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

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

commit d8efb4be6c78d89d85c9c14bb68e8646a2d5b5b6
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Thu May 23 13:16:24 2013 +0000

    Update translations for orbot
---
 values-ar/strings.xml       |   98 +++++++++----------
 values-az/strings.xml       |    1 +
 values-bg/strings.xml       |    1 +
 values-bs/strings.xml       |   24 +++++
 values-ca/strings.xml       |    8 ++
 values-ca_ES/strings.xml    |   21 +++++
 values-cs/strings.xml       |    8 ++
 values-cy/strings.xml       |   54 +++++++++++
 values-da/strings.xml       |   11 +++
 values-en_GB/strings.xml    |   19 ++++
 values-eo/strings.xml       |   35 +++++++
 values-es_AR/strings.xml    |    2 +
 values-et/strings.xml       |   19 ++++
 values-eu/strings.xml       |    2 +
 values-fi/strings.xml       |   20 ++++
 values-gl/strings.xml       |   19 ++++
 values-gu/strings.xml       |   23 +++++
 values-gu_IN/strings.xml    |   20 ++++
 values-hi/strings.xml       |   29 ++++++
 values-hr/strings.xml       |   21 +++++
 values-hr_HR/strings.xml    |  217 ++++---------------------------------------
 values-ia/strings.xml       |   36 +++++++
 values-id/strings.xml       |   18 ++++
 values-is/strings.xml       |   40 ++++++++
 values-ja/strings.xml       |   10 ++
 values-ko_KR/strings.xml    |   36 +++++++
 values-ky/strings.xml       |   27 ++++++
 values-lt/strings.xml       |   32 +++++++
 values-mk/strings.xml       |    3 +
 values-my/strings.xml       |  216 ++++--------------------------------------
 values-nb/strings.xml       |  146 +++++++++++++++++++++++++++++
 values-pa/strings.xml       |   25 +++++
 values-pl_PL/strings.xml    |    4 +
 values-pt/strings.xml       |   10 ++
 values-ro/strings.xml       |   36 +++++++
 values-si/strings.xml       |   18 ++++
 values-si_LK/strings.xml    |   25 +++++
 values-sk/strings.xml       |   36 +++++++
 values-sk_SK/strings.xml    |   21 +++++
 values-sl/strings.xml       |   27 ++++++
 values-sq/strings.xml       |   36 +++++++
 values-sr/strings.xml       |   19 ++++
 values-sr@latin/strings.xml |   19 ++++
 values-ta/strings.xml       |   22 +++++
 values-te_IN/strings.xml    |   18 ++++
 values-th/strings.xml       |   18 ++++
 values-tr/strings.xml       |   13 +++
 values-uk/strings.xml       |   11 +++
 values-ur_PK/strings.xml    |   24 +++++
 values-vi/strings.xml       |   55 +++++++++++
 values-zh/strings.xml       |   74 +++++++--------
 values-zh_TW/strings.xml    |   36 +++++++
 52 files changed, 1283 insertions(+), 480 deletions(-)

diff --git a/values-ar/strings.xml b/values-ar/strings.xml
index 418eedb..3e5b8d3 100644
--- a/values-ar/strings.xml
+++ b/values-ar/strings.xml
@@ -14,15 +14,15 @@
   <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="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>
@@ -31,23 +31,23 @@
   <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">- اضغط Ù?Ù?ترة Ø·Ù?Ù?Ù?Ø© Ù?Ù?بدء -</string>
-  <string name="pref_trans_proxy_group">برÙ?Ù?سÙ? ضÙ?Ù?Ù? (Ù?تطÙ?ب اذÙ? حساب رÙ?Ù?ت Root)</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_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">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</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_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="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>
@@ -57,20 +57,20 @@
   <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">Ù?Ù?تاز! Ù?Ù?د Ù?جدÙ?ا بأÙ?Ù? Ù?دÙ?Ù? صÙ?احÙ?Ø© حساب رÙ?Ù?ت Ù?تÙ?Ù?Ù?Ù? Ø£Ù?ربÙ?ت. سÙ?Ù? Ù?ستخدÙ? Ù?Ø°Ù? اÙ?سÙ?طة بحÙ?Ù?Ø©.</string>
-  <string name="wizard_permissions_msg_stock">رغÙ? Ø£Ù?Ù? Ù?Ù?س ضرÙ?رÙ?اØ? Ù?Ù?Ù?Ù? اÙ? Ù?صبح Ø£Ù?ربÙ?ت أداة Ù?Ù?Ù?Ø© إذا Ù?اÙ? Ù?دÙ? جÙ?ازÙ? صÙ?احÙ?Ø© حساب رÙ?Ù?ت. استخدÙ? اÙ?زر باÙ?أسÙ?Ù? Ù?Ù?Ù?Ø­ Ø£Ù?ربÙ?ت Ù?Ù?Ø© Ø£Ù?بر!</string>
-  <string name="wizard_permissions_no_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_permission_enable_root">اÙ?Ù?Ø­ اÙ?ربÙ?ت صÙ?احÙ?Ø© حساب رÙ?Ù?ت</string>
   <string name="wizard_configure">تÙ?Ù?Ù?Ù? تÙ?رÙ?Ù?اÙ?</string>
-  <string name="wizard_configure_msg">Ø£Ù?ربÙ?ت Ù?عطÙ?Ù? اÙ?Ø®Ù?ار Ù?تÙ?جÙ?Ù? جÙ?Ù?ع حرÙ?ات Ù?رÙ?ر اÙ?تطبÙ?Ù?ات عبر تÙ?ر اÙ? Ù?إختÙ?ار اÙ?تطبÙ?Ù?ات بشÙ?Ù? Ù?ردÙ?.</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_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>
@@ -81,26 +81,26 @@
   <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_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="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">اÙ?ربÙ?ت Ù?جÙ?ب شبÙ?Ø© تÙ?ر Ù?Ù?Ø£Ù?درÙ?Ù?د!\nتÙ?ر Ù?ساعدÙ? Ù?Ù? اÙ?تغÙ?ب عÙ?Ù? تصÙ?Ù?Ø© اÙ?Ù?حتÙ?Ù?Ø? Ù?حص اÙ?اتصاÙ? Ù? اÙ?رÙ?ابة عÙ?Ù? اÙ?شبÙ?ات اÙ?تÙ? تÙ?دد خصÙ?صÙ?تÙ?Ø? Ù? عÙ?اÙ?اتÙ? اÙ?شخصÙ?Ø© Ù? Ù?عÙ?Ù?Ù?اتÙ? اÙ?سرÙ?Ø©.\nستÙ?Ù?Ù? Ù?Ø°Ù? اÙ?Ù?اÙ?ذة بÙ?ساعدتÙ? عÙ?Ù? ضبط تÙ?Ù?Ù?Ù? اÙ?ربÙ?ت Ù? تÙ?ر عÙ?Ù? جÙ?ازÙ?.</string>
