[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] r23481: {projects} updated translations for orbot (in projects/android/trunk/Orbot/res: values-ar values-es values-fa values-nl values-pl values-ru values-zh)



Author: runa
Date: 2010-10-09 11:57:03 +0000 (Sat, 09 Oct 2010)
New Revision: 23481

Modified:
   projects/android/trunk/Orbot/res/values-ar/strings.xml
   projects/android/trunk/Orbot/res/values-es/strings.xml
   projects/android/trunk/Orbot/res/values-fa/strings.xml
   projects/android/trunk/Orbot/res/values-nl/strings.xml
   projects/android/trunk/Orbot/res/values-pl/strings.xml
   projects/android/trunk/Orbot/res/values-ru/strings.xml
   projects/android/trunk/Orbot/res/values-zh/strings.xml
Log:
updated translations for orbot

Modified: projects/android/trunk/Orbot/res/values-ar/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-ar/strings.xml	2010-10-09 11:52:25 UTC (rev 23480)
+++ projects/android/trunk/Orbot/res/values-ar/strings.xml	2010-10-09 11:57:03 UTC (rev 23481)
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="pref_hs_group">ØØÙØØ ØÙÙØ</string>
     <string name="app_name">ØÙØØÙØ (Orbot)</string>
         <string name="app_version">1.0.4</string>
     
@@ -109,8 +108,8 @@
     <string name="wizard_final">ØÙØØÙØ ØØÙØ!</string>
     <string name="wizard_final_msg">ÙØØØ ØÙØÙØÙ ÙÙ ØÙÙØØ ÙÙ ØÙÙØ ØÙØØØ ØÙØØÙÙ ÙØØØØÙÙÙ ØÙØ ÙØØØØØ ØØÙØØ: ØÙØØÙÙÙÙ ÙØÙÙØÙÙÙÙØ ÙØÙØØÙÙÙÙ ÙÙ ÙØØÙ ØÙÙÙ ØÙØÙØØÙØ ÙØÙØÙÙØ ÙØÙØØÙØØ ÙØÙÙÙØØÙÙÙ ÙÙ ØÙØÙØÙØ ØÙÙÙØÙØØ ÙØÙÙÙØØÙÙÙ ØÙØØØÙÙÙ ... ÙØÙØÙ ØÙØ ÙØØØØ ÙØÙ ØØØØØÙÙ ÙØÙÙ!</string>
     
-    <string name="otrchat_apk_url">https://guardianproject/getgibber</string>
-    <string name="orweb_apk_url">https://guardianproject/getorweb</string>
+    <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
+    <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
     
 <!-- END Welcome Wizard strings (DJH) -->
  
@@ -120,4 +119,12 @@
  ÙÙ ØØÙØØØÙØ ØÙÙ https://guardianproject.info/apps/orbot ØÙ ØØØÙ ØØØÙØ ØÙÙØØÙÙÙØ ØÙÙ help@xxxxxxxxxxxxxxxxxxxx ÙÙØØÙØ ØÙÙØÙØ.</string>
 
 	<string name="tor_check">ØÙØØÙ ÙØØ ØÙÙ ÙØØ ØÙÙØØÙØ ØÙØÙØØØØÙ ØÙØØØ ØÙ ØÙÙ ØÙØÙÙØÙ https://check.torproject.org ÙÙ ØØÙ ØÙØØÙÙ ÙÙ ØÙÙÙÙ ØÙØØÙØ ØØÙÙ ØØÙØ ÙØØÙÙ ÙØØÙ ØØÙØ.</string>
+
+	
+    <string name="pref_hs_group">ØØÙØØ ØÙÙØ</string>
+    
+    <string name="pref_general_group">General</string>
+    <string name="pref_start_boot_title">Start Orbot on Boot</string>
+    <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
+    
 </resources>

