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

[tor-commits] [orbot/master] updating string resources from transifex



commit bbf8d8a03bff12ecf4e412bf58ba2d80ec8b65d4
Author: n8fr8 <nathan@xxxxxxxxxxx>
Date:   Wed Jul 17 22:37:56 2013 -0400

    updating string resources from transifex
---
 res/values-ar/strings.xml     |  278 ++++++++++++++++++-----------------
 res/values-bg/strings.xml     |    3 +-
 res/values-ca/strings.xml     |   82 +----------
 res/values-cs/strings.xml     |   10 +-
 res/values-de/strings.xml     |   88 +++++------
 res/values-el/strings.xml     |    2 +-
 res/values-es/strings.xml     |  324 +++++++++++++++++++++--------------------
 res/values-eu/strings.xml     |    4 +-
 res/values-fa/strings.xml     |    2 +-
 res/values-fr/strings.xml     |   25 ++--
 res/values-he/strings.xml     |   66 ++++++++-
 res/values-hr/strings.xml     |  204 +-------------------------
 res/values-hu/strings.xml     |    7 +-
 res/values-it/strings.xml     |    2 +-
 res/values-ja/strings.xml     |   12 +-
 res/values-ko/strings.xml     |  113 +-------------
 res/values-lv/strings.xml     |   33 +++--
 res/values-mk/strings.xml     |    5 +-
 res/values-ms/strings.xml     |    2 +-
 res/values-my/strings.xml     |  216 +++------------------------
 res/values-nb/strings.xml     |  148 ++++++++++++++++++-
 res/values-nl/strings.xml     |    2 +-
 res/values-pl/strings.xml     |    6 +-
 res/values-pt-rBR/strings.xml |   12 +-
 res/values-pt/strings.xml     |   12 +-
 res/values-ru/strings.xml     |    9 +-
 res/values-sv/strings.xml     |  135 ++++++++++++++++-
 res/values-tr/strings.xml     |   15 +-
 res/values-uk/strings.xml     |  209 ++------------------------
 res/values-zh/strings.xml     |  212 ++++++++++++++++++++-------
 30 files changed, 1029 insertions(+), 1209 deletions(-)

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index f56d446..3e5b8d3 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1,214 +1,224 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Orbot</string>
+  <string name="app_name">اÙ?ربÙ?ت</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>
   <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Tor بدء Ù?Ø¥Ù?Ù?اÙ?</string>
+  <string name="control_permission_label">Ù?عÙ? Ù? اÙ?Ù?Ù? تÙ?ر</string>
   <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">...Orbot جارÙ? تشغÙ?Ù?</string>
-  <string name="status_activated">Ø£Ù?ا Ù?تصÙ? بشبÙ?Ø© تÙ?ر</string>
-  <string name="status_disabled">\"تÙ? Ø¥Ù?Ù?اÙ? اÙ?ربÙ?ت</string>
+  <string name="status_starting_up">جارÙ? تشغÙ?Ù? اÙ?ربÙ?ت...</string>
+  <string name="status_activated">Ù?تصÙ? بشبÙ?Ø© تÙ?ر</string>
+  <string name="status_disabled">تÙ? Ø¥Ù?Ù?اÙ? اÙ?ربÙ?ت</string>
   <string name="status_shutting_down">جارÙ? إغÙ?اÙ? اÙ?ربÙ?ت</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="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 Ø£Ù? SOCK4A Ø£Ù? SOKS5 127.0.0.1:9050</string>
+  <string name="menu_home">اÙ?Ù?ائÙ?Ø© اÙ?رئÙ?سÙ?Ø©</string>
   <string name="menu_browse">تصÙ?Ù?Ø­</string>
   <string name="menu_settings">إعدادات</string>
   <string name="menu_log">اÙ?سجÙ?</string>
   <string name="menu_info">Ù?ساعدة</string>
   <string name="menu_apps">تطبÙ?Ù?ات</string>
   <string name="menu_start">بدء</string>
-  <string name="menu_stop">Ø¥Ù?Ù?اÙ?</string>
+  <string name="menu_stop">تÙ?Ù?Ù?</string>
   <string name="menu_about">Ø­Ù?Ù?</string>
   <string name="menu_wizard">Wizard</string>
+  <string name="main_layout_download">تحÙ?Ù?Ù?</string>
+  <string name="main_layout_upload">رÙ?ع</string>
   <string name="button_help">Ù?ساعدة</string>
   <string name="button_close">إغÙ?اÙ?</string>
   <string name="button_about">Ø­Ù?Ù?</string>
   <string name="button_clear_log">Ù?سح اÙ?سجÙ?</string>
-  <string name="menu_verify">Ù?حص</string>
+  <string name="menu_verify">تحÙ?Ù?</string>
   <string name="menu_exit">خرÙ?ج</string>
-  <string name="press_to_start">- long press to start -</string>
-  <string name="pref_trans_proxy_group">عÙ?Ù?Ù?Ø© تÙ?Ù?Ù?Ù? غÙ?ر Ù?رئÙ?Ø© Ø£Ù? ضÙ?Ù?Ù?Ø© (Ù?تطÙ?ب Ø­Ù?Ù?Ù? اÙ?Ù?سؤÙ?Ù?- Root-)</string>
-  <string name="pref_trans_proxy_title">عÙ?Ù?Ù?Ø© تÙ?Ù?Ù?Ù? غÙ?ر Ù?رئÙ?Ø© Ø£Ù? ضÙ?Ù?Ù?Ø©</string>
+  <string name="press_to_start">- اضغط Ù?Ù?ترة Ø·Ù?Ù?Ù?Ø© Ù?Ù?بدء -</string>
+  <string name="pref_trans_proxy_group">برÙ?Ù?سÙ? ضÙ?Ù?Ù? (Ù?تطÙ?ب اذÙ? حساب رÙ?Ù?ت)</string>
+  <string name="pref_trans_proxy_title">برÙ?Ù?سÙ? ضÙ?Ù?Ù?</string>
   <string name="pref_trans_proxy_summary">عÙ?Ù?Ù?Ø© تÙ?رÙ?Ù?اÙ? Ø£Ù?تÙ?Ù?اتÙ?Ù?Ù?Ø© Ù?Ù?تطبÙ?Ù?ات</string>
-  <string name="pref_transparent_all_title">تÙ?ر Ù?Ù? Ø´Ù?Ø¡</string>
-  <string name="pref_transparent_all_summary">حرÙ?Ø© Ù?رÙ?ر اÙ?Ù?Ù?Ù?Ù? Ù?جÙ?Ù?ع اÙ?تطبÙ?Ù?ات عبر تÙ?ر</string>
-  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
-  <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
-  <string name="pref_transparent_port_title">Port List</string>
-  <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
-  <string name="pref_transparent_port_dialog">Enter ports to proxy</string>
-  <string name="pref_has_root">Request Root Access</string>
-  <string name="pref_has_root_summary">Request root access for transparent proxying</string>
-  <string name="status_install_success">تÙ? تثبÙ?ت Ø«Ù?ائÙ?ات تÙ?ر بÙ?جاح!</string>
-  <string name="status_install_fail">غÙ?ر Ù?ادر عÙ?Ù? تثبÙ?ت Ù?Ù?Ù?ات Ø«Ù?ائÙ?ات تÙ?ر. Ù?رجÙ? اÙ?تحÙ?Ù? Ù?Ù? اÙ?سجÙ? Ù?إعÙ?اÙ?Ù?ا عÙ?Ù? اÙ?برÙ?د اÙ?Ø¥Ù?Ù?ترÙ?Ù?Ù? tor-assistants@xxxxxxxxxxxxxx</string>
+  <string name="pref_transparent_all_title">استخدÙ? تÙ?ر Ù?ع جÙ?Ù?ع اÙ?تطبÙ?Ù?ات</string>
+  <string name="pref_transparent_all_summary">Ù?رر Ù?Ù? بÙ?اÙ?ات اÙ?Ù?رÙ?ر اÙ?خاصة باÙ?تطبÙ?Ù?ات عبر تÙ?ر</string>
+  <string name="pref_transparent_port_fallback_title">تراجع Ù?Ù?Ù?Ø° اÙ?برÙ?Ù?سÙ?</string>
+  <string name="pref_transparent_port_fallback_summary">تحذÙ?ر: تتحاÙ?Ù? عÙ?Ù? اÙ?Ù?Ù?اÙ?Ø° اÙ?شائعة  (80, 443, Ø¥Ù?Ù? آخرÙ?) *استخدÙ? Ù?Ù?Ø·* إذا Ù?اÙ? Ù?ضع \'Ù?Ù?\' Ø£Ù? \'اÙ?تطبÙ?Ù?\' Ù?ا Ù?عÙ?Ù?.</string>
+  <string name="pref_transparent_port_title">Ù?ائÙ?Ø© اÙ?Ù?Ù?اÙ?Ø°</string>
+  <string name="pref_transparent_port_summary">Ù?ائÙ?Ø© بجÙ?Ù?ع اÙ?Ù?Ù?اÙ?Ø° Ø¥Ù?Ù? اÙ?برÙ?Ù?سÙ?. *استخدÙ? Ù?Ù?Ø·* إذا Ù?اÙ? Ù?ضع \'Ù?Ù?\' Ø£Ù? \'اÙ?تطبÙ?Ù?\' Ù?ا Ù?عÙ?Ù?.</string>
+  <string name="pref_transparent_port_dialog">ادخÙ? اÙ?Ù?Ù?اÙ?Ø° Ù?Ù?برÙ?Ù?سÙ?</string>
+  <string name="pref_has_root">اطÙ?ب إذÙ? رÙ?Ù?ت</string>
+  <string name="pref_has_root_summary">اطÙ?ب إذÙ? رÙ?Ù?ت Ù?تÙ?عÙ?Ù? اÙ?برÙ?Ù?سÙ? اÙ?ضÙ?Ù?Ù?</string>
+  <string name="status_install_success">تÙ? تثبÙ?ت تÙ?ر بÙ?جاح!</string>
+  <string name="status_install_fail">غÙ?ر Ù?ادر عÙ?Ù? تثبÙ?ت Ù?Ù?Ù?ات تÙ?ر. Ù?رجÙ? Ù?راجعة اÙ?سجÙ? Ù?إعÙ?اÙ?Ù?ا عÙ?Ù? اÙ?برÙ?د اÙ?Ø¥Ù?Ù?ترÙ?Ù?Ù? tor-assistants@xxxxxxxxxxxxxx</string>
   <string name="title_error">خطأ Ù?Ù? اÙ?تطبÙ?Ù?</string>
-  <string name="wizard_title">Ù?رحبا بÙ? Ù?Ù? Ø£Ù?ربÙ?ت</string>
-  <string name="wizard_btn_tell_me_more">عÙ? Ø£Ù?ربÙ?ت</string>
+  <string name="wizard_title">اÙ?ربÙ?ت</string>
+  <string name="wizard_btn_tell_me_more">عÙ? اÙ?ربÙ?ت</string>
   <string name="btn_next">اÙ?تاÙ?Ù?</string>
   <string name="btn_back">رجÙ?ع</string>
   <string name="btn_finish">Ø¥Ù?Ù?اء</string>
   <string name="btn_okay">Ù?Ù?اÙ?Ù?</string>
   <string name="btn_cancel">Ø¥Ù?غاء</string>
   <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">بعض اÙ?تÙ?اصÙ?Ù? عÙ? Ø£Ù?ربÙ?ت</string>
-  <string name="wizard_details_msg">Ø£Ù?ربÙ?ت Ù?Ù? تطبÙ?Ù? Ù?Ù?تÙ?Ø­ اÙ?Ù?صدر Ù?اÙ?Ø°Ù? Ù?ضÙ? تÙ?ر, LibEvent Ù?Prixovy. Ù?عÙ?Ù? عÙ?Ù? تÙ?Ù?Ù?ر Ù?Ù?Ù?Ù? HTTP Ù?Ø­Ù?Ù? (8118) Ù?Ù?Ù?Ù?Ù? SOCKS (9050) Ø¥Ù?Ù? شبÙ?Ø© تÙ?ر. Ù?تÙ?Ù?ر Ù?دÙ? Ø£Ù?ربÙ?ت اÙ?Ù?درة عÙ?Ù? إرساÙ? جÙ?Ù?ع حرÙ?ات Ù?رÙ?ر اÙ?اÙ?ترÙ?ت Ù?Ù? Ø®Ù?اÙ? تÙ?ر عÙ?Ù? اÙ?جÙ?از ذات Ø­Ù?Ù?Ù? اÙ?Ù?سؤÙ?Ù? (root). </string>
+  <string name="wizard_details">بعض اÙ?تÙ?اصÙ?Ù? عÙ? اÙ?ربÙ?ت</string>
+  <string name="wizard_details_msg">اÙ?ربÙ?ت Ù?Ù? تطبÙ?Ù? Ù?Ù?تÙ?Ø­ اÙ?Ù?صدر Ù?Ù?ضÙ? تÙ?ر, LibEvent Ù?Prixovy. Ù?عÙ?Ù? عÙ?Ù? تÙ?Ù?Ù?ر برÙ?Ù?سÙ? HTTP Ù?Ø­Ù?Ù? (8118) Ù?برÙ?Ù?سÙ? SOCKS (9050) Ø¥Ù?Ù? شبÙ?Ø© تÙ?ر. Ù? Ù?تÙ?Ù?ر Ù?دÙ? اÙ?ربÙ?ت اÙ?ضاÙ? - عÙ?Ù? اÙ?اجÙ?زة ذات حساب رÙ?Ù?ت - اÙ?Ù?درة عÙ?Ù? إرساÙ? جÙ?Ù?ع حرÙ?ات Ù?رÙ?ر اÙ?تطبÙ?Ù?ات Ø¥Ù?Ù? تÙ?ر.</string>
   <string name="wizard_permissions_root">تÙ? Ù?Ù?Ø­ اÙ?إذÙ?</string>
-  <string name="wizard_permissions_stock">أذÙ?Ù?ات Ø£Ù?ربÙ?ت</string>
-  <string name="wizard_premissions_msg_root">Ù?Ù?تاز! Ù?Ù?د Ù?جدÙ?ا بأÙ?Ù? Ù?دÙ?Ù? أذÙ?Ù?ات Ø­Ù?Ù?Ù? اÙ?Ù?سؤÙ?Ù? (root) Ù?تÙ?Ù?Ù?Ù? Ø£Ù?ربÙ?ت. سÙ?Ù? Ù?ستخدÙ? Ù?Ø°Ù? اÙ?سÙ?طة بحÙ?Ù?Ø©.</string>
-  <string name="wizard_permissions_msg_stock">رغÙ? Ø£Ù?Ù? Ù?Ù?س ضرÙ?رÙ?اØ? Ù?Ù?Ù?Ù? اÙ? Ù?صبح Ø£Ù?ربÙ?ت أداة Ù?Ù?Ù?Ø© إذا Ù?اÙ? Ù?دÙ? جÙ?ازÙ? صÙ?احÙ?Ø© Ø­Ù?Ù?Ù? اÙ?Ù?سؤÙ?Ù? (root). استخدÙ? اÙ?زر باÙ?أسÙ?Ù? Ù?Ù?Ù?Ø­ Ø£Ù?ربÙ?ت Ù?Ù?Ø© Ø£Ù?بر!</string>
-  <string name="wizard_permissions_no_root">إذا Ù?Ù? Ù?Ù?Ù? Ù?دÙ?Ù? صÙ?احÙ?Ø© Ø­Ù?Ù?Ù? اÙ?Ù?سؤÙ?Ù? (root) Ø£Ù? Ù?Ù?ست Ù?دÙ?Ù? أدÙ?Ù? Ù?Ù?رة عÙ?ا Ù?تحدث عÙ?Ù?Ø? تأÙ?د Ù?Ù?Ø· Ù?Ù? استخداÙ? تطبÙ?Ù?ات تعÙ?Ù? Ù?ع Ø£Ù?ربÙ?ت.</string>
-  <string name="wizard_permissions_consent">Ø£Ù?Ù?Ù? Ø°Ù?Ù? Ù?Ø£Ù?د Ø£Ù? أستÙ?ر بدÙ?Ù? Ø­Ù?Ù?Ù? اÙ?Ù?سؤÙ?Ù? (root)</string>
-  <string name="wizard_permission_enable_root">Ù?Ù?Ø­ Ø£Ù?ربÙ?ت Ø­Ù?Ù?Ù? اÙ?Ù?سؤÙ?Ù? (root)</string>
+  <string name="wizard_permissions_stock">أذÙ?Ù?ات اÙ?ربÙ?ت</string>
+  <string name="wizard_premissions_msg_root">Ù?Ù?تاز! Ù?Ù?د Ù?جدÙ?ا بأÙ?Ù? Ù?دÙ?Ù? صÙ?احÙ?Ø© حساب رÙ?Ù?ت Ù?تÙ?Ù?Ù?Ù? اÙ?ربÙ?ت. سÙ?Ù? Ù?ستخدÙ? Ù?Ø°Ù? اÙ?سÙ?طة بحÙ?Ù?Ø©.</string>
+  <string name="wizard_permissions_msg_stock">رغÙ? Ø£Ù?Ù? Ù?Ù?س ضرÙ?رÙ?اØ? Ù?Ù?Ù?Ù? اÙ? Ù?صبح Ø£Ù?ربÙ?ت أداة Ù?Ù?Ù?Ø© إذا Ù?اÙ? Ù?دÙ? جÙ?ازÙ? صÙ?احÙ?Ø© حساب رÙ?Ù?ت. استخدÙ? اÙ?زر باÙ?أسÙ?Ù? Ù?Ù?Ù?Ø­ اÙ?ربÙ?ت Ù?Ù?Ø© Ø£Ù?بر!</string>
+  <string name="wizard_permissions_no_root">إذا Ù?Ù? Ù?Ù?Ù? Ù?دÙ?Ù? صÙ?احÙ?Ø© حساب رÙ?Ù?ت Ø£Ù? Ù?Ù?ست Ù?دÙ?Ù? أدÙ?Ù? Ù?Ù?رة عÙ?ا Ù?تحدث عÙ?Ù?Ø? تأÙ?د Ù?Ù?Ø· Ù?Ù? استخداÙ? تطبÙ?Ù?ات تعÙ?Ù? Ù?ع اÙ?ربÙ?ت.</string>
+  <string name="wizard_permissions_consent">Ø£Ù?Ù?Ù? Ø°Ù?Ù? Ù?Ø£Ù?د Ø£Ù? أستÙ?ر بدÙ?Ù? صÙ?احÙ?ات حساب رÙ?Ù?ت</string>
+  <string name="wizard_permission_enable_root">اÙ?Ù?Ø­ اÙ?ربÙ?ت صÙ?احÙ?Ø© حساب رÙ?Ù?ت</string>
   <string name="wizard_configure">تÙ?Ù?Ù?Ù? تÙ?رÙ?Ù?اÙ?</string>
-  <string name="wizard_configure_msg">Ø£Ù?ربÙ?ت Ù?عطÙ?Ù? اÙ?Ø®Ù?ار Ù?تÙ?جÙ?Ù? جÙ?Ù?ع حرÙ?ات Ù?رÙ?ر اÙ?تطبÙ?Ù?ات عبر تÙ?ر OR Ù?إختÙ?ار تطبÙ?Ù?اتÙ? بشÙ?Ù? Ù?ردÙ?.</string>
-  <string name="wizard_configure_all">تÙ?Ù?Ù?Ù? جÙ?Ù?ع اÙ?تطبÙ?Ù?ات عبر تÙ?ر</string>
+  <string name="wizard_configure_msg">اÙ?ربÙ?ت Ù?عطÙ?Ù? اÙ?Ø®Ù?ار Ù?تÙ?جÙ?Ù? جÙ?Ù?ع حرÙ?ات Ù?رÙ?ر اÙ?تطبÙ?Ù?ات عبر تÙ?ر اÙ? Ù?إختÙ?ار اÙ?تطبÙ?Ù?ات بشÙ?Ù? Ù?ردÙ?.</string>
+  <string name="wizard_configure_all">Ù?رر جÙ?Ù?ع اÙ?تطبÙ?Ù?ات عبر تÙ?ر</string>
   <string name="wizard_configure_select_apps">اختر اÙ?تطبÙ?Ù?ات اÙ?Ù?ردÙ?Ø© Ù?تÙ?ر</string>
-  <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_proxy">إعدادات اÙ?Ù?Ù?Ù?Ù? - تعÙ?Ù? Ù?Ù?Ù?Ù?Ø© تÙ?Ù?Ù?Ù? اÙ?تطبÙ?Ù?ات Ù?تعÙ?Ù? Ù?ع Ø£Ù?ربÙ?ت</string>
-  <string name="wizard_proxy_help_info">إعدادات اÙ?Ù?Ù?Ù?Ù?</string>
-  <string name="wizard_proxy_help_msg">اذا Ù?اÙ? تطبÙ?Ù? Ø£Ù?درÙ?Ù?د اÙ?Ø°Ù? تستخدÙ?Ù? Ù?Ù?Ù?Ù? اÙ? Ù?دعÙ? استخداÙ? Ù?Ù?Ù?Ù? HTTP اÙ? SOCKS , عÙ?دÙ?ا Ù?Ù?Ù?Ù?Ù? تÙ?Ù?Ù?Ù?Ù? Ù?Ù?إتصاÙ? بأÙ?ربÙ?ت Ù?استخداÙ? تÙ?ر.\n\n\n    اعدادات اÙ?Ù?ستضÙ?Ù? Ù?Ù? 127.0.0.1 اÙ? \"اÙ?Ù?ستضÙ?Ù? اÙ?Ù?Ø­Ù?Ù?\". باÙ?Ù?سبة اÙ?Ù? HTTP, Ù?Ø¥Ù? ضبط اÙ?Ù?Ù?Ù?Ø° Ù?Ù? 8118. باÙ?Ù?سبة اÙ?Ù? SOCKS, Ù?Ø¥Ù? اÙ?Ù?Ù?Ù?Ù? Ù?Ù? 9050. Ù?جب عÙ?Ù?Ù? استخداÙ? SOCKS4A اÙ? SOCKS5 اذا اÙ?Ù?Ù?.\n    \n\n\n    Ù?Ù?Ù?Ù?Ù? Ù?عرÙ?Ø© اÙ?Ù?زÙ?د عÙ? عÙ?Ù?Ù?Ø© تÙ?Ù?Ù?Ù? غÙ?ر Ù?رئÙ?Ø© Ù?Ù?Ø£Ù?درÙ?Ù?د عÙ? طرÙ?Ù? اÙ?أسئÙ?Ø© اÙ?Ù?تداÙ?Ù?Ø© (FAQ)  Ù?Ù?: http://tinyurl.com/proxyandroid\n    </string>
-  <string name="wizard_final">Ø£Ù?ربÙ?ت جاÙ?ز!</string>
-  <string name="wizard_final_msg">Ù?ئات اÙ?Ø¢Ù?اÙ? Ù?Ù? اÙ?Ù?اس Ù?Ù? جÙ?Ù?ع Ø£Ù?حاء اÙ?عاÙ?Ù? Ù?ستخدÙ?Ù?Ù? تÙ?ر Ù?أسباب عدÙ?دة: اÙ?صحÙ?Ù?Ù?Ù? Ù?اÙ?Ù?دÙ?Ù?Ù?Ù?Ø? Ù?اÙ?عاÙ?Ù?Ù?Ù? Ù?Ù? Ù?جاÙ? Ø­Ù?Ù?Ù? اÙ?Ø¥Ù?ساÙ?Ø? Ù?اÙ?جÙ?Ù?د Ù?اÙ?شرÙ?ات Ù?اÙ?Ù?Ù?اطÙ?Ù?Ù? Ù?Ù? اÙ?Ø£Ù?ظÙ?Ø© اÙ?Ù?Ù?عÙ?Ø©Ø? Ù?اÙ?Ù?Ù?اطÙ?Ù?Ù? اÙ?عادÙ?Ù?Ù? ... Ù?اÙ?Ø¢Ù? Ø£Ù?ت Ù?ستعد Ù?Ø£Ù? تستخدÙ?Ù? Ù?Ø°Ù?Ù?!</string>
+  <string name="wizard_tips_tricks">تطبÙ?Ù?ات Ù?Ù?Ù?ئة Ù?اÙ?ربÙ?ت</string>
+  <string name="wizard_tips_msg">اÙ?تطبÙ?Ù?ات اÙ?تاÙ?Ù?Ø© تÙ? تطÙ?Ù?رÙ?ا حتÙ? تعÙ?Ù? Ù?ع اÙ?ربÙ?ت. اضغط عÙ?Ù? Ù?ا ترÙ?د تثبÙ?تة عÙ?Ù? جÙ?ازÙ? اÙ?Ø£Ù?, Ø£Ù? Ù?Ù?Ù?Ù?Ù? اÙ? تجدÙ?Ù? Ù?احÙ?اÙ? عÙ?Ù? جÙ?جÙ? بÙ?اÙ?, Ø£Ù? عÙ?Ù? Ù?Ù?Ù?عÙ?ا GuardianProject.info Ø£Ù? Ù?Ù? Ø®Ù?اÙ? F-Droid.org.</string>
+  <string name="wizard_tips_otrchat">Gibberbot - تطبÙ?Ù? Ø£Ù?Ù? Ù?Ù?Ù?راسÙ?Ø© اÙ?Ù?Ù?رÙ?Ø© Ù?Ù?Ø£Ù?درÙ?Ù?د.</string>
+  <string name="wizard_tips_proxy">إعدادات اÙ?برÙ?Ù?سÙ? - تعÙ?Ù? Ù?Ù?Ù?Ù?Ø© تÙ?Ù?Ù?Ù? اÙ?تطبÙ?Ù?ات Ù?تعÙ?Ù? Ù?ع اÙ?ربÙ?ت</string>
+  <string name="wizard_tips_duckgo">تطبÙ?Ù? Ù?حرÙ? اÙ?بحث DuckDuckGo</string>
+  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+  <string name="wizard_tips_firefox">اÙ?برÙ?اÙ?ج اÙ?إضاÙ?Ù? \"Proxy Mobile\" Ù?Ù?اÙ?رÙ?Ù?Ù?س (http://tinyurl.com/getproxymob)</string>
+  <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
+  <string name="wizard_tips_twitter">اضبط اÙ?برÙ?Ù?سÙ? اÙ?خاص بتÙ?Ù?تر Ø¥Ù?Ù? Ù?ستضÙ?Ù? \"localhost\" Ù? اÙ?Ù?Ù?Ù?Ø° Ø¥Ù?Ù? 8118</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
+  <string name="wizard_proxy_help_info">إعدادات اÙ?برÙ?Ù?سÙ?</string>
+  <string name="wizard_proxy_help_msg">إذا Ù?اÙ? تطبÙ?Ù? اÙ?Ø£Ù?درÙ?Ù?د اÙ?Ø°Ù? تستخدÙ?Ù? Ù?Ù?Ù?Ù? اÙ? Ù?دعÙ? استخداÙ? برÙ?Ù?سÙ? HTTP اÙ? SOCKS , عÙ?دÙ?ا Ù?Ù?Ù?Ù?Ù? تÙ?Ù?Ù?Ù?Ù? Ù?Ù?إتصاÙ? باÙ?ربÙ?ت Ù?استخداÙ? تÙ?ر.\n\n\nإعدادات اÙ?Ù?ستضÙ?Ù? Ù?Ù? 127.0.0.1 اÙ? \"اÙ?Ù?ستضÙ?Ù? اÙ?Ù?Ø­Ù?Ù?\". باÙ?Ù?سبة Ø¥Ù?Ù? HTTP, Ù?Ø¥Ù? اÙ?Ù?Ù?Ù?Ø° Ù?Ù? 8118. Ø£Ù?ا باÙ?Ù?سبة Ø¥Ù?Ù? SOCKS, Ù?Ø¥Ù? اÙ?Ù?Ù?Ù?Ø° Ù?Ù? 9050. Ù?Ù? اÙ?Ø£Ù?ضÙ? استخداÙ? SOCKS4A اÙ? SOCKS5 إذا Ø£Ù?Ù?Ù?.\n    \n\n\nÙ?Ù?Ù?Ù?Ù? Ù?عرÙ?Ø© اÙ?Ù?زÙ?د عÙ? استخداÙ? اÙ?برÙ?Ù?سÙ? عÙ?Ù? Ø£Ù?درÙ?Ù?د عÙ? طرÙ?Ù? زÙ?ارة صÙ?حة اÙ?أسئÙ?Ø© اÙ?Ù?تداÙ?Ù?Ø©: http://tinyurl.com/proxyandroid\n    </string>
+  <string name="wizard_final">اÙ?ربÙ?ت جاÙ?ز Ù?Ù?استخداÙ?!</string>
+  <string name="wizard_final_msg">Ù?ئات اÙ?Ø¢Ù?اÙ? Ù?Ù? اÙ?Ù?اس Ù?Ù? جÙ?Ù?ع Ø£Ù?حاء اÙ?عاÙ?Ù? Ù?ستخدÙ?Ù?Ù? تÙ?ر Ù?أسباب عدÙ?دة.\n\nاÙ?صحÙ?Ù?Ù?Ù? Ù?اÙ?Ù?دÙ?Ù?Ù?Ù?Ø? Ù?اÙ?Ù?داÙ?عÙ?Ù? عÙ? Ø­Ù?Ù?Ù? اÙ?Ø¥Ù?ساÙ?Ø? Ù?اÙ?ضباط Ù?اÙ?جÙ?Ù?د Ù?اÙ?شرÙ?ات Ù?اÙ?Ù?Ù?اطÙ?Ù?Ù? تحت اÙ?Ø£Ù?ظÙ?Ø© اÙ?Ù?Ù?عÙ?Ø©Ø? Ù?اÙ?Ù?Ù?اطÙ?Ù?Ù? اÙ?عادÙ?Ù?Ù? ... Ù?اÙ?Ø¢Ù? Ø£Ù?ت Ù?ستعد Ù?تستخدÙ?Ù? Ù?Ø«Ù?Ù?Ù?!</string>
   <!--END Welcome Wizard strings (DJH)-->
-  <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="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">عاÙ?</string>
+  <string name="pref_start_boot_title">شغÙ? اÙ?ربÙ?ت عÙ?د Ù?تح اÙ?جÙ?از</string>
+  <string name="pref_start_boot_summary">Ù?عÙ? اÙ?ربÙ?ت Ù? اتصÙ? بتÙ?ر تÙ?Ù?ائÙ?اÙ? عÙ?دÙ?ا Ù?بدء جÙ?از اÙ?Ø£Ù?درÙ?Ù?د اÙ?خاص بÙ? باÙ?عÙ?Ù?</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Ø£Ù?ربÙ?ت Ù?جÙ?ب Ù?Ù? شبÙ?Ø© تÙ?ر Ù?Ù?Ø£Ù?درÙ?Ù?د! تÙ?ر Ù?ساعدÙ?  Ù?Ù?تغÙ?ب عÙ?Ù? حجب اÙ?Ù?حتÙ?Ù?Ø? Ù?حص اÙ?اتصاÙ?Ø? Ù? اÙ?رÙ?ابة Ù? اÙ?تجسس عÙ?Ù? اÙ?شبÙ?اتØ? Ù? اÙ?تÙ? تÙ?دد اÙ?خصÙ?صÙ?Ø© Ù? اÙ?عÙ?اÙ?ات اÙ?شخصÙ?Ø© Ù? اÙ?Ù?عÙ?Ù?Ù?ات اÙ?سرÙ?Ø©. سÙ?Ù?Ù?Ù? اÙ?Ø¢Ù? بÙ?ساعدتÙ? Ù?ضبط Ø£Ù?ربÙ?ت Ù? تÙ?ر عÙ?Ù? جÙ?ازÙ?.</string>
+  <string name="wizard_title_msg">اÙ?ربÙ?ت Ù?جÙ?ب شبÙ?Ø© تÙ?ر Ù?Ù?Ø£Ù?درÙ?Ù?د!\n\nتÙ?ر Ù?ساعدÙ? Ù?Ù? اÙ?تغÙ?ب عÙ?Ù? تصÙ?Ù?Ø© اÙ?Ù?حتÙ?Ù?Ø? Ù?حص اÙ?اتصاÙ? Ù? اÙ?رÙ?ابة عÙ?Ù? اÙ?شبÙ?ات اÙ?تÙ? تÙ?دد خصÙ?صÙ?تÙ?Ø? Ù? عÙ?اÙ?اتÙ? اÙ?شخصÙ?Ø© Ù? Ù?عÙ?Ù?Ù?اتÙ? اÙ?سرÙ?Ø©.\n\nستÙ?Ù?Ù? Ù?Ø°Ù? اÙ?Ù?اÙ?ذة بÙ?ساعدتÙ? عÙ?Ù? ضبط تÙ?Ù?Ù?Ù? اÙ?ربÙ?ت Ù? تÙ?ر عÙ?Ù? جÙ?ازÙ?.</string>
   <!--Warning screen-->
   <string name="wizard_warning_title">تحذÙ?ر</string>
-  <string name="wizard_warning_msg">Ù?جرد تÙ?زÙ?Ù? Ø£Ù?ربÙ?ت Ù?Ù? Ù?عطÙ?Ù? اÙ?خصÙ?صÙ?Ø©. Ù?جب عÙ?Ù?Ù? Ø£Ù?ضاÙ? اعداد Ø£Ù?ربÙ?ت Ù? جÙ?ازÙ? Ù? اÙ?براÙ?ج اÙ?Ù?ستÙ?Ù?دة Ù?Ù? تÙ?ر.</string>
+  <string name="wizard_warning_msg">Ø£Ù? تثبÙ?ت اÙ?ربÙ?ت Ù?Ù?Ø· Ù?Ù? Ù?Ù?Ù?Ø­Ù? اÙ?خصÙ?صÙ?Ø© تÙ?Ù?ائÙ?اÙ?.\n\nÙ?جب عÙ?Ù?Ù? تÙ?Ù?Ù?Ù? اÙ?ربÙ?ت بشÙ?Ù? صحÙ?Ø­ Ø? Ù? جÙ?ازÙ? Ø? Ù? اÙ?براÙ?ج اÙ?اخرÙ? اÙ?تÙ? ترÙ?دÙ?ا اÙ? تستخدÙ? تÙ?ر.</string>
   <!--Permissions screen-->
   <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">Ù?ا Ù?Ù?جد رÙ?ت Ø£Ù? صÙ?احÙ?ات خارÙ?Ø© عÙ?Ù? جÙ?ازÙ?  Ù? Ù?Ø°Ù?Ù? Ù?تستÙ?Ù?د Ù?Ù? Ù?Ù? تÙ?ر عÙ?Ù?Ù? استخداÙ? براÙ?ج صÙ?Ù?ت Ù?تعÙ?Ù? Ù?ع Ø£Ù?ربÙ?ت Ø£Ù? اÙ?تÙ? تدعÙ? برÙ?Ù?سÙ? HTTP Ø£Ù? SOCKS .</string>
