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

[tor-commits] [translation/orbot] Update translations for orbot



commit 15fbc001bdcbd1c37bdd0e27068c613267414585
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Sat Oct 29 04:15:34 2011 +0000

    Update translations for orbot
---
 values-ar/strings.xml |   51 ++++++++++++++++++++++++++++++++---------
 values-ca/strings.xml |   51 ++++++++++++++++++++++++++++++++---------
 values-de/strings.xml |   51 ++++++++++++++++++++++++++++++++---------
 values-es/strings.xml |   51 ++++++++++++++++++++++++++++++++---------
 values-fa/strings.xml |   49 ++++++++++++++++++++++++++++++++-------
 values-fr/strings.xml |   49 ++++++++++++++++++++++++++++++++-------
 values-hu/strings.xml |   49 ++++++++++++++++++++++++++++++++-------
 values-it/strings.xml |   49 ++++++++++++++++++++++++++++++++-------
 values-mk/strings.xml |   49 ++++++++++++++++++++++++++++++++-------
 values-nb/strings.xml |   49 ++++++++++++++++++++++++++++++++-------
 values-nl/strings.xml |   51 ++++++++++++++++++++++++++++++++---------
 values-pl/strings.xml |   49 ++++++++++++++++++++++++++++++++-------
 values-pt/strings.xml |   49 ++++++++++++++++++++++++++++++++-------
 values-ru/strings.xml |   49 ++++++++++++++++++++++++++++++++-------
 values-sv/strings.xml |   49 ++++++++++++++++++++++++++++++++-------
 values-zh/strings.xml |   49 ++++++++++++++++++++++++++++++++-------
 values/strings.xml    |   61 +++++++++++++++++++++++++++++++++++++------------
 17 files changed, 686 insertions(+), 169 deletions(-)

diff --git a/values-ar/strings.xml b/values-ar/strings.xml
index e43e865..c0c0201 100644
--- a/values-ar/strings.xml
+++ b/values-ar/strings.xml
@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">اÙ?ربÙ?ت (Orbot)</string>
-  <string name="app_version">1.0.5.2</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>
@@ -12,10 +11,9 @@
   <string name="status_activated">Ø£Ù?ا Ù?تصÙ? بشبÙ?Ø© تÙ?ر</string>
   <string name="status_disabled">\"تÙ? Ø¥Ù?Ù?اÙ? اÙ?ربÙ?ت</string>
   <string name="status_shutting_down">جارÙ? إغÙ?اÙ? اÙ?ربÙ?ت</string>
-  <string name="tor_process_connecting">بدء تÙ?ر...</string>
-  <string name="tor_process_connecting_step2">ضبط اÙ?تحÙ?Ù?...</string>
-  <string name="tor_process_connecting_step3">Ù?Ù?تÙ?Ù?.</string>
-  <string name="tor_process_connecting_step4">اÙ?تظار.</string>
+  <string name="tor_process_starting"></string>
+  <string name="tor_process_complete"></string>
+  <string name="tor_process_waiting"></string>
   <string name="not_anonymous_yet">تحذÙ?ر: حرÙ?Ø© Ù?رÙ?رÙ? Ù?Ù?ست Ø®Ù?Ù?Ø© اÙ?Ù? اÙ?Ø¢Ù?! Ù?Ù? Ù?ضÙ?Ù? Ù?Ù? بتÙ?Ù?Ù?Ù? اÙ?تطبÙ?Ù?ات اÙ?خاصة بÙ? Ù?إستخداÙ? HTTP proxy 127.0.0.1:8118 Ø£Ù? SOCK4A Ø£Ù? SOKS5 127.0.0.1:9050</string>
   <string name="menu_home">اÙ?صÙ?حة اÙ?رئÙ?سÙ?Ø©</string>
   <string name="menu_browse">تصÙ?Ù?Ø­</string>
@@ -57,9 +55,6 @@
   <string name="btn_finish">Ø¥Ù?Ù?اء</string>
   <string name="btn_okay">Ù?Ù?اÙ?Ù?</string>
   <string name="btn_cancel">Ø¥Ù?غاء</string>
-  <string name="wizard_welcome_msg">بÙ?ضÙ? Ø£Ù?ربÙ?تØ? صار Ù?Ù?Ù?Ù?ا استعÙ?اÙ? تÙ?ر Ù?Ù? Ø£Ù?درÙ?Ù?د. تÙ?ر Ù?Ù? برÙ?اÙ?ج Ù?جاÙ?Ù? Ù?شبÙ?Ø© Ù?Ù?تÙ?حة تساعد عÙ?Ù? Ø­Ù?اÙ?تÙ? Ù?Ù? Ù?راÙ?بة اÙ?شبÙ?ات اÙ?تÙ? تÙ?دد اÙ?خصÙ?صÙ?Ø© Ù?اÙ?حرÙ?Ø© اÙ?شخصÙ?Ø© Ù?اÙ?عÙ?اÙ?ات Ù?اÙ?Ø£Ù?شطة اÙ?تجارÙ?Ø© اÙ?سرÙ?Ø© Ù?رÙ?ابة اÙ?دÙ?Ù? اÙ?Ù?عرÙ?Ù?Ø© بإسÙ? تحÙ?Ù?Ù? حرÙ?Ø© اÙ?Ù?رÙ?ر.
-
-*تحذÙ?ر: *تثبÙ?ت Ø£Ù?ربÙ?ت عÙ?Ù? جÙ?ازÙ?_Ù?Ù?_Ù?Ù?Ù?Ù? بإخÙ?اء تحرÙ?ات حرÙ?Ø© Ù?رÙ?رÙ? بشÙ?Ù? سحرÙ?! سÙ?Ù? Ù?ساعدÙ? Ù?ذا اÙ?Ù?عاÙ?ج عÙ?Ù? اÙ?بدء.</string>
   <string name="wizard_details">بعض اÙ?تÙ?اصÙ?Ù? عÙ? Ø£Ù?ربÙ?ت</string>
   <string name="wizard_details_msg">Ø£Ù?ربÙ?ت Ù?Ù? تطبÙ?Ù? Ù?Ù?تÙ?Ø­ اÙ?Ù?صدر Ù?اÙ?Ø°Ù? Ù?ضÙ? تÙ?ر, LibEvent Ù?Prixovy. Ù?عÙ?Ù? عÙ?Ù? تÙ?Ù?Ù?ر Ù?Ù?Ù?Ù? HTTP Ù?Ø­Ù?Ù? (8118) Ù?Ù?Ù?Ù?Ù? SOCKS (9050) Ø¥Ù?Ù? شبÙ?Ø© تÙ?ر. Ù?تÙ?Ù?ر Ù?دÙ? Ø£Ù?ربÙ?ت اÙ?Ù?درة عÙ?Ù? إرساÙ? جÙ?Ù?ع حرÙ?ات Ù?رÙ?ر اÙ?اÙ?ترÙ?ت Ù?Ù? Ø®Ù?اÙ? تÙ?ر عÙ?Ù? اÙ?جÙ?از ذات Ø­Ù?Ù?Ù? اÙ?Ù?سؤÙ?Ù? (root). </string>
   <string name="wizard_permissions_root">تÙ? Ù?Ù?Ø­ اÙ?إذÙ?</string>
@@ -76,7 +71,6 @@
   <string name="wizard_tips_tricks">تطبÙ?Ù?ات Ù?Ù?Ù?ئة Ù?Ø£Ù?ربÙ?ت</string>
   <string name="wizard_tips_msg">Ù?شجعÙ?Ù? عÙ?Ù? تحÙ?Ù?Ù? Ù?استخداÙ? اÙ?تطبÙ?Ù?ات اÙ?تÙ? تعرÙ? Ù?Ù?Ù?Ù?Ø© اÙ?اتصاÙ? Ù?باشرة بأÙ?ربÙ?ت. اضغط عÙ?Ù? اÙ?أزرار Ù?Ù? اÙ?أسÙ?Ù? Ù?Ù?تثبÙ?ت.</string>
   <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
-  <string name="wizard_tips_orweb">ORWEB (Ø£Ù?درÙ?Ù?د 1.x Ù?Ù?Ø·) - Ù?تصÙ?Ø­ Ù?صÙ?Ù?Ù? Ù?Ù?خصÙ?صÙ?Ø© Ù?Ø£Ù?ربÙ?ت </string>
   <string name="wizard_tips_proxy">إعدادات اÙ?Ù?Ù?Ù?Ù? - تعÙ?Ù? Ù?Ù?Ù?Ù?Ø© تÙ?Ù?Ù?Ù? اÙ?تطبÙ?Ù?ات Ù?تعÙ?Ù? Ù?ع Ø£Ù?ربÙ?ت</string>
   <string name="wizard_proxy_help_info">إعدادات اÙ?Ù?Ù?Ù?Ù?</string>
   <string name="wizard_proxy_help_msg">اذا Ù?اÙ? تطبÙ?Ù? Ø£Ù?درÙ?Ù?د اÙ?Ø°Ù? تستخدÙ?Ù? Ù?Ù?Ù?Ù? اÙ? Ù?دعÙ? استخداÙ? Ù?Ù?Ù?Ù? HTTP اÙ? SOCKS , عÙ?دÙ?ا Ù?Ù?Ù?Ù?Ù? تÙ?Ù?Ù?Ù?Ù? Ù?Ù?إتصاÙ? بأÙ?ربÙ?ت Ù?استخداÙ? تÙ?ر.
@@ -90,8 +84,6 @@
     </string>
   <string name="wizard_final">Ø£Ù?ربÙ?ت جاÙ?ز!</string>
   <string name="wizard_final_msg">Ù?ئات اÙ?Ø¢Ù?اÙ? Ù?Ù? اÙ?Ù?اس Ù?Ù? جÙ?Ù?ع Ø£Ù?حاء اÙ?عاÙ?Ù? Ù?ستخدÙ?Ù?Ù? تÙ?ر Ù?أسباب عدÙ?دة: اÙ?صحÙ?Ù?Ù?Ù? Ù?اÙ?Ù?دÙ?Ù?Ù?Ù?Ø? Ù?اÙ?عاÙ?Ù?Ù?Ù? Ù?Ù? Ù?جاÙ? Ø­Ù?Ù?Ù? اÙ?Ø¥Ù?ساÙ?Ø? Ù?اÙ?جÙ?Ù?د Ù?اÙ?شرÙ?ات Ù?اÙ?Ù?Ù?اطÙ?Ù?Ù? Ù?Ù? اÙ?Ø£Ù?ظÙ?Ø© اÙ?Ù?Ù?عÙ?Ø©Ø? Ù?اÙ?Ù?Ù?اطÙ?Ù?Ù? اÙ?عادÙ?Ù?Ù? ... Ù?اÙ?Ø¢Ù? Ø£Ù?ت Ù?ستعد Ù?Ø£Ù? تستخدÙ?Ù? Ù?Ø°Ù?Ù?!</string>
-  <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
-  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
   <string name="connect_first_time"> Ù?Ù?د Ù?Ù?ت بإتصاÙ? Ù?اجح اÙ?Ù? شبÙ?Ø© تÙ?ر - Ù?Ù?Ù? Ù?ذا Ù?ا Ù?عÙ?Ù? بأÙ? جÙ?ازÙ? Ù?Ù? Ù?Ø£Ù?Ù?. Ù?Ù?Ù?Ù?Ù? استخداÙ? Ø®Ù?ار \'تحÙ?Ù?\' Ù?Ù? اÙ?Ù?ائÙ?Ø© Ù?إختبار اÙ?Ù?تصÙ?Ø­ اÙ?خاص بÙ?. 
 
  Ù?Ù? بزÙ?ارتÙ?ا عÙ?Ù? https://guardianproject.info/apps/orbot اÙ? ارسÙ? رساÙ?Ø© اÙ?Ù?ترÙ?Ù?Ù?Ø© اÙ?Ù? help@xxxxxxxxxxxxxxxxxxxx Ù?Ù?عرÙ?Ø© اÙ?Ù?زÙ?د.</string>
@@ -100,4 +92,41 @@
   <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>
+  <string name="wizard_title_msg"></string>
+  <string name="wizard_warning_title"></string>
+  <string name="wizard_warning_msg"></string>
+  <string name="wizard_permissions_title"></string>
+  <string name="wizard_permissions_root_msg1"></string>
+  <string name="wizard_permissions_root_msg2"></string>
+  <string name="wizard_permissions_no_root_msg"></string>
+  <string name="wizard_tips_title"></string>
+  <string name="wizard_tips_gibberbot"></string>
+  <string name="gibberbot_apk_url"></string>
+  <string name="wizard_tips_orweb">ORWEB (Ø£Ù?درÙ?Ù?د 1.x Ù?Ù?Ø·) - Ù?تصÙ?Ø­ Ù?صÙ?Ù?Ù? Ù?Ù?خصÙ?صÙ?Ø© Ù?Ø£Ù?ربÙ?ت </string>
+  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <string name="wizard_transproxy_title"></string>
+  <string name="wizard_transproxy_msg"></string>
+  <string name="wizard_transproxy_hint"></string>
+  <string name="wizard_transproxy_none"></string>
+  <string name="pref_transparent_tethering_title"></string>
+  <string name="pref_transparent_tethering_summary"></string>
+  <string name="button_grant_superuser"></string>
+  <string name="pref_select_apps"></string>
+  <string name="pref_select_apps_summary"></string>
+  <string name="pref_node_configuration"></string>
+  <string name="pref_node_configuration_summary"></string>
+  <string name="pref_entrance_node"></string>
+  <string name="pref_entrance_node_summary"></string>
+  <string name="pref_entrance_node_dialog"></string>
+  <string name="pref_use_whispercore"></string>
+  <string name="pref_use_whispercore_summary"></string>
+  <string name="pref_proxy_type_title"></string>
+  <string name="pref_proxy_type_summary"></string>
+  <string name="pref_proxy_type_dialog"></string>
+  <string name="pref_proxy_host_title"></string>
+  <string name="pref_proxy_host_summary"></string>
+  <string name="pref_proxy_host_dialog"></string>
+  <string name="pref_proxy_port_title"></string>
+  <string name="pref_proxy_port_summary"></string>
+  <string name="pref_proxy_port_dialog"></string>
 </resources>
diff --git a/values-ca/strings.xml b/values-ca/strings.xml
index d4bc6d7..f3978dc 100644
--- a/values-ca/strings.xml
+++ b/values-ca/strings.xml
@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="app_version">1.0.5.2</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>
@@ -12,10 +11,9 @@
   <string name="status_activated">Connectat a la xarxa Tor</string>
   <string name="status_disabled">Orbot està desactivat</string>
   <string name="status_shutting_down">Orbot s\'està aturant</string>
-  <string name="tor_process_connecting">Iniciant Tor...</string>
-  <string name="tor_process_connecting_step2">Preparant el control...</string>
-  <string name="tor_process_connecting_step3">acomplert.</string>
-  <string name="tor_process_connecting_step4">esperant.</string>
+  <string name="tor_process_starting"></string>
+  <string name="tor_process_complete"></string>
+  <string name="tor_process_waiting"></string>
   <string name="not_anonymous_yet">ATENCI� : El trànsit de la teva connexió ja no es anònim! Siusplau, configura les teves aplicacions per a usar HTTP proxy 127.0.0.1:8118, per SOCKS4A o SOCKS5 proxy 127.0.0.1:9050</string>
   <string name="menu_home">Lloc d\'inici</string>
   <string name="menu_browse">Navega</string>
@@ -57,9 +55,6 @@
   <string name="btn_finish">Fi</string>
   <string name="btn_okay">D\'acord</string>
   <string name="btn_cancel">Cancel·la</string>