Modified: projects/android/trunk/Orbot/res/values-es/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-es/strings.xml	2010-10-09 11:52:25 UTC (rev 23480)
+++ projects/android/trunk/Orbot/res/values-es/strings.xml	2010-10-09 11:57:03 UTC (rev 23481)
@@ -2,6 +2,7 @@
 <resources>
     <string name="app_name">Orbot</string>
         <string name="app_version">1.0.4</string>
+    
     <string name="internal_web_url">http://orbot/</string>
     <string name="default_web_url">http://check.torproject.org</string>
     <string name="secure_default_web_url">https://check.torproject.org</string>
@@ -9,33 +10,121 @@
     <string name="control_permission_label">iniciar y detener Tor</string>
     <string name="tor_proxy_service_process">torproxyservice</string>
    
-<string name="status_starting_up">Orbot està empezando ...</string>
-<string name="status_activated">Conectado a la red</string>
-<string name="status_disabled">"Orbot està Desactivado</string>
-<string name="status_shutting_down">Orbot està cerrando</string>
+<string name="status_starting_up">Orbot està iniciando...</string>
+<string name="status_activated">Conectado a la Red de Tor</string>
+<string name="status_disabled">"Orbot està desactivado</string>
+<string name="status_shutting_down">Orbot se està cerrando</string>
 
-<string name="tor_process_connecting">Partir Tor...</string>
-<string name="tor_process_connecting_step2">AutenticaciÃn de conexiÃn de control...</string>
-<string name="tor_process_connecting_step3">Completo.</string>
-<string name="tor_process_connecting_step4">Espera.</string>
+<string name="tor_process_connecting">Iniciando Tor...</string>
+<string name="tor_process_connecting_step2">ConfigurciÃn de control...</string>
+<string name="tor_process_connecting_step3">completo.</string>
+<string name="tor_process_connecting_step4">esperando.</string>
 
-<string name="not_anonymous_yet">ADVERTENCIA: el trÃfico no es anÃnima todavÃa! Por favor, configure sus aplicaciones para utilizar HTTP proxy 127.0.0.1:8118 o SOCKS4A o SOCKS5 127.0.0.1:9050</string>
+<string name="not_anonymous_yet">ADVERTENCIA: ÂSu trÃfico no es anÃnimo aÃn! Por favor, configure sus aplicaciones para usar el Proxy HTTP 127.0.0.1:8118, el SOCKS4A o el Proxy SOCKS5 127.0.0.1:9050</string>
 <string name="menu_home">Principal</string>
 <string name="menu_browse">Examinar</string>
-<string name="menu_settings">InformaciÃn</string>
-<string name="menu_log">Entrar</string>
+<string name="menu_settings">ConfiguraciÃn</string>
+<string name="menu_log">Historial</string>
 <string name="menu_info">Ayuda</string>
 <string name="menu_apps">Aplicaciones</string>
 <string name="menu_start">Iniciar</string>
-<string name="menu_stop">Stop</string>
+<string name="menu_stop">Detener</string>
 
 
-
 <string name="button_help">Ayuda</string>
 <string name="button_close">Cerrar</string>
 <string name="button_about">Acerca de</string>
 
+<string name="button_clear_log">Limpiar Historial</string>
 
