updated original string format, for adapting multi-language

This commit is contained in:
ronoaer 2023-10-05 13:26:11 +08:00
parent 79d371fb76
commit 08defbbbd8
8 changed files with 140 additions and 145 deletions

View file

@ -139,65 +139,50 @@
<name>InstallController</name> <name>InstallController</name>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="110"/> <location filename="../ui/controllers/installController.cpp" line="110"/>
<location filename="../ui/controllers/installController.cpp" line="163"/> <location filename="../ui/controllers/installController.cpp" line="162"/>
<source> installed successfully. </source> <source>%1 installed successfully. </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="113"/> <location filename="../ui/controllers/installController.cpp" line="112"/>
<location filename="../ui/controllers/installController.cpp" line="166"/> <location filename="../ui/controllers/installController.cpp" line="164"/>
<source> is already installed on the server. </source> <source>%1 is already installed on the server. </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="116"/> <location filename="../ui/controllers/installController.cpp" line="115"/>
<location filename="../ui/controllers/installController.cpp" line="185"/> <location filename="../ui/controllers/installController.cpp" line="183"/>
<source> <source>
Already installed containers were found on the server. All installed containers have been added to the application</source> Already installed containers were found on the server. All installed containers have been added to the application</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="266"/> <location filename="../ui/controllers/installController.cpp" line="264"/>
<source>Settings updated successfully</source> <source>Settings updated successfully</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="281"/> <location filename="../ui/controllers/installController.cpp" line="279"/>
<source>Server &apos;</source> <source>Server &apos;%1&apos; was removed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="281"/> <location filename="../ui/controllers/installController.cpp" line="289"/>
<source>&apos; was removed</source> <source>All containers from server &apos;%1&apos; have been removed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="291"/> <location filename="../ui/controllers/installController.cpp" line="306"/>
<source>All containers from server &apos;</source> <source>1% has been removed from the server &apos;%2&apos;</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="291"/> <location filename="../ui/controllers/installController.cpp" line="452"/>
<source>&apos; have been removed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="307"/>
<source> has been removed from the server &apos;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="308"/>
<source>&apos;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="454"/>
<source>Please login as the user</source> <source>Please login as the user</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="481"/> <location filename="../ui/controllers/installController.cpp" line="479"/>
<source>Server added successfully</source> <source>Server added successfully</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -253,7 +238,7 @@ Already installed containers were found on the server. All installed containers
<name>PageDeinstalling</name> <name>PageDeinstalling</name>
<message> <message>
<location filename="../ui/qml/Pages2/PageDeinstalling.qml" line="62"/> <location filename="../ui/qml/Pages2/PageDeinstalling.qml" line="62"/>
<source>Removing services from </source> <source>Removing services from %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -519,13 +504,12 @@ Already installed containers were found on the server. All installed containers
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="172"/> <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="172"/>
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="176"/>
<source>Remove </source> <source>Remove </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="176"/> <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="176"/>
<source> from server?</source> <source>Remove %1 from server?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -590,13 +574,12 @@ Already installed containers were found on the server. All installed containers
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="62"/> <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="62"/>
<location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="66"/>
<source>Remove </source> <source>Remove </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="66"/> <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="66"/>
<source> from server?</source> <source>Remove %1 from server?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -1318,13 +1301,12 @@ And if you don&apos;t like the app, all the more support it - the donation will
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="112"/> <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="112"/>
<location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="116"/>
<source>Remove </source> <source>Remove </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="116"/> <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="116"/>
<source> from server?</source> <source>Remove %1 from server?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -2540,22 +2522,22 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
</message> </message>
<message> <message>
<location filename="../ui/controllers/sitesController.cpp" line="67"/> <location filename="../ui/controllers/sitesController.cpp" line="67"/>
<source>New site added: </source> <source>New site added: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/sitesController.cpp" line="80"/> <location filename="../ui/controllers/sitesController.cpp" line="80"/>
<source>Site removed: </source> <source>Site removed: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/sitesController.cpp" line="88"/> <location filename="../ui/controllers/sitesController.cpp" line="88"/>
<source>Can&apos;t open file: </source> <source>Can&apos;t open file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/sitesController.cpp" line="95"/> <location filename="../ui/controllers/sitesController.cpp" line="95"/>
<source>Failed to parse JSON data from file: </source> <source>Failed to parse JSON data from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

View file