+  <string name="wizard_title_msg">اÙ?ربÙ?ت Ù?جÙ?ب شبÙ?Ø© تÙ?ر Ù?Ù?Ø£Ù?درÙ?Ù?د!\n\nتÙ?ر Ù?ساعدÙ? Ù?Ù? اÙ?تغÙ?ب عÙ?Ù? تصÙ?Ù?Ø© اÙ?Ù?حتÙ?Ù?Ø? Ù?حص اÙ?اتصاÙ? Ù? اÙ?رÙ?ابة عÙ?Ù? اÙ?شبÙ?ات اÙ?تÙ? تÙ?دد خصÙ?صÙ?تÙ?Ø? Ù? عÙ?اÙ?اتÙ? اÙ?شخصÙ?Ø© Ù? Ù?عÙ?Ù?Ù?اتÙ? اÙ?سرÙ?Ø©.\n\nستÙ?Ù?Ù? Ù?Ø°Ù? اÙ?Ù?اÙ?ذة بÙ?ساعدتÙ? عÙ?Ù? ضبط تÙ?Ù?Ù?Ù? اÙ?ربÙ?ت Ù? تÙ?ر عÙ?Ù? جÙ?ازÙ?.</string>
   <!--Warning screen-->
   <string name="wizard_warning_title">تحذÙ?ر</string>
-  <string name="wizard_warning_msg">Ø£Ù? تثبÙ?ت اÙ?ربÙ?ت Ù?Ù?Ø· Ù?Ù? Ù?Ù?Ù?Ø­Ù? اÙ?خصÙ?صÙ?Ø© .\nÙ?جب عÙ?Ù?Ù? تÙ?Ù?Ù?Ù? اÙ?ربÙ?ت بشÙ?Ù? صحÙ?Ø­ Ø? Ù? جÙ?ازÙ? Ø? Ù? اÙ?براÙ?ج اÙ?اخرÙ? اÙ?تÙ? ترÙ?دÙ?ا اÙ? تستخدÙ? تÙ?ر.</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_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>
@@ -133,27 +133,27 @@
 <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_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_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="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="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="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>
@@ -164,26 +164,26 @@
   <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="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="relay_port">Ù?Ù?Ù?Ø° اÙ?Ù?رحÙ?</string>
   <string name="listening_port_for_your_tor_relay">اÙ?Ù?Ù?Ù?Ø° اÙ?Ù?صغÙ? Ù?Ù?Ù?رحÙ? تÙ?ر اÙ?خاص بÙ?</string>
-  <string name="enter_or_port">أدخÙ? Ø£Ù? Ù?Ù?Ù?Ø°</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="reachable_addresses">اÙ?عÙ?اÙ?Ù?Ù? اÙ?تÙ? Ù?Ù?Ù?Ù? اÙ?Ù?صÙ?Ù? Ø¥Ù?Ù?Ù?ا</string>
   <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">اÙ?عÙ?Ù? Ù?خدÙ?Ø© Ù?Ù? Ù?راء جدار Ù?ارÙ? بسÙ?اسات تÙ?Ù?دÙ?Ø©</string>
-  <string name="reachable_ports">اÙ?Ù?Ù?اÙ?Ø° اÙ?Ù?ابÙ?Ø© Ù?Ù?اتصاÙ?</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>
@@ -191,12 +191,12 @@
   <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="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>
@@ -205,12 +205,12 @@
   <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="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>
diff --git a/values-az/strings.xml b/values-az/strings.xml
index 6caf084..8030a60 100644
--- a/values-az/strings.xml
+++ b/values-az/strings.xml
@@ -34,6 +34,7 @@
   <string name="btn_okay">Okey</string>
   <string name="btn_cancel">LÉ?Ä?v et</string>
   <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Proksi qurÄ?uları</string>
   <!--END Welcome Wizard strings (DJH)-->
   <string name="pref_general_group">Æ?sas</string>
   <!--New Wizard Strings-->
diff --git a/values-bg/strings.xml b/values-bg/strings.xml
index 9c4a835..c249f53 100644
--- a/values-bg/strings.xml
+++ b/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-->
diff --git a/values-bs/strings.xml b/values-bs/strings.xml
new file mode 100644
index 0000000..a55a212
--- /dev/null
+++ b/values-bs/strings.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="menu_info">PomoÄ?</string>
+  <string name="button_help">PomoÄ?</string>
+  <string name="button_close">Zatvori</string>
+  <string name="btn_back">Nazad</string>
+  <string name="btn_cancel">Otkaži</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Proksi postavke</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--<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="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/values-ca/strings.xml b/values-ca/strings.xml
index 2ad1211..e5d562a 100644
--- a/values-ca/strings.xml
+++ b/values-ca/strings.xml
@@ -11,6 +11,8 @@
   <string name="status_activated">Connectat a la xarxa Tor</string>
   <string name="status_disabled">Orbot està desactivat</string>
   <string name="status_shutting_down">Orbot s\'està aturant</string>
+  <string name="tor_process_complete">acomplert.</string>
+  <string name="tor_process_waiting">esperant.</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>
@@ -83,6 +85,7 @@
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
+  <string name="wizard_warning_title">Advertència</string>
   <!--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>
@@ -92,8 +95,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">Utilitza un proxy transparent</string>
+  <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="status">Estat</string>
+  <string name="error">Error</string>
   <string name="default_bridges"></string>
   <string name="powered_by">Funciona gràcies al Projecte Tor</string>
