From 127ed5d02fe27d465149735c6dcd13775ee4d392 Mon Sep 17 00:00:00 2001 From: Nathan Freitas Date: Sat, 8 May 2010 04:18:24 +0000 Subject: [PATCH] updated resource strings in order to enable use of translation portal / pootle svn:r22297 --- res/layout/layout_help.xml | 2 +- res/values/strings.xml | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/res/layout/layout_help.xml b/res/layout/layout_help.xml index 5084903d..4e464b63 100644 --- a/res/layout/layout_help.xml +++ b/res/layout/layout_help.xml @@ -11,7 +11,7 @@ android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent"> - complete. waiting. -WARNING: Your traffic is not anonymous yet! Please configure your applications to use HTTP proxy 127.0.0.1:8118 or SOCKS5 proxy 127.0.0.1:9050 +WARNING: Your traffic is not anonymous yet! Please configure your applications to use HTTP proxy 127.0.0.1:8118 or SOCKS4A or SOCKS5 proxy 127.0.0.1:9050 Home Browse Settings @@ -35,18 +35,18 @@ Close About -Orbot requires different configuration depending on the Android operating system version it is used on. -Please visit https://www.torproject.org/docs/android.html for the latest information. -\n\n -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 HTTP traffic only (HTTP/S will not work). For Instant Messaging, try "Beem" in the market, and set the SOCKS5 proxy to 127.0.0.1 / port 9050. -\n\n -For Android 2.x devices, you MUST ROOT your device in order for Orbot to work transparently, as there is no browser that will work for non-root devices. 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. -\n\n -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 access the web. -traffic. -\n\n - +Orbot requires different configuration depending on the Android operating system version it is used on. +Please visit https://www.torproject.org/docs/android.html for the latest information. + +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 HTTP traffic only (HTTP/S will not work). + +For Instant Messaging, try "Beem" in the market, and set the SOCKS5 proxy to 127.0.0.1 / port 9050. + +For Android 2.x devices, you MUST ROOT your device in order for Orbot to work transparently, as there is no browser that will work for non-root devices. 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. + +If you root your device, whether it is 1.x or 2.x based, Orbot can transparently proxy any applicatons you select +and all DNS requests. This includes the built-in Browser, Gmail, YouTube and Maps, as well as any third-party app. +