@ -6,7 +6,7 @@
<message> <message>
<location filename="../amnezia_application.cpp" line="299"/> <location filename="../amnezia_application.cpp" line="299"/>
<source>Split tunneling for WireGuard is not implemented, the option was disabled</source> <source>Split tunneling for WireGuard is not implemented, the option was disabled</source>
<translation type="unfinished">WireGuard协议的VPN分流</translation> <translation type="unfinished">WireGuard协议的VPN分流</translation>
</message> </message>
</context> </context>
<context> <context>
@ -138,66 +138,72 @@
<context> <context>
<name>InstallController</name> <name>InstallController</name>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="110"/>
<location filename="../ui/controllers/installController.cpp" line="163"/>
<source> installed successfully. </source> <source> installed successfully. </source>
<translation type="unfinished"></translation> <translation type="obsolete"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="113"/>
<location filename="../ui/controllers/installController.cpp" line="166"/>
<source> is already installed on the server. </source> <source> is already installed on the server. </source>
<translation type="unfinished"> </translation> <translation type="obsolete"> </translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="116"/> <location filename="../ui/controllers/installController.cpp" line="110"/>
<location filename="../ui/controllers/installController.cpp" line="185"/> <location filename="../ui/controllers/installController.cpp" line="162"/>
<source>%1 installed successfully. </source>
<translation type="unfinished">%1 </translation>
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="112"/>
<location filename="../ui/controllers/installController.cpp" line="164"/>
<source>%1 is already installed on the server. </source>
<translation type="unfinished"> %1</translation>
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="115"/>
<location filename="../ui/controllers/installController.cpp" line="183"/>
<source> <source>
Already installed containers were found on the server. All installed containers have been added to the application</source> Already installed containers were found on the server. All installed containers have been added to the application</source>
<translation type="unfinished"></translation> <translation type="unfinished">
</translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="266"/> <location filename="../ui/controllers/installController.cpp" line="264"/>
<source>Settings updated successfully</source> <source>Settings updated successfully</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="281"/> <location filename="../ui/controllers/installController.cpp" line="279"/>
<source>Server &apos;%1&apos; was removed</source>
<translation type="unfinished"> &apos;%1&apos;</translation>
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="289"/>
<source>All containers from server &apos;%1&apos; have been removed</source>
<translation type="unfinished"> &apos;%1&apos; </translation>
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="306"/>
<source>1% has been removed from the server &apos;%2&apos;</source>
<translation type="unfinished"> 1% &apos;%2&apos; </translation>
</message>
<message>
<source>Server &apos;</source> <source>Server &apos;</source>
<translation type="unfinished"> </translation> <translation type="obsolete"> </translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="281"/>
<source>&apos; was removed</source> <source>&apos; was removed</source>
<translation type="unfinished"> </translation> <translation type="obsolete"> </translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="291"/>
<source>All containers from server &apos;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="291"/>
<source>&apos; have been removed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="307"/>
<source> has been removed from the server &apos;</source> <source> has been removed from the server &apos;</source>
<translation type="unfinished"> </translation> <translation type="obsolete"> </translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="308"/> <location filename="../ui/controllers/installController.cpp" line="452"/>
<source>&apos;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/controllers/installController.cpp" line="454"/>
<source>Please login as the user</source> <source>Please login as the user</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/installController.cpp" line="481"/> <location filename="../ui/controllers/installController.cpp" line="479"/>
<source>Server added successfully</source> <source>Server added successfully</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -253,8 +259,8 @@ Already installed containers were found on the server. All installed containers
<name>PageDeinstalling</name> <name>PageDeinstalling</name>
<message> <message>
<location filename="../ui/qml/Pages2/PageDeinstalling.qml" line="62"/> <location filename="../ui/qml/Pages2/PageDeinstalling.qml" line="62"/>
<source>Removing services from </source> <source>Removing services from %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"> %1 </translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageDeinstalling.qml" line="87"/> <location filename="../ui/qml/Pages2/PageDeinstalling.qml" line="87"/>
@ -519,14 +525,17 @@ Already installed containers were found on the server. All installed containers
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="172"/> <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="172"/>
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="176"/>
<source>Remove </source> <source>Remove </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="176"/> <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="176"/>
<source>Remove %1 from server?</source>
<translation type="unfinished"> %1 ?</translation>
</message>
<message>
<source> from server?</source> <source> from server?</source>
<translation type="unfinished"> </translation> <translation type="obsolete"> </translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="177"/> <location filename="../ui/qml/Pages2/PageProtocolRaw.qml" line="177"/>
@ -583,14 +592,17 @@ Already installed containers were found on the server. All installed containers
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="62"/> <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="62"/>
<location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="66"/>
<source>Remove </source> <source>Remove </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="66"/> <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="66"/>
<source>Remove %1 from server?</source>
<translation type="unfinished"> %1 ?</translation>
</message>
<message>
<source> from server?</source> <source> from server?</source>
<translation type="unfinished"> </translation> <translation type="obsolete"> </translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="67"/> <location filename="../ui/qml/Pages2/PageServiceDnsSettings.qml" line="67"/>
@ -673,12 +685,12 @@ Already installed containers were found on the server. All installed containers
<message> <message>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="260"/> <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="260"/>
<source>Remove SFTP and all data stored there</source> <source>Remove SFTP and all data stored there</source>
<translation type="unfinished">SFTP和其存储在这里的所有数据</translation> <translation type="unfinished">SFTP和其本地所有数据</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="263"/> <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="263"/>
<source>Remove SFTP and all data stored there?</source> <source>Remove SFTP and all data stored there?</source>
<translation type="unfinished">SFTP和其存储在这里的所有数据?</translation> <translation type="unfinished">SFTP和其本地所有数据?</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="264"/> <location filename="../ui/qml/Pages2/PageServiceSftpSettings.qml" line="264"/>
@ -864,7 +876,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="192"/> <location filename="../ui/qml/Pages2/PageSettingsAbout.qml" line="192"/>
<source>Check for updates</source> <source>Check for updates</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
@ -917,7 +929,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="111"/>
<source>Disabled</source> <source>Disabled</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="124"/> <location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="124"/>
@ -1241,22 +1253,22 @@ And if you don&apos;t like the app, all the more support it - the donation will
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="117"/> <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="117"/>
<source>Check the server for previously installed Amnezia services</source> <source>Check the server for previously installed Amnezia services</source>
<translation type="unfinished"> Amnezia </translation> <translation type="unfinished"> Amnezia </translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="118"/> <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="118"/>
<source>Add them to the application if they were not displayed</source> <source>Add them to the application if they were not displayed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="134"/> <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="134"/>
<source>Remove server from application</source> <source>Remove server from application</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="138"/> <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="138"/>
<source>Remove server?</source> <source>Remove server?</source>
<translation type="unfinished">?</translation> <translation type="unfinished">?</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="139"/> <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="139"/>
@ -1266,7 +1278,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="165"/> <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="165"/>
<source>Clear server from Amnezia software</source> <source>Clear server from Amnezia software</source>
<translation type="unfinished">Amnezia中清除服务器</translation> <translation type="unfinished">Amnezia中服务器信息</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="169"/> <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="169"/>
@ -1316,14 +1328,17 @@ And if you don&apos;t like the app, all the more support it - the donation will
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="112"/> <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="112"/>
<location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="116"/>
<source>Remove </source> <source>Remove </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="116"/>
<source> from server?</source> <source> from server?</source>
<translation type="unfinished"> </translation> <translation type="obsolete"> </translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="116"/>
<source>Remove %1 from server?</source>
<translation type="unfinished"> %1 ?</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="117"/> <location filename="../ui/qml/Pages2/PageSettingsServerProtocol.qml" line="117"/>
@ -1374,7 +1389,7 @@ And if you don&apos;t like the app, all the more support it - the donation will
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="198"/> <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="198"/>
<source>Remove </source> <source>Remove </source>
<translation type="unfinished"></translation> <translation type="unfinished"> </translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="199"/> <location filename="../ui/qml/Pages2/PageSettingsSplitTunneling.qml" line="199"/>
@ -1583,7 +1598,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<message> <message>
<location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="66"/> <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="66"/>
<source>Amnesia has detected that your server is currently </source> <source>Amnesia has detected that your server is currently </source>
<translation type="unfinished">Amnezia </translation> <translation type="unfinished">Amnezia </translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="67"/> <location filename="../ui/qml/Pages2/PageSetupWizardInstalling.qml" line="67"/>
@ -1731,7 +1746,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<message> <message>
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="105"/> <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="105"/>
<source>Show content</source> <source>Show content</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="148"/> <location filename="../ui/qml/Pages2/PageSetupWizardViewConfig.qml" line="148"/>
@ -1754,7 +1769,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<message> <message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="86"/> <location filename="../ui/qml/Pages2/PageShare.qml" line="86"/>
<source>For the AmneziaVPN app</source> <source>For the AmneziaVPN app</source>
<translation type="unfinished">AmneziaVPN</translation> <translation type="unfinished">AmneziaVPN </translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="91"/> <location filename="../ui/qml/Pages2/PageShare.qml" line="91"/>
@ -1779,17 +1794,17 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<message> <message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="158"/> <location filename="../ui/qml/Pages2/PageShare.qml" line="158"/>
<source>Full access</source> <source>Full access</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="174"/> <location filename="../ui/qml/Pages2/PageShare.qml" line="174"/>
<source>VPN access without the ability to manage the server</source> <source>VPN access without the ability to manage the server</source>
<translation type="unfinished">VPN 访</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="175"/> <location filename="../ui/qml/Pages2/PageShare.qml" line="175"/>
<source>Full access to server</source> <source>Full access to server</source>
<translation type="unfinished">访</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="190"/> <location filename="../ui/qml/Pages2/PageShare.qml" line="190"/>
@ -1810,7 +1825,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<location filename="../ui/qml/Pages2/PageShare.qml" line="222"/> <location filename="../ui/qml/Pages2/PageShare.qml" line="222"/>
<location filename="../ui/qml/Pages2/PageShare.qml" line="307"/> <location filename="../ui/qml/Pages2/PageShare.qml" line="307"/>
<source>File with connection settings to </source> <source>File with connection settings to </source>
<translation type="unfinished"></translation> <translation type="unfinished">:</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageShare.qml" line="248"/> <location filename="../ui/qml/Pages2/PageShare.qml" line="248"/>
@ -2000,12 +2015,12 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<message> <message>
<location filename="../3rd/qtkeychain/keychain_android.cpp" line="68"/> <location filename="../3rd/qtkeychain/keychain_android.cpp" line="68"/>
<source>Could not retrieve private key from keystore</source> <source>Could not retrieve private key from keystore</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../3rd/qtkeychain/keychain_android.cpp" line="75"/> <location filename="../3rd/qtkeychain/keychain_android.cpp" line="75"/>
<source>Could not create decryption cipher</source> <source>Could not create decryption cipher</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
@ -2059,27 +2074,27 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<message> <message>
<location filename="../3rd/qtkeychain/keychain_android.cpp" line="124"/> <location filename="../3rd/qtkeychain/keychain_android.cpp" line="124"/>
<source>Could not create private key generator</source> <source>Could not create private key generator</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../3rd/qtkeychain/keychain_android.cpp" line="131"/> <location filename="../3rd/qtkeychain/keychain_android.cpp" line="131"/>
<source>Could not generate new private key</source> <source>Could not generate new private key</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../3rd/qtkeychain/keychain_android.cpp" line="139"/> <location filename="../3rd/qtkeychain/keychain_android.cpp" line="139"/>
<source>Could not retrieve private key from keystore</source> <source>Could not retrieve private key from keystore</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../3rd/qtkeychain/keychain_android.cpp" line="147"/> <location filename="../3rd/qtkeychain/keychain_android.cpp" line="147"/>
<source>Could not create encryption cipher</source> <source>Could not create encryption cipher</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../3rd/qtkeychain/keychain_android.cpp" line="155"/> <location filename="../3rd/qtkeychain/keychain_android.cpp" line="155"/>
<source>Could not encrypt data</source> <source>Could not encrypt data</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
@ -2328,7 +2343,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<message> <message>
<location filename="../containers/containers_defs.cpp" line="104"/> <location filename="../containers/containers_defs.cpp" line="104"/>
<source>OpenVPN over Cloak - OpenVPN with VPN masquerading as web traffic and protection against active-probbing detection. Ideal for bypassing blocking in regions with the highest levels of censorship.</source> <source>OpenVPN over Cloak - OpenVPN with VPN masquerading as web traffic and protection against active-probbing detection. Ideal for bypassing blocking in regions with the highest levels of censorship.</source>
<translation type="unfinished">OpenVPN over Cloak - OpenVPNVPN .</translation> <translation type="unfinished">OpenVPN over Cloak - OpenVPN VPN </translation>
</message> </message>
<message> <message>
<location filename="../containers/containers_defs.cpp" line="108"/> <location filename="../containers/containers_defs.cpp" line="108"/>
@ -2338,7 +2353,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<message> <message>
<location filename="../containers/containers_defs.cpp" line="111"/> <location filename="../containers/containers_defs.cpp" line="111"/>
<source>IKEv2 - Modern stable protocol, a bit faster than others, restores connection after signal loss. It has native support on the latest versions of Android and iOS.</source> <source>IKEv2 - Modern stable protocol, a bit faster than others, restores connection after signal loss. It has native support on the latest versions of Android and iOS.</source>
<translation type="unfinished">IKEv2 - Android iOS最新版原生支持</translation> <translation type="unfinished">IKEv2 - Android iOS最新版原生支持</translation>
</message> </message>
<message> <message>
<location filename="../containers/containers_defs.cpp" line="114"/> <location filename="../containers/containers_defs.cpp" line="114"/>
@ -2478,22 +2493,22 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<message> <message>
<location filename="../ui/controllers/settingsController.cpp" line="20"/> <location filename="../ui/controllers/settingsController.cpp" line="20"/>
<source>Software version</source> <source>Software version</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/settingsController.cpp" line="102"/> <location filename="../ui/controllers/settingsController.cpp" line="102"/>
<source>Backup file is corrupted</source> <source>Backup file is corrupted</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/settingsController.cpp" line="117"/> <location filename="../ui/controllers/settingsController.cpp" line="117"/>
<source>All settings have been reset to default values</source> <source>All settings have been reset to default values</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/settingsController.cpp" line="123"/> <location filename="../ui/controllers/settingsController.cpp" line="123"/>
<source>Cached profiles cleared</source> <source>Cached profiles cleared</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
@ -2502,7 +2517,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="27"/> <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="27"/>
<location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="35"/> <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="35"/>
<source>Save AmneziaVPN config</source> <source>Save AmneziaVPN config</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="71"/> <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="71"/>
@ -2512,22 +2527,22 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<message> <message>
<location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="104"/> <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="104"/>
<source>Copy</source> <source>Copy</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="111"/> <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="111"/>
<source>Copied</source> <source>Copied</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="126"/> <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="126"/>
<source>Show content</source> <source>Show content</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="250"/> <location filename="../ui/qml/Components/ShareConnectionDrawer.qml" line="250"/>
<source>To read the QR code in the Amnezia app, select &quot;Add server&quot; &quot;I have data to connect&quot; &quot;QR code, key or settings file&quot;</source> <source>To read the QR code in the Amnezia app, select &quot;Add server&quot; &quot;I have data to connect&quot; &quot;QR code, key or settings file&quot;</source>
<translation type="unfinished"></translation> <translation type="unfinished"> Amnezia </translation>
</message> </message>
</context> </context>
<context> <context>
@ -2539,22 +2554,22 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
</message> </message>
<message> <message>
<location filename="../ui/controllers/sitesController.cpp" line="67"/> <location filename="../ui/controllers/sitesController.cpp" line="67"/>
<source>New site added: </source> <source>New site added: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/sitesController.cpp" line="80"/> <location filename="../ui/controllers/sitesController.cpp" line="80"/>
<source>Site removed: </source> <source>Site removed: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/sitesController.cpp" line="88"/> <location filename="../ui/controllers/sitesController.cpp" line="88"/>
<source>Can&apos;t open file: </source> <source>Can&apos;t open file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/controllers/sitesController.cpp" line="95"/> <location filename="../ui/controllers/sitesController.cpp" line="95"/>
<source>Failed to parse JSON data from file: </source> <source>Failed to parse JSON data from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -2593,7 +2608,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<message> <message>
<location filename="../ui/systemtray_notificationhandler.cpp" line="39"/> <location filename="../ui/systemtray_notificationhandler.cpp" line="39"/>
<source>Visit Website</source> <source>Visit Website</source>
<translation type="unfinished">访</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/systemtray_notificationhandler.cpp" line="43"/> <location filename="../ui/systemtray_notificationhandler.cpp" line="43"/>
@ -2677,7 +2692,7 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<message> <message>
<location filename="../containers/containers_defs.cpp" line="247"/> <location filename="../containers/containers_defs.cpp" line="247"/>
<source>Many foreign websites and VPN providers are blocked</source> <source>Many foreign websites and VPN providers are blocked</source>
<translation type="unfinished">VPN提供商被屏蔽</translation> <translation type="unfinished">VPN提供商被屏蔽</translation>
</message> </message>
<message> <message>
<location filename="../containers/containers_defs.cpp" line="248"/> <location filename="../containers/containers_defs.cpp" line="248"/>