-  <string name="wizard_welcome_msg">Orbot et porta Tor a l\'Android. Tor és programari lliure i una xarxa oberta que t\'ajuda a defensar-te d\'una vigilància a través de la xarxa, amenaçant la teva privacitat i llibertat personal, informació confidencial, activitats i relacions, i seguretat estatal coneguda com anàlisi de trànsit.
-
-*ALERTA:* Instal·lar Orbot _no_ convertirà la teva connexió en anònima instantàniament! Aquest assistent t\'ajudarà a començar.</string>
   <string name="wizard_details">Alguns detalls d\'Orbot...</string>
   <string name="wizard_details_msg">Orbot és una aplicació de codi lliure que conté Tor, LibEvent i Privoxy. Proporciona un Proxy HTTP local (8118) i un proxy SOCKS (9050) a la xarxa Tor. Orbot també té capacitat d\'enviar tot el trànsit de dades d\'internet a través de Tor.</string>
   <string name="wizard_permissions_root">Permís concedit</string>
@@ -76,7 +71,6 @@
   <string name="wizard_tips_tricks">Aplicacions per a usar-se amb Orbot</string>
   <string name="wizard_tips_msg">T\'animem a descarregar-te &amp;amp; utilitza aplicacions que sàpiguen com connectar-se directament a Orbot. Fes clic als botons de sota per instal·lar.</string>
   <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
-  <string name="wizard_tips_orweb">ORWEB (Només Android 1.x) - Navegador dissenyat per la privacitat &amp;amp; per a Orbot</string>
   <string name="wizard_tips_proxy">Coniguració de Proxy - Aprèn a configurar aplicacions per a què funcionin amb Orbot</string>
   <string name="wizard_proxy_help_info">Configuració de Proxy</string>
   <string name="wizard_proxy_help_msg">Si l\'aplicació d\'Android que estàs utilitzant admet l\'ús d\'un proxy HTTP o SOCKS, pots configurar-la per a connectar-se a Orbot i utilitzar Tor.
@@ -90,8 +84,6 @@ Pots aprendre més coses sobre l\'ús dels proxys a Android al FAQ de: http://ti
     </string>
   <string name="wizard_final">Orbot és a punt!</string>
   <string name="wizard_final_msg">Centenars de milers de persones arreu del món utilitzen Tor per un gran ventall de raons: periodistes i blocaires, treballadors pels drets humans, agents de l\'autoritat, soldats, corporacions, ciutadans de règims opressors, i ciutadans qualssevol... I ara tu també ho pots fer!</string>
-  <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
-  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
   <string name="connect_first_time">T\'has connectat correctament a la xarxa Tor, però això NO vol dir que el teu dispositiu sigui segur. Pots utilitzar la opció \'Comprova\' del menú per provar el teu navegador. 
 
 Visita\'ns a https://guardianproject.info/apps/orbot o envia\'ns un correu electrònic a help@xxxxxxxxxxxxxxxxxxxx per a saber-ne més.</string>
@@ -100,4 +92,41 @@ Visita\'ns a https://guardianproject.info/apps/orbot o envia\'ns un correu elect
   <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>
+  <string name="wizard_title_msg"></string>
+  <string name="wizard_warning_title"></string>
+  <string name="wizard_warning_msg"></string>
+  <string name="wizard_permissions_title"></string>
+  <string name="wizard_permissions_root_msg1"></string>
+  <string name="wizard_permissions_root_msg2"></string>
+  <string name="wizard_permissions_no_root_msg"></string>
+  <string name="wizard_tips_title"></string>
+  <string name="wizard_tips_gibberbot"></string>
+  <string name="gibberbot_apk_url"></string>
+  <string name="wizard_tips_orweb">ORWEB (Només Android 1.x) - Navegador dissenyat per la privacitat &amp;amp; per a Orbot</string>
+  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <string name="wizard_transproxy_title"></string>
+  <string name="wizard_transproxy_msg"></string>
+  <string name="wizard_transproxy_hint"></string>
+  <string name="wizard_transproxy_none"></string>
+  <string name="pref_transparent_tethering_title"></string>
+  <string name="pref_transparent_tethering_summary"></string>
+  <string name="button_grant_superuser"></string>
+  <string name="pref_select_apps"></string>
+  <string name="pref_select_apps_summary"></string>
+  <string name="pref_node_configuration"></string>
+  <string name="pref_node_configuration_summary"></string>
+  <string name="pref_entrance_node"></string>
+  <string name="pref_entrance_node_summary"></string>
+  <string name="pref_entrance_node_dialog"></string>
+  <string name="pref_use_whispercore"></string>
+  <string name="pref_use_whispercore_summary"></string>
+  <string name="pref_proxy_type_title"></string>
+  <string name="pref_proxy_type_summary"></string>
+  <string name="pref_proxy_type_dialog"></string>
+  <string name="pref_proxy_host_title"></string>
+  <string name="pref_proxy_host_summary"></string>
+  <string name="pref_proxy_host_dialog"></string>
+  <string name="pref_proxy_port_title"></string>
+  <string name="pref_proxy_port_summary"></string>
+  <string name="pref_proxy_port_dialog"></string>
 </resources>
diff --git a/values-de/strings.xml b/values-de/strings.xml
index 0cd9792..0714f9c 100644
--- a/values-de/strings.xml
+++ b/values-de/strings.xml
@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="app_version">1.0.5.2</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>
@@ -12,10 +11,9 @@
   <string name="status_activated">Verbunden mit dem Tor-Netzwerk</string>
   <string name="status_disabled">\"Orbot ist deaktiviert</string>
   <string name="status_shutting_down">Orbot wird beendet</string>
-  <string name="tor_process_connecting">Starte Tor...</string>
-  <string name="tor_process_connecting_step2">Baue Kontrollverbindung auf...</string>
-  <string name="tor_process_connecting_step3">erfolgreich abgeschlossen.</string>
-  <string name="tor_process_connecting_step4">warte.</string>
+  <string name="tor_process_starting"></string>
+  <string name="tor_process_complete"></string>
+  <string name="tor_process_waiting"></string>
   <string name="not_anonymous_yet">WARNUNG: Ihr Datenverkehr ist noch nicht anonymisiert! Bitte stellen Sie Ihre Programme so ein, dass sie entweder den HTTP Proxy 127.0.0.1:8118 oder den SOCKS4A bzw. SOCKS5 Proxy 127.0.0.1:9050 nutzen.</string>
   <string name="menu_home">Home</string>
   <string name="menu_browse">Durchstöbern</string>
@@ -57,9 +55,6 @@
   <string name="btn_finish">Fertigstellen</string>
   <string name="btn_okay">OK</string>
   <string name="btn_cancel">Abbrechen</string>
-  <string name="wizard_welcome_msg">Orbot bringt Tor auf Android Geräte. Tor ist ein freies Programm und ein offenes Netzwerk, dass Ihnen hilft sich gegen Datenverkehrsüberwachung zu wehren, eine Form der Onlineüberwachung, die Ihre persönliche Freiheit, Privatsphäre, vertrauliche Geschäfte und Geschäftseziehungen bedroht.
-
-*WARNUNG:* Durch die Installation von Orbot wird _nicht_ sofort Ihr kompletter Datenverkehr anonymisiert! Hilfestellung erhalten Sie von diesem Assistenten.</string>
   <string name="wizard_details">Nähere Informationen zu Orbot</string>
   <string name="wizard_details_msg">Orbot ist eine quelloffene Anwendung die Tor, LibEvent und Privoxy enthält. Es stellt einen lokalen HTTP Proxy (8118) und einen SOCKS Proxy (9050) zum Tor-Netzwerk zur Verfügung. Orbot hat auf einem System mit Administrationsrechten auch die Fähigkeit, jeglichen Internetverkehr über das Tor-Netzwerk abzuwickeln.</string>
   <string name="wizard_permissions_root">Erlaubnis erteilt</string>
@@ -76,7 +71,6 @@
   <string name="wizard_tips_tricks">Programme, für die Orbot aktiviert ist</string>
   <string name="wizard_tips_msg">Wir raten Ihnen Programme herunterzuladen &amp;amp; zu nutzen, die wissen, wie sie sich direkt mit Orbot verbinden. Klicken Sie zum Installieren auf den Knopf unten.</string>
   <string name="wizard_tips_otrchat">Gibberbot - Ein sicheres Instant-Messaging Programm für Android</string>
-  <string name="wizard_tips_orweb">ORWEB (Nur Android 1.x) - Ein für Privatsphäre &amp;amp; Orbot entworfener Browser</string>
   <string name="wizard_tips_proxy">Proxy-Einstellungen - Lernen Sie Anwendungen so zu konfigurieren, dass sie mit Orbot zusammenarbeiten.</string>
   <string name="wizard_proxy_help_info">Proxy-Einstellungen</string>
   <string name="wizard_proxy_help_msg">Wenn das Android-Programm, das Sie benutzten die Verwendung von HTTP- oder SOCKS-Proxys unterstützt, können Sie es konfigurieren sich mit Orbot zu verbinden und Tor zu nutzen.
@@ -90,8 +84,6 @@ Erfahren Sie mehr über die Verwendung von Proxys unter Android in den FAQ unter
     </string>
   <string name="wizard_final">Orbot ist bereit!</string>
   <string name="wizard_final_msg">Hunderttausende Menschen auf der ganzen Welt nutzen Tor aus einer Vielzahl von Gründen: Journalisten und Blogger, Menschenrechtsaktivisten, Strafverfolgungsbehörden, Soldaten, Unternehmen, Bürger repressiver Regime und ganz normale Menschen... und sind Sie ebenfalls bereit!</string>
-  <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
-  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
   <string name="connect_first_time">Sie haben sich erfolgreich mit dem Tor-Netzwerk verbunden - das bedeutet aber NICHT, dass Ihr Gerät sicher ist. Sie können die \'�berprüfen\'-Option aus dem Menü benutzen, um Ihren Browser zu testen. 
 
 Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail an help@xxxxxxxxxxxxxxxxxxxx um mehr darüber zu erfahren.</string>
@@ -100,4 +92,41 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail
   <string name="pref_general_group">Allgemein</string>
   <string name="pref_start_boot_title">Orbot beim Systemstart ausführen</string>
   <string name="pref_start_boot_summary">Automatisches starten von Orbor und verbinden von Tor, wenn dein Android-Gerät startet</string>
+  <string name="wizard_title_msg"></string>
+  <string name="wizard_warning_title"></string>
+  <string name="wizard_warning_msg"></string>
+  <string name="wizard_permissions_title"></string>
+  <string name="wizard_permissions_root_msg1"></string>
+  <string name="wizard_permissions_root_msg2"></string>
+  <string name="wizard_permissions_no_root_msg"></string>
+  <string name="wizard_tips_title"></string>
+  <string name="wizard_tips_gibberbot"></string>
+  <string name="gibberbot_apk_url"></string>
+  <string name="wizard_tips_orweb">ORWEB (Nur Android 1.x) - Ein für Privatsphäre &amp;amp; Orbot entworfener Browser</string>
+  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <string name="wizard_transproxy_title"></string>
+  <string name="wizard_transproxy_msg"></string>
+  <string name="wizard_transproxy_hint"></string>
+  <string name="wizard_transproxy_none"></string>
+  <string name="pref_transparent_tethering_title"></string>
+  <string name="pref_transparent_tethering_summary"></string>
+  <string name="button_grant_superuser"></string>
+  <string name="pref_select_apps"></string>
+  <string name="pref_select_apps_summary"></string>
+  <string name="pref_node_configuration"></string>
+  <string name="pref_node_configuration_summary"></string>
+  <string name="pref_entrance_node"></string>
+  <string name="pref_entrance_node_summary"></string>
+  <string name="pref_entrance_node_dialog"></string>
+  <string name="pref_use_whispercore"></string>
+  <string name="pref_use_whispercore_summary"></string>
+  <string name="pref_proxy_type_title"></string>
+  <string name="pref_proxy_type_summary"></string>
+  <string name="pref_proxy_type_dialog"></string>
+  <string name="pref_proxy_host_title"></string>
+  <string name="pref_proxy_host_summary"></string>
+  <string name="pref_proxy_host_dialog"></string>
+  <string name="pref_proxy_port_title"></string>
+  <string name="pref_proxy_port_summary"></string>
+  <string name="pref_proxy_port_dialog"></string>
 </resources>
diff --git a/values-es/strings.xml b/values-es/strings.xml
index 065c81d..f294f8a 100644
--- a/values-es/strings.xml
+++ b/values-es/strings.xml
@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="app_version">1.0.5.2</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>
@@ -12,10 +11,9 @@
   <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">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="tor_process_starting"></string>
+  <string name="tor_process_complete"></string>
+  <string name="tor_process_waiting"></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>
@@ -57,9 +55,6 @@
   <string name="btn_finish">Finalizar</string>
   <string name="btn_okay">OK</string>
   <string name="btn_cancel">Cancelar</string>
-  <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>
@@ -76,7 +71,6 @@
   <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">Gibberbot - Secure instant messaging client for 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.
@@ -90,8 +84,6 @@ Puede aprender más acerca de los proxys en Android a través de las Preguntas F
     </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">market://search?q=pname:info.guardianproject.otr.app.im</string>
-  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
   <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>
@@ -100,4 +92,41 @@ Visítenos en https://guardianproject.info/apps/orbot o envíenos un correo elec
   <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>
+  <string name="wizard_title_msg"></string>
+  <string name="wizard_warning_title"></string>
+  <string name="wizard_warning_msg"></string>
+  <string name="wizard_permissions_title"></string>
+  <string name="wizard_permissions_root_msg1"></string>
+  <string name="wizard_permissions_root_msg2"></string>
+  <string name="wizard_permissions_no_root_msg"></string>
+  <string name="wizard_tips_title"></string>
+  <string name="wizard_tips_gibberbot"></string>
+  <string name="gibberbot_apk_url"></string>
+  <string name="wizard_tips_orweb">ORWEB (Sólo Android 1.x) - Navegador diseñado para la privacidad y para Orbot</string>
+  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <string name="wizard_transproxy_title"></string>
+  <string name="wizard_transproxy_msg"></string>
+  <string name="wizard_transproxy_hint"></string>
+  <string name="wizard_transproxy_none"></string>
+  <string name="pref_transparent_tethering_title"></string>
+  <string name="pref_transparent_tethering_summary"></string>
+  <string name="button_grant_superuser"></string>
+  <string name="pref_select_apps"></string>
+  <string name="pref_select_apps_summary"></string>
+  <string name="pref_node_configuration"></string>
+  <string name="pref_node_configuration_summary"></string>
+  <string name="pref_entrance_node"></string>
+  <string name="pref_entrance_node_summary"></string>
+  <string name="pref_entrance_node_dialog"></string>
+  <string name="pref_use_whispercore"></string>
+  <string name="pref_use_whispercore_summary"></string>
+  <string name="pref_proxy_type_title"></string>
+  <string name="pref_proxy_type_summary"></string>
+  <string name="pref_proxy_type_dialog"></string>
+  <string name="pref_proxy_host_title"></string>
+  <string name="pref_proxy_host_summary"></string>
+  <string name="pref_proxy_host_dialog"></string>
+  <string name="pref_proxy_port_title"></string>
+  <string name="pref_proxy_port_summary"></string>
+  <string name="pref_proxy_port_dialog"></string>
 </resources>