-<string name="menu_verify">Check</string>
-<string name="menu_exit">Exit</string>
+
+<string name="menu_verify">Comprobar</string>
+<string name="menu_exit">Salir</string>
+<string name="powered_by">potenciado por Tor Project</string>
+<string name="press_to_start">- presione para comenzar -</string>
+
+<string name="pref_trans_proxy_group">Proxy transparente (Requiere ser Administrador)</string>
+<string name="pref_trans_proxy_title">Proxy transparente</string>
+<string name="pref_trans_proxy_summary">Torificado automÃtico de las Aplicaciones</string>
+
+<string name="pref_transparent_all_title">Pasar todo el trÃfico por Tor</string>
+<string name="pref_transparent_all_summary">TrÃfico Proxy para todas las aplicaciones mediante Tor</string>
+
+<string name="status_install_success">ÂBinarios de Tor instalados con Ãxito!</string>
+<string name="status_install_fail">Los archivos binarios de Tor no se han podido instalar. Por favor, verifique el Historial y notifique a: tor-assistants@xxxxxxxxxxxxxx</string>
+
+<string name="title_error">Error de aplicaciÃn</string>
+
+<string name="wizard_title">Bienvenido a Orbot</string>
+
+<string name="wizard_btn_tell_me_more">Acerca de Orbot</string>
+<string name="btn_next">Siguiente</string>
+<string name="btn_back">AtrÃs</string>
+<string name="btn_finish">Finalizar</string>
+
+<string name="btn_okay">OK</string>
+<string name="btn_cancel">Cancelar</string>
+
+
+<!-- Welcome Wizard strings (DJH) -->
+ 
+    <string name="wizard_welcome_msg">Orbot proporciona Tor a Android. Tor es un software libre y una red abierta que le ayuda a defenderse contra una forma de vigilancia que amenaza su libertad y privacidad personal, la confidencialidad en los negocios y en las relaciones, y la seguridad del Estado conocida como anÃlisis de trÃfico.
+
+*ADVERTENCIA:* ÂInstalando Orbot _NO_ anonimizarà mÃgicamente su trÃfico del mÃvil! Este assitente le ayudarà a empezar.</string>
+    <string name="wizard_details">Algunos detalles de Orbot</string>
+    <string name="wizard_details_msg">Orbot es una aplicaciÃn de cÃdigo abierto que contiene Tor, LibEvent y Privoxy. Provee un Proxy HTTP local (8118) y un Proxy SOCKS (9050) en la red Tor. Orbot tambiÃn tiene la habilidad, en un dispositivo enrutador, de enviar todo el trÃfico de Internet a travÃs de Tor.</string>
+    <string name="wizard_permissions_root">Permiso Concedido</string>
+    <string name="wizard_permissions_stock">Permisos de Orbot</string>
+    <string name="wizard_premissions_msg_root">ÂExcelente! Hemos detectado que usted tiene permisos administravitos activados para Orbot. Utilizaremos estos poderes sabiamente.</string>
+    <string name="wizard_permissions_msg_stock">Mientras no sea requerido, Orbot puede convertirse en una herramienta aÃn mÃs poderosa si su dispositivo tiene acceso de administrador. Utilice el botÃn a continuaciÃn para conceder superpoderes a Orbot</string>
+   
+    <string name="wizard_permissions_no_root">Si no tiene acceso de admnistrador o no tiene idea de quà estamos hablando, sÃlo asegÃrese de utilizar aplicaciones hechas para trabajar con Orbot.</string>
+    <string name="wizard_permissions_consent">Comprendo y quiero continuar sin poderes administrativos</string>
+   
+    <string name="wizard_permission_enable_root">Conceder poderes administrativos a Orbot</string>
+    <string name="wizard_configure">Configurar TorificaciÃn</string>
+    <string name="wizard_configure_msg">Orbot le da la opciÃn de dirigir todo el trÃfico de las aplicaciones a travÃs de Tor O de seleccionar sus aplicaciones individualmente.</string> 
+    <string name="wizard_configure_all">Configurar Proxy para todas las aplicaciones a travÃs de Tor</string>
+    <string name="wizard_configure_select_apps">Seleccionar aplicaciones individualmente para Tor</string>
+    
+    
+    <string name="wizard_tips_tricks">Aplicaciones activas en Orbot</string>
+    <string name="wizard_tips_msg">Le invitamos a descargar y utilizar aplicaciones que saben cÃmo conectarse directamente a Orbot. Haga clic en los botones a continuaciÃn para Instalar.</string>
+    <string name="wizard_tips_otrchat">OTRCHAT - Cliente de mensajerÃa instantÃnea seguro para Android</string>
+    <string name="wizard_tips_orweb">ORWEB (SÃlo Android 1.x) - Navegador diseÃado para la privacidad y para Orbot</string>
+    <string name="wizard_tips_proxy">Configuraciones Proxy - Aprenda cÃmo configurar aplicaciones para que trabajen con Orbot</string>
+    
+    <string name="wizard_proxy_help_info">Configuraciones Proxy</string>
+    <string name="wizard_proxy_help_msg">Si la aplicaciÃn Android que està utilizando puede soportar el uso de un Proxy HTTP o SOCKS, entonces puede configurarla para conectar a Orbot y utilizar Tor.
+
+
+La configuraciÃn del dominio es 127.0.0.1 o "localhost". Para HTTP, la configuraciÃn del puerto es 8118. Para SOCKS, el proxy es 9050. Puede utilizar SOCKS4A o SOCKS5 si es posible.
+
+
+
+Puede aprender mÃs acerca de los proxys en Android a travÃs de las Preguntas Frecuentes ubicadas en: http://tinyurl.com/proxyandroid
+    </string>
+    
+    <string name="wizard_final">ÂOrbot està listo!</string>
+    <string name="wizard_final_msg">Cientos de miles de personas alrededor del mundo usan Tor por una amplia variedad de razones: periodistas y bloggers, trabajadores de los derechos humanos, oficiales de policÃa, soldados, corporaciones, ciudadanos de regÃmenes represivos y ciudadanos ordinarios... Ây ahora tambiÃn lo estÃs!</string>
+    
+    <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
+    <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
+    
+<!-- END Welcome Wizard strings (DJH) -->
+ 
+
+	<string name="connect_first_time">Se ha conectado con Ãxito a la red Tor, pero eso NO significa que su dispositivo es seguro. Puede utilizar la opciÃn \'Comprobar\' desde el menà para probar su navegador.
+
+VisÃtenos en https://guardianproject.info/apps/orbot o envÃenos un correo electrÃnico a help@xxxxxxxxxxxxxxxxxxxx para aprender mÃs.</string>
+
+	<string name="tor_check">Esto abrirà https://check.torproject.org en su navegador predeterminado con el fin de comprobar si Orbot està configurado y si està conectado a Tor.</string>
+
+	
+    <string name="pref_hs_group">Servicios Ocultados</string>
+    
+    <string name="pref_general_group">General</string>
+    <string name="pref_start_boot_title">Start Orbot on Boot</string>
+    <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
+    
 </resources>

