diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-01-12 23:41:35 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-01-12 23:41:35 +0100 |
| commit | da298cfe5937d9e4ea735f0ed50a5a5d61b9f235 (patch) | |
| tree | 041772330bdd053c2b45dc00a71cae25dc525c26 /src/main/res | |
| parent | d122d224bb5a17b6cff3b4e0cb3b78ca53785f7f (diff) | |
| parent | 38c936b8ef084b6040d6fd2672f9709dede11680 (diff) | |
Merge branch 'master' of github.com:siacs/Conversations
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/values/strings.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index cdb5ae22..4f17c411 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -521,7 +521,7 @@ <string name="download_failed_could_not_connect">Download failed: Could not connect to host</string> <string name="pref_use_white_background">Use white background</string> <string name="pref_use_white_background_summary">Show received messages as black text on a white background</string> - <string name="account_status_tor_unavailable">TOR network unavailable</string> + <string name="account_status_tor_unavailable">Tor network unavailable</string> <string name="server_info_broken">Broken</string> <string name="pref_presence_settings">Presence settings</string> <string name="pref_away_when_screen_off">Away when screen is off</string> @@ -542,7 +542,7 @@ <string name="device_does_not_support_certificates">Your device does not support the selection of client certificates!</string> <string name="pref_connection_options">Connection options</string> <string name="pref_use_tor">Connect via Tor</string> - <string name="pref_use_tor_summary">Tunnel all connections through the TOR network. Requires Orbot</string> + <string name="pref_use_tor_summary">Tunnel all connections through the Tor network. Requires Orbot</string> <string name="account_settings_hostname">Hostname</string> <string name="account_settings_port">Port</string> <string name="hostname_or_onion">Server- or .onion-Address</string> |