[or-cvs] r22297: {projects} updated resource strings in order to enable use of translati (in projects/android/trunk/Orbot/res: layout values)

[Nathan Freitas]

Author: n8fr8
Date: 2010-05-08 04:18:24 +0000 (Sat, 08 May 2010)
New Revision: 22297

Modified:
   projects/android/trunk/Orbot/res/layout/layout_help.xml
   projects/android/trunk/Orbot/res/values/strings.xml
Log:
updated resource strings in order to enable use of translation portal / pootle

Modified: projects/android/trunk/Orbot/res/layout/layout_help.xml
===================================================================
--- projects/android/trunk/Orbot/res/layout/layout_help.xml	2010-05-07 16:37:46 UTC (rev 22296)
+++ projects/android/trunk/Orbot/res/layout/layout_help.xml	2010-05-08 04:18:24 UTC (rev 22297)
@@ -11,7 +11,7 @@
 		    android:orientation="vertical"
 		    android:layout_width="fill_parent"
 		    android:layout_height="fill_parent">
-			<TextView android:text="@string/help_text"
+			<TextView android:text=""
 				android:layout_width="fill_parent" 
 				android:layout_height="wrap_content"
 				android:paddingTop="15px"

Modified: projects/android/trunk/Orbot/res/values/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values/strings.xml	2010-05-07 16:37:46 UTC (rev 22296)
+++ projects/android/trunk/Orbot/res/values/strings.xml	2010-05-08 04:18:24 UTC (rev 22297)
@@ -19,7 +19,7 @@
 <string name="tor_process_connecting_step3">complete.</string>
 <string name="tor_process_connecting_step4">waiting.</string>
 
-<string name="not_anonymous_yet">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</string>
+<string name="not_anonymous_yet">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</string>
 <string name="menu_home">Home</string>
 <string name="menu_browse">Browse</string>
 <string name="menu_settings">Settings</string>
@@ -35,18 +35,18 @@
 <string name="button_close">Close</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.
-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
-</string>
+<string name="help_text_1">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.</string>
+
+<string name="help_text_2">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).</string>
+
+<string name="help_text_3">For Instant Messaging, try "Beem" in the market, and set the SOCKS5 proxy to 127.0.0.1 / port 9050.</string>
+
+<string name="help_text_4">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.</string>
+
+<string name="help_text_5">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.</string>
+
 </resources>