diff --git a/values-fa/strings.xml b/values-fa/strings.xml
index ee5a5f5..2b1d469 100644
--- a/values-fa/strings.xml
+++ b/values-fa/strings.xml
@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">اÙ?ربات</string>
-  <string name="app_version">1.0.5.2</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>
@@ -12,10 +11,9 @@
   <string name="status_activated">Ù¾Û?Ù?ستÙ? بÙ? شبکÙ? Û? Tor</string>
   <string name="status_disabled">اÙ?ربات غÛ?رÙ?عاÙ? شدÙ? است.</string>
   <string name="status_shutting_down">اÙ?ربات در حاÙ? بستÙ? شدÙ? است.</string>
-  <string name="tor_process_connecting">شرÙ?ع تÙ?ر ...</string>
-  <string name="tor_process_connecting_step2">راÙ? اÙ?دازÛ? Ù?ظارت...</string>
-  <string name="tor_process_connecting_step3">Ù?اÙ?Ù? شد.</string>
-  <string name="tor_process_connecting_step4">در اÙ?تظار.</string>
+  <string name="tor_process_starting"></string>
+  <string name="tor_process_complete"></string>
+  <string name="tor_process_waiting"></string>
   <string name="not_anonymous_yet">Ù?شدار: Ù?عاÙ?Û?ت Ø´Ù?ا Ù?Ù?Ù?ز \"Ú¯Ù?Ù?اÙ?\" Ù?Û?ست! Ù?Ø·Ù?Ù? اپÙ?Û?Ú©Û?Ø´Ù? Ø®Ù?د را تÙ?ظÛ?Ù? Ú©Ù?Û?د تا از HTTP پرÙ?کسÛ? 127.0.0.1:8118 Ù? Û?ا SOCKS4A Ù? Û?ا SOCKS5 پرÙ?کسÛ? 127.0.01:9050 استÙ?ادÙ? Ú©Ù?د.</string>
   <string name="menu_home">خاÙ?Ù?</string>
   <string name="menu_browse">جستجÙ?</string>
@@ -57,7 +55,6 @@
   <string name="btn_finish">پاÛ?اÙ?</string>
   <string name="btn_okay">Ù?غÙ?</string>
   <string name="btn_cancel">Ù?غÙ?</string>
-  <string name="wizard_welcome_msg">اÙ?ربات Tor را بÙ? Ø¢Ù?درÙ?Ù?Û?د Ù?ارد Ù?Û? Ú©Ù?د. Tor Ù?رÙ? اÙ?زارÛ? راÛ?گاÙ? Ù? شبکÙ? اÛ? باز است Ú©Ù? در Ù?Ù?ابÙ? تÙ?دÛ?د شبکÙ? Ù?اÛ? Ù?ظارتÛ? عÙ?Û?Ù? آزادÛ? Ù? حرÛ?Ù? Ù?ردÛ?Ø? Ù?عاÙ?Û?ت Ù?ا Ù? رÙ?ابط Ù?حرÙ?اÙ?Ù? شرکت Ù?اØ? Ù? اÙ?Ù?Û?ت Ù?Ù?Û?Ø? Ú©Ù? \"کاÙ?Ø´ Ù?عاÙ?Û?ت\" Ù?عرÙ?Ù? استØ? بÙ? Ø´Ù?ا Ú©Ù?Ú© Ù?Û? Ú©Ù?د. *Ù?شدار:* Ù?صب اÙ?ربات بÙ? تÙ?Ù?اÛ?Û? Ù?ادر Ù?Û?ست Ù?عجزÙ? اÛ? صÙ?رت دÙ?د Ù? Ù?عاÙ?Û?ت Ø¢Ù?Ù?اÛ?Ù? Ø´Ù?ا را Ù?Ø®Ù?Û? Ú©Ù?د! اÛ?Ù? ابزار تÙ?Ù?ا Ú©Ù?Ú© Ù?Û? Ú©Ù?د Ú©Ù? Ù?دÙ? اÙ?Ù? را بردارÛ?د.</string>
   <string name="wizard_details">برخÛ? جزئÛ?ات در Ù?Ù?رد اÙ?ربات</string>
   <string name="wizard_details_msg">اÙ?ربات اپÙ?Û?Ú©Û?Ø´Ù?Û? با Ù?تÙ?-باز است Ú©Ù? شاÙ?Ù? Tor, LibEvent Ù? Privoxy. اÛ?Ù? اپÙ?Û?Ú©Û?Ø´Ù?Ø? HTTP پرÙ?کسÛ? (8118) Ù?Ø­Ù?Û? Ù? SOCKS پرÙ?کسÛ? (9050) را در شبکÙ? Tor در دسترس Ù?رار Ù?Û? دÙ?د. اÙ?ربات Ù?Ù?Ú?Ù?Û?Ù? Ù?ادر است بر رÙ?Û? ابزار root شدÙ?Ø? تÙ?اÙ? تراÙ?Û?Ú© اÛ?Ù?ترÙ?ت را از Tor ارساÙ? Ú©Ù?د.</string>
   <string name="wizard_permissions_root">Ù?جÙ?ز صادر گردÛ?د</string>
@@ -74,18 +71,52 @@
   <string name="wizard_tips_tricks">اپÙ?Û?Ú©Û?Ø´Ù? Ù?اÛ?Û? Ú©Ù? براÛ? اÙ?ربات تÙ?ظÛ?Ù? شدÙ? اÙ?د</string>
   <string name="wizard_tips_msg">تÙ?صÛ?Ù? Ù?Û? Ú©Ù?Û?Ù? داÙ?Ù? Ù?Ù?د Ù? Ù?عاÙ? Ú©Ù?Û?دØ? اپÙ?Û?Ú©Û?Ø´Ù? Ù?اÛ?Û? را استÙ?ادÙ? Ú©Ù?Û?د Ú©Ù? Ù?ستÙ?Û?Ù? بÙ? اÙ?ربات Ù?صÙ? Ù?Û? Ø´Ù?Ù?د. دکÙ?Ù? Ù?اÛ? زÛ?ر را Ù?شار دÙ?Û?د تا Ù?صب Ø´Ù?د. </string>
   <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
-  <string name="wizard_tips_orweb">ORWEB (Ù?Ù?Ø· Ø¢Ù?درÙ?Û?د 1.x) - Ù?رÙ?رگر طراحÛ? شدÙ? براÛ? Ø­Ù?ظ حرÛ?Ù? خصÙ?صÛ? Ù? اÙ?زÙ?Ù?ساز اÙ?ربات</string>
   <string name="wizard_tips_proxy">تÙ?ظÛ?Ù?ات پرÙ?کسÛ? - Û?ادگÛ?رÛ? تÙ?ظÛ?Ù? اپÙ?Û?Ú©Û?Ø´Ù? Ù?ا براÛ? کار با اÙ?ربات</string>
   <string name="wizard_proxy_help_info">تÙ?ظÛ?Ù?ات پرÙ?کسÛ?</string>
   <string name="wizard_proxy_help_msg">اگر اپÙ?Û?Ú©Ø´Û?Ù? Ø¢Ù?درÙ?Ù?Ù?Û?د Ù?Ù?رد استÙ?ادÙ? Ø´Ù?ا Ù?ابÙ?Û?ت کار با HTTP Ù? Û?ا SOCKS پرÙ?کسÛ? دارد Ù?Û? تÙ?اÙ?Û?د تÙ?ظÛ?Ù?Ø´ Ú©Ù?Û?د تا بÙ? اÙ?ربات Ù?صÙ? Ø´Ù?د Ù? از Tor استÙ?ادÙ? Ú©Ù?د. تÙ?ظÛ?Ù?ات سرÙ?Û?س دÙ?Ù?دÙ? 127.0.0.1 Ù? Û?ا \"سرÙ?Û?س-دÙ? Ù?Ø­Ù?Û?\" است. براÛ? HTTP تÙ?ظÛ?Ù?ات درگاÙ? (port) 8118 است. براÛ? SOCKSØ? پرÙ?کسÛ? Ù?Ù?اسبØ? 9050 است. Ø´Ù?ا Ù?Û? باÛ?ست SOCKS4A  Ù? Û?ا  در صÙ?رت اÙ?کاÙ? از socks5 استÙ?ادÙ? Ú©Ù?Û?د. در صÙ?رت Ù?Û?از بÙ? اطÙ?اعات بÛ?شتر در Ù?Ù?رد اÙ?تÙ?اÙ?دÙ? Ø¢Ù?درÙ?Û?دØ? Ù?Û? تÙ?اÙ?Û?د بÙ? FAQ (سÙ?اÙ?Ù?اÛ? Ù?عÙ?Ù?Ù?) در http://tinyurl.com/proxyandroid Ù?راجعÙ? Ú©Ù?Û?د.</string>
   <string name="wizard_final">اÙ?ربات Ø¢Ù?ادÙ? استÙ?ادÙ? Ù?Û?باشد!</string>
   <string name="wizard_final_msg">صدÙ?ا Ù?زار Ù?Ù?ر در سراسر جÙ?اÙ? بÙ? دÙ?اÛ?Ù? Ú¯Ù?Ù?اگÙ?Ù? از Tor استÙ?ادÙ? Ù?Û? Ú©Ù?Ù?د: رÙ?زÙ?اÙ?Ù? Ù?Ù?Û?سÙ?ا Ù? بÙ?اگرÙ?اØ? کارکÙ?اÙ? Ø­Ù?Ù?Ù? بشرØ? Ù?اÙ?Ù?راÙ? اÙ?تظاÙ?Û?Ø? سربازاÙ?Ø? شرکتÙ?اØ? Ø´Ù?رÙ?Ù?داÙ? دÙ?Ù?تÙ?اÛ? سرکÙ?بگرØ? Ù? Ø´Ù?رÙ?Ù?داÙ? عادÛ?Ø? Ù? حاÙ?ا Ø´Ù?ا Ù?Û?ز Ø¢Ù?ادÙ? استÙ?ادÙ? از Ø¢Ù? Ù?ستÛ?د!</string>
-  <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
-  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
   <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>
+  <string name="wizard_title_msg"></string>
+  <string name="wizard_warning_title"></string>
+  <string name="wizard_warning_msg"></string>
+  <string name="wizard_permissions_title"></string>
+  <string name="wizard_permissions_root_msg1"></string>
+  <string name="wizard_permissions_root_msg2"></string>
+  <string name="wizard_permissions_no_root_msg"></string>
+  <string name="wizard_tips_title"></string>
+  <string name="wizard_tips_gibberbot"></string>
+  <string name="gibberbot_apk_url"></string>
+  <string name="wizard_tips_orweb">ORWEB (Ù?Ù?Ø· Ø¢Ù?درÙ?Û?د 1.x) - Ù?رÙ?رگر طراحÛ? شدÙ? براÛ? Ø­Ù?ظ حرÛ?Ù? خصÙ?صÛ? Ù? اÙ?زÙ?Ù?ساز اÙ?ربات</string>
+  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <string name="wizard_transproxy_title"></string>
+  <string name="wizard_transproxy_msg"></string>
+  <string name="wizard_transproxy_hint"></string>
+  <string name="wizard_transproxy_none"></string>
+  <string name="pref_transparent_tethering_title"></string>
+  <string name="pref_transparent_tethering_summary"></string>
+  <string name="button_grant_superuser"></string>
+  <string name="pref_select_apps"></string>
+  <string name="pref_select_apps_summary"></string>
+  <string name="pref_node_configuration"></string>
+  <string name="pref_node_configuration_summary"></string>
+  <string name="pref_entrance_node"></string>
+  <string name="pref_entrance_node_summary"></string>
+  <string name="pref_entrance_node_dialog"></string>
+  <string name="pref_use_whispercore"></string>
+  <string name="pref_use_whispercore_summary"></string>
+  <string name="pref_proxy_type_title"></string>
+  <string name="pref_proxy_type_summary"></string>
+  <string name="pref_proxy_type_dialog"></string>
+  <string name="pref_proxy_host_title"></string>
+  <string name="pref_proxy_host_summary"></string>
+  <string name="pref_proxy_host_dialog"></string>
+  <string name="pref_proxy_port_title"></string>
+  <string name="pref_proxy_port_summary"></string>
+  <string name="pref_proxy_port_dialog"></string>
 </resources>
diff --git a/values-fr/strings.xml b/values-fr/strings.xml
index 78b44b3..82531a4 100644
--- a/values-fr/strings.xml
+++ b/values-fr/strings.xml
@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="app_version">1.0.5.2</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>
@@ -12,10 +11,9 @@
   <string name="status_activated">Connecté au réseau Tor</string>
   <string name="status_disabled">\"Orbot est désactivé</string>
   <string name="status_shutting_down">Orbot s\'arrête</string>
-  <string name="tor_process_connecting">Démarrage de Tor...</string>
-  <string name="tor_process_connecting_step2">Configuration en cours...</string>
-  <string name="tor_process_connecting_step3">effectué.</string>
-  <string name="tor_process_connecting_step4">en attente.</string>
+  <string name="tor_process_starting"></string>
+  <string name="tor_process_complete"></string>
+  <string name="tor_process_waiting"></string>
   <string name="not_anonymous_yet">AVERTISSEMENT: Votre traffic n\'est pas encore anonyme ! Veuillez configurer vos applications pour qu\'elles utilisent le proxy HTTP à 127.0.0.1:8118 ou le proxy SOCKS4A ou SOCKS5 à 127.0.0.1:9050</string>
   <string name="menu_home">Accueil</string>
   <string name="menu_browse">Parcourir</string>
@@ -57,7 +55,6 @@
   <string name="btn_finish">Fin</string>
   <string name="btn_okay">Valider</string>
   <string name="btn_cancel">Annuler</string>
-  <string name="wizard_welcome_msg">Orbot permet de fournir les services de Tor à Android. Tor est un logiciel libre et un réseau ouvert qui aide à vous défendre contre une forme de surveillance des réseaux informatiques qui menace les libertés individuelles et l\'anonymat, la confidentialité des activités d\'affaires et des relations interpersonnelles, et la sécurité des gouvernements, connu sous le nom d\'analyse de trafic \ n \ n * AVERTISSEMENT : * Il ne suffit pas d\'installer Orbot pour que votre trafic mobile soit anonymisé ! Cet assistant va vous y aider.</string>
   <string name="wizard_details">Quelques détails sur Orbot</string>
   <string name="wizard_details_msg">Orbot est une application logicielle libre qui contient Tor, LibEvent et Privoxy. Il fournit un proxy local HTTP (8118) et un proxy SOCKS (9050) dans le réseau Tor. Orbot a aussi la capacité, avec les droits administrateurs, d\'envoyer tout le trafic Internet à travers Tor.</string>
   <string name="wizard_permissions_root">Permission accordée</string>
@@ -74,7 +71,6 @@
   <string name="wizard_tips_tricks">Applications avec Orbot</string>
   <string name="wizard_tips_msg">Nous vous encouragons à télécharger &amp;amp; utiliser les applications conçues pour se connecter directement à Orbot. Cliquez sur les boutons ci-dessous pour installer.</string>
   <string name="wizard_tips_otrchat">Gibberbot - Client de messagerie instantanée pour Android</string>
-  <string name="wizard_tips_orweb">ORWEB (Android 1.x seulement) - navigateur créé pour protéger votre vie privée &amp;amp; pour Orbot</string>
   <string name="wizard_tips_proxy">Configuration du proxy - Apprendre comment configurer les applications pour qu\'elles fonctionnent avec Orbot</string>
   <string name="wizard_proxy_help_info">Configuration du proxy</string>
   <string name="wizard_proxy_help_msg">Si l\'application Android que vous utilisez peut supporter un proxy HTTP ou un proxy SOCKS, vous pouvez la configurer pour se connecter à Orbot et utiliser Tor./n/n
