From d457efb5260966a184bfeded07b1dd304f18a847 Mon Sep 17 00:00:00 2001
From: Jacob Appelbaum <jacob@appelbaum.net>
Date: Sat, 6 Mar 2010 00:01:59 +0000
Subject: [PATCH] Update strings to reflect proper urls, better phrasing

svn:r21817
---
 Orbot/res/layout/layout_main.xml                     |  2 +-
 Orbot/res/values/strings.xml                         | 12 +++++++-----
 .../org/torproject/android/service/TorService.java   |  6 +++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Orbot/res/layout/layout_main.xml b/Orbot/res/layout/layout_main.xml
index d56ea726..82ba8fa3 100644
--- a/Orbot/res/layout/layout_main.xml
+++ b/Orbot/res/layout/layout_main.xml
@@ -24,7 +24,7 @@
 		<TextView android:id="@+id/radioModeText"
  		    android:layout_width="wrap_content"
 		    android:layout_height="wrap_content"           
-            android:text="powered by the tor project  "
+            android:text="powered by The Tor Project  "
 			android:layout_marginTop="8px"
 			android:layout_marginRight="0px"
 			android:gravity="right"
diff --git a/Orbot/res/values/strings.xml b/Orbot/res/values/strings.xml
index 995badc7..9675a10d 100644
--- a/Orbot/res/values/strings.xml
+++ b/Orbot/res/values/strings.xml
@@ -4,16 +4,18 @@
     <string name="app_version">0.0.3b</string>
     <string name="internal_web_url">http://orbot/</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="secure_default_web_url">https://check.torproject.org</string>
+    <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+    <string name="control_permission_label">start and stop Tor</string>
     <string name="tor_proxy_service_process">torproxyservice</string>
     
 
-<string name="status_starting_up">Starting up...</string>
-<string name="status_activated">"Orbot is Activated!\nYou are now connected to Tor</string>
+<string name="status_starting_up">Orbot is starting...</string>
+<string name="status_activated">Connected to the Tor network</string>
 <string name="status_disabled">"Orbot is Deactivated</string>
 <string name="status_shutting_down">Orbot is shutting down</string>
 
-<string name="tor_process_connecting">Starting Tor engine...</string>
+<string name="tor_process_connecting">Starting Tor...</string>
 <string name="tor_process_connecting_step2">authenticating...</string>
 <string name="tor_process_connecting_step3">complete.</string>
 <string name="tor_process_connecting_step4">waiting.</string>
@@ -31,7 +33,7 @@
 <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 http://torproject.org/android for the latest information.
+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 Instant Messsaging, try "Beem" in the market, and set the SOCKS5 proxy to 127.0.0.1 / port 9050.
diff --git a/Orbot/src/org/torproject/android/service/TorService.java b/Orbot/src/org/torproject/android/service/TorService.java
index 74f3ea3e..cab21339 100644
--- a/Orbot/src/org/torproject/android/service/TorService.java
+++ b/Orbot/src/org/torproject/android/service/TorService.java
@@ -235,8 +235,8 @@ public class TorService extends Service implements TorServiceConstants, Runnable
 				
 		currentStatus = STATUS_READY;
     	
-		showToolbarNotification ("Orbot","Anonymous browsing is disabled",R.drawable.tornotificationoff);
-    	sendCallbackMessage("Anonymous browsing is disabled");
+		showToolbarNotification ("Orbot","Tor is disabled",R.drawable.tornotificationoff);
+    	sendCallbackMessage("Tor is disabled");
 
     }
     
@@ -331,7 +331,7 @@ public class TorService extends Service implements TorServiceConstants, Runnable
     		{
     			logNotice("Tor, Privoxy, IPtables binaries installed!");
     	
-    			this.showToolbarNotification("Orbot Installed!", "The Tor binary was successfully extracted and installed", R.drawable.tornotification);
+    			this.showToolbarNotification("Orbot Installed!", "Tor was successfully extracted and installed", R.drawable.tornotification);
     		
     		}
     		else