+  <string name="wizard_permissions_root_msg1">Ù?Ù?Ù?Ù?Ù? اعطاء اÙ?ربÙ?ت صÙ?احÙ?ات حساب رÙ?Ù?ت Ù?تشغÙ?Ù? اÙ?Ù?Ù?Ù?زات اÙ?Ù?تÙ?دÙ?Ø© Ù?Ø«Ù? اÙ?برÙ?Ù?سÙ? اÙ?ضÙ?Ù?Ù?.</string>
+  <string name="wizard_permissions_root_msg2">إذا Ù?Ù?ت Ù?ا ترÙ?د Ø£Ù? تÙ?عÙ? Ù?ذا, اÙ?رجاء إستخداÙ? براÙ?ج Ù?عدة Ù?Ù?عÙ?Ù? Ù?ع اÙ?ربÙ?ت</string>
+  <string name="wizard_permissions_no_root_msg">Ù?بدÙ? Ø£Ù? جÙ?ازÙ? Ù?ا Ù?تÙ?تع بصÙ?احÙ?ات حساب رÙ?Ù?ت.\n\nÙ?Ù?تستÙ?Ù?د Ù?Ù? Ù?Ù? تÙ?ر عÙ?Ù?Ù? استخداÙ? براÙ?ج صÙ?Ù?ت Ù?تعÙ?Ù? Ù?ع اÙ?ربÙ?ت Ø£Ù? اÙ?تÙ? تدعÙ? برÙ?Ù?سÙ? HTTP Ø£Ù? SOCKS .\n\n</string>
   <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">براÙ?ج Ù?عدة Ù?تشتغÙ? Ù?ع Ø£Ù?ربÙ?ت</string>
-  <string name="wizard_tips_gibberbot">جÙ?بربÙ?ت: Ù?حادثات Ø¢Ù?Ù?Ø© باستخداÙ? اÙ?تشÙ?Ù?ر خارج اÙ?سجÙ?.</string>
-  <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
-  <string name="wizard_tips_orweb">ORWEB (Ø£Ù?درÙ?Ù?د 1.x Ù?Ù?Ø·) - Ù?تصÙ?Ø­ Ù?صÙ?Ù?Ù? Ù?Ù?خصÙ?صÙ?Ø© Ù?Ø£Ù?ربÙ?ت </string>
+  <string name="wizard_tips_title"> براÙ?ج Ù?عدة Ù?Ù?عÙ?Ù? Ù?ع اÙ?ربÙ?ت</string>
+  <string name="wizard_tips_gibberbot">Gibberbot: برÙ?اÙ?ج Ù?Ù?Ù?راسÙ?Ø© اÙ?Ù?Ù?رÙ?Ø© اÙ?Ø¢Ù?Ù?Ø© Ù?عÙ?Ù? ببرÙ?تÙ?Ù?Ù?Ù? اÙ?تشÙ?Ù?ر Off-the-Record</string>
+  <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string>
+  <string name="wizard_tips_orweb">Orweb: Ù?تصÙ?Ø­ Ù?صÙ?Ù?Ù? Ù?Ù?خصÙ?صÙ?Ø© Ù? Ù?عÙ?Ù? Ù?ع تÙ?ر</string>
   <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <string name="wizard_tips_play">Ù?Ù?Ù?Ù?Ù? اÙ?حصÙ?Ù? عÙ?Ù? جÙ?Ù?ع تطبÙ?Ù?ات Ù?شرÙ?ع اÙ?جاردÙ?Ù? عÙ?Ù? جÙ?جÙ? بÙ?اÙ?</string>
+  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject\n</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">برÙ?Ù?سÙ? Ø´Ù?اÙ?</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="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_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">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_title">برÙ?Ù?سÙ? اÙ?شبÙ?Ø©</string>
-  <string name="pref_proxy_type_title">Ù?Ù?ع اÙ?برÙ?Ù?سÙ?</string>
-  <string name="pref_proxy_type_summary">اÙ?برÙ?تÙ?Ù?Ù?Ù? Ù?Ù?ستخدÙ? Ù?ع خادÙ? اÙ?برÙ?Ù?سÙ?: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_title">برÙ?Ù?سÙ? اÙ?شبÙ?Ø© اÙ?صادرة</string>
+  <string name="pref_proxy_type_title">Ù?Ù?ع اÙ?برÙ?Ù?سÙ? اÙ?صادر</string>
+  <string name="pref_proxy_type_summary">اÙ?برÙ?تÙ?Ù?Ù?Ù? اÙ?Ù?ستخدÙ? Ù?خادÙ? اÙ?برÙ?Ù?سÙ?: HTTP, HTTPS, Socks4, Socks5</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_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>
   <string name="status">اÙ?حاÙ?Ø©</string>
-  <string name="setting_up_full_transparent_proxying_">Ù?تÙ? اعداد اÙ?برÙ?Ù?سÙ? Ù?اÙ?Ù? اÙ?Ø´Ù?اÙ?Ù?Ø©</string>
-  <string name="setting_up_app_based_transparent_proxying_">Ù?تÙ? اعداد اÙ?برÙ?Ù?سÙ? اÙ?Ø´Ù?اÙ? اÙ?خاص باÙ?براÙ?ج</string>
-  <string name="transparent_proxying_enabled">اÙ?برÙ?Ù?سÙ? اÙ?Ø´Ù?اÙ? Ù?Ù?عÙ?</string>
-  <string name="transproxy_enabled_for_tethering_">اÙ?برÙ?Ù?سÙ? اÙ?Ø´Ù?اÙ? جاÙ?ز Ù?Ù?ربط!</string>
-  <string name="warning_error_starting_transparent_proxying_">تحذÙ?ر: حصÙ? خطأ بتشغÙ?Ù? اÙ?برÙ?Ù?سÙ? اÙ?Ø´Ù?اÙ?</string>
-  <string name="transproxy_rules_cleared">تÙ? Ù?سح Ù?Ù?اعد اÙ?برÙ?Ù?سÙ? اÙ?Ø´Ù?اÙ?</string>
-  <string name="couldn_t_start_tor_process_">تعذر تشغÙ?Ù? تÙ?ر</string>
-  <string name="privoxy_is_running_on_port_">Privoxy Ù?شتغÙ? عÙ?Ù? Ù?Ù?Ù?Ø°:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Ù?تÙ? اعداد اÙ?برÙ?Ù?سÙ? اÙ?Ø´Ù?اÙ? حسب اÙ?Ù?Ù?Ù?Ø°</string>
-  <string name="bridge_error">خطأ بجسر اÙ?اتصاÙ?</string>
-  <string name="bridge_requires_ip">Ù?تستخدÙ? Ù?Ù?زة جسÙ?ر اÙ?اتصاÙ?Ø? Ù?جب عÙ?Ù?Ù? ادخاÙ? عÙ?Ù?اÙ? اÙ?ترÙ?ت Ù?جسر Ù?احد عاÙ?Ø£Ù?Ù?.</string>
-  <string name="send_email_for_bridges">أرسÙ? رساÙ?Ø© برÙ?د اÙ?Ù?ترÙ?Ù?Ù? Ø¥Ù?Ù? bridges@xxxxxxxxxxxxxx Ù?ع عبارة get bridges بداخÙ? اÙ?رساÙ?Ø© Ù?Ù? حساب برÙ?د جÙ?Ù?Ù?Ù? gmail.</string>
+  <string name="setting_up_full_transparent_proxying_">Ù?تÙ? إعداد برÙ?Ù?سÙ? ضÙ?Ù?Ù? Ù?اÙ?Ù?...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Ù?تÙ? إعداد اÙ?برÙ?Ù?سÙ? اÙ?ضÙ?Ù?Ù? حسب اÙ?براÙ?ج...</string>
+  <string name="transparent_proxying_enabled">اÙ?برÙ?Ù?سÙ? اÙ?ضÙ?Ù?Ù? Ù?Ù?Ù?عÙ?</string>
+  <string name="transproxy_enabled_for_tethering_">اÙ?برÙ?Ù?سÙ? اÙ?ضÙ?Ù?Ù? جاÙ?ز Ù?Ù?ربط!</string>
+  <string name="warning_error_starting_transparent_proxying_">تحذÙ?ر: حصÙ? خطأ بتشغÙ?Ù? اÙ?برÙ?Ù?سÙ? اÙ?ضÙ?Ù?Ù?!</string>
+  <string name="transproxy_rules_cleared">تÙ? Ù?سح Ù?Ù?اعد اÙ?برÙ?Ù?سÙ? اÙ?ضÙ?Ù?Ù?</string>
+  <string name="couldn_t_start_tor_process_">Ù?Ù?د تعذر بدء تشغÙ?Ù? تÙ?ر:</string>
+  <string name="privoxy_is_running_on_port_">Privoxy Ù?عÙ?Ù? عÙ?Ù? Ù?Ù?Ù?Ø°:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Ù?تÙ? إعداد اÙ?برÙ?Ù?سÙ? اÙ?ضÙ?Ù?Ù? حسب اÙ?Ù?Ù?Ù?Ø°...</string>
+  <string name="bridge_error">خطأ باÙ?جسر</string>
+  <string name="bridge_requires_ip">حتÙ? تستطÙ?ع إستخدÙ? Ù?Ù?زة اÙ?جسÙ?رØ? Ù?جب عÙ?Ù?Ù? ادخاÙ? عÙ?Ù?اÙ? اÙ?ترÙ?ت Ù?جسر Ù?احد عÙ?Ù? اÙ?Ø£Ù?Ù?.</string>
+  <string name="send_email_for_bridges">أرسÙ? برÙ?د Ø¥Ù?Ù?ترÙ?Ù?Ù? Ø¥Ù?Ù? bridges@xxxxxxxxxxxxxx Ù?ع عبارة \"get bridges\" بداخÙ? اÙ?رساÙ?Ø© Ù?Ù? حساب برÙ?د gmail.</string>
   <string name="error">خطأ</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">اعدادات اÙ?عÙ?Ù?اÙ? اÙ?Ù?ابÙ? Ù?Ù?اتصاÙ? Ù?دÙ?Ù? تسببت بخطأ!</string>
-  <string name="your_relay_settings_caused_an_exception_">اعدادات Ù?Ù?اط اÙ?تحÙ?Ù?Ù? Ù?دÙ?Ù? تسببت بخطأ!</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">إعدادات اÙ?عÙ?Ù?اÙ? اÙ?Ù?ابÙ? Ù?Ù?اتصاÙ? Ù?دÙ?Ù? تسببت بخطأ!</string>
+  <string name="your_relay_settings_caused_an_exception_">إعدادات اÙ?Ù?رحÙ?ات Ù?دÙ?Ù? تسببت بخطأ!</string>
   <string name="exit_nodes">Ù?Ù?اط اÙ?خرÙ?ج</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">اÙ?بصÙ?اتØ? اÙ?اسÙ?اء اÙ?Ù?ستعارةØ? اÙ?بÙ?داÙ?  Ù? اÙ?عÙ?اÙ?Ù?Ù? Ù?آخر Ù?Ù?طة اتصاÙ?</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">اÙ?بصÙ?اتØ? اÙ?اسÙ?اء اÙ?Ù?ستعارةØ? اÙ?بÙ?داÙ? Ù? اÙ?عÙ?اÙ?Ù?Ù? Ù?آخر Ù?Ù?طة اتصاÙ?</string>
   <string name="enter_exit_nodes">أدخÙ? Ù?Ù?اط اÙ?خرÙ?ج</string>
   <string name="exclude_nodes">استثÙ?Ù? اÙ?Ù?Ù?اط</string>
   <string name="fingerprints_nicks_countries_and_addresses_to_exclude">بصÙ?اتØ? اÙ?أسÙ?اء اÙ?Ù?ستعارةØ? اÙ?بÙ?داÙ? Ù? اÙ?عÙ?اÙ?Ù?Ù? Ù?Ù?تÙ? استثÙ?ائÙ?ا</string>
   <string name="enter_exclude_nodes">أدخÙ? اÙ?Ù?Ù?اط اÙ?Ù?ستثÙ?اÙ?</string>
   <string name="strict_nodes">اÙ?Ù?Ù?اط اÙ?Ù?شددة</string>
-  <string name="use_only_these_specified_nodes">Ù?Ù?Ø· استخدÙ? Ù?Ø°Ù? اÙ?Ù?Ù?اط اÙ?Ù?حددة</string>
+  <string name="use_only_these_specified_nodes">استخدÙ? Ù?Ù?Ø· تÙ?Ù? اÙ?Ù?Ù?اط اÙ?Ù?حددة</string>
   <string name="bridges">اÙ?جسÙ?ر</string>
   <string name="use_bridges">استخدÙ? اÙ?جسÙ?ر</string>
-  <string name="bridges_obfuscated">اÙ?جسÙ?ر اÙ?Ù?Ø®Ù?Ù?Ø©</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">اسÙ?Ø­ باستخداÙ? Ù?Ù?اط دخÙ?Ù? بدÙ?Ù?Ø© عÙ?Ù? شبÙ?Ø© تÙ?ر</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">تÙ?عÙ?Ù? Ù?ذا اÙ?Ø®Ù?ار اذا Ù?اÙ?ت اÙ?جسÙ?ر Ù?Ø®Ù?Ù?Ø©</string>
-  <string name="ip_address_and_port_of_bridges">عÙ?اÙ?Ù?Ù? اÙ?اÙ?ترÙ?ت Ù? Ù?Ù?اÙ?Ø° اÙ?جسÙ?ر</string>
-  <string name="enter_bridge_addresses">أدخÙ? عÙ?Ù?اÙ? اÙ?جسر</string>
-  <string name="relays">Ù?Ù?اط اÙ?تحÙ?Ù?Ù?</string>
-  <string name="relaying">Ù?تÙ? اÙ?تحÙ?Ù?Ù?</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">اسÙ?Ø­ Ù?جÙ?ازÙ? Ù?Ù?Ù?Ù?Ù? Ù?Ù?Ù?Ø° تحÙ?Ù?Ù? غÙ?ر Ù?Ù?ائÙ?</string>
-  <string name="relay_port">Ù?Ù?اÙ?Ø° تحÙ?Ù?Ù? اÙ?اتصاÙ?</string>
-  <string name="listening_port_for_your_tor_relay">اÙ?Ù?Ù?Ù?Ø° اÙ?Ù?صغÙ? Ù?Ù?Ù?Ù?Ø° تحÙ?Ù?Ù? تÙ?ر اÙ?خاص بÙ?</string>
+  <string name="bridges_obfuscated">اÙ?جسÙ?ر اÙ?غاÙ?ضة</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">اسÙ?Ø­ باستخداÙ? Ù?Ù?اط دخÙ?Ù? بدÙ?Ù?Ø© Ø¥Ù?Ù? شبÙ?Ø© تÙ?ر</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Ù?عÙ? Ù?ذا اÙ?Ø®Ù?ار إذا Ù?اÙ?ت اÙ?جسÙ?ر اÙ?Ù?حددة جسÙ?ر غاÙ?ضة</string>
+  <string name="ip_address_and_port_of_bridges">عÙ?Ù?اÙ? اÙ?اÙ?ترÙ?ت Ù? اÙ?Ù?Ù?Ù?Ø° Ù?Ù?جسÙ?ر</string>
+  <string name="enter_bridge_addresses">أدخÙ? عÙ?اÙ?Ù?Ù? اÙ?جسÙ?ر</string>
+  <string name="relays">اÙ?Ù?رحÙ?ات</string>
+  <string name="relaying">Ù?رحÙ?</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">اسÙ?Ø­ Ù?جÙ?ازÙ? Ù?Ù?Ù?Ù?Ù? Ù?رحÙ? غÙ?ر Ù?Ù?ائÙ?</string>
+  <string name="relay_port">Ù?Ù?Ù?Ø° اÙ?Ù?رحÙ?</string>
+  <string name="listening_port_for_your_tor_relay">اÙ?Ù?Ù?Ù?Ø° اÙ?Ù?صغÙ? Ù?Ù?Ù?رحÙ? تÙ?ر اÙ?خاص بÙ?</string>
   <string name="enter_or_port">أدخÙ? Ù?Ù?Ù?Ø° OR</string>
-  <string name="relay_nickname">اÙ?اسÙ? اÙ?Ù?ستعار Ù?Ù?Ù?Ù?Ø° اÙ?تحÙ?Ù?Ù?</string>
-  <string name="the_nickname_for_your_tor_relay">اÙ?اسÙ? اÙ?Ù?ستعار Ù?Ù?Ù?Ù?Ø° تحÙ?Ù?Ù? تÙ?ر اÙ?خاص بÙ?</string>
-  <string name="enter_a_custom_relay_nickname">أدخÙ? اسÙ? Ù?ستعار Ù?Ù?Ù?طة تحÙ?Ù?Ù?</string>
+  <string name="relay_nickname">اÙ?اسÙ? اÙ?Ù?ستعار Ù?Ù?Ù?Ù?رحÙ?</string>
+  <string name="the_nickname_for_your_tor_relay">اÙ?اسÙ? اÙ?Ù?ستعار Ù?Ù?Ù?رحÙ? تÙ?ر اÙ?خاص بÙ?</string>
+  <string name="enter_a_custom_relay_nickname">أدخÙ? اسÙ? Ù?ستعار Ù?Ù?Ù?Ù?رحÙ?</string>
   <string name="reachable_addresses">اÙ?عÙ?اÙ?Ù?Ù? اÙ?تÙ? Ù?Ù?Ù?Ù? اÙ?Ù?صÙ?Ù? Ø¥Ù?Ù?Ù?ا</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Ù?Ù? باÙ?تشغÙ?Ù? Ù?خدÙ?Ø© Ù?Ù? Ù?راء جدار Ù?ارÙ?</string>
-  <string name="reachable_ports">اÙ?Ù?Ù?اÙ?Ø° اÙ?Ù?ابÙ?Ø© Ù?Ù?اتصاÙ?</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">اÙ?Ù?Ù?اÙ?Ø° اÙ?Ù?ابÙ?Ø© Ù?Ù?اتصاÙ? عبر اÙ?جدار اÙ?Ù?ارÙ?</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">اÙ?عÙ?Ù? Ù?خدÙ?Ø© Ù?Ù? Ù?راء جدار Ù?ارÙ? بسÙ?اسات تÙ?Ù?دÙ?Ø©</string>
+  <string name="reachable_ports">اÙ?Ù?Ù?اÙ?Ø° اÙ?تÙ? Ù?Ù?Ù?Ù? اÙ?Ù?صÙ?Ù? Ø¥Ù?Ù?Ù?ا</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Ù?Ù?اÙ?Ø° Ù?Ù?تÙ?حة عبر جدار Ù?ارÙ? تÙ?Ù?دÙ?</string>
   <string name="enter_ports">أدخÙ? اÙ?Ù?Ù?اÙ?Ø°</string>
-  <string name="enable_hidden_services">تشغÙ?Ù? اÙ?خدÙ?ات اÙ?Ù?Ø®Ù?Ù?Ø©</string>
-  <string name="run_servers_accessible_via_the_tor_network">شغÙ? Ø®Ù?ادÙ? Ù?ابÙ?Ø© Ù?Ù?اتصاÙ? Ù?Ù? داخÙ? شبÙ?Ø© تÙ?ر</string>
-  <string name="enter_localhost_ports_for_hidden_services">أدخÙ? Ù?Ù?اÙ?Ø° localhost Ù?Ù?خدÙ?ات اÙ?Ù?Ø®Ù?Ù?Ø©</string>
+  <string name="enable_hidden_services">استضاÙ?Ø© اÙ?خدÙ?Ø© اÙ?Ù?Ø®Ù?Ù?Ø©</string>
+  <string name="run_servers_accessible_via_the_tor_network">اÙ?سÙ?اح Ù?Ù?خادÙ? اÙ?Ø°Ù? عÙ?Ù? جÙ?ازÙ? بأÙ?Ù?اÙ?Ù?Ø© اÙ?Ù?صÙ?Ù? Ø¥Ù?Ù?Ù? Ù?Ù? Ø®Ù?اÙ? شبÙ?Ø© تÙ?ر</string>
+  <string name="enter_localhost_ports_for_hidden_services">أدخÙ? اÙ?Ù?Ù?اÙ?Ø° اÙ?Ù?Ø­Ù?Ù?Ø© Ù?Ù?خدÙ?ات اÙ?Ù?Ø®Ù?Ù?Ø©</string>
   <string name="hidden_service_ports">Ù?Ù?اÙ?Ø° اÙ?خدÙ?ات اÙ?Ù?Ø®Ù?Ù?Ø©</string>
   <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">اسÙ? اÙ?عÙ?Ù?اÙ? Ù?خدÙ?تÙ? اÙ?Ù?Ø®Ù?Ù?Ø© (Ù?تÙ? اÙ?شائÙ? تÙ?Ù?ائÙ?اÙ?)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">شغÙ? سجÙ? اÙ?Ù?عاÙ?جة debug</string>
-  <string name="project_home">اÙ?Ù?Ù?Ù?ع اÙ?رسÙ?Ù? Ù?Ù?Ù?شرÙ?ع:</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">شغÙ? سجÙ? اÙ?Ù?debug ( Ù?Ù?Ù?راجعة Ù?جب استخداÙ? adb Ø£Ù? LogCat)</string>
+  <string name="project_home">اÙ?Ù?Ù?Ù?ع اÙ?رسÙ?Ù? Ù?Ù?Ù?شرÙ?ع (اÙ?Ù?شارÙ?ع):</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
   <string name="the_tor_license">رخصة استخداÙ? تÙ?ر</string>
   <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">براÙ?ج Ù?Ù? جÙ?ات أخرÙ?:</string>
-  <string name="tor_version">Tor v0.2.3.10: https://www.torproject.orgب;</string>
-  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
+  <string name="third_party_software">براÙ?ج Ù?Ù? اÙ?طرÙ? اÙ?ثاÙ?Ø«:</string>
+  <string name="tor_version">Tor v0.2.4.3-alpha: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.1.1-alpha: http://www.monkey.org/~provos/libevent/</string>
   <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
   <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
-  <string name="hidden_service_request">أحد اÙ?براÙ?ج Ù?حاÙ?Ù? تشغÙ?Ù? خدÙ?Ø© Ù?Ø®Ù?Ù?Ø© بÙ?Ù?Ù?Ø° %S عÙ?Ù? شبÙ?Ø© تÙ?ر. Ù?Ø°Ù? اÙ?Ù?Ù?زة Ø¢Ù?Ù?Ø© Ù?Ù?Ø· اذا Ù?Ù?ت تثÙ? باÙ?برÙ?اÙ?ج</string>
-  <string name="found_existing_tor_process">تÙ? اÙ?عثÙ?ر عÙ?Ù? برÙ?اÙ?ج تÙ?ر </string>
+  <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string>
+  <string name="hidden_service_request">Ù?Ù?اÙ? برÙ?اÙ?ج Ù?حاÙ?Ù? Ù?تح Ù?Ù?Ù?Ø° Ù?خادÙ? Ù?Ø®Ù?Ù? %S Ø¥Ù?Ù? شبÙ?Ø© تÙ?ر. Ù?ذا اÙ?سÙ?Ù?Ù? Ø¢Ù?Ù? إذا Ù?Ù?ت تثÙ? بÙ?ذا اÙ?برÙ?اÙ?ج.</string>
+  <string name="found_existing_tor_process">عÙ?ثر عÙ?Ù? عÙ?Ù?Ù?Ø© تÙ?ر سابÙ?Ø© تعÙ?Ù?...</string>
   <string name="something_bad_happened">حصÙ? خطأ Ù?ا. اÙ?حص اÙ?سجÙ?</string>
-  <string name="hidden_service_on">تشغÙ?Ù? اÙ?خدÙ?ات اÙ?Ù?Ø®Ù?Ù?Ø©</string>
+  <string name="hidden_service_on">اÙ?خدÙ?ات اÙ?Ù?Ø®Ù?Ù?Ø© اÙ?تÙ? تعÙ?Ù? حاÙ?Ù?اÙ?:</string>
   <string name="unable_to_read_hidden_service_name">غÙ?ر Ù?ادر عÙ?Ù? Ù?راءة اسÙ? اÙ?خدÙ?Ø© اÙ?Ù?Ø®Ù?Ù?Ø©</string>
-  <string name="unable_to_start_tor">غÙ?ر Ù?ادر عÙ?Ù? تشغÙ?Ù? تÙ?ر</string>
-  <string name="pref_use_sys_iptables_title">استخدÙ? iptables اÙ?تÙ?Ù?ائÙ?</string>
-  <string name="pref_use_sys_iptables_summary">استخدÙ? Ù?Ù?Ù?Ù?ات iptables اÙ?Ù?Ù?جÙ?دة ضÙ?Ù?اÙ? باÙ?جÙ?از بدÙ? اÙ?Ù?سخة اÙ?Ù?ربÙ?طة Ù?ع Ø£Ù?ربÙ?ت</string>
-  <string name="error_installing_binares">Ù?Ù? Ù?تÙ? تثبÙ?ت Ø£Ù? تحدÙ?Ø« Ù?Ù?Ù?Ù?ات تÙ?ر</string>
-  <string name="pref_use_persistent_notifications">ضع اÙ?Ø£Ù?Ù?Ù?Ù?Ø© Ù?Ù? شرÙ?Ø· اÙ?تÙ?بÙ?Ù?ات عÙ?دÙ?ا Ù?Ù?Ù?Ù? Ø£Ù?ربÙ?ت Ù?تصÙ?اÙ?</string>
-  <string name="pref_use_persistent_notifications_title">تÙ?عÙ?Ù? اÙ?تÙ?بÙ?Ù?ات دائÙ?اÙ?</string>
+  <string name="unable_to_start_tor">غÙ?ر Ù?ادر عÙ?Ù? بدء تÙ?ر:</string>
+  <string name="pref_use_sys_iptables_title">استخدÙ? اÙ?Ù?iptables اÙ?تÙ?Ù?ائÙ?Ø©</string>
+  <string name="pref_use_sys_iptables_summary">استخدÙ? Ù?Ù?Ù?Ù?ات اÙ?Ù?iptables اÙ?Ù?Ù?جÙ?دة ضÙ?Ù?اÙ? باÙ?جÙ?از بدÙ? اÙ?Ù?سخة اÙ?Ù?رÙ?Ù?Ø© Ù?ع اÙ?ربÙ?ت</string>
+  <string name="error_installing_binares">غÙ?ر Ù?ادرة عÙ?Ù? تثبÙ?ت Ø£Ù? تحدÙ?Ø« تÙ?ر</string>
+  <string name="pref_use_persistent_notifications">دائÙ?ا ضع اÙ?Ø£Ù?Ù?Ù?Ù?Ø© Ù?Ù? شرÙ?Ø· اÙ?أدÙ?ات عÙ?دÙ?ا Ù?Ù?Ù?Ù? اÙ?ربÙ?ت Ù?تصÙ?اÙ?</string>
+  <string name="pref_use_persistent_notifications_title">تÙ?بÙ?Ù?ات دائÙ?Ø©</string>
   <string name="notification_using_bridges">تÙ? تÙ?عÙ?Ù? اÙ?جسÙ?ر!</string>
-  <string name="default_bridges"/>
-  <string name="set_locale_title">تغÙ?Ù?ر اÙ?Ù?غة</string>
-  <string name="set_locale_summary">غÙ?ر اÙ?Ù?غة Ù? اÙ?اعدادات اÙ?اÙ?Ù?Ù?Ù?Ù?Ø© Ù?Ø£Ù?ربÙ?ت</string>
-  <string name="wizard_locale_title">اختÙ?ار اÙ?Ù?غة</string>
-  <string name="wizard_locale_msg">اختر اÙ?Ù?غة اÙ?اÙ?تراضÙ?Ø©</string>
-  <string name="powered_by">بدعÙ? Ù?Ù? Ù?شرÙ?ع تÙ?ر</string>
-  <string name="btn_save_settings">Ø­Ù?ظ اÙ?اعدادات</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">ضبط اÙ?إعدادات اÙ?Ù?Ø­Ù?Ù?Ø©</string>
+  <string name="set_locale_summary">اختار  اÙ?إعدادات اÙ?Ù?Ø­Ù?Ù?Ø© Ù? اÙ?Ù?غة Ù?اÙ?ربÙ?ت</string>
+  <string name="wizard_locale_title">اختار اÙ?Ù?غة</string>
+  <string name="wizard_locale_msg">Ø¥Ù?ا اÙ? تترÙ? اÙ?Ù?غة اÙ?اÙ?تراضÙ?Ø© اÙ? Ø¥Ù?ا اÙ? تغÙ?ر اÙ?Ù?غة</string>
+  <string name="powered_by">Ù?دعÙ?Ù? Ù?Ù? Ù?بÙ? Ù?شرÙ?ع تÙ?ر</string>
+  <string name="btn_save_settings">Ø­Ù?ظ اÙ?إعدادات</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index fa92c48..c249f53 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -73,6 +73,7 @@
   <string name="wizard_final_msg">СÑ?оÑ?иÑ?и Ñ?илÑ?ди Ñ?оÑ?а по Ñ?веÑ?а използваÑ? ТоÑ? по Ñ?азлиÑ?ни пÑ?иÑ?ини.\n\nÐ?Ñ?Ñ?налиÑ?Ñ?и и блогÑ?Ñ?и, заÑ?иÑ?ниÑ?и на Ñ?овеÑ?киÑ?е пÑ?ава, Ñ?лÑ?жиÑ?ели на закона, военни, коÑ?поÑ?аÑ?ии, гÑ?аждани под огÑ?аниÑ?иÑ?елни Ñ?ежими, и пÑ?оÑ?Ñ?о обикновени гÑ?аждани... и Ñ?ега и Ñ?и Ñ?и гоÑ?ов да го напÑ?авиÑ? Ñ?Ñ?Ñ?о!</string>
   <!--END Welcome Wizard strings (DJH)-->
   <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>
   <!--New Wizard Strings-->
@@ -163,7 +164,7 @@
   <string name="error_installing_binares">Ð?вÑ?иÑ?ниÑ?е Ñ?айлове на ТоÑ? не бÑ?Ñ?а инÑ?Ñ?алиÑ?ани или обновени.</string>
   <string name="pref_use_persistent_notifications">Ð?инаги показвай икона в Ñ?Ñ?лбаÑ?а когаÑ?о Ð?Ñ?боÑ? е Ñ?вÑ?Ñ?зан</string>
   <string name="pref_use_persistent_notifications_title">УведомлениÑ? винаги вклÑ?Ñ?ени</string>
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="set_locale_title">Ð?збеÑ?и меÑ?Ñ?оположение</string>
   <string name="set_locale_summary">Ð?збеÑ?и меÑ?Ñ?оположение и език за Ð?Ñ?боÑ?</string>
   <string name="wizard_locale_title">Ð?збеÑ?и език</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index f834ccb..6c721b8 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1,99 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Orbot</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>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Engega o atura Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot s\'està iniciant...</string>
-  <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="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>
-  <string name="menu_settings">Preferències</string>
-  <string name="menu_log">Registre</string>
-  <string name="menu_info">Ajut</string>
-  <string name="menu_apps">Aplicacions</string>
-  <string name="menu_start">Inici</string>
-  <string name="menu_stop">Atura</string>
-  <string name="menu_about">Quant a...</string>
-  <string name="menu_wizard">Wizard</string>
-  <string name="button_help">Ajut</string>
-  <string name="button_close">Tanca</string>
-  <string name="button_about">Quant a...</string>
-  <string name="button_clear_log">Esborra el registre</string>
-  <string name="menu_verify">Prova</string>
-  <string name="menu_exit">Surt</string>
-  <string name="press_to_start">- long press to start -</string>
-  <string name="pref_trans_proxy_group">Utilitza un proxy transparent (requereix accés)</string>
-  <string name="pref_trans_proxy_title">Utilitza un proxy transparent</string>
-  <string name="pref_trans_proxy_summary">Automatitza Tor per a les aplicacions</string>
-  <string name="pref_transparent_all_title">Automatitza Tor per a tot</string>
-  <string name="pref_transparent_all_summary">Canalitza tot el trànsit de proxy de les aplicacions per Tor</string>
-  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
-  <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
-  <string name="pref_transparent_port_title">Port List</string>
-  <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
-  <string name="pref_transparent_port_dialog">Enter ports to proxy</string>
-  <string name="pref_has_root">Request Root Access</string>
-  <string name="pref_has_root_summary">Request root access for transparent proxying</string>
-  <string name="status_install_success">Binaris de Tor instal·lats correctament!</string>
-  <string name="status_install_fail">Els fitxers binaris de Tor no s\'han pogut instalar. Per favor, comprova el registre i notifica-ho a tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Error de l\'aplicació</string>
-  <string name="wizard_title">Benvingut/da a Orbot</string>
-  <string name="wizard_btn_tell_me_more">Quant a Orbot...</string>
-  <string name="btn_next">Següent</string>
-  <string name="btn_back">Enrere</string>
-  <string name="btn_finish">Fi</string>
-  <string name="btn_okay">D\'acord</string>
   <string name="btn_cancel">Cancel·la</string>
   <!--Welcome Wizard strings (DJH)-->
-  <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>
-  <string name="wizard_permissions_stock">Permisos d\'Orbot</string>
-  <string name="wizard_premissions_msg_root">Perfecte! Hem detectat que tens els permisos matriu activats per a Orbot. Utilitzarem aquest poder sàviament.</string>
-  <string name="wizard_permissions_msg_stock">Encara que no és imprescindible, Orbot pot esdevenir una eina molt més potent si el teu terminal té accés complet. Utilitza el botó d\'aquí sota per conferir superpoders a Orbot!</string>
-  <string name="wizard_permissions_no_root">Si no tens accés complet, o no tens ni idea del què t\'estem parlant, simplement assegura\'t d\'utilitzar aplicacions fetes per a funcionar amb Orbot.</string>
-  <string name="wizard_permissions_consent">Ho entenc i vull continuar sense accés complet.</string>
-  <string name="wizard_permission_enable_root">Concedeix accés complet a Orbot</string>
-  <string name="wizard_configure">Configura la connexió a Tor</string>
-  <string name="wizard_configure_msg">Orbot t\'ofereix l\'opció de conduir el trànsit de totes les aplicacions per Tor o bé escollir quines aplicacions vols utilitzar amb Tor.</string>
-  <string name="wizard_configure_all">Connecta totes les aplicacions per Proxy per Tor.</string>
-  <string name="wizard_configure_select_apps">Selecciona aplicacions individuals per a funcionar amb Tor</string>
-  <string name="wizard_tips_tricks">Aplicacions per a usar-se amb Orbot</string>
-  <string name="wizard_tips_msg">T\'animem a descarregar-te &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_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.\n\n\nLa configuració de l\'amfitrió és 127.0.0.1 o \"localhost\". Per a HTTP, el port actiu és 8118. Per a SOCKS, el proxy és 9050. Hauries d\'utlitzar SOCKS4A o SOCKS5 si és possible.\n\n\n\nPots aprendre més coses sobre l\'ús dels proxys a Android al FAQ de: http://tinyurl.com/proxyandroid\n    </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>
   <!--END Welcome Wizard strings (DJH)-->
-  <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. \n\nVisita\'ns a https://guardianproject.info/apps/orbot o envia\'ns un correu electrònic a help@xxxxxxxxxxxxxxxxxxxx per a saber-ne més.</string>
-  <string name="tor_check">Això obrirà el teu navegador web per defecte i es connectarà a https://check.torproject.org per tal de comprovar si Orbot està configurat correctament i estàs connectat/da a Tor.</string>
-  <string name="pref_hs_group">Serveis ocults</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>
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
-  <string name="wizard_tips_orweb">ORWEB (Només Android 1.x) - Navegador dissenyat per la privacitat &amp; per a Orbot</string>
-  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_none">Cap</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="default_bridges"/>
-  <string name="powered_by">Funciona gràcies al Projecte Tor</string>
+  <string name="default_bridges"></string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index e335fa3..2a1604d 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -23,9 +23,11 @@
   <string name="menu_apps">Aplikace</string>
   <string name="menu_start">Zapnout</string>
   <string name="menu_stop">Vypnout</string>