View file

@ -107,10 +107,9 @@ void InstallController::installServer(DockerContainer container, QJsonObject &co
if (!installedContainers.contains(container)) { if (!installedContainers.contains(container)) {
errorCode = serverController.setupContainer(m_currentlyInstalledServerCredentials, container, config); errorCode = serverController.setupContainer(m_currentlyInstalledServerCredentials, container, config);
installedContainers.insert(container, config); installedContainers.insert(container, config);
finishMessage = ContainerProps::containerHumanNames().value(container) + tr(" installed successfully. "); finishMessage = tr("%1 installed successfully. ").arg(ContainerProps::containerHumanNames().value(container));
} else { } else {
finishMessage = finishMessage = tr("%1 is already installed on the server. ").arg(ContainerProps::containerHumanNames().value(container));
ContainerProps::containerHumanNames().value(container) + tr(" is already installed on the server. ");
} }
if (installedContainers.size() > 1) { if (installedContainers.size() > 1) {
finishMessage += tr("\nAlready installed containers were found on the server. " finishMessage += tr("\nAlready installed containers were found on the server. "
@ -160,10 +159,9 @@ void InstallController::installContainer(DockerContainer container, QJsonObject
if (!installedContainers.contains(container)) { if (!installedContainers.contains(container)) {
errorCode = serverController.setupContainer(serverCredentials, container, config); errorCode = serverController.setupContainer(serverCredentials, container, config);
installedContainers.insert(container, config); installedContainers.insert(container, config);
finishMessage = ContainerProps::containerHumanNames().value(container) + tr(" installed successfully. "); finishMessage = tr("%1 installed successfully. ").arg(ContainerProps::containerHumanNames().value(container));
} else { } else {
finishMessage = finishMessage = tr("%1 is already installed on the server. ").arg(ContainerProps::containerHumanNames().value(container));
ContainerProps::containerHumanNames().value(container) + tr(" is already installed on the server. ");
} }
bool isInstalledContainerAddedToGui = false; bool isInstalledContainerAddedToGui = false;
@ -278,7 +276,7 @@ void InstallController::removeCurrentlyProcessedServer()
QString serverName = m_serversModel->data(serverIndex, ServersModel::Roles::NameRole).toString(); QString serverName = m_serversModel->data(serverIndex, ServersModel::Roles::NameRole).toString();
m_serversModel->removeServer(); m_serversModel->removeServer();
emit removeCurrentlyProcessedServerFinished(tr("Server '") + serverName + tr("' was removed")); emit removeCurrentlyProcessedServerFinished(tr("Server '%1' was removed").arg(serverName));
} }
void InstallController::removeAllContainers() void InstallController::removeAllContainers()
@ -288,7 +286,7 @@ void InstallController::removeAllContainers()
ErrorCode errorCode = m_containersModel->removeAllContainers(); ErrorCode errorCode = m_containersModel->removeAllContainers();
if (errorCode == ErrorCode::NoError) { if (errorCode == ErrorCode::NoError) {
emit removeAllContainersFinished(tr("All containers from server '") + serverName + tr("' have been removed")); emit removeAllContainersFinished(tr("All containers from server '%1' have been removed").arg(serverName));
return; return;
} }
emit installationErrorOccurred(errorString(errorCode)); emit installationErrorOccurred(errorString(errorCode));
@ -304,8 +302,8 @@ void InstallController::removeCurrentlyProcessedContainer()
ErrorCode errorCode = m_containersModel->removeCurrentlyProcessedContainer(); ErrorCode errorCode = m_containersModel->removeCurrentlyProcessedContainer();
if (errorCode == ErrorCode::NoError) { if (errorCode == ErrorCode::NoError) {
emit removeCurrentlyProcessedContainerFinished(containerName + tr(" has been removed from the server '")
+ serverName + tr("'")); emit removeCurrentlyProcessedContainerFinished(tr("1% has been removed from the server '%2'").arg(containerName).arg(serverName));
return; return;
} }
emit installationErrorOccurred(errorString(errorCode)); emit installationErrorOccurred(errorString(errorCode));

View file

@ -64,7 +64,7 @@ void SitesController::addSite(QString hostname)
QHostInfo::lookupHost(hostname, this, resolveCallback); QHostInfo::lookupHost(hostname, this, resolveCallback);
} }
emit finished(tr("New site added: ") + hostname); emit finished(tr("New site added: %1").arg(hostname));
} }
void SitesController::removeSite(int index) void SitesController::removeSite(int index)
@ -77,7 +77,7 @@ void SitesController::removeSite(int index)
Q_ARG(QStringList, QStringList() << hostname)); Q_ARG(QStringList, QStringList() << hostname));
QMetaObject::invokeMethod(m_vpnConnection.get(), "flushDns", Qt::QueuedConnection); QMetaObject::invokeMethod(m_vpnConnection.get(), "flushDns", Qt::QueuedConnection);
emit finished(tr("Site removed: ") + hostname); emit finished(tr("Site removed: %1").arg(hostname));
} }
void SitesController::importSites(const QString &fileName, bool replaceExisting) void SitesController::importSites(const QString &fileName, bool replaceExisting)
@ -85,19 +85,19 @@ void SitesController::importSites(const QString &fileName, bool replaceExisting)
QFile file(fileName); QFile file(fileName);
if (!file.open(QIODevice::ReadOnly)) { if (!file.open(QIODevice::ReadOnly)) {
emit errorOccurred(tr("Can't open file: ") + fileName); emit errorOccurred(tr("Can't open file: %1").arg(fileName));
return; return;
} }
QByteArray jsonData = file.readAll(); QByteArray jsonData = file.readAll();
QJsonDocument jsonDocument = QJsonDocument::fromJson(jsonData); QJsonDocument jsonDocument = QJsonDocument::fromJson(jsonData);
if (jsonDocument.isNull()) { if (jsonDocument.isNull()) {
emit errorOccurred(tr("Failed to parse JSON data from file: ") + fileName); emit errorOccurred(tr("Failed to parse JSON data from file: %1").arg(fileName));
return; return;
} }
if (!jsonDocument.isArray()) { if (!jsonDocument.isArray()) {
emit errorOccurred(tr("The JSON data is not an array in file: ") + fileName); emit errorOccurred(tr("The JSON data is not an array in file: ").arg(fileName));
return; return;
} }

