diff options
| author | cyberta <cyberta@riseup.net> | 2021-12-13 09:32:32 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2021-12-13 09:32:32 +0000 |
| commit | 70a64dad36db8a79f2e9c2a8bf4bdc0842b67708 (patch) | |
| tree | 09512dc1a617f1d7c12321ff4d3f54dd3a267090 /app/src/main/res/values | |
| parent | 42a3735356881633004dfb6ed3c60fe8b7d26689 (diff) | |
| parent | cf0cf6964accada6482722b52554978174ef2da2 (diff) | |
Merge branch 'improve_strings' into 'master'
Improve strings
Closes #9055
See merge request leap/bitmask_android!152
Diffstat (limited to 'app/src/main/res/values')
| -rw-r--r-- | app/src/main/res/values/strings.xml | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4458b095..dd33ce33 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -155,25 +155,25 @@ <string name="gateway_selection_recommended_location">Recommended location</string> <string name="gateway_selection_recommended">Recommended</string> <string name="gateway_selection_manually">Manually select</string> - <string name="gateway_selection_automatic_location">Automatically use best connection.</string> + <string name="gateway_selection_automatic_location">Automatically use best connection</string> <string name="gateway_selection_automatic">Automatic</string> <string name="reconnecting">Reconnecting…</string> <string name="tor_starting">Starting bridges for censorship circumvention…</string> - <string name="tor_stopping">Stopping bridges.</string> - <string name="tor_started">Using bridges for censorship circumvention.</string> + <string name="tor_stopping">Stopping bridges</string> + <string name="tor_started">Using bridges for censorship circumvention</string> <string name="log_conn_done_pt">Connected to pluggable transport</string> <string name="log_conn_pt">Connecting to pluggable transport</string> <string name="log_conn_done">Connected to a relay</string> - <string name="log_handshake">Handshaking with a relay</string> - <string name="log_handshake_done">Handshake with a relay done</string> + <string name="log_handshake">Negotiating connection with a relay</string> + <string name="log_handshake_done">Connection with relay negotiated</string> <string name="log_onehop_create">Establishing an encrypted directory connection</string> - <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_status">Asking for network status consensus</string> + <string name="log_loading_status">Loading network status consensus</string> + <string name="log_loading_keys">Loading authority certificates</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> + <string name="log_ap_handshake_done">Negotiation finished with a relay to build circuits</string> <string name="log_circuit_create">Establishing a Tor circuit</string> <string name="log_done">Running</string> <string name="channel_name_tor_service">%s Bridges Service</string> @@ -196,4 +196,7 @@ <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> <string name="disabled_while_udp_on">Disabled while UDP is on.</string> + <string name="advanced_settings">Advanced settings</string> + <string name="cancel_connection">Disconnect</string> + </resources> |