+  <string name="menu_about">O aplikaci</string>
   <string name="menu_wizard">Průvodce</string>
   <string name="button_help">Pomoc</string>
   <string name="button_close">ZavÅ?ít</string>
+  <string name="button_about">O aplikaci</string>
   <string name="button_clear_log">VyÄ?istit log</string>
   <string name="menu_verify">OvÄ?Å?it</string>
   <string name="menu_exit">Konec</string>
@@ -55,6 +57,7 @@
   <string name="wizard_proxy_help_info">Nastavení Proxy</string>
   <string name="wizard_final">Orbot je pÅ?ipraven!</string>
   <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Hlavní</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
@@ -67,7 +70,12 @@
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparentní proxy</string>
+  <string name="wizard_transproxy_none">Není</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="default_bridges"/>
+  <string name="status">Status</string>
+  <string name="error">Chyba</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">Uloz nastaveni</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 994a9fe..f4d40dc 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -9,7 +9,7 @@
   <string name="tor_proxy_service_process">Tor Proxydienst</string>
   <string name="status_starting_up">Orbot startet...</string>
   <string name="status_activated">Verbunden mit dem Tor-Netzwerk</string>
-  <string name="status_disabled">\"Orbot ist deaktiviert</string>
+  <string name="status_disabled">Orbot ist deaktiviert</string>
   <string name="status_shutting_down">Orbot wird beendet</string>
   <string name="tor_process_starting">Starte Tor-Software...</string>
   <string name="tor_process_complete">abgeschlossen.</string>
@@ -34,7 +34,7 @@
   <string name="menu_verify">�berprüfen</string>
   <string name="menu_exit">Beenden</string>
   <string name="press_to_start">- Zum Starten gedrückt halten -</string>
-  <string name="pref_trans_proxy_group">Transparenter Proxy (benötigt Administratorrechte)</string>
+  <string name="pref_trans_proxy_group">Transparenter Proxy (benötigt Root-Rechte)</string>
   <string name="pref_trans_proxy_title">Transparenter Proxy</string>
   <string name="pref_trans_proxy_summary">Anwendungen automatisch durch Tor leiten</string>
   <string name="pref_transparent_all_title">Alles durch Tor leiten</string>
@@ -58,16 +58,16 @@
   <string name="btn_cancel">Abbrechen</string>
   <!--Welcome Wizard strings (DJH)-->
   <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_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 Root-Rechten auch die Fähigkeit, jeglichen Internetverkehr über das Tor-Netzwerk abzuwickeln.</string>
   <string name="wizard_permissions_root">Berechtigung erteilt</string>
   <string name="wizard_permissions_stock">Orbot Rechte</string>
-  <string name="wizard_premissions_msg_root">Exzellent! Wir haben festgestellt, dass Sie Orbot Administrator-Rechte eingeräumt haben. Wir werden diese Macht weise nutzen.</string>
-  <string name="wizard_permissions_msg_stock">Obwohl es nicht nötig ist, kann Orbot ein mächtigeres Tool werden, wenn Sie ihm Administrator-Rechte einräumen. Drücken Sie auf den Kopf unten, um Orbot diese Superkräfte einzuräumen.</string>
-  <string name="wizard_permissions_no_root">Falls Sie keinen Administrator-Zugriff haben oder nicht wissen was das ist, achten Sie darauf, dass Sie Anwendungen verwenden, die Orbot nutzen können.</string>
-  <string name="wizard_permissions_consent">Ich habe verstanden und möchte ohne Administrator-Rechte weitermachen.</string>
-  <string name="wizard_permission_enable_root">Orbot Administrator-Rechte einräumen</string>
+  <string name="wizard_premissions_msg_root">Exzellent! Wir haben festgestellt, dass Sie Orbot Root-Rechte eingeräumt haben. Wir werden diese Macht weise nutzen.</string>
+  <string name="wizard_permissions_msg_stock">Obwohl es nicht nötig ist, kann Orbot ein mächtigeres Tool werden, wenn Sie ihm Root-Rechte einräumen. Drücken Sie auf den Kopf unten, um Orbot diese Superkräfte einzuräumen.</string>
+  <string name="wizard_permissions_no_root">Falls Sie keinen Root-Zugriff haben oder nicht wissen, was das ist, achten Sie darauf, dass Sie Anwendungen verwenden, die Orbot nutzen können.</string>
+  <string name="wizard_permissions_consent">Ich habe verstanden und möchte ohne Root-Rechte weitermachen.</string>
+  <string name="wizard_permission_enable_root">Orbot Root-Rechte einräumen</string>
   <string name="wizard_configure">Torification konfigurieren</string>
-  <string name="wizard_configure_msg">Orbot gibt Ihnen die Wahl, den Datenverkehr aller Apps durch Tor zu leiten ODER die Wahl für alle Apps einzeln zu treffen.</string>
+  <string name="wizard_configure_msg">Orbot gibt Ihnen die Wahl, den Datenverkehr aller Apps durch Tor zu leiten ODER einzelne Apps auszuwählen.</string>
   <string name="wizard_configure_all">Den Verkehr aller Apps durch Tor leiten</string>
   <string name="wizard_configure_select_apps">Apps einzeln wählen</string>
   <string name="wizard_tips_tricks">Apps, für die Orbot aktiviert ist</string>
@@ -78,7 +78,7 @@
   <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
   <string name="wizard_tips_firefox">Firefox mir Proxy Mobile-Add-On (extra Installation im Anschluss)</string>
   <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
-  <string name="wizard_tips_twitter">Twitter unterstützt den http proxy \"localhost:8118\"</string>
+  <string name="wizard_tips_twitter">Twitter unterstützt den HTTP-Proxy \"localhost:8118\"</string>
   <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Proxy-Einstellungen</string>
   <string name="wizard_proxy_help_msg">Wenn das Android-App, das Sie benutzen, die Verwendung von HTTP- oder SOCKS-Proxys unterstützt, können Sie es so konfigurieren, dass es sich mit Orbot verbindet und Tor verwendet.\n\n\nDie Host-Einstellungen sind 127.0.0.1 oder \"localhost\". Die Port-Einstellungen sind 8118 für HTTP und 9050 für SOCKS. Sie sollten versuchen, SOCKS4A oder SOCKS5 zu verwenden.\n\n\n\nErfahren Sie mehr über die Verwendung von Proxys unter Android in den FAQ unter http://tinyurl.com/proxyandroid\n    </string>
@@ -99,16 +99,16 @@
   <string name="wizard_warning_msg">Die reine Installation von Orbot wird Ihren Datenverkehr nicht anonymisieren. Tor muss korrekt konfiguriert sein, damit ihr Gerät Tor erfolgreich verwenden kann.</string>
   <!--Permissions screen-->
   <string name="wizard_permissions_title">Rechte</string>
-  <string name="wizard_permissions_root_msg1">Sie können Orbot wahlweise \'Administrator\'-Rechte geben, um erweiterte Optionen wie die Nutzung von transparenten Proxys zu ermöglichen.</string>
+  <string name="wizard_permissions_root_msg1">Sie können Orbot wahlweise \'Root\'-Rechte geben, um erweiterte Optionen wie die Nutzung von transparenten Proxys zu ermöglichen.</string>
   <string name="wizard_permissions_root_msg2">Wenn Sie dies nicht möchten, dann verwenden Sie bitte Apps, die mit Orbot zusammen arbeiten können.</string>
   <string name="wizard_permissions_no_root_msg">Ihr Gerät läuft im Standard-Modus und unterstützt keine Administrator-Rechte. In diesem Fall müssen Sie Apps verwenden, die von Haus aus mit Orbot zusammenarbeiten oder die HTTP bzw. SOCKS Proxy Einstellungen ermöglichen.\n</string>
   <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Apps die Orbot unterstützt</string>
+  <string name="wizard_tips_title">Apps, die Orbot unterstützen</string>
   <string name="wizard_tips_gibberbot">Gibberbot: Sichere Chat App mit inoffizieller Verschlüsselung</string>
-  <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
+  <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string>
   <string name="wizard_tips_orweb">ORWEB (Nur Android 1.x) - Ein für Privatsphäre &amp; Orbot entworfener Browser</string>
-  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
-  <string name="wizard_tips_play">Finde alle Guardian Project Apss im Google Play Store</string>
+  <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.xpi</string>
+  <string name="wizard_tips_play">Finde alle Guardian Project Apps im Google Play Store</string>
   <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
@@ -116,24 +116,24 @@
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
   <string name="wizard_transproxy_title">Benutze transparenten Proxy</string>
-  <string name="wizard_transproxy_msg">Dies ermöglicht Ihnen Apps, automatisch das Tor Netzwerk zu verwenden ohne dies konfigurieren zu müssen.</string>
+  <string name="wizard_transproxy_msg">Dies ermöglicht Ihren Apps automatisch das Tor Netzwerk zu verwenden ohne dies konfigurieren zu müssen.</string>
   <string name="wizard_transproxy_hint">(Klicken Sie dieses Kästchen an wenn Sie nicht wissen wovon wir reden)</string>
   <string name="wizard_transproxy_none">Nichts</string>
   <string name="pref_transparent_tethering_title">Tor Anbindung</string>
   <string name="pref_transparent_tethering_summary">Aktiviere transparenten Proxy für Wifi und angebunde USB-Geräte (benötigt einen Neustart)</string>
-  <string name="button_grant_superuser">Administrator-Rechte anfordern</string>
+  <string name="button_grant_superuser">Root-Rechte anfordern</string>
   <string name="pref_select_apps">Apps auswählen</string>
-  <string name="pref_select_apps_summary">Wählen Sie die Apps die Tor benutzen sollen</string>
+  <string name="pref_select_apps_summary">Wählen Sie die Apps, die Tor benutzen sollen</string>
   <string name="pref_node_configuration">Knoten-Konfiguration</string>
   <string name="pref_node_configuration_summary">Dies sind erweiterte Einstellungen, die Ihre Anonymität beeinträchtigen können</string>
   <string name="pref_entrance_node">Eingangs-Knoten</string>
-  <string name="pref_entrance_node_summary">Fingerprints, Spitznamen, Land und Adressen für den ersten Punkt</string>
+  <string name="pref_entrance_node_summary">Fingerprints, Spitznamen, Länder und Adressen für den ersten Punkt</string>
   <string name="pref_entrance_node_dialog">Eingangs-Knoten angeben</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_title">Ausgehender Netzwerk-Proxy</string>
   <string name="pref_proxy_type_title">Proxy-Typ</string>
-  <string name="pref_proxy_type_summary">Protokoll zur Verwendung des Proxy Servers:HTTP,HTTPS,Socks4,Socks5</string>
+  <string name="pref_proxy_type_summary">Protokoll zur Verwendung des Proxy Servers: HTTP, HTTPS, Socks4, Socks5</string>
   <string name="pref_proxy_type_dialog">Proxy-Typ angeben</string>
   <string name="pref_proxy_host_title">Proxy-Server</string>
   <string name="pref_proxy_host_summary">Hostname des Proxys-Servers</string>
@@ -152,31 +152,31 @@
   <string name="privoxy_is_running_on_port_">Privoxy läuft auf Port:</string>
   <string name="setting_up_port_based_transparent_proxying_">Richte Port-basiertes transparentes Proxiying ein...</string>
   <string name="bridge_error">Bridge-Fehler</string>
-  <string name="bridge_requires_ip">Um das Bridge-Feature nutzen zu können müssen Sie mindestens eine IP-Adresse eingeben.</string>
-  <string name="send_email_for_bridges">Senden Sie von Ihrem gmail-Account ein e-Mail an bridges@xxxxxxxxxxxxxx mit dem Text \"get bridges\" im Nachrichten-Feld.</string>
+  <string name="bridge_requires_ip">Um das Bridge-Feature nutzen zu können, müssen Sie mindestens eine IP-Adresse eingeben.</string>
+  <string name="send_email_for_bridges">Senden Sie von Ihrem Gmail-Account eine eMail an bridges@xxxxxxxxxxxxxx mit dem Text \"get bridges\" im Nachrichten-Feld.</string>
   <string name="error">Fehler</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Ihre eingestellte erreichbare e-Mail Adresse hat einen Ausnahme-Fehler erzeugt.</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Ihre eingestellte erreichbare eMail Adresse hat einen Ausnahme-Fehler erzeugt.</string>
   <string name="your_relay_settings_caused_an_exception_">Ihre Relay Einstellungen haben einen Ausnahme-Fehler erzeugt.</string>
   <string name="exit_nodes">Exit Nodes</string>
   <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerabdrücke, Spitznamen, Länder und Adressen für den letzten Knoten-Punkt.</string>
-  <string name="enter_exit_nodes">Tragen Sie die Exit-Nodes ein.</string>
+  <string name="enter_exit_nodes">Tragen Sie die Exit-Nodes ein</string>
   <string name="exclude_nodes">Nodes Ausnahmen</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerabdrücke, Spitz-Namen, Länder und Adressen die ausgenommen werden sollen.</string>
-  <string name="enter_exclude_nodes">Geben Sie die auszunehmenden Nodes ein.</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerabdrücke, Spitznamen, Länder und Adressen, die ignoriert werden sollen</string>
+  <string name="enter_exclude_nodes">Geben Sie die zu ignorierenden Nodes ein</string>
   <string name="strict_nodes">Strikte Nodes</string>
   <string name="use_only_these_specified_nodes">Benutze *ausschlieÃ?lich* diese angegebenen Nodes</string>
   <string name="bridges">Bridges</string>
-  <string name="use_bridges">Benutze Bridges</string>
+  <string name="use_bridges">Bridges benutzen</string>
   <string name="bridges_obfuscated">Verschleierte Brücken</string>
   <string name="enable_alternate_entrance_nodes_into_the_tor_network">Benutze alternative Eingangs-Nodes in das TOR-Netzwerk</string>
   <string name="enable_if_configured_bridges_are_obfuscated_bridges">Aktivieren, falls konfigurierte Brücken verschleierte Brücken sind.</string>
-  <string name="ip_address_and_port_of_bridges">IP Adresse und Port der Bridges</string>
-  <string name="enter_bridge_addresses">Geben Sie die Bridge_Adressen ein</string>
+  <string name="ip_address_and_port_of_bridges">IP-Adresse und Port der Bridges</string>
+  <string name="enter_bridge_addresses">Geben Sie die Bridge-Adressen ein</string>
   <string name="relays">Relays</string>
   <string name="relaying">Relaying</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Aktivieren das Ihr Gerät ein non-exit Relay ist.</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Aktivieren, dass Ihr Gerät ein non-exit Relay ist</string>
   <string name="relay_port">Relay Port</string>
-  <string name="listening_port_for_your_tor_relay">Port auf den bei Ihrem TOR-Relay gehört werden soll</string>
+  <string name="listening_port_for_your_tor_relay">Port, auf dem bei Ihrem TOR-Relay gehört werden soll</string>
   <string name="enter_or_port">OR-Port eingeben</string>
   <string name="relay_nickname">Relay Spitzname</string>
   <string name="the_nickname_for_your_tor_relay">Der Spitzname für Ihren TOR-Relay</string>
@@ -188,33 +188,33 @@
   <string name="enter_ports">Ports eingeben</string>
   <string name="enable_hidden_services">Versteckte Dienste aktivieren</string>
   <string name="run_servers_accessible_via_the_tor_network">Betrieben von Servern auf die vom TOR-Netzwerk aus zugegriffen werden kann.</string>
-  <string name="enter_localhost_ports_for_hidden_services">TRagen Sie die lokelen Ports für die versteckten Dienste ein</string>
-  <string name="hidden_service_ports">Versteckte Dienste Ports</string>
+  <string name="enter_localhost_ports_for_hidden_services">Tragen Sie die lokelen Ports für die versteckten Dienste ein</string>
+  <string name="hidden_service_ports">Ports der versteckten Dienste</string>
   <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Der adressierbare Name für Ihre versteckten Dienste (werden automatisch generiert)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Aktiviere Debug Log Ausgabe (benötigt adb oder alogcat zur Ansicht)</string>
-  <string name="project_home">Heimat des Projekt(s):</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Aktiviere Debug-Log Ausgabe (benötigt adb oder alogcat zur Ansicht)</string>
+  <string name="project_home">Webseite(n) des Projekts:</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Die Tor Lizenz</string>
+  <string name="the_tor_license">Tor Lizenz</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">Drittanbieter-Software:</string>
-  <string name="tor_version">Tor v0.2.3.7-alpha: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
+  <string name="tor_version">Tor v0.2.4.3-alpha: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.1.1-alpha: http://www.monkey.org/~provos/libevent/</string>
   <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
   <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
+  <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string>
   <string name="hidden_service_request">Eine Anwendungen möchte den Port für versteckte Dienste %S öffnen. Dies ist sicher wenn Sie der Anwendung vertrauen.</string>
   <string name="found_existing_tor_process">existierender Tor Prozess gefunden...</string>
-  <string name="something_bad_happened">Etwasist schief gelaufen. Bitte Log prüfen</string>
-  <string name="hidden_service_on">Verstckte Dienste auf:</string>
+  <string name="something_bad_happened">Etwas ist schief gelaufen. Bitte Log prüfen</string>
+  <string name="hidden_service_on">Versteckte Dienste auf:</string>
   <string name="unable_to_read_hidden_service_name">Kann den Namen des versteckten Dienstes nicht lesen</string>
   <string name="unable_to_start_tor">Kann Tor nicht starten:</string>
   <string name="pref_use_sys_iptables_title">Benutze die Standard (default) Iptables</string>
   <string name="pref_use_sys_iptables_summary">Benutze den mitgelieferten Iptables-Binary anstatt des mit Orbot mitgelieferten.</string>
   <string name="error_installing_binares">Die Tor-Binarys konnten nicht installiert oder aktualisiert werden.</string>
-  <string name="pref_use_persistent_notifications">Behalte das Icon immer in der Benutzerleiste (Toolbar) wenn Orbot verbunden ist.</string>
+  <string name="pref_use_persistent_notifications">Behalte das Icon immer in der Benutzerleiste (Toolbar), wenn Orbot verbunden ist.</string>
   <string name="pref_use_persistent_notifications_title">Immer-eingeschaltet Benachrichtigungen</string>
-  <string name="notification_using_bridges">Brücke aktiviert!</string>
-  <string name="default_bridges"/>
+  <string name="notification_using_bridges">Brücken aktiviert!</string>
+  <string name="default_bridges"></string>
   <string name="set_locale_title">Gebietsschema festlegen</string>
   <string name="set_locale_summary">Gebietsschema und Sprache wählen</string>
   <string name="wizard_locale_title">Sprache wählen</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index b429371..dcab7b3 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -214,7 +214,7 @@
   <string name="pref_use_persistent_notifications">Î?α διαÏ?ηÏ?είÏ?αι Ï?άνÏ?οÏ?ε Ï?ο εικονίδιο Ï?Ï?ην γÏ?αμμή εÏ?γαλείÏ?ν Ï?Ï?αν Ï?ο Orbot Ï?Ï?νδέεÏ?αι</string>
   <string name="pref_use_persistent_notifications_title">Î?ιδοÏ?οιήÏ?ειÏ? διαÏ?κοÏ?Ï? Ï?Ï?νδεÏ?ηÏ?</string>
   <string name="notification_using_bridges">Î?ι γέÏ?Ï?Ï?εÏ? ενεÏ?γοÏ?οιήθηκαν!</string>
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="set_locale_title">Î?Ï?ιÏ?μÏ?Ï? Ï?οÏ?ικÏ?ν Ï?Ï?οÏ?αÏ?μογÏ?ν</string>
   <string name="set_locale_summary">Î?Ï?ιλέξÏ?ε Ï?Ï?θμίÏ?ειÏ? Ï?οÏ?ικÏ?Ï?ηÏ?αÏ? και γλÏ?Ï?Ï?αÏ? για Ï?ο Orbot</string>
   <string name="wizard_locale_title">Î?Ï?ιλέξÏ?ε γλÏ?Ï?Ï?α</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 876434e..04146d6 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -2,213 +2,223 @@
 <resources>
   <string name="app_name">Orbot</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>
+  <string name="default_web_url">https://check.torproject.org/?lang=es</string>
+  <string name="secure_default_web_url">https://check.torproject.org/?lang=es</string>
   <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
   <string name="control_permission_label">iniciar y detener Tor</string>
   <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot está iniciando...</string>
-  <string name="status_activated">Conectado a la Red de Tor</string>
-  <string name="status_disabled">\"Orbot está desactivado</string>
+  <string name="status_starting_up">Orbot está iniciandose...</string>
+  <string name="status_activated">Conectado a la red Tor</string>
+  <string name="status_disabled">Orbot está desactivado</string>
   <string name="status_shutting_down">Orbot se está cerrando</string>
-  <string name="tor_process_starting">Lanzando cliente Tor ...</string>
-  <string name="tor_process_complete">Completado</string>
-  <string name="tor_process_waiting">En espera</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="tor_process_starting">Iniciando cliente Tor...</string>
+  <string name="tor_process_complete">completado.</string>
+  <string name="tor_process_waiting">en espera.</string>
+  <string name="not_anonymous_yet">ADVERTENCIA: ¡Su tráfico no es anónimo aún! Configure sus aplicaciones para utilizar proxy HTTP 127.0.0.1:8118, o proxy SOCKS4A o SOCKS5 127.0.0.1:9050 (o podría habilitar la proxyficación transparente si su dispositivo está rooteado)</string>
   <string name="menu_home">Principal</string>
   <string name="menu_browse">Examinar</string>
   <string name="menu_settings">Configuración</string>
-  <string name="menu_log">Historial</string>
+  <string name="menu_log">Registro (log)</string>
   <string name="menu_info">Ayuda</string>
   <string name="menu_apps">Aplicaciones</string>
   <string name="menu_start">Iniciar</string>
   <string name="menu_stop">Detener</string>
   <string name="menu_about">Acerca de</string>
-  <string name="menu_wizard">Wizard</string>
+  <string name="menu_wizard">Asistente</string>
+  <string name="main_layout_download">Descarga</string>
+  <string name="main_layout_upload">Subida</string>
   <string name="button_help">Ayuda</string>
   <string name="button_close">Cerrar</string>
   <string name="button_about">Acerca de</string>
-  <string name="button_clear_log">Limpiar Historial</string>
-  <string name="menu_verify">Comprobar</string>
+  <string name="button_clear_log">Limpiar registro (log)</string>
+  <string name="menu_verify">Verificar</string>
   <string name="menu_exit">Salir</string>
-  <string name="press_to_start">- long press to start -</string>
-  <string name="pref_trans_proxy_group">Proxy transparente (Requiere ser Administrador)</string>
-  <string name="pref_trans_proxy_title">Proxy transparente</string>
-  <string name="pref_trans_proxy_summary">Torificado automático de las Aplicaciones</string>
-  <string name="pref_transparent_all_title">Pasar todo el tráfico por Tor</string>
-  <string name="pref_transparent_all_summary">Tráfico Proxy para todas las aplicaciones mediante Tor</string>
-  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
-  <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
-  <string name="pref_transparent_port_title">Port List</string>
-  <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
-  <string name="pref_transparent_port_dialog">Enter ports to proxy</string>
-  <string name="pref_has_root">Request Root Access</string>
-  <string name="pref_has_root_summary">Request root access for transparent proxying</string>
-  <string name="status_install_success">¡Binarios de Tor instalados con éxito!</string>
-  <string name="status_install_fail">Los archivos binarios de Tor no se han podido instalar. Por favor, verifique el Historial y notifique a: tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Error de aplicación</string>
-  <string name="wizard_title">Bienvenido a Orbot</string>
+  <string name="press_to_start">- mantega pulsado para iniciar -</string>
+  <string name="pref_trans_proxy_group">Proxyficación transparente (requiere root)</string>
+  <string name="pref_trans_proxy_title">Proxyficación transparente</string>
+  <string name="pref_trans_proxy_summary">Torificado automático de aplicaciones</string>
+  <string name="pref_transparent_all_title">Torificar todo</string>
+  <string name="pref_transparent_all_summary">Proxyfica vía Tor el tráfico de todas las aplicaciones sin configurarlas</string>
+  <string name="pref_transparent_port_fallback_title">Puertos a proxyficar para contingencias</string>
+  <string name="pref_transparent_port_fallback_summary">ADVERTENCIA: Evita puertos comunes (80, 443, etc). *USAR SÃ?LO* si los modos \'Todo\' o \'Aplicaciones\' no funcionan.</string>
+  <string name="pref_transparent_port_title">Lista de puertos</string>
+  <string name="pref_transparent_port_summary">Lista de puertos a proxyficar. *USAR SÃ?LO* si los modos \'Todo\' o \'Aplicaciones\' no funcionan</string>
+  <string name="pref_transparent_port_dialog">Introduzca los puertos a proxyficar</string>
+  <string name="pref_has_root">Solicitar permisos de root</string>
+  <string name="pref_has_root_summary">Solicita permisos de root para usar proxyficación transparente</string>
+  <string name="status_install_success">¡Los binarios de Tor se instalaron con éxito!</string>
+  <string name="status_install_fail">Los archivos binarios de Tor no pudieron ser instalados. Revise el registro (log) y notifique a tor-assistants@xxxxxxxxxxxxxx</string>
+  <string name="title_error">Error de la aplicación</string>
+  <string name="wizard_title">Orbot</string>
   <string name="wizard_btn_tell_me_more">Acerca de Orbot</string>
   <string name="btn_next">Siguiente</string>
   <string name="btn_back">Atrás</string>
   <string name="btn_finish">Finalizar</string>
-  <string name="btn_okay">OK</string>
+  <string name="btn_okay">Aceptar</string>
   <string name="btn_cancel">Cancelar</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Algunos detalles de Orbot</string>
-  <string name="wizard_details_msg">Orbot es una aplicación de código abierto que contiene Tor, LibEvent y Privoxy. Provee un Proxy HTTP local (8118) y un Proxy SOCKS (9050) en la red Tor. Orbot también tiene la habilidad, en un dispositivo enrutador, de enviar todo el tráfico de Internet a través de Tor.</string>
-  <string name="wizard_permissions_root">Permiso Concedido</string>
+  <string name="wizard_details_msg">Orbot es una aplicación de código abierto que contiene Tor, LibEvent y Privoxy. Proporciona un proxy HTTP (8118) y un proxy SOCKS (9050) locales, hacia la red Tor. También tiene la capacidad, en un dispositivo rooteado (modificado para acceder como root), de enviar el tráfico de Internet a través de Tor con proxyficación transparente (sin necesidad de configurar cada aplicación para conectar al proxy).</string>
+  <string name="wizard_permissions_root">Permiso concedido</string>
   <string name="wizard_permissions_stock">Permisos de Orbot</string>
-  <string name="wizard_premissions_msg_root">¡Excelente! Hemos detectado que usted tiene permisos administravitos activados para Orbot. Utilizaremos estos poderes sabiamente.</string>
-  <string name="wizard_permissions_msg_stock">Mientras no sea requerido, Orbot puede convertirse en una herramienta aún más poderosa si su dispositivo tiene acceso de administrador. Utilice el botón a continuación para conceder superpoderes a Orbot</string>
-  <string name="wizard_permissions_no_root">Si no tiene acceso de admnistrador o no tiene idea de qué estamos hablando, sólo asegúrese de utilizar aplicaciones hechas para trabajar con Orbot.</string>
-  <string name="wizard_permissions_consent">Comprendo y quiero continuar sin poderes administrativos</string>
-  <string name="wizard_permission_enable_root">Conceder poderes administrativos a Orbot</string>
-  <string name="wizard_configure">Configurar Torificación</string>
-  <string name="wizard_configure_msg">Orbot le da la opción de dirigir todo el tráfico de las aplicaciones a través de Tor O de seleccionar sus aplicaciones individualmente.</string>
-  <string name="wizard_configure_all">Configurar Proxy para todas las aplicaciones a través de Tor</string>
-  <string name="wizard_configure_select_apps">Seleccionar aplicaciones individualmente para Tor</string>
-  <string name="wizard_tips_tricks">Aplicaciones activas en Orbot</string>
-  <string name="wizard_tips_msg">Le invitamos a descargar y utilizar aplicaciones que saben cómo conectarse directamente a Orbot. Haga clic en los botones a continuación para Instalar.</string>
-  <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</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.\n\n\nLa configuración del dominio es 127.0.0.1 o \"localhost\". Para HTTP, la configuración del puerto es 8118. Para SOCKS, el proxy es 9050. Puede utilizar SOCKS4A o SOCKS5 si es posible.\n\n\n\nPuede aprender más acerca de los proxys en Android a través de las Preguntas Frecuentes ubicadas en: http://tinyurl.com/proxyandroid\n    </string>
+  <string name="wizard_premissions_msg_root">¡Excelente! Hemos detectado que ha concedido a Orbot permisos de root. Utilizaremos estos poderes sabiamente.</string>
+  <string name="wizard_permissions_msg_stock"> Aunque no es un requisito, Orbot puede convertirse en una herramienta más potente si accede a su dispositivo con permisos de root. ¡Utilice el botón inferior para conceder superpoderes a Orbot!</string>
+  <string name="wizard_permissions_no_root">Si no tiene acceso como root o no tiene idea de qué estamos hablando, tan solo asegúrese de utilizar aplicaciones específicamente preparadas para trabajar con Orbot (o que permitan conexión por proxy HTTP o SOCKS).</string>
+  <string name="wizard_permissions_consent">Comprendo, y quiero continuar sin poderes administrativos</string>
+  <string name="wizard_permission_enable_root">Conceder permisos de root a Orbot</string>
+  <string name="wizard_configure">Configurar torificación</string>
+  <string name="wizard_configure_msg">Orbot le da la opción de dirigir el tráfico de todas las aplicaciones a través de Tor - o - de seleccionar sus aplicaciones a torificar individualmente.</string>
+  <string name="wizard_configure_all">Proxyficar todas la aplicaciones a través de Tor</string>
+  <string name="wizard_configure_select_apps">Seleccionar aplicaciones individuales para Tor</string>
+  <string name="wizard_tips_tricks">Aplicaciones habilitadas para Orbot</string>
+  <string name="wizard_tips_msg">Las siguientes aplicaciones fueron desarrolladas para trabajar con Orbot. Haga clic en cada botón para instalarlas ahora, o puede encontrarlas más tarde en Google Play, en la web guardianproject.info o vía f-droid.org </string>
+  <string name="wizard_tips_otrchat">Gibberbot - cliente de mensajería instantánea segura para Android</string>
+  <string name="wizard_tips_proxy">Preferencias para proxy - aprenda cómo configurar aplicaciones para que trabajen con Orbot</string>
+  <string name="wizard_tips_duckgo">Aplicación del motor de búsqueda DuckDuckGo</string>
+  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+  <string name="wizard_tips_firefox">Add-on \'Proxy Mobile\' para Firefox (http://tinyurl.com/getproxymob)</string>
+  <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
+  <string name="wizard_tips_twitter">Configure por proxy la aplicación de Twitter en localhost:8118</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
+  <string name="wizard_proxy_help_info">Preferencias para proxy</string>
+  <string name="wizard_proxy_help_msg">Si la aplicación Android que esté utilizando soporta el uso de un proxy HTTP o SOCKS, entonces puede configurarla para conectarse a Orbot (que será el proxy) y utilizar Tor.\n \n \nDebe configurar el servidor (host) proxy en 127.0.0.1 o \"localhost\". Para proxy por HTTP por el puerto 8118. Para proxy por SOCKS por el puerto 9050, y debe configurar para SOCKS4A o SOCKS5 si es posible.\n \n \n \nPuede aprender más acerca del uso de proxys sobre Android a través de las Preguntas Frecuentes (FAQ) en: http://tinyurl.com/proxyandroid\n </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="wizard_final_msg">Cientos de miles de personas por todo el mundo usan Tor por una amplia variedad de razones.\n\nPeriodistas y bloggers, defensores de los derechos humanos, oficiales de policía, soldados, corporaciones, ciudadanos de regímenes represivos y ciudadanos ordinarios... ¡y ahora usted también está preparado!</string>
   <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Se ha conectado con éxito a la red Tor, pero eso NO significa que su dispositivo es seguro. Puede utilizar la opción \'Comprobar\' desde el menú para probar su navegador.\n\nVisítenos en https://guardianproject.info/apps/orbot o envíenos un correo electrónico a help@xxxxxxxxxxxxxxxxxxxx para aprender más.</string>
-  <string name="tor_check">Esto abrirá https://check.torproject.org en su navegador predeterminado con el fin de comprobar si Orbot está configurado y si está conectado a Tor.</string>
-  <string name="pref_hs_group">Servicios Ocultados</string>
+  <string name="connect_first_time">Ha conectado con éxito a la red Tor - pero esto NO significa que su dispositivo ya sea seguro. Puede utilizar la opción \'Verificar\' desde el menú para probar su navegador.\n\nVisítenos en https://guardianproject.info/apps/orbot o envíenos un correo a help@xxxxxxxxxxxxxxxxxxxx para aprender más.</string>
+  <string name="tor_check">Esto abrirá https://check.torproject.org/?lang=es en su navegador predeterminado para comprobar que Orbot esté configurado y que esté conectado a Tor.</string>
+  <string name="pref_hs_group">Alojamiento de servicios ocultos (dentro de la red Tor)</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="pref_start_boot_title">Iniciar Orbot en el arranque</string>
+  <string name="pref_start_boot_summary">Inicia Orbot y conecta a Tor automáticamente cuando arranca su dispositivo Android</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot activa el acceso a la red Tor, en su Android! \n\nTor le ayuda a defenderse del filtrado de contenido, análisis de tráfico y la vigilancia que amenaza su privacidad, su información confidencial y sus relaciones personales. \n\nEste asistente le ayudará a configurar Orbot y Tor en su dispositivo Android.</string>
+  <string name="wizard_title_msg">¡Orbot trae Tor a Android!\n\nTor le ayuda a defenderse del filtrado de contenidos, del análisis de tráfico y la vigilancia de red que atenta contra la privacidad, la información confidencial y las relaciones personales.\n\nEste asistente le ayudará a configurar Orbot y Tor en su dispositivo.</string>
   <!--Warning screen-->
   <string name="wizard_warning_title">Advertencia</string>
-  <string name="wizard_warning_msg">Simplemente instalando Orbort, no automatiza de por si, la proteccion anonima del trafico generado por su dispositivo \n\nPara anonimizar su trafico con garantias, debe configurar adecuadamente Orbot, el dispositivo y las aplicaciones que utilize en su conexion.</string>
+  <string name="wizard_warning_msg">Sólo instalando Orbot no anonimizará automáticamente su tráfico móvil.\n\nDebe configurar adecuadamente Orbot, así como su dispositivo y otras aplicaciones, para utilizar Tor con éxito.</string>
   <!--Permissions screen-->
   <string name="wizard_permissions_title">Permisos</string>