@@ -84,12 +80,47 @@
     </string>
   <string name="wizard_final">Orbot est prêt!</string>
   <string name="wizard_final_msg">Des milliers de personnes dans le monde utilisent Tor pour une grande variétés de raisons : journalistes et bloggers, défenseurs des droits de l\'homme, policiers, soldats, entreprises, les citoyens de régimes répressifs, et aussi de simples citoyens ... et maintenant vous êtes prêts aussi !</string>
-  <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
-  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
   <string name="connect_first_time"> Vous êtes connectés avec succés au réseau Tor - mais cela ne signifie PAS que votre appareil est sécurisé. Vous pouvez utiliser l\'option \'Vérifier\'  du menu pour vérifier avec votre navigateur. \n\nAllez à la page https://guardianproject.info/apps/orbot ou envoyez un courriel à help@xxxxxxxxxxxxxxxxxxxx pour en savoir plus.</string>
   <string name="tor_check">Ceci va ouvrir la page https://check.torproject.org avec le navigateur web par défaut pour vérifier si Orbot est suffisamment configuré pour vous connecter à Tor.</string>
   <string name="pref_hs_group">Services cachés</string>
   <string name="pref_general_group">Général</string>
   <string name="pref_start_boot_title">Exécuter Orbot automatiquement</string>
   <string name="pref_start_boot_summary">Démarrer automatiquement Orbot et se connecter à Tor quand votre périphérique Android démarre</string>
+  <string name="wizard_title_msg"></string>
+  <string name="wizard_warning_title"></string>
+  <string name="wizard_warning_msg"></string>
+  <string name="wizard_permissions_title"></string>
+  <string name="wizard_permissions_root_msg1"></string>
+  <string name="wizard_permissions_root_msg2"></string>
+  <string name="wizard_permissions_no_root_msg"></string>
+  <string name="wizard_tips_title"></string>
+  <string name="wizard_tips_gibberbot"></string>
+  <string name="gibberbot_apk_url"></string>
+  <string name="wizard_tips_orweb">ORWEB (Android 1.x seulement) - navigateur créé pour protéger votre vie privée &amp;amp; pour Orbot</string>
+  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <string name="wizard_transproxy_title"></string>
+  <string name="wizard_transproxy_msg"></string>
+  <string name="wizard_transproxy_hint"></string>
+  <string name="wizard_transproxy_none"></string>
+  <string name="pref_transparent_tethering_title"></string>
+  <string name="pref_transparent_tethering_summary"></string>
+  <string name="button_grant_superuser"></string>
+  <string name="pref_select_apps"></string>
+  <string name="pref_select_apps_summary"></string>
+  <string name="pref_node_configuration"></string>
+  <string name="pref_node_configuration_summary"></string>
+  <string name="pref_entrance_node"></string>
+  <string name="pref_entrance_node_summary"></string>
+  <string name="pref_entrance_node_dialog"></string>
+  <string name="pref_use_whispercore"></string>
+  <string name="pref_use_whispercore_summary"></string>
+  <string name="pref_proxy_type_title"></string>
+  <string name="pref_proxy_type_summary"></string>
+  <string name="pref_proxy_type_dialog"></string>
+  <string name="pref_proxy_host_title"></string>
+  <string name="pref_proxy_host_summary"></string>
+  <string name="pref_proxy_host_dialog"></string>
+  <string name="pref_proxy_port_title"></string>
+  <string name="pref_proxy_port_summary"></string>
+  <string name="pref_proxy_port_dialog"></string>
 </resources>
diff --git a/values-hu/strings.xml b/values-hu/strings.xml
index d135dd2..6ed5ff8 100644
--- a/values-hu/strings.xml
+++ b/values-hu/strings.xml
@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="app_version">1.0.5.2</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>
@@ -12,10 +11,9 @@
   <string name="status_activated">Csatlakozva a Tor hálózathoz</string>
   <string name="status_disabled">\"Orbot deaktiválva</string>
   <string name="status_shutting_down">Az Orbot leállítás alatt</string>
-  <string name="tor_process_connecting">Tor indítása...</string>
-  <string name="tor_process_connecting_step2">VezérlÅ? beállítása...</string>
-  <string name="tor_process_connecting_step3">kész.</string>
-  <string name="tor_process_connecting_step4">várakozik.</string>
+  <string name="tor_process_starting"></string>
+  <string name="tor_process_complete"></string>
+  <string name="tor_process_waiting"></string>
   <string name="not_anonymous_yet">FIGYELEM: A forgalma még nem névtelen! �llítsa be alkalmazásait, hogy HTTP proxy használjanak a 127.0.0.1:8118 címen vagy SOCKS4A vagy SOCKS5 proxy-t a 127.0.0.1:9050 címen</string>
   <string name="menu_home">KezdÅ?lap</string>
   <string name="menu_browse">Tallóz</string>
@@ -57,7 +55,6 @@
   <string name="btn_finish">Befejezés</string>
   <string name="btn_okay">OK</string>
   <string name="btn_cancel">Mégsem</string>
-  <string name="wizard_welcome_msg">Az Orbot elérhetÅ?vé teszi a Tor-t Android-on. A Tor egy ingynes szoftver és egy nyílt hálózat, amely védi a hálózati megfigyeléstÅ?l, ezáltal magánéletét és személyes szabadságát, bizalmas üzleti tevékenységeit és kapcsolatait, védi az állami szervek forgalom elemzésétÅ?l.\n\n*FIGYELEM:* Az Orbot telepítése _NEM_ egy varázslattal teszi névtelenné mobil forgalmát! Ez a varázsló végigvezeti a kezdeteken.</string>
   <string name="wizard_details">Néhány Orbot Tudnivaló</string>
   <string name="wizard_details_msg">Az Orbot egy nyílt forrás alkalmazás, ami a Tor, a LibEvent és Privoxy csomagot tartalmazza. Szolgáltatása egy helyi  HTTP proxy (8118) és egy SOCKS proxy (9050) a Tor hálózat felé. Az Orbot további tulajdonsága, hogy rootolt készülék esetén képes a teljes internet forgalom Tor hálózaton keresztül küldésére.</string>
   <string name="wizard_permissions_root">Jogosultság megadva</string>
@@ -74,7 +71,6 @@
   <string name="wizard_tips_tricks">Orbot-engedélyezett alkalmazások</string>
   <string name="wizard_tips_msg">Javasoljuk, hogy töltsön le és használjon olyan alkalmazásokat, amelyek tudják, hogyna kell közvetlenül kapcsolódni az Orbot-hoz. Kattintson az gombokra alább a telepítéshez.</string>
   <string name="wizard_tips_otrchat">Gibberbot - Biztonságos azonnali üzenetküldÅ? kliens Android-ra</string>
-  <string name="wizard_tips_orweb">ORWEB (csak Android 1.x) - BöngészÅ?, kifejezetten adatvédelemre és az Orbot-hoz</string>
   <string name="wizard_tips_proxy">Proxy beállítások - Tanulja meg, hogyan állíthatja be alkalmazásait, hogy együttműködjenek az Orbot-tal</string>
   <string name="wizard_proxy_help_info">Proxy beállítások</string>
   <string name="wizard_proxy_help_msg">Ha az Android alkalmazás, amit használ képes a HTTP vagy SOCKS proxy-k használatára, akkor be tudja állítani, hogy csatlakozzon az Orbot-hoz és használj a Tor-t.\n\n
@@ -84,12 +80,47 @@
     </string>
   <string name="wizard_final">Az Orbot kész!</string>
   <string name="wizard_final_msg">Több száezren használják szerte a világon a Tor-t különbözÅ? okokból: újságírók, bloggerek, emberi jogi aktivisták, rendvédelmi szervek dolgozói, katonák, vállalatok, elnyomó rezsimek polgárai, vagy csak egyszerű polgárok... és most készen áll erre Ã?n is!</string>
-  <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
-  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
   <string name="connect_first_time"> Sikeresen csatlakozott a Tor hálózathoz - de ez NEM azt jelenti, hogy a készüléke biztonságos. EllenÅ?rizze az \'EllenÅ?rzés\' opcióval a menübÅ?l a böngészÅ?jét.\n\nLátogassa meg a https://guardianproject.info/apps/orbot oldalt vagy küldjön emailt a help@xxxxxxxxxxxxxxxxxxxx címre a további információkért.</string>
   <string name="tor_check">Ez megnyitja az alapértelmezett böngészÅ?t, és elnavigálja a https://check.torproject.orgoldalra, hogy ellenÅ?rizze, hogy az Orbot helyesen konfigurált-e, és hogy csatlakozott-e a Tor hálózathoz.</string>
   <string name="pref_hs_group">Rejtett szolgáltatások</string>
   <string name="pref_general_group">�ltalános</string>
   <string name="pref_start_boot_title">Az Orbot indítása bekapcsoláskor</string>
   <string name="pref_start_boot_summary">Automatikusan elindítja az Orbot-ot, és csatlakozik a hálózathoz, amikor az Android eszköz elindul</string>
+  <string name="wizard_title_msg"></string>
+  <string name="wizard_warning_title"></string>
+  <string name="wizard_warning_msg"></string>
+  <string name="wizard_permissions_title"></string>
+  <string name="wizard_permissions_root_msg1"></string>
+  <string name="wizard_permissions_root_msg2"></string>
+  <string name="wizard_permissions_no_root_msg"></string>
+  <string name="wizard_tips_title"></string>
+  <string name="wizard_tips_gibberbot"></string>
+  <string name="gibberbot_apk_url"></string>
+  <string name="wizard_tips_orweb">ORWEB (csak Android 1.x) - BöngészÅ?, kifejezetten adatvédelemre és az Orbot-hoz</string>
+  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <string name="wizard_transproxy_title"></string>
+  <string name="wizard_transproxy_msg"></string>
+  <string name="wizard_transproxy_hint"></string>
+  <string name="wizard_transproxy_none"></string>
+  <string name="pref_transparent_tethering_title"></string>
+  <string name="pref_transparent_tethering_summary"></string>
+  <string name="button_grant_superuser"></string>
+  <string name="pref_select_apps"></string>
+  <string name="pref_select_apps_summary"></string>
+  <string name="pref_node_configuration"></string>
+  <string name="pref_node_configuration_summary"></string>
+  <string name="pref_entrance_node"></string>
+  <string name="pref_entrance_node_summary"></string>
+  <string name="pref_entrance_node_dialog"></string>
+  <string name="pref_use_whispercore"></string>
+  <string name="pref_use_whispercore_summary"></string>
+  <string name="pref_proxy_type_title"></string>
+  <string name="pref_proxy_type_summary"></string>
+  <string name="pref_proxy_type_dialog"></string>
+  <string name="pref_proxy_host_title"></string>
+  <string name="pref_proxy_host_summary"></string>
+  <string name="pref_proxy_host_dialog"></string>
+  <string name="pref_proxy_port_title"></string>
+  <string name="pref_proxy_port_summary"></string>
+  <string name="pref_proxy_port_dialog"></string>
 </resources>
diff --git a/values-it/strings.xml b/values-it/strings.xml
index 8cf7205..eadd004 100644
--- a/values-it/strings.xml
+++ b/values-it/strings.xml
@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="app_version">1.0.5.2</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>
@@ -12,10 +11,9 @@
   <string name="status_activated">Connesso alla rete Tor</string>
   <string name="status_disabled">\"Orbot è disattivato</string>
   <string name="status_shutting_down">Orbot si sta spegnendo</string>
-  <string name="tor_process_connecting">Avvio di Tor..</string>
-  <string name="tor_process_connecting_step2">Controllo impostazioni...</string>
-  <string name="tor_process_connecting_step3">completo.</string>
-  <string name="tor_process_connecting_step4">in attesa.</string>
+  <string name="tor_process_starting"></string>
+  <string name="tor_process_complete"></string>
+  <string name="tor_process_waiting"></string>
   <string name="not_anonymous_yet">ATTENZIONE: Il traffico non è ancora anonimo! Configura le applicazioni per utilizzare il proxy HTTP 127.0.0.1:8118,  SOCKS4A o proxy SOCKS5 127.0.0.1:9050</string>
   <string name="menu_home">Home</string>
   <string name="menu_browse">Sfoglia</string>
@@ -57,7 +55,6 @@
   <string name="btn_finish">Fine</string>
   <string name="btn_okay">Ok</string>
   <string name="btn_cancel">Annulla</string>
-  <string name="wizard_welcome_msg"></string>
   <string name="wizard_details">Alcuni dettagli su Orbot</string>
   <string name="wizard_details_msg">Orbot è un\' applicazione open-source che contiene Tor, LibEvent and Privoxy. Fornisce un proxy HTTP locale (8118) e un proxy SOCKS (9050) verso la rete Tor. Orbot ha anche la capacità, su dispositivi con root, di far passare tutto il traffico internet attraverso Tor.</string>
   <string name="wizard_permissions_root">Permesso concesso</string>
@@ -74,7 +71,6 @@
   <string name="wizard_tips_tricks">App abilitate per Orbot</string>
   <string name="wizard_tips_msg">Ti invitiamo a scaricare &amp;amp; usare app che possono connettersi direttamente a Orbot. Fai click sui pulsanti qui sotto per installare.</string>
   <string name="wizard_tips_otrchat">Gibberbot - Client sicuro di instant messaging per Android</string>
-  <string name="wizard_tips_orweb">ORWEB (Solo Android 1.x) - Browser progettato per la privacy e Orbot</string>
   <string name="wizard_tips_proxy">Impostazioni proxy - Ulteriori informazioni su come configurare le app per funzionare con Orbot</string>
   <string name="wizard_proxy_help_info">Impostazioni proxy</string>
   <string name="wizard_proxy_help_msg">Se la versione di Android che stai utilizzando supporta l\'utilizzo di un proxy HTTP o SOCKS allora puoi utilizzarla per connetterti a Orbot e utilizzare Tor.\n\n
@@ -84,8 +80,6 @@ Ulteriori informazioni sul proxying per Android nelle FAQ all\' indirizzo: http:
     </string>
   <string name="wizard_final">Orbot è pronto!</string>
   <string name="wizard_final_msg">Centinaia di migliaia di persone nel mondo usano Tor per una varietà di motivi: giornalisti e bloggers, lavoratori per i diritti umani, ufficiali delle forze dell\'ordine, soldati, aziende, cittadini di paesi repressivi, e anche cittadini qualunque... e ora sei pronto a farlo anche tu!</string>
-  <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
-  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
   <string name="connect_first_time">Ti sei collegato correttamente alla rete Tor - ma questo NON significa che il dispositivo è sicuro. � possibile utilizzare l\'opzione \'Controlla\' dal menù per testare il browser. \n\n
 Visita il nostro sito web https://guardianproject.info/apps/orbot o invia una mail a help@xxxxxxxxxxxxxxxxxxxx per saperne di più.</string>
   <string name="tor_check">Si aprirà il browser web predefinito per https://check.torproject.org per controllare se Orbot probabilmente è configurato e si è connessi a Tor.</string>
@@ -93,4 +87,41 @@ Visita il nostro sito web https://guardianproject.info/apps/orbot o invia una ma
   <string name="pref_general_group">Generale</string>
   <string name="pref_start_boot_title">Avvia Orbot al boot</string>
   <string name="pref_start_boot_summary">Avvia automaticamente Orbot e connetti Tor quando il dispositivo Android viene avviato</string>