+  <string name="btn_save_settings">Desa els paràmetres</string>
 </resources>
diff --git a/values-ca_ES/strings.xml b/values-ca_ES/strings.xml
new file mode 100644
index 0000000..6c721b8
--- /dev/null
+++ b/values-ca_ES/strings.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="menu_browse">Navega</string>
+  <string name="btn_cancel">Cancel·la</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--<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>
+</resources>
diff --git a/values-cs/strings.xml b/values-cs/strings.xml
index 489237b..2a1604d 100644
--- a/values-cs/strings.xml
+++ b/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="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/values-cy/strings.xml b/values-cy/strings.xml
new file mode 100644
index 0000000..a5e8d1f
--- /dev/null
+++ b/values-cy/strings.xml
@@ -0,0 +1,54 @@
+<?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">dechrau ac yn stopio Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_activated">Gysylltu â\'r rhwydwaith Tor</string>
+  <string name="status_shutting_down">Orbot yn cau i lawr</string>
+  <string name="tor_process_complete">gwneud.</string>
+  <string name="tor_process_waiting">yn aros.</string>
+  <string name="not_anonymous_yet">RHYBUDD: Nid yw eich traffig yn ddienw eto! Os gwelwch yn dda ffurfweddu eich ceisiadau at arfer HTTP proxy 127.0.0.1:8118 neu SOCKS4A neu ddirprwy SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Dechrau</string>
+  <string name="menu_browse">Pori</string>
+  <string name="menu_settings">Gosodiadau</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Ð?опомога</string>
+  <string name="menu_apps">Apps</string>
+  <string name="menu_start">Dechrau</string>
+  <string name="menu_stop">Stop</string>
+  <string name="menu_about">Amdanom ni</string>
+  <string name="button_help">Ð?опомога</string>
+  <string name="button_close">Cau</string>
+  <string name="button_about">Amdanom ni</string>
+  <string name="menu_verify">Gwirio</string>
+  <string name="menu_exit">Allanfa</string>
+  <string name="pref_trans_proxy_group">Proxying tryloyw (Requires Root)</string>
+  <string name="pref_trans_proxy_title">Proxying tryloyw</string>
+  <string name="pref_trans_proxy_summary">\'N awtomatig Torifying o Apps</string>
+  <string name="pref_transparent_all_title">Tor popeth</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="btn_cancel">Canslo</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Gosodiadau Procsi</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--<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">Proxying tryloyw</string>
+  <string name="wizard_transproxy_none">Dim</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="error">Gwall</string>
+  <string name="default_bridges"></string>
+</resources>
diff --git a/values-da/strings.xml b/values-da/strings.xml
index 2f942a1..2c322be 100644
--- a/values-da/strings.xml
+++ b/values-da/strings.xml
@@ -11,6 +11,8 @@
   <string name="status_activated">Der er forbindelse til Tor-netværket</string>
   <string name="status_disabled">Orbot er slået fra</string>
   <string name="status_shutting_down">Orbot lukker ned</string>
+  <string name="tor_process_complete">udført.</string>
+  <string name="tor_process_waiting">afventer.</string>
   <string name="not_anonymous_yet">ADVARSEL: Din trafik er ikke endnu ikke anonym! Konfigurér venligst dine programmer, så de bruger HTTP proxy 127.0.0.1:8118 eller SOCKS4A eller SOCKS5-proxy 127.0.0.1:9050</string>
   <string name="menu_home">Hjem</string>
   <string name="menu_browse">Brows</string>
@@ -43,11 +45,15 @@
   <string name="btn_next">Næste</string>
   <string name="btn_back">Tilbage</string>
   <string name="btn_finish">Afslut</string>
+  <string name="btn_cancel">Fortryd</string>
   <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Proxy-indstillinger</string>
   <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Generelt</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
+  <string name="wizard_warning_title">Advarsel</string>
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
@@ -55,8 +61,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">Transperant Proxying</string>
+  <string name="wizard_transproxy_none">Ingen</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="status">Status</string>
+  <string name="error">Fejl</string>
   <string name="default_bridges"></string>
   <string name="powered_by">drevet af The Tor Project</string>
+  <string name="btn_save_settings">Gem Indstillinger</string>
 </resources>
diff --git a/values-en_GB/strings.xml b/values-en_GB/strings.xml
new file mode 100644
index 0000000..24b11a8
--- /dev/null
+++ b/values-en_GB/strings.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="btn_next">Next</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--<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="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/values-eo/strings.xml b/values-eo/strings.xml
new file mode 100644
index 0000000..cabf10a
--- /dev/null
+++ b/values-eo/strings.xml
@@ -0,0 +1,35 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="menu_home">Hejma tasto</string>
+  <string name="menu_browse">Foliumi</string>
+  <string name="menu_settings">Agordoj</string>
+  <string name="menu_info">Helpo</string>
+  <string name="menu_about">Pri</string>
+  <string name="button_help">Helpo</string>
+  <string name="button_close">Fermi</string>
+  <string name="button_about">Pri</string>
+  <string name="menu_exit">Eliri</string>
+  <string name="btn_back">MalantaÅ­e</string>
+  <string name="btn_cancel">Rezigni</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Retperantâ??agordoj</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Ä?enerala</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Averto</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--<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">Neniom</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="status">Stato</string>
+  <string name="error">Eraro</string>
+  <string name="default_bridges"></string>
+</resources>
diff --git a/values-es_AR/strings.xml b/values-es_AR/strings.xml
index 06453a3..ea529df 100644
--- a/values-es_AR/strings.xml
+++ b/values-es_AR/strings.xml
@@ -33,6 +33,7 @@
   <string name="pref_trans_proxy_title">Proxying Transparente</string>
   <string name="pref_trans_proxy_summary">Torificación Automática de Aplicaciones</string>
   <string name="pref_transparent_all_title">Torear Todo</string>
+  <string name="wizard_title">Orbot</string>
   <string name="btn_next">Siguiente</string>
   <string name="btn_back">Atrás</string>
   <string name="btn_finish">Finalizar</string>