-  <string name="wizard_permissions_root_msg1">Si lo desea, puede conceder acceso \'superusuario\' a Orbot para habilitar las características avanzadas de configuracion y acceso a la red Tor, tales como los proxys transparentes.</string>
-  <string name="wizard_permissions_root_msg2">Si no desea habilitar esta opcion, por favor asegúrese de utilizar aplicaciones compatibles con Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Su dispositivo se esta ejecutando en modo estándar, y no admite el acceso root o \"superusuario\".\n\nPara que pueda beneficiarse de todo el potencial de Tor, tendrá que utilizar aplicaciones creadas para trabajar con Orbot, o compatibles con la configuracion proxy basada en los protocolos HTTP o SOCKS\n\n</string>
+  <string name="wizard_permissions_root_msg1">Opcionalmente puede conceder permisos de \'Superusuario\' a Orbot para habilitar las características avanzadas, como la proxyficación transparente.</string>
+  <string name="wizard_permissions_root_msg2">Si no desea hacer esto, asegúrese de utilizar aplicaciones específicamente preparadas para trabajar con Orbot (o configurables para ello)</string>
+  <string name="wizard_permissions_no_root_msg">Su dispositivo no parece estar rooteado (modificado para permitir acceso como root), o estar concediendo permisos de \'Superusuario\' a Orbot.\n\nPara que pueda beneficiarse de Tor, tendrá que utilizar aplicaciones específicamente preparadas para trabajar con Orbot, o que soporten conexión a través proxy HTTP o SOCKS.\n </string>
   <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Aplicaciones habilitadas para utilizar con Orbot</string>
-  <string name="wizard_tips_gibberbot">Gibberbot: Asegure su aplicación de chat con nuestro sistema de cifrado </string>
-  <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</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_tips_title">Aplicaciones habilitadas para Orbot</string>
+  <string name="wizard_tips_gibberbot">Gibberbot: Aplicación de chat segura con cifrado OTR (Off-The-Record)</string>
+  <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string>
+  <string name="wizard_tips_orweb">Orweb - navegador de privacidad-mejorada que funciona a través de Tor</string>
+  <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.xpi</string>
+  <string name="wizard_tips_play">Descubre todas las aplicaciones de Guardian Project en Google Play</string>
+  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">conexion proxy transparente activada </string>
-  <string name="wizard_transproxy_msg">Esto permite que sus aplicaciones se ejecuten automáticamente a través de la red Tor sin necesidad de realizar ninguna configuración.</string>
-  <string name="wizard_transproxy_hint">(Si no tiene idea de lo que estamos hablando, marque esta casilla ;o)</string>
+  <string name="wizard_transproxy_title">Proxyficación transparente</string>
+  <string name="wizard_transproxy_msg">Permite que sus aplicaciones se ejecuten automáticamente a través de la red Tor sin realizar configuración alguna.</string>
+  <string name="wizard_transproxy_hint">(Marque esta casilla si no tiene idea de qué estamos hablando)</string>
   <string name="wizard_transproxy_none">Ninguno</string>
