Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 03:09:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1269-bridge-setting' into 'master'

Browse Source 
Refactor Tor settings and add a setting for forcing the use bridges

Closes #1269

See merge request briar/briar!895
This commit is contained in:
akwizgran
2018-08-20 17:56:56 +00:00
parent e51c437a06 4b9a9771f8
commit 169c59349e
7 changed files with 120 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
briar-android/src/main/res/values/strings.xml
View File

@@ -349,12 +349,14 @@
<string name="bluetooth_setting">Connect via Bluetooth</string>
<string name="bluetooth_setting_enabled">Whenever contacts are nearby</string>
<string name="bluetooth_setting_disabled">Only when adding contacts</string>
<string name="tor_network_setting">Connect via Tor</string>
<string name="tor_network_setting_never">Never</string>
<string name="tor_network_setting_wifi">Only when using Wi-Fi</string>
<string name="tor_network_setting_always">When using Wi-Fi or mobile data</string>
<string name="tor_location_setting_title">Disable Tor based on location</string>
<string name="tor_location_setting_hint_format">Disable Tor in countries where it is likely to be blocked (%1$s)</string>
<string name="tor_network_setting">Connect via Internet (Tor)</string>
<string name="tor_network_setting_automatic">Automatic based on location</string>
<string name="tor_network_setting_without_bridges">Use Tor without bridges</string>
<string name="tor_network_setting_with_bridges">Use Tor with bridges</string>
<string name="tor_network_setting_never">Don\'t connect</string>
<!-- How and when Tor will connect after Automatic: E.g. Don't connect (in China) or Use Tor with bridges (in Belarus) -->
<string name="tor_network_setting_summary">Automatic: %1$s (in %2$s)</string>
<string name="tor_mobile_data_title">Use mobile data</string>
<!-- Settings Security and Panic -->
<string name="security_settings_title">Security</string>