Modified: projects/android/trunk/Orbot/res/values-fa/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-fa/strings.xml	2010-10-09 11:52:25 UTC (rev 23480)
+++ projects/android/trunk/Orbot/res/values-fa/strings.xml	2010-10-09 11:57:03 UTC (rev 23481)
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="pref_hs_group">ØØÙÙØ ÙØÙ ÙØÙÙ</string>
     <string name="app_name">ØÙØØØØ</string>
         <string name="app_version">1.0.4</string>
     
@@ -99,8 +98,8 @@
     <string name="wizard_final">ØÙØØØØ ØÙØØÙ ØØØÙØØÙ ÙÛØØØØ!</string>
     <string name="wizard_final_msg">ØØÙØ ÙØØØ ÙÙØ ØØ ØØØØØ ØÙØÙ ØÙ ØÙØÛÙ ÚÙÙØÚÙÙ ØØ Tor ØØØÙØØÙ ÙÛ ÚÙÙØ: ØÙØÙØÙÙ ÙÙÛØÙØ Ù ØÙØÚØÙØØ ÚØØÚÙØÙ ØÙÙÙ ØØØØ ÙØÙÙØØÙ ØÙØØØÙÛØ ØØØØØØÙØ ØØÚØÙØØ ØÙØÙÙØØÙ ØÙÙØÙØÛ ØØÚÙØÚØØ Ù ØÙØÙÙØØÙ ØØØÛØ Ù ØØÙØ ØÙØ ÙÛØ ØÙØØÙ ØØØÙØØÙ ØØ ØÙ ÙØØÛØ!</string>
     
-    <string name="otrchat_apk_url">https://guardianproject/getgibber</string>
-    <string name="orweb_apk_url">https://guardianproject/getorweb</string>
+    <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
+    <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
     
 <!-- END Welcome Wizard strings (DJH) -->
  