View file

@ -59,7 +59,7 @@ PageType {
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.topMargin: 20
headerText: qsTr("Removing services from ") + name headerText: qsTr("Removing services from %1").arg(name)
} }
ProgressBarType { ProgressBarType {

View file

@ -173,7 +173,7 @@ PageType {
textColor: "#EB5757" textColor: "#EB5757"
clickedFunction: function() { clickedFunction: function() {
questionDrawer.headerText = qsTr("Remove ") + ContainersModel.getCurrentlyProcessedContainerName() + qsTr(" from server?") questionDrawer.headerText = qsTr("Remove %1 from server?").arg(ContainersModel.getCurrentlyProcessedContainerName())
questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it") questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it")
questionDrawer.yesButtonText = qsTr("Continue") questionDrawer.yesButtonText = qsTr("Continue")
questionDrawer.noButtonText = qsTr("Cancel") questionDrawer.noButtonText = qsTr("Cancel")

View file

@ -63,7 +63,7 @@ PageType {
textColor: "#EB5757" textColor: "#EB5757"
clickedFunction: function() { clickedFunction: function() {
questionDrawer.headerText = qsTr("Remove ") + ContainersModel.getCurrentlyProcessedContainerName() + qsTr(" from server?") questionDrawer.headerText = qsTr("Remove %1 from server?").arg(ContainersModel.getCurrentlyProcessedContainerName())
questionDrawer.yesButtonText = qsTr("Continue") questionDrawer.yesButtonText = qsTr("Continue")
questionDrawer.noButtonText = qsTr("Cancel") questionDrawer.noButtonText = qsTr("Cancel")

View file

@ -113,7 +113,7 @@ PageType {
textColor: "#EB5757" textColor: "#EB5757"
clickedFunction: function() { clickedFunction: function() {
questionDrawer.headerText = qsTr("Remove ") + ContainersModel.getCurrentlyProcessedContainerName() + qsTr(" from server?") questionDrawer.headerText = qsTr("Remove %1 from server?").arg(ContainersModel.getCurrentlyProcessedContainerName())
questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it") questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it")
questionDrawer.yesButtonText = qsTr("Continue") questionDrawer.yesButtonText = qsTr("Continue")
questionDrawer.noButtonText = qsTr("Cancel") questionDrawer.noButtonText = qsTr("Cancel")