diff options
| author | Albin <albin@mullvad.net> | 2022-11-14 12:19:20 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2022-11-14 12:19:20 +0100 |
| commit | 18b1685dea0d5cae709d5ef8f16d14d4fe003cec (patch) | |
| tree | ee5d6be5a98d2fa8caaa899d2a0fccd9c2c9555f | |
| parent | 0ad0b36259b7a09e35c9d4b4a2f562d8bd4cb7e1 (diff) | |
| parent | 709d6a762f6e2492315d4310c7653dcd8ab039b8 (diff) | |
| download | mullvadvpn-18b1685dea0d5cae709d5ef8f16d14d4fe003cec.tar.xz mullvadvpn-18b1685dea0d5cae709d5ef8f16d14d4fe003cec.zip | |
Merge branch 'add-privacy-policy-link-in-settings'
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | android/app/src/main/res/layout/settings.xml | 5 | ||||
| -rw-r--r-- | android/app/src/main/res/values/strings.xml | 1 | ||||
| -rw-r--r-- | android/app/src/main/res/values/strings_non_translatable.xml | 2 | ||||
| -rw-r--r-- | gui/locales/messages.pot | 3 |
5 files changed, 16 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 9543dfba8a..4e108fffec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,11 @@ Line wrap the file at 100 chars. Th ## [Unreleased] +### Added +#### Android +- Add privacy policy link in settings. + + ### Fixed - When a country is selected, and the constraints only match relays that are not included on the country level, select those relays anyway. diff --git a/android/app/src/main/res/layout/settings.xml b/android/app/src/main/res/layout/settings.xml index 6e51960e88..d590759e2e 100644 --- a/android/app/src/main/res/layout/settings.xml +++ b/android/app/src/main/res/layout/settings.xml @@ -75,6 +75,11 @@ android:layout_marginTop="1dp" mullvad:text="@string/faqs_and_guides" mullvad:url="@string/faqs_and_guides_url" /> + <net.mullvad.mullvadvpn.ui.widget.UrlCell android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="1dp" + mullvad:text="@string/privacy_policy" + mullvad:url="@string/privacy_policy_url" /> </LinearLayout> </net.mullvad.mullvadvpn.ui.widget.ListenableScrollView> </LinearLayout> diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index d89b630462..f0422fd435 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -55,6 +55,7 @@ <string name="update_available_footer">Update available, download to remain safe.</string> <string name="report_a_problem">Report a problem</string> <string name="faqs_and_guides">FAQs & Guides</string> + <string name="privacy_policy">Privacy policy</string> <string name="account_number">Account number</string> <string name="device_name">Device name</string> <string name="mullvad_account_number">Mullvad account number</string> diff --git a/android/app/src/main/res/values/strings_non_translatable.xml b/android/app/src/main/res/values/strings_non_translatable.xml index 4890e8f4e8..fc40758faf 100644 --- a/android/app/src/main/res/values/strings_non_translatable.xml +++ b/android/app/src/main/res/values/strings_non_translatable.xml @@ -13,6 +13,8 @@ translatable="false">https://mullvad.net/download</string> <string name="faqs_and_guides_url" translatable="false">https://mullvad.net/help/tag/mullvad-app/</string> + <string name="privacy_policy_url" + translatable="false">https://mullvad.net/help/privacy-policy/</string> <string name="split_tunneling" translatable="false">Split tunneling</string> <string name="wireguard" diff --git a/gui/locales/messages.pot b/gui/locales/messages.pot index 377684c041..94ed5653c0 100644 --- a/gui/locales/messages.pot +++ b/gui/locales/messages.pot @@ -1602,6 +1602,9 @@ msgstr "" msgid "Preferences" msgstr "" +msgid "Privacy policy" +msgstr "" + msgid "Secured" msgstr "" |