@@ -51,6 +52,7 @@
     <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">Proxying Transparente</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>
diff --git a/values-et/strings.xml b/values-et/strings.xml
new file mode 100644
index 0000000..2f8ea7f
--- /dev/null
+++ b/values-et/strings.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="btn_cancel">Katkesta</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--<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="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/values-eu/strings.xml b/values-eu/strings.xml
index f46912a..cb86f58 100644
--- a/values-eu/strings.xml
+++ b/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>
@@ -148,4 +149,5 @@
   <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/values-fi/strings.xml b/values-fi/strings.xml
index 0f46066..c6b53a5 100644
--- a/values-fi/strings.xml
+++ b/values-fi/strings.xml
@@ -1,10 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="menu_home">Alkuun</string>
+  <string name="menu_browse">Selaa</string>
+  <string name="menu_settings">Asetukset</string>
+  <string name="menu_info">Apua</string>
+  <string name="menu_about">Tietoa</string>
+  <string name="button_help">Apua</string>
+  <string name="button_close">Sulje</string>
+  <string name="button_about">Tietoa</string>
+  <string name="menu_verify">Tarkista</string>
+  <string name="menu_exit">Lopeta</string>
+  <string name="btn_next">Seuraava</string>
+  <string name="btn_back">Takaisin</string>
+  <string name="btn_cancel">Peruuta</string>
   <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Välityspalvelin Asetukset</string>
   <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Yleiset</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
+  <string name="wizard_warning_title">Varoitus</string>
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
@@ -12,7 +28,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_none">Ei mikään</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="status">Tila</string>
+  <string name="error">Virhe</string>
   <string name="default_bridges"></string>
+  <string name="btn_save_settings">Tallenna asetukset</string>
 </resources>
diff --git a/values-gl/strings.xml b/values-gl/strings.xml
index 0f46066..f552f3b 100644
--- a/values-gl/strings.xml
+++ b/values-gl/strings.xml
@@ -1,10 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="menu_home">Inicio</string>
+  <string name="menu_browse">Examinar</string>
+  <string name="menu_settings">Axustes</string>
+  <string name="menu_info">Axuda</string>
+  <string name="menu_about">Sobre</string>
+  <string name="button_help">Axuda</string>
+  <string name="button_close">Pechar</string>
+  <string name="button_about">Sobre</string>
+  <string name="menu_verify">Comprobar</string>
+  <string name="menu_exit">Saír </string>
+  <string name="btn_back">Atrás</string>
+  <string name="btn_cancel">Cancelar</string>
   <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Axustes do proxy</string>
   <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Xeral</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>
@@ -12,7 +27,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_none">Ninguna</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="status">Estado</string>
+  <string name="error">Erro</string>
   <string name="default_bridges"></string>
+  <string name="btn_save_settings">Gardar os axustes</string>
 </resources>
diff --git a/values-gu/strings.xml b/values-gu/strings.xml
new file mode 100644
index 0000000..a8080da
--- /dev/null
+++ b/values-gu/strings.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="menu_info">મદદ</string>
+  <string name="button_help">મદદ</string>
+  <string name="button_close">બ�ધ �ર�</string>
+  <string name="btn_cancel">રદ� �ર�</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">પ�ર���સ� ��ઠવણ��</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--<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="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/values-gu_IN/strings.xml b/values-gu_IN/strings.xml
new file mode 100644
index 0000000..95492e5
--- /dev/null
+++ b/values-gu_IN/strings.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="btn_cancel">રદ �ર�</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">પ�ર���સ� ��ઠવણ��</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--<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="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/values-hi/strings.xml b/values-hi/strings.xml
new file mode 100644
index 0000000..d4f4165
--- /dev/null
+++ b/values-hi/strings.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <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_proxy_help_info">प�र���स� स�����</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">समन�य </string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--<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">��� नह��</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="status">स�थिति</string>
+  <string name="default_bridges"></string>
+</resources>
diff --git a/values-hr/strings.xml b/values-hr/strings.xml
new file mode 100644
index 0000000..cda2f90
--- /dev/null
+++ b/values-hr/strings.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="menu_info">PomoÄ?</string>
+  <string name="button_help">PomoÄ?</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Proxy postavke</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--<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="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/values-hr_HR/strings.xml b/values-hr_HR/strings.xml
index 520215c..74971db 100644
--- a/values-hr_HR/strings.xml
+++ b/values-hr_HR/strings.xml
@@ -1,213 +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">Polazno</string>
+  <string name="menu_browse">Pretraži</string>
+  <string name="menu_settings">Postavke</string>
+  <string name="menu_info">PomoÄ?</string>
+  <string name="menu_about">O</string>
+  <string name="button_help">PomoÄ?</string>
+  <string name="button_close">Zatvori</string>
+  <string name="button_about">O</string>
+  <string name="menu_exit">Izlaz</string>
+  <string name="btn_back">Povratak</string>
+  <string name="btn_cancel">Odustani</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">Postavke Proxya</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>
+  <string name="pref_general_group">OpÄ?enito</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">Upozorenje</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="wizard_transproxy_none">Nepoznato</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="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="error">Greška</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">Spremi postavke</string>
 </resources>
diff --git a/values-ia/strings.xml b/values-ia/strings.xml
new file mode 100644
index 0000000..44f7cad
--- /dev/null
+++ b/values-ia/strings.xml
@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="menu_home">Initio</string>
+  <string name="menu_browse">Navigar</string>
+  <string name="menu_settings">Configurationes</string>
+  <string name="menu_info">Adjuta</string>
+  <string name="menu_about">Circa</string>
+  <string name="button_help">Adjuta</string>
+  <string name="button_close">Clauder</string>
+  <string name="button_about">Circa</string>
+  <string name="menu_exit">Sortir</string>
+  <string name="btn_back">Retro</string>
+  <string name="btn_cancel">Cancellar</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Configurationes de proxy:</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">General</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Advertimento</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--<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">Nulle</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="status">Stato</string>
+  <string name="error">Error</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">Salveguardar configurationes</string>
+</resources>
diff --git a/values-id/strings.xml b/values-id/strings.xml
index 7a42c62..1107c5b 100644
--- a/values-id/strings.xml
+++ b/values-id/strings.xml
@@ -12,11 +12,25 @@
   <string name="status_disabled">Orbot telah dibatalkan</string>
   <string name="status_shutting_down">Orbot sedang dimatikan</string>
   <string name="not_anonymous_yet">PERINGATAN: </string>
