dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

new preference value updates

This commit is contained in:
n8fr8 2013-04-03 15:48:16 -04:00
parent b6e2507580
commit 2ab32fcccd
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
res/values/strings.xml
View File

@ -129,18 +129,31 @@
<string name="pref_entrance_node">Entrance Nodes</string> <string name="pref_entrance_node">Entrance Nodes</string>
<string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string>
<string name="pref_entrance_node_dialog">Enter Entrance Nodes</string> <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string>
<!--<string name="pref_use_whispercore">Use WhisperCore</string>
<string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>--> <string name="pref_proxy_title">Outbound Network Proxy (Optional)</string>
<string name="pref_proxy_title">Outbound Network Proxy</string>
<string name="pref_proxy_type_title">Outbound Proxy Type</string> <string name="pref_proxy_type_title">Outbound Proxy Type</string>
<string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string>
<string name="pref_proxy_type_dialog">Enter Proxy Type</string> <string name="pref_proxy_type_dialog">Enter Proxy Type</string>
<string name="pref_proxy_host_title">Outbound Proxy Host</string> <string name="pref_proxy_host_title">Outbound Proxy Host</string>
<string name="pref_proxy_host_summary">Proxy server hostname</string> <string name="pref_proxy_host_summary">Proxy Server hostname</string>
<string name="pref_proxy_host_dialog">Enter Proxy Host</string> <string name="pref_proxy_host_dialog">Enter Proxy Host</string>
<string name="pref_proxy_port_title">Outbound Proxy Port</string> <string name="pref_proxy_port_title">Outbound Proxy Port</string>
<string name="pref_proxy_port_summary">Proxy server port</string> <string name="pref_proxy_port_summary">Proxy Server port</string>
<string name="pref_proxy_port_dialog">Enter Proxy port</string> <string name="pref_proxy_port_dialog">Enter Proxy port</string>
<string name="pref_proxy_username_title">Outbound Proxy Username</string>
<string name="pref_proxy_username_summary">Proxy Username (Optional)</string>
<string name="pref_proxy_username_dialog">Enter Proxy Username</string>
<string name="pref_proxy_password_title">Outbound Proxy Password</string>
<string name="pref_proxy_password_summary">Proxy Password (Optional)</string>
<string name="pref_proxy_password_dialog">Enter Proxy Password</string>
<string name="status">Status</string> <string name="status">Status</string>
<string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying&#8230;</string> <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying&#8230;</string>
<string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying&#8230;</string> <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying&#8230;</string>

11
res/xml/preferences.xml
View File

@ -187,6 +187,17 @@ android:title="@string/pref_proxy_port_title"
android:summary="@string/pref_proxy_port_summary" android:summary="@string/pref_proxy_port_summary"
android:dialogTitle="@string/pref_proxy_port_dialog" android:dialogTitle="@string/pref_proxy_port_dialog"
/> />
<EditTextPreference android:key="pref_proxy_username"
android:title="@string/pref_proxy_username_title"
android:summary="@string/pref_proxy_username_summary"
android:dialogTitle="@string/pref_proxy_username_dialog"
/>
<EditTextPreference android:key="pref_proxy_password"
android:title="@string/pref_proxy_password_title"
android:summary="@string/pref_proxy_password_summary"
android:dialogTitle="@string/pref_proxy_password_dialog"
/>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="Debug"> <PreferenceCategory android:title="Debug">