@@ -108,4 +107,12 @@
 	<string name="connect_first_time">ØÚÙÙÙ ØØ ÙÙÙÙÛØ ØÙ ØØÚÙ Tor ÙØÙ ØØÙ ØÛØ ØÙØ ØÙ ØÙ ÙØÙØ ÙÛØØ ÚÙ ØÛØØÙ ØÙØ ØÛÙÙ ØØØ. ÙÛ ØÙØÙÛØ ØØ ÙÙÛÙ ÚØÛÙÙ /"Check/" ØØ ØØØÛ ØØÙØÛØ ÙØÙØÚØ ØÙØØØØ ÚÙÛØ. ØÙ ÙØ ØØ ØÙØÙ https://guardianproject.info/apps/orbot ÙØØØØÙ ÚÙÛØ Ù ØÙ ØØØØ help@xxxxxxxxxxxxxxxxxxxx  ØÛÙÛÙÛ ØÙØØØÛØ ØØ ØØÙØØØØ ØÛØØØÛ ØØÛØÙØ ÚÙÛØ. </string>
 
 	<string name="tor_check">ØØ ØÛÙ ÙØÙ ÙÛØÙØØ ÙØÙØÚØ ÙØ ØÙØ ØÙ ØÙØÙ   https://check.torproject.org ØØØ ÙÛ ØÙØ ØØ ØÙØ ÙØØÙØÙ ÚÙÛØ ØÛØ ØÙØØØØ ØÙØÛÙ ØØÙ ØØØ Ù ØÛØ ØÙØ ØÙ Tor ÙØÙ ØØÙ ØÛØ ÛØ ÙÙ.</string>
+
+	
+    <string name="pref_hs_group">ØØÙÙØ ÙØÙ ÙØÙÙ</string>
+    
+    <string name="pref_general_group">General</string>
+    <string name="pref_start_boot_title">Start Orbot on Boot</string>
+    <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
+    
 </resources>

Modified: projects/android/trunk/Orbot/res/values-nl/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-nl/strings.xml	2010-10-09 11:52:25 UTC (rev 23480)
+++ projects/android/trunk/Orbot/res/values-nl/strings.xml	2010-10-09 11:57:03 UTC (rev 23481)
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="pref_hs_group">Verborgen diensten</string>
     <string name="app_name">Orbot</string>
         <string name="app_version">1.0.4</string>
     
@@ -36,7 +35,7 @@
 <string name="button_close">Afsluiten</string>
 <string name="button_about">Over</string>
 
-<string name="button_clear_log">Clear Log</string>
+<string name="button_clear_log">Wis logboek</string>
 
 
 <string name="menu_verify">Controleer</string>
@@ -103,13 +102,13 @@
 
 
 U kunt meer leren over het proxyen op Android door naar de FAQ op http://tinyurl.com/proxyandroid te gaan
-</string>
+    </string>
     
     <string name="wizard_final">Orbot is klaar!</string>
     <string name="wizard_final_msg">Honderdduizenden verschillende mensen over de wereld gebruiken Tor, zoals: journalisten, bloggers, mensen rechten medewerkers, soldaten, bedrijven, burgers met onderdrukte religies, en natuurlijk normale mensen... En nu bent u ook klaar om te gaan!</string>
     
-    <string name="otrchat_apk_url">https://guardianproject/getgibber</string>
-    <string name="orweb_apk_url">https://guardianproject/getorweb</string>
+    <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
+    <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
     
 <!-- END Welcome Wizard strings (DJH) -->
  
@@ -119,4 +118,12 @@
 Bezoek onze website op https://guardianproject.info/apps/orbot of stuuf een email naar help@xxxxxxxxxxxxxxxxxxxx voor vragen.</string>
 
 	<string name="tor_check">Dit opent uw standaard browser naar https://check.torproject.org om te controleren of Orbot succesvol is geconfigureerd om te verbinden met het Tor netwerk.</string>