+  <string name="menu_home">Home</string>
+  <string name="menu_browse">Jelajahi</string>
+  <string name="menu_settings">Pengaturan</string>
+  <string name="menu_info">Bantuan</string>
+  <string name="menu_about">Mengenai</string>
+  <string name="button_help">Bantuan</string>
+  <string name="button_close">Dekat</string>
+  <string name="button_about">Mengenai</string>
+  <string name="menu_exit">Keluar</string>
+  <string name="btn_back">Kembali</string>
+  <string name="btn_cancel">Batal</string>
   <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Pengaturan Proxy</string>
   <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Umum</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
+  <string name="wizard_warning_title">Peringatan</string>
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
@@ -24,7 +38,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_none">Tidak ada</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="status">Status</string>
+  <string name="error">Kesalahan</string>
   <string name="default_bridges"></string>
+  <string name="btn_save_settings">Simpan Pengaturan</string>
 </resources>
diff --git a/values-is/strings.xml b/values-is/strings.xml
new file mode 100644
index 0000000..750ab06
--- /dev/null
+++ b/values-is/strings.xml
@@ -0,0 +1,40 @@
+<?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">ræsa og stöðva Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="menu_home">Heim</string>
+  <string name="menu_settings">Stillingar</string>
+  <string name="menu_info">Hjálp</string>
+  <string name="menu_about">Um</string>
+  <string name="button_help">Hjálp</string>
+  <string name="button_close">Loka</string>
+  <string name="button_about">Um</string>
+  <string name="menu_exit">Hætta</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="btn_back">Til baka</string>
+  <string name="btn_cancel">Hætta við</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Almennt</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Aðvörun</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--<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="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="status">Staða</string>
+  <string name="error">Villa</string>
+  <string name="default_bridges"></string>
+</resources>
diff --git a/values-ja/strings.xml b/values-ja/strings.xml
index e2199d9..a859789 100644
--- a/values-ja/strings.xml
+++ b/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>
diff --git a/values-ko_KR/strings.xml b/values-ko_KR/strings.xml
new file mode 100644
index 0000000..7074e64
--- /dev/null
+++ b/values-ko_KR/strings.xml
@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <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_proxy_help_info">í??ë¡?ì?? ì?¤ì ?</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">��</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">경고</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--<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">ì??ì??</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="status">ì??í??</string>
+  <string name="error">��</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">ì?¤ì ? ì ?ì?¥í??기</string>
+</resources>
diff --git a/values-ky/strings.xml b/values-ky/strings.xml
new file mode 100644
index 0000000..9eb02ea
--- /dev/null
+++ b/values-ky/strings.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="menu_settings">ЫÑ?аÑ?Ñ?оолоÑ?</string>
+  <string name="menu_info">Ð?аÑ?дам</string>
+  <string name="menu_about">Ð?Ñ?огÑ?амма жөнүндө</string>
+  <string name="button_help">Ð?аÑ?дам</string>
+  <string name="button_about">Ð?Ñ?огÑ?амма жөнүндө</string>
+  <string name="menu_exit">ЧÑ?гÑ?Ñ?</string>
+  <string name="btn_cancel">Ð?йнÑ?Ñ?</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--<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="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="status">Ð?бал</string>
+  <string name="error">Ð?аÑ?а</string>
+  <string name="default_bridges"></string>
+</resources>
diff --git a/values-lt/strings.xml b/values-lt/strings.xml
new file mode 100644
index 0000000..9d3698c
--- /dev/null
+++ b/values-lt/strings.xml
@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="menu_browse">Naršyti</string>
+  <string name="menu_settings">Nustatymai</string>
+  <string name="menu_info">Pagalba</string>
+  <string name="menu_about">Apie</string>
+  <string name="button_help">Pagalba</string>
+  <string name="button_close">Uždaryti</string>
+  <string name="button_about">Apie</string>
+  <string name="menu_exit">IÅ¡eiti</string>
+  <string name="btn_back">Atgal</string>
+  <string name="btn_cancel">Atsisakyti</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Ä®spÄ?jimas</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--<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">Joks</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="error">Klaida</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">IÅ¡saugoti nustatymus</string>
+</resources>
diff --git a/values-mk/strings.xml b/values-mk/strings.xml
index 7d25090..4b319fe 100644
--- a/values-mk/strings.xml
+++ b/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,6 +94,7 @@
     <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>
diff --git a/values-my/strings.xml b/values-my/strings.xml
index c2a5e2d..cbacdd7 100644
--- a/values-my/strings.xml
+++ b/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/values-nb/strings.xml b/values-nb/strings.xml
index e598aa4..af9438f 100644
--- a/values-nb/strings.xml
+++ b/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">Last ned</string>
+  <string name="main_layout_upload">Last opp</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="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">IPadresser 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/values-pa/strings.xml b/values-pa/strings.xml
new file mode 100644
index 0000000..3edb9f9
--- /dev/null
+++ b/values-pa/strings.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="menu_browse">�ਰਨਾ</string>
+  <string name="menu_settings">ਪਰਿਸਥਿਤ�</string>
+  <string name="menu_info">ਸਹਾ�ਤਾ</string>
+  <string name="button_help">ਸਹਾ�ਤਾ</string>
+  <string name="btn_cancel">ਰੱਦ �ਰ�</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">ਪਰਾ�ਸ� ਸ��ਿੰ�</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--<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">�ਾਲ�</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/values-pl_PL/strings.xml b/values-pl_PL/strings.xml
index 342e8ae..25e7504 100644
--- a/values-pl_PL/strings.xml
+++ b/values-pl_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="status">Status</string>
   <string name="default_bridges"></string>
   <string name="powered_by">powered by The Tor Project </string>
 </resources>