+  <string name="wizard_title_msg"></string>
+  <string name="wizard_warning_title"></string>
+  <string name="wizard_warning_msg"></string>
+  <string name="wizard_permissions_title"></string>
+  <string name="wizard_permissions_root_msg1"></string>
+  <string name="wizard_permissions_root_msg2"></string>
+  <string name="wizard_permissions_no_root_msg"></string>
+  <string name="wizard_tips_title"></string>
+  <string name="wizard_tips_gibberbot"></string>
+  <string name="gibberbot_apk_url"></string>
+  <string name="wizard_tips_orweb">ORWEB (Solo Android 1.x) - Browser progettato per la privacy e Orbot</string>
+  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <string name="wizard_transproxy_title"></string>
+  <string name="wizard_transproxy_msg"></string>
+  <string name="wizard_transproxy_hint"></string>
+  <string name="wizard_transproxy_none"></string>
+  <string name="pref_transparent_tethering_title"></string>
+  <string name="pref_transparent_tethering_summary"></string>
+  <string name="button_grant_superuser"></string>
+  <string name="pref_select_apps"></string>
+  <string name="pref_select_apps_summary"></string>
+  <string name="pref_node_configuration"></string>
+  <string name="pref_node_configuration_summary"></string>
+  <string name="pref_entrance_node"></string>
+  <string name="pref_entrance_node_summary"></string>
+  <string name="pref_entrance_node_dialog"></string>
+  <string name="pref_use_whispercore"></string>
+  <string name="pref_use_whispercore_summary"></string>
+  <string name="pref_proxy_type_title"></string>
+  <string name="pref_proxy_type_summary"></string>
+  <string name="pref_proxy_type_dialog"></string>
+  <string name="pref_proxy_host_title"></string>
+  <string name="pref_proxy_host_summary"></string>
+  <string name="pref_proxy_host_dialog"></string>
+  <string name="pref_proxy_port_title"></string>
+  <string name="pref_proxy_port_summary"></string>
+  <string name="pref_proxy_port_dialog"></string>
 </resources>
diff --git a/values-mk/strings.xml b/values-mk/strings.xml
index d6fdf98..2872d70 100644
--- a/values-mk/strings.xml
+++ b/values-mk/strings.xml
@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Ð?Ñ?боÑ?</string>
-  <string name="app_version">1.0.5.2</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>
@@ -12,10 +11,9 @@
   <string name="status_activated">Ð?овÑ?зан на мÑ?ежаÑ?а ТоÑ?</string>
   <string name="status_disabled">\"Ð?Ñ?боÑ? е дезакÑ?ивиÑ?ан</string>
   <string name="status_shutting_down">Ð?Ñ?боÑ? Ñ?е иÑ?клÑ?Ñ?Ñ?ва</string>
-  <string name="tor_process_connecting">Ð?клÑ?Ñ?Ñ?ваÑ?е на ТоÑ?...</string>
-  <string name="tor_process_connecting_step2">Ð?оÑ?поÑ?Ñ?авÑ?ваÑ?е конÑ?Ñ?ола...</string>
-  <string name="tor_process_connecting_step3">гоÑ?ово.</string>
-  <string name="tor_process_connecting_step4">Ñ?екаÑ?е.</string>
+  <string name="tor_process_starting"></string>
+  <string name="tor_process_complete"></string>
+  <string name="tor_process_waiting"></string>
   <string name="not_anonymous_yet">Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?: Ð?аÑ?иоÑ? Ñ?ообÑ?аÑ?аÑ? Ñ?еÑ?Ñ?Ñ?е не е анонимен! ТÑ?еба да ги конÑ?игÑ?Ñ?иÑ?аÑ?е Ð?аÑ?иÑ?е апликаÑ?ии да го коÑ?иÑ?Ñ?аÑ? пÑ?окÑ?иÑ?о за HTTP, 127.0.0.1:8118, или пÑ?окÑ?иÑ?о за SOCKS4A или SOCKS5, 127.0.0.1:9050</string>
   <string name="menu_home">Ð?ома</string>
   <string name="menu_browse">Ð?Ñ?елиÑ?Ñ?Ñ?ваÑ?е</string>
@@ -57,7 +55,6 @@
   <string name="btn_finish">Ð?Ñ?аÑ?</string>
   <string name="btn_okay">Ð?о Ñ?ед</string>
   <string name="btn_cancel">Ð?Ñ?кажи Ñ?е</string>
-  <string name="wizard_welcome_msg">Ð?Ñ?боÑ? овозможÑ?ва Ñ?абоÑ?а Ñ?о ТоÑ? на Ð?ндÑ?оид. ТоÑ? е Ñ?лободен Ñ?оÑ?Ñ?веÑ? и оÑ?воÑ?ена мÑ?ежа коÑ?аÑ?Ñ?о Ð?и помага да Ñ?е заÑ?Ñ?иÑ?иÑ?е од одÑ?еден вид мÑ?ежно пÑ?иÑ?лÑ?Ñ?кÑ?ваÑ?е, познаÑ? како анализа на Ñ?ообÑ?аÑ?аÑ? (traffic analysis), коÑ? пÑ?еÑ?Ñ?Ñ?авÑ?вааÑ? закана за лиÑ?наÑ?а Ñ?лобода и пÑ?иваÑ?ноÑ?Ñ?, за Ñ?Ñ?опанÑ?киÑ?е деÑ?ноÑ?Ñ?и и одноÑ?и од довеÑ?лив каÑ?акÑ?еÑ?, како и за дÑ?жавнаÑ?а безбедноÑ?Ñ?.\n\n*Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?:*СамиоÑ? Ñ?акÑ? Ñ?Ñ?о Ñ?Ñ?е го инÑ?Ñ?алиÑ?але Ð?Ñ?боÑ? _нема_ авÑ?омаÑ?Ñ?ки да го напÑ?ави Ð?аÑ?иоÑ? мобилен Ñ?ообÑ?аÑ?аÑ? анонимен! Ð?о, овоÑ? пÑ?озоÑ? Ñ?е Ð?и помогне да Ñ?е иниÑ?иÑ?аÑ?е.</string>
   <string name="wizard_details">Ð?екои деÑ?али за Ð?Ñ?боÑ?</string>
   <string name="wizard_details_msg">Ð?Ñ?боÑ? е апликаÑ?иÑ?а Ñ?о оÑ?воÑ?ен код коÑ?аÑ?Ñ?о го Ñ?одÑ?жи ТоÑ?, LibEvent и Privoxy. Таа Ð?и нÑ?ди локални пÑ?окÑ?иÑ?а за HTTP (поÑ?Ñ? 8118) и SOCKS (поÑ?Ñ? 9050) за повÑ?зÑ?ваÑ?е Ñ?о мÑ?ежаÑ?а ТоÑ?. Ð?Ñ?боÑ? иÑ?Ñ?о Ñ?ака нÑ?ди можноÑ?Ñ?, на Ñ?Ñ?еди Ñ?о root пÑ?иÑ?Ñ?ап, Ñ?елиоÑ? Ñ?ообÑ?аÑ?аÑ? да Ñ?е пÑ?енаÑ?оÑ?и пÑ?екÑ? ТоÑ?.</string>
   <string name="wizard_permissions_root">Ð?озволаÑ?а е издадена</string>
@@ -74,7 +71,6 @@
   <string name="wizard_tips_tricks">Ð?Ñ?боÑ?-вклÑ?Ñ?ени апликаÑ?ии</string>
   <string name="wizard_tips_msg">Ð?и пÑ?епоÑ?аÑ?Ñ?ваме да пÑ?езимаÑ?е и коÑ?иÑ?Ñ?иÑ?е апликаÑ?ии кои Ñ?Ñ?о знааÑ? како диÑ?екÑ?но да Ñ?е повÑ?заÑ? Ñ?о Ð?Ñ?боÑ?. Ð?Ñ?иÑ?иÑ?неÑ?е на копÑ?иÑ?аÑ?а подолÑ? за инÑ?Ñ?алиÑ?аÑ?е.</string>
   <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
-  <string name="wizard_tips_orweb">ORWEB (Ñ?амо Ð?ндÑ?оид 1.x) - Ð?Ñ?аÑ?Ñ?еÑ? дизаÑ?ниÑ?ан за пÑ?иваÑ?ноÑ?Ñ? и за Ð?Ñ?боÑ?</string>
   <string name="wizard_tips_proxy">Ð?одеÑ?Ñ?ваÑ?а на пÑ?окÑ?и - Ð?аÑ?Ñ?еÑ?е како да ги конÑ?игÑ?Ñ?иÑ?аÑ?е апликаÑ?ииÑ?е да Ñ?абоÑ?аÑ? Ñ?о Ð?Ñ?боÑ?</string>
   <string name="wizard_proxy_help_info">Ð?одеÑ?Ñ?ваÑ?а на пÑ?окÑ?и</string>
   <string name="wizard_proxy_help_msg">Ð?ко апликаÑ?иÑ?аÑ?а за Ð?ндÑ?оид Ñ?Ñ?о Ñ?а коÑ?иÑ?Ñ?иÑ?е поддÑ?жÑ?ва Ñ?поÑ?Ñ?еба на пÑ?окÑ?и за HTTP или SOCKS, Ñ?огаÑ? може да Ñ?а конÑ?игÑ?Ñ?иÑ?аÑ?е да Ñ?е повÑ?зе Ñ?о Ð?Ñ?боÑ? и да коÑ?иÑ?Ñ?и ТоÑ?. \n\n
@@ -84,12 +80,47 @@
     </string>
   <string name="wizard_final">Ð?Ñ?боÑ? е Ñ?пÑ?емен!</string>
   <string name="wizard_final_msg">СÑ?оÑ?иÑ?и илÑ?ади лÑ?Ñ?е низ Ñ?елиоÑ? СвеÑ? го коÑ?иÑ?Ñ?аÑ? ТоÑ? од многÑ? Ñ?азлиÑ?ни пÑ?иÑ?ини: новинаÑ?и и блогеÑ?и, боÑ?Ñ?и за Ñ?овекови пÑ?ава, полиÑ?аÑ?Ñ?и, воÑ?ниÑ?и, коÑ?поÑ?аÑ?ии, гÑ?аÑ?ани на Ñ?епÑ?еÑ?ивни Ñ?ежими, и обиÑ?ни гÑ?аÑ?ани... а Ñ?ега и Ð?ие Ñ?Ñ?е Ñ?пÑ?емин да го коÑ?иÑ?Ñ?иÑ?е!</string>
-  <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
-  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
   <string name="connect_first_time"> УÑ?пеÑ?но Ñ?е повÑ?завÑ?е на мÑ?ежаÑ?а ТоÑ? - но ова Ð?Ð? знаÑ?и дека важиоÑ? Ñ?Ñ?ед е Ñ?игÑ?Ñ?ен. Ð?а да го пÑ?овеÑ?иÑ?е Ð?аÑ?иоÑ? бÑ?аÑ?Ñ?еÑ?, избеÑ?еÑ?е Ñ?а опÑ?иÑ?аÑ?а â??Ð?Ñ?овеÑ?иâ?? во мениÑ?о. \n\nÐ?оÑ?еÑ?еÑ?е нÑ? на 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>
+  <string name="wizard_title_msg"></string>
+  <string name="wizard_warning_title"></string>
+  <string name="wizard_warning_msg"></string>
+  <string name="wizard_permissions_title"></string>
+  <string name="wizard_permissions_root_msg1"></string>
+  <string name="wizard_permissions_root_msg2"></string>
+  <string name="wizard_permissions_no_root_msg"></string>
+  <string name="wizard_tips_title"></string>
+  <string name="wizard_tips_gibberbot"></string>
+  <string name="gibberbot_apk_url"></string>
+  <string name="wizard_tips_orweb">ORWEB (Ñ?амо Ð?ндÑ?оид 1.x) - Ð?Ñ?аÑ?Ñ?еÑ? дизаÑ?ниÑ?ан за пÑ?иваÑ?ноÑ?Ñ? и за Ð?Ñ?боÑ?</string>
+  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <string name="wizard_transproxy_title"></string>
+  <string name="wizard_transproxy_msg"></string>
+  <string name="wizard_transproxy_hint"></string>
+  <string name="wizard_transproxy_none"></string>
+  <string name="pref_transparent_tethering_title"></string>
+  <string name="pref_transparent_tethering_summary"></string>
+  <string name="button_grant_superuser"></string>
+  <string name="pref_select_apps"></string>
+  <string name="pref_select_apps_summary"></string>
+  <string name="pref_node_configuration"></string>
+  <string name="pref_node_configuration_summary"></string>
+  <string name="pref_entrance_node"></string>
+  <string name="pref_entrance_node_summary"></string>
+  <string name="pref_entrance_node_dialog"></string>
+  <string name="pref_use_whispercore"></string>
+  <string name="pref_use_whispercore_summary"></string>
+  <string name="pref_proxy_type_title"></string>
+  <string name="pref_proxy_type_summary"></string>
+  <string name="pref_proxy_type_dialog"></string>
+  <string name="pref_proxy_host_title"></string>
+  <string name="pref_proxy_host_summary"></string>
+  <string name="pref_proxy_host_dialog"></string>
+  <string name="pref_proxy_port_title"></string>
+  <string name="pref_proxy_port_summary"></string>
+  <string name="pref_proxy_port_dialog"></string>
 </resources>
diff --git a/values-nb/strings.xml b/values-nb/strings.xml
index b257a3c..7124442 100644
--- a/values-nb/strings.xml
+++ b/values-nb/strings.xml
@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="app_version">1.0.5.2</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>
@@ -12,10 +11,9 @@
   <string name="status_activated">Tilkoblet Tor-nettverket</string>
   <string name="status_disabled">\"Orbot er deaktivert</string>
   <string name="status_shutting_down">Orbot skrur seg av</string>
-  <string name="tor_process_connecting">Starter Tor...</string>
-  <string name="tor_process_connecting_step2">autentiserer kontrolltilkobling...</string>
-  <string name="tor_process_connecting_step3">ferdig.</string>
-  <string name="tor_process_connecting_step4">venter.</string>
+  <string name="tor_process_starting"></string>
+  <string name="tor_process_complete"></string>
+  <string name="tor_process_waiting"></string>
   <string name="not_anonymous_yet">ADVARSEL: Trafikken din er ikke anonym helt enda! Vær vennlig og konfigurer applikasjonene dine til å bruke HTTP proxy 127.0.0.1:8118 eller SOCKS4A eller SOCKS5 proxy 127.0.0.1:9050</string>
   <string name="menu_home">Hjem</string>
   <string name="menu_browse">GÃ¥ til</string>
@@ -57,7 +55,6 @@
   <string name="btn_finish"></string>
   <string name="btn_okay"></string>
   <string name="btn_cancel"></string>
-  <string name="wizard_welcome_msg"></string>
   <string name="wizard_details"></string>
   <string name="wizard_details_msg"></string>
   <string name="wizard_permissions_root"></string>
@@ -74,18 +71,52 @@
   <string name="wizard_tips_tricks"></string>
   <string name="wizard_tips_msg"></string>
   <string name="wizard_tips_otrchat"></string>
-  <string name="wizard_tips_orweb"></string>
   <string name="wizard_tips_proxy"></string>
   <string name="wizard_proxy_help_info"></string>
   <string name="wizard_proxy_help_msg"></string>
   <string name="wizard_final"></string>
   <string name="wizard_final_msg"></string>
-  <string name="otrchat_apk_url"></string>
-  <string name="orweb_apk_url"></string>
   <string name="connect_first_time"></string>
   <string name="tor_check"></string>
   <string name="pref_hs_group"></string>
   <string name="pref_general_group"></string>
   <string name="pref_start_boot_title"></string>
   <string name="pref_start_boot_summary"></string>