+
+	
+    <string name="pref_hs_group">Verborgen diensten</string>
+    
+    <string name="pref_general_group">General</string>
+    <string name="pref_start_boot_title">Start Orbot on Boot</string>
+    <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
+    
 </resources>

Modified: projects/android/trunk/Orbot/res/values-pl/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-pl/strings.xml	2010-10-09 11:52:25 UTC (rev 23480)
+++ projects/android/trunk/Orbot/res/values-pl/strings.xml	2010-10-09 11:57:03 UTC (rev 23481)
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="pref_hs_group">UsÅugi ukryte</string>
     <string name="app_name">Orbot</string>
         <string name="app_version">1.0.4</string>
     
@@ -103,8 +102,8 @@
     <string name="wizard_final">Orbot jest gotowy!</string>
     <string name="wizard_final_msg">Setki tysiÄcy ludzi na caÅym Åwiecie uÅywajÄ Tora z rÃÅnych powodÃw: dziennikarze i blogerzy, dziaÅacze na rzecz praw czÅowieka, strÃÅe prawa, ÅoÅnierze, korporacje, obywatele represyjnych reÅimÃw i zwykli obywatele... teraz Ty teÅ moÅesz!</string>
     
-    <string name="otrchat_apk_url">https://guardianproject/getgibber</string>
-    <string name="orweb_apk_url">https://guardianproject/getorweb</string>
+    <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
+    <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
     
 <!-- END Welcome Wizard strings (DJH) -->
  
@@ -112,4 +111,12 @@
 	<string name="connect_first_time">PomyÅlnie poÅaczono z sieciÄ Tora - ale to NIE oznacza, Åe Twoje urzÄdzenie jest bezpieczne. MoÅesz uÅyÄ opcji \'SprawdÅ\' w menu, aby przetestowaÄ swojÄ przeglÄdarkÄ. \n\nOdwiedÅ nas na https://guardianproject.info/apps/orbot lub wyÅlij email na help@xxxxxxxxxxxxxxxxxxxx, by dowiedzieÄ siÄ wiÄcej.</string>
 
 	<string name="tor_check">To otworzy TwojÄ domyÅlnÄ przeglÄdarkÄ na adresie https://check.torproject.org w celu sprawdzenia, czy Orbot jest skonfigurowany i jest poÄÅczenie z Torem.</string>
+
+	
+    <string name="pref_hs_group">UsÅugi ukryte</string>
+    
+    <string name="pref_general_group">General</string>
+    <string name="pref_start_boot_title">Start Orbot on Boot</string>
+    <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
+    
 </resources>

Modified: projects/android/trunk/Orbot/res/values-ru/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-ru/strings.xml	2010-10-09 11:52:25 UTC (rev 23480)
+++ projects/android/trunk/Orbot/res/values-ru/strings.xml	2010-10-09 11:57:03 UTC (rev 23481)
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="pref_hs_group">ÐÐÑÑÑÑÐ ÑÐÑÐÐÑÑ</string>
     <string name="app_name">Orbot</string>
         <string name="app_version">1.0.4</string>
     
@@ -103,8 +102,8 @@
     <string name="wizard_final">ÐÑÐÐÑÐÐÐÐ Orbot ÐÐÑÐÐÐ Ð ÐÑÐÐÐÑÐÐÐÐÐÐÑ!</string>
     <string name="wizard_final_msg">ÐÐÑÐÐ ÑÑÑÑÑ ÐÑÐÐÐ ÐÐ ÐÑÐÐÑ ÐÐÑÑ ÐÑÐÐÐÑÐÑÑÑ Tor ÐÐ ÑÐÐÐÐÑÐÑÐ ÐÑÐÑÐÐÐÐ: ÐÑÑÐÐÐÐÑÑÑ Ð ÐÐÐÐÐÐÑÑ, ÐÐÑÐÐÐÑÑÑ ÐÑÐÐÐÐÐÐÑÐÐ, ÐÑÑÑÑÐÐÑÑÐÑ Ð ÐÐÑÐÑÑ ÐÑÐÐ ÑÐÐÐÐÐÐÐ, ÑÑÐÐÐÐÑÐ ÐÑÐÐÐÐÐÑÐÐÐ, ÑÐÐÐÐÑÑ, ÐÐÑÐÐÑÐÑÐÐ, ÐÑÐÐÐÐÐÐ ÑÑÑÐÐ Ñ ÑÐÐÑÐÑÑÐÐÐÑÐ ÑÐÐÐÐÐÐ, Ð ÐÑÐÑÑÑÐ ÐÑÐÐ... Ð ÑÐÐÐÑÑ ÐÐÑÐÐÑ Ð ÐÑ!</string>
     