diff --git a/values-pt/strings.xml b/values-pt/strings.xml
index 9e5c5a9..a92e94c 100644
--- a/values-pt/strings.xml
+++ b/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="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/values-ro/strings.xml b/values-ro/strings.xml
new file mode 100644
index 0000000..fbfc2df
--- /dev/null
+++ b/values-ro/strings.xml
@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="menu_home">Pagina de start</string>
+  <string name="menu_browse">RÄ?sfoieÅ?te</string>
+  <string name="menu_settings">SetÄ?ri</string>
+  <string name="menu_info">AsistenÅ£Ä?</string>
+  <string name="menu_about">Despre</string>
+  <string name="button_help">AsistenÅ£Ä?</string>
+  <string name="button_close">Ã?nchide</string>
+  <string name="button_about">Despre</string>
+  <string name="menu_exit">IeÅ?ire</string>
+  <string name="btn_back">Ã?napoi</string>
+  <string name="btn_cancel">Revocare</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">SetÄ?ri proxy</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">General</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Avertizare</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--<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">Nimic</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="status">Stare</string>
+  <string name="error">Eroare</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">SalveazÄ? setÄ?rile</string>
+</resources>
diff --git a/values-si/strings.xml b/values-si/strings.xml
new file mode 100644
index 0000000..0f46066
--- /dev/null
+++ b/values-si/strings.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--<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="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/values-si_LK/strings.xml b/values-si_LK/strings.xml
new file mode 100644
index 0000000..889b0e3
--- /dev/null
+++ b/values-si_LK/strings.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="menu_browse">ප�ර����න�න</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)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--<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">������� න�ම�ත</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/values-sk/strings.xml b/values-sk/strings.xml
new file mode 100644
index 0000000..c524791
--- /dev/null
+++ b/values-sk/strings.xml
@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="menu_home">Domov</string>
+  <string name="menu_browse">Prehliadať</string>
+  <string name="menu_settings">Nastavenia</string>
+  <string name="menu_info">Pomocník</string>
+  <string name="menu_about">O aplikácií</string>
+  <string name="button_help">Pomocník</string>
+  <string name="button_close">Zatvoriť</string>
+  <string name="button_about">O aplikácií</string>
+  <string name="menu_exit">UkonÄ?iÅ¥</string>
+  <string name="btn_back">Späť</string>
+  <string name="btn_cancel">Zrušiť</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Nastavenie proxy</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Všeobecné</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Varovanie</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--<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">Žiadny</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="status">Stav</string>
+  <string name="error">Chyba</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">Uložiť nastavenie</string>
+</resources>
diff --git a/values-sk_SK/strings.xml b/values-sk_SK/strings.xml
new file mode 100644
index 0000000..c7c5b85
--- /dev/null
+++ b/values-sk_SK/strings.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="menu_info">Pomocník</string>
+  <string name="button_help">Pomocník</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Nastavenia proxy</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--<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="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/values-sl/strings.xml b/values-sl/strings.xml
new file mode 100644
index 0000000..ccb3084
--- /dev/null
+++ b/values-sl/strings.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="menu_settings">Nastavitve</string>
+  <string name="menu_info">PomoÄ?</string>
+  <string name="button_help">PomoÄ?</string>
+  <string name="button_close">Zapri</string>
+  <string name="btn_back">Nazaj</string>
+  <string name="btn_cancel">Prekini</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Nastavitve posredniškega (proxy) strežnika</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Splošno</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--<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="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="status">Stanje</string>
+  <string name="default_bridges"></string>
+</resources>
diff --git a/values-sq/strings.xml b/values-sq/strings.xml
new file mode 100644
index 0000000..e097895
--- /dev/null
+++ b/values-sq/strings.xml
@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="menu_home">Shpi</string>
+  <string name="menu_browse">Lundro</string>
+  <string name="menu_settings">Zgjedhjet</string>
+  <string name="menu_info">Ndihmë</string>
+  <string name="menu_about">Informacione</string>
+  <string name="button_help">Ndihmë</string>
+  <string name="button_close">Mbylle</string>
+  <string name="button_about">Informacione</string>
+  <string name="menu_exit">Dil</string>
+  <string name="btn_back">Mbrapa</string>
+  <string name="btn_cancel">Anullo</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Konfigurimi i Proxy</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Të Përgjithshme</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Warning</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--<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">Asnjë</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="status">Gjëndja</string>
+  <string name="error">Gabim</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">Shpëto Konfigurmin</string>
+</resources>
diff --git a/values-sr/strings.xml b/values-sr/strings.xml
index 0f46066..f072292 100644
--- a/values-sr/strings.xml
+++ b/values-sr/strings.xml
@@ -1,10 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="menu_home">Ð?оÑ?еÑ?ак</string>
+  <string name="menu_browse">Pronadji</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_next">Sledece</string>
+  <string name="btn_back">Ð?азад</string>
+  <string name="btn_cancel">Ð?Ñ?кажи</string>
   <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Ð?Ñ?окÑ?и подеÑ?аваÑ?а</string>
   <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Ð?пÑ?Ñ?е</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
+  <string name="wizard_warning_title">Upozorenje</string>
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
@@ -12,7 +27,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_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="status">СÑ?аÑ?Ñ?Ñ?</string>
+  <string name="error">Greška</string>
   <string name="default_bridges"></string>
+  <string name="btn_save_settings">СаÑ?Ñ?ваÑ? подеÑ?аваÑ?а</string>
 </resources>
diff --git a/values-sr@latin/strings.xml b/values-sr@latin/strings.xml
new file mode 100644
index 0000000..63ce6f9
--- /dev/null
+++ b/values-sr@latin/strings.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="btn_cancel">Otkaži</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--<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="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/values-ta/strings.xml b/values-ta/strings.xml
new file mode 100644
index 0000000..4690d21
--- /dev/null
+++ b/values-ta/strings.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="menu_info">�தவி</string>
+  <string name="button_help">�தவி</string>
+  <string name="button_close">ம��வ�ம�</string>
+  <string name="btn_cancel">ரத�த���ய�</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--<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="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/values-te_IN/strings.xml b/values-te_IN/strings.xml
new file mode 100644
index 0000000..0f46066
--- /dev/null
+++ b/values-te_IN/strings.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--<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="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/values-th/strings.xml b/values-th/strings.xml
index 0f46066..a446f00 100644
--- a/values-th/strings.xml
+++ b/values-th/strings.xml
@@ -1,10 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <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_proxy_help_info">�ั����า proxy</string>
   <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">�ั�ว��</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
