dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update strings to reflect proper urls, better phrasing 

svn:r21817
This commit is contained in:
Jacob Appelbaum 2010-03-06 00:01:59 +00:00
parent 09fd0ef66d
commit a15509f192
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/layout_main.xml
View File

@ -24,7 +24,7 @@
<TextView android:id="@+id/radioModeText" <TextView android:id="@+id/radioModeText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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_marginTop="8px"
android:layout_marginRight="0px" android:layout_marginRight="0px"
android:gravity="right" android:gravity="right"

12
res/values/strings.xml
View File

@ -4,16 +4,18 @@
<string name="app_version">0.0.3b</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="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="tor_proxy_service_process">torproxyservice</string>
<string name="status_starting_up">Starting up...</string> <string name="status_starting_up">Orbot is starting...</string>
<string name="status_activated">"Orbot is Activated!\nYou are now connected to Tor</string> <string name="status_activated">Connected to the Tor network</string>
<string name="status_disabled">"Orbot is Deactivated</string> <string name="status_disabled">"Orbot is Deactivated</string>
<string name="status_shutting_down">Orbot is shutting down</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_step2">authenticating...</string>
<string name="tor_process_connecting_step3">complete.</string> <string name="tor_process_connecting_step3">complete.</string>
<string name="tor_process_connecting_step4">waiting.</string> <string name="tor_process_connecting_step4">waiting.</string>
@ -31,7 +33,7 @@
<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. Please visit https://www.torproject.org/docs/android.html 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 SOCKS5 proxy to 127.0.0.1 / 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.

6
src/org/torproject/android/service/TorService.java
View File

@ -235,8 +235,8 @@ public class TorService extends Service implements TorServiceConstants, Runnable
currentStatus = STATUS_READY; currentStatus = STATUS_READY;
showToolbarNotification ("Orbot","Anonymous browsing is disabled",R.drawable.tornotificationoff); showToolbarNotification ("Orbot","Tor is disabled",R.drawable.tornotificationoff);
sendCallbackMessage("Anonymous browsing is disabled"); sendCallbackMessage("Tor is disabled");
} }
@ -331,7 +331,7 @@ public class TorService extends Service implements TorServiceConstants, Runnable
{ {
logNotice("Tor, Privoxy, IPtables binaries installed!"); 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 else