-  <string name="pref_transparent_tethering_title">Tor, como pasarela de acceso</string>
-  <string name="pref_transparent_tethering_summary">Habilitar Tor como proxy cuando este dispositivo movil se utilize, a traves de conexiones WI-FI o USB como pasarela de acceso a internet (requiere reinicio)</string>
-  <string name="button_grant_superuser">Solicitud de acceso como superusuario root</string>
-  <string name="pref_select_apps">Seleccion de Aplicaciones</string>
-  <string name="pref_select_apps_summary">Elija las Aplicaciones que utilizaran Tor</string>
-  <string name="pref_node_configuration">Configuración de nodo</string>
-  <string name="pref_node_configuration_summary">Estas son las configuraciones avanzadas que pueden reducir su anonimato</string>
-  <string name="pref_entrance_node">Los nodos de entrada</string>
-  <string name="pref_entrance_node_summary">Las llaves publicas, apodos, países y direcciones para el primer salto, o nodo (primer servidor que se conectara para acceder a la red Tor)</string>
-  <string name="pref_entrance_node_dialog">Introduzca los nodos de entrada</string>
+  <string name="pref_transparent_tethering_title">Tor tethering</string>
+  <string name="pref_transparent_tethering_summary">Habilita la proxyficación transparente de Tor para dispositivos tethered (dispositivos móviles \"amarrados\", pasarela a Internet para otros dispositivos conectados a ellos mediante Wifi, USB o Bluetooth) -- (requiere reinicio)</string>
+  <string name="button_grant_superuser">Solicitar permisos de superusuario</string>
+  <string name="pref_select_apps">Seleccionar aplicaciones</string>
+  <string name="pref_select_apps_summary">Escoja las aplicaciones a redirigir través de Tor</string>
+  <string name="pref_node_configuration">Configuración de nodos</string>
+  <string name="pref_node_configuration_summary">¡Estas son configuraciones avanzadas que pueden reducir su anonimato! Afectan a los circuitos (túneles) que se establezcan para su propio tráfico a través de Tor; si repite tráfico ajeno estas configuraciones no afectan a esos circuitos.</string>
+  <string name="pref_entrance_node">Nodos de entrada</string>
+  <string name="pref_entrance_node_summary">Reglas de identificación de repetidores de entrada a la red Tor, mediante huellas de validación de claves (fingerprints), alias (nicks), códigos de país y \ndirecciones (o rangos). No prevalecen sobre las configuraciones de exclusión de nodos, y las configuraciones de bridges.</string>
+  <string name="pref_entrance_node_dialog">Introduzca nodos de entrada</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_title">Proxy de Red Saliente</string>
-  <string name="pref_proxy_type_title">Tipo de proxy</string>
-  <string name="pref_proxy_type_summary">Protocolo que se utilizará para la configuracion del servidor proxy: HTTP, HTTPS, SOCKS4, SOCKS5</string>
-  <string name="pref_proxy_type_dialog">Introduzca el Tipo de Proxy</string>
-  <string name="pref_proxy_host_title">Servidor Proxy</string>
-  <string name="pref_proxy_host_summary">Nombre para el Servidor Proxy</string>
-  <string name="pref_proxy_host_dialog">Introduzca el servidor anfitrion Proxy</string>
-  <string name="pref_proxy_port_title">Puerto proxy</string>
-  <string name="pref_proxy_port_summary">Puerto del servidor proxy</string>
-  <string name="pref_proxy_port_dialog">Introducir el puerto proxy</string>
+  <string name="pref_proxy_title">Proxy de salida (a Internet)</string>
+  <string name="pref_proxy_type_title">Tipo de proxy saliente</string>
+  <string name="pref_proxy_type_summary">Protocolo a usar para el servidor proxy saliente: HTTP, HTTPS, Socks4, Socks5.</string>
+  <string name="pref_proxy_type_dialog">Introduzca tipo de proxy</string>
+  <string name="pref_proxy_host_title">Servidor proxy saliente</string>
+  <string name="pref_proxy_host_summary">Dirección o nombre del servidor (host) proxy saliente.</string>
+  <string name="pref_proxy_host_dialog">Introduzca el servidor proxy</string>
+  <string name="pref_proxy_port_title">Puerto del proxy saliente </string>
+  <string name="pref_proxy_port_summary">Puerto del servidor proxy saliente</string>
+  <string name="pref_proxy_port_dialog">Introduzca el puerto del proxy</string>
   <string name="status">Estado</string>
-  <string name="setting_up_full_transparent_proxying_">Configuración completa, aplicando y arrancando el proxy ...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Configurando las aplicaciones que utilizaran el proxy  ...</string>
-  <string name="transparent_proxying_enabled">Servicio Proxy -- HABILITADO Y ACTIVO</string>
-  <string name="transproxy_enabled_for_tethering_">Pasarela proxy habilitado para, los dispositivos conectados, a su dispositivo movil!</string>
-  <string name="warning_error_starting_transparent_proxying_">ADVERTENCIA: vaya .. hemos tenido un error al iniciar el proxy !</string>
-  <string name="transproxy_rules_cleared">Reglas de pasarela proxy, Borradas</string>
-  <string name="couldn_t_start_tor_process_">ADVERTENCIA: No se pudo iniciar el proceso  Tor:</string>
-  <string name="privoxy_is_running_on_port_">Privoxy se está ejecutando en el puerto:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Configuración de puerto proxy  ...</string>
-  <string name="bridge_error">ADVERTENCIA: Error al establecer el Bridge ( dispositivo puente )</string>
-  <string name="bridge_requires_ip">Para utilizar la función Brigde (dispositivo puente), se debe introducir al menos una dirección IP del Bridge.</string>
-  <string name="send_email_for_bridges">Enviar un correo electrónico a bridges@xxxxxxxxxxxxxx desde una cuenta de gmail , con el siguiente texto en el cuerpo del mensaje \"get bridges\" </string>
+  <string name="setting_up_full_transparent_proxying_">Estableciendo proxyficación transparente completa... </string>
+  <string name="setting_up_app_based_transparent_proxying_">Estableciendo proxyficación transparente por aplicaciones... </string>
+  <string name="transparent_proxying_enabled">Proxyficación transparente ACTIVADA</string>
+  <string name="transproxy_enabled_for_tethering_">¡TransProxy (proxyficación transparente) habilitado para tethering (pasarela)!</string>
+  <string name="warning_error_starting_transparent_proxying_">ADVERTENCIA: ¡Error al iniciar la proxyficación transparente!</string>
+  <string name="transproxy_rules_cleared">Reglas de TransProxy (proxyficación transparente) borradas</string>
+  <string name="couldn_t_start_tor_process_">No se pudo iniciar el proceso de Tor: </string>
+  <string name="privoxy_is_running_on_port_">Privoxy (proxy web de filtrado) se está ejecutando en el puerto: </string>
+  <string name="setting_up_port_based_transparent_proxying_">Estableciendo proxyficación transparente por puertos... </string>
+  <string name="bridge_error">Error de bridge (repetidor puente)</string>
+  <string name="bridge_requires_ip">Para utilizar la función bridge (repetidor puente, acceso a Tor de publicitación restringida), debe introducir al menos una dirección IP de bridge.</string>
+  <string name="send_email_for_bridges">Envíe un correo a bridges@xxxxxxxxxxxxxx incluyendo en el cuerpo del mensaje una línea sólo con \"get bridges\", desde una cuenta con dominio gmail.com, yahoo.com o yahoo.cn (que soportan DKIM)</string>
   <string name="error">Error</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">La configuración de ReachableAddresses (Reglas, sobre listas de rangos ip) ha producido una excepción!</string>
-  <string name="your_relay_settings_caused_an_exception_">La configuración de la transmision ha producido una excepción!</string>
-  <string name="exit_nodes">Los nodos de salida</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Llaves publicas, alias, países y las direcciones para el último nodo de salto</string>
-  <string name="enter_exit_nodes">Introduzca los nodos de salida</string>
-  <string name="exclude_nodes">Nodos de exclusion</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Llaves publicas, alias, países y las direcciones a excluir</string>
-  <string name="enter_exclude_nodes">Introduzca los nodos a excluir</string>
-  <string name="strict_nodes">Nodos Obligatorios</string>
-  <string name="use_only_these_specified_nodes">Usar * sólamente * los nodos especificados</string>
-  <string name="bridges">Puentes/Bridges</string>
-  <string name="use_bridges">Utilizar Puentes/Bridges</string>
-  <string name="bridges_obfuscated">Puentes ofuscados</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Activar nodos de entrada alternativos en la red Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Habilitar si puentes configurados estan ofuscados</string>
-  <string name="ip_address_and_port_of_bridges">Dirección IP y el puerto del puente/Bridge</string>
-  <string name="enter_bridge_addresses">Introduzca la dirección del puente/Bridge</string>
-  <string name="relays">Retransmisores de trafico</string>
-  <string name="relaying">Retransmitiendo Trafico</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Desactivar su dispositivo, como repetidor de salida</string>
-  <string name="relay_port">Puerto del Repetidor</string>
-  <string name="listening_port_for_your_tor_relay">Puerto de escucha de su servidor Tor</string>
-  <string name="enter_or_port">Introduzca el Puerto OR</string>
-  <string name="relay_nickname">Alias para referirse al Repetidor</string>
-  <string name="the_nickname_for_your_tor_relay">Alias de su servidor Tor</string>
-  <string name="enter_a_custom_relay_nickname">Introduzca un alias personalizado para el repetidor de trafico</string>
-  <string name="reachable_addresses">Listado de ips, accesibles</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Ejecutar como cliente, situado tras un cortafuegos con politicas restrictivas</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">¡Sus \'Reglas de direcciones accesibles\' han producido una excepción!</string>
+  <string name="your_relay_settings_caused_an_exception_">¡La configuración de su repetidor ha producido una excepción!</string>
+  <string name="exit_nodes">Nodos de salida</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Reglas de identificación de repetidores de salida de la red Tor, mediante huellas de validación de claves (fingerprints), alias (nicks), códigos de país y direcciones (o rangos)</string>
+  <string name="enter_exit_nodes">Introduzca repetidores de salida</string>
+  <string name="exclude_nodes">Excluír nodos</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Reglas de identificación de repetidores a evitar en la red Tor, mediante huellas de validación de claves (fingerprints), alias (nicks), códigos de país y direcciones (o rangos)</string>
+  <string name="enter_exclude_nodes">Introduzca repetidores a evitar</string>
+  <string name="strict_nodes">Hacer estricta la exclusión de nodos (incluso si falla la comunicación)</string>
+  <string name="use_only_these_specified_nodes">Usar *sólo* estos nodos especificados</string>
+  <string name="bridges">Bridges (repetidores puente) </string>
+  <string name="use_bridges">Usar bridges</string>
+  <string name="bridges_obfuscated">Bridges ofuscados (contra análisis DPI del tráfico) </string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Habilita nodos alternativos de entrada a la red Tor, de publicitación restringida. Prevalece sobre \'Nodos de entrada\'</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Habilítelo si los bridges (repetidores puente) de su lista de configuración están ofuscados (encapsulando el tráfico SSL para evitar ser detectados) </string>
+  <string name="ip_address_and_port_of_bridges">Direcciones IP y puertos de los bridges</string>
+  <string name="enter_bridge_addresses">Introduzca direcciones de bridge</string>
+  <string name="relays">Repetidores</string>
+  <string name="relaying">Repetición de tráfico</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Habilitar que su dispositivo no sea repetidor de salida (de la red Tor) </string>
+  <string name="relay_port">Puerto de repetidor</string>
+  <string name="listening_port_for_your_tor_relay">Puerto de escucha para su repetidor Tor</string>
+  <string name="enter_or_port">Introduzca puerto OR (Onion Routing, repositorio de repetidores)</string>
+  <string name="relay_nickname">Alias del repetidor</string>
+  <string name="the_nickname_for_your_tor_relay">El apodo que identificará a su repetidor en la red Tor</string>
+  <string name="enter_a_custom_relay_nickname">Introduzca un alias personalizado para su repetidor</string>
+  <string name="reachable_addresses">Reglas de direcciones accesibles ([accept(*)|reject] IP:port, etc.)</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Ejecutar Tor como sólo cliente detrás de un cortafuegos (firewall) con políticas restrictivas</string>
   <string name="reachable_ports">Puertos accesibles</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Puertos accesibles detrás de un firewall restrictivo</string>
-  <string name="enter_ports">Introduzca los puertos</string>
-  <string name="enable_hidden_services">Activar los servicios ocultos</string>
-  <string name="run_servers_accessible_via_the_tor_network">Ejecutar servidores accesibles a través de la red de Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">Introduzca los puertos locales de los servicios ocultos activados</string>
-  <string name="hidden_service_ports">Ocultar puertos de servicio</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Nombre direccionable para su servicio oculto (generado automáticamente)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">permitir  el registro de depuración de la aplicacion (debe utilizar adb o aLogCat para poder verlos)</string>
-  <string name="project_home">Localizacion del proyecto: </string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/Orbot/</string>
-  <string name="the_tor_license">Licencia de uso Tor</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Puertos accesibles detrás de un firewall restrictivo (80 y 443 por defecto)</string>
+  <string name="enter_ports">Introduzca puertos</string>
+  <string name="enable_hidden_services">Activar alojamiento de servicios ocultos (en la red Tor)</string>
+  <string name="run_servers_accessible_via_the_tor_network">Permite el acceso a servidores ocultos por dispositivo (IP oculta al usuario) accesibles a través de la red Tor (dominio .onion, sin DNS)</string>
+  <string name="enter_localhost_ports_for_hidden_services">Introduzca los puertos locales de sus servicios ocultos</string>
+  <string name="hidden_service_ports">Puertos de los servicios ocultos</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">El nombre direccionable (sin DNS, .onion generado automáticamente) para su servicio oculto</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Habilitar el registro de depuración (debug log) a la salida (debe utilizar adb o aLogCat para verlo)</string>
+  <string name="project_home">Página(s) principal(es) del proyecto:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Licencia de Tor</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">Software de terceras partes</string>
-  <string name="tor_version">Tor v0.2.3.7-alfa: https://www.torproject.org</string>
-  <string name="libevent_version">Libevent v1.4.13: http://www.monkey.org/ ~ provos / libevent /</string>
+  <string name="tor_version">Tor v0.2.4.3-alpha: https://www.torproject.org</string>
+  <string name="libevent_version">Libevent v2.1.1-alpha: http://www.monkey.org/~provos/libevent/</string>
   <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
   <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
-  <string name="hidden_service_request">Una aplicación esta intentando abrir el siguiente puerto %S a la red Tor. Esto es seguro, si confía en la aplicación, que lo esta intentando abrir.</string>
-  <string name="found_existing_tor_process">Se ha encontrado proceso activo de Tor ...</string>
-  <string name="something_bad_happened">Algo ha ocurrido con el normal funcionamiento de la aplicacion. Compruebe el log de registro del sistema Tor</string>
+  <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string>
+  <string name="hidden_service_request">Una aplicación está intentando abrir el puerto %S de servicio oculto hacia la red Tor. Esto es seguro si su aplicación es de su confianza.</string>
+  <string name="found_existing_tor_process">Se encontró un proceso de Tor ya existente...</string>
+  <string name="something_bad_happened">Hubo algún tipo de problema. Compruebe el registro (log)</string>
   <string name="hidden_service_on">Servicio oculto en:</string>
-  <string name="unable_to_read_hidden_service_name">No se puede leer el nombre del servicio oculto</string>
-  <string name="unable_to_start_tor">ADVERTENCIA: No Puedo iniciar la Red Tor:</string>
-  <string name="pref_use_sys_iptables_title">Usar Iptables por defecto</string>
-  <string name="pref_use_sys_iptables_summary">Usar built-in iptables binario en lugar del paquete con Orbot</string>
-  <string name="error_installing_binares">Los binario de Tor no se pudieron instalar o actualizar</string>
+  <string name="unable_to_read_hidden_service_name">No fue posible leer el nombre del servicio oculto</string>
+  <string name="unable_to_start_tor">No fue posible iniciar Tor: </string>
+  <string name="pref_use_sys_iptables_title">Usar el Iptables por defecto</string>
+  <string name="pref_use_sys_iptables_summary">Usa el binario de Iptables del sistema en lugar del incluído en el paquete de Orbot</string>
+  <string name="error_installing_binares">No fue posible instalar o actualizar los binarios de Tor.</string>
   <string name="pref_use_persistent_notifications">Mantener siempre el icono de Orbot en la barra de tareas cuando esté conectado</string>
-  <string name="pref_use_persistent_notifications_title">Notificaciones siempre encendidas</string>
-  <string name="notification_using_bridges">Puentes activados!</string>
-  <string name="default_bridges"/>
-  <string name="set_locale_title">Establecer configuración regional</string>
-  <string name="set_locale_summary">Elija la configuración regional y de idioma para Orbot</string>
-  <string name="wizard_locale_title">Escoja lenguaje\n</string>
-  <string name="wizard_locale_msg">Dejar por defecto o cambiar el lenguaje actual</string>
-  <string name="powered_by">potenciado por Tor Project</string>
+  <string name="pref_use_persistent_notifications_title">Notificaciones siempre activadas</string>
+  <string name="notification_using_bridges">¡Bridges habilitados! </string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Configuración regional</string>
+  <string name="set_locale_summary">Elija la configuración regional y el idioma para Orbot</string>
+  <string name="wizard_locale_title">Escoja idioma</string>
+  <string name="wizard_locale_msg">Deje el predeterminado o cambie de idioma</string>
+  <string name="powered_by">impulsado por The Tor Project</string>
   <string name="btn_save_settings">Guardar configuración</string>
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 613218b..cb86f58 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -78,6 +78,7 @@
   <string name="wizard_permissions_title">Baimenak</string>
   <!--TipsAndTricks screen-->
   <string name="wizard_tips_title">Orbot-Gaitutako Aplikazioak</string>
+  <string name="wizard_tips_gibberbot">Gibberbot: Txat aplikazio segurua Off-the-Record enkriptazioarekin.</string>
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
   <string name="wizard_tips_orweb">Orweb - Tor bidez lan egiten duen pribatutasun-hobetua duen nabigatzailea</string>
   <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
@@ -142,10 +143,11 @@
   <string name="unable_to_start_tor">Ezin izan da Tor hasi:</string>
   <string name="pref_use_sys_iptables_title">Lehenetsitako Iptables erabili</string>
   <string name="notification_using_bridges">Zubiak gaituta!</string>
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="set_locale_title">Lokala ezarri</string>
   <string name="set_locale_summary">Aukeratu Orbotentzako lokala eta hizkuntza</string>
   <string name="wizard_locale_title">Hizkuntza aukeratu</string>
   <string name="wizard_locale_msg">Lehenetsia utzi edo uneko hizkuntzara aldatu</string>
   <string name="powered_by">Tor Projectek indartua</string>
+  <string name="btn_save_settings">Ezarpenak gorde</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 7afc086..c20f110 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -214,7 +214,7 @@
   <string name="pref_use_persistent_notifications">Ù?Ù?تÛ? ربات Ù¾Û?ازÛ? Ù?تصÙ? استØ? Ù?Ù?Û?Ø´Ù? Ø¢Û?Ú©Ù?Ù? Ù?ربÙ?Ø· را در Ù?Ù?ار ابزار Ù?Ú¯Ù? دار.</string>
   <string name="pref_use_persistent_notifications_title">آگاÙ?سازÛ? Ù?Ù?Û?Ø´Ù? رÙ?Ø´Ù?</string>
   <string name="notification_using_bridges">Ù¾Ù? Ù?ا Ù?عاÙ? شدÙ?د!</string>
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="set_locale_title">زباÙ? Ù?Ø­Ù?Û? را Ù?شخص Ú©Ù?Û?د</string>
   <string name="set_locale_summary">زباÙ? Ù?Ø­Ù?Û?  ربات Ù¾Û?ازÛ?  را اÙ?تخاب Ú©Ù?Û?د</string>
   <string name="wizard_locale_title">اÙ?تخاب زباÙ?</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 3807707..5a2908f 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -9,11 +9,11 @@
   <string name="tor_proxy_service_process">torproxyservice</string>
   <string name="status_starting_up">Orbot démarre...</string>
   <string name="status_activated">Connecté au réseau Tor</string>
-  <string name="status_disabled">\"Orbot est désactivé</string>
+  <string name="status_disabled">Orbot est désactivé</string>
   <string name="status_shutting_down">Orbot s\'arrête</string>
   <string name="tor_process_starting">Lancement du client Tor</string>
-  <string name="tor_process_complete">Terminé</string>
-  <string name="tor_process_waiting">Attente...</string>
+  <string name="tor_process_complete">terminé.</string>
+  <string name="tor_process_waiting">attente.</string>
   <string name="not_anonymous_yet">AVERTISSEMENT: Votre trafic 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>
@@ -47,7 +47,7 @@
   <string name="pref_has_root">Demander un accès privilégié</string>
   <string name="pref_has_root_summary">Demande un accès privilégié pour le proxy transparent</string>
   <string name="status_install_success">Tor a été installé avec succès !</string>
-  <string name="status_install_fail">Tor n\'a pas pu installé. S\'il vous plaît, vérifiez le fichier journal et contactez tor-assistants@xxxxxxxxxxxxxx</string>
+  <string name="status_install_fail">Tor n\'a pu être installé. Veuillez vérifier le fichier journal et contacter tor-assistants@xxxxxxxxxxxxxx</string>
   <string name="title_error">Erreur de l\'application</string>
   <string name="wizard_title">Bienvenue dans Orbot</string>
   <string name="wizard_btn_tell_me_more">Ã? propos de Orbot</string>
@@ -62,12 +62,12 @@
   <string name="wizard_permissions_root">Permission accordée</string>
   <string name="wizard_permissions_stock">Permissions d\'Orbot</string>
   <string name="wizard_premissions_msg_root">Excellent ! Nous avons détecté que vous avez donné les droits privilégiés pour Orbot. Nous utiliserions ces droits avec sagesse.</string>
-  <string name="wizard_permissions_msg_stock"> Bien que cela ne soit pas nécessaire, Orbot peut devenir un outil bien plus utile si vous lui donnez un accès privilégié. Utilisez le bouton ci-dessous pour donner à Orbot de grands pouvoirs ! </string>
-  <string name="wizard_permissions_no_root">Si vous n\'avez pas d\'accès privilégié ou n\'avez pas idée de ce que cela est, vérifiez bien que vous utilisez des applications conçues pour fonctionner avec Orbot.</string>
+  <string name="wizard_permissions_msg_stock">Bien que cela ne soit pas nécessaire, Orbot peut devenir un outil bien plus utile si vous lui donnez un accès privilégié. Utilisez le bouton ci-dessous pour donner à Orbot de grands pouvoirs ! </string>
+  <string name="wizard_permissions_no_root">Si vous n\'avez pas d\'accès privilégié ou n\'avez pas idée de ce que cela signifie, vérifiez bien que vous utilisez des applications conçues pour fonctionner avec Orbot.</string>
   <string name="wizard_permissions_consent">Je comprends et je souhaite continuer sans les droits privilégiés</string>
   <string name="wizard_permission_enable_root">Donner les droits privilégiés à Orbot</string>
   <string name="wizard_configure">Configurer la Torification</string>
-  <string name="wizard_configure_msg">Orbot vous donne le choix entre faire passer le trafic de toutes les applications à travers Tor OU de choisir pour chaque application</string>
+  <string name="wizard_configure_msg">Orbot vous donne le choix entre faire passer le trafic de toutes les applications à travers Tor OU de choisir pour chaque application.</string>
   <string name="wizard_configure_all">Toutes les applications par Tor</string>
   <string name="wizard_configure_select_apps">Choisir les applications utilisant Tor</string>
   <string name="wizard_tips_tricks">Applications avec Orbot</string>
@@ -75,11 +75,14 @@
   <string name="wizard_tips_otrchat">Gibberbot - Client de messagerie instantanée pour Android</string>
   <string name="wizard_tips_proxy">Configuration du proxy - Apprendre comment configurer les applications pour qu\'elles fonctionnent avec Orbot</string>
   <string name="wizard_tips_duckgo">Application DuckDuckgo Search Engine</string>
+  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
   <string name="wizard_tips_firefox">Firefox avec le plugin Proxy Mobile (installation complémentaire)</string>
+  <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
   <string name="wizard_tips_twitter">Twitter supporte le proxy http \"localhost:8118\"</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</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\n    La configuration de l\'hôte est 127.0.0.1 ou \"localhost\". Pour le HTTP, le port utilisé est le 8118. Pour SOCKS, le port utilisé est 9050. Vous devriez, si possible, utiliser SOCKS4A ou SOCKS5.\n    /n/n\n    Vous pouvez en apprendre plus sur la configuration de proxy sous Android sur la FAQ à : http://tinyurl.com/proxyandroid\n    </string>
-  <string name="wizard_final">Orbot est prêt!</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>
   <!--END Welcome Wizard strings (DJH)-->
   <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>
@@ -105,6 +108,8 @@
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
   <string name="wizard_tips_orweb">ORWEB (Android 1.x seulement) - navigateur créé pour protéger votre vie privée &amp; pour Orbot</string>
   <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
+  <string name="wizard_tips_play">Trouver toutes les applications de Guardian Project sur Google Play</string>
+  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
@@ -148,7 +153,7 @@
   <string name="setting_up_port_based_transparent_proxying_">Configuration du proxy transparent par port...</string>
   <string name="bridge_error">Erreur de passerelle</string>
   <string name="bridge_requires_ip">Avant de pouvoir utiliser les passerelles, vous devez entrer au moins l\'adresse IP d\'une passerelle</string>
-  <string name="send_email_for_bridges">Envoyez un e-mail à bridges@xxxxxxxxxxxxxx avec \"get bridges\" dans le corps de l\'e-mail - fonctionne si le mail est envoyé d\'une adresse Gmail</string>
+  <string name="send_email_for_bridges">Envoyez un e-mail à bridges@xxxxxxxxxxxxxx avec \"get bridges\" dans le corps de l\'e-mail - fonctionne si le mail est envoyé d\'une adresse Gmail.</string>
   <string name="error">Erreur</string>
   <string name="your_reachableaddresses_settings_caused_an_exception_">Les paramètres pour ReachableAddresses ont provoqué une erreur !</string>
   <string name="your_relay_settings_caused_an_exception_">Vos paramètres de relais ont provoqué une erreur !</string>
@@ -209,7 +214,7 @@
   <string name="pref_use_persistent_notifications">Toujours conserver l\'icône dans la barre des tâches quand Orbot est connecté.</string>
   <string name="pref_use_persistent_notifications_title">Toujours activé les Notifications</string>
   <string name="notification_using_bridges">Les ponts sont activés!</string>
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="set_locale_title">Fixer le Lieu</string>
   <string name="set_locale_summary">Choisir le lieu and la langue pour Orbot</string>
   <string name="wizard_locale_title">Choisir la langue</string>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
index 002f24e..1c94b69 100644
--- a/res/values-he/strings.xml
+++ b/res/values-he/strings.xml
@@ -13,6 +13,8 @@
   <string name="status_shutting_down">Orbot ×?ת×?×?×?×? ×?×?×?×?×?</string>
   <string name="tor_process_starting">×?ת×?×?×? ×?ת Tor...</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\nproxy 127.0.0.1:9050</string>
   <string name="menu_home">×?×?ת</string>
   <string name="menu_browse">×?פ×?×£</string>
   <string name="menu_settings">×?×?×?ר×?ת</string>
@@ -30,9 +32,20 @@
   <string name="menu_verify">×?×?×?ק×?</string>
   <string name="menu_exit">צ×?</string>
   <string name="press_to_start">-× ×?×?×¢×? ×?ר×?×?×? ×?×?ת×?×?×?-</string>
+  <string name="pref_trans_proxy_group">פר×?קס×? שק×?×£ (ש×?רש × ×?רש)</string>
+  <string name="pref_trans_proxy_title">פר×?קס×? שק×?×£</string>
+  <string name="pref_trans_proxy_summary">×¢×?×?×?×? ×?×?×?×?×?×?×?ת ×¢×? ×?פ×?×?קצ×?×?ת ×?ר×? Tor</string>
   <string name="pref_transparent_all_title">×?×?×? ×?ר×? Tor</string>
+  <string name="pref_transparent_all_summary">תע×?×?ר ×?ר×? פר×?קס×?  ×¢×?×?ר ×?×? ×?×?פ×?×?קצ×?×?ת ×?ר×? Tor</string>
+  <string name="pref_transparent_port_fallback_title">×?×?×?×?×? ×? Port Proxy</string>
+  <string name="pref_transparent_port_fallback_summary">×?×?×?ר×?: עק×?×£ פ×?ר×?×?×? נפ×?צ×?×? (80,443 ×?×?×?\'). *×?שת×?ש רק* ×?×? ×?×?×?פנ×?×? \'All\' ×?×? \'App\'  ×?×? ×¢×?×?×?×?×?.</string>
   <string name="pref_transparent_port_title">רש×?×?ת פ×?ר×?×?×?</string>
+  <string name="pref_transparent_port_summary">רש×?×?ת פ×?ר×?×?×? ×?פר×?קס×?. *×?שת×?ש רק* ×?×? ×?×?×?פנ×?×? \'All\' ×?×? \'App\'  ×?×? ×¢×?×?×?×?×?.</string>
+  <string name="pref_transparent_port_dialog">×?×?ר פ×?ר×?×?×? ×?פר×?קס×?×?</string>
   <string name="pref_has_root">×?ר×?ש ר×?×?</string>
+  <string name="pref_has_root_summary">×?קש ×?×?ש×? ×¢×?×?×?× ×? ×¢×?×?ר ש×?×?×?ש ×?פר×?קס×? שק×?×£</string>
+  <string name="status_install_success">ק×?צ×?×? ×?ר×? ×?רצ×? ש×? Tor ×?×?תקנ×? ×?×?צ×?×?×?!</string>
+  <string name="status_install_fail">×?ק×?צ×?×? ×?ר×? ×?×?רצ×? ש×? Tor ×?×? × ×?תנ×? ×?×?תקנ×?. ×?×?קש×? ×?×?×?ק ×?ת ×?×?×?×? ×?×?×?×?×¢ ×? \ntor-assistants@xxxxxxxxxxxxxx</string>
   <string name="title_error">ש×?×?×?ת ×?×?ש×?×?</string>
   <string name="wizard_title">Orbot</string>
   <string name="wizard_btn_tell_me_more">×?×?×?×?ת Orbot</string>
@@ -42,38 +55,87 @@
   <string name="btn_okay">OK.</string>
   <string name="btn_cancel">ס×?×?ר</string>
   <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">×?ספר פר×?×?×? ש×?  Orbot </string>
+  <string name="wizard_details_msg"> Orbot ×?×?×? ×?פ×?×?קצ×?ת ק×?×? פת×?×? ש×?×?×?×?×? Tor, libEvevt ×?פר×?קס×?. ×?×?×? ×?ספקת פר×?קס×?    HTTP  ×?ק×?×?×? (8118) ×? SOCKS   פר×?קס×? (9050) ×?רשת ×? Tor. ×? Orbot ×?ש ×?×? ×?×?×?×?ת, ×?×?×?ש×?ר פת×?×?, ×?ש×?×?×? ×?ת ×?×? תע×?×?רת ×?×?×?× ×?רנ×? ×?ר×? Tor.</string>
+  <string name="wizard_permissions_root">× ×?תנ×? רש×?ת</string>
+  <string name="wizard_permissions_stock">רש×?×?×?ת ש×? Orbot</string>
+  <string name="wizard_premissions_msg_root">×?צ×?×?×?! ×?×?×?×?× ×? ש×?ש ×?×? רש×?×?×?ת ×¢×?×?×?× ×?×?ת ×?×?×?פשר×?ת ×?ש×?×?×? Orbot. נשת×?ש ×?×?×?×? ×?×?×? ×?×?×?×?×?×?.</string>
+  <string name="wizard_permissions_msg_stock">×?×?×?×? ש×?×? ×?×? × ×?רש, Orbot ×?×?×?×?×? ×?×?פ×?×? ×?×?×?×?ת ×?×?×? ×?×?ק ×?×?תר ×?×? ×?×?×?ש×?ר ש×?×? ×?ש ×?×?ש×? ×¢×?×?×?× ×?. תשת×?ש ×?×?פת×?ר ×?×?×?×? ×?×?×? ×?ק×?×? ×?×?×?×?ת ×¢×? ש×? Orbot !</string>
+  <string name="wizard_permissions_no_root">×?×? ×?×?×? ×?×? ×?×?ש×? ×¢×?×?×?× ×? ×?×? ×?×?×? ×?×? ×?×?ש×? ×¢×? ×?×? ×?× ×?× ×? ×?×?×?ר×?×?, רק ת×?×?×?×? שתשת×?ש ×?×?פ×?×?קצ×?×?ת שנ×?×¢×?×? ×?×¢×?×?×? ×¢×? Orbot.</string>
   <string name="wizard_permissions_consent">×?×?נת×? ×?×?× ×? ×?×¢×?×?×£ ×?×?×?ש×?×? ×?×?×? Superuser</string>
+  <string name="wizard_permission_enable_root">×?פשר ×?×?ש×? ×?×?×?×? ×¢×?×?ר Orbot</string>
+  <string name="wizard_configure">×?×?×?ר ×¢×?×?×?×? ×?×?×?צע×?ת Tor</string>
+  <string name="wizard_configure_msg">Orbot × ×?תנת ×?×? ×?פשר×?ת ×?×?×?×?×? ×?ת ×?×? תע×?×?רת ×?×?פ×?×?קצ×?×?ת ×?ר×? Tor ×?×? ×?×?×?×?ר ×?ת ×?×?פ×?×?קצ×?×?ת ש×?×? ×?נפר×?.</string>
+  <string name="wizard_configure_all">×?שץ×?ש ×?פר×?קס×? ×?×?×? ×?×?פ×?×?קצ×?×?ת ×?ר×? Tor</string>
+  <string name="wizard_configure_select_apps">×?×?ר ×?פ×?×?קצ×?×?ת ×?ס×?×?×?×?ת ×¢×?×?ר Tor</string>
+  <string name="wizard_tips_tricks">Orbot ×?ת×?פשר ×¢×? ×?×?×? ×?פ×?×?קצ×?×?ת</string>
+  <string name="wizard_tips_msg">×?×?פ×?×?קצ×?×?ת ×?ת×?ת פ×?ת×?×? ×?×¢×?×?×?×? ×¢×? Orbot. ×?×?×¥ ×¢×? ×?×? ×?פת×?ר ×?×?תקנ×? ×?×?×?×?×?ת, ×?×? ש×?ת×? ×?×?×?×? ×?×?צ×?×? ×?×?ת×? ×?×?ר ×?×? ×? Google Play, ×?×?תר GuardianProject.info ×?×?\n×?ר×?  F-Droid.org</string>
+  <string name="wizard_tips_otrchat">Gibberbot-ש×?×?×?ת ×?×?×?×¢×?ת ×?ק×?×? ×?×?×?×?×?ת ×?×?×?×?×?×?ת  ×¢×?×?ר ×?× ×?ר×?×?×?×?.</string>
   <string name="wizard_tips_proxy">×?×?×?ר×?ת פר×?קס×?- ×?×?×? ×?×?×? ×?×?×?×?×?ר ×?פ×?×?קצ×?×?ת ×?×¢×?×?×? ×¢×? Orbot</string>
   <string name="wizard_proxy_help_info">×?×?×?ר×?ת פר×?קס×?</string>
+  <string name="wizard_proxy_help_msg">×?×? ×?פ×?×?קצ×?×?ת ×?×?× ×?ר×?×?×?×? ש×?ת×? ×?שת×?ש ת×?×?×?ת ×?ש×?×?×?ש ש×? פר×?קס×?   HTTP  ×?×? SOCKS, ת×?×?×? ×?×?×?×?×?ר ×?×?ת ×?ש×?×?×? ×?×?ת×?×?ר ×? Orbot ×?×?×?שת×?ש ×? Tor. \n×?×?×?ר×?ת ×?×?×?ר×? ×?×? 127.0.0.1 ×?×? \"localhost\". ×¢×?×?ר HTTP, ×?×?×?רת ×?פ×?ר×? ×?×?×? 8118. ×¢×?×?ר SOCKS ×?פר×?קס×? ×?×?×? 9050. ×?ת×? ×?×?×?×? ×?×?שת×?ש ×? SOCKS4A ×?×? ×? SOCKS5 ×?×? ×?ת×?פשר. ×?ת×? ×?×?×?×? ×?×?×?×?×? ×¢×?×? ×¢×? ×¢×?×?×?×? ×¢×? פר×?קס×? ×?×?× ×?ר×?×?×?×? ×?ר×? FAQ\n×? http://tinyurl.com/proxyandroid</string>
   <string name="wizard_final">Orbot ×?×?×?×?!</string>
+  <string name="wizard_final_msg">×?×?×?ת ×?×?פ×? ×?נש×?×? ס×?×?×? ×?×¢×?×?×? ×?שת×?ש×?×? ×? Tor  ×¢×?×?ר ×?×?×?×?×? ס×?×?×?ת. ×¢×?ת×?× ×?×?×? ×?×?×?×?×?ר×?×?, ×?×?×?× ×? ×?×?×?×?×?ת ×?×?×?, ש×?×?ר×?×?, ×?×?×?×?×?×?, ת×?×?×?×?×?×?, ×?×?ר×?×?×? ×?×?ש×?ר×?×? ×?×?×?×?×?×? ×?×?×? ×?×?ר×?×?×? ר×?×?×?×?×?.. ×?×¢×?ש×?×? ×?×? ×?ת×?!</string>
   <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">×?ת×? ×?×?×?×?ר ×?×?צ×?×?×? ×?רשת Tor- ×?×?×? ×?×? ×?×? ×?×?×?ר ש×?×?×?ש×?ר ש×?×? ×?×?×?×?×?×?. ×?ת×? ×?×?×?×? ×?×?שת×?ש ×?×?פשר×?ת ×?   \'Check\' ×?×?תפר×?×? ×?×?×? ×?×?×?×?ק ×?ת ×?×?פ×?פ×? ש×?×?. ×?קר ×? \nhttps://guardianproject.info/apps/orbot  ×?×? ש×?×? ×?×?×?×?×?×? ×? help@xxxxxxxxxxxxxxxxxxxx\n×?×?×? ×?×?×?×?×? ×¢×?×?.</string>
+  <string name="tor_check">×?×?ר ×?×? ×?פת×? ×?ת ×?פ×?פ×? ×?רשת ש×?×? ×?  https://check.torproject.org ×?×?×? ×?ר×?×?ת ×?×? Orbot ×?×?×?×?ר×? ×?×?×? ×?ת×? ×?×?×?×?ר ×? Tor.</string>
   <string name="pref_hs_group">×?×?×?ס×?×? ש×?ר×?ת×?×? נסתר×?×?</string>
   <string name="pref_general_group">×?×?×?×?</string>
   <string name="pref_start_boot_title">×?ת×?×? ×?ת Orbot ×?×?×?×?קת ×?×?×?ש×?ר</string>
   <string name="pref_start_boot_summary">×?ת×?×? ×?ת Orbot ×?×?ת×?×?ר ×?-Tor ×?×?×?×?×?×?×?ת ×?×?×?×?ש×?ר × ×?×?ק</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot ×?×?×?×?×? ×?ת Tor ×?×?× ×?ר×?×?×?×?! Tor  ×¢×?×?רת ×?×? ×?×?×?× ×? × ×?×? ס×?× ×?×? ת×?× ×?×?, × ×?ת×?×? תע×?×?ר×? ×?×?עק×? רשת ש×?×?×?×?×?×?×? ×¢×? פר×?×?×?ת, ×?×?×?×¢ ס×?×?×? ×?קשר×?×? ×?×?ש×?×?×?.  ×?×?×? ×?×? ×¢×?×?ר ×?×? ×?×?×?×?×?ר ×?ת Orbot ×?×?ת Tor ×¢×? ×?×?×?ש×?ר ש×?×?. </string>
   <!--Warning screen-->
+  <string name="wizard_warning_title">×?×?×?ר×?</string>
+  <string name="wizard_warning_msg">רק ×?תקנת Orbot ×?×? ת×?פשר ×?× ×?× ×?×?×?×?ת ×?תע×?×?רת ×?×?×?ש×?ר ש×?×?. ×?ת×? ×?×?×?×? ×?×?×?×?×?ר Orbot , ×?ת ×?×?×?ש×?ר ש×?×? ×?×?פ×?×?קצ×?×?ת ×?×?ר×?ת ×?×?ת×?×? ×?×?×? ×?×?שת×?ש ×?×?צ×?×?×?  ×?Tor.</string>
   <!--Permissions screen-->
+  <string name="wizard_permissions_title">רש×?×?×?ת</string>
+  <string name="wizard_permissions_root_msg1">×?ת×? ×?×?×?×? ×?ק×?×? ×?×?שת   \'Superuser\'   ×? Orbot ×?×?×? ×?×?פשר ×?×?פ×?×?× ×?×? ×?תק×?×?×?×? ×?×?×? ×?×?ש×?, פר×?קס×? שק×?×£.</string>
   <string name="wizard_permissions_root_msg2">×?×? ×?ת×? ×?×? ר×?צ×? ×?עש×?ת ×?ת ×?×?, ×?× ×? ×?קפ×? ×?×?שת×?ש ×?×?×?ש×?×?×?×? שנעש×? ×?×?×? ×?×¢×?×?×? ×¢×? Orbot</string>
+  <string name="wizard_permissions_no_root_msg">×?×? נר×?×? ש×?×?×?ש×?ר ש×?×? ×?×¢×? ס×?×?×?ת ×¢×?×?×?× ×? ×?×? ק×?×?×? ×?×?שת  \'Superuser\'. ×?×?×? ש Tor ×?×?×?×? ×?×¢×?×?, תצ×?ר×? ×?×?שת×?ש ×?×?פ×?×?קצ×?×?ת שנ×?× ×? ×?ש×?×?×? ×?×¢×?×?×? ×¢×? Orbot, ×?×? ×?×?×?×? שת×?×?×?×?ת \n×?×?×?×?ר×?ת פר×?קס×? ש×?   HTTP ×?×? ש×? SOCKS.\n</string>
   <!--TipsAndTricks screen-->
   <string name="wizard_tips_title">Orbot - ×?×?ש×?×?×?×? ×?×?פע×?×?×?</string>
+  <string name="wizard_tips_gibberbot">Gibberbot: ×?פ×?×?קצ×?ת צ\'×?×? ×?×?×?×?×?×?ת ×¢×? ×?צפנת Off-the-Record</string>
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
+  <string name="wizard_tips_orweb">Orweb- ×?פ×?פ×? ×¢×? פר×?×?×?ת ר×?×? שע×?×?×? ×?ר×? Tor</string>
+  <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.xpi</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">פר×?קס×? שק×?×£</string>
   <string name="wizard_transproxy_msg">×?×? ×?×?פשר ×?×?×?ש×?×?×?×? ש×?×? ×?×?פע×?×? ×?×?×?פ×? ×?×?×?×?×?×?×? ×?ר×? רשת Tor ×?×?×? ×?×? תצ×?ר×?.</string>
   <string name="wizard_transproxy_hint">(ס×?×? ת×?×?×? ×?×? ×?×? ×?×?×? ×?×? ×?×?ש×? ×¢×? ×?×? ×?× ×?× ×? ×?×?×?ר×?×?)</string>
+  <string name="wizard_transproxy_none">×?×?×?×?</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">×?×?פשר ×¢×?×?×?×? ×¢×? פר×?קס×? שק×?×£ ×¢×?×?ר רשת ×?×?×?×?×?×?ת ×?×?×?ש×?ר×?  USB Tethered (×?×?רש ×?ת×?×?×? ×?×?×?ש)</string>
   <string name="button_grant_superuser">×?ר×?ש ×?×?ש×?ר Superuser</string>
   <string name="pref_select_apps">×?×?ר ×?פ×?קצ×?×?ת</string>
   <string name="pref_select_apps_summary">×?×?ר ×?פ×?קצ×?×?ת</string>
+  <string name="pref_node_configuration">×?×?×?ר×?ת Node</string>
+  <string name="pref_node_configuration_summary">ק×?×?×?×?ת ×?×?×?ר×?ת ×?תק×?×?×?ת ש×?×?×?×?×?ת ×?×?פ×?×?ת ×?ת ×?×?× ×?× ×?×?×?×?ת ש×?×?</string>
+  <string name="pref_entrance_node">Entrance Nodes</string>
+  <string name="pref_entrance_node_summary">×?×?×?×¢×?ת ×?צ×?×¢, ×?×?× ×?×?×?×?, ×?רצ×?ת ×?×?ת×?×?×?ת ×¢×?×?ר ×?×?×¢×?ר ×?ר×?ש×?×?</string>
+  <string name="pref_entrance_node_dialog">×?×?נס 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_dialog">ס×?×? ×?פר×?קס×?:</string>
+  <string name="pref_proxy_type_title">Outbound Proxy Type</string>
+  <string name="pref_proxy_type_summary">פר×?×?×?ק×?×? ש×?×?×?ש ×?שרת פר×?קס×?:  HTTP, HTTPS, Socks4,Socks5</string>
+  <string name="pref_proxy_type_dialog">ס×?×? ×?פר×?קס×?</string>
+  <string name="pref_proxy_host_title">×?×?ר×? ש×? Outbound Proxy</string>
+  <string name="pref_proxy_host_summary">ש×? ×?×?ר×? ש×? שרת פר×?קס×?</string>
+  <string name="pref_proxy_host_dialog">×?×?נס ×?×?ר×? פר×?קס×?</string>
+  <string name="pref_proxy_port_title">פ×?ר×? ש×? Outbound Proxy</string>
   <string name="pref_proxy_port_summary">פ×?ר×? ×?שרת ש×? ×?פר×?קס×?</string>
+  <string name="pref_proxy_port_dialog">×?×?נס פ×?ר×? ש×? פר×?קס×?</string>
   <string name="status">ס×?×?×?ס</string>
+  <string name="setting_up_full_transparent_proxying_">×?×?× ×? ש×? ×?פר×?קס×? ×?שק×?×£...</string>
+  <string name="setting_up_app_based_transparent_proxying_">×?×?× ×? ש×? ×?פר×?קס×? ×?שק×?×£ ×?×?×?סס ×?פ×?×?קצ×?×?ת...</string>
+  <string name="transparent_proxying_enabled">פר×?קס×? שק×?×£ ×?×?×?פשר</string>
+  <string name="transproxy_enabled_for_tethering_">פר×?קס×? שק×?×£ ×?×?×?פשר ×? Tathering!</string>
+  <string name="warning_error_starting_transparent_proxying_">×?×?×?ר×?: ש×?×?×?×? ×?ת×?×?×?×? ×?ת ×?פר×?קס×? ×?שק×?×£!</string>
   <string name="bridge_error">ש×?×?×?ת ×?שר</string>
   <string name="error">ש×?×?×?×?</string>
   <string name="bridges">×?שר×?×?</string>
@@ -84,7 +146,7 @@
   <string name="enable_hidden_services">×?×?ס×?×? ש×?ר×?ת×?×? נסתר×?×?</string>
   <string name="hidden_service_ports">פ×?ר×? ×?ש×?ר×?ת×?×? ×?נסתר×?×?</string>
   <string name="https_torproject_org">https://torproject.org/</string>
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="wizard_locale_title">×?×?ר שפ×?</string>
   <string name="powered_by">×?×?פע×? ×¢×? ×?×?×? Tor Project</string>
   <string name="btn_save_settings">ש×?×?רת ×?×?×?ר×?ת</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 520215c..cda2f90 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -1,213 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Orbot</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>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">start and stop Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot is starting...</string>
-  <string name="status_activated">Connected to the Tor network</string>
-  <string name="status_disabled">\"Orbot is Deactivated</string>
-  <string name="status_shutting_down">Orbot is shutting down</string>
-  <string name="tor_process_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>
-  <string name="menu_settings">Settings</string>
-  <string name="menu_log">Log</string>
-  <string name="menu_info">Help</string>
-  <string name="menu_apps">Apps</string>
-  <string name="menu_start">Start</string>
-  <string name="menu_stop">Stop</string>
-  <string name="menu_about">About</string>
-  <string name="menu_wizard">Wizard</string>
-  <string name="button_help">Help</string>
-  <string name="button_close">Close</string>
-  <string name="button_about">About</string>
-  <string name="button_clear_log">Clear Log</string>
-  <string name="menu_verify">Check</string>
-  <string name="menu_exit">Exit</string>
-  <string name="press_to_start">- long press to start -</string>
-  <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string>
-  <string name="pref_trans_proxy_title">Transparent Proxying</string>
-  <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string>
-  <string name="pref_transparent_all_title">Tor Everything</string>
-  <string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string>
-  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
-  <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
-  <string name="pref_transparent_port_title">Port List</string>
-  <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
-  <string name="pref_transparent_port_dialog">Enter ports to proxy</string>
-  <string name="pref_has_root">Request Root Access</string>
-  <string name="pref_has_root_summary">Request root access for transparent proxying</string>
-  <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">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="menu_info">PomoÄ?</string>
+  <string name="button_help">PomoÄ?</string>
   <!--Welcome Wizard strings (DJH)-->
-  <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>
-  <string name="wizard_permissions_stock">Orbot Permissions</string>
-  <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 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">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_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\n    The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n    \n\n\n    You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n    </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.\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="wizard_proxy_help_info">Proxy postavke</string>
   <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help@xxxxxxxxxxxxxxxxxxxx to learn more.</string>
-  <string name="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>
   <!--New Wizard Strings-->
   <!--Title Screen-->
-  <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>
   <!--Warning screen-->
-  <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>
   <!--Permissions screen-->
-  <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 does not appear to be rooted or provide \'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>
   <!--TipsAndTricks screen-->
-  <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_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
-  <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 (requires restart)</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>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying...</string>
-  <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string>
-  <string name="transproxy_rules_cleared">TransProxy rules cleared</string>
-  <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string>
-  <string name="privoxy_is_running_on_port_">Privoxy is running on port: </string>
-  <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string>
-  <string name="bridge_error">Bridge Error</string>
-  <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string>
-  <string name="send_email_for_bridges">Send an email to bridges@xxxxxxxxxxxxxx with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string>
-  <string name="error">Error</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string>
-  <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string>
-  <string name="exit_nodes">Exit Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string>
-  <string name="enter_exit_nodes">Enter Exit Nodes</string>
-  <string name="exclude_nodes">Exclude Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string>
-  <string name="enter_exclude_nodes">Enter Exclude Nodes</string>
-  <string name="strict_nodes">Strict Nodes</string>
-  <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string>
-  <string name="bridges">Bridges</string>
-  <string name="use_bridges">Use Bridges</string>
-  <string name="bridges_obfuscated">Obfuscated Bridges</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string>
-  <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string>
-  <string name="enter_bridge_addresses">Enter Bridge Addresses</string>
-  <string name="relays">Relays</string>
-  <string name="relaying">Relaying</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Enable your device to be a non-exit relay</string>
-  <string name="relay_port">Relay Port</string>
-  <string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string>
-  <string name="enter_or_port">Enter OR port</string>
-  <string name="relay_nickname">Relay nickname</string>
-  <string name="the_nickname_for_your_tor_relay">The nickname for your Tor relay</string>
-  <string name="enter_a_custom_relay_nickname">Enter a custom relay nickname</string>
-  <string name="reachable_addresses">Reachable Addresses</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Run as a client behind a firewall with restrictive policies</string>
-  <string name="reachable_ports">Reachable ports</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string>
-  <string name="enter_ports">Enter ports</string>
-  <string name="enable_hidden_services">Enable Hidden Services</string>
-  <string name="run_servers_accessible_via_the_tor_network">run servers accessible via the Tor network</string>
-  <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string>
-  <string name="hidden_service_ports">Hidden Service Ports</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string>
-  <string name="project_home">Project Home(s): </string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">The Tor License</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3rd-Party-Software: </string>
-  <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
-  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
-  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
-  <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string>
-  <string name="found_existing_tor_process">found existing Tor process...</string>
-  <string name="something_bad_happened">Something bad happened. Check the log</string>
-  <string name="hidden_service_on">hidden service on:</string>
-  <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string>
-  <string name="unable_to_start_tor">Unable to start Tor:</string>
-  <string name="pref_use_sys_iptables_title">Use Default Iptables</string>
-  <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string>
-  <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string>
-  <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string>
-  <string name="pref_use_persistent_notifications_title">Always-On Notifications</string>
-  <string name="notification_using_bridges">Bridges enabled!</string>
-  <string name="default_bridges"/>
-  <string name="set_locale_title">Set Locale</string>
-  <string name="set_locale_summary">Choose the locale and language for Orbot</string>
-  <string name="wizard_locale_title">Choose Language</string>
-  <string name="wizard_locale_msg">Leave default or switch the current language</string>
-  <string name="powered_by">powered by The Tor Project  </string>
-  <string name="btn_save_settings">Save Settings</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="default_bridges"></string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 67a4883..0acc964 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -75,8 +75,11 @@
   <string name="wizard_tips_otrchat">Gibberbot - Biztonságos azonnali üzenetküldÅ? kliens Android-ra</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_tips_duckgo">Duckduckgo keresÅ?gép alkalmazás</string>
+  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
   <string name="wizard_tips_firefox">Firefox Proxy Mobile kiegészítÅ?vel (külön telepítés utána)</string>
+  <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
   <string name="wizard_tips_twitter">A Twitter támogatja a \"localhost:8118\" http proxyt</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</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\n    A host beállítás 127.0.0.1 vagy \"localhost\". A HTTP-hez a  port értéke 8118. A SOCKS esetében a proxy port értéke 9050. SOCKS4A vagy SOCKS5 proxy javasolt használnia, ha lehetséges.\n    \n\n\n    További információkat talál a proxyzásról Android készülékne a FAQ szekcióban az alábbi oldalon: http://tinyurl.com/proxyandroid\n    </string>
   <string name="wizard_final">Az Orbot kész!</string>
@@ -105,6 +108,8 @@
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</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_tips_play">Az összes Guardian Project alkalmazás keresése a Google Play-en</string>
+  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
@@ -209,7 +214,7 @@
   <string name="pref_use_persistent_notifications">Mindig legyen látható az ikon az eszköztáron, ha az Orbot csatlakozott állapotú.</string>
   <string name="pref_use_persistent_notifications_title">Mindig bekapcsolt értesítések</string>
   <string name="notification_using_bridges">Hidak engedélyezve!</string>
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="set_locale_title">Hely beállítása</string>
   <string name="set_locale_summary">Adja meg a helyi és nyelvi beállításokat</string>
   <string name="wizard_locale_title">Válasszon nyelvet</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 72fe3ab..84211ec 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -214,7 +214,7 @@
   <string name="pref_use_persistent_notifications">Mantieni sempre l\'icona nella barra degli strumenti quando Orbot è connesso.</string>
   <string name="pref_use_persistent_notifications_title">Notifiche sempre attive</string>
   <string name="notification_using_bridges">Bridge attivati!</string>
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="set_locale_title">Configura le impostazioni internazionali.</string>
   <string name="set_locale_summary">Scegli le impostazioni internazionali e la lingua di Orbot</string>
   <string name="wizard_locale_title">Scegli Lingua</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 9ebb63f..a859789 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -25,6 +25,8 @@
   <string name="menu_stop">å??æ­¢</string>
   <string name="menu_about">æ??å ±</string>
   <string name="menu_wizard">ã?¦ã?£ã?¶ã?¼ã??</string>
+  <string name="main_layout_download">ã??ã?¦ã?³ã?­ã?¼ã??</string>
+  <string name="main_layout_upload">ã?¢ã??ã??ã?­ã?¼ã??</string>
   <string name="button_help">ã??ã?«ã??</string>
   <string name="button_close">é??ã??ã??</string>
   <string name="button_about">ã?«ã?¤ã??ã?¦</string>
@@ -72,6 +74,12 @@
   <string name="wizard_tips_msg">以ä¸?ã?®ã?¢ã??ã?ªã?¯Orbotç?¨ã?«ä½?ã??ã??ã?¦ã??ã?¾ã??ã??ã??ã??ã??ã??ã?®ã??ã?¿ã?³ã??æ?¼ã??ã?¨ä»?ã??ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã?§ã??ã?¾ã??ã??Google Playã??ã??ã??å??ã??ã??ã?®ã??æ?¢ã??ã?¾ã??ã??</string>
   <string name="wizard_tips_otrchat">Gibberbot - å®?å?¨ã?ªã?¤ã?³ã?¹ã?¿ã?³ã??ã?¡ã??ã?»ã?¼ã?¸ã?¢ã??ã?ª</string>
   <string name="wizard_tips_proxy">Proxy Settings - Orbotã?§ã?¢ã??ã?ªã??å??ã??ã??ã??ã??ã?®æ??é ?æ?¸</string>
+  <string name="wizard_tips_duckgo">DuckDuckGo æ¤?ç´¢ã?¨ã?³ã?¸ã?³ã?¢ã??ã?ª</string>
+  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+  <string name="wizard_tips_firefox">Proxy Mobile add-on for Firefox (http://tinyurl.com/getproxymob)</string>
+  <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
+  <string name="wizard_tips_twitter">Twitter proxyã??ã??localhostã??ã?¨8118ç?ªã??ã?¼ã??ã?«å??ã??ã??ã??</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">ã??ã?­ã?­ã?·è¨­å®?</string>
   <string name="wizard_proxy_help_msg">Androidã?¢ã??ã?ªã??HTTPã??SOCKSã??ã?­ã?­ã?·ã??å?©ç?¨ã?§ã??ã??å ´å??ã??Orbotã??使ã?£ã?¦Toræ?¥ç¶?ã??ã??ã??ã??ã?¨ã??å?¯è?½ã?§ã??ã??\n\n\n    ã??ã?¹ã??設å®?ã?¯127.0.0.1ã?¾ã??ã?¯localhostã?§ã??ã??HTTPã?§ã?¯ä½¿ç?¨ã??ã?¼ã??ã?¯8118ã?§ã??ã??SOCKSã?§ã?¯9050ã?§ã??ã??å?¯è?½ã?§ã??ã??ã?°SOCKS4Aã??SOCKS5ã?®å?©ç?¨ã??æ?¨å¥¨ã??ã?¾ã??ã??\n    \n\n\n    Androidä¸?ã?®ã??ã?­ã?­ã?·ã?«ã?¤ã??ã?¦å­¦ã?³ã??ã??å ´å??ã?¯ http://tinyurl.com/proxyandroidã??ã?®FAQã??å??ç?§ã??ã?¦ã??ã? ã??ã??ã??\n    </string>
   <string name="wizard_final">Orbotã?®æº?å??ã??å®?äº?ã??ã?¾ã??ã??</string>
@@ -100,6 +108,8 @@
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
   <string name="wizard_tips_orweb">Orweb: Torã??使ã??å?¿å??ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã??ã?©ã?¦ã?¶</string>
   <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
+  <string name="wizard_tips_play">Google Playã?§å?¨ã?¦ã?®Guardian Projectã?®ã?¢ã??ã?ªã??è¦?ã?¤ã??ã??</string>
+  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
@@ -204,7 +214,7 @@
   <string name="pref_use_persistent_notifications">Orbotã??æ?¥ç¶?中ã?¯ã?¢ã?¤ã?³ã?³ã??常ã?«ã??ã?¼ã?«ã??ã?¼ã?«è¡¨ç¤º</string>
   <string name="pref_use_persistent_notifications_title">é??ç?¥ã??常ã?«æ??å?¹å??</string>
   <string name="notification_using_bridges">ã??ã?ªã??ã?¸ã??æ??å?¹ã?§ã??ï¼?</string>
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="set_locale_title">å?°å??ã??é?¸æ??</string>
   <string name="set_locale_summary">Orbotã?®å?°å??ã?¨è¨?èª?ã??é?¸æ??</string>
   <string name="wizard_locale_title">è¨?èª?ã??é?¸æ??</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index c39f433..7074e64 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1,133 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Orbot</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>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">í? ë¥´ ì??ì?? ë°? ì¤?ì§?</string>
-  <string name="tor_proxy_service_process">í? ë¥´ í??ë¡?ì?? ì??ë¹?ì?¤</string>
-  <string name="status_starting_up">Orbotì?´ ì??ì??ì¤?...</string>
-  <string name="status_activated">Tor ë?¤í?¸ì??í?¬ì?? ì?°ê²°ë?¨</string>
-  <string name="status_disabled">\"Orbotê°? ë¹?í??ì?±í??ë??ì?´ ì??ì?µë??ë?¤</string>
-  <string name="status_shutting_down">Orbot를 ì¢?ë£?í?©ë??ë?¤</string>
-  <string name="tor_process_starting">Tor í?´ë?¼ì?´ì?¸í?¸ ì??ì??ì¤?...</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>
+  <string name="menu_home">í??ì§?</string>
+  <string name="menu_browse">ì°¾ì??보기</string>
   <string name="menu_settings">��</string>
-  <string name="menu_log">ë¡?ê·¸</string>
   <string name="menu_info">ë??ì??ë§?</string>
-  <string name="menu_apps">ì??ì?© í??ë¡?ê·¸ë?¨</string>
-  <string name="menu_start">ì??ì??</string>
-  <string name="menu_stop">��</string>
-  <string name="menu_about">ì ?ë³´</string>
-  <string name="menu_wizard">���</string>
+  <string name="menu_about">ì??ê°?</string>
   <string name="button_help">ë??ì??ë§?</string>
   <string name="button_close">�기</string>
-  <string name="button_about">ì ?ë³´</string>
-  <string name="button_clear_log">�그 ��기</string>
-  <string name="menu_verify">í??ì?¸</string>
-  <string name="menu_exit">��</string>
-  <string name="press_to_start">- ì??ì??í??려면 ì?¤ë?? ë??르기 -</string>
-  <string name="pref_trans_proxy_group">í?¬ëª?í?? í??ë¡?ì?? (루í?¸ í??ì??)</string>
-  <string name="pref_trans_proxy_title">í?¬ëª?í?? í??ë¡?ì??</string>
-  <string name="pref_trans_proxy_summary">ì?±ì?? ì??ë?? Torifying</string>
-  <string name="pref_transparent_all_title">í? ë¥´ì?? 모ë?  ê²?</string>
-  <string name="pref_transparent_all_summary">í? ë¥´ë¥¼ í?µí?? 모ë?  ì??ì?© í??ë¡?ê·¸ë?¨ì?? ë??í?? í??ë¡?ì?? í?¸ë??í?½</string>
-  <string name="pref_transparent_port_fallback_title">í?¬í?¸ í??ë¡?ì?? ë??ì²´</string>
-  <string name="pref_transparent_port_title">�� 목�</string>
-  <string name="pref_has_root">루í?¸ ê¶?í??ì?? ë??í?? ì ?ê·¼ í??ì??</string>
-  <string name="pref_has_root_summary">ëª?ë°±í?? í??ë¡?ì??를 ì??í?´ 루í?¸ ê¶?í?? ì??구</string>
-  <string name="status_install_success">Tor ë°?ì?´ë??리ê°? ì?±ê³µì ?ì?¼ë¡? ì?¤ì¹?ë?¨!</string>
-  <string name="status_install_fail">Tor ë°?ì?´ë??리 í??ì?¼ì?´ ì?¤ì¹?ë?  ì?? ì??ì?µë??ë?¤. Log를 í??ì?¸í?´ 주ì??ê³  tor-assistants@xxxxxxxxxxxxxx ì?? ì??ë ¤ 주ì?­ì??ì?¤.</string>
-  <string name="title_error">ì? í??리ì¼?ì?´ì?? ì?¤ë¥?</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Orbot ì ?ë³´</string>
-  <string name="btn_next">ë?¤ì??</string>
+  <string name="button_about">ì??ê°?</string>
+  <string name="menu_exit">ë??ê°?기</string>
   <string name="btn_back">��</string>
-  <string name="btn_finish">�침</string>
-  <string name="btn_okay">í??ì?¸</string>
   <string name="btn_cancel">ì·¨ì??</string>
   <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_permissions_root">ì?¬ì?© ê¶?í?? ë¶?ì?¬</string>
-  <string name="wizard_permissions_stock">Orbot ì?¬ì?© ê¶?í??</string>
-  <string name="wizard_premissions_msg_root">ì??ë²½í?©ë??ë?¤! Orbotì?? ì??í?´ 루í?¸ ê¶?í??ì?´ í??ì?±í??ë??ê²?ì?? ê°?ì§?í??ì?µë??ë?¤. ì?°ë¦¬ë?? ì?´ í??ì?? í??ëª?í??ê²? ì?¬ì?©í?  ê²?ì??ë??ë?¤.</string>
-  <string name="wizard_permissions_no_root">루í?¸ ê¶?í??ì?? ê°?ì§?ê³  ì??ì§? ì??ê±°ë?? ì?´ê²?ì?´ 무ì??ì?? ë§?í??ì??ë??ì§? 모르겠ë?¤ë©´, Orbotì?¼ë¡? ë§?ë?¤ì?´ì§? ì? í??리ì¼?ì?´ì??ë§?ì?? ì?¬ì?©í??ì?­ì??ì?¤.</string>
-  <string name="wizard_permissions_consent">ì?´í?´í??ì??ê³ , ì??í?¼ì? ì ? ê¶?í?? ì??ì?´ ê³?ì??í?©ë??ë?¤.</string>
-  <string name="wizard_permission_enable_root">Orbotì?? ì??í?? 루í?¸ í??ê°?</string>
-  <string name="wizard_configure">Torification ��</string>
-  <string name="wizard_configure_msg">Orbotì?? 모ë?  ì? í??리ì¼?ì?´ì?? ë??ë?? ì? í??ë?? ì? í??리ì¼?ì?´ì??ì?? Tor를 í?µí?´ í?µì? í??ë??ë¡? í?  ì?? ì??ì?µë??ë?¤.</string>
-  <string name="wizard_configure_all">모ë?  Appì?´ Tor를 ì?¬ì?©í??기</string>
-  <string name="wizard_configure_select_apps">Tor를 ì??í?´ ê°?ê°?ì?? ì?± ì? í??</string>
-  <string name="wizard_tips_tricks">Orbotì?´ í??ì?±í??ë?? ì?±</string>
-  <string name="wizard_tips_otrchat">Gibberbot - ì??ë??ë¡?ì?´ë??를 ì??í?? ë³´ì?? ì?¸ì?¤í?´í?¸ ë©?ì??ì§? í?´ë?¼ì?´ì?¸í?¸</string>
-  <string name="wizard_tips_proxy">Proxy Settings - Orbotì?´ ì??ë??í??ë??ë¡? ì?±ì?? ì?¤ì ?í??ë?? ë°©ë²?ì?? ë°°ì?°ê¸°</string>
   <string name="wizard_proxy_help_info">í??ë¡?ì?? ì?¤ì ?</string>
-  <string name="wizard_final">Orbot� ���!</string>
-  <string name="wizard_final_msg">ì ?ì?¸ê³?ì??ì?? ì??ë°±ë§?ëª?ì?? ì?¬ë??ë?¤ì?´ ë?¤ì??í?? ì?´ì? ë¡? Tor를 ì?¬ì?©í?©ë??ë?¤.\n\nì?¸ë¡ ì?¸ê³¼ ë¸?ë¡?ê±°, ì?¸ê¶? ì?´ë??ê°?, ë²? ì§?í?? ì??ì??, êµ°ì?¸, 기ì??, ì?µì??í??ë?? ì ?ê¶?ì?? 국민, 그리고 í??ë²?í?? ì??민 ... 그리고 ì§?ê¸? ë?¹ì? ì?? ì¤?ë¹?í??ê³  ì??ì?µë??ë?¤!</string>
   <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Tor ë?¤í?¸ì??í?¬ì?? ì?±ê³µì ?ì?¼ë¡? ì?°ê²°ë??ì??ì?µë??ë?¤. í??ì§?ë§? ì?´ê²?ì?? ê·?í??ì?? ì?¥ì¹?ê°? ì??ì ?í??ë?¤ë?? ì??미ê°? ì??ë??ë??ë?¤. ê·?í??ì?? ë¸?ë?¼ì?°ì ?를 í??ì?¤í?¸í??기 ì??í?´ ë©?ë?´ì??ì?? \'í??ì?¸\' ì?µì??ì?? ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤.\n\në?? ë§?ì?? ì ?ë³´ê°? í??ì??í??ì??ë©´, https://guardianproject.info/apps/orbot ì?? 방문í??ì??ê±°ë??, help@xxxxxxxxxxxxxxxxxxxxë¡? ì?´ë©?ì?¼ì?? ë³´ë?´ì£¼ì?­ì??ì?¤.</string>
-  <string name="tor_check">Orbotì?´ ì ?ì??ì ?ì?¼ë¡? ì?¤ì ?ë??ì??ê³  Torì?? ì?°ê²°ë??ì??ë??ì§? í??ì?¸í??기 ì??í?´ ì?´ê²?ì?? https://check.torproject.org ì?? ê·?í??ì?? ì?¹ ë¸?ë?¼ì?°ì ¸ì?? ì?´ë¦¬ê²? í?  ê²?ì??ë??ë?¤.</string>
-  <string name="pref_hs_group">í??ë?  ì??ë¹?ì?¤ í?¸ì?¤í??</string>
   <string name="pref_general_group">��</string>
-  <string name="pref_start_boot_title">ë¶?í?¸ ì?? Orbot ì??ì??</string>
-  <string name="pref_start_boot_summary">ì??ë??ë¡?ì?´ë?? ì?¥ì¹?ê°? ì??ì??í?  ë?? ì??ë??ì ?ì?¼ë¡? Orbotì?? ì??ì??í??ê³  Torì?? ì?°ê²°</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbotì?? Tor를 ì??ë??ë¡?ì?´ë??ë¡? ê°?ì ¸ì?µë??ë?¤!\n\nTorë?? 컨í??츠 í??í?°ë§?, í?¸ë??í?½ ë¶?ì??, 기ë°? ì ?ë³´ì?? ê°?ì?¸ ê´?ê³?, ì?¬í??í??ì?? ì??í??í??ë?? ë?¤í?¸ì??í?¬ ê°?ì??ì?? ë??í?­í??ë??ë¡? í?´ ì¤?ë??ë?¤.\n\nì?´ ë§?ë²?ì?¬ë?? Orbotê³¼ Tor를 ê·?í??ì?? ì?¥ì¹?ì?? ì?¤ì ?í??ë?? ê²?ì?? ë??ì??ì¤? ê²?ì??ë??ë?¤.</string>
   <!--Warning screen-->
   <string name="wizard_warning_title">경고</string>
   <!--Permissions screen-->
-  <string name="wizard_permissions_title">ê¶?í??</string>
   <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbotì?´ í??ì?±í??ë?? ì?¥ì¹?</string>
-  <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
-  <string name="wizard_tips_orweb">Orweb: Tor를 í?µí?´ ì??ë??í??ë?? ë³´ì?? ê°?í?? ë¸?ë?¼ì?°ì ?</string>
-  <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
-  <string name="button_grant_superuser">ì??í?¼ì? ì ¸ ê¶?í?? ì??ì²­</string>
-  <string name="pref_select_apps">ì?± </string>
-  <string name="pref_node_configuration_summary">ê·?í??ì?? ì?µëª?ì?±ì?? ê°?ì??ì??í?¬ ì?? ì??ë?? ê³ ê¸? ì?¤ì ?ì?´ ì??ì?µë??ë?¤.</string>
+  <string name="wizard_transproxy_none">ì??ì??</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_summary">í??ë¡?ì?? ì??ë²?를 ì??í?? ì?¬ì?©ë??ë?? í??ë¡?í? ì½? : HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">í??ë¡?ì?? í??ì?? ì??ë ¥</string>
-  <string name="pref_proxy_host_summary">í??ë¡?ì?? ì??ë²? í?¸ì?¤í?¸ë?¤ì??</string>
-  <string name="pref_proxy_host_dialog">í??ë¡?ì?? í?¸ì?¤í?¸ ì??ë ¥</string>
-  <string name="pref_proxy_port_summary">ì??ë²? í?¬í?¸ ì??ë ¥</string>
-  <string name="pref_proxy_port_dialog">í??ë¡?ì?? í?¬í?¸ ì??ë ¥</string>
   <string name="status">ì??í??</string>
-  <string name="couldn_t_start_tor_process_">Tor í??ë¡?ì?¸ì?¤ ì??ì?? ë¶?ê°?ë?¥:  </string>
-  <string name="bridge_error">�릿� ��</string>
-  <string name="bridge_requires_ip">ë¸?릿ì§? 기ë?¥ì?? ì?¬ì?©í??기 ì??í?´ì??, ìµ?ì??í?? 1ê°? ì?´ì??ì?? ë¸?릿ì§? IP 주ì??ê°? í??ì??í?©ë??ë?¤.</string>
   <string name="error">��</string>
-  <string name="exit_nodes">ì¶?구 ë?¸ë??</string>
-  <string name="bridges">ì¤?ê³?ì??ë²?</string>
-  <string name="use_bridges">ì¤?ê³?ì??ë²? ì?¬ì?©</string>
-  <string name="ip_address_and_port_of_bridges">ì¤?ê³?ì??ë²?ì?? IP 주ì??ì?? </string>
-  <string name="enter_bridge_addresses">ì¤?ê²?ì??ë²? 주ì?? ì??ë ¥</string>
-  <string name="relays">ì¤?ê³?ì??ë²?</string>
-  <string name="relaying">��</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">ê·?í??ì?? ì?¥ì¹?를 ì¶?구ê°? ì??ë?? ì¤?ê³?ì??ë²?ë¡? í??ì?±í??</string>
-  <string name="relay_port">�� ��</string>
-  <string name="listening_port_for_your_tor_relay">ê·?í??ì?? Tor ì¤?ê³?ì??ë²?를 ì??í?? Listening í?¬í?¸</string>
-  <string name="relay_nickname">ì¤?ê³?ì??ë²? ë³?ëª?</string>
-  <string name="the_nickname_for_your_tor_relay">ê·?í??ì?? ì¤?ê³?ì??ë²?를 ì??í?? ë³?ëª?</string>
-  <string name="enter_a_custom_relay_nickname">ì??ì??ì?? ì¤?ê³?ì??ë²? ë³?ëª?ì?? ì??ë ¥</string>
-  <string name="enable_hidden_services">í??ë?  ì??ë¹?ì?¤ í?¸ì?¤í??</string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string>
-  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
-  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string>
-  <string name="default_bridges"/>
-  <string name="powered_by">í? ë¥´ í??ë¡?ì ?í?¸ì?? ì??í?´ 구ë??  </string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">ì?¤ì ? ì ?ì?¥í??기</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 1cc58d4..785a81d 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -5,11 +5,11 @@
   <string name="default_web_url">http://check.torproject.org</string>
   <string name="secure_default_web_url">https://check.torproject.org</string>
   <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">startÄ?t un apturÄ?t Tor</string>
+  <string name="control_permission_label">uzsÄ?kt un apturÄ?t Tor</string>
   <string name="tor_proxy_service_process">torproxyservice</string>
   <string name="status_starting_up">Orbot startÄ?...</string>
   <string name="status_activated">Izveidots savienojums ar Tor tīklu</string>
-  <string name="status_disabled">\"Orbot ir deaktivÄ?ts</string>
+  <string name="status_disabled">Orbot ir deaktivÄ?ts</string>
   <string name="status_shutting_down">Orbot izslÄ?dzas</string>
   <string name="tor_process_starting">StartÄ? Tor klientu...</string>
   <string name="tor_process_complete">pabeidz.</string>
@@ -25,8 +25,8 @@
   <string name="menu_stop">ApturÄ?t</string>
   <string name="menu_about">Par</string>
   <string name="menu_wizard">Vednis</string>
-  <string name="main_layout_download">LejupielÄ?de (Ä?trums/kopÄ?)</string>
-  <string name="main_layout_upload">AugÅ¡upielÄ?de (Ä?trums/kopÄ?)</string>
+  <string name="main_layout_download">LejupielÄ?de</string>
+  <string name="main_layout_upload">AugÅ¡upielÄ?de</string>
   <string name="button_help">Palīdzība</string>
   <string name="button_close">AizvÄ?rt</string>
   <string name="button_about">Par</string>
@@ -75,16 +75,19 @@
   <string name="wizard_tips_otrchat">Gibberbot - DroÅ¡s Android\'a tÅ«lÄ«tÄ?jÄ?s ziÅ?ojumapmaiÅ?as klients</string>
   <string name="wizard_tips_proxy">Starpnieka iestatÄ«jumi - Uzzini kÄ? konfigurÄ?t lietotnes, lai tÄ?s strÄ?dÄ?tu ar Orbot</string>
   <string name="wizard_tips_duckgo">MeklÄ?tÄ?jprogrammas Duckduckgo lietotne</string>
+  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
   <string name="wizard_tips_firefox">Firefox ar Proxy Mobile pievienojumu (papildu instalÄ?Å¡ana vÄ?lÄ?k)</string>
+  <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
   <string name="wizard_tips_twitter">Twitter atbalsta http starpnieku \"localhost:8118\"</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Starpnieka iestatījumi</string>
-  <string name="wizard_proxy_help_msg">Ja izmantotÄ? Android lietotne spÄ?j nodroÅ¡inÄ?t HTTP vai SOCKS starpnieku lietoÅ¡anu, tad lietotni ir ir iespÄ?jams konfigurÄ?t lai to savienotu ar Orbot un izmantotu Tor.\n\n\n    Resursdatora iestatÄ«jumi ir 127.0.0.1 vai \"localhost\". HTTP porta iestatÄ«jums ir 8118. SOCKS\'am starpnieks ir 9050. PÄ?c iespÄ?jas izmantojiet SOCKS4A vai SOCKS5.\n    \n\n\n    VairÄ?k uzzinÄ?t par starpniekoÅ¡anu izmantojot Android var iepazÄ«stoties ar atbildÄ?m, kuras sagatavotas biežÄ?k uzdotiem jautÄ?jumiem jeb Frequently Asked Questions, FAQ tÄ«mekļa vietnÄ?: http://tinyurl.com/proxyandroid\n    </string>
+  <string name="wizard_proxy_help_msg">Ja izmantotÄ? Android lietotne spÄ?j nodroÅ¡inÄ?t HTTP vai SOCKS starpnieku lietoÅ¡anu, tad lietotni ir ir iespÄ?jams konfigurÄ?t lai to savienotu ar Orbot un izmantotu Tor.\n\n\n    ViesotÄ?ja iestatÄ«jumi ir 127.0.0.1 vai \"localhost\". HTTP porta iestatÄ«jums ir 8118. SOCKS\'am starpnieks ir 9050. PÄ?c iespÄ?jas izmantojiet SOCKS4A vai SOCKS5.\n    \n\n\n    VairÄ?k uzzinÄ?t par starpniekoÅ¡anu izmantojot Android var iepazÄ«stoties ar atbildÄ?m, kuras sagatavotas biežÄ?k uzdotiem jautÄ?jumiem jeb FAQ tÄ«mekļa vietnÄ?: http://tinyurl.com/proxyandroid\n    </string>
   <string name="wizard_final">Orbot ir gatavs darbam!</string>
   <string name="wizard_final_msg">Simtiem tÅ«kstoÅ¡u ļaužu visÄ? pasaulÄ? lieto Tor dažÄ?diem mÄ?rÄ·iem.\n\nŽurnÄ?listi un emuÄ?ru autori, cilvÄ?ktiesÄ«bu aizstÄ?vji, likumsargi, karavÄ«ri, korporÄ?cijas, apspiestÄ«bÄ? dzÄ«vojuÅ¡i iedzÄ«votÄ?ji, un vienkÄ?rÅ¡i parasti cilvÄ?ki .. un tagad arÄ« JÅ«s to varatl!</string>
   <!--END Welcome Wizard strings (DJH)-->
   <string name="connect_first_time">Esat sekmÄ«gi izveidojis savienojumu ar tÄ«klu Tor - taÄ?u tas vien NEnozÄ«mÄ?, ka JÅ«su ierÄ«ce ir droÅ¡Ä«bÄ?. Lai pÄ?rbaudÄ«tu savu pÄ?rlÅ«ku, no izvÄ?lnes izraugieties izvÄ?li \'PÄ?rbaudÄ«t\'. \n\nApmeklÄ?jiet mÅ«s https://guardianproject.info/apps/orbot vai sÅ«tiet e-pastu uz help@xxxxxxxxxxxxxxxxxxxx , lai uzzinÄ?tu vairÄ?k.</string>
   <string name="tor_check">Å Ä« darbÄ«ba tÄ«mekļa pÄ?rlÅ«kÄ? atvÄ?rs https://check.torproject.org , lai redzÄ?tu vai Orbot ir konfigurÄ?ts un esat izveidojies savienojumu ar Tor.</string>
-  <string name="pref_hs_group">SlÄ?ptu pakalpojumu mitinÄ?Å¡ana</string>
+  <string name="pref_hs_group">SlÄ?ptu pakalpojumu viesoÅ¡ana</string>
   <string name="pref_general_group">VispÄ?rÄ«gi</string>
   <string name="pref_start_boot_title">StartÄ?t Orbot, kad ielÄ?dÄ?jas</string>
   <string name="pref_start_boot_summary">AutomÄ?tiski startÄ?t Orbot, un veidot savienojumu ar Tor, kad JÅ«su Android ierÄ«ce ielÄ?dÄ?jas</string>
@@ -105,6 +108,8 @@
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
   <string name="wizard_tips_orweb">Orweb: PÄ?rlÅ«ks ar uzlabotu privÄ?tumu un kurÅ¡ strÄ?dÄ? caur Tor tÄ«klu</string>
   <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
+  <string name="wizard_tips_play">Visas Guardian Project\'a lietotnes atrodamas Google Play\'Ä?</string>
+  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
@@ -114,8 +119,8 @@
   <string name="wizard_transproxy_msg">Å is ļauj JÅ«su lietotnÄ?m automÄ?tiski, bez jebkÄ?das papildu konfigurÄ?cijas darboties caur Tor tÄ«klu.</string>
   <string name="wizard_transproxy_hint">(AtzÄ«mÄ?jiet Å¡o kastÄ«ti gadÄ«jumÄ? ja Jums nav ne mazÄ?kÄ?s nojausmas par to, ko mÄ?s te runÄ?jam)</string>
   <string name="wizard_transproxy_none">Neviens</string>
-  <string name="pref_transparent_tethering_title">Tor tuvapraide</string>
-  <string name="pref_transparent_tethering_summary">IespÄ?jot Tor PÄ?rredzamo starpniekoÅ¡anu Wifi un USB tuvapraides ierÄ«cÄ?m (nepiecieÅ¡ams pÄ?rstartÄ?t)</string>
+  <string name="pref_transparent_tethering_title">Tor valgošana</string>
+  <string name="pref_transparent_tethering_summary">IespÄ?jot Tor PÄ?rredzamo starpniekoÅ¡anu Wifi\'m un USB valgoÅ¡anas ierÄ«cÄ?m (nepiecieÅ¡ams pÄ?rstartÄ?t)</string>
   <string name="button_grant_superuser">PieprasÄ«t superlietotÄ?ja piekļuvi</string>
   <string name="pref_select_apps">IzvÄ?lÄ?ties lietotnes</string>
   <string name="pref_select_apps_summary">IzvÄ?lÄ?ties lietotnes, lai marÅ¡rutÄ?tu caur Tor</string>
@@ -130,9 +135,9 @@
   <string name="pref_proxy_type_title">Ä?rvÄ?rstÄ? starpnieka tips</string>
   <string name="pref_proxy_type_summary">Starpnieka serverim izmantojamais protokols: HTTP, HTTPS, Socks4, Socks5</string>
   <string name="pref_proxy_type_dialog">Ievadiet starpnieka tipu</string>
-  <string name="pref_proxy_host_title">Ä?rvÄ?rstÄ? starpnieka mitinÄ?tÄ?js</string>
-  <string name="pref_proxy_host_summary">Starpniekservera mitinÄ?tÄ?jvÄ?rds</string>
-  <string name="pref_proxy_host_dialog">Ievadiet starpnieka mitinÄ?tÄ?ju</string>
+  <string name="pref_proxy_host_title">Ä?rvÄ?rstÄ? starpnieka viesotÄ?js</string>
+  <string name="pref_proxy_host_summary">Starpniekservera viesotÄ?jvÄ?rds</string>
+  <string name="pref_proxy_host_dialog">Ievadiet starpnieka viesotÄ?ju</string>
   <string name="pref_proxy_port_title">Ä?rvÄ?rstÄ? starpnieka ports</string>
   <string name="pref_proxy_port_summary">Starpniekservera ports</string>
   <string name="pref_proxy_port_dialog">Ievadiet starpnieka portu</string>
@@ -140,7 +145,7 @@
   <string name="setting_up_full_transparent_proxying_">Iestata pilnÄ«bÄ? pÄ?rredzamu starpniekoÅ¡anu...</string>
   <string name="setting_up_app_based_transparent_proxying_">Iestata lietotÅ?u nodroÅ¡inÄ?tu starpniekoÅ¡anu...</string>
   <string name="transparent_proxying_enabled">PÄ?rredzama starpniekoÅ¡ana IESPÄ?JOTA</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy iespÄ?jots tuvapraidei!</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy iespÄ?jots valgoÅ¡anai!</string>
   <string name="warning_error_starting_transparent_proxying_">BRĪDINÄ?JUMS: kļūda uzsÄ?kot pÄ?rredzamu starpniekoÅ¡anu!</string>
   <string name="transproxy_rules_cleared">TransProxy kÄ?rtulas notÄ«rÄ«tas</string>
   <string name="couldn_t_start_tor_process_">NeizdevÄ?s palaist Tor\'a procesu:</string>
@@ -181,7 +186,7 @@
   <string name="reachable_ports">Sasniedzamie porti</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Porti, kuri sasniedzami otrpus ierobežojoša ugunsmūra</string>
   <string name="enter_ports">Ievadiet portus</string>
-  <string name="enable_hidden_services">SlÄ?ptu pakalpojumu mitinÄ?Å¡ana</string>
+  <string name="enable_hidden_services">SlÄ?ptu pakalpojumu viesoÅ¡ana</string>
   <string name="run_servers_accessible_via_the_tor_network">ļaut no tÄ«kla Tor piekļūt serverim, kurÅ¡ ir ierÄ«cÄ?.  </string>
   <string name="enter_localhost_ports_for_hidden_services">ievadiet slÄ?pto pakalpojumu localhost portus</string>
   <string name="hidden_service_ports">SlÄ?ptu pakalpojumu porti</string>
@@ -209,7 +214,7 @@
   <string name="pref_use_persistent_notifications">VienmÄ?r paturÄ?t ikonu rÄ«kjoslÄ?, kad Orbot ir savienots</string>
   <string name="pref_use_persistent_notifications_title">VienmÄ?r ieslÄ?gtie paziÅ?ojumi</string>
   <string name="notification_using_bridges">Tilti ir iespÄ?joti!</string>
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="set_locale_title">Iestatiet lokalizÄ?ciju</string>
   <string name="set_locale_summary">Iestatiet Orbot lokalizÄ?ciju un valodu</string>
   <string name="wizard_locale_title">IzvÄ?lÄ?ties valodu</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index ce0bcb9..4b319fe 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -11,6 +11,8 @@
   <string name="status_activated">Ð?овÑ?зан на мÑ?ежаÑ?а ТоÑ?</string>
   <string name="status_disabled">\"Ð?Ñ?боÑ? е дезакÑ?ивиÑ?ан</string>
   <string name="status_shutting_down">Ð?Ñ?боÑ? Ñ?е иÑ?клÑ?Ñ?Ñ?ва</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>
@@ -92,8 +94,9 @@
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">ТÑ?анÑ?паÑ?енÑ?но пÑ?окÑ?и</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="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="powered_by">напоÑ?Ñ?вано од пÑ?оекÑ?оÑ? ТоÑ?</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 1a16594..0aafb9a 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -203,7 +203,7 @@
   <string name="pref_use_persistent_notifications">Sentiasa biar ikon pada toolbar apabila Orbot bersambung</string>
   <string name="pref_use_persistent_notifications_title">Sentiasa On Notifikasi</string>
   <string name="notification_using_bridges">Jambatan dibenarkan!</string>
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="set_locale_title">Tetapan Tempatan</string>
   <string name="set_locale_summary">Pilihan tempatan dan bahasa untuk Orbot</string>
   <string name="wizard_locale_title">Pilih Bahasa</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index c2a5e2d..cbacdd7 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -1,214 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Orbot</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>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">start and stop Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot is starting...</string>
-  <string name="status_activated">Connected to the Tor network</string>
-  <string name="status_disabled">\"Orbot is Deactivated</string>
-  <string name="status_shutting_down">Orbot is shutting down</string>
-  <string name="tor_process_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>
-  <string name="menu_settings">Settings</string>
-  <string name="menu_log">Log</string>
-  <string name="menu_info">Help</string>
-  <string name="menu_apps">Apps</string>
-  <string name="menu_start">Start</string>
-  <string name="menu_stop">Stop</string>
-  <string name="menu_about">About</string>
-  <string name="menu_wizard">Wizard</string>
-  <string name="button_help">Help</string>
-  <string name="button_close">Close</string>
-  <string name="button_about">About</string>
-  <string name="button_clear_log">Clear Log</string>
-  <string name="menu_verify">Check</string>
-  <string name="menu_exit">Exit</string>
-  <string name="press_to_start">- long press to start -</string>
-  <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string>
-  <string name="pref_trans_proxy_title">Transparent Proxying</string>
-  <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string>
-  <string name="pref_transparent_all_title">Tor Everything</string>
-  <string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string>
-  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
-  <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
-  <string name="pref_transparent_port_title">Port List</string>
-  <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
-  <string name="pref_transparent_port_dialog">Enter ports to proxy</string>
-  <string name="pref_has_root">Request Root Access</string>
-  <string name="pref_has_root_summary">Request root access for transparent proxying</string>
-  <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">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="menu_home">á??á??á?ºá?? á??á?¬á??á?»á??á?ºá??á?¾á?¬</string>
+  <string name="menu_browse">á??á?½á??á?ºá?·á??á?¼á??á?ºá?·á??á??á?º</string>
+  <string name="menu_settings">á??á?»á?­á??á?ºá??á?¾á?­á??á?»á??á?ºá??á?»á?¬á?¸</string>
+  <string name="menu_info">á?¡á??á?°á?¡á??á?®</string>
+  <string name="menu_about">á?¡á??á?¼á?±á?¬á??á?ºá?¸</string>
+  <string name="button_help">á?¡á??á?°á?¡á??á?®</string>
+  <string name="button_close">á??á?­á??á?ºá??á??á?º</string>
+  <string name="button_about">á?¡á??á?¼á?±á?¬á??á?ºá?¸</string>
+  <string name="menu_exit">á??á?½á??á?ºá??á??á?º</string>
+  <string name="btn_back">á??á?±á?¬á??á?ºá??á?­á?¯á?·</string>
+  <string name="btn_cancel">á??á?»á??á?ºá??á?­á??á?ºá?¸á??á??á?º</string>
   <!--Welcome Wizard strings (DJH)-->
-  <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>
-  <string name="wizard_permissions_stock">Orbot Permissions</string>
-  <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 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">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_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\n    The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n    \n\n\n    You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n    </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.\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="wizard_proxy_help_info">á??á??á?±á?¬á??á?ºá??á?® á??á?»á?­á??á?ºá??á?¾á?­á??á?»á??á?ºá??á?»á?¬á?¸</string>
   <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help@xxxxxxxxxxxxxxxxxxxx to learn more.</string>
-  <string name="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 Service Hosting</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="pref_general_group">á??á?±á??á?¯á??á?»</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
-  <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>
   <!--Warning screen-->
-  <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_warning_title">á??á??á?­á??á?±á?¸á??á?»á??á?º</string>
   <!--Permissions screen-->
-  <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 does not appear to be rooted or provide \'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>
   <!--TipsAndTricks screen-->
-  <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_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
-  <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 (requires restart)</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="wizard_transproxy_none">á??á?¬á??á?¾á??á??á?¾á?­</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_title">Outbound Network Proxy</string>
-  <string name="pref_proxy_type_title">Outbound 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">Outbound 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">Outbound Proxy Port</string>
-  <string name="pref_proxy_port_summary">Proxy server port</string>
-  <string name="pref_proxy_port_dialog">Enter Proxy port</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying...</string>
-  <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string>
-  <string name="transproxy_rules_cleared">TransProxy rules cleared</string>
-  <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string>
-  <string name="privoxy_is_running_on_port_">Privoxy is running on port: </string>
-  <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string>
-  <string name="bridge_error">Bridge Error</string>
-  <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string>
-  <string name="send_email_for_bridges">Send an email to bridges@xxxxxxxxxxxxxx with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string>
-  <string name="error">Error</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string>
-  <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string>
-  <string name="exit_nodes">Exit Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string>
-  <string name="enter_exit_nodes">Enter Exit Nodes</string>
-  <string name="exclude_nodes">Exclude Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string>
-  <string name="enter_exclude_nodes">Enter Exclude Nodes</string>
-  <string name="strict_nodes">Strict Nodes</string>
-  <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string>
-  <string name="bridges">Bridges</string>
-  <string name="use_bridges">Use Bridges</string>
-  <string name="bridges_obfuscated">Obfuscated Bridges</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string>
-  <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string>
-  <string name="enter_bridge_addresses">Enter Bridge Addresses</string>
-  <string name="relays">Relays</string>
-  <string name="relaying">Relaying</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Enable your device to be a non-exit relay</string>
-  <string name="relay_port">Relay Port</string>
-  <string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string>
-  <string name="enter_or_port">Enter OR port</string>
-  <string name="relay_nickname">Relay nickname</string>
-  <string name="the_nickname_for_your_tor_relay">The nickname for your Tor relay</string>
-  <string name="enter_a_custom_relay_nickname">Enter a custom relay nickname</string>
-  <string name="reachable_addresses">Reachable Addresses</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Run as a client behind a firewall with restrictive policies</string>
-  <string name="reachable_ports">Reachable ports</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string>
-  <string name="enter_ports">Enter ports</string>
-  <string name="enable_hidden_services">Hidden Service Hosting</string>
-  <string name="run_servers_accessible_via_the_tor_network">allow on-device server to be accessible via the Tor network</string>
-  <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string>
-  <string name="hidden_service_ports">Hidden Service Ports</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string>
-  <string name="project_home">Project Home(s): </string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">The Tor License</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3rd-Party-Software: </string>
-  <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string>
-  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
-  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
-  <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string>
-  <string name="found_existing_tor_process">found existing Tor process...</string>
-  <string name="something_bad_happened">Something bad happened. Check the log</string>
-  <string name="hidden_service_on">hidden service on:</string>
-  <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string>
-  <string name="unable_to_start_tor">Unable to start Tor:</string>
-  <string name="pref_use_sys_iptables_title">Use Default Iptables</string>
-  <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string>
-  <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string>
-  <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string>
-  <string name="pref_use_persistent_notifications_title">Always-On Notifications</string>
-  <string name="notification_using_bridges">Bridges enabled!</string>
-  <string name="default_bridges"/>
-  <string name="set_locale_title">Set Locale</string>
-  <string name="set_locale_summary">Choose the locale and language for Orbot</string>
-  <string name="wizard_locale_title">Choose Language</string>
-  <string name="wizard_locale_msg">Leave default or switch the current language</string>
-  <string name="powered_by">powered by The Tor Project  </string>
-  <string name="btn_save_settings">Save Settings</string>
+  <string name="status">á?¡á??á?±á?¡á??á?¬á?¸</string>
+  <string name="error">á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?º</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">á??á?»á?­á??á?ºá??á?¾á?­á??á?»á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á??á?­á??á?ºá?¸á??á??á?ºá?¸á??á??á?º</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index c0ab256..cef8f4e 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -25,16 +25,30 @@
   <string name="menu_stop">Stopp</string>
   <string name="menu_about">About</string>
   <string name="menu_wizard">Wizard</string>
+  <string name="main_layout_download">Nedlasting</string>
+  <string name="main_layout_upload">Opplasting</string>
   <string name="button_help">Hjelp</string>
   <string name="button_close">Avslutt</string>
   <string name="button_about">Om</string>
   <string name="button_clear_log">Slett Logg</string>
   <string name="menu_verify">Check</string>
   <string name="menu_exit">Exit</string>
+  <string name="press_to_start">- trykk lenge for å starte -</string>
+  <string name="pref_trans_proxy_group">Transparent Proxy (Krever Root)</string>
+  <string name="pref_trans_proxy_title">Transparent Proxy</string>
+  <string name="pref_trans_proxy_summary">Automatisk Torifisering av apps</string>
   <string name="pref_transparent_all_title">Tor All Trafikk</string>
+  <string name="pref_transparent_all_summary">Proxytrafikk for alle apper gjennom Tor</string>
+  <string name="pref_transparent_port_fallback_title">Proxyport fallback</string>
+  <string name="pref_transparent_port_fallback_summary">ADVARSEL: Omgår vanlige porter (80, 443, etc). *KUN BRUK* hvis \'Alle\'- eller \'App\'-modus ikke virker.</string>
   <string name="pref_transparent_port_title">Port Liste</string>
+  <string name="pref_transparent_port_summary">Liste over porter som skal gjennom proxy. *KUN BRUK* hvis \'Alle\'- eller \'App\'-modus ikke virker.</string>
+  <string name="pref_transparent_port_dialog">Angi porter som skal gjennom proxy</string>
   <string name="pref_has_root">Request Root Access</string>
   <string name="pref_has_root_summary">&gt;Request root access for transparent proxying</string>
+  <string name="status_install_success">Suksess! Tor-binærene ble installert.</string>
+  <string name="status_install_fail">Tors binærfiler kunne ikke installeres. Vennligst sjekk loggen og informer tor-assistants@xxxxxxxxxxxxxx</string>
+  <string name="title_error">Applikasjonsfeil</string>
   <string name="wizard_title">Orbot</string>
   <string name="wizard_btn_tell_me_more">Om Orbot</string>
   <string name="btn_next">Neste</string>
@@ -43,6 +57,7 @@
   <string name="btn_okay">Ok</string>
   <string name="btn_cancel">Avbryt</string>
   <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Informasjon om Orbot</string>
   <string name="wizard_details_msg">Orbot er åpen programvare som inneholder Tor, LibEvent og Privoxy.  Det leverer en lokal HTTP proxy (8118) og en SOCKS proxy (9050) tilkobling til Tor nettverket. Orbot kan også, med rot-tilgang, sende all internett-trafikk gjennom Tor.</string>
   <string name="wizard_permissions_root">Tilgang Innvilget</string>
   <string name="wizard_permissions_stock">Orbot Tilgangsnivåer</string>
@@ -51,28 +66,159 @@
   <string name="wizard_permissions_no_root">Hvis du ikke har rot-tilgang (eller ikke aner hva vi snakker om), sørg ihvertfall for å bruke programmer som er kompatible med Orbot.</string>
   <string name="wizard_permissions_consent">Jeg forstår og ønsker å fortsette uten Superbruker.</string>
   <string name="wizard_permission_enable_root">Gi Orbot tilgang.</string>
+  <string name="wizard_configure">Konfigurer Torification</string>
+  <string name="wizard_configure_msg">Orbot gir deg muligheten til å sende all applikasjons-trafikk gjennom Tor ELLER å velge applikasjonene individuelt.</string>
+  <string name="wizard_configure_all">Proxytrafikk for alle apper gjennom Tor</string>
+  <string name="wizard_configure_select_apps">Velg individuelle apps som skal brukes med Tor</string>
+  <string name="wizard_tips_tricks">Orbot-aktiverte apps</string>
+  <string name="wizard_tips_msg">Appene under er utviklet for å fungere sammen med Orbot. Klikk på hver enkelt for å installere nå, eller du kan finne dem senere på Google Play, på nettsiden GuardianProject.info eller via F-Droid.org</string>
+  <string name="wizard_tips_otrchat">Gibberbot - Sikker lynmeldingsklient til Android</string>
+  <string name="wizard_tips_proxy">Proxy-innstillinger - Lær hvordan du konfigurerer apper til å fungere med Orbot</string>
+  <string name="wizard_tips_duckgo">DuckDuckGo søkemotor app</string>
+  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+  <string name="wizard_tips_firefox">Proxy Mobile tillegg til Firefox (http://tinyurl.com/getproxymob)</string>
+  <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
+  <string name="wizard_tips_twitter">Sett Twitters proxy til \"localhost\" og port 8118</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
+  <string name="wizard_proxy_help_info">Proxyinnstillinger</string>
+  <string name="wizard_proxy_help_msg">Hvis Android-appen du bruker støtter bruken av en HTTP- eller SOCKS-proxy, så kan du konfigurere den til å koble til Orbot og bruke Tor.\n\n\nVertens innstillinger er 127.0.0.1 eller \"localhost\". For HTTP er porten 8118. For SOCKS er proxyen 9050. Du kan bruke SOCKS4A eller SOCKS5 om mulig.\n\n\n\nDu kan lære mer om proxyer på Android i FAQ på: http://tinyurl.com/proxyandroid\n    </string>
   <string name="wizard_final">Orbot er klar!</string>
   <string name="wizard_final_msg">Hundretusener av mennesker over hele verden bruker Tor til en lang rekke forskjellige formål.\n\nJournalister og bloggere, menneskerettighetsforkjempere, politietterforskere, militære, bedrifter, mennesker i undertrykkende regimer, og vanlige borgere...og nå er du klar til å bruke det også!</string>
   <!--END Welcome Wizard strings (DJH)-->
   <string name="connect_first_time">Du er nå tilkoblet Tor-nettverket - men det betyr IKKE at ditt apparat er sikret.  Du kan bruke \"Sjekk\" valget fra menyen for å sjekke din nettleser.\n\nBesøk oss på https://guardianproject.info/apps/orbot eller send en email til help@xxxxxxxxxxxxxxxxxxxx for å få vite mer.</string>
   <string name="tor_check">Dette vil åpne din nettleser på https://check.torproject.org og sjekke om Orbot er riktig innstilt og om du er koblet til Tor.</string>
+  <string name="pref_hs_group">Hidden service hosting</string>
   <string name="pref_general_group">Generelt</string>
+  <string name="pref_start_boot_title">Start Orbot ved oppstart</string>
   <string name="pref_start_boot_summary">Start Orbot og Tor automatisk når din Android starter opp.</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <string name="wizard_title_msg">Orbot bringer Tor til Android!\n\nTor hjelper deg med å forsvare deg mot innholdsfiltrering, trafikkanalyse og nettverksovervåkning som kan true ditt personvern, din konfidensielle informasjon og dine personlige forhold.\n\nDenne steg-for-steg guiden hjelper deg med å konfigurere Orbot og Tor på ditt apparat.</string>
   <!--Warning screen-->
   <string name="wizard_warning_title">Advarsel</string>
+  <string name="wizard_warning_msg">Installering av Orbot vil ikke automatisk anonymisere mobiltrafikken din.\n\nDu må konfigurere Orbot skikkelig for å bruke enheten og andre apper med Tor.</string>
   <!--Permissions screen-->
+  <string name="wizard_permissions_title">Tillatelser</string>
+  <string name="wizard_permissions_root_msg1">Du kan velge å gi Orbot \'Superuser\'-tilgang for å aktivere avanserte instillinger, som Transparent Proxy.</string>
+  <string name="wizard_permissions_root_msg2">Hvis du ikke vil dette, sørg for å bruke appene som er lagd for å virke med Orbot</string>
+  <string name="wizard_permissions_no_root_msg">Enheten din ser ikke ut til ha root eller gi \'Superuser\'-tilgang.\n\nFor å utnytte Tor fullt ut, må du bruke apper som er lagd for å fungere med Orbot, eller som støtter HTTP eller SOCKS-proxy innstillinger.\n\n\n</string>
   <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot-aktiverte apps</string>
+  <string name="wizard_tips_gibberbot">Gibberbot: Sikker chat app med Off-The-Record kryptering</string>
+  <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string>
+  <string name="wizard_tips_orweb">Orweb: Personverns-forsterket nettleser som virker gjennom Tor</string>
   <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
+  <string name="wizard_tips_play">Finn alle apps fra Guardian Project på Google Play</string>
+  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparent Proxy</string>
+  <string name="wizard_transproxy_msg">Dette tillater appene dine å automatisk kjøre gjennom Tor-nettverket uten konfigurasjon</string>
+  <string name="wizard_transproxy_hint">(Kryss av i denne boksen hvis du ikke har peiling på hva vi snakker om)</string>
   <string name="wizard_transproxy_none">Ingen</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Aktiver Tor Transparent Proxy for Wifi og USB Tethered enheter (krever omstart)</string>
+  <string name="button_grant_superuser">Krev superbruker tilgang</string>
+  <string name="pref_select_apps">Velg apps</string>
+  <string name="pref_select_apps_summary">Velg apper som skal sendes gjennom Tor</string>
+  <string name="pref_node_configuration">Node konfigurering</string>
+  <string name="pref_node_configuration_summary">Dette er avanserte innstillinger som kan redusere anonymiteten din</string>
+  <string name="pref_entrance_node">Inngangsnoder</string>
+  <string name="pref_entrance_node_summary">Fingeravtrykk, kallenavn, land og adresser til første hoppet</string>
+  <string name="pref_entrance_node_dialog">Angi inngangsnoder</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="default_bridges"/>
+  <string name="pref_proxy_title">Utgående nettverksproxy</string>
+  <string name="pref_proxy_type_title">Utgående proxytype</string>
+  <string name="pref_proxy_type_summary">Protokoller som skal brukes med proxyserver: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Angi proxytype</string>
+  <string name="pref_proxy_host_title">Utgående proxyvert</string>
+  <string name="pref_proxy_host_summary">Proxyserverens vertsnavn</string>
+  <string name="pref_proxy_host_dialog">Angi proxyvert</string>
+  <string name="pref_proxy_port_title">Utgående proxyport</string>
+  <string name="pref_proxy_port_summary">Proxyserverens port</string>
+  <string name="pref_proxy_port_dialog">Angi proxyport</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Konfigurerer full transparent proxy...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Konfigurerer app-basert transparent proxy...</string>
+  <string name="transparent_proxying_enabled">Transparent proxy AKTIVERT</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy aktivert for Tethering!</string>
+  <string name="warning_error_starting_transparent_proxying_">ADVARSEL: Feil under oppstart av transparent proxy!</string>
+  <string name="transproxy_rules_cleared">TransProxy reglene fjernet</string>
+  <string name="couldn_t_start_tor_process_">Kunne ikke starte Tor-prosess:</string>
+  <string name="privoxy_is_running_on_port_">Privoxy kjører på port:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Konfigurerer portbasert transparent proxy...</string>
+  <string name="bridge_error">Brofeil</string>
+  <string name="bridge_requires_ip">For å bruke disse brofunksjonene, må du angi minst en broadresse.</string>
+  <string name="send_email_for_bridges">Send en e-post til bridges@xxxxxxxxxxxxxx med tekstlinjen \"get bridges\" som eneste innhold i en e-post fra en gmail-konto.</string>
+  <string name="error">Feil</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Dine \"adresser som kan nås\"-innstillinger forårsaket et unntak!</string>
+  <string name="your_relay_settings_caused_an_exception_">Relé-innstillingene dine forårsaket et unntak!</string>
+  <string name="exit_nodes">Utgående noder</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingeravtrykk, kallenavn, land og adresser for siste hopp</string>
+  <string name="enter_exit_nodes">Angi utgående noder</string>
+  <string name="exclude_nodes">Ekskluder noder</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fineravtrykk, kallenavn, land og adresser som skal ekskluderes</string>
+  <string name="enter_exclude_nodes">Angi ekskluderte noder</string>
+  <string name="strict_nodes">Strikte noder</string>
+  <string name="use_only_these_specified_nodes">Bruk *bare* disse spesifiserte nodene</string>
+  <string name="bridges">Broer</string>
+  <string name="use_bridges">Bruk broer</string>
+  <string name="bridges_obfuscated">Maskerte broer</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Aktiver alternative inngangsnoder til Tor-nettverket</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Aktiver hvis de konfigurerte broene er maskerte broer</string>
+  <string name="ip_address_and_port_of_bridges">IP-adresser og broporter</string>
+  <string name="enter_bridge_addresses">Angi broadresser</string>
+  <string name="relays">Reléer</string>
+  <string name="relaying">Videresending</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Aktiver enheten din som et relé uten utgående trafikk</string>
+  <string name="relay_port">Relé-port</string>
+  <string name="listening_port_for_your_tor_relay">Porten Tor-reléet ditt lytter på</string>
+  <string name="enter_or_port">Angi OR-port</string>
+  <string name="relay_nickname">Reléets kallenavn</string>
+  <string name="the_nickname_for_your_tor_relay">Kallenavnet på ditt Tor-relé</string>
+  <string name="enter_a_custom_relay_nickname">Angi et egendefinert kallenavn på reléet</string>
+  <string name="reachable_addresses">Adresser som kan nås</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Kjør som en klient bak en brannmur med restriktive regler</string>
+  <string name="reachable_ports">Porter som kan nås</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Porter som kan nås bak en restriktiv brannmur</string>
+  <string name="enter_ports">Angi porter</string>
+  <string name="enable_hidden_services">Hidden service hosting</string>
+  <string name="run_servers_accessible_via_the_tor_network">Tillatt at server på enheten er tilgjengelig via Tor-nettverket</string>
+  <string name="enter_localhost_ports_for_hidden_services">angi localhost-portene til hidden services</string>
+  <string name="hidden_service_ports">Hidden service porter</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">det adresserbare navnet på din hidden service (generert automatisk)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">aktiver feilsøkingslogg for output (må bruke adb eller aLogCat for å vise)</string>
+  <string name="project_home">Prosjektets nettside(r):</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Tor-lisensen</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Tredjepartsprogramvare:</string>
+  <string name="tor_version">Tor v0.2.4.3-alpha: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.1.1-alpha: http://www.monkey.org/~provos/libevent/</string>
+  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
+  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string>
+  <string name="hidden_service_request">En app vil åpne den skjulte tjenesteporten %S til Tor-nettverket. Dette er trygt hvis du stoler på appen. </string>
+  <string name="found_existing_tor_process">fant eksisterende Tor-prosess</string>
+  <string name="something_bad_happened">Noe alvorlig skjedde. Sjekk loggen.</string>
+  <string name="hidden_service_on">hidden service på:</string>
+  <string name="unable_to_read_hidden_service_name">kunne ikke lese hidden service navnet</string>
+  <string name="unable_to_start_tor">Kunne ikke starte Tor:</string>
+  <string name="pref_use_sys_iptables_title">Bruk standard Iptables</string>
+  <string name="pref_use_sys_iptables_summary">bruk de innebygde iptables-binærene istedenfor de som kommer med Orbot</string>
+  <string name="error_installing_binares">Tor-binærene kunne ikke installeres eller oppgraderes.</string>
+  <string name="pref_use_persistent_notifications">Behold ikonet i verktøylinjen mens Orbot er tilkoblet</string>
+  <string name="pref_use_persistent_notifications_title">Alltid-PÃ¥ Varslinger</string>
+  <string name="notification_using_bridges">Broer aktivert!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Angi land</string>
+  <string name="set_locale_summary">Velg landet og språket til Orbot</string>
+  <string name="wizard_locale_title">Velg språk</string>
+  <string name="wizard_locale_msg">Fortsett med standard eller endre til gjeldende språk</string>
+  <string name="powered_by">driftet av Tor-prosjektet</string>
+  <string name="btn_save_settings">Lagre Inntillinger</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index b49ef0a..cd3084e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -214,7 +214,7 @@
   <string name="pref_use_persistent_notifications">Houd icoon in toolbar zolang Orbot verbonden is</string>
   <string name="pref_use_persistent_notifications_title">Meldingen altijd aan</string>
   <string name="notification_using_bridges">Bridges ingeschakeld!</string>
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="set_locale_title">Stel landsinstellingen in</string>
   <string name="set_locale_summary">Kies de landsinstellingen en taal voor Orbot</string>
   <string name="wizard_locale_title">Kies taal</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 3355fd6..25e7504 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -37,6 +37,7 @@
   <string name="pref_transparent_port_title">Lista portów</string>
   <string name="pref_transparent_port_dialog">Wprowadź porty dla proxy</string>
   <string name="pref_has_root">Wymaga dostÄ?pu Root\'a</string>
+  <string name="pref_has_root_summary">Wymaga dostÄ?pu ROOT\'a dla transparent proxying</string>
   <string name="status_install_success">Pliki binarne Tora zainstalowane poprawnie!</string>
   <string name="status_install_fail">Pliki binarne Tora nie mogÅ?y byÄ? zainstalowane. Sprawdź Log i skontaktuj siÄ? z nami mailowo: tor-assistants@xxxxxxxxxxxxxx</string>
   <string name="title_error">BÅ?Ä?d aplikacji</string>
@@ -77,8 +78,11 @@
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparenty Proxing</string>
+  <string name="wizard_transproxy_none">Brak</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="default_bridges"/>
+  <string name="status">Status</string>
+  <string name="default_bridges"></string>
   <string name="powered_by">powered by The Tor Project </string>
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index f7579bc..8adb909 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -25,6 +25,8 @@
   <string name="menu_stop">Parar</string>
   <string name="menu_about">Sobre</string>
   <string name="menu_wizard">Assistente</string>
+  <string name="main_layout_download">Download</string>
+  <string name="main_layout_upload">Upload</string>
   <string name="button_help">Ajuda</string>
   <string name="button_close">Fechar</string>
   <string name="button_about">Sobre</string>
@@ -72,6 +74,12 @@
   <string name="wizard_tips_msg">As apps abaixo foram desenvolvidas para trabalhar com Orbot. Clique em cada botão para instalar agora, ou você pode encontrá-las posteriormente no Android Market.</string>
   <string name="wizard_tips_otrchat">Gibberbot - Cliente de mensagem instantânea seguro para Android</string>
   <string name="wizard_tips_proxy">Configurações de Proxy - Aprenda como configurar apps para trabalhar com Orbot</string>
+  <string name="wizard_tips_duckgo">Ferramenta de Busca DuckDuckGo</string>
+  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+  <string name="wizard_tips_firefox">Aplicativo Proxy Mobile para Firefox (http://tinyurl.com/getproxymob)</string>
+  <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
+  <string name="wizard_tips_twitter">Define o proxy do Twitter para \"localhost\" e a porta 8118</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Configurações de Proxy</string>
   <string name="wizard_proxy_help_msg">Se a app Android que você está usando puder suportar o uso de proxy HTTP ou SOCKS, então você pode configurar para conectar ao Orbot e usar o Tor.\n\n\n    As configurações de host são 127.0.0.1 ou \"localhost\". Para HTTP, a porta configurada é 8118. Para SOCKS, o proxy é 9050. Você deve usar SOCKS4A ou SOCKS5 se possível.\n    \n\n\n    Você pode aprender mais sobre proxy no Android através do FAQ em: http://tinyurl.com/proxyandroid\n    </string>
   <string name="wizard_final">Orbot está pronto!</string>
@@ -100,6 +108,8 @@
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
   <string name="wizard_tips_orweb">Orweb: Navegador de reforço de privacidade que trabalha através do Tor</string>
   <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
+  <string name="wizard_tips_play">Encontre todos os aplicativos da Guardian Project no Google Play</string>
+  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
@@ -204,7 +214,7 @@
   <string name="pref_use_persistent_notifications">Sempre manter o ícone na barra de tarefas quando o Orbot está conectado</string>
   <string name="pref_use_persistent_notifications_title">Notificações Sempre Ligadas</string>
   <string name="notification_using_bridges">Pontes habilitadas!</string>
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="set_locale_title">Selecionar Local</string>
   <string name="set_locale_summary">Escolha o local e idioma para o Orbot</string>
   <string name="wizard_locale_title">Escolha o Idioma</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 3e7f20a..a92e94c 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -11,6 +11,8 @@
   <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_complete">completo.</string>
+  <string name="tor_process_waiting">a aguardar.</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>
@@ -52,10 +54,13 @@
   <string name="wizard_permissions_stock">Permissões do Orbot</string>
   <string name="wizard_permission_enable_root">Autorizar acesso Root para o Orbot</string>
   <string name="wizard_configure">Configurar acesso com Tor</string>
+  <string name="wizard_proxy_help_info">Configurações do Proxy</string>
   <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Geral</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
+  <string name="wizard_warning_title">Aviso</string>
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
@@ -63,8 +68,13 @@
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Proxy Transparente</string>
+  <string name="wizard_transproxy_none">Nenhum</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="default_bridges"/>
+  <string name="status">Estado</string>
+  <string name="error">Erro</string>
+  <string name="default_bridges"></string>
   <string name="powered_by">powered by the Tor Project</string>
+  <string name="btn_save_settings">Salvar as Configurações</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index aa89294..da6feff 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -25,6 +25,8 @@
   <string name="menu_stop">Ð?Ñ?Ñ?ановиÑ?Ñ?</string>
   <string name="menu_about">Ð? пÑ?огÑ?амме</string>
   <string name="menu_wizard">Ð?аÑ?Ñ?еÑ?</string>
+  <string name="main_layout_download">Ð?агÑ?Ñ?зиÑ?Ñ?</string>
+  <string name="main_layout_upload">Ð?агÑ?Ñ?зиÑ?Ñ?</string>
   <string name="button_help">СпÑ?авка</string>
   <string name="button_close">Ð?акÑ?Ñ?Ñ?Ñ?</string>
   <string name="button_about">Ð? пÑ?огÑ?амме</string>
@@ -73,8 +75,11 @@
   <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
   <string name="wizard_tips_proxy">Ð?аÑ?Ñ?Ñ?ойки пÑ?окÑ?и - Ñ?знайÑ?е как наÑ?Ñ?Ñ?оиÑ?Ñ? пÑ?иложениÑ? длÑ? Ñ?абоÑ?Ñ? Ñ? Orbot</string>
   <string name="wizard_tips_duckgo">Ð?Ñ?иложение поиÑ?ковой Ñ?иÑ?Ñ?емÑ? Duckduckgo</string>
+  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
   <string name="wizard_tips_firefox">Firefox Ñ? дополнением Proxy Mobile (поÑ?ле оÑ?делÑ?ной Ñ?Ñ?Ñ?ановки)</string>
+  <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
   <string name="wizard_tips_twitter">Twitter поддеÑ?живаеÑ? http пÑ?окÑ?и \"localhost:8118\"</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Ð?аÑ?Ñ?Ñ?ойки Ð?Ñ?окÑ?и</string>
   <string name="wizard_proxy_help_msg">Ð?Ñ?ли иÑ?полÑ?зÑ?емое вами пÑ?иложение длÑ? Android поддеÑ?живаеÑ? HTTP или SOCKS пÑ?окÑ?и, Ñ?о вÑ? можеÑ?е наÑ?Ñ?Ñ?оиÑ?Ñ? его на подклÑ?Ñ?ение к Orbot и иÑ?полÑ?зование Tor.\n\n\n    Ð?наÑ?ение Ñ?оÑ?Ñ?а - 127.0.0.1 или \"localhost\". Ð?лÑ? HTTP, номеÑ? поÑ?Ñ?а - 8118. Ð?лÑ? SOCKS пÑ?окÑ?и - 9050. Ð?о возможноÑ?Ñ?и иÑ?полÑ?зÑ?йÑ?е SOCKS4A или SOCKS5.\n\n    \n    Ð?Ñ? можеÑ?е Ñ?знаÑ?Ñ? болÑ?Ñ?е о Ñ?абоÑ?е Ñ?еÑ?ез пÑ?окÑ?и на Android, пÑ?оÑ?иÑ?ав Ñ?Ñ?оÑ? FAQ: http://tinyurl.com/proxyandroid\n    </string>
   <string name="wizard_final">Ð?Ñ?огÑ?амма Orbot гоÑ?ова к иÑ?полÑ?зованиÑ?!</string>
@@ -103,6 +108,8 @@
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</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_tips_play">Ð?айÑ?и вÑ?е пÑ?иложениÑ? Guardian Project на Google Play</string>
+  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
@@ -207,7 +214,7 @@
   <string name="pref_use_persistent_notifications">Ð?Ñ?егда оÑ?обÑ?ажаÑ?Ñ? иконкÑ? в панели задаÑ? когда Orbot подклÑ?Ñ?ен</string>
   <string name="pref_use_persistent_notifications_title">УведомлениÑ? о поÑ?Ñ?оÑ?нной Ñ?абоÑ?е</string>
   <string name="notification_using_bridges">Ð?оÑ?Ñ?Ñ? вклÑ?Ñ?енÑ?!</string>
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="set_locale_title">Ð?адаÑ?Ñ? локалÑ?</string>
   <string name="set_locale_summary">Ð?Ñ?бÑ?аÑ?Ñ? локалÑ? и Ñ?зÑ?к длÑ? Orbot</string>
   <string name="wizard_locale_title">Ð?Ñ?бÑ?аÑ?Ñ? ЯзÑ?к</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 2c4f2d9..1115dc4 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -11,6 +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_starting">Startar Tor klient...</string>
+  <string name="tor_process_complete">färdig.</string>
+  <string name="tor_process_waiting">väntar.</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>
@@ -22,6 +25,8 @@
   <string name="menu_stop">Stopp</string>
   <string name="menu_about">About</string>
   <string name="menu_wizard">Wizard</string>
+  <string name="main_layout_download">Ladda Ner</string>
+  <string name="main_layout_upload">Ladda Upp</string>
   <string name="button_help">Hjälp</string>
   <string name="button_close">Stäng</string>
   <string name="button_about">Om</string>
@@ -33,9 +38,12 @@
   <string name="pref_trans_proxy_title">Transparent Proxy</string>
   <string name="pref_trans_proxy_summary">Automatisk Torifiering av Appar</string>
   <string name="pref_transparent_all_title">Tor:a Allt</string>
+  <string name="pref_transparent_all_summary">Proxy trafik för alla appar genom Tor</string>
+  <string name="pref_transparent_port_fallback_title">Port Proxy Ã?terfall</string>
   <string name="pref_transparent_port_fallback_summary">VARNING: Kringgår vanliga portar (80, 443, etc). *ANV�ND ENDAST* om \'Alla\' eller \'App\'-läge inte fungerar.</string>
   <string name="pref_transparent_port_title">Port-lista</string>
   <string name="pref_transparent_port_summary">Lista över portar att köra genom proxy. *ANV�ND ENDAST* om \'Alla\' eller \'App\'-läge inte fungerar</string>
+  <string name="pref_transparent_port_dialog">Skriv in portar till proxy</string>
   <string name="pref_has_root">Request Root Access</string>
   <string name="pref_has_root_summary">&gt;Request root access for transparent proxying</string>
   <string name="status_install_success">Tor-binärer installerades utan problem!</string>
@@ -51,41 +59,166 @@
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Orbot-information</string>
   <string name="wizard_details_msg">Orbot är en öppen källkods-applikation som innehåller Tor, LibEvent och Privoxy. Den tillhandahåller en local HTTP-proxy (8118) och en SOCKS-proxy (9050) in i Tor-nätverket. Orbot har också möjligheten, på en rootad enhet, att skicka all internet-trafik genom Tor.</string>
+  <string name="wizard_permissions_root">Tillstånd Givet</string>
+  <string name="wizard_permissions_stock">Orbot Tillstånd</string>
+  <string name="wizard_premissions_msg_root">Utmärkt! Vi har upptäckt att du har root tillstånd aktiverat för Orbot. Vi kommer använda denna makt ansvarsfullt.</string>
+  <string name="wizard_permissions_msg_stock">Det är inte nödvändigt, men Orbot kan bli ett kraftfullare verktyg om din enhet har root tillgång. Använd knappen nedan för att ge Orbot superkrafter!</string>
+  <string name="wizard_permissions_no_root">Om du inte har root tillgång eller inte har en aning om vad vi pratar om, använd bara appar som är gjorda att fungera med Orbot.</string>
+  <string name="wizard_permissions_consent">Jag förstår och vill fortsätta utan Superuser.</string>
+  <string name="wizard_permission_enable_root">Ge Orbot Root Tillgång</string>
+  <string name="wizard_configure">Konfigurera Torifikation</string>
+  <string name="wizard_configure_msg">Orbot ger dig möjligheten att skicka all applikationstrafik genom Tor ELLER att själv välja applikationer individuellt.</string>
+  <string name="wizard_configure_all">Proxy Alla Appar Genom Tor</string>
+  <string name="wizard_configure_select_apps">Välj Enskilda Appar för Tor</string>
+  <string name="wizard_tips_tricks">Orbot-anpassade Appar</string>
+  <string name="wizard_tips_msg">Apparna nedanför var utvecklade att fungera med Orbot. Klicka varje knapp för att installera nu, eller hitta dom senare på Google Play, på GuardianProject.info, eller via F-Droid.org.</string>
+  <string name="wizard_tips_otrchat">Gibberbot - Säker chattklient för Android</string>
+  <string name="wizard_tips_proxy">Proxy-inställningar - Lär dig hur du konfigurerar appar att fungera med Orbot</string>
+  <string name="wizard_tips_duckgo">DuckDuckGo Sökmotor App</string>
+  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+  <string name="wizard_tips_firefox">Proxy Mobile tillägg för Firefox (http://tinyurl.com/getproxymob)</string>
+  <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
+  <string name="wizard_tips_twitter">Ställ in Twitter proxy till värd \"localhost\" och port 8118</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Proxy-inställningar</string>
+  <string name="wizard_proxy_help_msg">Om Android appen du använder kan stödja användandet av HTTP eller SOCKS proxy, så kan du konfigurera den att ansluta till Orbot och använda Tor.\n\n\nVärd inställningarna är 127.0.0.1 eller \"localhost\". För HTTP är port inställningen 8118. För SOCKS är proxyn 9050. Du bör använda SOCKS4A eller SOCKS5 om möjligt.\n\n\nDu kan lära dig mer om proxys på Android via FAQ:n på http://tinyurl.com/proxyandroid\n</string>
+  <string name="wizard_final">Orbot är redo!</string>
+  <string name="wizard_final_msg">Hundratusentals personer runt om i världen använder Tor för många olika anledningar.\n\nJournalister och bloggare, försvarare av mänskliga rättigheter, polis, soldater, företag, medborgare i totalitära regimer, och bara vanliga medborgare... och nu är du också redo!</string>
   <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Du har framgångsrikt anslutit till Tor nätverket - men det betyder INTE att din enhet är säker. Du kan använda \"Check\" valet i menyn för att testa din webbläsare.\n\nBesök oss på https://guardianproject.info/apps/orbot eller skicka ett mail till help@xxxxxxxxxxxxxxxxxxxx för att få reda på mer.</string>
   <string name="tor_check">Det här kommer att öppna din webbläsare mot https://check.torproject.org för att se om Orbot är rätt konfigurerad och du är uppkopplad mot Tor.</string>
+  <string name="pref_hs_group">Gömd Service Hosting</string>
   <string name="pref_general_group">Allmänt</string>
+  <string name="pref_start_boot_title">Starta Orbot vid Uppstart</string>
+  <string name="pref_start_boot_summary">Starta Orbot automatiskt och anslut till Tor när din Android enhet startar upp</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot tar Tor till Android!\n\nTor hjälper dig försvara dig mot innehållsfiltrering, trafikanalys, och nätverksövervakning som hotar din integritet, konfidentiell information, och personliga relationer.\n\nDenna guide hjälper dig att konfigurera Orbot och Tor på din enhet.</string>
   <!--Warning screen-->
+  <string name="wizard_warning_title">Varning</string>
+  <string name="wizard_warning_msg">Bara att installera Orbot kommer inte automatiskt att anonymisera din mobila trafik.\n\nDu måste konfigurera Orbot, din enhet, och andra appar att framgångsrikt använda Tor.</string>
   <!--Permissions screen-->
+  <string name="wizard_permissions_title">Tillstånd</string>
+  <string name="wizard_permissions_root_msg1">Du kan alternativt ge Orbot \'Superuser\' tillgång för att aktivera avancerade inställningar, som till exempel Transparent Proxy.</string>
+  <string name="wizard_permissions_root_msg2">Om du inte vill göra detta, se till att bara använda appar som anpassats till Orbot.</string>
+  <string name="wizard_permissions_no_root_msg">Din enhet verkar inte vara rootad eller ge \'Superuser\' tillgång.\n\nFör att du ska ha användning av Tor måste du använda appar som är anpassade till Orbot, eller som stödjer HTTP eller SOCKS proxy inställningar.\n\n</string>
   <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot-Anpassade Appar</string>
+  <string name="wizard_tips_gibberbot">Gibberbot: Säker chatt app med Off-the-Record Kryptering</string>
+  <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string>
+  <string name="wizard_tips_orweb">Orweb: Integritets-förbättrande webbläsare som fungerar genom Tor</string>
+  <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.xpi</string>
+  <string name="wizard_tips_play">Hitta alla Guardian Project appar på Google Play</string>
+  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparent Proxy</string>
+  <string name="wizard_transproxy_msg">Detta tillåter dina appar att automatiskt köra genom Tor nätverket utan någon konfiguration.</string>
+  <string name="wizard_transproxy_hint">(Markera denna om du inte har någon aning om vad vi pratar om)</string>
+  <string name="wizard_transproxy_none">Ingen</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Aktivera Tor Transparent Proxy för Wifi och USB Thetered Enheter (omstart krävs)</string>
+  <string name="button_grant_superuser">Begär Superuser Tillgång</string>
+  <string name="pref_select_apps">Välj Appar</string>
+  <string name="pref_select_apps_summary">Välj Appar att Leda Genom Tor</string>
+  <string name="pref_node_configuration">Nod Konfiguration</string>
   <string name="pref_node_configuration_summary">Det här är avancerade inställningar som kan minska din anonymitet</string>
   <string name="pref_entrance_node">Ingångsnoder</string>
+  <string name="pref_entrance_node_summary">Fingeravtryck, nicks, länder, och adresser för första hoppet</string>
+  <string name="pref_entrance_node_dialog">Skriv in Ingångs Noder</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_title">Utgående Nätverksproxy</string>
   <string name="pref_proxy_type_title">Proxy-typ</string>
   <string name="pref_proxy_type_summary">Protokoll att använda för proxyserver: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Skriv in Proxy Typ</string>
   <string name="pref_proxy_host_title">Proxy-värd</string>
   <string name="pref_proxy_host_summary">Proxy-servernamn</string>
+  <string name="pref_proxy_host_dialog">Skriv in Proxy Värd</string>
+  <string name="pref_proxy_port_title">Utgående Proxy Port</string>
+  <string name="pref_proxy_port_summary">Proxy server port</string>
+  <string name="pref_proxy_port_dialog">Skriv in Proxy port</string>
+  <string name="status">Status</string>
   <string name="setting_up_full_transparent_proxying_">Ställer in full transparent proxyfiering...</string>
   <string name="setting_up_app_based_transparent_proxying_">Ställer in app-baserad transparent proxyfiering...</string>
+  <string name="transparent_proxying_enabled">Transparent proxy AKTIVERAD</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy aktiverad för Tethering!</string>
+  <string name="warning_error_starting_transparent_proxying_">VARNING: kunde ej starta transparent proxy!</string>
+  <string name="transproxy_rules_cleared">TransProxy regler rensade</string>
   <string name="couldn_t_start_tor_process_">Kunde inte starta Tor-process:</string>
   <string name="privoxy_is_running_on_port_">Privoxy körs på port:</string>
   <string name="setting_up_port_based_transparent_proxying_">Ställer in port-baserad transparent proxyfiering...</string>
+  <string name="bridge_error">Bro Error</string>
+  <string name="bridge_requires_ip">För att använda bro funktionen måste du skriva in minst en bro IP adress.</string>
+  <string name="send_email_for_bridges">Skicka ett email till bridges@xxxxxxxxxxxxxx med linjen \"get bridges\" ensamt som meddelande från ett gmail konto.</string>
   <string name="error">Fel</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Din NåbaraAdresser inställning orsakade ett undantag!</string>
+  <string name="your_relay_settings_caused_an_exception_">Din relä inställning orsakade ett undantag!</string>
   <string name="exit_nodes">Utgångsnoder</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingeravtryck, nicks, länder, och adresser för sista hoppet</string>
+  <string name="enter_exit_nodes">Skriv in Exit Noder</string>
+  <string name="exclude_nodes">Exkludera Noder</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingeravtryck, nicks, länder och adresser att exkludera</string>
+  <string name="enter_exclude_nodes">Skriv in Exkluderade Noder</string>
+  <string name="strict_nodes">Strikta Noder</string>
+  <string name="use_only_these_specified_nodes">Använd *enbart* dessa specificerade noder</string>
+  <string name="bridges">Broar</string>
+  <string name="use_bridges">Använd Broar</string>
+  <string name="bridges_obfuscated">Förvillande Broar</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Aktivera alternativa ingångsnoder till Tor nätverket</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Aktivera om konfigurerade broar är förvillande broar</string>
+  <string name="ip_address_and_port_of_bridges">IP adress och port för broar</string>
+  <string name="enter_bridge_addresses">Skriv in Bro Adresser</string>
+  <string name="relays">Reläer</string>
+  <string name="relaying">�verföring</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Aktivera din enhet till att vara ett icke-utgångsrelä</string>
+  <string name="relay_port">Relä Port</string>
+  <string name="listening_port_for_your_tor_relay">Lyssningsport för din Tor relä</string>
   <string name="enter_or_port">Allmänt</string>
+  <string name="relay_nickname">Relä namn</string>
+  <string name="the_nickname_for_your_tor_relay">Namnet för din Tor relä</string>
+  <string name="enter_a_custom_relay_nickname">Skriv in ett anpassat relä namn</string>
+  <string name="reachable_addresses">NÃ¥bara Adresser</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Kör som klient bakom en brandvägg med restriktiva policys</string>
+  <string name="reachable_ports">NÃ¥bara portar</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Portar nåbara bakom en restriktiv brandvägg</string>
+  <string name="enter_ports">Skriv in portar</string>
+  <string name="enable_hidden_services">Gömd Tjänstehosting</string>
+  <string name="run_servers_accessible_via_the_tor_network">Tillåt server på enheten att vara tillgänglig via Tor nätverket</string>
+  <string name="enter_localhost_ports_for_hidden_services">Skriv in localhost portar för gömda tjänster</string>
+  <string name="hidden_service_ports">Gömda Tjänsteportar</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">det adresserade namnet för din gömda tjänst (genereras automatiskt)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Aktivera debug loggen för output (måste använda adb eller aLogCat för att se)</string>
   <string name="project_home">Projektets hemsidor:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
   <string name="the_tor_license">Tor-licensen</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">Tredjepartsprogramvara:</string>
-  <string name="default_bridges"/>
+  <string name="tor_version">Tor v0.2.4.3-alpha: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.1.1-alpha: http://www.monkey.org/~provos/libevent/</string>
+  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
+  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string>
+  <string name="hidden_service_request">En app vill öppna gömd tjänsteport %S till Tor nätverket. Detta är säkert om du litar på appen.</string>
+  <string name="found_existing_tor_process">hittade existerande Tor process...</string>
+  <string name="something_bad_happened">Något dåligt hände. Kolla loggen.</string>
+  <string name="hidden_service_on">gömd tjänst på:</string>
+  <string name="unable_to_read_hidden_service_name">kan inte läsa gömda tjänstens namn</string>
+  <string name="unable_to_start_tor">Kan inte starta Tor:</string>
+  <string name="pref_use_sys_iptables_title">Använd standard Iptables</string>
+  <string name="pref_use_sys_iptables_summary">Använd den inbyggda iptables binären istället för den som kommer med Orbot</string>
+  <string name="error_installing_binares">Tor binärerna kunde inte installeras eller uppgraderas.</string>
+  <string name="pref_use_persistent_notifications">Behåll alltid ikonen i verktygsfältet när Orbot är ansluten</string>
+  <string name="pref_use_persistent_notifications_title">Alltid-PÃ¥ Notifikationer</string>
+  <string name="notification_using_bridges">Broar aktiverade!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Välj Plats</string>
+  <string name="set_locale_summary">Välj plats och språk för Orbot</string>
   <string name="wizard_locale_title">Välj språk</string>
+  <string name="wizard_locale_msg">Lämna standard eller byt nuvarande språk</string>
   <string name="powered_by">drivs av Tor-projektet</string>
+  <string name="btn_save_settings">Spara Inställningar</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index aac14cd..ac350f1 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -11,6 +11,8 @@
   <string name="status_activated">Tor aÄ?ına baÄ?landı</string>
   <string name="status_disabled">Orbot devre dıÅ?ı bırakıldı</string>
   <string name="status_shutting_down">Orbot kapatılıyor</string>
+  <string name="tor_process_complete">tamamlandı.</string>
+  <string name="tor_process_waiting">bekliyor.</string>
   <string name="not_anonymous_yet">UYARI: BaÄ?lantınız henüz anonim deÄ?ildir! Lütfen uygulamalarınızı HTTP 127.0.0.1:8118  veya SOCKS4A / SOCKS5 127.0.0.1:9050 vekil sunucusu kullanacak Å?ekilde yapılandırınız.</string>
   <string name="menu_home">BaÅ?langıç</string>
   <string name="menu_browse">Göz At</string>
@@ -49,11 +51,17 @@
   <string name="btn_next">Ä°leri</string>
   <string name="btn_back">Geri</string>
   <string name="btn_finish">Bitir</string>
+  <string name="btn_okay">Tamam</string>
+  <string name="btn_cancel">Ä°ptal\n            </string>
   <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Proxy Ayarları</string>
+  <string name="wizard_final">Orbot hazır!</string>
   <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Genel</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
+  <string name="wizard_warning_title">Uyarı</string>
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
@@ -61,6 +69,8 @@
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparan Vekil SunuculuÄ?u</string>
+  <string name="wizard_transproxy_none">Hiçbiri</string>
   <string name="button_grant_superuser">Süper Kullanıcı EriÅ?imi Talebi</string>
   <string name="pref_select_apps">Uygulamaları Seç</string>
   <string name="pref_select_apps_summary">Tor �zerinden Yönlendirilecek Uygulamaları Seç</string>
@@ -69,6 +79,9 @@
   <string name="pref_entrance_node">GiriÅ? Noktaları</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="default_bridges"/>
+  <string name="status">Durum</string>
+  <string name="error">Hata</string>
+  <string name="default_bridges"></string>
   <string name="powered_by">The Tor Project tarafından desteklenmektedir.</string>
+  <string name="btn_save_settings">Ayarları kaydet</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 461bf86..f047e2d 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1,214 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Orbot</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>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">start and stop Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot is starting...</string>
-  <string name="status_activated">Connected to the Tor network</string>
-  <string name="status_disabled">\"Orbot is Deactivated</string>
-  <string name="status_shutting_down">Orbot is shutting down</string>
-  <string name="tor_process_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>
-  <string name="menu_settings">Settings</string>
-  <string name="menu_log">Log</string>
-  <string name="menu_info">Help</string>
-  <string name="menu_apps">Apps</string>
-  <string name="menu_start">Start</string>
-  <string name="menu_stop">Stop</string>
-  <string name="menu_about">About</string>
-  <string name="menu_wizard">Wizard</string>
-  <string name="button_help">Help</string>
-  <string name="button_close">Close</string>
-  <string name="button_about">About</string>
-  <string name="button_clear_log">Clear Log</string>
-  <string name="menu_verify">Check</string>
-  <string name="menu_exit">Exit</string>
-  <string name="press_to_start">- long press to start -</string>
-  <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string>
-  <string name="pref_trans_proxy_title">Transparent Proxying</string>
-  <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string>
-  <string name="pref_transparent_all_title">Tor Everything</string>
-  <string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string>
-  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
-  <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
-  <string name="pref_transparent_port_title">Port List</string>
-  <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
-  <string name="pref_transparent_port_dialog">Enter ports to proxy</string>
-  <string name="pref_has_root">Request Root Access</string>
-  <string name="pref_has_root_summary">Request root access for transparent proxying</string>
-  <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">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="menu_browse">Ð?гÑ?лд</string>
+  <string name="menu_settings">Ð?алаÑ?Ñ?Ñ?ваннÑ?</string>
+  <string name="menu_info">Ð?опомога</string>
+  <string name="button_help">Ð?опомога</string>
+  <string name="button_close">Ð?акÑ?иÑ?и</string>
+  <string name="btn_back">Ð?азад</string>
+  <string name="btn_cancel">Ð?Ñ?дмова</string>
   <!--Welcome Wizard strings (DJH)-->
-  <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>
-  <string name="wizard_permissions_stock">Orbot Permissions</string>
-  <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 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">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_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\n    The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n    \n\n\n    You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n    </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.\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="wizard_proxy_help_info">Ð?аÑ?амеÑ?Ñ?и пÑ?окÑ?Ñ?</string>
   <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help@xxxxxxxxxxxxxxxxxxxx to learn more.</string>
-  <string name="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 Service Hosting</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="pref_general_group">Ð?Ñ?новнÑ?</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
-  <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>
   <!--Warning screen-->
-  <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>
   <!--Permissions screen-->
-  <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 does not appear to be rooted or provide \'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>
   <!--TipsAndTricks screen-->
-  <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_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
-  <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 (requires restart)</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="wizard_transproxy_none">Ð?Ñ?Ñ?ого</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_title">Outbound Network Proxy</string>
-  <string name="pref_proxy_type_title">Outbound 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">Outbound 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">Outbound Proxy Port</string>
-  <string name="pref_proxy_port_summary">Proxy server port</string>
-  <string name="pref_proxy_port_dialog">Enter Proxy port</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying...</string>
-  <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string>
-  <string name="transproxy_rules_cleared">TransProxy rules cleared</string>
-  <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string>
-  <string name="privoxy_is_running_on_port_">Privoxy is running on port: </string>
-  <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string>
-  <string name="bridge_error">Bridge Error</string>
-  <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string>
-  <string name="send_email_for_bridges">Send an email to bridges@xxxxxxxxxxxxxx with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string>
-  <string name="error">Error</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string>
-  <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string>
-  <string name="exit_nodes">Exit Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string>
-  <string name="enter_exit_nodes">Enter Exit Nodes</string>
-  <string name="exclude_nodes">Exclude Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string>
-  <string name="enter_exclude_nodes">Enter Exclude Nodes</string>
-  <string name="strict_nodes">Strict Nodes</string>
-  <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string>
-  <string name="bridges">Bridges</string>
-  <string name="use_bridges">Use Bridges</string>
-  <string name="bridges_obfuscated">Obfuscated Bridges</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string>
-  <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string>
-  <string name="enter_bridge_addresses">Enter Bridge Addresses</string>
-  <string name="relays">Relays</string>
-  <string name="relaying">Relaying</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Enable your device to be a non-exit relay</string>
-  <string name="relay_port">Relay Port</string>
-  <string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string>
-  <string name="enter_or_port">Enter OR port</string>
-  <string name="relay_nickname">Relay nickname</string>
-  <string name="the_nickname_for_your_tor_relay">The nickname for your Tor relay</string>
-  <string name="enter_a_custom_relay_nickname">Enter a custom relay nickname</string>
-  <string name="reachable_addresses">Reachable Addresses</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Run as a client behind a firewall with restrictive policies</string>
-  <string name="reachable_ports">Reachable ports</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string>
-  <string name="enter_ports">Enter ports</string>
-  <string name="enable_hidden_services">Hidden Service Hosting</string>
-  <string name="run_servers_accessible_via_the_tor_network">allow on-device server to be accessible via the Tor network</string>
-  <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string>
-  <string name="hidden_service_ports">Hidden Service Ports</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string>
-  <string name="project_home">Project Home(s): </string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">The Tor License</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3rd-Party-Software: </string>
-  <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string>
-  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
-  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string>
-  <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string>
-  <string name="found_existing_tor_process">found existing Tor process...</string>
-  <string name="something_bad_happened">Something bad happened. Check the log</string>
-  <string name="hidden_service_on">hidden service on:</string>
-  <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string>
-  <string name="unable_to_start_tor">Unable to start Tor:</string>
-  <string name="pref_use_sys_iptables_title">Use Default Iptables</string>
-  <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string>
-  <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string>
-  <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string>
-  <string name="pref_use_persistent_notifications_title">Always-On Notifications</string>
-  <string name="notification_using_bridges">Bridges enabled!</string>
-  <string name="default_bridges"/>
-  <string name="set_locale_title">Set Locale</string>
-  <string name="set_locale_summary">Choose the locale and language for Orbot</string>
-  <string name="wizard_locale_title">Choose Language</string>
-  <string name="wizard_locale_msg">Leave default or switch the current language</string>
-  <string name="powered_by">powered by The Tor Project  </string>
-  <string name="btn_save_settings">Save Settings</string>
+  <string name="status">СÑ?аÑ?Ñ?Ñ?</string>
+  <string name="default_bridges"></string>
 </resources>
diff --git a/res/values-zh/strings.xml b/res/values-zh/strings.xml
index 964adb0..38db494 100644
--- a/res/values-zh/strings.xml
+++ b/res/values-zh/strings.xml
@@ -11,43 +11,45 @@
   <string name="status_activated">已��� Tor ��</string>
   <string name="status_disabled">Orbot å·²å??ç?¨</string>
   <string name="status_shutting_down">Orbot 正���</string>
-  <string name="tor_process_starting">��Tor客�端...</string>
+  <string name="tor_process_starting">正��� Tor 客�端...</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="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>
   <string name="menu_settings">设置</string>
   <string name="menu_log">��</string>
   <string name="menu_info">帮�</string>
-  <string name="menu_apps">��</string>
+  <string name="menu_apps">����</string>
   <string name="menu_start">��</string>
   <string name="menu_stop">å??æ­¢</string>
   <string name="menu_about">��</string>
-  <string name="menu_wizard">Wizard</string>
+  <string name="menu_wizard">å??导</string>
+  <string name="main_layout_download">�载</string>
+  <string name="main_layout_upload">�传</string>
   <string name="button_help">帮�</string>
   <string name="button_close">��</string>
   <string name="button_about">��</string>
-  <string name="button_clear_log">Clear Log</string>
+  <string name="button_clear_log">����</string>
   <string name="menu_verify">��</string>
   <string name="menu_exit">é??å?º</string>
-  <string name="press_to_start">- é?¿æ??以å?¯å?¨ -</string>
-  <string name="pref_trans_proxy_group">é??æ??代ç??(é??è¦? root)</string>
+  <string name="press_to_start">- é?¿æ??å?¯å?¨ -</string>
+  <string name="pref_trans_proxy_group">é??æ??代ç??ï¼?é??è¦? Root æ??é??ï¼?</string>
   <string name="pref_trans_proxy_title">é??æ??代ç??</string>
-  <string name="pref_trans_proxy_summary">��对����使� Tor</string>
-  <string name="pref_transparent_all_title">对æ??æ??åº?ç?¨ä½¿ç?¨ Tor</string>
-  <string name="pref_transparent_all_summary">使ç?¨ Tor 代ç??æ??æ??ç¨?åº?ç??æµ?é??</string>
-  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
-  <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
+  <string name="pref_trans_proxy_summary">������使� Tor</string>
+  <string name="pref_transparent_all_title">æ??æ??åº?ç?¨ç¨?åº?使ç?¨ Tor</string>
+  <string name="pref_transparent_all_summary">æ??æ??åº?ç?¨ç¨?åº?é?½é??è¿? Tor è¿?æ?¥ç½?ç»?</string>
+  <string name="pref_transparent_port_fallback_title">å¤?ç?¨ä»£ç??端å?£</string>
+  <string name="pref_transparent_port_fallback_summary">è­¦å??ï¼?é?¿å??使ç?¨å¸¸ç?¨ç«¯å?£ï¼?80ã??443 ç­?ï¼?ã??ä»?å?¨â??åº?ç?¨ç¨?åº?â??æ??â??åº?ç?¨ç¨?åº?â??模å¼?æ? æ³?å·¥ä½?æ?¶ä½¿ç?¨ã??</string>
   <string name="pref_transparent_port_title">端å?£å??表</string>
-  <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
-  <string name="pref_transparent_port_dialog">Enter ports to proxy</string>
-  <string name="pref_has_root">Request Root Access</string>
-  <string name="pref_has_root_summary">Request root access for transparent proxying</string>
-  <string name="status_install_success">Tor äº?è¿?å?¶ç¨?åº?å®?è£?æ??å??ï¼?</string>
-  <string name="status_install_fail">Tor äº?è¿?å?¶ç¨?åº?æ? æ³?å®?è£?ã??请æ?¥ç??æ?¥å¿? tor-assistants@xxxxxxxxxxxxxx</string>
+  <string name="pref_transparent_port_summary">代ç??端å?£å??表ã??ä»?å?¨â??åº?ç?¨ç¨?åº?â??æ??â??åº?ç?¨ç¨?åº?â??模å¼?æ? æ³?å·¥ä½?æ?¶ä½¿ç?¨ã??</string>
+  <string name="pref_transparent_port_dialog">è¾?å?¥ä»£ç??端å?£</string>
+  <string name="pref_has_root">请æ±? Root 访é?®æ??é??</string>
+  <string name="pref_has_root_summary">为é??æ??代ç??请æ±?è?·å?? Root 访é?®æ??é??</string>
+  <string name="status_install_success">Tor ç¨?åº?å®?è£?æ??å??ï¼?</string>
+  <string name="status_install_fail">Tor ç¨?åº?æ? æ³?å®?è£?ã??请æ?¥ç??æ?¥å¿?并å°?å?¶å??é??å?° tor-assistants@xxxxxxxxxxxxxx</string>
   <string name="title_error">åº?ç?¨ç¨?åº?é??误</string>
-  <string name="wizard_title">欢�使� Orbot</string>
+  <string name="wizard_title">Orbot</string>
   <string name="wizard_btn_tell_me_more">�� Orbot</string>
   <string name="btn_next">��步</string>
   <string name="btn_back">��步</string>
@@ -55,64 +57,168 @@
   <string name="btn_okay">确�</string>
   <string name="btn_cancel">å??æ¶?</string>
   <!--Welcome Wizard strings (DJH)-->
-  <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>
+  <string name="wizard_details">�� Orbot 信�</string>
+  <string name="wizard_details_msg">Orbot æ?¯ä¸?个å??å?« Torã??LibEvent å?? Privoxy ç??å¼?æº?ç¨?åº?ã??å®?使ç?¨æ?¬å?° HTTP 代ç?? (8118) å?? SOCKS 代ç?? (9050) æ?¥æ?¥å?¥å?° Tor ç½?ç»?ã??对äº?å·²è?·å¾? ROOT æ??é??ç??设å¤?ï¼?å?©ç?¨ Orbotï¼?æ??æ??åº?ç?¨ç¨?åº?é?½å?¯é??è¿? Tor æ?¥è¿?è¡?ç½?ç»?é??讯ã??</string>
+  <string name="wizard_permissions_root">å·²è?·å??æ??é??</string>
   <string name="wizard_permissions_stock">Orbot æ??é??</string>
-  <string name="wizard_premissions_msg_root">é??常好ï¼?æ??们æ£?æµ?å?°æ?¨å·²ç»?为 Orbot é??ç½®äº? root æ??é??ã??æ??们ä¼?è?ªæ??å?°ä½¿ç?¨è¿?个ç?¹æ??ã??</string>
-  <string name="wizard_permissions_msg_stock">è?½ç?¶å¹¶é??å¿?é¡»ï¼?å¦?æ??ä½ ç??设å¤?æ?? root æ??é??ï¼?Orbot å?¯ä»¥è¡¨ç?°å¾?æ?´ä¸ºå¼ºå¤§ã??使ç?¨ä»¥ä¸?æ??é?®æ?¥èµ?äº? Orbot è¶?级è?½å??ï¼?</string>
-  <string name="wizard_permissions_no_root">å¦?æ??你没æ?? root æ??é??ï¼?æ??ä¸?æ??ç?½ä¸?é?¢è¯´ç??æ?¯ä»?ä¹?ï¼?é?£ä¹?å?ªé??使ç?¨å?¯ä¸? Orbot å·¥ä½?ç??åº?ç?¨ç¨?åº?ã??</string>
-  <string name="wizard_permissions_consent">æ??æ??ç?½å¹¶ä¼?以é?? root 继续</string>
-  <string name="wizard_permission_enable_root">为 Orbot èµ?äº? root æ??é??</string>
-  <string name="wizard_configure">é??ç½® Tor 使ç?¨</string>
-  <string name="wizard_configure_msg">Orbot ç»?äº?æ?¨è·¯ç?±æ??æ??åº?ç?¨ç¨?åº?æµ?é??é??è¿? Tor æ??è??为å??个ç¨?åº?设置é??æ?©ç??é??项ã??</string>
-  <string name="wizard_configure_all">é??è¿? Tor 代ç??å?¨é?¨åº?ç?¨ç¨?åº?</string>
-  <string name="wizard_configure_select_apps">é??æ?©ä½¿ç?¨ Tor ç??å??个åº?ç?¨ç¨?åº?</string>
-  <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_premissions_msg_root">好æ??äº?ï¼?æ??们æ£?æµ?å?° Orbot å·²è?·å?? Root æ??é?? ã??æ??们ä¼?è°¨æ??å?°ä½¿ç?¨è¿?ä¸?æ??é??ã??</string>
+  <string name="wizard_permissions_msg_stock">è?½é??å¿?é¡»ï¼?ä½?æ?¯å?·æ?? Root 访é?®æ??é??ç??设å¤?å?¯ä»¥è®© Orbot å??å¾?æ?´å¼ºå¤§ã??请使ç?¨ä¸?é?¢ç??æ??é?®æ??äº? Orbot è¿?ä¸?强大ç??è?½å??ï¼?</string>
+  <string name="wizard_permissions_no_root">å¦?æ??没æ?? Root 访é?®æ??é??æ??ä¸?æ??ç?½æ­¤å¤?æ??说ç??å??容ï¼?å?ªé??ç¡®ä¿? Orbot æ?¯æ??æ??ç?¨ç??åº?ç?¨å?³å?¯ã??</string>
+  <string name="wizard_permissions_consent">æ??æ??ç?½å¹¶æ?¿æ??å?¨æ?ªè?·å?? Root æ??é??ç??æ??å?µä¸?继续æ??ä½?</string>
+  <string name="wizard_permission_enable_root">为 Orbot è?·å?? Root æ??é??</string>
+  <string name="wizard_configure">é??ç½® Tor ç½?ç»?</string>
+  <string name="wizard_configure_msg">Orbot æ??ä¾?äº?é??项ï¼?å?¯æ??å®?æ??æ??åº?ç?¨ç¨?åº?使ç?¨ Tor ç½?ç»?æ??æ??å®?æ??äº?åº?ç?¨é??è¿? Tor ç½?ç»?è¿?è¡?é??讯ã??</string>
+  <string name="wizard_configure_all">æ??æ??åº?ç?¨ç¨?åº?é?½ä½¿ç?¨ Tor</string>
+  <string name="wizard_configure_select_apps">é??æ?©ä½¿ç?¨ Tor ç??åº?ç?¨ç¨?åº?</string>
+  <string name="wizard_tips_tricks">Orbot æ?¯æ??ç??åº?ç?¨</string>
+  <string name="wizard_tips_msg">以ä¸?åº?ç?¨å?¯ä¸? Orbot ä¸?起使ç?¨ã??ç?¹å?»ä¸?é?¢ç??æ??é?®å®?è£?ï¼?ä¹?å?¯ä»¥é??è¿? Google Play å??åº?ã??GuardianProject.info ç½?ç«?æ?? F-Droid.org æ?¥æ?¾ã??</string>
+  <string name="wizard_tips_otrchat">Gibberbot - Android 设置ä¸?ç??å®?å?¨å?³æ?¶é??讯客æ?·ç«¯</string>
   <string name="wizard_tips_proxy">代ç??设置 - 学习å¦?ä½?é??ç½®åº?ç?¨ç¨?åº?使ç?¨ Orbot</string>
+  <string name="wizard_tips_duckgo">DuckDuckGo æ??ç´¢å¼?æ??åº?ç?¨ç¨?åº?</string>
+  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+  <string name="wizard_tips_firefox">ç?¨äº? Firefox ç?? Proxy Mobile æ?©å±? (http://tinyurl.com/getproxymob)</string>
+  <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
+  <string name="wizard_tips_twitter">å°? Twitter 代ç??ç??主æ?ºè®¾ç½® localhost 并å°?端å?£è®¾ç½®ä¸º 8118</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">代ç??设置</string>
-  <string name="wizard_proxy_help_msg">å¦?æ??æ?¨æ­£å?¨ä½¿ç?¨ç?? Android åº?ç?¨ç¨?åº?æ?¯æ??使ç?¨ HTTP æ?? SOCKS 代ç??ï¼?æ?¨å?¯ä»¥é??ç½®å®?è¿?æ?¥å?° Orbot 并使ç?¨ Torã??\n\n\n    主æ?ºè®¾ç½®ä¸º 127.0.0.1 æ?? localhostã??对äº? HTTPï¼?端å?£ä¸º 8118ï¼?对äº? SOCKS 端å?£ä¸º 9050ã??å¦?æ??å?¯è?½ï¼?åº?å½?使ç?¨ SOCKS4A æ?? SOCKS5ã??\n    \n\n\n    æ?¨å?¯ä»¥é??è¿? http://tinyurl.com/proxyandroid äº?解æ?´å¤? Android ä¸?使ç?¨ä»£ç??ç??ç?¥è¯?ã??</string>
+  <string name="wizard_proxy_help_msg">å¦?æ?? Android åº?ç?¨ç¨?åº?æ?¯æ?? HTTP æ?? SOCKS 代ç??ï¼?é?£ä¹?å?¯å?¶è¿?è¡?é??置以è¿?æ?¥ Orbot 并使ç?¨ Tor ç½?ç»?ã??\n\n主æ?ºè®¾ç½®ä¸º 127.0.0.1 æ?? localhostã??对äº? HTTPï¼?端å?£è®¾ç½®ä¸º 8118ï¼?对äº? SOCKSï¼?端å?£è®¾ç½®ä¸º 9050ã??å¦?æ??å?¯ä»¥ï¼?请尽é??使ç?¨ SOCKS4A æ?? SOCKS5 代ç??ã??\n\næ?´å¤?æ??å?³ Android 代ç??ä¿¡æ?¯ï¼?请å??é?? http://tinyurl.com/proxyandroid 中ç??常è§?é?®é¢?</string>
   <string name="wizard_final">Orbot 已就绪�</string>
-  <string name="wizard_final_msg">æ?°ä»¥ä¸?计ç??å??å?½äººä»¬å? ä¸ºå??ç§?å??å? ä½¿ç?¨ Torï¼?è®°è??ã??人æ??å·¥ä½?è??ã??æ³?å¾?å·¥ä½?è??ã??士å?µã??å?¬å?¸ã??è¿«äº?å®?é??æ??å?µä½¿ç?¨ç??å¸?æ°?ï¼?å½?ç?¶ä¹?æ??æ?®é??ç??å¸?æ°?ã??ç?°å?¨ä½ ä¹?å?³å°?æ??为å?¶ä¸­ç??ä¸?å??ï¼?</string>
+  <string name="wizard_final_msg">å?¨ä¸?ç??å??å?°æ??æ??å??ä¸?ä¸?ç??人å?ºäº?å??ç§?å??æ ·ç??å??å? é??è¦?使ç?¨ Torï¼?\n\nè®°è??å??å??客ã??人æ??å·¥ä½?è??ã??æ³?å¾?å·¥ä½?è??ã??å??人ã??ä¼?ä¸?ã??ä¸?å?¶å?½å®¶ç??人æ°?ï¼?以å??å??ä½ æ??ä¸?æ ·ç??æ?®é??å?¬æ°?...\n ç?°å?¨ä½ å·²å??å¤?就绪ï¼?欢è¿?å? å?¥ï¼?</string>
   <!--END Welcome Wizard strings (DJH)-->
-  <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="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">常�</string>
+  <string name="pref_start_boot_title">����� Orbot</string>
+  <string name="pref_start_boot_summary">Android 设�������� Orbot 并�� Tor ��</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot å°? Tor å¼?å?¥ Android å¹³å?°ï¼?\n\nTor å?¯ä»¥é?¿å??ç?¨æ?·é?­å??å??容è¿?滤ã??é??讯å??æ??以å??å¨?è??é??ç§?ã??æ?ºå¯?ä¿¡æ?¯ä¸?人é??å?³ç³»ä¿¡æ?¯ç??ç½?ç»?ç??æ?§ã??\n\næ­¤å??导å°?帮å?©ç?¨æ?·å?¨è®¾å¤?ä¸?对 Orbot å?? Tor è¿?è¡?é??ç½®ã??</string>
   <!--Warning screen-->
   <string name="wizard_warning_title">è­¦å??</string>
+  <string name="wizard_warning_msg">ä»?ä»?å®?è£? Orbot 并ä¸?è?½è?ªå?¨ä½¿ç§»å?¨é??ä¿¡å?¿å??å??ã??\n\n为äº?正常使ç?¨ Tor ç½?ç»?ï¼?å¿?须正确å?°å¯¹ Orbotã??设å¤?以å??å?¶ä»?åº?ç?¨è¿?è¡?é??ç½®ã??</string>
   <!--Permissions screen-->
-  <string name="wizard_permissions_title">å??许</string>
+  <string name="wizard_permissions_title">æ??é??</string>
+  <string name="wizard_permissions_root_msg1">å?¯é??æ?©æ??äº? Orbot â??Superuserâ??访é?®æ??é??ï¼?以便å?¯ç?¨é«?级å??è?½ï¼?ä¾?å¦?é??æ??代ç??ã??</string>
+  <string name="wizard_permissions_root_msg2">å¦?æ??ä¸?æ?¿æ??äº? Orbot 该æ??é??ï¼?请确ä¿?åº?ç?¨ç¨?åº?å?¯ä½¿ç?¨ Orbotã??</string>
+  <string name="wizard_permissions_no_root_msg">设å¤?æ?ªè?·å?? Root æ??é??æ??æ?ªæ??ä¾? Superuser 访é?®æ??é??ã??\n\n为äº?使ç?¨ Tor ç½?ç»?ï¼?æ??ç?¨ç??åº?ç?¨ç¨?åº?é??æ?¯æ?? Orbot æ??æ?¯æ?? HTTP æ?? SOCKS 代ç??设置ã??\n</string>
   <!--TipsAndTricks screen-->
-  <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</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_tips_title">使ç?¨ Orbot ç??åº?ç?¨ç¨?åº?</string>
+  <string name="wizard_tips_gibberbot">Gibberbotï¼?å? å¯?ä¸?ä¸?ä¼?ç??ä¸?è®°å½?ç??å®?å?¨è??天åº?ç?¨ç¨?åº?</string>
+  <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string>
+  <string name="wizard_tips_orweb">Orwebï¼?使ç?¨ Tor ç½?ç»?ç??é??ç§?ä¿?æ?¤æµ?è§?å?¨</string>
+  <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.xpi</string>
+  <string name="wizard_tips_play">å?¨ Google Play å??åº?æ?¥æ?¾æ??æ?? Guardian Project ç??åº?ç?¨ç¨?åº?</string>
+  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">é??æ??代ç??</string>
+  <string name="wizard_transproxy_msg">å?¯ä½¿åº?ç?¨ç¨?åº?æ? é??é??ç½®å?³å?¯è?ªå?¨é??è¿? Tor è¿?æ?¥ç½?ç»?ã??</string>
+  <string name="wizard_transproxy_hint">ï¼?å¦?æ??ä¸?æ??ç?½è¿?é??æ??说ç??é?®é¢?ï¼?请é??æ?©è¯¥é??项ï¼?</string>
+  <string name="wizard_transproxy_none">æ? </string>
+  <string name="pref_transparent_tethering_title">Tor ���享</string>
+  <string name="pref_transparent_tethering_summary">对 Wifi å?? USB ç½?ç»?å?±äº«è®¾å¤?å?¯ç?¨é??æ??代ç??ï¼?é??é??æ?°å?¯å?¨ï¼?</string>
+  <string name="button_grant_superuser">请æ±? Superuser 访é?®æ??é??</string>
+  <string name="pref_select_apps">é??æ?©åº?ç?¨ç¨?åº?</string>
+  <string name="pref_select_apps_summary">é??æ?©é??è¿? Tor è¿?æ?¥ç½?ç»?ç??åº?ç?¨ç¨?åº?</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">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_title">å?ºç«?ç½?ç»?代ç??</string>
+  <string name="pref_proxy_type_title">å?ºç«?代ç??ç±»å??</string>
+  <string name="pref_proxy_type_summary">代ç??æ??å?¡å?¨ä½¿ç?¨ç??å??è®®ï¼?HTTPã??HTTPSã??Socks4ã??Socks5</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>
   <string name="status">ç?¶æ??</string>
+  <string name="setting_up_full_transparent_proxying_">æ­£å?¨å¯¹æ??æ??åº?ç?¨ç¨?åº?è¿?è¡?é??æ??代ç??设置...</string>
+  <string name="setting_up_app_based_transparent_proxying_">æ­£å?¨å¯¹æ??é??åº?ç?¨ç¨?åº?è¿?è¡?é??æ??代ç??设置...</string>
+  <string name="transparent_proxying_enabled">é??æ??代ç??å·²å?¯ç?¨</string>
+  <string name="transproxy_enabled_for_tethering_">已为���享�活 TransProxy �</string>
+  <string name="warning_error_starting_transparent_proxying_">è­¦å??ï¼?å?¯å?¨é??æ??代ç??æ?¶å??ç??é??误ï¼?</string>
+  <string name="transproxy_rules_cleared">å·²æ¸?é?¤ TransProxy è§?å??</string>
+  <string name="couldn_t_start_tor_process_">���� Tor ���</string>
+  <string name="privoxy_is_running_on_port_">Privoxy  å½?å??æ??ç?¨ç??端å?£ï¼?</string>
+  <string name="setting_up_port_based_transparent_proxying_">æ­£å?¨å¯¹å?ºäº?端å?£ç??é??æ??代ç??è¿?è¡?设置...</string>
   <string name="bridge_error">ç½?æ¡¥é??误</string>
+  <string name="bridge_requires_ip">为äº?é??使ç?¨ç½?æ¡¥ï¼?å¿?é¡»è?³å°?è¾?å?¥ä¸?个ç½?æ¡¥ IP å?°å??ã??</string>
+  <string name="send_email_for_bridges">å¦?é??è?·å??ç½?æ¡¥å?°å??ï¼?请使ç?¨ gmail å??é??ç?µå­?é?®ä»¶è?³ bridges@xxxxxxxxxxxxxx 并å?¨æ­£æ??å??å¡«ä¸?â?? get bridgesâ??ã??</string>
   <string name="error">é??误</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">å?¯è®¿é?®å?°å??设置导è?´å¼?常ï¼?</string>
+  <string name="your_relay_settings_caused_an_exception_">中继设置导��常�</string>
+  <string name="exit_nodes">å?ºå?£è??ç?¹</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">æ??å??跳转ç??å¯?é?¥æ??纹ã??æ?µç§°ã??å?½å®¶ä¸?å?°å??</string>
+  <string name="enter_exit_nodes">è¾?å?¥å?ºå?£è??ç?¹</string>
+  <string name="exclude_nodes">æ??é?¤è??ç?¹</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">æ??é?¤ç??å¯?é?¥æ??纹ã??æ?µç§°ã??å?½å®¶ä¸?å?°å??</string>
+  <string name="enter_exclude_nodes">è¾?å?¥æ??é?¤è??ç?¹</string>
+  <string name="strict_nodes">é??å?¶è??ç?¹</string>
+  <string name="use_only_these_specified_nodes">ä»?使ç?¨è¿?äº?æ??å®?è??ç?¹</string>
   <string name="bridges">ç½?æ¡¥</string>
   <string name="use_bridges">使��桥</string>
-  <string name="ip_address_and_port_of_bridges">ç½?æ¡¥ç??IPå?°å??å??端å?£</string>
+  <string name="bridges_obfuscated">æ··æ·?ç½?æ¡¥</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">使ç?¨å?¶ä»?å?¥å?£è??ç?¹è¿?æ?¥å?° Tor ç½?ç»?</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">å·²é??ç½®ç??ç½?桥为混æ·?ç½?æ¡¥æ?¶å?¯ç?¨</string>
+  <string name="ip_address_and_port_of_bridges">ç½?æ¡¥ç?? IP å?°å??å??端å?£</string>
+  <string name="enter_bridge_addresses">è¾?å?¥ç½?æ¡¥å?°å??</string>
+  <string name="relays">中继</string>
+  <string name="relaying">中继转å??</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">ä»?设置被设置为é??å?ºå?£ä¸­ç»§</string>
+  <string name="relay_port">中继端�</string>
+  <string name="listening_port_for_your_tor_relay">Tor 中继ç??侦å?¬ç«¯å?£</string>
+  <string name="enter_or_port">�� OR 端�</string>
+  <string name="relay_nickname">中继�称</string>
+  <string name="the_nickname_for_your_tor_relay">Tor 中继�称</string>
+  <string name="enter_a_custom_relay_nickname">�����中继�称</string>
+  <string name="reachable_addresses">å?¯è®¿é?®å?°å??</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">å?¨å?·æ??é??å?¶ç­?ç?¥é?²ç?«å¢?å??ï¼?ä½?为客æ?·ç«¯è¿?è¡?</string>
+  <string name="reachable_ports">�访�端�</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">é?²ç?«å¢?é??å®?ç??å?¯è®¿é?®ç«¯å?£</string>
+  <string name="enter_ports">��端�</string>
+  <string name="enable_hidden_services">é??è??æ??å?¡ä¸»æ?º</string>
+  <string name="run_servers_accessible_via_the_tor_network">å??许设å¤?ä¸?ç??æ??å?¡å?¨å?¯é??è¿? Tor ç½?ç»?访é?®</string>
+  <string name="enter_localhost_ports_for_hidden_services">è¾?å?¥é??è??æ??å?¡ç??æ?¬å?°ä¸»æ?ºç«¯å?£</string>
+  <string name="hidden_service_ports">é??è??æ??å?¡ç«¯å?£</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">é??è??æ??å?¡ç??å?°å??ï¼?è?ªå?¨ç??æ??ï¼?</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">å?¯ç?¨è°?è¯?æ?¥å¿?è¾?å?ºï¼?å¿?须使ç?¨ adb æ?? aLongCat æ?¥ç??ï¼?</string>
+  <string name="project_home">项�主页(s)�</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Tor许��</string>
+  <string name="the_tor_license">Tor 许��</string>
   <string name="https_torproject_org">https://torproject.org</string>
-  <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>
+  <string name="third_party_software">第��软件�</string>
+  <string name="tor_version">Tor v0.2.4.3-alphaï¼?https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.1.1-alphaï¼?http://www.monkey.org/~provos/libevent/</string>
   <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
-  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
-  <string name="default_bridges"/>
-  <string name="powered_by">ç?± Tor 项ç?®å¼ºå??驱å?¨</string>
+  <string name="iptables_version">Iptables v1.4.7ï¼?http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v0.9.8hï¼?http://www.openssl.org</string>
+  <string name="hidden_service_request">åº?ç?¨ç¨?åº?è¯?å?¾æ??å¼?é??è??æ??å?¡ä¸»æ?ºç«¯å?£ %S è¿?æ?¥ Tor ç½?ç»?ã??对äº?å?¯ä¿¡åº?ç?¨è¿?æ?¯å®?å?¨ç??ã??</string>
+  <string name="found_existing_tor_process">å??ç?°å½?å??å·²å­?å?¨ Tor è¿?ç¨?...</string>
+  <string name="something_bad_happened">å??ç??é??误ï¼?请æ£?æ?¥æ?¥å¿?</string>
+  <string name="hidden_service_on">é??è??æ??å?¡ä½?äº?ï¼?</string>
+  <string name="unable_to_read_hidden_service_name">æ? æ³?读å??é??è??æ??å?¡å??称</string>
+  <string name="unable_to_start_tor">���� Tor�</string>
+  <string name="pref_use_sys_iptables_title">使��认 iptables </string>
+  <string name="pref_use_sys_iptables_summary">使ç?¨å??ç½®ç?? iptables ç¨?åº?æ?¿ä»£ Orbot ç»?å®?ç?? iptables </string>
+  <string name="error_installing_binares">æ? æ³?å®?è£?æ??æ?´æ?° Tor ç¨?åº?ã??</string>
+  <string name="pref_use_persistent_notifications">Orbot è¿?æ?¥å??å§?ç»?å?¨é??ç?¥æ ?æ?¾ç¤ºå?¾æ ?</string>
+  <string name="pref_use_persistent_notifications_title">å§?ç»?æ?¾ç¤ºé??ç?¥</string>
+  <string name="notification_using_bridges">已���桥�</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">å?ºå??设置</string>
+  <string name="set_locale_summary">é??æ?© Orbot ç??å?ºå??设置ä¸?语è¨?</string>
+  <string name="wizard_locale_title">é??æ?©è¯­è¨?</string>
+  <string name="wizard_locale_msg">ä¿?æ??é»?认æ??å??æ?¢ä¸ºå½?å??æ??ç?¨è¯­è¨?</string>
+  <string name="powered_by">ç?± Tor Project æ??ä¾?æ??æ?¯æ?¯æ??</string>
+  <string name="btn_save_settings">��设置</string>
 </resources>



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