+  <string name="wizard_title_msg"></string>
+  <string name="wizard_warning_title"></string>
+  <string name="wizard_warning_msg"></string>
+  <string name="wizard_permissions_title"></string>
+  <string name="wizard_permissions_root_msg1"></string>
+  <string name="wizard_permissions_root_msg2"></string>
+  <string name="wizard_permissions_no_root_msg"></string>
+  <string name="wizard_tips_title"></string>
+  <string name="wizard_tips_gibberbot"></string>
+  <string name="gibberbot_apk_url"></string>
+  <string name="wizard_tips_orweb"></string>
+  <string name="orweb_apk_url"></string>
+  <string name="wizard_transproxy_title"></string>
+  <string name="wizard_transproxy_msg"></string>
+  <string name="wizard_transproxy_hint"></string>
+  <string name="wizard_transproxy_none"></string>
+  <string name="pref_transparent_tethering_title"></string>
+  <string name="pref_transparent_tethering_summary"></string>
+  <string name="button_grant_superuser"></string>
+  <string name="pref_select_apps"></string>
+  <string name="pref_select_apps_summary"></string>
+  <string name="pref_node_configuration"></string>
+  <string name="pref_node_configuration_summary"></string>
+  <string name="pref_entrance_node"></string>
+  <string name="pref_entrance_node_summary"></string>
+  <string name="pref_entrance_node_dialog"></string>
+  <string name="pref_use_whispercore"></string>
+  <string name="pref_use_whispercore_summary"></string>
+  <string name="pref_proxy_type_title"></string>
+  <string name="pref_proxy_type_summary"></string>
+  <string name="pref_proxy_type_dialog"></string>
+  <string name="pref_proxy_host_title"></string>
+  <string name="pref_proxy_host_summary"></string>
+  <string name="pref_proxy_host_dialog"></string>
+  <string name="pref_proxy_port_title"></string>
+  <string name="pref_proxy_port_summary"></string>
+  <string name="pref_proxy_port_dialog"></string>
 </resources>
diff --git a/values-nl/strings.xml b/values-nl/strings.xml
index 005c6f3..641e9d3 100644
--- a/values-nl/strings.xml
+++ b/values-nl/strings.xml
@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="app_version">1.0.5.2</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>
@@ -12,10 +11,9 @@
   <string name="status_activated">Verbonden met het Tor netwerk</string>
   <string name="status_disabled">Orbot is uitgeschakeld</string>
   <string name="status_shutting_down">Orbot is bezig met afsluiten</string>
-  <string name="tor_process_connecting">Bezig met opstarten van Tor...</string>
-  <string name="tor_process_connecting_step2">Bezig met instellen aansturing</string>
-  <string name="tor_process_connecting_step3">klaar.</string>
-  <string name="tor_process_connecting_step4">aan het wachten.</string>
+  <string name="tor_process_starting"></string>
+  <string name="tor_process_complete"></string>
+  <string name="tor_process_waiting"></string>
   <string name="not_anonymous_yet">WAARSCHUWING: Je verkeer is nog niet anononiem! Stel je programma\'s in om gebruik te maken van HTTP proxy 127.0.0.1:8118 of SOCKS4A of SOCKS5 proxy 127.0.0.1:9050</string>
   <string name="menu_home">Thuis</string>
   <string name="menu_browse">Bladeren</string>
@@ -57,9 +55,6 @@
   <string name="btn_finish">Einde</string>
   <string name="btn_okay">OK</string>
   <string name="btn_cancel">Annuleren</string>
-  <string name="wizard_welcome_msg">Orbot brengt Tor naar de Android. Tor is vrije software en een open netwerk dat u helpt te verdedigen tegen een vorm van netwerk toezicht, bekend als traffic analysis, welke aanvallen zijn op uw vrijheid en privacy, geheime zakelijke activiteiten relaties en inlichtingendiensten.
-
-*WAARSCHUWING:* Door het installeren van Orbot wordt uw verkeer _niet_ automatisch geanonimiseerd! Deze wizard helpt u hier mee.</string>
   <string name="wizard_details">Enkele Orbot Details</string>
   <string name="wizard_details_msg">Orbot is een open-source applicatie die Tor, LibEvent en Privoxy bevat. Het creëert een lokale HTTP proxy (8118) en een SOCKS proxy (9050) naar het Tor netwerk. Orbot heeft ook de mogelijkheid om al het internet verkeer over het Tor netwerk te sturen.</string>
   <string name="wizard_permissions_root">Rechten toegewezen</string>
@@ -76,7 +71,6 @@
   <string name="wizard_tips_tricks">Orbot-geschikte Apps</string>
   <string name="wizard_tips_msg">We raden je aan om apps te downloaden die zich automatisch verbinden met Orbot. Klik op de knoppen hieronder om te installeren.</string>
   <string name="wizard_tips_otrchat">Gibberbot - Veilige instant messaging client voor Android</string>
-  <string name="wizard_tips_orweb">ORWEB (Alleen Android 1.x) - Browser gemaakt voor privacy &amp;amp; voor Orbot</string>
   <string name="wizard_tips_proxy">Proxy Instellingen - Leer hoe je apps te configureren voor Orbot</string>
   <string name="wizard_proxy_help_info">Proxy Instellingen</string>
   <string name="wizard_proxy_help_msg">Als de Android app die je gebruikt beschikt over een HTTP of SOCKS proxy instelling, dan kun je het configureren zodat het via Orbot over het Tor netwerk gaat.
@@ -89,8 +83,6 @@ Je kunt meer leren over het proxy-en op Android door naar de FAQ op http://tinyu
     </string>
   <string name="wizard_final">Orbot is klaar!</string>
   <string name="wizard_final_msg">Honderdduizenden verschillende mensen over de wereld gebruiken Tor, voor verschillende redenen. Zoals: journalisten, bloggers, mensen rechten medewerkers, soldaten, bedrijven, burgers met onderdrukte religies, en natuurlijk normale mensen... En nu ben jij er ook klaar voor!</string>
-  <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
-  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
   <string name="connect_first_time">Je bent succesvol verbonden met het Tor netwerk, maar dit betekent NIET dat je apparaat volledig veilig is. Gebruik te \'Check\' optie vanuit het menu om je browser te testen.
 
 Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een email naar help@xxxxxxxxxxxxxxxxxxxx voor vragen.</string>
@@ -99,4 +91,41 @@ Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een emai
   <string name="pref_general_group">Algemeen</string>
   <string name="pref_start_boot_title">Start Orbot bij boot</string>
   <string name="pref_start_boot_summary">Start Orbot automatisch en verbind metTor wanneer je Android apparaat opstart.</string>
+  <string name="wizard_title_msg"></string>
+  <string name="wizard_warning_title"></string>
+  <string name="wizard_warning_msg"></string>
+  <string name="wizard_permissions_title"></string>
+  <string name="wizard_permissions_root_msg1"></string>
+  <string name="wizard_permissions_root_msg2"></string>
+  <string name="wizard_permissions_no_root_msg"></string>
+  <string name="wizard_tips_title"></string>
+  <string name="wizard_tips_gibberbot"></string>
+  <string name="gibberbot_apk_url"></string>
+  <string name="wizard_tips_orweb">ORWEB (Alleen Android 1.x) - Browser gemaakt voor privacy &amp;amp; voor Orbot</string>
+  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <string name="wizard_transproxy_title"></string>
+  <string name="wizard_transproxy_msg"></string>
+  <string name="wizard_transproxy_hint"></string>
+  <string name="wizard_transproxy_none"></string>
+  <string name="pref_transparent_tethering_title"></string>
+  <string name="pref_transparent_tethering_summary"></string>
+  <string name="button_grant_superuser"></string>
+  <string name="pref_select_apps"></string>
+  <string name="pref_select_apps_summary"></string>
+  <string name="pref_node_configuration"></string>
+  <string name="pref_node_configuration_summary"></string>
+  <string name="pref_entrance_node"></string>
+  <string name="pref_entrance_node_summary"></string>
+  <string name="pref_entrance_node_dialog"></string>
+  <string name="pref_use_whispercore"></string>
+  <string name="pref_use_whispercore_summary"></string>
+  <string name="pref_proxy_type_title"></string>
+  <string name="pref_proxy_type_summary"></string>
+  <string name="pref_proxy_type_dialog"></string>
+  <string name="pref_proxy_host_title"></string>
+  <string name="pref_proxy_host_summary"></string>
+  <string name="pref_proxy_host_dialog"></string>
+  <string name="pref_proxy_port_title"></string>
+  <string name="pref_proxy_port_summary"></string>
+  <string name="pref_proxy_port_dialog"></string>
 </resources>
diff --git a/values-pl/strings.xml b/values-pl/strings.xml
index 21d4173..00a56ae 100644
--- a/values-pl/strings.xml
+++ b/values-pl/strings.xml
@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="app_version">1.0.5.2</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>
@@ -12,10 +11,9 @@
   <string name="status_activated">PodÅ?Ä?czony do sieci Tor</string>
   <string name="status_disabled">Orbot wyÅ?Ä?czony</string>
   <string name="status_shutting_down">Orbot wyÅ?Ä?cza siÄ?</string>
-  <string name="tor_process_connecting">Tor startuje...</string>
-  <string name="tor_process_connecting_step2">Ustawianie sterowania...</string>
-  <string name="tor_process_connecting_step3">zakoÅ?czono.</string>
-  <string name="tor_process_connecting_step4">oczekiwanie.</string>
+  <string name="tor_process_starting"></string>
+  <string name="tor_process_complete"></string>
+  <string name="tor_process_waiting"></string>
   <string name="not_anonymous_yet">UWAGA: Twoja komunikacja nie jest jeszcze anonimowa! ProszÄ? skonfiguruj aplikacje aby używaÅ?y serwera proxy HTTP 127.0.0.1:8118 lub SOCKS4A lub SOCKS5 127.0.0.1:9050</string>
   <string name="menu_home">Start</string>
   <string name="menu_browse">PrzeglÄ?daj</string>
@@ -57,7 +55,6 @@
   <string name="btn_finish">Koniec</string>
   <string name="btn_okay">OK</string>
   <string name="btn_cancel">Anuluj</string>
-  <string name="wizard_welcome_msg">Orbot daje Tora Androidowi. Tor jest otwartym oprogramowaniem i otwartÄ? sieciÄ?, która pomaga broniÄ? siÄ? przed podsÅ?uchem sieci znanym jako analiza ruchu, który zagraża wolnoÅ?ci osobistej i prywatnoÅ?ci, poufnym dziaÅ?aniom biznesowym i relacjami oraz bezpieczeÅ?stwu paÅ?stwa.\n\n*UWAGA:* Sama instalacja Orbota _nie_ zanonimizuje magicznie Twojego ruchu! Ten kreator pozwoli Ci w pierwszych krokach.</string>
   <string name="wizard_details">Niektóre szczegóÅ?y o Orbocie</string>
   <string name="wizard_details_msg">Orbot jest otwartÄ? aplikacjÄ? zawierajÄ?cÄ? Tora, LibEvent i Privoxy. Dostarcza lokalnego poÅ?rednika HTTP (8118) i SOCKS (9050) do sieci Tora. Orbot ma możliwoÅ?Ä?, na urzÄ?dzeniu uruchomionym z prawami administratora, wysyÅ?aÄ? caÅ?y ruch internetowy przez Tora.</string>
   <string name="wizard_permissions_root">DostÄ?p zezwolony</string>
@@ -74,7 +71,6 @@
   <string name="wizard_tips_tricks">Aplikacje skonfigurowane dla Orbota</string>
   <string name="wizard_tips_msg">ZachÄ?camy do pobierania i używania aplikacji, które wiedzÄ?, jak Å?Ä?czyÄ? siÄ? bezpoÅ?rednio z Orbotem. Kliknij na poniższe przyciski, by zainstalowaÄ?.</string>
   <string name="wizard_tips_otrchat">Gibberbot - Bezpieczny komunikator dla Androida</string>
-  <string name="wizard_tips_orweb">ORWEB (tylko Android 1.x) - PrzeglÄ?darka zaprojektowana do prywatnoÅ?ci i dla Orbota</string>
   <string name="wizard_tips_proxy">Ustawienia Proxy - NDowiedz siÄ?, jak konfiguroaÄ? aplikacje do wspóÅ?pracy z Orbotem</string>
   <string name="wizard_proxy_help_info">Ustawienia Proxy</string>
   <string name="wizard_proxy_help_msg">JeÅ?li aplikacja na Androida, której używasz ma obsÅ?ugÄ? proxy HTTP lub SOCKS, możesz skonfigurowaÄ? jÄ? do Å?Ä?czenia siÄ? z Orbotem i używania Tora.\n\n
@@ -84,12 +80,47 @@
     </string>
   <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">market://search?q=pname:info.guardianproject.otr.app.im</string>
-  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
   <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">Ogólne</string>
   <string name="pref_start_boot_title">Uruchamiaj Orbota przy starcie</string>
   <string name="pref_start_boot_summary">Automatycznie uruchamiaj Orbota i Å?Ä?cz siÄ? z Torem, gdy Twoje urzÄ?dzenie z Androidem siÄ? uruchomi</string>
+  <string name="wizard_title_msg"></string>
+  <string name="wizard_warning_title"></string>
+  <string name="wizard_warning_msg"></string>
+  <string name="wizard_permissions_title"></string>
+  <string name="wizard_permissions_root_msg1"></string>
+  <string name="wizard_permissions_root_msg2"></string>
+  <string name="wizard_permissions_no_root_msg"></string>
+  <string name="wizard_tips_title"></string>
+  <string name="wizard_tips_gibberbot"></string>
+  <string name="gibberbot_apk_url"></string>
+  <string name="wizard_tips_orweb">ORWEB (tylko Android 1.x) - PrzeglÄ?darka zaprojektowana do prywatnoÅ?ci i dla Orbota</string>
+  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <string name="wizard_transproxy_title"></string>
+  <string name="wizard_transproxy_msg"></string>
+  <string name="wizard_transproxy_hint"></string>
+  <string name="wizard_transproxy_none"></string>
+  <string name="pref_transparent_tethering_title"></string>
+  <string name="pref_transparent_tethering_summary"></string>
+  <string name="button_grant_superuser"></string>
+  <string name="pref_select_apps"></string>
+  <string name="pref_select_apps_summary"></string>
+  <string name="pref_node_configuration"></string>
+  <string name="pref_node_configuration_summary"></string>
+  <string name="pref_entrance_node"></string>
+  <string name="pref_entrance_node_summary"></string>
+  <string name="pref_entrance_node_dialog"></string>
+  <string name="pref_use_whispercore"></string>
+  <string name="pref_use_whispercore_summary"></string>
+  <string name="pref_proxy_type_title"></string>
+  <string name="pref_proxy_type_summary"></string>
+  <string name="pref_proxy_type_dialog"></string>
+  <string name="pref_proxy_host_title"></string>
+  <string name="pref_proxy_host_summary"></string>
+  <string name="pref_proxy_host_dialog"></string>
+  <string name="pref_proxy_port_title"></string>
+  <string name="pref_proxy_port_summary"></string>
+  <string name="pref_proxy_port_dialog"></string>
 </resources>
diff --git a/values-pt/strings.xml b/values-pt/strings.xml
index f9e06b8..cc923f4 100644
--- a/values-pt/strings.xml
+++ b/values-pt/strings.xml
@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="app_version">1.0.5.2</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>
@@ -12,10 +11,9 @@
   <string name="status_activated">Ligação estabelecida à rede Tor</string>
   <string name="status_disabled">\"Orbot está Desactivado</string>
   <string name="status_shutting_down">Orbot a encerrar</string>
