summaryrefslogtreecommitdiff
path: root/app/src/main/res/values
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res/values')
-rw-r--r--app/src/main/res/values/strings.xml7
-rw-r--r--app/src/main/res/values/untranslatable.xml10
2 files changed, 6 insertions, 11 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 53ba5e8f..79f03764 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -152,7 +152,6 @@
<string name="version_update_error">Update failed.</string>
<string name="version_update_error_permissions">No permissions to install app.</string>
<string name="gateway_selection_title">Select location</string>
- <string name="gateway_selection_warning">%s will find the best connection for you.</string>
<string name="gateway_selection_recommended_location">Use recommended location</string>
<string name="gateway_selection_recommended">Recommended</string>
<string name="gateway_selection_manually">Manually select</string>
@@ -172,7 +171,7 @@
<string name="log_requesting_status">Asking for networkstatus consensus</string>
<string name="log_loading_status">Loading networkstatus consensus</string>
<string name="log_loading_keys">Loading authority key certs</string>
- <string name="log_requesting_desccriptors">Asking for relay descriptors</string>
+ <string name="log_requesting_descriptors">Asking for relay descriptors</string>
<string name="log_loading_descriptors">Loading relay descriptors</string>
<string name="log_enough_dirinfo">Loaded enough directory info to build circuits</string>
<string name="log_ap_handshake_done">Handshake finished with a relay to build circuits</string>
@@ -192,4 +191,8 @@
<string name="prefer_udp_subtitle">UDP can be faster and better for streaming, but does not work for all networks.</string>
<string name="hint_bridges">Only locations supporting bridges are currently selectable.</string>
<string name="option_disable_bridges">Disable bridges</string>
+ <string name="eip_state_insecure">Connection insecure</string>
+ <string name="connection_not_connected" >You may be leaking information to your internet provider or local network.</string>
+ <string name="eip_state_no_network">You have no working Internet connection. Once you get it back, you will be automatically connected to</string>
+ <string name="eip_state_blocking">%1$s is blocking all internet traffic.</string>
</resources>
diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml
index 8c478b33..8c3c5944 100644
--- a/app/src/main/res/values/untranslatable.xml
+++ b/app/src/main/res/values/untranslatable.xml
@@ -47,14 +47,6 @@
<!-- gateway selector, move to strings.xml, once the wording is clear -->
<string name="warning_no_more_gateways_manual_gw_selection" translatable="false">%1$s could not connect to %2$s. Do you want to try to connect automatically with best location?</string>
<string name="warning_option_try_best" translatable="false">Try best location</string>
- <string name="warning_bridges_not_supported" translatable="false">%1$s doesn\'t support bridges to circumvent VPN filtering. Do you want to choose a different location or disable bridges?</string>
- <string name="option_different_location" translatable="false">Choose different location</string>
- <string name="eip_state_insecure" translatable="false">Connection Insecure</string>
- <string name="eip_state_connected_recommended" translatable="false">You are connected to the recommended location</string>
- <string name="eip_state_connected_manual" translatable="false">You are connected to</string>
- <string name="eip_state_connecting" translatable="false">Connecting...</string>
- <string name="connection_not_connected" translatable="false">You may be leaking information to your internet provider or local network.</string>
- <string name="eip_state_no_network" translatable="false">You have no working Internet connection. Once you get it back, you will be automatically connected to</string>
- <string name="eip_state_blocking" translatable="false">%1$s is blocking all internet traffic.</string>
+ <string name="no_location" translatable="false">---</string>
</resources> \ No newline at end of file