diff options
| author | Albin <albin@mullvad.net> | 2021-10-07 10:50:02 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2021-10-07 10:50:02 +0200 |
| commit | e31b0d39fdbeff9421cc69a1dd0c6a8c807f6732 (patch) | |
| tree | ed4fe5222b257b1dd08457419bd018bb7036a3d6 /android/src/main/res/values | |
| parent | a2f4c7215dd46ed98cd23fda0d292bea303ee478 (diff) | |
| parent | 347391aebd4898390d2dca9bb52e292c8424420a (diff) | |
| download | mullvadvpn-e31b0d39fdbeff9421cc69a1dd0c6a8c807f6732.tar.xz mullvadvpn-e31b0d39fdbeff9421cc69a1dd0c6a8c807f6732.zip | |
Merge branch 'skip-url-translation'
Diffstat (limited to 'android/src/main/res/values')
| -rw-r--r-- | android/src/main/res/values/strings.xml | 9 | ||||
| -rw-r--r-- | android/src/main/res/values/strings_non_translatable.xml | 16 |
2 files changed, 16 insertions, 9 deletions
diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml index 30d3225b96..97d5828e72 100644 --- a/android/src/main/res/values/strings.xml +++ b/android/src/main/res/values/strings.xml @@ -16,8 +16,6 @@ <string name="connecting_to_daemon">Connecting to Mullvad system service...</string> <string name="login_title">Login</string> <string name="login_description">Enter your account number</string> - <string name="login_hint" - translatable="false">0000 0000 0000 0000</string> <string name="logging_in_title">Logging in...</string> <string name="logging_in_description">Checking account number</string> <string name="logged_in_title">Logged in</string> @@ -36,8 +34,6 @@ <string name="buy_more_credit">Buy more credit</string> <string name="redeem_voucher">Redeem voucher</string> <string name="enter_voucher_code">Enter voucher code</string> - <string name="voucher_hint" - translatable="false">XXXX-XXXX-XXXX-XXXX</string> <string name="redeem">Redeem</string> <string name="invalid_voucher">Voucher code is invalid.</string> <string name="voucher_already_used">Voucher code has already been used.</string> @@ -175,11 +171,6 @@ <string name="add_anyway">Add anyway</string> <string name="exclude_applications">Excluded applications</string> <string name="all_applications">All applications</string> - <string name="account_url">https://mullvad.net/en/account</string> - <string name="wg_key_url">https://mullvad.net/en/account/ports</string> - <string name="create_account_url">https://mullvad.net/en/account/create</string> - <string name="download_url">https://mullvad.net/en/download</string> - <string name="faqs_and_guides_url">https://mullvad.net/en/help/tag/mullvad-app/</string> <string name="copied_to_clipboard">Copied to clipboard</string> <string name="show_system_apps">Show system apps</string> </resources> diff --git a/android/src/main/res/values/strings_non_translatable.xml b/android/src/main/res/values/strings_non_translatable.xml new file mode 100644 index 0000000000..c895d28ac2 --- /dev/null +++ b/android/src/main/res/values/strings_non_translatable.xml @@ -0,0 +1,16 @@ +<resources> + <string name="login_hint" + translatable="false">0000 0000 0000 0000</string> + <string name="voucher_hint" + translatable="false">XXXX-XXXX-XXXX-XXXX</string> + <string name="account_url" + translatable="false">https://mullvad.net/account</string> + <string name="wg_key_url" + translatable="false">https://mullvad.net/account/ports</string> + <string name="create_account_url" + translatable="false">https://mullvad.net/account/create</string> + <string name="download_url" + translatable="false">https://mullvad.net/download</string> + <string name="faqs_and_guides_url" + translatable="false">https://mullvad.net/help/tag/mullvad-app/</string> +</resources> |