-  <string name="tor_process_connecting">A iniciar Tor...</string>
-  <string name="tor_process_connecting_step2">a autenticar a ligação de controlo...</string>
-  <string name="tor_process_connecting_step3">completo.</string>
-  <string name="tor_process_connecting_step4">a aguardar.</string>
+  <string name="tor_process_starting"></string>
+  <string name="tor_process_complete"></string>
+  <string name="tor_process_waiting"></string>
   <string name="not_anonymous_yet">ATEN��O: A sua ligação ainda não é anónima! Por favor configure as suas aplicações para utilizarem o proxy HTTP 127.0.0.1:8118 ou o proxy SOCKS4A ou SOCKS5 127.0.0.1:9050</string>
   <string name="menu_home">Início</string>
   <string name="menu_browse">Explorar</string>
@@ -57,7 +55,6 @@
   <string name="btn_finish"></string>
   <string name="btn_okay"></string>
   <string name="btn_cancel"></string>
-  <string name="wizard_welcome_msg"></string>
   <string name="wizard_details"></string>
   <string name="wizard_details_msg"></string>
   <string name="wizard_permissions_root"></string>
@@ -74,18 +71,52 @@
   <string name="wizard_tips_tricks"></string>
   <string name="wizard_tips_msg"></string>
   <string name="wizard_tips_otrchat"></string>
-  <string name="wizard_tips_orweb"></string>
   <string name="wizard_tips_proxy"></string>
   <string name="wizard_proxy_help_info"></string>
   <string name="wizard_proxy_help_msg"></string>
   <string name="wizard_final"></string>
   <string name="wizard_final_msg"></string>
-  <string name="otrchat_apk_url"></string>
-  <string name="orweb_apk_url"></string>
   <string name="connect_first_time"></string>
   <string name="tor_check"></string>
   <string name="pref_hs_group"></string>
   <string name="pref_general_group"></string>
   <string name="pref_start_boot_title"></string>
   <string name="pref_start_boot_summary"></string>
+  <string name="wizard_title_msg"></string>
+  <string name="wizard_warning_title"></string>
+  <string name="wizard_warning_msg"></string>
+  <string name="wizard_permissions_title"></string>
+  <string name="wizard_permissions_root_msg1"></string>
+  <string name="wizard_permissions_root_msg2"></string>
+  <string name="wizard_permissions_no_root_msg"></string>
+  <string name="wizard_tips_title"></string>
+  <string name="wizard_tips_gibberbot"></string>
+  <string name="gibberbot_apk_url"></string>
+  <string name="wizard_tips_orweb"></string>
+  <string name="orweb_apk_url"></string>
+  <string name="wizard_transproxy_title"></string>
+  <string name="wizard_transproxy_msg"></string>
+  <string name="wizard_transproxy_hint"></string>
+  <string name="wizard_transproxy_none"></string>
+  <string name="pref_transparent_tethering_title"></string>
+  <string name="pref_transparent_tethering_summary"></string>
+  <string name="button_grant_superuser"></string>
+  <string name="pref_select_apps"></string>
+  <string name="pref_select_apps_summary"></string>
+  <string name="pref_node_configuration"></string>
+  <string name="pref_node_configuration_summary"></string>
+  <string name="pref_entrance_node"></string>
+  <string name="pref_entrance_node_summary"></string>
+  <string name="pref_entrance_node_dialog"></string>
+  <string name="pref_use_whispercore"></string>
+  <string name="pref_use_whispercore_summary"></string>
+  <string name="pref_proxy_type_title"></string>
+  <string name="pref_proxy_type_summary"></string>
+  <string name="pref_proxy_type_dialog"></string>
+  <string name="pref_proxy_host_title"></string>
+  <string name="pref_proxy_host_summary"></string>
+  <string name="pref_proxy_host_dialog"></string>
+  <string name="pref_proxy_port_title"></string>
+  <string name="pref_proxy_port_summary"></string>
+  <string name="pref_proxy_port_dialog"></string>
 </resources>
diff --git a/values-ru/strings.xml b/values-ru/strings.xml
index b6e6318..9ff44bf 100644
--- a/values-ru/strings.xml
+++ b/values-ru/strings.xml
@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="app_version">1.0.5.2</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>
@@ -12,10 +11,9 @@
   <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">Ð?аÑ?Ñ?Ñ?ойка Ñ?пÑ?авлениÑ?...</string>
-  <string name="tor_process_connecting_step3">гоÑ?ово.</string>
-  <string name="tor_process_connecting_step4">ожидание.</string>
+  <string name="tor_process_starting"></string>
+  <string name="tor_process_complete"></string>
+  <string name="tor_process_waiting"></string>
   <string name="not_anonymous_yet">Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?! Ð?аÑ? поÑ?ок даннÑ?Ñ? еÑ?е не анонимен! Ð?ожалÑ?йÑ?Ñ?а, наÑ?Ñ?Ñ?ойÑ?е Ñ?вои пÑ?иложениÑ? на иÑ?полÑ?зование HTTP пÑ?окÑ?и 127.0.0.1:8118 или SOCKS4A или SOCKS5 пÑ?окÑ?и 127.0.0.1:9050</string>
   <string name="menu_home">Ð?омаÑ?нÑ?Ñ? Ñ?Ñ?Ñ?аниÑ?а</string>
   <string name="menu_browse">Ð?Ñ?оÑ?моÑ?Ñ?</string>
@@ -57,7 +55,6 @@
   <string name="btn_finish">Ð?авеÑ?Ñ?иÑ?Ñ?</string>
   <string name="btn_okay">Ok</string>
   <string name="btn_cancel">Ð?Ñ?мена</string>
-  <string name="wizard_welcome_msg">Orbot, и Tor на Android. Tor - Ñ?Ñ?о беÑ?плаÑ?ное пÑ?огÑ?аммное обеÑ?пеÑ?ение и оÑ?кÑ?Ñ?Ñ?аÑ? Ñ?еÑ?Ñ?, коÑ?оÑ?аÑ? позволÑ?еÑ? вам Ñ?беÑ?еÑ?Ñ?Ñ?Ñ? оÑ? пÑ?оÑ?лÑ?Ñ?иваниÑ? в Ñ?еÑ?и, коÑ?оÑ?ое Ñ?гÑ?ожаеÑ? ваÑ?ей Ñ?вободе и конÑ?иденÑ?иалÑ?ноÑ?Ñ?и в бизнеÑ?е, оÑ?ноÑ?ениÑ?Ñ?, Tor позволÑ?еÑ? заÑ?иÑ?иÑ?Ñ?Ñ?Ñ? оÑ? анализа Ñ?Ñ?аÑ?ика.\n\n*Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?:* УÑ?Ñ?ановка Orbot не можеÑ? магиÑ?еÑ?ким обÑ?азом анонимизиÑ?оваÑ?Ñ? веÑ?Ñ? ваÑ? мобилÑ?нÑ?й Ñ?Ñ?аÑ?ик! ЭÑ?оÑ? маÑ?Ñ?еÑ? поможеÑ? вам наÑ?аÑ?Ñ?.</string>
   <string name="wizard_details">Ð?екоÑ?оÑ?Ñ?е Ñ?веденÑ?Ñ? о пÑ?огÑ?амме Orbot</string>
   <string name="wizard_details_msg">Orbot - Ñ?Ñ?о пÑ?иложение Ñ? оÑ?кÑ?Ñ?Ñ?Ñ?м кодом, коÑ?оÑ?ое Ñ?одеÑ?жиÑ? Tor, LibEvent и Privoxy. Ð?на обеÑ?пеÑ?иваеÑ? Ñ?абоÑ?Ñ? локалÑ?ного HTTP пÑ?окÑ?и (8118) и SOCKS пÑ?окÑ?и (9050) в Ñ?еÑ?и Tor. Orbot Ñ?акже позволÑ?еÑ?, из коÑ?нÑ? Ñ?Ñ?Ñ?Ñ?ойÑ?ва, пеÑ?еÑ?Ñ?лаÑ?Ñ? веÑ?Ñ? инÑ?еÑ?неÑ? Ñ?Ñ?аÑ?ик Ñ?еÑ?ез Tor.</string>
   <string name="wizard_permissions_root">РазÑ?еÑ?ение полÑ?Ñ?ено</string>
@@ -74,7 +71,6 @@
   <string name="wizard_tips_tricks">Orbot-задейÑ?Ñ?вованнÑ?е пÑ?иложениÑ?</string>
   <string name="wizard_tips_msg">Ð?Ñ? Ñ?овеÑ?Ñ?ем вам Ñ?каÑ?аÑ?Ñ? и иÑ?полÑ?зоваÑ?Ñ? пÑ?иложениÑ?, коÑ?оÑ?Ñ?е Ñ?меÑ?Ñ? Ñ?абоÑ?аÑ?Ñ? напÑ?Ñ?мÑ?Ñ? Ñ?еÑ?ез Orbot. Ð?ажмиÑ?е на кнопки ниже, Ñ?Ñ?обÑ? запÑ?Ñ?Ñ?иÑ?Ñ? пÑ?оÑ?еÑ?Ñ? Ñ?Ñ?Ñ?ановки.</string>
   <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
-  <string name="wizard_tips_orweb">ORWEB (ТолÑ?ко длÑ? веÑ?Ñ?ии Android 1.x) - Ð?Ñ?аÑ?зеÑ?, Ñ?азÑ?абоÑ?аннÑ?й длÑ? обеÑ?пеÑ?ениÑ? безопаÑ?ноÑ?Ñ?и и длÑ? Orbot</string>
   <string name="wizard_tips_proxy">Ð?аÑ?Ñ?Ñ?ойки пÑ?окÑ?и - Ñ?знайÑ?е как наÑ?Ñ?Ñ?оиÑ?Ñ? пÑ?иложениÑ? длÑ? Ñ?абоÑ?Ñ? Ñ? Orbot</string>
   <string name="wizard_proxy_help_info">Ð?аÑ?Ñ?Ñ?ойки Ð?Ñ?окÑ?и</string>
   <string name="wizard_proxy_help_msg">Ð?Ñ?ли иÑ?полÑ?зÑ?емое вами пÑ?иложение длÑ? Android поддеÑ?живаеÑ? HTTP или SOCKS, Ñ?о вÑ? можеÑ?е наÑ?Ñ?оиÑ?Ñ? его на подклÑ?Ñ?ение к Orbot и иÑ?полÑ?зование Tor.\n\n
@@ -84,12 +80,47 @@
     </string>
   <string name="wizard_final">Ð?Ñ?огÑ?амма Orbot гоÑ?ова к иÑ?полÑ?зованиÑ?!</string>
   <string name="wizard_final_msg">СоÑ?ни Ñ?Ñ?Ñ?Ñ?Ñ? лÑ?дей по вÑ?емÑ? миÑ?Ñ? иÑ?полÑ?зÑ?Ñ?Ñ? Tor по Ñ?азлиÑ?нÑ?м пÑ?иÑ?инам: жÑ?Ñ?налиÑ?Ñ?Ñ? и блоггеÑ?Ñ?, акÑ?ивиÑ?Ñ?Ñ? оÑ?ганизаÑ?ий, вÑ?Ñ?Ñ?Ñ?паÑ?Ñ?иÑ? в заÑ?иÑ?Ñ? пÑ?ав Ñ?еловека, Ñ?Ñ?дебнÑ?е иÑ?полниÑ?ели, Ñ?олдаÑ?Ñ?, коÑ?поÑ?аÑ?ии, гÑ?аждане Ñ?Ñ?Ñ?ан Ñ? Ñ?епÑ?еÑ?Ñ?ивнÑ?м Ñ?ежимом, и пÑ?оÑ?Ñ?Ñ?е лÑ?ди... а Ñ?епеÑ?Ñ? гоÑ?овÑ? и вÑ?!</string>
-  <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
-  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
   <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>
+  <string name="wizard_title_msg"></string>
+  <string name="wizard_warning_title"></string>
+  <string name="wizard_warning_msg"></string>
+  <string name="wizard_permissions_title"></string>
+  <string name="wizard_permissions_root_msg1"></string>
+  <string name="wizard_permissions_root_msg2"></string>
+  <string name="wizard_permissions_no_root_msg"></string>
+  <string name="wizard_tips_title"></string>
+  <string name="wizard_tips_gibberbot"></string>
+  <string name="gibberbot_apk_url"></string>
+  <string name="wizard_tips_orweb">ORWEB (ТолÑ?ко длÑ? веÑ?Ñ?ии Android 1.x) - Ð?Ñ?аÑ?зеÑ?, Ñ?азÑ?абоÑ?аннÑ?й длÑ? обеÑ?пеÑ?ениÑ? безопаÑ?ноÑ?Ñ?и и длÑ? Orbot</string>
+  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <string name="wizard_transproxy_title"></string>
+  <string name="wizard_transproxy_msg"></string>
+  <string name="wizard_transproxy_hint"></string>
+  <string name="wizard_transproxy_none"></string>
+  <string name="pref_transparent_tethering_title"></string>
+  <string name="pref_transparent_tethering_summary"></string>
+  <string name="button_grant_superuser"></string>
+  <string name="pref_select_apps"></string>
+  <string name="pref_select_apps_summary"></string>
+  <string name="pref_node_configuration"></string>
+  <string name="pref_node_configuration_summary"></string>
+  <string name="pref_entrance_node"></string>
+  <string name="pref_entrance_node_summary"></string>
+  <string name="pref_entrance_node_dialog"></string>
+  <string name="pref_use_whispercore"></string>
+  <string name="pref_use_whispercore_summary"></string>
+  <string name="pref_proxy_type_title"></string>
+  <string name="pref_proxy_type_summary"></string>
+  <string name="pref_proxy_type_dialog"></string>
+  <string name="pref_proxy_host_title"></string>
+  <string name="pref_proxy_host_summary"></string>
+  <string name="pref_proxy_host_dialog"></string>
+  <string name="pref_proxy_port_title"></string>
+  <string name="pref_proxy_port_summary"></string>
+  <string name="pref_proxy_port_dialog"></string>
 </resources>
diff --git a/values-sv/strings.xml b/values-sv/strings.xml
index 0f96e32..0012721 100644
--- a/values-sv/strings.xml
+++ b/values-sv/strings.xml
@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="app_version">1.0.5.2</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>
@@ -12,10 +11,9 @@
   <string name="status_activated">Uppkopplad till Tor nätverket</string>
   <string name="status_disabled">\"Orbot är inaktiverad</string>
   <string name="status_shutting_down">Orbot avslutas</string>
-  <string name="tor_process_connecting">Startar Tor...</string>
-  <string name="tor_process_connecting_step2">verifierar kontroll uppkopplingen...</string>
-  <string name="tor_process_connecting_step3">klar.</string>
-  <string name="tor_process_connecting_step4">väntar.</string>
+  <string name="tor_process_starting"></string>
+  <string name="tor_process_complete"></string>
+  <string name="tor_process_waiting"></string>
   <string name="not_anonymous_yet">VARNING: Din trafik är inte anonym än! Vänligen konfigurera dina apps att använda HTTP proxy 127.0.0.1:8118 eller SOCKS4A/5 proxy 127.0.0.1:9050</string>
   <string name="menu_home">Hem</string>
   <string name="menu_browse">Browse</string>
@@ -57,7 +55,6 @@
   <string name="btn_finish"></string>
   <string name="btn_okay"></string>
   <string name="btn_cancel"></string>
-  <string name="wizard_welcome_msg"></string>
   <string name="wizard_details"></string>
   <string name="wizard_details_msg"></string>
   <string name="wizard_permissions_root"></string>
@@ -74,18 +71,52 @@
   <string name="wizard_tips_tricks"></string>
   <string name="wizard_tips_msg"></string>
   <string name="wizard_tips_otrchat"></string>
