updated resources file to add new preferences, modified help text
svn:r21748
This commit is contained in:
parent
58946837dd
commit
6db137d9b5
|
@ -32,7 +32,8 @@
|
||||||
android:paddingLeft="15px"
|
android:paddingLeft="15px"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
android:textColor="#ffffff" />
|
android:textColor="#ffffff" />
|
||||||
<TextView android:text="http://torproject.org/orbot"
|
<TextView android:text="https://torproject.org/android
|
||||||
|
http://guardianproject.info/apps/orbot/"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:autoLink="web"
|
android:autoLink="web"
|
||||||
|
@ -52,7 +53,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:paddingLeft="15px"
|
android:paddingLeft="15px"
|
||||||
android:textColor="#ffffff" />
|
android:textColor="#ffffff" />
|
||||||
<TextView android:text="http://torproject.org"
|
<TextView android:text="https://torproject.org"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:autoLink="web"
|
android:autoLink="web"
|
||||||
|
@ -67,7 +68,7 @@
|
||||||
android:paddingLeft="15px"
|
android:paddingLeft="15px"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
android:textColor="#ffffff" />
|
android:textColor="#ffffff" />
|
||||||
<TextView android:text="Tor vX.x: http://www.torproject.org"
|
<TextView android:text="Tor v2.0.x: https://www.torproject.org"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:autoLink="web"
|
android:autoLink="web"
|
||||||
|
@ -75,7 +76,7 @@
|
||||||
android:paddingLeft="15px"
|
android:paddingLeft="15px"
|
||||||
android:textSize="12sp"
|
android:textSize="12sp"
|
||||||
android:textColor="#ffffff" />
|
android:textColor="#ffffff" />
|
||||||
<TextView android:text="LibEvent vX.x: http://www.monkey.org/~provos/libevent/"
|
<TextView android:text="LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:autoLink="web"
|
android:autoLink="web"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
<string name="app_name">Orbot</string>
|
<string name="app_name">Orbot</string>
|
||||||
<string name="app_version">0.0.3a</string>
|
<string name="app_version">0.0.3b</string>
|
||||||
<string name="internal_web_url">http://orbot/</string>
|
<string name="internal_web_url">http://orbot/</string>
|
||||||
<string name="default_web_url">http://check.torproject.org</string>
|
<string name="default_web_url">http://check.torproject.org</string>
|
||||||
<string name="control_permission_label">start and stop the anonymous data connection</string>
|
<string name="control_permission_label">start and stop the anonymous data connection</string>
|
||||||
|
@ -29,17 +29,17 @@
|
||||||
<string name="button_about">About</string>
|
<string name="button_about">About</string>
|
||||||
|
|
||||||
<string name="help_text">Orbot requires different configuration depending on the Android operating system version it is used on.
|
<string name="help_text">Orbot requires different configuration depending on the Android operating system version it is used on.
|
||||||
|
Please visit http://torproject.org/android for the latest information.
|
||||||
\n\n
|
\n\n
|
||||||
For non-rooted Android 1.x devices (G1, MyTouch3G, Hero): Please use the "ProxySurf" browser available in the Android Market, and set
|
For non-rooted Android 1.x devices (G1, MyTouch3G, Hero): Please use the "ProxySurf" browser available in the Android Market, and set
|
||||||
the HTTP Proxy to 127.0.0.1 and port 8118. For Instant Messsaging, try "Beem" in the market, and set the HTTP or SOCKS5 proxy (to port 9050).
|
the HTTP Proxy to 127.0.0.1 and port 8118. For Instant Messsaging, try "Beem" in the market, and set the SOCKS5 proxy to 127.0.0.1 / port 9050.
|
||||||
\n\n
|
\n\n
|
||||||
For Android 2.x devices, you MUST ROOT your device in order for Orbot to work transparently for all web and DNS traffic. Otherwise, the "Beem" app will allow
|
For Android 2.x devices, you MUST ROOT your device in order for Orbot to work transparently for all web and DNS traffic. Otherwise, the "Beem" app will allow
|
||||||
you to set the SOCKS5 proxy to 127.0.0.1 and port 9050. You should also enable SSL to protect your username and password.
|
you to set the SOCKS5 proxy to 127.0.0.1 and port 9050. You should also enable SSL to protect your username and password.
|
||||||
\n\n
|
\n\n
|
||||||
If you root your device, whether it is 1.x or 2.x based, Orbot will automatically, transparently proxy all web traffic on port 80
|
If you root your device, whether it is 1.x or 2.x based, Orbot will automatically, transparently proxy all web traffic (http and https)
|
||||||
and all DNS requests. This includes the built-in Browser, Gmail, YouTube, Maps and any other application that uses standard port 80
|
and all DNS requests. This includes the built-in Browser, Gmail, YouTube, Maps and any other application that access the web.
|
||||||
traffic.
|
traffic.
|
||||||
\n\n
|
\n\n
|
||||||
At this time, Orbot cannot proxy standard HTTPS traffic unless the application supports proxy via HTTP or SOCKS.
|
|
||||||
</string>
|
</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -15,6 +15,15 @@ android:summary="IP address and port of bridges"
|
||||||
android:dialogTitle="Enter Bridge Addresses"
|
android:dialogTitle="Enter Bridge Addresses"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
|
||||||
|
<CheckBoxPreference android:defaultValue="false"
|
||||||
|
android:key="pref_transparent"
|
||||||
|
android:title="Transparent Proxying"
|
||||||
|
android:summary="ROOTED DEVICES ONLY: Activate Tor for all web traffic and DNS"
|
||||||
|
android:enabled="true"/>
|
||||||
|
|
||||||
|
<!--
|
||||||
|
|
||||||
<EditTextPreference android:key="pref_relay"
|
<EditTextPreference android:key="pref_relay"
|
||||||
android:title="Relaying"
|
android:title="Relaying"
|
||||||
android:summary="Enable your device to be a relay"
|
android:summary="Enable your device to be a relay"
|
||||||
|
@ -22,10 +31,11 @@ android:dialogTitle="Enter Bridge Addresses"
|
||||||
android:enabled="false"
|
android:enabled="false"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
|
||||||
<CheckBoxPreference android:defaultValue="false"
|
<CheckBoxPreference android:defaultValue="false"
|
||||||
android:title="Fascist Firewall" android:key="pref_fascist_firewall"
|
android:title="Fascist Firewall" android:key="pref_fascist_firewall"
|
||||||
android:summary="Run as a client behind a firewall with restrictive policies"
|
android:summary="Run as a client behind a firewall with restrictive policies"
|
||||||
android:enabled="false"></CheckBoxPreference>
|
android:enabled="false"></CheckBoxPreference>
|
||||||
|
-->
|
||||||
|
|
||||||
</PreferenceScreen>
|
</PreferenceScreen>
|
Loading…
Reference in New Issue