narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

Merge branch 'master' of github.com:siacs/Conversations

Browse source
This commit is contained in:
Daniel Gultsch 2016-01-12 23:41:35 +01:00
parent d122d224bb 38c936b8ef
commit da298cfe59
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/res/values/strings.xml
View file

@ -521,7 +521,7 @@
<string name="download_failed_could_not_connect">Download failed: Could not connect to host</string> <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">Use white background</string>
<string name="pref_use_white_background_summary">Show received messages as black text on a 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="server_info_broken">Broken</string>
<string name="pref_presence_settings">Presence settings</string> <string name="pref_presence_settings">Presence settings</string>
<string name="pref_away_when_screen_off">Away when screen is off</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="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_connection_options">Connection options</string>
<string name="pref_use_tor">Connect via Tor</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_hostname">Hostname</string>
<string name="account_settings_port">Port</string> <string name="account_settings_port">Port</string>
<string name="hostname_or_onion">Server- or .onion-Address</string> <string name="hostname_or_onion">Server- or .onion-Address</string>