-    <string name="otrchat_apk_url">https://guardianproject/getgibber</string>
-    <string name="orweb_apk_url">https://guardianproject/getorweb</string>
+    <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
+    <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
     
 <!-- END Welcome Wizard strings (DJH) -->
  
@@ -112,4 +111,12 @@
 	<string name="connect_first_time"> ÐÑ ÑÑÐÐÑÐÐ ÐÐÐÐÐÑÑÐÐÐÑÑ Ð ÑÐÑÐ Tor, ÐÐ ÑÑÐ ÐÐ ÐÐÐÑÐÑ, ÑÑÐ ÐÐÑÐ ÑÑÑÑÐÐÑÑÐÐ ÐÐÐÐÐÐÑÐÐ. ÐÑ ÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐÐÐÐÑÑÑÑ ÑÑÐÐÑÐÐÐ \'ÐÑÐÐÐÑÐÐ\' ÐÐ ÐÐÐÑ, ÑÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐÐÑÑ ÐÐÑ ÐÑÐÑÐÐÑ. \n\nÐÐÑÐÑÐÑÐ ÐÐÑ ÑÐÐÑ: https://guardianproject.info/apps/orbot ÐÐÐ ÐÑÐÑÐÐÑÑÐ ÐÐÐ ÐÐÑÑÐÐ ÐÐ ÐÐÑÐÑ: help@xxxxxxxxxxxxxxxxxxxx, ÑÑÐÐÑ ÑÐÐÐÑÑ ÐÐÐÑÑÐ.</string>
 
 	<string name="tor_check">ÐÑÐ ÐÑÐÐÐÐÐÑ Ð ÐÐÐÑÑÐÑ ÐÐÐ-ÐÑÐÑÐÐÑÐ, ÐÑÐÑÐÐÐÐÐÐ ÐÐ ÐÐÑÐÐ ÐÐÐÐÑÑÑÐÑÐ ÐÐ-ÑÐÐÐÑÐÐÐÑ, Ð ÐÐÐÐÐÑÑÐÐÐÑ Ð ÑÐÐÑÑ https://check.torproject.org, Ñ ÑÐÐÑÑ ÐÑÐÐÐÑÐÐ ÐÑÐÐÐÐÑÐÐÑÑÐ ÑÐÐÐÑÑ Orbot Ð ÐÐÑÐÐÐÐÐÐÐÑ, ÐÐÐÐÐÑÑÐÐÑ ÐÐ ÐÑ Ð ÑÐÑÐ Tor.</string>
+
+	
+    <string name="pref_hs_group">ÐÐÑÑÑÑÐ ÑÐÑÐÐÑÑ</string>
+    
+    <string name="pref_general_group">General</string>
+    <string name="pref_start_boot_title">Start Orbot on Boot</string>
+    <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
+    
 </resources>

Modified: projects/android/trunk/Orbot/res/values-zh/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-zh/strings.xml	2010-10-09 11:52:25 UTC (rev 23480)
+++ projects/android/trunk/Orbot/res/values-zh/strings.xml	2010-10-09 11:57:03 UTC (rev 23481)
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="pref_hs_group">Hidden Services</string>
     <string name="app_name">Orbot</string>
         <string name="app_version">1.0.4</string>
     
@@ -11,13 +10,13 @@
     <string name="control_permission_label">ååååæTor</string>
     <string name="tor_proxy_service_process">Toräçæå</string>
    
