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 @@ 0.0.3b http://orbot/ http://check.torproject.org - start and stop the anonymous data connection + https://check.torproject.org + https://check.torproject.org/?TorButton=true + start and stop Tor torproxyservice -Starting up... -"Orbot is Activated!\nYou are now connected to Tor +Orbot is starting... +Connected to the Tor network "Orbot is Deactivated Orbot is shutting down -Starting Tor engine... +Starting Tor... authenticating... complete. waiting. @@ -31,7 +33,7 @@ About 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