summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2022-01-31 16:32:14 +0000
committercyberta <cyberta@riseup.net>2022-01-31 16:32:14 +0000
commit77908103f7d6d5bd6c8bd20c8e2ca0c9ac45da4d (patch)
treeb5abc5b73d0247bbc67781f610b56d8e19968a96 /app
parentdd61a0cd00433d13b1682a9f848365d55076987b (diff)
parentb9bf9b816540cfc25f96d5cbbc4389ad5284e3a1 (diff)
Merge branch 'translation_fixes' into 'master'
translation fixes See merge request leap/bitmask_android!168
Diffstat (limited to 'app')
-rwxr-xr-xapp/src/main/res/values/strings-icsopenvpn.xml2
1 files changed, 0 insertions, 2 deletions
diff --git a/app/src/main/res/values/strings-icsopenvpn.xml b/app/src/main/res/values/strings-icsopenvpn.xml
index b552715a..dee6a42f 100755
--- a/app/src/main/res/values/strings-icsopenvpn.xml
+++ b/app/src/main/res/values/strings-icsopenvpn.xml
@@ -56,7 +56,6 @@
<string name="custom_config_title">Enable Custom Options</string>
<string name="custom_config_summary">Specify custom options. Use with care!</string>
<string name="route_rejected">Route rejected by Android</string>
- <string name="cancel_connection">Disconnect</string>
<string name="cancel_connection_long">Disconnect VPN</string>
<string name="clear_log">clear log</string>
<string name="title_cancel">Cancel Confirmation</string>
@@ -343,7 +342,6 @@
<string name="remote_no_server_selected">You need to define and enable at least one remote server.</string>
<string name="server_list">Server List</string>
<string name="vpn_allowed_apps">Allowed Apps</string>
- <string name="advanced_settings">Advanced Settings</string>
<string name="payload_options">Payload options</string>
<string name="tls_settings">TLS Settings</string>
<string name="no_remote_defined">No remote defined</string>