+  <string name="wizard_warning_title">��อ��ือ�</string>
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
@@ -12,7 +26,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_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="status">ส�า�ะ</string>
+  <string name="error">�ิ��ลา�</string>
   <string name="default_bridges"></string>
+  <string name="btn_save_settings">�ั������าร�ั����า</string>
 </resources>
diff --git a/values-tr/strings.xml b/values-tr/strings.xml
index 9d83d8e..ac350f1 100644
--- a/values-tr/strings.xml
+++ b/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="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/values-uk/strings.xml b/values-uk/strings.xml
index 0f46066..f047e2d 100644
--- a/values-uk/strings.xml
+++ b/values-uk/strings.xml
@@ -1,7 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <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_proxy_help_info">Ð?аÑ?амеÑ?Ñ?и пÑ?окÑ?Ñ?</string>
   <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Ð?Ñ?новнÑ?</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
@@ -12,7 +21,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_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="status">СÑ?аÑ?Ñ?Ñ?</string>
   <string name="default_bridges"></string>
 </resources>
diff --git a/values-ur_PK/strings.xml b/values-ur_PK/strings.xml
new file mode 100644
index 0000000..22c1de7
--- /dev/null
+++ b/values-ur_PK/strings.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="menu_browse">براؤز Ú©Û?جÛ?Û?</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)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--<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="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/values-vi/strings.xml b/values-vi/strings.xml
new file mode 100644
index 0000000..cde6ed6
--- /dev/null
+++ b/values-vi/strings.xml
@@ -0,0 +1,55 @@
+<?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">bắt Ä?ầu và ngừng Tor</string>
+  <string name="status_activated">Kết n�i v�i mạng Tor</string>
+  <string name="status_shutting_down">Orbot Ä?ang tắt</string>
+  <string name="tor_process_starting">Bắt Ä?ầu Tor</string>
+  <string name="not_anonymous_yet">Chú ý: luá»?ng thông tin của bạn không phải là ẩn danh! Hãy cấu hình các ứng dụng của bạn Ä?á»? sá»­ dụng HTTP proxy 127.0.0.1:8118 hoặc SOCKS4A hoặc proxy SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Trang chu</string>
+  <string name="menu_browse">Trình duy�t</string>
+  <string name="menu_settings">Thiết lập</string>
+  <string name="menu_info">Giúp Ä?ỡ</string>
+  <string name="menu_start">Bắt Ä?ầu</string>
+  <string name="menu_stop">Ngừng</string>
+  <string name="menu_about">Vá»?</string>
+  <string name="button_help">Giúp Ä?ỡ</string>
+  <string name="button_close">Ä?óng</string>
+  <string name="button_about">Giá»?i thiá»?u</string>
+  <string name="menu_exit">Thoát</string>
+  <string name="btn_back">Trá»? vá»?</string>
+  <string name="btn_cancel">Hủy</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+  <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
+  <string name="wizard_proxy_help_info">Những Cài Ä?ặt máy chủ proxy</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Chung</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Cảnh báo</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string>
+  <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.xpi</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_none">Không có</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="status">Tình trạng</string>
+  <string name="error">Lá»?i</string>
+  <string name="libevent_version">LibEvent v2.1.1-alpha: http://www.monkey.org/~provos/libevent/</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">Thiết lập Bảo lưu</string>
+</resources>
diff --git a/values-zh/strings.xml b/values-zh/strings.xml
index 2a7ed48..38db494 100644
--- a/values-zh/strings.xml
+++ b/values-zh/strings.xml
@@ -37,14 +37,14 @@
   <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">æ??æ??åº?ç?¨ç¨?åº?使ç?¨ T</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">代ç??端å?£å??表ã??ä»?å?¨â??åº?ç?¨ç¨?åº?â??æ??â??åº?ç?¨ç¨?åº?â??模å¼?æ? æ³?å·¥ä½?æ?¶ä½¿ç?¨ã??</string>
   <string name="pref_transparent_port_dialog">è¾?å?¥ä»£ç??端å?£</string>
-  <string name="pref_has_root">请æ±? Root æ??é??</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>
@@ -61,33 +61,33 @@
   <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">好æ??äº?ï¼?æ??们æ£?æµ?å?°æ?¨å·²è?·å?? ROOT æ??é??并å?¯ç?¨äº? Orbot ã??å?¨é??è¦?ç??æ?¶å??æ??们å°?å?¯ä»¥ä½¿ç?¨è¿?个强大ç??å??è?½ã??</string>
