Merge pull request #128 from Psiphon-Inc/next-release

Next release

i18n/transifex_pull.py

@@ -24,7 +24,7 @@
 # If you don't already have pipenv:
 $ python3 -m pip install --upgrade pipenv
 
-$ pipenv install --three --ignore-pipfile
+$ pipenv install --ignore-pipfile
 $ pipenv run python transifex_pull.py
 
 # To reset your pipenv state (e.g., after a Python upgrade):
@@ -33,7 +33,7 @@
 # To update transifexlib
 $ pipenv update transifexlib
 $ pipenv --rm
-$ pipenv install --three --ignore-pipfile
+$ pipenv install --ignore-pipfile
 '''
 
 
@@ -93,7 +93,7 @@
 
 def pull_app_translations():
     transifexlib.process_resource(
-        'windows-client-strings',
+        'https://app.transifex.com/otf/Psiphon3/windows-client-strings/',
         DEFAULT_LANGS,
         '../src/webui/_locales/en/messages.json',
         lambda lang: f'../src/webui/_locales/{lang}/messages.json',

src/webui/_locales/es/messages.json

@@ -940,7 +940,7 @@
         "description": "Body text of a modal dialog shown when a PsiCash login fails due to bad username or password."
     },
     "psicash#login#invalid-credentials-body-multiple-attempts": {
-        "message": "¿Prefieres <a class=\"js-psicash-account-signup\" href=\"#\"> crear una cuenta  o <a class=\"js-psicash-forgot-account\" href=\"#\"> recuperar tu cuenta</a>?",
+        "message": "¿Prefieres <a class=\"js-psicash-account-signup\" href=\"#\"> crear una cuenta</a> o <a class=\"js-psicash-forgot-account\" href=\"#\"> recuperar tu cuenta</a>?",
         "description": "Body text of a modal dialog shown when a PsiCash login fails due to bad username or password."
     },
     "psicash#login#server-error-body": {

src/webui/_locales/tr/messages.json

@@ -972,7 +972,7 @@
         "description": "Title of modal error message shown to user when Psiphon disallows some non-web internet traffic. The user will be told to 'upgrade' their connection with Speed Boost (giving more speed and app compatibility). The word 'Psiphon' must not be translated or transliterated."
     },
     "notice#disallowed-traffic-alert-body": {
-        "message": "</p>Çalışmayan uygulamalar mı var?</p>\n<p>İnternet trafiğinin bir kısmı Speed Boost özelliği etkinleştirilmeden kullanılamaz. Psiphon deneyimini tam olarak yaşamak için PsiCash kullanarak Speed Boost özelliğini etkinleştirin.</p>",
+        "message": "<p>Çalışmayan uygulamalar mı var?</p>\n<p>İnternet trafiğinin bir kısmı Speed Boost özelliği etkinleştirilmeden kullanılamaz. Psiphon deneyimini tam olarak yaşamak için PsiCash kullanarak Speed Boost özelliğini etkinleştirin.</p>",
         "description": "Body text of modal error message shown to user when Psiphon disallows some non-web internet traffic. The user needs to purchase Speed Boost in order to full app compatibilty and more speed. The words 'Psiphon' and 'PsiCash' must not be translated or transliterated. 'Speed Boost' is a reward that can be purchased with PsiCash credit. It provides unlimited network connection speed through Psiphon. Other words that can be used to help with translation are: 'turbo' (like cars), 'accelerate', 'warp speed', 'blast off', or anything that indicates a fast or unrestricted speed."
     },
     "appbackend#disallowed-traffic-notification-title": {

src/webui/_locales/zh/messages.json

@@ -940,7 +940,7 @@
         "description": "Body text of a modal dialog shown when a PsiCash login fails due to bad username or password."
     },
     "psicash#login#invalid-credentials-body-multiple-attempts": {
-        "message": "Would you instead like to <a class=\"js-psicash-account-signup\" href=\"#\">create an account</a> or <a class=\"js-psicash-forgot-account\" href=\"#\">recover your account</a>?",
+        "message": "您想<a class=\"js-psicash-account-signup\" href=\"#\">创建一个账户</a>还是<a class=\"js-psicash-forgot-account\" href=\"#\">恢复您的账户</a>？",
         "description": "Body text of a modal dialog shown when a PsiCash login fails due to bad username or password."
     },
     "psicash#login#server-error-body": {
@@ -956,7 +956,7 @@
         "description": "Title of modal dialog shown when the PsiCash account login attempt succeeds, if additional information needs to be conveyed. The word 'PsiCash' must not be translated or transliterated."
     },
     "psicash#login#last-tracker-merge-body": {
-        "message": "您已经登陆您的PsiCash账户。预先存在在这个设备上的余额已经转入您的帐户，但是这是最后一次余额合并。",
+        "message": "您已经登陆您的PsiCash账户。预先存在在这个设备上的余额已经转入您的账户，但是这是最后一次余额合并。",
         "description": "Body text of a modal dialog shown when a PsiCash login succeeds. There is a fixed number of times that a user can merge a pre-account balance into a PsiCash account. This message indicates that the user has hit that limit and the merge that occurred is the last one allowed. The word 'PsiCash' must not be translated or transliterated."
     },
     "psicash#alert#tokens-expired": {
@@ -1000,15 +1000,15 @@
         "description": "Sometimes when the Psiphon UI tries to open an external URL in the browser, it fails to open. This message indicates to the user that URL has been copied to the Windows system clipboard and is available for pasting into a browser. `<br>` may be used to split the message over two lines to ensure the alert doesn't take too much horizontal space."
     },
     "notice#psiphonui-fileerror-error-title": {
-        "message": "File Access Error",
+        "message": "文件访问错误",
         "description": "Title of modal error message shown to user when Psiphon cannot read/write/delete a file that it needs to access in order to function properly."
     },
     "notice#psiphonui-fileerror-error-body": {
-        "message": "<p>Psiphon cannot access a file it needs in order to work properly.</p>\n<p>Close the Psiphon application, delete the file listed below, and try running Psiphon again.</p>",
+        "message": "<p>Psiphon 无法访问正常工作所需的文件。</p>\n<p>关闭 Psiphon 应用程序，删除下面列出的文件，然后尝试再次运行 Psiphon。</p>",
         "description": "Body text of modal error message shown to user when Psiphon cannot read/write/delete a file that it needs to access in order to function properly. If this occurs, the user cannot connect and must take manual action to fix it. The word 'Psiphon' must not be translated or transliterated."
     },
     "notice#psiphonui-fileerror-detail-preamble": {
-        "message": "Filename and error message:",
+        "message": "文件名和错误消息：",
         "description": "Preamble text before technical details displayed in a modal error message shown to user when Psiphon cannot read/write/delete a file that it needs to access in order to function properly."
     },
     "banner#sponsored-by": {