-<string name="status_starting_up">Orbotæååå</string>
+<string name="status_starting_up">Orbotæååå...</string>
 <string name="status_activated">åçèæääTorçç</string>
 <string name="status_disabled">Orbotååç</string>
 <string name="status_shutting_down">Orbotæååé</string>
 
 <string name="tor_process_connecting">æåååTor....</string>
-<string name="tor_process_connecting_step2">Setting up control...</string>
+<string name="tor_process_connecting_step2">ååæåèæ...</string>
 <string name="tor_process_connecting_step3">åæ.</string>
 <string name="tor_process_connecting_step4">èçå...</string>
 
@@ -44,7 +43,7 @@
 <string name="powered_by">ç Tor éçæäåå</string>
 <string name="press_to_start">- æäååå -</string>
 
-<string name="pref_trans_proxy_group">éæäç(éè Root æé)</string>
+<string name="pref_trans_proxy_group">éæäç(éè Root æé)</string>
 <string name="pref_trans_proxy_title">éæäç</string>
 <string name="pref_trans_proxy_summary">åççåèåéè Tor èéçç</string>
 
@@ -76,7 +75,7 @@
     <string name="wizard_details_msg">Orbot æääåææäççåççåïåååä Tor, LibEvent å Privoxy. ååæåæäääèæå Tor ççç HTTP äçï8118ïåää SOCKS äçï9050ïãåæ Root æéçèåäïOrbot èåèææçäèçèééè Tor ççååã</string>
     <string name="wizard_permissions_root">åçèåææ</string>
     <string name="wizard_permissions_stock">Orbot æé</string>
-    <string name="wizard_premissions_msg_root">æåïææå Orbot åçèåä Root æéãæääèæåäçåã</string>
+    <string name="wizard_premissions_msg_root">ååïæäææå Orbot åçèåä Root æéãæääèæåäçåã</string>
     <string name="wizard_permissions_msg_stock">èç Root æéåäæåéçïäæäæææïOrbot åäåææåååçååãçåäéçæéèå Root æéï</string>
    
     <string name="wizard_permissions_no_root">åæäææ Root æéïæèäæçæäåèääïèäååäçéäææ Orbotçåççåã</string>
@@ -101,18 +100,28 @@
 äæååæ 127.0.0.1 æè localhost, HTTP äççåæ 8118, SOCKS äççåæ 9050. äåääç SOCKS4A æè SOCKS5. 
 
 èåæååä Android ääçäçèççäæèèéï http://tinyurl.com/proxyandroid
-</string>
+    </string>
     
     <string name="wizard_final">Orbot éçåæ</string>
     <string name="wizard_final_msg">åäçæ100åäçäçäåçååæåäç Torïæéèèïååïäæåäèïæåæåèïååïååïåææåäçåæïåæéçåæ...çåäääæåäç Tor äï</string>
     
-    <string name="otrchat_apk_url">https://guardianproject/getgibber</string>
-    <string name="orweb_apk_url">https://guardianproject/getorweb</string>
+    <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
+    <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
     
 <!-- END Welcome Wizard strings (DJH) -->
  
 
-	<string name="connect_first_time"> You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help@xxxxxxxxxxxxxxxxxxxx to learn more.</string>
+	<string name="connect_first_time">äåçæåèæåTorçç-äæïèåäæåçäçèåæååçãäåääçèåäç\'ææ\'ééææèäçæèåã
 
-	<string name="tor_check">This will open your default web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string>
+èéæäçççhttps://guardianproject.info/apps/orbotæåéçåéäèhelp@xxxxxxxxxxxxxxxxxxxxäèæåäæã;</string>
+
+	<string name="tor_check">èåæåäçéèæèåè https://check.torproject.org ääçè OrbotæååèåæåäæåèæåäTorã</string>
+
+	
+    <string name="pref_hs_group">éåæå</string>
+    
+    <string name="pref_general_group">General</string>
+    <string name="pref_start_boot_title">Start Orbot on Boot</string>
+    <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
+    
 </resources>