-  <string name="wizard_permissions_msg_stock">è?½ç?¶å¹¶é??å¿?é¡»ï¼?ä½?å¦?æ??æ?¨ç??设å¤?æ?¥æ?? ROOT æ??é??å°?使 Orbot æ??为æ?´å¼ºå¤§ç??å·¥å?·ã??使ç?¨ä¸?é?¢ç??æ??é?®æ?¥è®© Orbot è?·å¾?è¶?强ç??è?½å??å?§ï¼?</string>
-  <string name="wizard_permissions_no_root">å¦?æ??æ?¨æ²¡æ?? ROOT æ??é??æ??ä¸?æ??ç?½æ??们è°?论ç??å??容ï¼?é?£å?ªè?½ä½¿ç?¨é?£äº? 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 è¿?è¡?ç½?ç»?é??讯æ??é??æ?©ä½¿ç?¨ Tor è¿?è¡?ç½?ç»?é??讯ç??å??ç?¬åº?ç?¨ç¨?åº?ã??</string>
-  <string name="wizard_configure_all">é??è¿? Tor 代ç??æ??æ??åº?ç?¨ç¨?åº?</string>
-  <string name="wizard_configure_select_apps">é??æ?©é??è¦?使ç?¨ Tor ç??åº?ç?¨ç¨?åº?</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 å??åº?ã??\nGuardianProject.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="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 移å?¨å®¢æ?·ç«¯ä»£ç??æ??件</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="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    主æ?ºè®¾ç½®ä¸º 127.0.0.1 æ?? localhostã??对äº? HTTPï¼?端å?£åº?设置为 8118ï¼?对äº? SOCKSï¼?端å?£åº?设置为 9050ã??å¦?æ??æ??å?¯è?½æ?¨åº?该尽é??使ç?¨ SOCKS4A æ?? SOCKS5 代ç??ã??\n\n    æ?¨å?¯ä»¥å?¨ http://tinyurl.com/proxyandroid ç?? FAQï¼?常è§?é?®é¢?ï¼?中äº?解æ?´å¤?å?¨ 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ï¼?\n    è®°è??å??å??客ã??人æ??å·¥ä½?è??ã??æ³?å¾?å·¥ä½?è??ã??å??人ã??ä¼?ä¸?ã??ä¸?å?¶æ?¿æ??ä¸?ç??人æ°?ï¼?以å??å??ä½ æ??ä¸?æ ·ç??æ?®é??å?¬æ°?...\n    ç?°å?¨æ?¨äº¦å·²å??å¤?就绪ï¼?欢è¿?æ?¨ï¼?</string>
+  <string name="wizard_final_msg">å?¨ä¸?ç??å??å?°æ??æ??å??ä¸?ä¸?ç??人å?ºäº?å??ç§?å??æ ·ç??å??å? é??è¦?使ç?¨ Torï¼?\n\nè®°è??å??å??客ã??人æ??å·¥ä½?è??ã??æ³?å¾?å·¥ä½?è??ã??å??人ã??ä¼?ä¸?ã??ä¸?å?¶å?½å®¶ç??人æ°?ï¼?以å??å??ä½ æ??ä¸?æ ·ç??æ?®é??å?¬æ°?...\n ç?°å?¨ä½ å·²å??å¤?就绪ï¼?欢è¿?å? å?¥ï¼?</string>
   <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">æ?¨å·²æ??å??è¿?æ?¥å?° Tor ç½?ç»?\n- ä½?è¿?并ä¸?æ??å?³ç??æ?¨ç??设å¤?æ?¯å®?å?¨ç??ï¼?æ?¨å?¯ä»¥ä½¿ç?¨è??å??中ç??ã??æ£?æ?¥ã??é??项æ?¥æµ?è¯?æ?¨ç??æµ?è§?å?¨ã??\n\näº?解æ?´å¤?ä¿¡æ?¯è¯·è®¿é?®ï¼?\nhttps://guardianproject.info/apps/orbot \næ??å??é??é?®ä»¶å?°ï¼?\nhelp@xxxxxxxxxxxxxxxxxxxx ã??</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_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>
@@ -101,14 +101,14 @@
   <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ã??å??许 Tor è?·å?? ROOT æ??é??ã??\n\nè¦?让 Tor 为æ?¨æ??ä¾?帮å?©ï¼?æ?¨å¿?须使åº?ç?¨ç¨?åº?è?½å?? Orbot ä¸?èµ·å??å??å·¥ä½?æ??设置好å®?们ç?? HTTP å?? SOCKS 代ç??ã??\n</string>
+  <string name="wizard_permissions_no_root_msg">设å¤?æ?ªè?·å?? Root æ??é??æ??æ?ªæ??ä¾? Superuser 访é?®æ??é??ã??\n\n为äº?使ç?¨ Tor ç½?ç»?ï¼?æ??ç?¨ç??åº?ç?¨ç¨?åº?é??æ?¯æ?? Orbot æ??æ?¯æ?? HTTP æ?? SOCKS 代ç??设置ã??\n</string>
   <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">å?¯ç?¨ Orbot ç??åº?ç?¨ç¨?åº?</string>
-  <string name="wizard_tips_gibberbot">Gibberbotï¼?å? å¯?æ? è®°å½?ç??å®?å?¨è??天åº?ç?¨ç¨?åº?</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">å?¨ 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>
@@ -150,7 +150,7 @@
   <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="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>
@@ -163,7 +163,7 @@
   <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="strict_nodes">é??å?¶è??ç?¹</string>
   <string name="use_only_these_specified_nodes">ä»?使ç?¨è¿?äº?æ??å®?è??ç?¹</string>
   <string name="bridges">ç½?æ¡¥</string>
   <string name="use_bridges">使��桥</string>
@@ -179,15 +179,15 @@
   <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="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="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="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>
@@ -197,19 +197,19 @@
   <string name="the_tor_license">Tor 许��</string>
   <string name="https_torproject_org">https://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="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="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="found_existing_tor_process">å??ç?°å½?å??å·²å­?å?¨ Tor è¿?ç¨?...</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">���� Tor�</string>
   <string name="pref_use_sys_iptables_title">使��认 iptables </string>
-  <string name="pref_use_sys_iptables_summary">使ç?¨å??ç½®ç?? iptables ç¨?åº?æ?¿ä»£ Orbot ç??ç»?å®? 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>
@@ -219,6 +219,6 @@
   <string name="set_locale_summary">é??æ?© Orbot ç??å?ºå??设置ä¸?语è¨?</string>
   <string name="wizard_locale_title">é??æ?©è¯­è¨?</string>
   <string name="wizard_locale_msg">ä¿?æ??é»?认æ??å??æ?¢ä¸ºå½?å??æ??ç?¨è¯­è¨?</string>
-  <string name="powered_by">ç?± Tor 项ç?®å¼ºå??驱å?¨</string>
+  <string name="powered_by">ç?± Tor Project æ??ä¾?æ??æ?¯æ?¯æ??</string>
   <string name="btn_save_settings">��设置</string>
 </resources>
diff --git a/values-zh_TW/strings.xml b/values-zh_TW/strings.xml
new file mode 100644
index 0000000..686156d
--- /dev/null
+++ b/values-zh_TW/strings.xml
@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <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_proxy_help_info">代ç??設å®?</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">��</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">è­¦å?? Warning</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--<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">ç?¡</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="status">ç??æ??</string>
+  <string name="error">�誤</string>
+  <string name="default_bridges"></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