-  <string name="wizard_tips_orweb"></string>
   <string name="wizard_tips_proxy"></string>
   <string name="wizard_proxy_help_info"></string>
   <string name="wizard_proxy_help_msg"></string>
   <string name="wizard_final"></string>
   <string name="wizard_final_msg"></string>
-  <string name="otrchat_apk_url"></string>
-  <string name="orweb_apk_url"></string>
   <string name="connect_first_time"></string>
   <string name="tor_check"></string>
   <string name="pref_hs_group"></string>
   <string name="pref_general_group"></string>
   <string name="pref_start_boot_title"></string>
   <string name="pref_start_boot_summary"></string>
+  <string name="wizard_title_msg"></string>
+  <string name="wizard_warning_title"></string>
+  <string name="wizard_warning_msg"></string>
+  <string name="wizard_permissions_title"></string>
+  <string name="wizard_permissions_root_msg1"></string>
+  <string name="wizard_permissions_root_msg2"></string>
+  <string name="wizard_permissions_no_root_msg"></string>
+  <string name="wizard_tips_title"></string>
+  <string name="wizard_tips_gibberbot"></string>
+  <string name="gibberbot_apk_url"></string>
+  <string name="wizard_tips_orweb"></string>
+  <string name="orweb_apk_url"></string>
+  <string name="wizard_transproxy_title"></string>
+  <string name="wizard_transproxy_msg"></string>
+  <string name="wizard_transproxy_hint"></string>
+  <string name="wizard_transproxy_none"></string>
+  <string name="pref_transparent_tethering_title"></string>
+  <string name="pref_transparent_tethering_summary"></string>
+  <string name="button_grant_superuser"></string>
+  <string name="pref_select_apps"></string>
+  <string name="pref_select_apps_summary"></string>
+  <string name="pref_node_configuration"></string>
+  <string name="pref_node_configuration_summary"></string>
+  <string name="pref_entrance_node"></string>
+  <string name="pref_entrance_node_summary"></string>
+  <string name="pref_entrance_node_dialog"></string>
+  <string name="pref_use_whispercore"></string>
+  <string name="pref_use_whispercore_summary"></string>
+  <string name="pref_proxy_type_title"></string>
+  <string name="pref_proxy_type_summary"></string>
+  <string name="pref_proxy_type_dialog"></string>
+  <string name="pref_proxy_host_title"></string>
+  <string name="pref_proxy_host_summary"></string>
+  <string name="pref_proxy_host_dialog"></string>
+  <string name="pref_proxy_port_title"></string>
+  <string name="pref_proxy_port_summary"></string>
+  <string name="pref_proxy_port_dialog"></string>
 </resources>
diff --git a/values-zh/strings.xml b/values-zh/strings.xml
index 7cd97f4..ca04f4f 100644
--- a/values-zh/strings.xml
+++ b/values-zh/strings.xml
@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="app_version">1.0.5.2</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>
@@ -12,10 +11,9 @@
   <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">设置��...</string>
-  <string name="tor_process_connecting_step3">å®?æ¯?ã??</string>
-  <string name="tor_process_connecting_step4">ç­?å¾?中ã??</string>
+  <string name="tor_process_starting"></string>
+  <string name="tor_process_complete"></string>
+  <string name="tor_process_waiting"></string>
   <string name="not_anonymous_yet">è­¦å??: æ?¨ç??é??讯è¿?ä¸?æ?¯å?¿å??ç??! 请设置æ?¨ç??åº?ç?¨ç¨?åº?使ç?¨ä»£ç??æ??å?¡å?¨ 127.0.0.1:8118 æ??è?? SOCKS4A æ??è?? SOCKS5 代ç??æ??å?¡å?¨ 127.0.0.1:9050</string>
   <string name="menu_home">�页</string>
   <string name="menu_browse">��</string>
@@ -57,7 +55,6 @@
   <string name="btn_finish">å®?æ??</string>
   <string name="btn_okay">确�</string>
   <string name="btn_cancel">å??æ¶?</string>
-  <string name="wizard_welcome_msg">Orbot å°? Tor 带å?° Android ä¹?ä¸?ã??Tor æ?¯è?ªç?±è½¯ä»¶ï¼?è?´å??äº?æ??建å¼?æ?¾ç½?ç»?ï¼?帮å?©ä¿?æ?¤ç½?ç»?访é?®ç??è?ªç?±å??é??ç§?ï¼?å?¯ä»¥æ?µå¾¡ç§?å¯?ç??å??ä¸?æ´»å?¨ã??å?³ç³»ä»¥å??å·²ç?¥ç??æµ?é??å??æ??æ??æ?¯ã??\n\n*è­¦å??ï¼?*ä»?ä»?å®?è£? Orbot ä¸?ä¼?è?ªå?¨ä½¿æ?¨ç??移å?¨æµ?é??å?¿å??å??ï¼?è¿?个å??导å°?带æ?¨å?¥é?¨ã??</string>
   <string name="wizard_details">ä¸?äº? Orbot 详æ??</string>
   <string name="wizard_details_msg">Orbot æ?¯å??å?« Torã??LibEvent å?? Privoxy ç??å¼?æº?软件ã??å®?å??å?«äº?ä¸?个æ?¬å?° HTTP 代ç??(8118)å?? SOCKS 代ç??(9050)ï¼?使æ?¨æ?¥å?¥ Tor ç½?ç»?ã??Orbot å?¨å?¯ä»¥è?·å¾? root æ??é??ç??设å¤?ä¸?æ?¥ç®¡æ??æ??æµ?é??ç»?ç?± Tor ç½?ç»?ã??</string>
   <string name="wizard_permissions_root">å·²èµ?äº?æ??é??</string>
@@ -74,7 +71,6 @@
   <string name="wizard_tips_tricks">å?¯ç?¨ Orbot ç??åº?ç?¨ç¨?åº?</string>
   <string name="wizard_tips_msg">æ??们建议æ?¨ä¸?è½½å??使ç?¨è?½ç?´æ?¥è¿?æ?¥å?° Orbot ç??åº?ç?¨ç¨?åº?ã??ç?¹å?»ä»¥ä¸?æ??é?®å®?è£?ã??</string>
   <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
-  <string name="wizard_tips_orweb">ORWEB (ä»? Android 1.x) - ç??é??é??ç§?设计ç??æµ?è§?å?¨</string>
   <string name="wizard_tips_proxy">代ç??设置 - 学习å¦?ä½?é??ç½®åº?ç?¨ç¨?åº?使ç?¨ Orbot</string>
   <string name="wizard_proxy_help_info">代ç??设置</string>
   <string name="wizard_proxy_help_msg">å¦?æ??æ?¨æ­£å?¨ä½¿ç?¨ç?? Android åº?ç?¨ç¨?åº?æ?¯æ??使ç?¨ HTTP æ?? SOCKS 代ç??ï¼?æ?¨å?¯ä»¥é??ç½®å®?è¿?æ?¥å?° Orbot 并使ç?¨ Torã??\n\n
@@ -83,12 +79,47 @@
     æ?¨å?¯ä»¥é??è¿? http://tinyurl.com/proxyandroid äº?解æ?´å¤? Android ä¸?使ç?¨ä»£ç??ç??ç?¥è¯?ã??</string>
   <string name="wizard_final">Orbot 已就绪�</string>
   <string name="wizard_final_msg">æ?°ä»¥ä¸?计ç??å??å?½äººä»¬å? ä¸ºå??ç§?å??å? ä½¿ç?¨ Torï¼?è®°è??ã??人æ??å·¥ä½?è??ã??æ³?å¾?å·¥ä½?è??ã??士å?µã??å?¬å?¸ã??è¿«äº?å®?é??æ??å?µä½¿ç?¨ç??å¸?æ°?ï¼?å½?ç?¶ä¹?æ??æ?®é??ç??å¸?æ°?ã??ç?°å?¨ä½ ä¹?å?³å°?æ??为å?¶ä¸­ç??ä¸?å??ï¼?</string>
-  <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
-  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
   <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">����Orbot</string>
   <string name="pref_start_boot_summary">å½?æ?¨ç?? Android 设å¤?å¼?æ?ºæ?¶è?ªå?¨å?¯å?¨ Orbot 并è¿?æ?¥è?³ Tor ç½?ç»?</string>
+  <string name="wizard_title_msg"></string>
+  <string name="wizard_warning_title"></string>
+  <string name="wizard_warning_msg"></string>
+  <string name="wizard_permissions_title"></string>
+  <string name="wizard_permissions_root_msg1"></string>
+  <string name="wizard_permissions_root_msg2"></string>
+  <string name="wizard_permissions_no_root_msg"></string>
+  <string name="wizard_tips_title"></string>
+  <string name="wizard_tips_gibberbot"></string>
+  <string name="gibberbot_apk_url"></string>
+  <string name="wizard_tips_orweb">ORWEB (ä»? Android 1.x) - ç??é??é??ç§?设计ç??æµ?è§?å?¨</string>
+  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <string name="wizard_transproxy_title"></string>
+  <string name="wizard_transproxy_msg"></string>
+  <string name="wizard_transproxy_hint"></string>
+  <string name="wizard_transproxy_none"></string>
+  <string name="pref_transparent_tethering_title"></string>
+  <string name="pref_transparent_tethering_summary"></string>
+  <string name="button_grant_superuser"></string>
+  <string name="pref_select_apps"></string>
+  <string name="pref_select_apps_summary"></string>
+  <string name="pref_node_configuration"></string>
+  <string name="pref_node_configuration_summary"></string>
+  <string name="pref_entrance_node"></string>
+  <string name="pref_entrance_node_summary"></string>
+  <string name="pref_entrance_node_dialog"></string>
+  <string name="pref_use_whispercore"></string>
+  <string name="pref_use_whispercore_summary"></string>
+  <string name="pref_proxy_type_title"></string>
+  <string name="pref_proxy_type_summary"></string>
+  <string name="pref_proxy_type_dialog"></string>
+  <string name="pref_proxy_host_title"></string>
+  <string name="pref_proxy_host_summary"></string>
+  <string name="pref_proxy_host_dialog"></string>
+  <string name="pref_proxy_port_title"></string>
+  <string name="pref_proxy_port_summary"></string>
+  <string name="pref_proxy_port_dialog"></string>
 </resources>
diff --git a/values/strings.xml b/values/strings.xml
index d5b3c50..41b14fc 100644
--- a/values/strings.xml
+++ b/values/strings.xml
@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="app_version">1.0.5.2</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>
@@ -12,10 +11,9 @@
   <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...</string>
-  <string name="tor_process_connecting_step2">Setting up control...</string>
-  <string name="tor_process_connecting_step3">complete.</string>
-  <string name="tor_process_connecting_step4">waiting.</string>
+  <string name="tor_process_starting">Starting Tor client...</string>
+  <string name="tor_process_complete">complete.</string>
+  <string name="tor_process_waiting">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 SOCKS4A or SOCKS5 proxy 127.0.0.1:9050</string>
   <string name="menu_home">Home</string>
   <string name="menu_browse">Browse</string>
@@ -50,14 +48,13 @@
   <string name="status_install_success">Tor binaries successfully installed!</string>
   <string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants@xxxxxxxxxxxxxx</string>
   <string name="title_error">Application Error</string>
-  <string name="wizard_title">Welcome to Orbot</string>
+  <string name="wizard_title">Orbot</string>
   <string name="wizard_btn_tell_me_more">About Orbot</string>
   <string name="btn_next">Next</string>
   <string name="btn_back">Back</string>
   <string name="btn_finish">Finish</string>
   <string name="btn_okay">Okay</string>
   <string name="btn_cancel">Cancel</string>
-  <string name="wizard_welcome_msg">Orbot brings Tor to Android. Tor is free software and an open network that helps you defend against a form of network surveillance that threatens personal freedom and privacy, confidential business activities and relationships, and state security known as traffic analysis.\n\n*WARNING:* Simply installing Orbot will _not_ magically anonymize your mobile traffic! This wizard will help you get started.</string>
   <string name="wizard_details">Some Orbot Details</string>
   <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, LibEvent and Privoxy. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string>
   <string name="wizard_permissions_root">Permission Granted</string>
@@ -65,16 +62,15 @@
   <string name="wizard_premissions_msg_root">Excellent! We\'ve detected that you have root permissions enabled for Orbot. We will use this power wisely.</string>
   <string name="wizard_permissions_msg_stock"> While it is not required, Orbot can become a more powerful tool if your device has root access. Use the button below to grant Orbot superpowers! </string>
   <string name="wizard_permissions_no_root">If you don\'t have root access or have no idea what we\'re talking about, just be sure to use apps made to work with Orbot.</string>
-  <string name="wizard_permissions_consent">I understand and would like to continue without root</string>
+  <string name="wizard_permissions_consent">I understand and would like to continue without Superuser</string>
   <string name="wizard_permission_enable_root">Grant Root for Orbot</string>
   <string name="wizard_configure">Configure Torification</string>
   <string name="wizard_configure_msg">Orbot gives you the option to route all application traffic through Tor OR to choose your applications individually.</string>
   <string name="wizard_configure_all">Proxy All Apps Through Tor</string>
   <string name="wizard_configure_select_apps">Select Individual Apps for Tor</string>
   <string name="wizard_tips_tricks">Orbot-enabled Apps</string>
-  <string name="wizard_tips_msg">We encourage you to download &amp;amp; use apps that know how to connect directly to Orbot. Click on the buttons below to install.</string>
+  <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later in the Android Market.</string>
   <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
-  <string name="wizard_tips_orweb">ORWEB (Android 1.x Only) - Browser designed for privacy &amp;amp; for Orbot</string>
   <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string>
   <string name="wizard_proxy_help_info">Proxy Settings</string>
   <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n
@@ -83,13 +79,48 @@
     You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid
     </string>
   <string name="wizard_final">Orbot is ready!</string>
-  <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons: journalists and bloggers, human rights workers, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string>
-  <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string>
-  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
-  <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="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>
+  <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string>
+  <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="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string>
   <string name="pref_hs_group">Hidden Services</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>
+  <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>
+  <string name="wizard_warning_title">Warning</string>
+  <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>
+  <string name="wizard_permissions_title">Permissions</string>
+  <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string>
+  <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string>
+  <string name="wizard_permissions_no_root_msg">Your device is running in standard mode, and does not support root or \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>
+  <string name="wizard_tips_title">Orbot-Enabled Apps</string>
+  <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string>
+  <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
+  <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string>
+  <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
+  <string name="wizard_transproxy_title">Transparent Proxying</string>
+  <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string>
+  <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string>
+  <string name="wizard_transproxy_none">None</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices</string>
+  <string name="button_grant_superuser">Request Superuser Access</string>
+  <string name="pref_select_apps">Select Apps</string>
+  <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string>
+  <string name="pref_node_configuration">Node Configuration</string>
+  <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string>
+  <string name="pref_entrance_node">Entrance Nodes</string>
+  <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string>
+  <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string>
+  <string name="pref_use_whispercore">Use WhisperCore</string>
+  <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>
+  <string name="pref_proxy_type_title">Proxy Type</string>
+  <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Enter Proxy Type</string>
+  <string name="pref_proxy_host_title">Proxy Host</string>
+  <string name="pref_proxy_host_summary">Proxy server hostname</string>
+  <string name="pref_proxy_host_dialog">Enter Proxy Host</string>
+  <string name="pref_proxy_port_title">Proxy Port</string>
+  <string name="pref_proxy_port_summary">Proxy server port</string>
+  <string name="pref_proxy_port_dialog">Enter Proxy port</string>
 </resources>

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits