[tor-commits] [orbot/master] updated to latest localization from transifex

[n8fr8@xxxxxxxxxxxxxx]

commit c4604f348a2ebc512b963345c5f2164f7a7e4db6
Author: n8fr8 <nathan@xxxxxxxxxxx>
Date:   Thu Oct 25 23:18:40 2012 +0530

    updated to latest localization from transifex
---
 res/values-ar/strings.xml     |   47 +++--
 res/values-bg/strings.xml     |  172 ++++++++++++++
 res/values-ca/strings.xml     |  138 ++----------
 res/values-cs/strings.xml     |  182 +++------------
 res/values-de/strings.xml     |   63 ++++--
 res/values-el/strings.xml     |  283 +++++++++++++----------
 res/values-es/strings.xml     |   49 +++--
 res/values-eu/strings.xml     |  246 +++++++++------------
 res/values-fa/strings.xml     |  258 ++++++++++++---------
 res/values-fr/strings.xml     |   53 ++++-
 res/values-he/strings.xml     |   91 ++++++++
 res/values-hr/strings.xml     |  213 +++++++++++++++++
 res/values-hu/strings.xml     |   39 +++-
 res/values-it/strings.xml     |   62 ++++--
 res/values-ja/strings.xml     |  298 +++++++++++++------------
 res/values-ko/strings.xml     |  301 ++++++++++---------------
 res/values-lv/strings.xml     |  219 ++++++++++++++++++
 res/values-mk/strings.xml     |  131 ++---------
 res/values-ms/strings.xml     |  213 +++++++++++++++++
 res/values-my/strings.xml     |  214 +++++++++++++++++
 res/values-nb/strings.xml     |  208 ++++-------------
 res/values-nl/strings.xml     |   56 ++++--
 res/values-pl/strings.xml     |  234 +++++--------------
 res/values-pt-rBR/strings.xml |   38 +++-
 res/values-pt/strings.xml     |  184 +++-------------
 res/values-rs-rAR/strings.xml |   58 +++++
 res/values-ru/strings.xml     |   90 +++++---
 res/values-sv/strings.xml     |  223 +++++-------------
 res/values-tr/strings.xml     |   74 ++++++
 res/values-uk/strings.xml     |  214 +++++++++++++++++
 res/values-v11/styles.xml     |    5 -
 res/values-v14/styles.xml     |    5 -
 res/values-zh/strings.xml     |  114 ++--------
 res/values/strings.xml        |  504 ++++++++++++++++++-----------------------
 res/values/styles.xml         |    5 -
 35 files changed, 3000 insertions(+), 2284 deletions(-)

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 9f07aa8..f56d446 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -31,7 +31,6 @@
   <string name="button_clear_log">Ù?سح اÙ?سجÙ?</string>
   <string name="menu_verify">Ù?حص</string>
   <string name="menu_exit">خرÙ?ج</string>
-  <string name="powered_by">بدعÙ? Ù?Ù? Ù?شرÙ?ع تÙ?ر</string>
   <string name="press_to_start">- long press to start -</string>
   <string name="pref_trans_proxy_group">عÙ?Ù?Ù?Ø© تÙ?Ù?Ù?Ù? غÙ?ر Ù?رئÙ?Ø© Ø£Ù? ضÙ?Ù?Ù?Ø© (Ù?تطÙ?ب Ø­Ù?Ù?Ù? اÙ?Ù?سؤÙ?Ù?- Root-)</string>
   <string name="pref_trans_proxy_title">عÙ?Ù?Ù?Ø© تÙ?Ù?Ù?Ù? غÙ?ر Ù?رئÙ?Ø© Ø£Ù? ضÙ?Ù?Ù?Ø©</string>
@@ -55,6 +54,7 @@
   <string name="btn_finish">Ø¥Ù?Ù?اء</string>
   <string name="btn_okay">Ù?Ù?اÙ?Ù?</string>
   <string name="btn_cancel">Ø¥Ù?غاء</string>
+  <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">بعض اÙ?تÙ?اصÙ?Ù? عÙ? Ø£Ù?ربÙ?ت</string>
   <string name="wizard_details_msg">Ø£Ù?ربÙ?ت Ù?Ù? تطبÙ?Ù? Ù?Ù?تÙ?Ø­ اÙ?Ù?صدر Ù?اÙ?Ø°Ù? Ù?ضÙ? تÙ?ر, LibEvent Ù?Prixovy. Ù?عÙ?Ù? عÙ?Ù? تÙ?Ù?Ù?ر Ù?Ù?Ù?Ù? HTTP Ù?Ø­Ù?Ù? (8118) Ù?Ù?Ù?Ù?Ù? SOCKS (9050) Ø¥Ù?Ù? شبÙ?Ø© تÙ?ر. Ù?تÙ?Ù?ر Ù?دÙ? Ø£Ù?ربÙ?ت اÙ?Ù?درة عÙ?Ù? إرساÙ? جÙ?Ù?ع حرÙ?ات Ù?رÙ?ر اÙ?اÙ?ترÙ?ت Ù?Ù? Ø®Ù?اÙ? تÙ?ر عÙ?Ù? اÙ?جÙ?از ذات Ø­Ù?Ù?Ù? اÙ?Ù?سؤÙ?Ù? (root). </string>
   <string name="wizard_permissions_root">تÙ? Ù?Ù?Ø­ اÙ?إذÙ?</string>
@@ -73,37 +73,38 @@
   <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
   <string name="wizard_tips_proxy">إعدادات اÙ?Ù?Ù?Ù?Ù? - تعÙ?Ù? Ù?Ù?Ù?Ù?Ø© تÙ?Ù?Ù?Ù? اÙ?تطبÙ?Ù?ات Ù?تعÙ?Ù? Ù?ع Ø£Ù?ربÙ?ت</string>
   <string name="wizard_proxy_help_info">إعدادات اÙ?Ù?Ù?Ù?Ù?</string>
-  <string name="wizard_proxy_help_msg">اذا Ù?اÙ? تطبÙ?Ù? Ø£Ù?درÙ?Ù?د اÙ?Ø°Ù? تستخدÙ?Ù? Ù?Ù?Ù?Ù? اÙ? Ù?دعÙ? استخداÙ? Ù?Ù?Ù?Ù? HTTP اÙ? SOCKS , عÙ?دÙ?ا Ù?Ù?Ù?Ù?Ù? تÙ?Ù?Ù?Ù?Ù? Ù?Ù?إتصاÙ? بأÙ?ربÙ?ت Ù?استخداÙ? تÙ?ر.
-
-
-    اعدادات اÙ?Ù?ستضÙ?Ù? Ù?Ù? 127.0.0.1 اÙ? \"اÙ?Ù?ستضÙ?Ù? اÙ?Ù?Ø­Ù?Ù?\". باÙ?Ù?سبة اÙ?Ù? HTTP, Ù?Ø¥Ù? ضبط اÙ?Ù?Ù?Ù?Ø° Ù?Ù? 8118. باÙ?Ù?سبة اÙ?Ù? SOCKS, Ù?Ø¥Ù? اÙ?Ù?Ù?Ù?Ù? Ù?Ù? 9050. Ù?جب عÙ?Ù?Ù? استخداÙ? SOCKS4A اÙ? SOCKS5 اذا اÙ?Ù?Ù?.
-    
-
-
-    Ù?Ù?Ù?Ù?Ù? Ù?عرÙ?Ø© اÙ?Ù?زÙ?د عÙ? عÙ?Ù?Ù?Ø© تÙ?Ù?Ù?Ù? غÙ?ر Ù?رئÙ?Ø© Ù?Ù?Ø£Ù?درÙ?Ù?د عÙ? طرÙ?Ù? اÙ?أسئÙ?Ø© اÙ?Ù?تداÙ?Ù?Ø© (FAQ)  Ù?Ù?: http://tinyurl.com/proxyandroid
-    </string>
+  <string name="wizard_proxy_help_msg">اذا Ù?اÙ? تطبÙ?Ù? Ø£Ù?درÙ?Ù?د اÙ?Ø°Ù? تستخدÙ?Ù? Ù?Ù?Ù?Ù? اÙ? Ù?دعÙ? استخداÙ? Ù?Ù?Ù?Ù? HTTP اÙ? SOCKS , عÙ?دÙ?ا Ù?Ù?Ù?Ù?Ù? تÙ?Ù?Ù?Ù?Ù? Ù?Ù?إتصاÙ? بأÙ?ربÙ?ت Ù?استخداÙ? تÙ?ر.\n\n\n    اعدادات اÙ?Ù?ستضÙ?Ù? Ù?Ù? 127.0.0.1 اÙ? \"اÙ?Ù?ستضÙ?Ù? اÙ?Ù?Ø­Ù?Ù?\". باÙ?Ù?سبة اÙ?Ù? HTTP, Ù?Ø¥Ù? ضبط اÙ?Ù?Ù?Ù?Ø° Ù?Ù? 8118. باÙ?Ù?سبة اÙ?Ù? SOCKS, Ù?Ø¥Ù? اÙ?Ù?Ù?Ù?Ù? Ù?Ù? 9050. Ù?جب عÙ?Ù?Ù? استخداÙ? SOCKS4A اÙ? SOCKS5 اذا اÙ?Ù?Ù?.\n    \n\n\n    Ù?Ù?Ù?Ù?Ù? Ù?عرÙ?Ø© اÙ?Ù?زÙ?د عÙ? عÙ?Ù?Ù?Ø© تÙ?Ù?Ù?Ù? غÙ?ر Ù?رئÙ?Ø© Ù?Ù?Ø£Ù?درÙ?Ù?د عÙ? طرÙ?Ù? اÙ?أسئÙ?Ø© اÙ?Ù?تداÙ?Ù?Ø© (FAQ)  Ù?Ù?: http://tinyurl.com/proxyandroid\n    </string>
   <string name="wizard_final">Ø£Ù?ربÙ?ت جاÙ?ز!</string>
   <string name="wizard_final_msg">Ù?ئات اÙ?Ø¢Ù?اÙ? Ù?Ù? اÙ?Ù?اس Ù?Ù? جÙ?Ù?ع Ø£Ù?حاء اÙ?عاÙ?Ù? Ù?ستخدÙ?Ù?Ù? تÙ?ر Ù?أسباب عدÙ?دة: اÙ?صحÙ?Ù?Ù?Ù? Ù?اÙ?Ù?دÙ?Ù?Ù?Ù?Ø? Ù?اÙ?عاÙ?Ù?Ù?Ù? Ù?Ù? Ù?جاÙ? Ø­Ù?Ù?Ù? اÙ?Ø¥Ù?ساÙ?Ø? Ù?اÙ?جÙ?Ù?د Ù?اÙ?شرÙ?ات Ù?اÙ?Ù?Ù?اطÙ?Ù?Ù? Ù?Ù? اÙ?Ø£Ù?ظÙ?Ø© اÙ?Ù?Ù?عÙ?Ø©Ø? Ù?اÙ?Ù?Ù?اطÙ?Ù?Ù? اÙ?عادÙ?Ù?Ù? ... Ù?اÙ?Ø¢Ù? Ø£Ù?ت Ù?ستعد Ù?Ø£Ù? تستخدÙ?Ù? Ù?Ø°Ù?Ù?!</string>
-  <string name="connect_first_time"> Ù?Ù?د Ù?Ù?ت بإتصاÙ? Ù?اجح اÙ?Ù? شبÙ?Ø© تÙ?ر - Ù?Ù?Ù? Ù?ذا Ù?ا Ù?عÙ?Ù? بأÙ? جÙ?ازÙ? Ù?Ù? Ù?Ø£Ù?Ù?. Ù?Ù?Ù?Ù?Ù? استخداÙ? Ø®Ù?ار \'تحÙ?Ù?\' Ù?Ù? اÙ?Ù?ائÙ?Ø© Ù?إختبار اÙ?Ù?تصÙ?Ø­ اÙ?خاص بÙ?. 
-
- Ù?Ù? بزÙ?ارتÙ?ا عÙ?Ù? https://guardianproject.info/apps/orbot اÙ? ارسÙ? رساÙ?Ø© اÙ?Ù?ترÙ?Ù?Ù?Ø© اÙ?Ù? help@xxxxxxxxxxxxxxxxxxxx Ù?Ù?عرÙ?Ø© اÙ?Ù?زÙ?د.</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time"> Ù?Ù?د Ù?Ù?ت بإتصاÙ? Ù?اجح اÙ?Ù? شبÙ?Ø© تÙ?ر - Ù?Ù?Ù? Ù?ذا Ù?ا Ù?عÙ?Ù? بأÙ? جÙ?ازÙ? Ù?Ù? Ù?Ø£Ù?Ù?. Ù?Ù?Ù?Ù?Ù? استخداÙ? Ø®Ù?ار \'تحÙ?Ù?\' Ù?Ù? اÙ?Ù?ائÙ?Ø© Ù?إختبار اÙ?Ù?تصÙ?Ø­ اÙ?خاص بÙ?. \n\n Ù?Ù? بزÙ?ارتÙ?ا عÙ?Ù? https://guardianproject.info/apps/orbot اÙ? ارسÙ? رساÙ?Ø© اÙ?Ù?ترÙ?Ù?Ù?Ø© اÙ?Ù? help@xxxxxxxxxxxxxxxxxxxx Ù?Ù?عرÙ?Ø© اÙ?Ù?زÙ?د.</string>
   <string name="tor_check">سÙ?ؤدÙ? Ù?ذا Ø¥Ù?Ù? Ù?تح اÙ?Ù?تصÙ?Ø­ اÙ?اÙ?تراضÙ? اÙ?خاص بÙ? عÙ?Ù? اÙ?عÙ?Ù?اÙ? https://check.torproject.org Ù?Ù? اجÙ? اÙ?تحÙ?Ù? Ù?Ù? تÙ?Ù?Ù?Ù? Ø£Ù?ربÙ?ت بشÙ?Ù? صحÙ?Ø­ Ù?بأÙ?Ù? Ù?تصÙ? بتÙ?ر.</string>
   <string name="pref_hs_group">خدÙ?ات Ø®Ù?Ù?Ø©</string>
   <string name="pref_general_group">General</string>
   <string name="pref_start_boot_title">Start Orbot on Boot</string>
   <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
   <string name="wizard_title_msg">Ø£Ù?ربÙ?ت Ù?جÙ?ب Ù?Ù? شبÙ?Ø© تÙ?ر Ù?Ù?Ø£Ù?درÙ?Ù?د! تÙ?ر Ù?ساعدÙ?  Ù?Ù?تغÙ?ب عÙ?Ù? حجب اÙ?Ù?حتÙ?Ù?Ø? Ù?حص اÙ?اتصاÙ?Ø? Ù? اÙ?رÙ?ابة Ù? اÙ?تجسس عÙ?Ù? اÙ?شبÙ?اتØ? Ù? اÙ?تÙ? تÙ?دد اÙ?خصÙ?صÙ?Ø© Ù? اÙ?عÙ?اÙ?ات اÙ?شخصÙ?Ø© Ù? اÙ?Ù?عÙ?Ù?Ù?ات اÙ?سرÙ?Ø©. سÙ?Ù?Ù?Ù? اÙ?Ø¢Ù? بÙ?ساعدتÙ? Ù?ضبط Ø£Ù?ربÙ?ت Ù? تÙ?ر عÙ?Ù? جÙ?ازÙ?.</string>
+  <!--Warning screen-->
   <string name="wizard_warning_title">تحذÙ?ر</string>
   <string name="wizard_warning_msg">Ù?جرد تÙ?زÙ?Ù? Ø£Ù?ربÙ?ت Ù?Ù? Ù?عطÙ?Ù? اÙ?خصÙ?صÙ?Ø©. Ù?جب عÙ?Ù?Ù? Ø£Ù?ضاÙ? اعداد Ø£Ù?ربÙ?ت Ù? جÙ?ازÙ? Ù? اÙ?براÙ?ج اÙ?Ù?ستÙ?Ù?دة Ù?Ù? تÙ?ر.</string>
+  <!--Permissions screen-->
   <string name="wizard_permissions_title">اÙ?صÙ?احÙ?ات</string>
   <string name="wizard_permissions_root_msg1">Ù?Ù?Ù?Ù?Ù? اعطاء Ø£Ù?ربÙ?ت صÙ?احÙ?Ø© اÙ?Ù?ستخدÙ? اÙ?سÙ?بر Ù?تشغÙ?Ù? اÙ?Ù?Ù?Ù?زات اÙ?Ù?تÙ?دÙ?Ø© Ù?Ø«Ù? اÙ?برÙ?Ù?سÙ? اÙ?Ø´Ù?اÙ?.</string>
   <string name="wizard_permissions_root_msg2">إذا Ù?Ù?ت ترÙ?د Ø£Ù? تÙ?Ù?Ù? بÙ?ذا Ù?عÙ?Ù?Ù? اÙ?تأÙ?د Ù?Ù? استخداÙ? براÙ?ج Ù?عدة Ù?تشتغÙ? Ù?ع Ø£Ù?ربÙ?ت.</string>
   <string name="wizard_permissions_no_root_msg">Ù?ا Ù?Ù?جد رÙ?ت Ø£Ù? صÙ?احÙ?ات خارÙ?Ø© عÙ?Ù? جÙ?ازÙ?  Ù? Ù?Ø°Ù?Ù? Ù?تستÙ?Ù?د Ù?Ù? Ù?Ù? تÙ?ر عÙ?Ù?Ù? استخداÙ? براÙ?ج صÙ?Ù?ت Ù?تعÙ?Ù? Ù?ع Ø£Ù?ربÙ?ت Ø£Ù? اÙ?تÙ? تدعÙ? برÙ?Ù?سÙ? HTTP Ø£Ù? SOCKS .</string>
+  <!--TipsAndTricks screen-->
   <string name="wizard_tips_title">براÙ?ج Ù?عدة Ù?تشتغÙ? Ù?ع Ø£Ù?ربÙ?ت</string>
   <string name="wizard_tips_gibberbot">جÙ?بربÙ?ت: Ù?حادثات Ø¢Ù?Ù?Ø© باستخداÙ? اÙ?تشÙ?Ù?ر خارج اÙ?سجÙ?.</string>
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
   <string name="wizard_tips_orweb">ORWEB (Ø£Ù?درÙ?Ù?د 1.x Ù?Ù?Ø·) - Ù?تصÙ?Ø­ Ù?صÙ?Ù?Ù? Ù?Ù?خصÙ?صÙ?Ø© Ù?Ø£Ù?ربÙ?ت </string>
   <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+  <!--Transparent Proxy screen-->
   <string name="wizard_transproxy_title">برÙ?Ù?سÙ? Ø´Ù?اÙ?</string>
   <string name="wizard_transproxy_msg">Ù?Ø°Ù? ستسÙ?Ø­ Ù?Ù?براÙ?ج باÙ?اتصاÙ? بشبÙ?Ø© تÙ?ر تÙ?Ù?ائÙ?اÙ? دÙ?Ù? اعداد Ù?سبÙ?.</string>
   <string name="wizard_transproxy_hint">اختر Ù?ذا اÙ?Ù?ربع اذا Ù?Ù?ت Ù?ا تعÙ?Ù? عÙ?ا Ù?تحدث عÙ?Ù? Ù?Ù?ا</string>
@@ -118,8 +119,9 @@
   <string name="pref_entrance_node">Ù?Ù?اط اÙ?دخÙ?Ù?</string>
   <string name="pref_entrance_node_summary">بصÙ?اتØ? اسÙ?اء Ù?ستعارةØ? اÙ?بÙ?داÙ? Ù? اÙ?عÙ?اÙ?Ù?Ù? Ù?Ø£Ù?Ù? Ù?Ù?طة اتصاÙ?</string>
   <string name="pref_entrance_node_dialog">أدخÙ? Ù?Ù?اط اÙ?دخÙ?Ù?</string>
-  <string name="pref_use_whispercore">استخدÙ? WhisperCore</string>
-  <string name="pref_use_whispercore_summary">استخدÙ? Ù?Ù?تبة NetFilter Ù?غÙ?Ù?Ø© اÙ?Ù?صدر Ù? اÙ?Ù?Ù?دÙ?Ø© Ù?Ù? WhisperSystems (تحتاج Ù?تÙ?زÙ?Ù? WhisperCore)</string>
+  <!--<string name="pref_use_whispercore">Use WhisperCore</string>
+<string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
+  <string name="pref_proxy_title">برÙ?Ù?سÙ? اÙ?شبÙ?Ø©</string>
   <string name="pref_proxy_type_title">Ù?Ù?ع اÙ?برÙ?Ù?سÙ?</string>
   <string name="pref_proxy_type_summary">اÙ?برÙ?تÙ?Ù?Ù?Ù? Ù?Ù?ستخدÙ? Ù?ع خادÙ? اÙ?برÙ?Ù?سÙ?: HTTP, HTTPS, Socks4, Socks5</string>
   <string name="pref_proxy_type_dialog">أدخÙ? Ù?Ù?ع اÙ?برÙ?Ù?سÙ?</string>
@@ -155,7 +157,9 @@
   <string name="use_only_these_specified_nodes">Ù?Ù?Ø· استخدÙ? Ù?Ø°Ù? اÙ?Ù?Ù?اط اÙ?Ù?حددة</string>
   <string name="bridges">اÙ?جسÙ?ر</string>
   <string name="use_bridges">استخدÙ? اÙ?جسÙ?ر</string>
+  <string name="bridges_obfuscated">اÙ?جسÙ?ر اÙ?Ù?Ø®Ù?Ù?Ø©</string>
   <string name="enable_alternate_entrance_nodes_into_the_tor_network">اسÙ?Ø­ باستخداÙ? Ù?Ù?اط دخÙ?Ù? بدÙ?Ù?Ø© عÙ?Ù? شبÙ?Ø© تÙ?ر</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">تÙ?عÙ?Ù? Ù?ذا اÙ?Ø®Ù?ار اذا Ù?اÙ?ت اÙ?جسÙ?ر Ù?Ø®Ù?Ù?Ø©</string>
   <string name="ip_address_and_port_of_bridges">عÙ?اÙ?Ù?Ù? اÙ?اÙ?ترÙ?ت Ù? Ù?Ù?اÙ?Ø° اÙ?جسÙ?ر</string>
   <string name="enter_bridge_addresses">أدخÙ? عÙ?Ù?اÙ? اÙ?جسر</string>
   <string name="relays">Ù?Ù?اط اÙ?تحÙ?Ù?Ù?</string>
@@ -183,6 +187,11 @@
   <string name="the_tor_license">رخصة استخداÙ? تÙ?ر</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">براÙ?ج Ù?Ù? جÙ?ات أخرÙ?:</string>
+  <string name="tor_version">Tor v0.2.3.10: https://www.torproject.orgب;</string>
+  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
+  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
+  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
   <string name="hidden_service_request">أحد اÙ?براÙ?ج Ù?حاÙ?Ù? تشغÙ?Ù? خدÙ?Ø© Ù?Ø®Ù?Ù?Ø© بÙ?Ù?Ù?Ø° %S عÙ?Ù? شبÙ?Ø© تÙ?ر. Ù?Ø°Ù? اÙ?Ù?Ù?زة Ø¢Ù?Ù?Ø© Ù?Ù?Ø· اذا Ù?Ù?ت تثÙ? باÙ?برÙ?اÙ?ج</string>
   <string name="found_existing_tor_process">تÙ? اÙ?عثÙ?ر عÙ?Ù? برÙ?اÙ?ج تÙ?ر </string>
   <string name="something_bad_happened">حصÙ? خطأ Ù?ا. اÙ?حص اÙ?سجÙ?</string>
@@ -194,4 +203,12 @@
   <string name="error_installing_binares">Ù?Ù? Ù?تÙ? تثبÙ?ت Ø£Ù? تحدÙ?Ø« Ù?Ù?Ù?Ù?ات تÙ?ر</string>
   <string name="pref_use_persistent_notifications">ضع اÙ?Ø£Ù?Ù?Ù?Ù?Ø© Ù?Ù? شرÙ?Ø· اÙ?تÙ?بÙ?Ù?ات عÙ?دÙ?ا Ù?Ù?Ù?Ù? Ø£Ù?ربÙ?ت Ù?تصÙ?اÙ?</string>
   <string name="pref_use_persistent_notifications_title">تÙ?عÙ?Ù? اÙ?تÙ?بÙ?Ù?ات دائÙ?اÙ?</string>
+  <string name="notification_using_bridges">تÙ? تÙ?عÙ?Ù? اÙ?جسÙ?ر!</string>
+  <string name="default_bridges"/>
+  <string name="set_locale_title">تغÙ?Ù?ر اÙ?Ù?غة</string>
+  <string name="set_locale_summary">غÙ?ر اÙ?Ù?غة Ù? اÙ?اعدادات اÙ?اÙ?Ù?Ù?Ù?Ù?Ø© Ù?Ø£Ù?ربÙ?ت</string>
+  <string name="wizard_locale_title">اختÙ?ار اÙ?Ù?غة</string>
+  <string name="wizard_locale_msg">اختر اÙ?Ù?غة اÙ?اÙ?تراضÙ?Ø©</string>
+  <string name="powered_by">بدعÙ? Ù?Ù? Ù?شرÙ?ع تÙ?ر</string>
+  <string name="btn_save_settings">Ø­Ù?ظ اÙ?اعدادات</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
new file mode 100644
index 0000000..fa92c48
--- /dev/null
+++ b/res/values-bg/strings.xml
@@ -0,0 +1,172 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Ð?Ñ?боÑ?</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">Ñ?пÑ?и и Ñ?Ñ?опиÑ?ай ТоÑ?</string>
+  <string name="status_starting_up">Ð?Ñ?боÑ? Ñ?Ñ?аÑ?Ñ?иÑ?а...</string>
+  <string name="status_activated">СвÑ?Ñ?зан кÑ?м ТоÑ? мÑ?ежаÑ?а</string>
+  <string name="status_disabled">\"Ð?Ñ?боÑ? е деакÑ?ивиÑ?ан</string>
+  <string name="status_shutting_down">Ð?Ñ?боÑ? Ñ?е изклÑ?Ñ?ва</string>
+  <string name="tor_process_starting">СÑ?аÑ?Ñ?иÑ?ане на ТоÑ? клиенÑ?...</string>
+  <string name="tor_process_complete">завÑ?Ñ?Ñ?ено.</string>
+  <string name="tor_process_waiting">изÑ?акване.</string>
+  <string name="not_anonymous_yet">Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?: ТÑ?аÑ?икÑ?Ñ? Ð?и не е анонимен! Ð?олÑ? конÑ?игÑ?Ñ?иÑ?айÑ?е пÑ?иложениÑ?Ñ?а Ñ?и да използваÑ? HTTP proxy 127.0.0.1:8118 или SOCKS4A или SOCKS5 proxy 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_about">Ð?Ñ?ноÑ?но</string>
+  <string name="menu_wizard">Ð?омоÑ?ник</string>
+  <string name="button_help">Ð?омоÑ?</string>
+  <string name="button_close">Ð?аÑ?воÑ?и</string>
+  <string name="button_about">Ð?Ñ?ноÑ?но</string>
+  <string name="button_clear_log">Ð?зÑ?иÑ?Ñ?и лог</string>
+  <string name="menu_verify">Check</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_title">Ð?Ñ?озÑ?аÑ?но пÑ?окÑ?и</string>
+  <string name="pref_trans_proxy_summary">Ð?вÑ?омаÑ?иÑ?но пÑ?екаÑ?ване на пÑ?иложениÑ?Ñ?а пÑ?ез ТоÑ?</string>
+  <string name="pref_transparent_all_title">Ð?Ñ?иÑ?ко пÑ?ез ТоÑ?</string>
+  <string name="pref_transparent_all_summary">Ð?Ñ?еÑ?вÑ?Ñ?лÑ?й пÑ?ез ТоÑ? Ñ?Ñ?аÑ?ика на вÑ?иÑ?ки пÑ?иложениÑ?</string>
+  <string name="pref_transparent_port_title">СпиÑ?Ñ?к поÑ?Ñ?ове</string>
+  <string name="pref_transparent_port_dialog">Ð?Ñ?веди поÑ?Ñ?ове на пÑ?окÑ?и</string>
+  <string name="pref_has_root">Ð?зиÑ?квай Root доÑ?Ñ?Ñ?п</string>
+  <string name="pref_has_root_summary">Ð?зиÑ?квай root доÑ?Ñ?Ñ?п за пÑ?озÑ?аÑ?но пÑ?окÑ?и</string>
+  <string name="status_install_success">ТоÑ? е Ñ?Ñ?пеÑ?но инÑ?Ñ?алиÑ?ан!</string>
+  <string name="status_install_fail">Ð?вÑ?иÑ?ниÑ?е Ñ?айлове на ТоÑ? не Ñ?а инÑ?Ñ?алиÑ?ани. Ð?олÑ? пÑ?овеÑ?еÑ?е лога и Ñ?ведомеÑ?е tor-assistants@xxxxxxxxxxxxxx</string>
+  <string name="title_error">Ð?Ñ?еÑ?ка в пÑ?иложениеÑ?о</string>
+  <string name="wizard_title">Ð?Ñ?боÑ?</string>
+  <string name="wizard_btn_tell_me_more">Ð?Ñ?ноÑ?но Ð?Ñ?боÑ?</string>
+  <string name="btn_next">СледваÑ?</string>
+  <string name="btn_back">Ð?бÑ?аÑ?но</string>
+  <string name="btn_finish">Ð?Ñ?ай</string>
+  <string name="btn_okay">Ð?Ð?</string>
+  <string name="btn_cancel">Ð?Ñ?кажи</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Ð?Ñ?кои Ð?Ñ?боÑ? деÑ?айли</string>
+  <string name="wizard_details_msg">Ð?Ñ?боÑ? (Orbot) е пÑ?иложение Ñ? оÑ?воÑ?ен код, коеÑ?о Ñ?Ñ?дÑ?Ñ?жа Tor, LibEvent и Privoxy. То пÑ?едоÑ?Ñ?авÑ? локално HTTP пÑ?окÑ?и (8118) и SOCKS пÑ?окÑ?и (9050) до мÑ?ежаÑ?а на Tor. Ð?а Ñ?Ñ?Ñ?Ñ?наÑ?и Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?ва, Ð?Ñ?боÑ? има вÑ?зможноÑ?Ñ?Ñ?а да пÑ?екаÑ?ва Ñ?елиÑ?Ñ? инÑ?еÑ?неÑ? Ñ?Ñ?аÑ?ик пÑ?ез Tor.</string>
+  <string name="wizard_permissions_root">Ð?Ñ?аваÑ?а дадени</string>
+  <string name="wizard_permissions_stock">Orbot Permissions</string>
+  <string name="wizard_premissions_msg_root">Ð?Ñ?лиÑ?но! Ð?аÑ?Ñ?коÑ?ме, Ñ?е имаÑ?е root пÑ?ава доÑ?Ñ?Ñ?пни за Ð?Ñ?боÑ?. Ще използваме Ñ?ази Ñ?ила Ñ?азÑ?мно.</string>
+  <string name="wizard_permissions_msg_stock"> Ð?Ñ?пÑ?еки Ñ?е не е задÑ?лжиÑ?елно, Ð?Ñ?боÑ? може да Ñ?Ñ?ане по-моÑ?но пÑ?иложение ако има root доÑ?Ñ?Ñ?п. Ð?зползвайÑ?е бÑ?Ñ?она долÑ? за да дадеÑ?е на Ð?Ñ?боÑ? Ñ?Ñ?пеÑ?Ñ?или!</string>
+  <string name="wizard_permissions_no_root">Ð?ко нÑ?маÑ?е root доÑ?Ñ?Ñ?п или не знаеÑ?е за какво Ñ?Ñ?ава вÑ?пÑ?оÑ?, пÑ?оÑ?Ñ?о използвайÑ?е пÑ?иложениÑ? напÑ?авени да Ñ?абоÑ?Ñ?Ñ? Ñ? Ð?Ñ?боÑ?.</string>
+  <string name="wizard_permissions_consent">РазбиÑ?ам и иÑ?кам да пÑ?одÑ?лжа без СÑ?пеÑ?поÑ?Ñ?ебиÑ?ел</string>
+  <string name="wizard_permission_enable_root">РазÑ?еÑ?и Root за Ð?Ñ?боÑ?</string>
+  <string name="wizard_configure_msg">Ð?Ñ?боÑ? Ð?и дава вÑ?зможноÑ?Ñ? да пÑ?екаÑ?аÑ?е вÑ?иÑ?киÑ? Ñ?Ñ?аÑ?ик пÑ?ез ТоÑ? или да избеÑ?еÑ?е пÑ?иложениÑ? по оÑ?делно.</string>
+  <string name="wizard_configure_all">Ð?Ñ?екаÑ?ай вÑ?иÑ?ки пÑ?иложениÑ? пÑ?ез ТоÑ?</string>
+  <string name="wizard_configure_select_apps">Ð?збеÑ?и оÑ?делни пÑ?иложениÑ? за ТоÑ?</string>
+  <string name="wizard_tips_tricks">Ð?оддÑ?Ñ?жани оÑ? Ð?Ñ?боÑ? пÑ?иложениÑ?</string>
+  <string name="wizard_tips_msg">Ð?Ñ?иложениÑ?Ñ?а по-долÑ? Ñ?а Ñ?Ñ?здадени Ñ?ака, Ñ?е да Ñ?абоÑ?Ñ?Ñ? Ñ? Ð?Ñ?боÑ?. ЦÑ?кни на вÑ?еки бÑ?Ñ?он, за да инÑ?Ñ?алиÑ?аÑ? Ñ?ега или може да ги намеÑ?иÑ? по-кÑ?Ñ?но в Ð?ндÑ?оид маÑ?кеÑ?.</string>
+  <string name="wizard_tips_otrchat">Gibberbot - СигÑ?Ñ?ен клиенÑ? за мигновени Ñ?Ñ?обÑ?ениÑ? за Ð?ндÑ?оид</string>
+  <string name="wizard_tips_proxy">Proxy Settings - Ð?аÑ?Ñ?еÑ?е как да конÑ?игÑ?Ñ?иÑ?аÑ?е пÑ?иложениÑ? да Ñ?абоÑ?Ñ?Ñ? пÑ?ез Ð?Ñ?боÑ?</string>
+  <string name="wizard_proxy_help_info">Ð?Ñ?окÑ?и наÑ?Ñ?Ñ?ойки</string>
+  <string name="wizard_proxy_help_msg">Ð?ко Ð?ндÑ?оид пÑ?иложениÑ?Ñ?а, коиÑ?о използваÑ?е могаÑ? да поддÑ?Ñ?жаÑ? HTTP или SOCKS пÑ?окÑ?и,Ñ?огава може да ги конÑ?игÑ?Ñ?иÑ?аÑ?е да Ñ?е Ñ?вÑ?Ñ?зваÑ? кÑ?м Ð?Ñ?боÑ? и да ползваÑ? ТоÑ?.\n\n\n    Ð?аÑ?Ñ?Ñ?ойкиÑ?е на Ñ?оÑ?Ñ?а Ñ?а 127.0.0.1 или \"localhost\". Ð?а HTTP, поÑ?Ñ?а е 8118. Ð?а SOCKS, поÑ?Ñ?а е 9050. Ð?о-добÑ?е да използваÑ?е SOCKS4A или SOCKS5 ако е вÑ?зможно.\n    \n\n\n    Ð?оже да наÑ?Ñ?иÑ?е повеÑ?е за пÑ?окÑ?иÑ?аÑ?а на Ð?ндÑ?оид Ñ?Ñ?ез FAQ на: http://tinyurl.com/proxyandroid\n    </string>
+  <string name="wizard_final">Ð?Ñ?боÑ? е гоÑ?ов!</string>
+  <string name="wizard_final_msg">СÑ?оÑ?иÑ?и Ñ?илÑ?ди Ñ?оÑ?а по Ñ?веÑ?а използваÑ? ТоÑ? по Ñ?азлиÑ?ни пÑ?иÑ?ини.\n\nÐ?Ñ?Ñ?налиÑ?Ñ?и и блогÑ?Ñ?и, заÑ?иÑ?ниÑ?и на Ñ?овеÑ?киÑ?е пÑ?ава, Ñ?лÑ?жиÑ?ели на закона, военни, коÑ?поÑ?аÑ?ии, гÑ?аждани под огÑ?аниÑ?иÑ?елни Ñ?ежими, и пÑ?оÑ?Ñ?о обикновени гÑ?аждани... и Ñ?ега и Ñ?и Ñ?и гоÑ?ов да го напÑ?авиÑ? Ñ?Ñ?Ñ?о!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_hs_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ТоÑ? Ð?и помага да Ñ?е заÑ?иÑ?иÑ?е пÑ?оÑ?ив Ñ?илÑ?Ñ?иÑ?анеÑ?о на Ñ?Ñ?дÑ?Ñ?жание, анализиÑ?анеÑ?о на Ñ?Ñ?аÑ?ик и наблÑ?дениеÑ?о на мÑ?ежи, коиÑ?о заплаÑ?ваÑ? лиÑ?наÑ?а и конÑ?иденÑ?иална инÑ?оÑ?маÑ?иÑ? какÑ?о и лиÑ?ниÑ?е взаимооÑ?ноÑ?ениÑ?.\n\nТози помоÑ?ник Ñ?е конÑ?игÑ?Ñ?иÑ?а Ð?Ñ?боÑ? и ТоÑ? на Ð?аÑ?еÑ?о Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?во.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Ð?нимание</string>
+  <string name="wizard_warning_msg">Ð?динÑ?Ñ?вено инÑ?Ñ?алиÑ?анеÑ?о на Ð?Ñ?боÑ? нÑ?ма авÑ?омаÑ?иÑ?но да напÑ?ави ваÑ?иÑ?Ñ? мобилен Ñ?Ñ?аÑ?ик анонимен.\n\nТÑ?Ñ?бва пÑ?авилно да конÑ?игÑ?Ñ?иÑ?аÑ?е Ð?Ñ?боÑ?, ваÑ?еÑ?о Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?во и дÑ?Ñ?ги пÑ?иложениÑ?, за да използваÑ?е Ñ?Ñ?пеÑ?но ТоÑ?.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Ð?Ñ?ава</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Ð?Ñ?иложениÑ? пÑ?ез Ð?Ñ?боÑ?</string>
+  <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
+  <string name="wizard_tips_orweb">Orweb: Ð?Ñ?аÑ?зÑ?Ñ? Ñ? повиÑ?ена анонимноÑ?Ñ?, койÑ?о Ñ?абоÑ?и пÑ?ез ТоÑ?</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">Ð?Ñ?озÑ?аÑ?но пÑ?окÑ?и</string>
+  <string name="wizard_transproxy_msg">Това позволÑ?ва на пÑ?иложениÑ?Ñ?а Ð?и авÑ?омаÑ?иÑ?но да използваÑ? мÑ?ежаÑ?а на ТоÑ? без никаква конÑ?игÑ?Ñ?аÑ?иÑ?.</string>
+  <string name="wizard_transproxy_hint">(Ð?збеÑ?и Ñ?ази опÑ?иÑ? ако нÑ?маÑ? пÑ?едÑ?Ñ?ава за какво Ñ?Ñ?ава вÑ?пÑ?оÑ?)</string>
+  <string name="wizard_transproxy_none">Ð?иÑ?о</string>
+  <string name="button_grant_superuser">Ð?зиÑ?кай доÑ?Ñ?Ñ?п на СÑ?пеÑ?поÑ?Ñ?ебиÑ?ел</string>
+  <string name="pref_select_apps">Ð?збеÑ?и пÑ?иложениÑ?</string>
+  <string name="pref_select_apps_summary">Ð?збÑ?еÑ?и пÑ?иложениÑ? за използване пÑ?ез ТоÑ?</string>
+  <string name="pref_node_configuration_summary">Това Ñ?а допÑ?лниÑ?елни наÑ?Ñ?Ñ?ойки, коиÑ?о могаÑ? да намалÑ?Ñ? Ð?аÑ?аÑ?а анонимноÑ?Ñ?</string>
+  <string name="pref_entrance_node">Ð?Ñ?одÑ?Ñ?и Ñ?оÑ?ки</string>
+  <string name="pref_entrance_node_dialog">Ð?Ñ?веди вÑ?одÑ?Ñ?и Ñ?оÑ?ки</string>
+  <!--<string name="pref_use_whispercore">Use WhisperCore</string>
+<string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
+  <string name="pref_proxy_type_title">Тип пÑ?окÑ?и</string>
+  <string name="pref_proxy_type_summary">Ð?Ñ?оÑ?окол за пÑ?окÑ?и Ñ?Ñ?Ñ?вÑ?Ñ?: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Тип на вÑ?одÑ?Ñ?о пÑ?окÑ?и</string>
+  <string name="pref_proxy_host_title">Ð?Ñ?окÑ?и Ñ?оÑ?Ñ?</string>
+  <string name="pref_proxy_host_summary">Ð?ме на пÑ?окÑ?и Ñ?Ñ?Ñ?вÑ?Ñ?</string>
+  <string name="pref_proxy_host_dialog">Ð?Ñ?веди пÑ?окÑ?и Ñ?оÑ?Ñ?</string>
+  <string name="pref_proxy_port_title">Ð?оÑ?Ñ? на пÑ?окÑ?и</string>
+  <string name="pref_proxy_port_summary">Ð?оÑ?Ñ? на пÑ?окÑ?и Ñ?Ñ?Ñ?вÑ?Ñ?</string>
+  <string name="pref_proxy_port_dialog">Ð?Ñ?веди пÑ?окÑ?и поÑ?Ñ?</string>
+  <string name="status">СÑ?аÑ?Ñ?Ñ?</string>
+  <string name="setting_up_full_transparent_proxying_">Ð?онÑ?игÑ?Ñ?иÑ?ане на напÑ?лно пÑ?озÑ?аÑ?но пÑ?окÑ?и...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Ð?онÑ?игÑ?Ñ?иÑ?ане на пÑ?озÑ?аÑ?но пÑ?окÑ?и на база пÑ?иложение...</string>
+  <string name="transparent_proxying_enabled">Ð?Ñ?озÑ?аÑ?но пÑ?окÑ?и Ð?Ð?ТÐ?Ð?Ð?Ð?</string>
+  <string name="warning_error_starting_transparent_proxying_">Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?: гÑ?еÑ?ка пÑ?и Ñ?Ñ?аÑ?Ñ?иÑ?ане на пÑ?озÑ?аÑ?но пÑ?оÑ?ки!</string>
+  <string name="transproxy_rules_cleared">TransProxy пÑ?авила изÑ?иÑ?Ñ?ени</string>
+  <string name="couldn_t_start_tor_process_">Ð?еÑ?Ñ?пеÑ?но Ñ?Ñ?аÑ?Ñ?иÑ?ане на ТоÑ? пÑ?оÑ?еÑ?: </string>
+  <string name="privoxy_is_running_on_port_">Ð?Ñ?окÑ?и Ñ?абоÑ?и на поÑ?Ñ?:</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">Ð?зпÑ?аÑ?и и-мейл до bridges@xxxxxxxxxxxxxx Ñ?Ñ?Ñ? Ñ?Ñ?дÑ?Ñ?жание \"get bridges\" в  и-мейл оÑ? акаÑ?нÑ? в gmail.</string>
+  <string name="error">Ð?Ñ?еÑ?ка</string>
+  <string name="your_relay_settings_caused_an_exception_">ТвоиÑ?е наÑ?Ñ?Ñ?ойки за пÑ?епÑ?аÑ?ане пÑ?едизвикаÑ?а изклÑ?Ñ?ение!</string>
+  <string name="exit_nodes">Ð?зÑ?одни Ñ?оÑ?ки</string>
+  <string name="enter_exit_nodes">Ð?Ñ?веди изÑ?одни Ñ?оÑ?ки</string>
+  <string name="enter_exclude_nodes">Ð?Ñ?ай</string>
+  <string name="bridges">Ð?Ñ?иджове</string>
+  <string name="use_bridges">Ð?зползвай Ð?Ñ?иджове</string>
+  <string name="ip_address_and_port_of_bridges">IP адÑ?еÑ? и поÑ?Ñ? на бÑ?иджове</string>
+  <string name="enter_bridge_addresses">Ð?Ñ?веди адÑ?еÑ?и на бÑ?иджове</string>
+  <string name="reachable_addresses">Ð?оÑ?Ñ?ижими адÑ?еÑ?и</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">СÑ?аÑ?Ñ?иÑ?ай каÑ?о клиенÑ? зад firewall Ñ? Ñ?еÑ?Ñ?Ñ?икÑ?ивни полиÑ?ики</string>
+  <string name="reachable_ports">Ð?оÑ?Ñ?Ñ?пни поÑ?Ñ?ове</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Ð?оÑ?Ñ?ове доÑ?Ñ?Ñ?пни зад firewall Ñ? Ñ?еÑ?Ñ?Ñ?икÑ?ивни полиÑ?ики</string>
+  <string name="enter_ports">Ð?Ñ?веди поÑ?Ñ?ове</string>
+  <string name="enable_hidden_services">Ð?клÑ?Ñ?и Ñ?кÑ?иÑ?и Ñ?Ñ?лÑ?ги</string>
+  <string name="run_servers_accessible_via_the_tor_network">Ñ?Ñ?аÑ?Ñ?иÑ?ай Ñ?Ñ?Ñ?вÑ?Ñ?и доÑ?Ñ?Ñ?пни пÑ?ез ТоÑ? мÑ?ежаÑ?а</string>
+  <string name="enter_localhost_ports_for_hidden_services">вÑ?веди локални поÑ?Ñ?ове за Ñ?кÑ?иÑ?и Ñ?Ñ?лÑ?ги</string>
+  <string name="hidden_service_ports">Ð?оÑ?Ñ?ове на Ñ?кÑ?иÑ?и Ñ?Ñ?лÑ?ги</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">ТоÑ? лиÑ?енз</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">СоÑ?Ñ?Ñ?еÑ? на Ñ?Ñ?еÑ?и Ñ?Ñ?Ñ?ани: </string>
+  <string name="tor_version">ТоÑ? 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">Ð?Ñ?иложение иÑ?ка да оÑ?воÑ?и поÑ?Ñ? на Ñ?кÑ?иÑ? Ñ?Ñ?Ñ?вÑ?Ñ? %S кÑ?м ТоÑ? мÑ?ежаÑ?а. Ð?езопаÑ?но е да Ñ?е довеÑ?иÑ?е на пÑ?иложениеÑ?о.</string>
+  <string name="something_bad_happened">Ð?еÑ?о лоÑ?о Ñ?е Ñ?лÑ?Ñ?и. Ð?Ñ?овеÑ?еÑ?е лога</string>
+  <string name="hidden_service_on">СкÑ?иÑ?а Ñ?Ñ?лÑ?га вклÑ?Ñ?ена:</string>
+  <string name="unable_to_read_hidden_service_name">не може да пÑ?оÑ?еÑ?е име на Ñ?кÑ?иÑ?а Ñ?Ñ?лÑ?га</string>
+  <string name="unable_to_start_tor">Ð?е може да Ñ?Ñ?аÑ?Ñ?иÑ?а ТоÑ?:</string>
+  <string name="pref_use_sys_iptables_title">Ð?зползвай Iptables по подÑ?азбиÑ?ане</string>
+  <string name="pref_use_sys_iptables_summary">използвай вгÑ?адениÑ?е двÑ?иÑ?ни iptables вмеÑ?Ñ?о Ñ?ези идваÑ?и Ñ? Orbot</string>
+  <string name="error_installing_binares">Ð?вÑ?иÑ?ниÑ?е Ñ?айлове на ТоÑ? не бÑ?Ñ?а инÑ?Ñ?алиÑ?ани или обновени.</string>
+  <string name="pref_use_persistent_notifications">Ð?инаги показвай икона в Ñ?Ñ?лбаÑ?а когаÑ?о Ð?Ñ?боÑ? е Ñ?вÑ?Ñ?зан</string>
+  <string name="pref_use_persistent_notifications_title">УведомлениÑ? винаги вклÑ?Ñ?ени</string>
+  <string name="default_bridges"/>
+  <string name="set_locale_title">Ð?збеÑ?и меÑ?Ñ?оположение</string>
+  <string name="set_locale_summary">Ð?збеÑ?и меÑ?Ñ?оположение и език за Ð?Ñ?боÑ?</string>
+  <string name="wizard_locale_title">Ð?збеÑ?и език</string>
+  <string name="powered_by">powered by The Tor Project  </string>
+  <string name="btn_save_settings">Ð?апази наÑ?Ñ?Ñ?ойки</string>
+</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index f9e06d2..f834ccb 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -11,9 +11,6 @@
   <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_starting">Starting Tor client...</string>
-  <string name="tor_process_complete">complete.</string>
-  <string name="tor_process_waiting">waiting.</string>
   <string name="not_anonymous_yet">ATENCI� : El trà nsit de la teva connexió ja no es anònim! Siusplau, configura les teves aplicacions per a usar HTTP proxy 127.0.0.1:8118, per SOCKS4A o SOCKS5 proxy 127.0.0.1:9050</string>
   <string name="menu_home">Lloc d\'inici</string>
   <string name="menu_browse">Navega</string>
@@ -31,7 +28,6 @@
   <string name="button_clear_log">Esborra el registre</string>
   <string name="menu_verify">Prova</string>
   <string name="menu_exit">Surt</string>
-  <string name="powered_by">Funciona grà cies al Projecte Tor</string>
   <string name="press_to_start">- long press to start -</string>
   <string name="pref_trans_proxy_group">Utilitza un proxy transparent (requereix accés)</string>
   <string name="pref_trans_proxy_title">Utilitza un proxy transparent</string>
@@ -55,6 +51,7 @@
   <string name="btn_finish">Fi</string>
   <string name="btn_okay">D\'acord</string>
   <string name="btn_cancel">Cancel·la</string>
+  <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Alguns detalls d\'Orbot...</string>
   <string name="wizard_details_msg">Orbot és una aplicació de codi lliure que conté Tor, LibEvent i Privoxy. Proporciona un Proxy HTTP local (8118) i un proxy SOCKS (9050) a la xarxa Tor. Orbot també té capacitat d\'enviar tot el trà nsit de dades d\'internet a través de Tor.</string>
   <string name="wizard_permissions_root">Permís concedit</string>
@@ -69,129 +66,34 @@
   <string name="wizard_configure_all">Connecta totes les aplicacions per Proxy per Tor.</string>
   <string name="wizard_configure_select_apps">Selecciona aplicacions individuals per a funcionar amb Tor</string>
   <string name="wizard_tips_tricks">Aplicacions per a usar-se amb Orbot</string>
-  <string name="wizard_tips_msg">T\'animem a descarregar-te &amp;amp; utilitza aplicacions que sà piguen com connectar-se directament a Orbot. Fes clic als botons de sota per instal·lar.</string>
+  <string name="wizard_tips_msg">T\'animem a descarregar-te &amp; utilitza aplicacions que sà piguen com connectar-se directament a Orbot. Fes clic als botons de sota per instal·lar.</string>
   <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
   <string name="wizard_tips_proxy">Coniguració de Proxy - Aprèn a configurar aplicacions per a què funcionin amb Orbot</string>
   <string name="wizard_proxy_help_info">Configuració de Proxy</string>
-  <string name="wizard_proxy_help_msg">Si l\'aplicació d\'Android que estàs utilitzant admet l\'ús d\'un proxy HTTP o SOCKS, pots configurar-la per a connectar-se a Orbot i utilitzar Tor.
-
-
-La configuració de l\'amfitrió és 127.0.0.1 o \"localhost\". Per a HTTP, el port actiu és 8118. Per a SOCKS, el proxy és 9050. Hauries d\'utlitzar SOCKS4A o SOCKS5 si és possible.
-
-
-
-Pots aprendre més coses sobre l\'ús dels proxys a Android al FAQ de: http://tinyurl.com/proxyandroid
-    </string>
+  <string name="wizard_proxy_help_msg">Si l\'aplicació d\'Android que estàs utilitzant admet l\'ús d\'un proxy HTTP o SOCKS, pots configurar-la per a connectar-se a Orbot i utilitzar Tor.\n\n\nLa configuració de l\'amfitrió és 127.0.0.1 o \"localhost\". Per a HTTP, el port actiu és 8118. Per a SOCKS, el proxy és 9050. Hauries d\'utlitzar SOCKS4A o SOCKS5 si és possible.\n\n\n\nPots aprendre més coses sobre l\'ús dels proxys a Android al FAQ de: http://tinyurl.com/proxyandroid\n    </string>
   <string name="wizard_final">Orbot és a punt!</string>
   <string name="wizard_final_msg">Centenars de milers de persones arreu del món utilitzen Tor per un gran ventall de raons: periodistes i blocaires, treballadors pels drets humans, agents de l\'autoritat, soldats, corporacions, ciutadans de règims opressors, i ciutadans qualssevol... I ara tu també ho pots fer!</string>
-  <string name="connect_first_time">T\'has connectat correctament a la xarxa Tor, però això NO vol dir que el teu dispositiu sigui segur. Pots utilitzar la opció \'Comprova\' del menú per provar el teu navegador. 
-
-Visita\'ns a https://guardianproject.info/apps/orbot o envia\'ns un correu electrònic a help@xxxxxxxxxxxxxxxxxxxx per a saber-ne més.</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">T\'has connectat correctament a la xarxa Tor, però això NO vol dir que el teu dispositiu sigui segur. Pots utilitzar la opció \'Comprova\' del menú per provar el teu navegador. \n\nVisita\'ns a https://guardianproject.info/apps/orbot o envia\'ns un correu electrònic a help@xxxxxxxxxxxxxxxxxxxx per a saber-ne més.</string>
   <string name="tor_check">Això obrirà el teu navegador web per defecte i es connectarà a https://check.torproject.org per tal de comprovar si Orbot està configurat correctament i estàs connectat/da a Tor.</string>
   <string name="pref_hs_group">Serveis ocults</string>
   <string name="pref_general_group">General</string>
   <string name="pref_start_boot_title">Start Orbot on Boot</string>
   <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
-  <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>
-  <string name="wizard_warning_title">Warning</string>
-  <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>
-  <string name="wizard_permissions_title">Permissions</string>
-  <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string>
-  <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Your device 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>
-  <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 (Només Android 1.x) - Navegador dissenyat per la privacitat &amp;amp; per a Orbot</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_orweb">ORWEB (Només Android 1.x) - Navegador dissenyat per la privacitat &amp; per a Orbot</string>
   <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
-  <string name="wizard_transproxy_title">Transparent Proxying</string>
-  <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string>
-  <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string>
-  <string name="wizard_transproxy_none">None</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string>
-  <string name="button_grant_superuser">Request Superuser Access</string>
-  <string name="pref_select_apps">Select Apps</string>
-  <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string>
-  <string name="pref_node_configuration">Node Configuration</string>
-  <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string>
-  <string name="pref_entrance_node">Entrance Nodes</string>
-  <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string>
-  <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string>
-  <string name="pref_use_whispercore">Use WhisperCore</string>
-  <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>
-  <string name="pref_proxy_type_title">Proxy Type</string>
-  <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Enter Proxy Type</string>
-  <string name="pref_proxy_host_title">Proxy Host</string>
-  <string name="pref_proxy_host_summary">Proxy server hostname</string>
-  <string name="pref_proxy_host_dialog">Enter Proxy Host</string>
-  <string name="pref_proxy_port_title">Proxy Port</string>
-  <string name="pref_proxy_port_summary">Proxy server port</string>
-  <string name="pref_proxy_port_dialog">Enter Proxy port</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying...</string>
-  <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string>
-  <string name="transproxy_rules_cleared">TransProxy rules cleared</string>
-  <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string>
-  <string name="privoxy_is_running_on_port_">Privoxy is running on port: </string>
-  <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string>
-  <string name="bridge_error">Bridge Error</string>
-  <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string>
-  <string name="send_email_for_bridges">Send an email to bridges@xxxxxxxxxxxxxx with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string>
-  <string name="error">Error</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string>
-  <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string>
-  <string name="exit_nodes">Exit Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string>
-  <string name="enter_exit_nodes">Enter Exit Nodes</string>
-  <string name="exclude_nodes">Exclude Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string>
-  <string name="enter_exclude_nodes">Enter Exclude Nodes</string>
-  <string name="strict_nodes">Strict Nodes</string>
-  <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string>
-  <string name="bridges">Bridges</string>
-  <string name="use_bridges">Use Bridges</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</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="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="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 name="powered_by">Funciona grà cies al Projecte Tor</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 4f20278..e335fa3 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -11,9 +11,9 @@
   <string name="status_activated">PÅ?ipojen k síti Tor</string>
   <string name="status_disabled">\"Orbot je deaktivován</string>
   <string name="status_shutting_down">Orbot se vypíná</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="tor_process_starting">Startuji Tor klienta...</string>
+  <string name="tor_process_complete">hotovo.</string>
+  <string name="tor_process_waiting">Ä?ekám.</string>
   <string name="not_anonymous_yet">VAROVÃ?NÃ?: VaÅ¡e komunikace jeÅ¡tÄ? není anonymní! Prosím nastavte vaÅ¡im aplikacím HTTP proxy 127.0.0.1:8118 nebo SOCKS4A Ä?i SOCKS5 proxy 172.0.0.1:9050</string>
   <string name="menu_home">Domů</string>
   <string name="menu_browse">Prohlížet</string>
@@ -23,18 +23,15 @@
   <string name="menu_apps">Aplikace</string>
   <string name="menu_start">Zapnout</string>
   <string name="menu_stop">Vypnout</string>
-  <string name="menu_about">About</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">About</string>
   <string name="button_clear_log">VyÄ?istit log</string>
   <string name="menu_verify">OvÄ?Å?it</string>
   <string name="menu_exit">Konec</string>
-  <string name="powered_by">powered by the Tor Project</string>
   <string name="press_to_start">- podržte pro spuÅ¡tÄ?ní -</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_group">Transparentní proxy (vyžaduje roota)</string>
+  <string name="pref_trans_proxy_title">Transparentní proxy</string>
   <string name="pref_trans_proxy_summary">Automatické Torování aplikací</string>
   <string name="pref_transparent_all_title">Torovat všechno</string>
   <string name="pref_transparent_all_summary">Proxynovat všechny aplikace skrz Tor</string>
@@ -44,148 +41,33 @@
   <string name="pref_transparent_port_summary">Seznam portů co proxynovat. *POUŽIJTE JEN* pokud módy \'All\' nebo \'App\' nefungují</string>
   <string name="pref_transparent_port_dialog">Zadejte porty pro proxynování</string>
   <string name="pref_has_root">Vyžaduje root pÅ?ístup</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="pref_has_root_summary">Požádat o práva roota kvůli transparentnímu proxy</string>
+  <string name="status_install_success">Binárky toru byly úspÄ?Å¡nÄ? nainstalovány!</string>
+  <string name="title_error">Chyba aplikace</string>
   <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">About Orbot</string>
-  <string name="btn_next">Next</string>
-  <string name="btn_back">Back</string>
-  <string name="btn_finish">Finish</string>
-  <string name="btn_okay">Okay</string>
-  <string name="btn_cancel">Cancel</string>
-  <string name="wizard_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
-    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
-    You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid
-    </string>
-  <string name="wizard_final">Orbot is ready!</string>
-  <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string>
-  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help@xxxxxxxxxxxxxxxxxxxx to learn more.</string>
-  <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string>
-  <string name="pref_hs_group">Hidden Services</string>
-  <string name="pref_general_group">General</string>
-  <string name="pref_start_boot_title">Start Orbot on Boot</string>
-  <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
-  <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>
-  <string name="wizard_warning_title">Warning</string>
-  <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>
-  <string name="wizard_permissions_title">Permissions</string>
-  <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string>
-  <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Your device 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>
-  <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="wizard_btn_tell_me_more">O Orbotovi</string>
+  <string name="btn_next">Další</string>
+  <string name="btn_back">ZpÄ?t</string>
+  <string name="btn_finish">DokonÄ?it</string>
+  <string name="btn_cancel">Zrušit</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_permissions_root">Práva udÄ?lena</string>
+  <string name="wizard_proxy_help_info">Nastavení Proxy</string>
+  <string name="wizard_final">Orbot je pÅ?ipraven!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Varování</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
   <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
-  <string name="wizard_transproxy_title">Transparent Proxying</string>
-  <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string>
-  <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string>
-  <string name="wizard_transproxy_none">None</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string>
-  <string name="button_grant_superuser">Request Superuser Access</string>
-  <string name="pref_select_apps">Select Apps</string>
-  <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string>
-  <string name="pref_node_configuration">Node Configuration</string>
-  <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string>
-  <string name="pref_entrance_node">Entrance Nodes</string>
-  <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string>
-  <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string>
-  <string name="pref_use_whispercore">Use WhisperCore</string>
-  <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>
-  <string name="pref_proxy_type_title">Proxy Type</string>
-  <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Enter Proxy Type</string>
-  <string name="pref_proxy_host_title">Proxy Host</string>
-  <string name="pref_proxy_host_summary">Proxy server hostname</string>
-  <string name="pref_proxy_host_dialog">Enter Proxy Host</string>
-  <string name="pref_proxy_port_title">Proxy Port</string>
-  <string name="pref_proxy_port_summary">Proxy server port</string>
-  <string name="pref_proxy_port_dialog">Enter Proxy port</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying...</string>
-  <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string>
-  <string name="transproxy_rules_cleared">TransProxy rules cleared</string>
-  <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string>
-  <string name="privoxy_is_running_on_port_">Privoxy is running on port: </string>
-  <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string>
-  <string name="bridge_error">Bridge Error</string>
-  <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string>
-  <string name="send_email_for_bridges">Send an email to bridges@xxxxxxxxxxxxxx with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string>
-  <string name="error">Error</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string>
-  <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string>
-  <string name="exit_nodes">Exit Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string>
-  <string name="enter_exit_nodes">Enter Exit Nodes</string>
-  <string name="exclude_nodes">Exclude Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string>
-  <string name="enter_exclude_nodes">Enter Exclude Nodes</string>
-  <string name="strict_nodes">Strict Nodes</string>
-  <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string>
-  <string name="bridges">Bridges</string>
-  <string name="use_bridges">Use Bridges</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</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="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="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"/>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index a9d4b83..994a9fe 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -25,13 +25,14 @@
   <string name="menu_stop">Stop</string>
   <string name="menu_about">Ã?ber</string>
   <string name="menu_wizard">Wizard</string>
+  <string name="main_layout_download">Download (Geschwindigkeit/Gesamt)</string>
+  <string name="main_layout_upload">Upload (Geschwindigkeit/Gesamtl)</string>
   <string name="button_help">Hilfe</string>
   <string name="button_close">SchlieÃ?en</string>
   <string name="button_about">Ã?ber</string>
   <string name="button_clear_log">Log löschen</string>
   <string name="menu_verify">�berprüfen</string>
   <string name="menu_exit">Beenden</string>
-  <string name="powered_by">ermöglicht durch das Tor Projekt</string>
   <string name="press_to_start">- Zum Starten gedrückt halten -</string>
   <string name="pref_trans_proxy_group">Transparenter Proxy (benötigt Administratorrechte)</string>
   <string name="pref_trans_proxy_title">Transparenter Proxy</string>
@@ -55,6 +56,7 @@
   <string name="btn_finish">Fertigstellen</string>
   <string name="btn_okay">OK</string>
   <string name="btn_cancel">Abbrechen</string>
+  <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Nähere Informationen zu Orbot</string>
   <string name="wizard_details_msg">Orbot ist eine quelloffene Anwendung die Tor, LibEvent und Privoxy enthält. Es stellt einen lokalen HTTP Proxy (8118) und einen SOCKS Proxy (9050) zum Tor-Netzwerk zur Verfügung. Orbot hat auf einem System mit Administrationsrechten auch die Fähigkeit, jeglichen Internetverkehr über das Tor-Netzwerk abzuwickeln.</string>
   <string name="wizard_permissions_root">Berechtigung erteilt</string>
@@ -72,39 +74,47 @@
   <string name="wizard_tips_msg">Die unten aufgeführten Apps wurden für die Zusammenarbeit mit Orbot entwickelt. Klicken Sie, um das Programm jetzt zu installieren oder verwenden Sie den Android Market.</string>
   <string name="wizard_tips_otrchat">Gibberbot - Ein sicheres Instant-Messaging Programm für Android</string>
   <string name="wizard_tips_proxy">Proxy-Einstellungen - Lernen Sie Anwendungen so zu konfigurieren, dass sie mit Orbot zusammenarbeiten.</string>
+  <string name="wizard_tips_duckgo">Duckduckgo Suchmaschinen-App</string>
+  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+  <string name="wizard_tips_firefox">Firefox mir Proxy Mobile-Add-On (extra Installation im Anschluss)</string>
+  <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
+  <string name="wizard_tips_twitter">Twitter unterstützt den http proxy \"localhost:8118\"</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Proxy-Einstellungen</string>
-  <string name="wizard_proxy_help_msg">Wenn das Android-App, das Sie benutzen, die Verwendung von HTTP- oder SOCKS-Proxys unterstützt, können Sie es so konfigurieren, dass es sich mit Orbot verbindet und Tor verwendet.
-
-
-Die Host-Einstellungen sind 127.0.0.1 oder \"localhost\". Die Port-Einstellungen sind 8118 für HTTP und 9050 für SOCKS. Sie sollten versuchen, SOCKS4A oder SOCKS5 zu verwenden.
-
-
-
-Erfahren Sie mehr über die Verwendung von Proxys unter Android in den FAQ unter http://tinyurl.com/proxyandroid
-    </string>
+  <string name="wizard_proxy_help_msg">Wenn das Android-App, das Sie benutzen, die Verwendung von HTTP- oder SOCKS-Proxys unterstützt, können Sie es so konfigurieren, dass es sich mit Orbot verbindet und Tor verwendet.\n\n\nDie Host-Einstellungen sind 127.0.0.1 oder \"localhost\". Die Port-Einstellungen sind 8118 für HTTP und 9050 für SOCKS. Sie sollten versuchen, SOCKS4A oder SOCKS5 zu verwenden.\n\n\n\nErfahren Sie mehr über die Verwendung von Proxys unter Android in den FAQ unter http://tinyurl.com/proxyandroid\n    </string>
   <string name="wizard_final">Orbot ist bereit!</string>
   <string name="wizard_final_msg">Hunderttausende Menschen auf der ganzen Welt nutzen Tor aus einer Vielzahl von Gründen: Journalisten und Blogger, Menschenrechtsaktivisten, Strafverfolgungsbehörden, Soldaten, Unternehmen, Bürger repressiver Regime und ganz normale Menschen... und jetzt können Sie das auch!</string>
-  <string name="connect_first_time">Sie haben sich erfolgreich mit dem Tor-Netzwerk verbunden - das bedeutet aber NICHT, dass Ihr Gerät sicher ist. Sie können die \'�berprüfen\'-Option aus dem Menü benutzen, um Ihren Browser zu testen. 
-
-Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail an help@xxxxxxxxxxxxxxxxxxxx um mehr darüber zu erfahren.</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Sie haben sich erfolgreich mit dem Tor-Netzwerk verbunden - das bedeutet aber NICHT, dass Ihr Gerät sicher ist. Sie können die \'�berprüfen\'-Option aus dem Menü benutzen, um Ihren Browser zu testen. \n\nBesuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail an help@xxxxxxxxxxxxxxxxxxxx um mehr darüber zu erfahren.</string>
   <string name="tor_check">Durch Bestätigen mit \'OK\' wird die Seite https://check.torproject.org in Ihrem Webbrowser geöffnet, sodass Sie überprüfen können, ob Orbot richtig konfiguriert ist und Sie mit Tor verbunden sind.</string>
   <string name="pref_hs_group">Versteckte Dienste</string>
   <string name="pref_general_group">Allgemein</string>
   <string name="pref_start_boot_title">Orbot beim Systemstart ausführen</string>
   <string name="pref_start_boot_summary">Automatisches Starten von Orbot und Verbinden von Tor beim Start des Android-Gerätes</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
   <string name="wizard_title_msg">Orbot sorgt dafür, dass Sie Tor mit Android nutzen können. Tor schützt vor Filterung von Inhalten, Traffic Analysen und Netzwerk-�berwachung, die Ihre Privatsphäre, vertrauliche Informationen und persönliche Verhältnisse gefährdet. Dieser Assistent wird Ihnen dabei helfen, Orbot und Tor auf Ihrem Gerät zu konfigurieren.</string>
+  <!--Warning screen-->
   <string name="wizard_warning_title">Warnung</string>
   <string name="wizard_warning_msg">Die reine Installation von Orbot wird Ihren Datenverkehr nicht anonymisieren. Tor muss korrekt konfiguriert sein, damit ihr Gerät Tor erfolgreich verwenden kann.</string>
+  <!--Permissions screen-->
   <string name="wizard_permissions_title">Rechte</string>
   <string name="wizard_permissions_root_msg1">Sie können Orbot wahlweise \'Administrator\'-Rechte geben, um erweiterte Optionen wie die Nutzung von transparenten Proxys zu ermöglichen.</string>
   <string name="wizard_permissions_root_msg2">Wenn Sie dies nicht möchten, dann verwenden Sie bitte Apps, die mit Orbot zusammen arbeiten können.</string>
-  <string name="wizard_permissions_no_root_msg">Ihr Gerät läuft im Standard-Modus und unterstützt keine Administrator-Rechte. In diesem Fall müssen Sie Apps verwenden, die von Haus aus mit Orbot zusammenarbeiten oder die HTTP bzw. SOCKS Proxy Einstellungen ermöglichen.
-</string>
+  <string name="wizard_permissions_no_root_msg">Ihr Gerät läuft im Standard-Modus und unterstützt keine Administrator-Rechte. In diesem Fall müssen Sie Apps verwenden, die von Haus aus mit Orbot zusammenarbeiten oder die HTTP bzw. SOCKS Proxy Einstellungen ermöglichen.\n</string>
+  <!--TipsAndTricks screen-->
   <string name="wizard_tips_title">Apps die Orbot unterstützt</string>
   <string name="wizard_tips_gibberbot">Gibberbot: Sichere Chat App mit inoffizieller Verschlüsselung</string>
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
-  <string name="wizard_tips_orweb">ORWEB (Nur Android 1.x) - Ein für Privatsphäre &amp;amp; Orbot entworfener Browser</string>
+  <string name="wizard_tips_orweb">ORWEB (Nur Android 1.x) - Ein für Privatsphäre &amp; Orbot entworfener Browser</string>
   <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <string name="wizard_tips_play">Finde alle Guardian Project Apss im Google Play Store</string>
+  <string name="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">Benutze transparenten Proxy</string>
   <string name="wizard_transproxy_msg">Dies ermöglicht Ihnen Apps, automatisch das Tor Netzwerk zu verwenden ohne dies konfigurieren zu müssen.</string>
   <string name="wizard_transproxy_hint">(Klicken Sie dieses Kästchen an wenn Sie nicht wissen wovon wir reden)</string>
@@ -119,8 +129,9 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail
   <string name="pref_entrance_node">Eingangs-Knoten</string>
   <string name="pref_entrance_node_summary">Fingerprints, Spitznamen, Land und Adressen für den ersten Punkt</string>
   <string name="pref_entrance_node_dialog">Eingangs-Knoten angeben</string>
-  <string name="pref_use_whispercore">Verwende WhisperCore</string>
-  <string name="pref_use_whispercore_summary">Verwende die proprietäre NetFilter-API von WhisperSystems (benötigt ein Gerät mit installiertem WhisperCore)</string>
+  <!--<string name="pref_use_whispercore">Use WhisperCore</string>
+<string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
+  <string name="pref_proxy_title">Ausgehender Netzwerk-Proxy</string>
   <string name="pref_proxy_type_title">Proxy-Typ</string>
   <string name="pref_proxy_type_summary">Protokoll zur Verwendung des Proxy Servers:HTTP,HTTPS,Socks4,Socks5</string>
   <string name="pref_proxy_type_dialog">Proxy-Typ angeben</string>
@@ -156,7 +167,9 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail
   <string name="use_only_these_specified_nodes">Benutze *ausschlieÃ?lich* diese angegebenen Nodes</string>
   <string name="bridges">Bridges</string>
   <string name="use_bridges">Benutze Bridges</string>
+  <string name="bridges_obfuscated">Verschleierte Brücken</string>
   <string name="enable_alternate_entrance_nodes_into_the_tor_network">Benutze alternative Eingangs-Nodes in das TOR-Netzwerk</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Aktivieren, falls konfigurierte Brücken verschleierte Brücken sind.</string>
   <string name="ip_address_and_port_of_bridges">IP Adresse und Port der Bridges</string>
   <string name="enter_bridge_addresses">Geben Sie die Bridge_Adressen ein</string>
   <string name="relays">Relays</string>
@@ -184,7 +197,11 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail
   <string name="the_tor_license">Die Tor Lizenz</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">Drittanbieter-Software:</string>
-  
+  <string name="tor_version">Tor v0.2.3.7-alpha: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
+  <string name="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">Eine Anwendungen möchte den Port für versteckte Dienste %S öffnen. Dies ist sicher wenn Sie der Anwendung vertrauen.</string>
   <string name="found_existing_tor_process">existierender Tor Prozess gefunden...</string>
   <string name="something_bad_happened">Etwasist schief gelaufen. Bitte Log prüfen</string>
@@ -196,4 +213,12 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail
   <string name="error_installing_binares">Die Tor-Binarys konnten nicht installiert oder aktualisiert werden.</string>
   <string name="pref_use_persistent_notifications">Behalte das Icon immer in der Benutzerleiste (Toolbar) wenn Orbot verbunden ist.</string>
   <string name="pref_use_persistent_notifications_title">Immer-eingeschaltet Benachrichtigungen</string>
+  <string name="notification_using_bridges">Brücke aktiviert!</string>
+  <string name="default_bridges"/>
+  <string name="set_locale_title">Gebietsschema festlegen</string>
+  <string name="set_locale_summary">Gebietsschema und Sprache wählen</string>
+  <string name="wizard_locale_title">Sprache wählen</string>
+  <string name="wizard_locale_msg">Grundeinstellung beibehalten oder Sprache ändern</string>
+  <string name="powered_by">ermöglicht durch das Tor Projekt</string>
+  <string name="btn_save_settings">Einstellungen speichern</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 2705a38..b429371 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -11,9 +11,9 @@
   <string name="status_activated">ΣÏ?νδέθηκε Ï?Ï?ο δίκÏ?Ï?ο Tor</string>
   <string name="status_disabled">\"Το Orbot είναι Î?Ï?ενεÏ?γοÏ?οιημένο</string>
   <string name="status_shutting_down">Το Orbot θα Ï?εÏ?μαÏ?ίÏ?ει</string>
-  <string name="tor_process_starting">Starting Tor client...</string>
-  <string name="tor_process_complete">complete.</string>
-  <string name="tor_process_waiting">waiting.</string>
+  <string name="tor_process_starting">Î?κκίνηÏ?η Ï?οÏ? Ï?ελάÏ?η Tor...</string>
+  <string name="tor_process_complete">ολοκληÏ?Ï?θηκε...</string>
+  <string name="tor_process_waiting">αναμονή</string>
   <string name="not_anonymous_yet">ΠΡÎ?Î?Î?Î?Î?Î Î?Î?Î?ΣÎ?: Î? κÏ?κλοÏ?οÏ?ία Ï?αÏ? δεν είναι ακÏ?μη ανÏ?νÏ?μη! ΡÏ?θμίÏ?Ï?ε Ï?ιÏ? εÏ?αÏ?μογέÏ? Ï?αÏ? Ï?Ï?Ï?ε να Ï?Ï?ηÏ?ιμοÏ?οιοÏ?ν Ï?Ï? Ï?ληÏ?εξοÏ?Ï?ιο HTTP 127.0.0.1:8118 ή SOCKS5 127.0.0.1:9050</string>
   <string name="menu_home">Î?Ï?Ï?ική</string>
   <string name="menu_browse">ΠεÏ?ιήγηÏ?η</string>
@@ -25,13 +25,14 @@
   <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>
   <string name="button_clear_log">Î?ιαγÏ?αÏ?ή Î?αÏ?αγÏ?αÏ?ήÏ?</string>
   <string name="menu_verify">Î?λεγÏ?οÏ?</string>
   <string name="menu_exit">Î?ξοδοÏ?</string>
-  <string name="powered_by">με Ï?ην δÏ?ναμη Ï?ο Tor Project</string>
   <string name="press_to_start">-για να εκκινήÏ?ει κÏ?αÏ?ήÏ?Ï?ε Ï?ο Ï?αÏ?ημένο-</string>
   <string name="pref_trans_proxy_group">Î?ιαÏ?ανήÏ? ΠληÏ?εξοÏ?Ï?ιοÏ? Î?ιακομηÏ?Ï?ήÏ? (Î?Ï?αιÏ?εί διαÏ?είÏ?ιÏ?η root)</string>
   <string name="pref_trans_proxy_title">Î?ιαÏ?ανήÏ? ΠληÏ?εξοÏ?Ï?ιοÏ? Î?ιακομηÏ?Ï?ήÏ?</string>
@@ -55,6 +56,7 @@
   <string name="btn_finish">ΤέλοÏ?</string>
   <string name="btn_okay">Okay</string>
   <string name="btn_cancel">Î?κÏ?Ï?ο</string>
+  <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Î?εÏ?ικέÏ? λεÏ?Ï?ομέÏ?ειεÏ? για Ï?ο Orbot</string>
   <string name="wizard_details_msg">Το Orbot είναι μια εÏ?αÏ?μογή ανοικÏ?οÏ? λογιÏ?μικοÏ? Ï?οÏ? Ï?εÏ?ιέÏ?ει Ï?α Tor, LibEvent και Privoxy. Î?ιαθέÏ?ει Ï?οÏ?ικοÏ?Ï? Ï?ληÏ?εξοÏ?Ï?ιοÏ?Ï? διακομιÏ?Ï?έÏ? (proxies) HTTP (8118) και SOCKS (9050) για Ï?ο δίκÏ?Ï?ο Tor. Σε Ï?Ï?Ï?κεÏ?έÏ? Ï?οÏ? έÏ?οÏ?ν διαμοÏ?Ï?Ï?θεί για Ï?ιζική Ï?Ï?ήÏ?η (rooted devices), Ï?ο Orbot μÏ?οÏ?εί να μεÏ?αδίδει Ï?λη Ï?ην διαδÏ?κÏ?ιακή κÏ?κλοÏ?οÏ?ία μέÏ?Ï? Tor.</string>
   <string name="wizard_permissions_root">Î? άδεια Ï?αÏ?αÏ?Ï?Ï?ήθηκε</string>
@@ -63,129 +65,160 @@
   <string name="wizard_permissions_msg_stock"> Î?ν και δεν είναι αÏ?αÏ?αίÏ?ηÏ?ο, Ï?ο Orbot μÏ?οÏ?εί να γίνει ιÏ?Ï?Ï?Ï?Ï?Ï?εÏ?ο Ï?Ï?αν η Ï?Ï?Ï?κεÏ?ή Ï?αÏ? έÏ?ει διαμοÏ?Ï?Ï?θεί για Ï?Ï?Ï?Ï?βαÏ?η Ï?Ï?εÏ?Ï?Ï?ήÏ?Ï?η. ΠαÏ?ήÏ?Ï?ε Ï?ο Ï?ιο κάÏ?Ï? κοÏ?μÏ?ί για να δÏ?Ï?εÏ?ε αÏ?ξημένα δικαιÏ?μαÏ?α Ï?Ï?ο Orbot! </string>
   <string name="wizard_permissions_no_root">Î?ν δεν διαθέÏ?εÏ?ε Ï?Ï?Ï?Ï?βαÏ?η Ï?Ï?εÏ?Ï?ήÏ?Ï?η ή δεν καÏ?αλαβαίνεÏ?ε Ï?ι εννοοÏ?με, αÏ?λÏ?Ï? Ï?Ï?ηÏ?ιμοÏ?οιείÏ?ε εÏ?αÏ?μογέÏ? Ï?οÏ? Ï?Ï?ιάÏ?Ï?ηκαν για να Ï?Ï?νεÏ?γάζονÏ?αι με Ï?ο Orbot.</string>
   <string name="wizard_permissions_consent">Î?αÏ?αλαβαίνÏ? και θέλÏ? να Ï?Ï?νεÏ?ίÏ?Ï? Ï?Ï? Î¥Ï?εÏ?Ï?Ï?ήÏ?Ï?ηÏ?</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
-    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
-    You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid
-    </string>
-  <string name="wizard_final">Orbot is ready!</string>
-  <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string>
-  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help@xxxxxxxxxxxxxxxxxxxx to learn more.</string>
-  <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string>
-  <string name="pref_hs_group">Hidden Services</string>
-  <string name="pref_general_group">General</string>
-  <string name="pref_start_boot_title">Start Orbot on Boot</string>
-  <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
-  <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>
-  <string name="wizard_warning_title">Warning</string>
-  <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>
-  <string name="wizard_permissions_title">Permissions</string>
-  <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string>
-  <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Your device 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>
-  <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="wizard_permission_enable_root">Î?Ï?Ï?δοÏ?η Î?ιαÏ?ειÏ?ιÏ?ηÏ? Ï?Ï?ο Orbot</string>
+  <string name="wizard_configure">ΡÏ?θμιÏ?η Torification</string>
+  <string name="wizard_configure_msg">Το Orbot Ï?αÏ? εÏ?ιÏ?Ï?έÏ?ει να καÏ?εÏ?θÏ?νεÏ?ε Ï?λη Ï?ην κÏ?κλοÏ?οÏ?ία κάÏ?οιαÏ? εÏ?αÏ?μογήÏ? Ï?Ï?οÏ? Ï?ο Tor ή να εÏ?ιλέξεÏ?ε κάθε μια εÏ?αÏ?μογή ξεÏ?Ï?Ï?ιÏ?Ï?ά.</string>
+  <string name="wizard_configure_all">Το Tor να γίνει ενδιάμεÏ?οÏ? διακομιÏ?Ï?ήÏ? Proxy για Ï?λεÏ? Ï?ιÏ? εÏ?αÏ?μογέÏ?</string>
+  <string name="wizard_configure_select_apps">Î?Ï?ιλογή μεμονÏ?μένÏ?ν εÏ?αÏ?μογÏ?ν για Ï?ο Tor</string>
+  <string name="wizard_tips_tricks">Î?Ï?αÏ?μογέÏ? Ï?Ï?μβαÏ?έÏ? για Orbont</string>
+  <string name="wizard_tips_msg">Î?ι Ï?αÏ?ακάÏ?Ï? εÏ?αÏ?μογέÏ? αναÏ?Ï?Ï?Ï?θηκαν Ï?Ï?Ï?ε να λειÏ?οÏ?Ï?γοÏ?ν με Ï?ο Orbot. ΠαÏ?ήÏ?Ï?ε Ï?ε κάθε κοÏ?μÏ?ί για να εγκαÏ?αÏ?Ï?αθεί Ï?Ï?Ï?α ή μÏ?οÏ?είÏ?ε να Ï?ιÏ? βÏ?είÏ?ε αÏ?γÏ?Ï?εÏ?α Ï?Ï?ο Android Market</string>
+  <string name="wizard_tips_otrchat">Gibberbot - Î?Ï?Ï?αλέÏ? Ï?Ï?Ï?γÏ?αμμα-Ï?ελάÏ?ηÏ? άμεÏ?Ï?ν μηνÏ?μάÏ?Ï?ν για Ï?ο Android</string>
+  <string name="wizard_tips_proxy">ΡÏ?θμίÏ?ειÏ? proxy: Î?άθεÏ?ε Ï?Ï?Ï? θα Ï?Ï?θμίÏ?εÏ?ε Ï?ιÏ? εÏ?αÏ?μογέÏ? Ï?Ï?Ï?ε να λειÏ?οÏ?Ï?γοÏ?ν με Ï?ο Orbot</string>
+  <string name="wizard_tips_duckgo">Î?Ï?αÏ?μογή Î?ηÏ?ανήÏ? Î?ναζήÏ?ηÏ?ηÏ? Duckduckgo</string>
+  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+  <string name="wizard_tips_firefox">Firefox με Ï?ο Ï?Ï?Ï?Ï?θεÏ?ο Proxy Mobile</string>
+  <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
+  <string name="wizard_tips_twitter">Το Twitter Ï?Ï?οÏ?Ï?ηÏ?ίζει http proxy localhost:8118</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
+  <string name="wizard_proxy_help_info">ΡÏ?θμίÏ?ειÏ? proxy</string>
+  <string name="wizard_proxy_help_msg">Î?ν η εÏ?αÏ?μογή Android Ï?οÏ? Ï?Ï?ηÏ?ιμοÏ?οιείÏ?ε Ï?Ï?οÏ?Ï?ηÏ?ίζει διακομιÏ?Ï?ή μεÏ?ολάβηÏ?ηÏ? proxy Ï?Ï?Ï?οÏ? HTTP ή SOCKS, Ï?Ï?Ï?ε μÏ?οÏ?είÏ?ε να Ï?ην Ï?Ï?θμίÏ?εÏ?ε να Ï?Ï?νδέεÏ?ε με Ï?ο Orbot και να Ï?Ï?ηÏ?ιμοÏ?οιεί Ï?ο Tor.\n\n\nÎ?ι Ï?Ï?θμίÏ?ειÏ? για Ï?ον Ï?Ï?ολογιÏ?Ï?ή Ï?οÏ? Ï?ιλοξενεί Ï?ο Ï?Ï?Ï?γÏ?αμμα Ï?ελάÏ?η είναι 127.0.0.1 ή \"localhost\". Î?ια Î?ΤΤΡ οι Ï?Ï?θμίÏ?ειÏ? θÏ?Ï?αÏ? είναι 8118. Î?ια SOCKS η θÏ?Ï?α είναι 9050. Î?άν αÏ?Ï?Ï? είναι εÏ?ικÏ?Ï?, Ï?Ï?έÏ?ει να Ï?Ï?ηÏ?ιμοÏ?οιείÏ?ε SOCKS4A ή SOCKS5.\n\n\nÎ?Ï?οÏ?είÏ?ε να μάθεÏ?ε Ï?εÏ?ιÏ?Ï?Ï?Ï?εÏ?α για Ï?ην διαδικαÏ?ία proxy Ï?ε Ï?εÏ?ιβάλλον Android μέÏ?Ï? Ï?οÏ? FAQ:http://tinyurl.com/proxyandroid\n</string>
+  <string name="wizard_final">Το Orbot είναι έÏ?οιμο!</string>
+  <string name="wizard_final_msg">Î?καÏ?ονÏ?άδεÏ? Ï?ιλιάδεÏ? ανθÏ?Ï?Ï?Ï?ν Ï?αγκοÏ?μίÏ?Ï? Ï?Ï?ηÏ?ιμοÏ?οιοÏ?ν Ï?ο Tor για Ï?ολλοÏ?Ï? λÏ?γοÏ?Ï?.\n\nÎ?ι δημοÏ?ιογÏ?άÏ?οι και οι bloggers, οι Ï?Ï?εÏ?αÏ?Ï?ιÏ?Ï?έÏ? Ï?Ï?ν δικαιÏ?μάÏ?Ï?ν Ï?οÏ? ανθÏ?Ï?Ï?οÏ?, οι δÏ?νάμειÏ? εÏ?αÏ?μογήÏ? Ï?οÏ? Î?Ï?μοÏ?, οι Ï?Ï?Ï?αÏ?ιÏ?Ï?ικοί, οι εÏ?αιÏ?ίεÏ?, οι Ï?ολίÏ?εÏ? καÏ?αÏ?ιεÏ?Ï?ικÏ?ν καθεÏ?Ï?Ï?Ï?Ï?ν αλλά και Ï?Ï?νηθιÏ?μένοι Ï?ολίÏ?εÏ?... Î?αι Ï?Ï?Ï?α Î?ΣÎ?Î?Σ είÏ?Ï?ε έÏ?οιμοÏ? ή έÏ?οιμη να Ï?ο Ï?Ï?ηÏ?ιμοÏ?οιήÏ?εÏ?ε, εÏ?ίÏ?ηÏ?!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">ΣÏ?νδεθήκαÏ?ε με εÏ?ιÏ?Ï?Ï?ία Ï?Ï?ο δίκÏ?Ï?ο Tor - αÏ?Ï?Ï? Ï?μÏ?Ï? δεν Ï?ημαίνει Ï?Ï?ι η Ï?Ï?Ï?κεÏ?ή Ï?αÏ? είναι αÏ?Ï?αλήÏ?. Î?Ï?οÏ?είÏ?ε να Ï?Ï?ηÏ?ιμοÏ?οιήÏ?εÏ?ε Ï?ην εÏ?ιλογή \'Check\' αÏ?Ï? Ï?ο μενοÏ? για να ελέγξεÏ?ε Ï?ον Ï?εÏ?ιηγηÏ?ή Ï?αÏ?.\n\nÎ?ια να μάθεÏ?ε Ï?εÏ?ιÏ?Ï?Ï?Ï?εÏ?α, εÏ?ιÏ?κεÏ?θείÏ?ε μαÏ? Ï?Ï?ην Ï?ελίδα https://guardianproject.info/apps/orbot ή Ï?Ï?είλÏ?ε ένα μήνÏ?μα Ï?Ï?ην διεÏ?θÏ?νÏ?η help@xxxxxxxxxxxxxxxxxxxxx</string>
+  <string name="tor_check">Î?α ανοίξει ο Ï?εÏ?ιηγηÏ?ήÏ? δικÏ?Ï?οÏ? Ï?Ï?ην Ï?ελίδα https://check.torproject.org για να διαÏ?ιÏ?Ï?Ï?Ï?εÏ?ε αν Ï?ο Orbot είναι Ï?Ï?Ï?Ï?ά Ï?Ï?θμιÏ?μένο και Ï?Ï?ι είÏ?Ï?ε Ï?Ï?νδεδεμένοÏ?/η Ï?Ï?ο Tor.</string>
+  <string name="pref_hs_group">Φιλοξενία κÏ?Ï?Ï?Ï?ν Ï?Ï?ηÏ?εÏ?ιÏ?ν</string>
+  <string name="pref_general_group">Î?ενικά</string>
+  <string name="pref_start_boot_title">Î?ναÏ?ξη Ï?οÏ? Orbot καÏ?ά Ï?ην εκκίνηÏ?η</string>
+  <string name="pref_start_boot_summary">Î?Ï?Ï?Ï?μαÏ?η έναÏ?ξη Ï?οÏ? Orbot και Ï?Ï?νδεÏ?η Ï?Ï?ο Tor Ï?Ï?αν ξεκινά η Android Ï?Ï?Ï?κεÏ?ή Ï?αÏ?</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Το Orbot Ï?έÏ?νει Ï?ο Tor Ï?Ï?ο Android!\n\nΤο Tor εÏ?ιÏ?Ï?έÏ?ει Ï?ην άμÏ?να αÏ?ένανÏ?ι Ï?ε Ï?ιλÏ?Ï?άÏ?ιÏ?μα Ï?εÏ?ιεÏ?ομένοÏ?, ανάλÏ?Ï?η κÏ?κλοÏ?οÏ?ίαÏ? και δικÏ?Ï?ακή εÏ?ιÏ?ήÏ?ηÏ?η Ï?οÏ? αÏ?ειλοÏ?ν Ï?ην ιδιÏ?Ï?ικÏ?Ï?ηÏ?α, Ï?ιÏ? εμÏ?ιÏ?Ï?εÏ?Ï?ικέÏ? Ï?ληÏ?οÏ?οÏ?ίεÏ? και Ï?ιÏ? Ï?Ï?οÏ?Ï?Ï?ικέÏ? Ï?Ï?έÏ?ειÏ?.\n\nÎ? οδηγÏ?Ï? αÏ?Ï?Ï?Ï? θα Ï?αÏ? βοηθήÏ?ει να Ï?Ï?θμίÏ?εÏ?ε Ï?α Orbot και Tor Ï?ηÏ? Ï?Ï?Ï?κεÏ?ήÏ? Ï?αÏ?.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Î Ï?οειδοÏ?οίηÏ?η</string>
+  <string name="wizard_warning_msg">Î?γκαθιÏ?Ï?Ï?νÏ?αÏ? αÏ?λÏ?Ï? Ï?ο Orbot δεν θα καÏ?αÏ?Ï?ήÏ?ει ανÏ?νÏ?μη Ï?ην κÏ?κλοÏ?οÏ?ία Ï?ηÏ? κινηÏ?ήÏ? Ï?Ï?Ï?κεÏ?ήÏ? Ï?αÏ?.\n\nÏ?Î?ια να Ï?Ï?ηÏ?ιμοÏ?οιήÏ?εÏ?ε με εÏ?ιÏ?Ï?Ï?ία Ï?ο Tor Î Ï?έÏ?ει να Ï?Ï?θμίÏ?εÏ?ε Ï?Ï?Ï?Ï?ά Ï?ο Orbot, Ï?ην Ï?Ï?Ï?κεÏ?ή Ï?αÏ? και άλλεÏ? εÏ?αÏ?μογέÏ?.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Î?δειεÏ?</string>
+  <string name="wizard_permissions_root_msg1">Î?ν θέλεÏ?ε, μÏ?οÏ?εί να δÏ?Ï?εÏ?ε Ï?Ï?ο Orbot Ï?Ï?Ï?Ï?βαÏ?η \'Î¥Ï?εÏ?Ï?Ï?ήÏ?Ï?η\' Ï?Ï?Ï?ε να ενεÏ?γοÏ?οιήÏ?εÏ?ε Ï?α Ï?Ï?οÏ?Ï?Ï?ημένα Ï?αÏ?ακÏ?ηÏ?ιÏ?Ï?ικά, Ï?Ï?Ï?Ï? Ï?ο Transparent Proxying.</string>
+  <string name="wizard_permissions_root_msg2">Î?ν δεν θέλεÏ?ε κάÏ?ι Ï?έÏ?οιο, βεβαιÏ?θείÏ?ε Ï?Ï?ι Ï?Ï?ηÏ?ιμοÏ?οιείÏ?ε εÏ?αÏ?μογέÏ? Ï?οÏ? Ï?Ï?νεÏ?γάζονÏ?αι με Ï?ο Orbot</string>
+  <string name="wizard_permissions_no_root_msg">ΦαίνεÏ?αι Ï?Ï?ι η Ï?Ï?Ï?κεÏ?ή Ï?αÏ? δεν έÏ?ει διαμÏ?Ï?Ï?Ï?Ï?η Ï?Ï?εÏ?Ï?Ï?ήÏ?Ï?η (rooted) ή δεν Ï?αÏ?έÏ?ει Ï?Ï?Ï?Ï?βαÏ?η \'Î¥Ï?εÏ?Ï?Ï?ήÏ?Ï?η\'.\n\nÎ?ν εÏ?ιθÏ?μείÏ?ε να εÏ?Ï?Ï?εληθείÏ?ε αÏ?Ï? Ï?ο Tor θα Ï?Ï?έÏ?ει να Ï?Ï?ηÏ?ιμοÏ?οιήÏ?εÏ?ε εÏ?αÏ?μογέÏ? Ï?οÏ? Ï?Ï?νεÏ?γάζονÏ?αι με Ï?ο Orbot ή Ï?Ï?οÏ?Ï?ηÏ?ίζοÏ?ν Ï?Ï?θμίÏ?ειÏ? διακομιÏ?Ï?ή διαμεÏ?ολάβηÏ?ηÏ? HTTP ή SOCKS.</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Î?Ï?αÏ?μογέÏ? Ï?Ï?μβαÏ?έÏ? με Orbot</string>
+  <string name="wizard_tips_gibberbot">Gibberbot: Î?Ï?Ï?αλήÏ? εÏ?αÏ?μογήÏ? Ï?Ï?ζήÏ?ηÏ?ηÏ? με ανεÏ?ίÏ?ημη κÏ?Ï?Ï?Ï?ογÏ?άÏ?ηÏ?η</string>
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
-  <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</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_transproxy_title">Transparent Proxying</string>
-  <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string>
-  <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string>
-  <string name="wizard_transproxy_none">None</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string>
-  <string name="button_grant_superuser">Request Superuser Access</string>
-  <string name="pref_select_apps">Select Apps</string>
-  <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string>
-  <string name="pref_node_configuration">Node Configuration</string>
-  <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string>
-  <string name="pref_entrance_node">Entrance Nodes</string>
-  <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string>
-  <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string>
-  <string name="pref_use_whispercore">Use WhisperCore</string>
-  <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>
-  <string name="pref_proxy_type_title">Proxy Type</string>
-  <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Enter Proxy Type</string>
-  <string name="pref_proxy_host_title">Proxy Host</string>
-  <string name="pref_proxy_host_summary">Proxy server hostname</string>
-  <string name="pref_proxy_host_dialog">Enter Proxy Host</string>
-  <string name="pref_proxy_port_title">Proxy Port</string>
-  <string name="pref_proxy_port_summary">Proxy server port</string>
-  <string name="pref_proxy_port_dialog">Enter Proxy port</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying...</string>
-  <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string>
-  <string name="transproxy_rules_cleared">TransProxy rules cleared</string>
-  <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string>
-  <string name="privoxy_is_running_on_port_">Privoxy is running on port: </string>
-  <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string>
-  <string name="bridge_error">Bridge Error</string>
-  <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string>
-  <string name="send_email_for_bridges">Send an email to bridges@xxxxxxxxxxxxxx with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string>
-  <string name="error">Error</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string>
-  <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string>
-  <string name="exit_nodes">Exit Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string>
-  <string name="enter_exit_nodes">Enter Exit Nodes</string>
-  <string name="exclude_nodes">Exclude Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string>
-  <string name="enter_exclude_nodes">Enter Exclude Nodes</string>
-  <string name="strict_nodes">Strict Nodes</string>
-  <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string>
-  <string name="bridges">Bridges</string>
-  <string name="use_bridges">Use Bridges</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</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="wizard_tips_play">Î?Ï?εÏ? Ï?λεÏ? Ï?ιÏ? εÏ?αÏ?μογέÏ? Guardian Project Ï?Ï?ο Google Play</string>
+  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
+  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Î?ιαÏ?ανήÏ? μεÏ?ολάβηÏ?η διακομιÏ?Ï?ή</string>
+  <string name="wizard_transproxy_msg">Το Ï?Ï?οιÏ?είο αÏ?Ï?Ï? εÏ?ιÏ?Ï?έÏ?ει Ï?Ï?ιÏ? εÏ?αÏ?μογέÏ? Ï?αÏ? να λειÏ?οÏ?Ï?γοÏ?ν μέÏ?Ï? Ï?οÏ? δικÏ?Ï?οÏ? Tor Ï?Ï?Ï?ίÏ? κάÏ?οια Ï?Ï?θμιÏ?η.</string>
+  <string name="wizard_transproxy_hint">(Î?Ï?ιλέξÏ?ε αÏ?Ï?Ï? Ï?ο Ï?εÏ?Ï?άγÏ?νο αν δεν καÏ?αλαβαίνεÏ?ε για Ï?ι Ï?Ï?άγμα μιλάμε)</string>
+  <string name="wizard_transproxy_none">Î?αμία</string>
+  <string name="pref_transparent_tethering_title">Î?ιαÏ?Ï?νδεÏ?η Tor</string>
+  <string name="pref_transparent_tethering_summary">Î?νεÏ?γοÏ?οίηÏ?η Ï?ηÏ? Î?ιαÏ?ανοÏ?Ï? μεÏ?ολάβηÏ?ηÏ? διακομιÏ?Ï?ή για Ï?Ï?Ï?κεÏ?έÏ? με WiFi και διαÏ?Ï?νδεÏ?η USB (αÏ?αιÏ?εί εÏ?ανεκκίνηÏ?η)</string>
+  <string name="button_grant_superuser">Î?ίÏ?ημα Î Ï?Ï?Ï?βαÏ?ηÏ? Î¥Ï?εÏ?Ï?Ï?ήÏ?Ï?η</string>
+  <string name="pref_select_apps">Î?Ï?ιλογή εÏ?αÏ?μογÏ?ν</string>
+  <string name="pref_select_apps_summary">Î?Ï?ιλέξÏ?ε Ï?ιÏ? εÏ?αÏ?μογέÏ? Ï?οÏ? θα διέλθοÏ?ν μέÏ?Ï? Tor</string>
+  <string name="pref_node_configuration">ΡÏ?θμιÏ?η κÏ?μβοÏ?</string>
+  <string name="pref_node_configuration_summary">Î?ι Ï?Ï?θμίÏ?ειÏ? αÏ?Ï?έÏ? είναι Ï?Ï?οÏ?Ï?Ï?ημένεÏ? και μÏ?οÏ?οÏ?ν να μειÏ?Ï?οÏ?ν Ï?ην ανÏ?νÏ?μία Ï?αÏ?.</string>
+  <string name="pref_entrance_node">Î?Ï?μβοι ειÏ?Ï?δοÏ?</string>
+  <string name="pref_entrance_node_summary">Î?Ï?οÏ?Ï?Ï?Ï?μαÏ?α, Ï?εÏ?δÏ?νÏ?μα, Ï?Ï?Ï?εÏ? και διεÏ?θÏ?νÏ?ειÏ? για Ï?ην Ï?Ï?Ï?Ï?η Ï?Ï?νδεÏ?η</string>
+  <string name="pref_entrance_node_dialog">Î?ιÏ?άγεÏ?ε κÏ?μβοÏ?Ï? ειÏ?αγÏ?γήÏ?</string>
+  <!--<string name="pref_use_whispercore">Use WhisperCore</string>
+<string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
+  <string name="pref_proxy_title">Î?ιακομιÏ?Ï?ήÏ? μεÏ?ολάβηÏ?ηÏ? εξεÏ?Ï?ομένÏ?ν δεδομένÏ?ν</string>
+  <string name="pref_proxy_type_title">ΤÏ?Ï?οÏ? Ï?οÏ? διακομιÏ?Ï?ή μεÏ?ολάβηÏ?ηÏ? εξεÏ?Ï?ομένÏ?ν δεδομένÏ?ν</string>
+  <string name="pref_proxy_type_summary">Î Ï?Ï?Ï?Ï?κολλο Ï?οÏ? διακομιÏ?Ï?ή μεÏ?ολάβηÏ?ηÏ?: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Î?ιÏ?άγεÏ?ε Ï?Ï?Ï?ο διακομιÏ?Ï?ή μεÏ?ολάβηÏ?ηÏ?</string>
+  <string name="pref_proxy_host_title">Î?ιακομιÏ?Ï?ήÏ? μεÏ?ολάβηÏ?ηÏ? εξεÏ?Ï?Ï?μενÏ?ν δεδομένÏ?ν</string>
+  <string name="pref_proxy_host_summary">Hostname για Ï?ον διακομιÏ?Ï?ή μεÏ?ολάβηÏ?ηÏ?</string>
+  <string name="pref_proxy_host_dialog">Î?ιÏ?άγεÏ?ε Ï?ον Ï?Ï?ολογιÏ?Ï?ή για Ï?ον διακομιÏ?Ï?ή μεÏ?ολάβηÏ?ηÏ?</string>
+  <string name="pref_proxy_port_title">Î?Ï?Ï?α εξεÏ?Ï?ομένÏ?ν Ï?οÏ? διακομιÏ?Ï?ή μεÏ?ολάβηÏ?ηÏ?</string>
+  <string name="pref_proxy_port_summary">Î?Ï?Ï?α Ï?οÏ? διακομιÏ?Ï?ή μεÏ?ολάβηÏ?ηÏ?</string>
+  <string name="pref_proxy_port_dialog">Î?ιÏ?άγεÏ?ε Ï?ην θÏ?Ï?α Ï?οÏ? διακομιÏ?Ï?ή μεÏ?ολάβηÏ?ηÏ?</string>
+  <string name="status">Î?αÏ?άÏ?Ï?αÏ?η</string>
+  <string name="setting_up_full_transparent_proxying_">ΡÏ?θμιÏ?η </string>
+  <string name="setting_up_app_based_transparent_proxying_">ΡÏ?θμιÏ?η Ï?ηÏ? διαÏ?ανοÏ?Ï? μεÏ?ολάβηÏ?ηÏ? διακομιÏ?Ï?ή</string>
+  <string name="transparent_proxying_enabled">Î? διαÏ?ανήÏ? μεÏ?ολάβηÏ?η διακομιÏ?Ï?ή Î?Î?Î?ΡÎ?Î?Î Î?Î?Î?Î?Î?Î?Î?</string>
+  <string name="transproxy_enabled_for_tethering_">Το TransProxy ενεÏ?γοÏ?οιήθηκε για Ï?ην διαÏ?Ï?νδεÏ?η - Tethering</string>
+  <string name="warning_error_starting_transparent_proxying_">ΠΡÎ?Î?Î?Î?Î?Î Î?Î?Î?ΣÎ?: Ï?Ï?άλμα καÏ?ά Ï?ην εκκίνηÏ?η Ï?ηÏ? διαÏ?ανοÏ?Ï? μεÏ?ολάβηÏ?ηÏ? διακομιÏ?Ï?ή!</string>
+  <string name="transproxy_rules_cleared">Î?ι Ï?Ï?θμίÏ?ειÏ? Ï?οÏ? TransProxy αÏ?ομακÏ?Ï?νθηκαν</string>
+  <string name="couldn_t_start_tor_process_">Î?δÏ?ναμία εκκίνηÏ?ηÏ? Ï?ηÏ? διεÏ?γαÏ?ίαÏ? Tor:</string>
+  <string name="privoxy_is_running_on_port_">Το privoxy εκÏ?ελείÏ?αι Ï?Ï?ην θÏ?Ï?α:</string>
+  <string name="setting_up_port_based_transparent_proxying_">ΡÏ?θμιÏ?η Ï?ηÏ? διαÏ?ανοÏ?Ï? μεÏ?ολάβηÏ?ηÏ? διακομιÏ?Ï?ή καÏ?ά θÏ?Ï?α...</string>
+  <string name="bridge_error">ΣÏ?άλμα γέÏ?Ï?Ï?αÏ?</string>
+  <string name="bridge_requires_ip">Î?ια να Ï?Ï?ηÏ?ιμοÏ?οιήÏ?εÏ?ε Ï?ο Ï?Ï?οιÏ?είο γέÏ?Ï?Ï?αÏ?, Ï?Ï?έÏ?ει να ειÏ?άγεÏ?ε Ï?ην διεÏ?θÏ?νÏ?η Î?Ρ Ï?οÏ?λάÏ?ιÏ?Ï?ον μιαÏ? γέÏ?Ï?Ï?αÏ?.</string>
+  <string name="send_email_for_bridges">Î?έÏ?Ï? ενÏ?Ï? λογαÏ?ιαÏ?μοÏ? gmai Ï?Ï?είλÏ?ε ένα μήνÏ?μα Ï?Ï?ην διεÏ?θÏ?νÏ?η bridges@xxxxxxxxxxxxxx με Ï?ην Ï?αÏ?η \"get bridges\" μÏ?νη Ï?ηÏ? Ï?Ï?ο Ï?Ï?μα Ï?ο μηνÏ?μαÏ?οÏ?.</string>
+  <string name="error">ΣÏ?άλμα</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Î?ι Ï?Ï?θμίÏ?ειÏ? ReachableAddresses Ï?Ï?οκάλεÏ?αν μια εξαίÏ?εÏ?η!</string>
+  <string name="your_relay_settings_caused_an_exception_">Î?ι Ï?Ï?θμίÏ?ειÏ? αναμεÏ?αδÏ?Ï?η Ï?αÏ? Ï?Ï?οκάλεÏ?αν μια εξαίÏ?εÏ?η!</string>
+  <string name="exit_nodes">Î?Ï?μβοι εξÏ?δοÏ?</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Î?Ï?οÏ?Ï?Ï?Ï?μαÏ?α, Ï?εÏ?δÏ?νÏ?μα, Ï?Ï?Ï?εÏ? και διεÏ?θÏ?νÏ?ειÏ? Ï?ηÏ? Ï?ελεÏ?Ï?αίαÏ? Ï?Ï?νδεÏ?ηÏ?</string>
+  <string name="enter_exit_nodes">Î?ιÏ?άγεÏ?ε κÏ?μβοÏ?Ï? εξÏ?δοÏ?</string>
+  <string name="exclude_nodes">Î?ξαιÏ?εÏ?έοι κÏ?μβοι</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Î?Ï?οÏ?Ï?Ï?Ï?μαÏ?α, Ï?εÏ?δÏ?νÏ?μα, Ï?Ï?Ï?εÏ? και διεÏ?θÏ?νÏ?ειÏ? Ï?Ï?οÏ? εξαίÏ?εÏ?η</string>
+  <string name="enter_exclude_nodes">Î?ιÏ?άγεÏ?ε Î?ξαιÏ?εÏ?έοÏ?Ï? κÏ?μβοÏ?Ï?</string>
+  <string name="strict_nodes">Î?Ï?οκλειÏ?Ï?ικοί κÏ?μβοι</string>
+  <string name="use_only_these_specified_nodes">ΧÏ?ήÏ?η *μÏ?νον* αÏ?Ï?Ï?ν Ï?Ï?ν Ï?Ï?γκεκÏ?ιμένÏ?ν κÏ?μβÏ?ν</string>
+  <string name="bridges">Î?έÏ?Ï?Ï?εÏ?</string>
+  <string name="use_bridges">ΧÏ?ήÏ?η γεÏ?Ï?Ï?Ï?ν</string>
+  <string name="bridges_obfuscated">Î?Ï?Ï?Ï?έÏ? γέÏ?Ï?Ï?εÏ?</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Î?νεÏ?γοÏ?οίηÏ?η εναλλακÏ?ικÏ?ν κÏ?μβÏ?ν ειÏ?Ï?δοÏ? Ï?Ï?ο δίκÏ?Ï?ο Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Î?νεÏ?γοÏ?οιήÏ?Ï?ε Ï?ο αν οι Ï?Ï?θμιÏ?μένεÏ? γέÏ?Ï?Ï?εÏ? είναι κÏ?Ï?Ï?έÏ?</string>
+  <string name="ip_address_and_port_of_bridges">Î?ιεÏ?θÏ?νÏ?η Î?Ρ και θÏ?Ï?α Ï?Ï?ν γεÏ?Ï?Ï?Ï?ν</string>
+  <string name="enter_bridge_addresses">Î?ιÏ?άγεÏ?ε Ï?ην διεÏ?θÏ?νÏ?η Ï?ηÏ? γέÏ?Ï?Ï?αÏ?</string>
+  <string name="relays">Î?ναμεÏ?αδÏ?Ï?εÏ?</string>
+  <string name="relaying">Î?ίνεÏ?αι αναμεÏ?άδοÏ?η</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Î?εÏ?αÏ?Ï?έÏ?Ï?ε Ï?ην Ï?Ï?Ï?κεÏ?ή Ï?αÏ? Ï?ε ένα αναμεÏ?αδÏ?Ï?η μη-εξÏ?δοÏ?</string>
+  <string name="relay_port">Î?Ï?Ï?α αναμεÏ?άδοÏ?ηÏ?</string>
+  <string name="listening_port_for_your_tor_relay">Î?Ï?Ï?α ακÏ?Ï?αÏ?ηÏ? για Ï?ον αναμεÏ?αδÏ?Ï?η Ï?αÏ?</string>
+  <string name="enter_or_port">Î?ιÏ?άγεÏ?ε Ï?ην θÏ?Ï?α OR</string>
+  <string name="relay_nickname">ΨεÏ?δÏ?νÏ?μο Ï?οÏ? αναμεÏ?αδÏ?Ï?η</string>
+  <string name="the_nickname_for_your_tor_relay">Το Ï?εÏ?δÏ?νÏ?μο Ï?οÏ? αναμεÏ?αδÏ?Ï?η Ï?αÏ? Tor</string>
+  <string name="enter_a_custom_relay_nickname">Î?ιÏ?άγεÏ?ε ένα Ï?Ï?οÏ?ιμÏ?μενο Ï?εÏ?δÏ?νÏ?μο αναμεÏ?αδÏ?Ï?η</string>
+  <string name="reachable_addresses">Î Ï?οÏ?ιÏ?έÏ? διεÏ?θÏ?νÏ?ειÏ?</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Î?κÏ?έλεÏ?η Ï?Ï? Ï?ελάÏ?η Ï?ίÏ?Ï? αÏ?Ï? Ï?οίÏ?οÏ? Ï?Ï?οÏ?Ï?αÏ?ίαÏ? με Ï?εÏ?ιοÏ?ιÏ?Ï?ικέÏ? Ï?ολιÏ?ικέÏ?</string>
+  <string name="reachable_ports">Î Ï?οÏ?ιÏ?έÏ? θÏ?Ï?εÏ?</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Î Ï?οÏ?ιÏ?έÏ? θÏ?Ï?εÏ? Ï?ίÏ?Ï? αÏ?Ï? Ï?εÏ?ιοÏ?ιÏ?Ï?ικÏ? Ï?οίÏ?οÏ? Ï?Ï?οÏ?Ï?αÏ?ίαÏ?</string>
+  <string name="enter_ports">Î?ιÏ?άγεÏ?ε θÏ?Ï?εÏ?</string>
+  <string name="enable_hidden_services">Φιλοξενία κÏ?Ï?Ï?Ï?ν Ï?Ï?ηÏ?εÏ?ιÏ?ν</string>
+  <string name="run_servers_accessible_via_the_tor_network">να εÏ?ιÏ?Ï?έÏ?εÏ?ε Ï?Ï?ον διακομιÏ?Ï?ή Ï?ηÏ? Ï?Ï?Ï?κεÏ?ήÏ? να είναι Ï?Ï?οÏ?βάÏ?ιμοÏ? μέÏ?Ï? Ï?οÏ? δικÏ?Ï?οÏ? Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">ειÏ?άγεÏ?ε Ï?ιÏ? θÏ?Ï?εÏ? κÏ?Ï?Ï?Ï?ν Ï?Ï?ηÏ?εÏ?ιÏ?ν Ï?οÏ? localhost</string>
+  <string name="hidden_service_ports">Î?Ï?Ï?εÏ? κÏ?Ï?Ï?Ï?ν Ï?Ï?ηÏ?εÏ?ιÏ?ν</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Ï?ο Ï?νομα Ï?Ï?οÏ?Ï?έλαÏ?ηÏ? για Ï?ιÏ? κÏ?Ï?Ï?έÏ? Ï?Ï?ηÏ?εÏ?ίεÏ? Ï?αÏ? (Ï?αÏ?άγεÏ?αι αÏ?Ï?Ï?μαÏ?α)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">ενεÏ?γοÏ?οίηÏ?η καÏ?αγÏ?αÏ?Ï?ν αÏ?οÏ?Ï?αλμάÏ?Ï?Ï?ηÏ? (για Ï?ην Ï?Ï?οβολή Ï?οÏ?Ï? αÏ?αιÏ?είÏ?αι Ï?Ï?ήÏ?η adb ή aLogCat)</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">The Tor License</string>
+  <string name="the_tor_license">Î? Î?δεια Tor</string>
   <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3rd-Party-Software: </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="third_party_software">Î?ογιÏ?μικÏ? Ï?Ï?ίÏ?Ï?ν:</string>
+  <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string>
+  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
+  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string>
+  <string name="hidden_service_request">Î?άÏ?οια εÏ?αÏ?μογή Ï?Ï?οÏ?Ï?αθεί να ανοίξει Ï?ην κÏ?Ï?Ï?ή θÏ?Ï?α διακομιÏ?Ï?ή %S Ï?Ï?ο δίκÏ?Ï?ο Tor. Î Ï?Ï?κειÏ?αι για αÏ?Ï?αλή ενέÏ?γεια, εÏ?Ï?Ï?ον γνÏ?Ï?ίζεÏ?ε Ï?ην εÏ?αÏ?μογή.</string>
+  <string name="found_existing_tor_process">αναζήÏ?ηÏ?η διεÏ?γαÏ?ιÏ?ν Tor...</string>
+  <string name="something_bad_happened">Î?άÏ?ι κακÏ? Ï?Ï?νέβη. Î?λέγξÏ?ε Ï?ιÏ? καÏ?αγÏ?αÏ?έÏ?</string>
+  <string name="hidden_service_on">ενεÏ?γοÏ?οιημένη κÏ?Ï?Ï?ή Ï?Ï?ηÏ?εÏ?ία:</string>
+  <string name="unable_to_read_hidden_service_name">αδÏ?ναμία ανάγνÏ?Ï?ηÏ? Ï?οÏ? ονÏ?μαÏ?οÏ? Ï?ηÏ? κÏ?Ï?Ï?ήÏ? Ï?Ï?ηÏ?εÏ?ίαÏ?</string>
+  <string name="unable_to_start_tor">Î?δÏ?ναμία εκκίνηÏ?ηÏ? Ï?οÏ? Tor:</string>
+  <string name="pref_use_sys_iptables_title">ΧÏ?ήÏ?η αÏ?Ï?ικοÏ? iptables</string>
+  <string name="pref_use_sys_iptables_summary">Ï?Ï?ήÏ?η Ï?οÏ? ενÏ?Ï?μαÏ?Ï?μένοÏ? iptables ανÏ?ί για εκείνÏ?ν Ï?οÏ? Ï?ακέÏ?οÏ? Orbot</string>
+  <string name="error_installing_binares">Τα αÏ?Ï?εία Tor δεν μÏ?Ï?Ï?εÏ?αν να εγκαÏ?αÏ?Ï?αθοÏ?ν ή να αναβαθμιÏ?Ï?οÏ?ν.</string>
+  <string name="pref_use_persistent_notifications">Î?α διαÏ?ηÏ?είÏ?αι Ï?άνÏ?οÏ?ε Ï?ο εικονίδιο Ï?Ï?ην γÏ?αμμή εÏ?γαλείÏ?ν Ï?Ï?αν Ï?ο Orbot Ï?Ï?νδέεÏ?αι</string>
+  <string name="pref_use_persistent_notifications_title">Î?ιδοÏ?οιήÏ?ειÏ? διαÏ?κοÏ?Ï? Ï?Ï?νδεÏ?ηÏ?</string>
+  <string name="notification_using_bridges">Î?ι γέÏ?Ï?Ï?εÏ? ενεÏ?γοÏ?οιήθηκαν!</string>
+  <string name="default_bridges"/>
+  <string name="set_locale_title">Î?Ï?ιÏ?μÏ?Ï? Ï?οÏ?ικÏ?ν Ï?Ï?οÏ?αÏ?μογÏ?ν</string>
+  <string name="set_locale_summary">Î?Ï?ιλέξÏ?ε Ï?Ï?θμίÏ?ειÏ? Ï?οÏ?ικÏ?Ï?ηÏ?αÏ? και γλÏ?Ï?Ï?αÏ? για Ï?ο Orbot</string>
+  <string name="wizard_locale_title">Î?Ï?ιλέξÏ?ε γλÏ?Ï?Ï?α</string>
+  <string name="wizard_locale_msg">ΠαÏ?αμείνεÏ?ε Ï?Ï?ην αÏ?Ï?ική ή αλλάξÏ?ε Ï?ην Ï?Ï?έÏ?οÏ?Ï?α γλÏ?Ï?Ï?α</string>
+  <string name="powered_by">με Ï?ην δÏ?ναμη Ï?ο Tor Project</string>
+  <string name="btn_save_settings">Î?Ï?οθήκεÏ?Ï?η Ï?Ï?θμίÏ?εÏ?ν</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 28fa0a1..876434e 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -31,7 +31,6 @@
   <string name="button_clear_log">Limpiar Historial</string>
   <string name="menu_verify">Comprobar</string>
   <string name="menu_exit">Salir</string>
-  <string name="powered_by">potenciado por Tor Project</string>
   <string name="press_to_start">- long press to start -</string>
   <string name="pref_trans_proxy_group">Proxy transparente (Requiere ser Administrador)</string>
   <string name="pref_trans_proxy_title">Proxy transparente</string>
@@ -55,6 +54,7 @@
   <string name="btn_finish">Finalizar</string>
   <string name="btn_okay">OK</string>
   <string name="btn_cancel">Cancelar</string>
+  <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Algunos detalles de Orbot</string>
   <string name="wizard_details_msg">Orbot es una aplicación de código abierto que contiene Tor, LibEvent y Privoxy. Provee un Proxy HTTP local (8118) y un Proxy SOCKS (9050) en la red Tor. Orbot también tiene la habilidad, en un dispositivo enrutador, de enviar todo el tráfico de Internet a través de Tor.</string>
   <string name="wizard_permissions_root">Permiso Concedido</string>
@@ -73,37 +73,38 @@
   <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
   <string name="wizard_tips_proxy">Configuraciones Proxy - Aprenda cómo configurar aplicaciones para que trabajen con Orbot</string>
   <string name="wizard_proxy_help_info">Configuraciones Proxy</string>
-  <string name="wizard_proxy_help_msg">Si la aplicación Android que está utilizando puede soportar el uso de un Proxy HTTP o SOCKS, entonces puede configurarla para conectar a Orbot y utilizar Tor.
-
-
-La configuración del dominio es 127.0.0.1 o \"localhost\". Para HTTP, la configuración del puerto es 8118. Para SOCKS, el proxy es 9050. Puede utilizar SOCKS4A o SOCKS5 si es posible.
-
-
-
-Puede aprender más acerca de los proxys en Android a través de las Preguntas Frecuentes ubicadas en: http://tinyurl.com/proxyandroid
-    </string>
+  <string name="wizard_proxy_help_msg">Si la aplicación Android que está utilizando puede soportar el uso de un Proxy HTTP o SOCKS, entonces puede configurarla para conectar a Orbot y utilizar Tor.\n\n\nLa configuración del dominio es 127.0.0.1 o \"localhost\". Para HTTP, la configuración del puerto es 8118. Para SOCKS, el proxy es 9050. Puede utilizar SOCKS4A o SOCKS5 si es posible.\n\n\n\nPuede aprender más acerca de los proxys en Android a través de las Preguntas Frecuentes ubicadas en: http://tinyurl.com/proxyandroid\n    </string>
   <string name="wizard_final">¡Orbot está listo!</string>
   <string name="wizard_final_msg">Cientos de miles de personas alrededor del mundo usan Tor por una amplia variedad de razones: periodistas y bloggers, trabajadores de los derechos humanos, oficiales de policía, soldados, corporaciones, ciudadanos de regímenes represivos y ciudadanos ordinarios... ¡y ahora también lo estás!</string>
-  <string name="connect_first_time">Se ha conectado con éxito a la red Tor, pero eso NO significa que su dispositivo es seguro. Puede utilizar la opción \'Comprobar\' desde el menú para probar su navegador.
-
-Visítenos en https://guardianproject.info/apps/orbot o envíenos un correo electrónico a help@xxxxxxxxxxxxxxxxxxxx para aprender más.</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Se ha conectado con éxito a la red Tor, pero eso NO significa que su dispositivo es seguro. Puede utilizar la opción \'Comprobar\' desde el menú para probar su navegador.\n\nVisítenos en https://guardianproject.info/apps/orbot o envíenos un correo electrónico a help@xxxxxxxxxxxxxxxxxxxx para aprender más.</string>
   <string name="tor_check">Esto abrirá https://check.torproject.org en su navegador predeterminado con el fin de comprobar si Orbot está configurado y si está conectado a Tor.</string>
   <string name="pref_hs_group">Servicios Ocultados</string>
   <string name="pref_general_group">General</string>
   <string name="pref_start_boot_title">Start Orbot on Boot</string>
   <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
   <string name="wizard_title_msg">Orbot activa el acceso a la red Tor, en su Android! \n\nTor le ayuda a defenderse del filtrado de contenido, análisis de tráfico y la vigilancia que amenaza su privacidad, su información confidencial y sus relaciones personales. \n\nEste asistente le ayudará a configurar Orbot y Tor en su dispositivo Android.</string>
+  <!--Warning screen-->
   <string name="wizard_warning_title">Advertencia</string>
   <string name="wizard_warning_msg">Simplemente instalando Orbort, no automatiza de por si, la proteccion anonima del trafico generado por su dispositivo \n\nPara anonimizar su trafico con garantias, debe configurar adecuadamente Orbot, el dispositivo y las aplicaciones que utilize en su conexion.</string>
+  <!--Permissions screen-->
   <string name="wizard_permissions_title">Permisos</string>
   <string name="wizard_permissions_root_msg1">Si lo desea, puede conceder acceso \'superusuario\' a Orbot para habilitar las características avanzadas de configuracion y acceso a la red Tor, tales como los proxys transparentes.</string>
   <string name="wizard_permissions_root_msg2">Si no desea habilitar esta opcion, por favor asegúrese de utilizar aplicaciones compatibles con Orbot</string>
   <string name="wizard_permissions_no_root_msg">Su dispositivo se esta ejecutando en modo estándar, y no admite el acceso root o \"superusuario\".\n\nPara que pueda beneficiarse de todo el potencial de Tor, tendrá que utilizar aplicaciones creadas para trabajar con Orbot, o compatibles con la configuracion proxy basada en los protocolos HTTP o SOCKS\n\n</string>
+  <!--TipsAndTricks screen-->
   <string name="wizard_tips_title">Aplicaciones habilitadas para utilizar con Orbot</string>
   <string name="wizard_tips_gibberbot">Gibberbot: Asegure su aplicación de chat con nuestro sistema de cifrado </string>
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
   <string name="wizard_tips_orweb">ORWEB (Sólo Android 1.x) - Navegador diseñado para la privacidad y para Orbot</string>
   <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+  <!--Transparent Proxy screen-->
   <string name="wizard_transproxy_title">conexion proxy transparente activada </string>
   <string name="wizard_transproxy_msg">Esto permite que sus aplicaciones se ejecuten automáticamente a través de la red Tor sin necesidad de realizar ninguna configuración.</string>
   <string name="wizard_transproxy_hint">(Si no tiene idea de lo que estamos hablando, marque esta casilla ;o)</string>
@@ -118,8 +119,9 @@ Visítenos en https://guardianproject.info/apps/orbot o envíenos un correo elec
   <string name="pref_entrance_node">Los nodos de entrada</string>
   <string name="pref_entrance_node_summary">Las llaves publicas, apodos, países y direcciones para el primer salto, o nodo (primer servidor que se conectara para acceder a la red Tor)</string>
   <string name="pref_entrance_node_dialog">Introduzca los nodos de entrada</string>
-  <string name="pref_use_whispercore">Utilizar plataforma de seguridad WhisperCore</string>
-  <string name="pref_use_whispercore_summary">Utilizar las API de NetFilter proporcionada por WhisperSystems (es necesario que su dispositivo tenga WhisperCore instalado)</string>
+  <!--<string name="pref_use_whispercore">Use WhisperCore</string>
+<string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
+  <string name="pref_proxy_title">Proxy de Red Saliente</string>
   <string name="pref_proxy_type_title">Tipo de proxy</string>
   <string name="pref_proxy_type_summary">Protocolo que se utilizará para la configuracion del servidor proxy: HTTP, HTTPS, SOCKS4, SOCKS5</string>
   <string name="pref_proxy_type_dialog">Introduzca el Tipo de Proxy</string>
@@ -155,7 +157,9 @@ Visítenos en https://guardianproject.info/apps/orbot o envíenos un correo elec
   <string name="use_only_these_specified_nodes">Usar * sólamente * los nodos especificados</string>
   <string name="bridges">Puentes/Bridges</string>
   <string name="use_bridges">Utilizar Puentes/Bridges</string>
+  <string name="bridges_obfuscated">Puentes ofuscados</string>
   <string name="enable_alternate_entrance_nodes_into_the_tor_network">Activar nodos de entrada alternativos en la red Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Habilitar si puentes configurados estan ofuscados</string>
   <string name="ip_address_and_port_of_bridges">Dirección IP y el puerto del puente/Bridge</string>
   <string name="enter_bridge_addresses">Introduzca la dirección del puente/Bridge</string>
   <string name="relays">Retransmisores de trafico</string>
@@ -183,6 +187,11 @@ Visítenos en https://guardianproject.info/apps/orbot o envíenos un correo elec
   <string name="the_tor_license">Licencia de uso Tor</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">Software de terceras partes</string>
+  <string name="tor_version">Tor v0.2.3.7-alfa: https://www.torproject.org</string>
+  <string name="libevent_version">Libevent v1.4.13: http://www.monkey.org/ ~ provos / libevent /</string>
+  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
+  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
   <string name="hidden_service_request">Una aplicación esta intentando abrir el siguiente puerto %S a la red Tor. Esto es seguro, si confía en la aplicación, que lo esta intentando abrir.</string>
   <string name="found_existing_tor_process">Se ha encontrado proceso activo de Tor ...</string>
   <string name="something_bad_happened">Algo ha ocurrido con el normal funcionamiento de la aplicacion. Compruebe el log de registro del sistema Tor</string>
@@ -190,8 +199,16 @@ Visítenos en https://guardianproject.info/apps/orbot o envíenos un correo elec
   <string name="unable_to_read_hidden_service_name">No se puede leer el nombre del servicio oculto</string>
   <string name="unable_to_start_tor">ADVERTENCIA: No Puedo iniciar la Red Tor:</string>
   <string name="pref_use_sys_iptables_title">Usar Iptables por defecto</string>
-  <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string>
+  <string name="pref_use_sys_iptables_summary">Usar built-in iptables binario en lugar del paquete con Orbot</string>
   <string name="error_installing_binares">Los binario de Tor no se pudieron instalar o actualizar</string>
   <string name="pref_use_persistent_notifications">Mantener siempre el icono de Orbot en la barra de tareas cuando esté conectado</string>
   <string name="pref_use_persistent_notifications_title">Notificaciones siempre encendidas</string>
+  <string name="notification_using_bridges">Puentes activados!</string>
+  <string name="default_bridges"/>
+  <string name="set_locale_title">Establecer configuración regional</string>
+  <string name="set_locale_summary">Elija la configuración regional y de idioma para Orbot</string>
+  <string name="wizard_locale_title">Escoja lenguaje\n</string>
+  <string name="wizard_locale_msg">Dejar por defecto o cambiar el lenguaje actual</string>
+  <string name="powered_by">potenciado por Tor Project</string>
+  <string name="btn_save_settings">Guardar configuración</string>
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 678af25..613218b 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -11,10 +11,10 @@
   <string name="status_activated">Tor sarera konektatuta</string>
   <string name="status_disabled">\"Orbot desaktibatuta dago</string>
   <string name="status_shutting_down">Orbot itzaltzen ari da</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="tor_process_starting">Tor bezeroa hasten...</string>
+  <string name="tor_process_complete">eginda.</string>
+  <string name="tor_process_waiting">itxaroten.</string>
+  <string name="not_anonymous_yet">ABISUA: Zure trafikoa ez da anonimoa oraindik! Mesedez konfigura itzazu zure aplikazioak 127.0.0.1:8118 HTTP proxya edo 127.0.0.1:9050 SOCKS4 edo SOCKS5 proxyak erabiltzeko</string>
   <string name="menu_home">Etxea</string>
   <string name="menu_browse">Arakatu</string>
   <string name="menu_settings">Ezarpenak</string>
@@ -31,161 +31,121 @@
   <string name="button_clear_log">Zerrenda Garbitu</string>
   <string name="menu_verify">Egiaztatu</string>
   <string name="menu_exit">Irten</string>
-  <string name="powered_by">Tor Projectek indartua</string>
   <string name="press_to_start">- sakatu luze hasteko -</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_trans_proxy_group">Proxyatze Gardena (Root behar du)</string>
+  <string name="pref_trans_proxy_title">Proxyatze Gardena</string>
+  <string name="pref_trans_proxy_summary">Aplikazioen Torifikatze Automatikoa</string>
+  <string name="pref_transparent_all_title">Tor-tu Dena</string>
+  <string name="pref_transparent_all_summary">Aplikazio guztien trafikoa Tor bidez proxyatu</string>
   <string name="pref_transparent_port_title">Portu Zerrenda</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="pref_transparent_port_dialog">Sartu proxyatzeko portuak</string>
+  <string name="pref_has_root">Root sarrera eskatu</string>
+  <string name="pref_has_root_summary">Root sarrera eskatu proxyatze gardenarentzat</string>
   <string name="status_install_success">Tor bitarrak zuzen instalatuta!</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="status_install_fail">Tor fitxategi bitarrak ezin izan dira instalatu. Mesedez ikusi erregistroa eta jakinarazi tor-assistants@xxxxxxxxxxxxxx</string>
   <string name="title_error">Aplikazio Akatsa</string>
   <string name="wizard_title">Orbot</string>
   <string name="wizard_btn_tell_me_more">Orboti buruz</string>
   <string name="btn_next">Hurrengoa</string>
   <string name="btn_back">Atzera</string>
   <string name="btn_finish">Amaitu</string>
-  <string name="btn_okay">Okay</string>
-  <string name="btn_cancel">Cancel</string>
-  <string name="wizard_details">Some Orbot Details</string>
-  <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, LibEvent and Privoxy. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string>
-  <string name="wizard_permissions_root">Permission Granted</string>
-  <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
-    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
-    You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid
-    </string>
-  <string name="wizard_final">Orbot is ready!</string>
-  <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string>
-  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help@xxxxxxxxxxxxxxxxxxxx to learn more.</string>
-  <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string>
-  <string name="pref_hs_group">Hidden Services</string>
-  <string name="pref_general_group">General</string>
-  <string name="pref_start_boot_title">Start Orbot on Boot</string>
-  <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
-  <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>
-  <string name="wizard_warning_title">Warning</string>
-  <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>
+  <string name="btn_okay">Ados</string>
+  <string name="btn_cancel">Utzi</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Orbot xehetasun batzuk</string>
+  <string name="wizard_permissions_root">Baimena Emanda</string>
+  <string name="wizard_permissions_stock">Orbot Baimenak</string>
+  <string name="wizard_premissions_msg_root">Bikain! Orbotentzako root baimenak gaituta dituzula detektatu dugu.</string>
+  <string name="wizard_permission_enable_root">Root Orboti eman</string>
+  <string name="wizard_configure">Torifikazioa Konfiguratu</string>
+  <string name="wizard_configure_all">Aplikazio gustiak Tor bidez proxyatu</string>
+  <string name="wizard_configure_select_apps">Hautatu Banakako Aplikazioak Torentzat</string>
+  <string name="wizard_tips_tricks">Orbot-gaitutako Aplikazioak</string>
+  <string name="wizard_tips_otrchat">Gibberbot - Andriodrentzako berehalako mezulari bezero ziurra</string>
+  <string name="wizard_tips_proxy">Proxy Ezarpenak - Ikasi zure aplikazioak Orbotekin funtziona dezaten nola konfiguratu</string>
+  <string name="wizard_proxy_help_info">Proxy Ezarpenak</string>
+  <string name="wizard_final">Orbot prest dago!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_hs_group">Ezkutuko Zerbitzuak</string>
+  <string name="pref_general_group">Orokorra</string>
+  <string name="pref_start_boot_title">Hasi Orbot Abiarazterakoan</string>
+  <string name="pref_start_boot_summary">Automatikoki Orbot hasi eta Tor konektatu zure Android gailua abiarazterakoan</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Abisua</string>
+  <!--Permissions screen-->
   <string name="wizard_permissions_title">Baimenak</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>
-  <string name="wizard_tips_title">Orbot-Enabled Apps</string>
-  <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot-Gaitutako Aplikazioak</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="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>
-  <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_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">Proxyatze Gardena</string>
   <string name="wizard_transproxy_none">Bat ere ez</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="button_grant_superuser">Supererabiltzaile sarrera eskatu</string>
   <string name="pref_select_apps">Aplikazioak hautatu</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_node_configuration">Nodo Konfigurazioa</string>
+  <string name="pref_entrance_node">Sarrera Nodoak</string>
+  <string name="pref_entrance_node_dialog">Sartu Sarrera Nodoak</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 mota</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="pref_proxy_type_summary">Proxy zerbitzariarentzako erabiltzeko protokoloak: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Sartu Proxy Mota</string>
+  <string name="pref_proxy_host_title">Proxy Ostalaria</string>
+  <string name="pref_proxy_host_summary">Proxy zerbitzari ostalaria</string>
+  <string name="pref_proxy_host_dialog">Sartu Proxy Ostalaria</string>
+  <string name="pref_proxy_port_title">Proxy Portua</string>
+  <string name="pref_proxy_port_summary">Proxy zerbitzari portua</string>
+  <string name="pref_proxy_port_dialog">Sartu Proxy portua</string>
   <string name="status">Egoera</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="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</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="transparent_proxying_enabled">Proxyatze gardena GAITUTA</string>
+  <string name="warning_error_starting_transparent_proxying_">ABISUA: akatsa proxyatze gardena hasterakoan!</string>
+  <string name="couldn_t_start_tor_process_">Ezin izan da Tor prozesua hasi:</string>
+  <string name="privoxy_is_running_on_port_">Privoxy hurrengo portua exekutatzen ari da:</string>
+  <string name="bridge_error">Zubi Akatsa</string>
+  <string name="error">Akatsa</string>
+  <string name="exit_nodes">Irteera Nodoak</string>
+  <string name="enter_exit_nodes">Irteera Nodoak sartu</string>
+  <string name="use_only_these_specified_nodes">*Bakarrik* zehaztutako nodo hauek erabili</string>
+  <string name="bridges">Zubiak</string>
+  <string name="use_bridges">Zubiak erabili</string>
+  <string name="bridges_obfuscated">Nahasitako Zubiak</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Gaitu konfiguratutako zubiak nahasitako zubiak badira</string>
+  <string name="ip_address_and_port_of_bridges">IP helbidea eta zubien portua</string>
+  <string name="enter_bridge_addresses">Sartu Zubi Helbideak</string>
+  <string name="relays">Erreleak</string>
+  <string name="relaying">Erreleatzea</string>
+  <string name="relay_port">Errele Portua</string>
+  <string name="enter_or_port">Sartu OR portua</string>
+  <string name="relay_nickname">Errele ezizena</string>
+  <string name="enter_ports">Portuak sartu</string>
+  <string name="enable_hidden_services">Ezkutuko Zerbitzuak Gaitu</string>
+  <string name="enter_localhost_ports_for_hidden_services">sartu localhost portuak ezkutuko zerbitzuentzat</string>
+  <string name="hidden_service_ports">Ezkutuko Zerbitzu Portuak</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="the_tor_license">Tor Lizentzia</string>
   <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3rd-Party-Software: </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="third_party_software">3.-Ataleko-Softwarea:</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_on">ezkutuko zerbitzua hemen:</string>
+  <string name="unable_to_start_tor">Ezin izan da Tor hasi:</string>
+  <string name="pref_use_sys_iptables_title">Lehenetsitako Iptables erabili</string>
+  <string name="notification_using_bridges">Zubiak gaituta!</string>
+  <string name="default_bridges"/>
+  <string name="set_locale_title">Lokala ezarri</string>
+  <string name="set_locale_summary">Aukeratu Orbotentzako lokala eta hizkuntza</string>
+  <string name="wizard_locale_title">Hizkuntza aukeratu</string>
+  <string name="wizard_locale_msg">Lehenetsia utzi edo uneko hizkuntzara aldatu</string>
+  <string name="powered_by">Tor Projectek indartua</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 1bdbfa2..7afc086 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1,192 +1,224 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">اÙ?ربات</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="app_name">ربات Ù¾Û?ازÛ?</string>
+  <string name="internal_web_url">https://guardianproject.info/apps/orbot/</string>
+  <string name="default_web_url">https://check.torproject.org/?lang=fa_IR</string>
+  <string name="secure_default_web_url">https://check.torproject.org/?lang=fa_IR</string>
   <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">شرÙ?ع Ù? پاÛ?اÙ? Tor</string>
-  <string name="tor_proxy_service_process">سرÙ?Ù?س پرÙ?Ù?سÙ? تÙ?ر</string>
-  <string name="status_starting_up">Orbot آغاز Ù?Û? Ø´Ù?د..</string>
-  <string name="status_activated">Ù¾Û?Ù?ستÙ? بÙ? شبکÙ? Û? Tor</string>
-  <string name="status_disabled">اÙ?ربات غÛ?رÙ?عاÙ? شدÙ? است.</string>
-  <string name="status_shutting_down">اÙ?ربات در حاÙ? بستÙ? شدÙ? است.</string>
+  <string name="control_permission_label">شرÙ?ع Ù? پاÛ?اÙ? تÙ?ر</string>
+  <string name="tor_proxy_service_process">سرÙ?Ù?س پرÙ?کسÛ? تÙ?ر</string>
+  <string name="status_starting_up">ربات Ù¾Û?ازÛ? درحاÙ? آغاز است...</string>
+  <string name="status_activated">Ù¾Û?Ù?ستÙ? بÙ? شبکÙ? تÙ?ر</string>
+  <string name="status_disabled">ربات Ù¾Û?ازÛ? غÛ?رÙ?عاÙ? شدÙ? است.</string>
+  <string name="status_shutting_down">ربات Ù¾Û?ازÛ? در حاÙ? بستÙ? شدÙ? است.</string>
   <string name="tor_process_starting">شرÙ?ع Ú©Ù?اÛ?Ù?ت تÙ?ر...</string>
   <string name="tor_process_complete">تÙ?اÙ?.</string>
   <string name="tor_process_waiting">در حاÙ? اÙ?تظار.</string>
   <string name="not_anonymous_yet">Ù?شدار: Ù?عاÙ?Û?ت Ø´Ù?ا Ù?Ù?Ù?ز \"Ú¯Ù?Ù?اÙ?\" Ù?Û?ست! Ù?Ø·Ù?Ù? اپÙ?Û?Ú©Û?Ø´Ù? Ø®Ù?د را تÙ?ظÛ?Ù? Ú©Ù?Û?د تا از HTTP پرÙ?کسÛ? 127.0.0.1:8118 Ù? Û?ا SOCKS4A Ù? Û?ا SOCKS5 پرÙ?کسÛ? 127.0.01:9050 استÙ?ادÙ? Ú©Ù?د.</string>
   <string name="menu_home">خاÙ?Ù?</string>
-  <string name="menu_browse">جستجÙ?</string>
+  <string name="menu_browse">Ù?رÙ?ر</string>
   <string name="menu_settings">تÙ?ظÛ?Ù?ات</string>
   <string name="menu_log">Ù?رÙ?د</string>
   <string name="menu_info">Ú©Ù?Ú©</string>
-  <string name="menu_apps">Ù?اÚ? Ù? Ù?اÙ?Ù?</string>
+  <string name="menu_apps">برÙ?اÙ?Ù? Ù?ا</string>
   <string name="menu_start">آغاز</string>
   <string name="menu_stop">اÛ?ست</string>
   <string name="menu_about">دربارÙ?</string>
   <string name="menu_wizard">Wizard</string>
+  <string name="main_layout_download">داÙ?Ù?Ù?د</string>
+  <string name="main_layout_upload">آپÙ?Ù?د</string>
   <string name="button_help">Ú©Ù?Ú©</string>
   <string name="button_close">بستÙ?</string>
   <string name="button_about">دربارÙ?</string>
-  <string name="button_clear_log">Clear Log</string>
+  <string name="button_clear_log">پاکسازÛ? گزارش</string>
   <string name="menu_verify">بررسÛ?</string>
   <string name="menu_exit">خرÙ?ج</string>
-  <string name="powered_by">Ù?عاÙ? شدÙ? تÙ?سط Tor Project</string>
   <string name="press_to_start">- Ù?Ú¯Ù?دارÛ?د براÛ? شرÙ?ع -</string>
   <string name="pref_trans_proxy_group">پرÙ?کسÛ?دÙ? Ø´Ù?اÙ? (Ù?Û?از بÙ? Root دارد)</string>
   <string name="pref_trans_proxy_title">پرÙ?کسÛ?دÙ? Ø´Ù?اÙ?</string>
-  <string name="pref_trans_proxy_summary">Tori-Ù?Ù?اÛ?Û? اتÙ?Ù?اتÛ?Ú© اپÙ?Û?Ú©Û?Ø´Ù? Ù?ا</string>
+  <string name="pref_trans_proxy_summary">تÙ?ر-Ù?Ù?اÛ?Û? اتÙ?Ù?اتÛ?Ú© اپÙ?Û?Ú©Û?Ø´Ù? Ù?ا</string>
   <string name="pref_transparent_all_title">شاÙ?Ù? Ù?Ù?Ù?</string>
-  <string name="pref_transparent_all_summary">Ù?عاÙ?Û?ت Ù?Ù?Ù? اپÙ?Û?Ú©Û?Ø´Ù? Ù?ا را از طرÛ?Ù? Tor پرÙ?کسÛ? Ú©Ù?Û?د.</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_title">Ù?Ù?رست پرتÙ?ا</string>
-  <string name="pref_transparent_port_summary">Ù?Ù?رست پرتÙ?ا بÙ? پرÙ?کسÛ?. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
-  <string name="pref_transparent_port_dialog">Ù?رÙ?د پرت بÙ? پرÙ?کسÛ?</string>
-  <string name="pref_has_root">root  درخÙ?است دسترسÛ? بÙ? </string>
-  <string name="pref_has_root_summary"> براÛ? پرÙ?کسÛ? کردÙ? Ø´Ù?اÙ? rootدرخÙ?است دسترسÛ? بÙ?  </string>
-  <string name="status_install_success">دÙ?تاÛ?Û? Ù?اÛ? Tor با Ù?Ù?Ù?Ù?Û?ت Ù?صب شدÙ?د!</string>
-  <string name="status_install_fail">Ù?صب Ù?اÛ?Ù? Ù?اÛ? دÙ?تاÛ?Û? Tor Ù?Ù?Ú©Ù? Ù?بÙ?د. Ù?Ø·Ù?Ù? Ù?طعÙ? را Ù?ارسÛ? Ú©Ù?Û?د Ù? بÙ? tor-assistance@xxxxxxxxxxxxxx اطÙ?اع دÙ?Û?د.</string>
+  <string name="pref_transparent_port_fallback_summary">Ù?شدار: Ù¾Ù?رتÙ?اÛ? راÛ?ج دÙ?ر زدÙ? (80, 444, غÛ?رÙ?). *Ù?Ù?Ø· در شراÛ?Ø·Û? استÙ?ادÙ? Ú©Ù?Û?د* Ú©Ù? حاÙ?ت Ù?اÛ? \'Ù?Ù?Ù?\' Û?ا \'اپÙ?Û?Ú©Û?Ø´Ù?\' کار Ù?Ù?Û?Ú©Ù?د.</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_summary"> درخÙ?است دسترسÛ? رÙ?Ù? براÛ? پرÙ?کسÛ? کردÙ? Ø´Ù?اÙ? </string>
+  <string name="status_install_success">باÛ?Ù?رÛ? Ù?اÛ? تÙ?ر با Ù?Ù?Ù?Ù?Û?ت Ù?صب شدÙ?د!</string>
+  <string name="status_install_fail">Ù?صب Ù?اÛ?Ù? Ù?اÛ? دÙ?تاÛ?Û? تÙ?ر Ù?Ù?Ú©Ù? Ù?بÙ?د. Ù?Ø·Ù?Ù? Ù?طعÙ? را Ù?ارسÛ? Ú©Ù?Û?د Ù? بÙ? tor-assistance@xxxxxxxxxxxxxx اطÙ?اع دÙ?Û?د.</string>
   <string name="title_error">خطاÛ? اپÙ?Û?Ú©Û?Ø´Û?Ù?</string>
-  <string name="wizard_title">بÙ? اÙ?ربات Ø®Ù?Ø´ Ø¢Ù?دÛ?د</string>
-  <string name="wizard_btn_tell_me_more">دربارÙ? اÙ?ربات</string>
+  <string name="wizard_title">بÙ? ربات Ù¾Û?ازÛ? Ø®Ù?Ø´ Ø¢Ù?دÛ?د</string>
+  <string name="wizard_btn_tell_me_more">دربارÙ? ربات Ù¾Û?ازÛ?</string>
   <string name="btn_next">بعدÛ?</string>
   <string name="btn_back">بازگشت</string>
   <string name="btn_finish">پاÛ?اÙ?</string>
-  <string name="btn_okay">Ù?غÙ?</string>
+  <string name="btn_okay">Ù?بÙ?Ù?</string>
   <string name="btn_cancel">Ù?غÙ?</string>
-  <string name="wizard_details">برخÛ? جزئÛ?ات در Ù?Ù?رد اÙ?ربات</string>
-  <string name="wizard_details_msg">اÙ?ربات اپÙ?Û?Ú©Û?Ø´Ù?Û? با Ù?تÙ?-باز است Ú©Ù? شاÙ?Ù? Tor, LibEvent Ù? Privoxy. اÛ?Ù? اپÙ?Û?Ú©Û?Ø´Ù?Ø? HTTP پرÙ?کسÛ? (8118) Ù?Ø­Ù?Û? Ù? SOCKS پرÙ?کسÛ? (9050) را در شبکÙ? Tor در دسترس Ù?رار Ù?Û? دÙ?د. اÙ?ربات Ù?Ù?Ú?Ù?Û?Ù? Ù?ادر است بر رÙ?Û? ابزار root شدÙ?Ø? تÙ?اÙ? تراÙ?Û?Ú© اÛ?Ù?ترÙ?ت را از Tor ارساÙ? Ú©Ù?د.</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">برخÛ? جزÛ?Û?ات دربارÙ? ربات Ù¾Û?ازÛ?</string>
+  <string name="wizard_details_msg">ربات Ù¾Û?ازÛ? اپÙ?Û?Ú©Û?Ø´Ù?Û? با Ù?تÙ?-باز است Ú©Ù? شاÙ?Ù? تÙ?ر, LibEvent Ù? Privoxy Ù?Û?Ø´Ù?د. اÛ?Ù? اپÙ?Û?Ú©Û?Ø´Ù?Ø? HTTP پرÙ?کسÛ? (8118) Ù?Ø­Ù?Û? Ù? SOCKS پرÙ?کسÛ? (9050) را در شبکÙ? Tor در دسترس Ù?رار Ù?Û? دÙ?د. ربات Ù¾Û?ازÛ? Ù?Ù?Ú?Ù?Û?Ù? Ù?ادر است بر رÙ?Û? ابزار root شدÙ?Ø? تÙ?اÙ? تراÙ?Û?Ú© اÛ?Ù?ترÙ?ت را از Tor ارساÙ? Ú©Ù?د.</string>
   <string name="wizard_permissions_root">Ù?جÙ?ز صادر گردÛ?د</string>
-  <string name="wizard_permissions_stock">Ù?جÙ?زÙ?اÛ? اÙ?ربات</string>
-  <string name="wizard_premissions_msg_root">بسÛ?ار عاÙ?Û?! اÛ?Ù?Ø·Ù?ر Ú©Ù? Ù?عÙ?Ù?Ù? است Ø´Ù?ا داراÛ? Ù?جÙ?ز root براÛ? Ù?عاÙ? کردÙ? اÙ?ربات Ù?ستÛ?د. اÛ?Ù? اÙ?کاÙ? را بخÙ?بÛ? Ù?Ù?رد استÙ?ادÙ? Ù?رار Ø®Ù?اÙ?Û?Ù? داد.</string>
-  <string name="wizard_permissions_msg_stock">Ù?رÚ?Ù?د ضرÙ?رت Ù?دارد اÙ?ا اگر سÛ?ستÙ? Ø´Ù?ا داراÛ? دسترسÛ? root باشد اÙ?ربات با ظرÙ?Û?ت بسÛ?ار بÛ?شترÛ? عÙ?Ù? Ø®Ù?اÙ?د کرد. دکÙ?Ù? زÛ?ر را Ù?شار دÙ?Û?د تا اÙ?ربات داراÛ? ظرÙ?Û?ت حداکثرÛ? بشÙ?د.</string>
-  <string name="wizard_permissions_no_root">اگر سÛ?ستÙ? Ø´Ù?ا داراÛ? دسترسÛ? root Ù?Û?ست Ù? Û?ا اصÙ?Ù? Ú?Û?زÛ? از اÛ?Ù? عبارت Ù?تÙ?جÙ? Ù?Ù?Û? Ø´Ù?Û?دØ? حتÙ?Ù? سعÛ? Ú©Ù?Û?د از اپÙ?Ú©Û?Ø´Ù? Ù?اÛ?Û? استÙ?ادÙ? Ú©Ù?Û?د Ú©Ù? Ù?Û?Ú?Ù? اÙ?ربات تÙ?Û?Ù? شدÙ? اÙ?د.</string>
+  <string name="wizard_permissions_stock">Ù?جÙ?زÙ?اÛ? ربات Ù¾Û?ازÛ?</string>
+  <string name="wizard_premissions_msg_root">بسÛ?ار عاÙ?Û?! اÛ?Ù?Ø·Ù?ر Ú©Ù? Ù?عÙ?Ù?Ù? است Ø´Ù?ا داراÛ? Ù?جÙ?ز root براÛ? Ù?عاÙ? کردÙ? ربات Ù¾Û?ازÛ? Ù?ستÛ?د. اÛ?Ù? اÙ?کاÙ? را بخÙ?بÛ? Ù?Ù?رد استÙ?ادÙ? Ù?رار Ø®Ù?اÙ?Û?Ù? داد.</string>
+  <string name="wizard_permissions_msg_stock">Ù?رÚ?Ù?د ضرÙ?رت Ù?دارد اÙ?ا اگر سÛ?ستÙ? Ø´Ù?ا داراÛ? دسترسÛ? root باشد ربات Ù¾Û?ازÛ? با ظرÙ?Û?ت بسÛ?ار بÛ?شترÛ? عÙ?Ù? Ø®Ù?اÙ?د کرد. دکÙ?Ù? زÛ?ر را Ù?شار دÙ?Û?د تا ربات Ù¾Û?ازÛ? داراÛ? ظرÙ?Û?ت حداکثرÛ? بشÙ?د.</string>
+  <string name="wizard_permissions_no_root">اگر سÛ?ستÙ? Ø´Ù?ا داراÛ? دسترسÛ? root Ù?Û?ست Ù? Û?ا اصÙ?ا Ú?Û?زÛ? از اÛ?Ù? عبارت Ù?تÙ?جÙ? Ù?Ù?Û? Ø´Ù?Û?دØ? حتÙ?ا سعÛ? Ú©Ù?Û?د از اپÙ?Ú©Û?Ø´Ù? Ù?اÛ?Û? استÙ?ادÙ? Ú©Ù?Û?د Ú©Ù? Ù?Û?Ú?Ù? ربات Ù¾Û?ازÛ? تÙ?Û?Ù? شدÙ? اÙ?د.</string>
   <string name="wizard_permissions_consent">Ù?تÙ?جÙ? Ù?ستÙ? Ù? ترجÛ?Ø­ Ù?Û? دÙ?Ù? بدÙ?Ù? root اداÙ?Ù? بدÙ?Ù?.</string>
-  <string name="wizard_permission_enable_root">Ù?اگذارÛ? root براÛ? اÙ?ربات</string>
-  <string name="wizard_configure">تÙ?ظÛ?Ù?ات تبدÛ?Ù? بÙ? Tor</string>
-  <string name="wizard_configure_msg">اÙ?ربات بÙ? Ø´Ù?ا اÙ?کاÙ? Ù?Û? دÙ?د Ú©Ù? تÙ?اÙ? اپÙ?Û?Ú©Ø´Û?Ù? Ù?ا را از طرÛ?Ù? Tor  Ù?Ù?تÙ?Ù? Ú©Ù?Û?د Ù? Û?ا اپÙ?Û?Ú©Û?Ø´Ù? Ù?Ù?رد Ù?ظر Ø®Ù?د را شخصÙ? اÙ?تخاب Ú©Ù?Û?د.</string>
-  <string name="wizard_configure_all">تÙ?اÙ? اپÙ?Û?Ú©Û?Ø´Ù? Ù?ا را از طرÛ?Ù? Tor Ù?Ù?تÙ?Ù? Ú©Ù?Û?د.</string>
-  <string name="wizard_configure_select_apps">اپÙ?Û?Ú©Û?Ø´Ù? Ù?اÛ? Ù?Ù?Ù?رد براÛ? Tor اÙ?تخاب Ú©Ù?Û?د.</string>
-  <string name="wizard_tips_tricks">اپÙ?Û?Ú©Û?Ø´Ù? Ù?اÛ?Û? Ú©Ù? براÛ? اÙ?ربات تÙ?ظÛ?Ù? شدÙ? اÙ?د</string>
-  <string name="wizard_tips_msg">تÙ?صÛ?Ù? Ù?Û? Ú©Ù?Û?Ù? داÙ?Ù? Ù?Ù?د Ù? Ù?عاÙ? Ú©Ù?Û?دØ? اپÙ?Û?Ú©Û?Ø´Ù? Ù?اÛ?Û? را استÙ?ادÙ? Ú©Ù?Û?د Ú©Ù? Ù?ستÙ?Û?Ù? بÙ? اÙ?ربات Ù?صÙ? Ù?Û? Ø´Ù?Ù?د. دکÙ?Ù? Ù?اÛ? زÛ?ر را Ù?شار دÙ?Û?د تا Ù?صب Ø´Ù?د.</string>
-  <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
-  <string name="wizard_tips_proxy">تÙ?ظÛ?Ù?ات پرÙ?کسÛ? - Û?ادگÛ?رÛ? تÙ?ظÛ?Ù? اپÙ?Û?Ú©Û?Ø´Ù? Ù?ا براÛ? کار با اÙ?ربات</string>
+  <string name="wizard_permission_enable_root">Ù?اگذارÛ? دسترسÛ? root براÛ? ربات Ù¾Û?ازÛ?</string>
+  <string name="wizard_configure">تÙ?ظÛ?Ù?ات تبدÛ?Ù? بÙ? تÙ?ر</string>
+  <string name="wizard_configure_msg">ربات Ù¾Û?ازÛ? بÙ? Ø´Ù?ا اÙ?کاÙ? Ù?Û? دÙ?د Ú©Ù? تÙ?اÙ? اپÙ?Û?Ú©Ø´Û?Ù? Ù?ا را از طرÛ?Ù? تÙ?ز  Ù?Ù?تÙ?Ù? Ú©Ù?Û?د Ù? Û?ا اپÙ?Û?Ú©Û?Ø´Ù? Ù?Ù?رد Ù?ظر Ø®Ù?د را شخصÙ? اÙ?تخاب Ú©Ù?Û?د.</string>
+  <string name="wizard_configure_all">تÙ?اÙ? اپÙ?Û?Ú©Û?Ø´Ù? Ù?ا را از طرÛ?Ù? تÙ?ر Ù?Ù?تÙ?Ù? Ú©Ù?Û?د.</string>
+  <string name="wizard_configure_select_apps">اپÙ?Û?Ú©Û?Ø´Ù? Ù?اÛ? Ù?Ù?Ù?رد براÛ? تÙ?ر اÙ?تخاب Ú©Ù?Û?د.</string>
+  <string name="wizard_tips_tricks">اپÙ?Û?Ú©Û?Ø´Ù? Ù?اÛ?Û? Ú©Ù? براÛ? ربات Ù¾Û?ازÛ? تÙ?ظÛ?Ù? شدÙ? اÙ?د</string>
+  <string name="wizard_tips_msg">تÙ?صÛ?Ù? Ù?Û? Ú©Ù?Û?Ù? داÙ?Ù?Ù?Ù?د Ù? Ù?عاÙ? Ú©Ù?Û?دØ? اپÙ?Û?Ú©Û?Ø´Ù? Ù?اÛ?Û? را استÙ?ادÙ? Ú©Ù?Û?د Ú©Ù? Ù?ستÙ?Û?Ù? بÙ? ربات Ù¾Û?ازÛ? Ù?صÙ? Ù?Û? Ø´Ù?Ù?د. دکÙ?Ù? Ù?اÛ? زÛ?ر را Ù?شار دÙ?Û?د تا Ù?صب Ø´Ù?د.</string>
+  <string name="wizard_tips_otrchat">ربات پرÚ?Ù?Ù?Ù? - Ú©Ù?اÛ?Ù?ت Ú¯Ù?تگÙ?Û? اÙ?Ù? براÛ? اÙ?درÙ?Û?د</string>
+  <string name="wizard_tips_proxy">تÙ?ظÛ?Ù?ات پرÙ?کسÛ? - Û?ادگÛ?رÛ? تÙ?ظÛ?Ù? اپÙ?Û?Ú©Û?Ø´Ù? Ù?ا براÛ? کار با ربات Ù¾Û?ازÛ?</string>
+  <string name="wizard_tips_duckgo">اپÙ?Û?Ú©Û?Ø´Ù? Ù?Ù?تÙ?ر جستجÙ?Û? داک داک Ú¯Ù?</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">تÙ?Û?Û?تر از \"http proxy \"localhost:8118 پشتÛ?باÙ?Û? Ù?Û? Ú©Ù?د</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">تÙ?ظÛ?Ù?ات پرÙ?کسÛ?</string>
-  <string name="wizard_proxy_help_msg">اگر اپÙ?Û?Ú©Ø´Û?Ù? Ø¢Ù?درÙ?Ù?Ù?Û?د Ù?Ù?رد استÙ?ادÙ? Ø´Ù?ا Ù?ابÙ?Û?ت کار با HTTP Ù? Û?ا SOCKS پرÙ?کسÛ? دارد Ù?Û? تÙ?اÙ?Û?د تÙ?ظÛ?Ù?Ø´ Ú©Ù?Û?د تا بÙ? اÙ?ربات Ù?صÙ? Ø´Ù?د Ù? از Tor استÙ?ادÙ? Ú©Ù?د. تÙ?ظÛ?Ù?ات سرÙ?Û?س دÙ?Ù?دÙ? 127.0.0.1 Ù? Û?ا \"سرÙ?Û?س-دÙ? Ù?Ø­Ù?Û?\" است. براÛ? HTTP تÙ?ظÛ?Ù?ات درگاÙ? (port) 8118 است. براÛ? SOCKSØ? پرÙ?کسÛ? Ù?Ù?اسبØ? 9050 است. Ø´Ù?ا Ù?Û? باÛ?ست SOCKS4A  Ù? Û?ا  در صÙ?رت اÙ?کاÙ? از socks5 استÙ?ادÙ? Ú©Ù?Û?د. در صÙ?رت Ù?Û?از بÙ? اطÙ?اعات بÛ?شتر در Ù?Ù?رد اÙ?تÙ?اÙ?دÙ? Ø¢Ù?درÙ?Û?دØ? Ù?Û? تÙ?اÙ?Û?د بÙ? FAQ (سÙ?اÙ?Ù?اÛ? Ù?عÙ?Ù?Ù?) در http://tinyurl.com/proxyandroid Ù?راجعÙ? Ú©Ù?Û?د.</string>
-  <string name="wizard_final">اÙ?ربات Ø¢Ù?ادÙ? استÙ?ادÙ? Ù?Û?باشد!</string>
-  <string name="wizard_final_msg">صدÙ?ا Ù?زار Ù?Ù?ر در سراسر جÙ?اÙ? بÙ? دÙ?اÛ?Ù? Ú¯Ù?Ù?اگÙ?Ù? از Tor استÙ?ادÙ? Ù?Û? Ú©Ù?Ù?د: رÙ?زÙ?اÙ?Ù? Ù?Ù?Û?سÙ?ا Ù? بÙ?اگرÙ?اØ? کارکÙ?اÙ? Ø­Ù?Ù?Ù? بشرØ? Ù?اÙ?Ù?راÙ? اÙ?تظاÙ?Û?Ø? سربازاÙ?Ø? شرکتÙ?اØ? Ø´Ù?رÙ?Ù?داÙ? دÙ?Ù?تÙ?اÛ? سرکÙ?بگرØ? Ù? Ø´Ù?رÙ?Ù?داÙ? عادÛ?Ø? Ù? حاÙ?ا Ø´Ù?ا Ù?Û?ز Ø¢Ù?ادÙ? استÙ?ادÙ? از Ø¢Ù? Ù?ستÛ?د!</string>
-  <string name="connect_first_time">اکÙ?Ù?Ù? با Ù?Ù?Ù?Ù?Û?ت بÙ? شبکÙ? Tor Ù?صÙ? شدÙ? اÛ?د اÙ?ا بÙ? Ø¢Ù? Ù?عÙ?ا Ù?Û?ست Ú©Ù? سÛ?ستÙ? Ø´Ù?ا اÛ?Ù?Ù? است. Ù?Û? تÙ?اÙ?Û?د از Ù?Ù?Û?Ù? گزÛ?Ù?Ù? /\"Check/\" را براÛ? آزÙ?اÛ?Ø´ Ù?رÙ?رگر اÙ?تخاب Ú©Ù?Û?د. بÙ? Ù?ا در صÙ?Ø­Ù? https://guardianproject.info/apps/orbot Ù?راجعÙ? Ú©Ù?Û?د Ù? بÙ? آدرس help@xxxxxxxxxxxxxxxxxxxx  اÛ?Ù?Û?Ù?Û? بÙ?رستÛ?د تا اطÙ?اعات بÛ?شترÛ? درÛ?اÙ?ت Ú©Ù?Û?د.</string>
-  <string name="tor_check">با اÛ?Ù? Ù?دÙ? Ù¾Û?Ø´Ù?رض Ù?رÙ?رگر Ù?ب Ø´Ù?ا بÙ? صÙ?Ø­Ù?   https://check.torproject.org باز Ù?Û? Ø´Ù?د تا Ø´Ù?ا Ù?شاÙ?دÙ? Ú©Ù?Û?د Ø¢Û?ا اÙ?ربات تÙ?ظÛ?Ù? شدÙ? است Ù? Ø¢Û?ا Ø´Ù?ا بÙ? Tor Ù?صÙ? شدÙ? اÛ?د Û?ا Ù?Ù?.</string>
-  <string name="pref_hs_group">سرÙ?Ù?س Ù?اÙ? Ù?Ø®Ù?Ù?</string>
-  <string name="pref_general_group">General</string>
-  <string name="pref_start_boot_title">Start Orbot on Boot</string>
-  <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
-  <string name="wizard_title_msg">! را بÙ? اÙ?درÙ?Û?د Ù?Û? Ø¢Ù?رد  tor  Ù?درت  orbot 
- بÙ? Ø´Ù?ا Ú©Ù?Ú© Ù?Û?Ú©Ù?د تا در Ù?Ù?ابÙ? ساÙ?سÙ?ر Ù?طاÙ?بØ? Ø¢Ù?اÙ?Û?ز تراÙ?Û?Ú© Ù? Ù?ظارت بر شبکÙ? Ú©Ù? حرÛ?Ù? خصÙ?صÛ? اÙ?رادØ? اطÙ?اعات Ù?حرÙ?اÙ?Ù? Ù? رÙ?ابط خصÙ?صÛ?تاÙ? را تÙ?دÛ?د Ù?Û? Ú©Ù?د از Ø®Ù?د دÙ?اع Ú©Ù?Û?د.  Tor
-را بر رÙ?Û? دستگاÙ? Ø®Ù?دتاÙ? اÙ?جاÙ? دÙ?Û?د Tor Ù? orbot  اÛ?Ù? راÙ?Ù?Ù?ا بÙ? Ø´Ù?ا Ú©Ù?Ú© Ù?Û?Ú©Ù?د تا تÙ?ظÛ?Ù?ات</string>
+  <string name="wizard_proxy_help_msg">اگر اپÙ?Û?Ú©Ø´Û?Ù? Ø¢Ù?درÙ?Û?د Ù?Ù?رد استÙ?ادÙ? Ø´Ù?ا Ù?ابÙ?Û?ت کار با HTTP Ù? Û?ا SOCKS پرÙ?کسÛ? دارد Ù?Û? تÙ?اÙ?Û?د تÙ?ظÛ?Ù?Ø´ Ú©Ù?Û?د تا بÙ? ربات Ù¾Û?ازÛ? Ù?صÙ? Ø´Ù?د Ù? از تÙ?ر استÙ?ادÙ? Ú©Ù?د. تÙ?ظÛ?Ù?ات سرÙ?Û?س دÙ?Ù?دÙ? 127.0.0.1 Ù? Û?ا \"سرÙ?Û?س-دÙ? Ù?Ø­Ù?Û?\" است. براÛ? HTTP تÙ?ظÛ?Ù?ات Ù¾Ù?رت 8118 است. براÛ? SOCKSØ? پرÙ?کسÛ? Ù?Ù?اسبØ? 9050 است. Ø´Ù?ا Ù?Û? باÛ?ست SOCKS4A  Ù? Û?ا  در صÙ?رت اÙ?کاÙ? از socks5 استÙ?ادÙ? Ú©Ù?Û?د. در صÙ?رت Ù?Û?از بÙ? اطÙ?اعات بÛ?شتر در Ù?Ù?رد اÙ?تÙ?اÙ?دÙ? اÙ?درÙ?Û?دØ? Ù?Û? تÙ?اÙ?Û?د بÙ? FAQ (سÙ?اÙ?Ù?اÛ? Ù?عÙ?Ù?Ù?) در http://tinyurl.com/proxyandroid Ù?راجعÙ? Ú©Ù?Û?د.</string>
+  <string name="wizard_final">ربات Ù¾Û?ازÛ? Ø¢Ù?ادÙ? استÙ?ادÙ? Ù?Û?باشد!</string>
+  <string name="wizard_final_msg">صدÙ?ا Ù?زار Ù?Ù?ر در سراسر جÙ?اÙ? بÙ? دÙ?اÛ?Ù? Ú¯Ù?Ù?اگÙ?Ù? از تÙ?ر استÙ?ادÙ? Ù?Û? Ú©Ù?Ù?د: رÙ?زÙ?اÙ?Ù? Ù?Ù?Û?سÙ?ا Ù? بÙ?اگرÙ?اØ? کارکÙ?اÙ? Ø­Ù?Ù?Ù? بشرØ? Ù?اÙ?Ù?راÙ? اÙ?تظاÙ?Û?Ø? سربازاÙ?Ø? شرکتÙ?اØ? Ø´Ù?رÙ?Ù?داÙ? دÙ?Ù?تÙ?اÛ? سرکÙ?بگرØ? Ù? Ø´Ù?رÙ?Ù?داÙ? عادÛ?Ø? Ù? حاÙ?ا Ø´Ù?ا Ù?Û?ز Ø¢Ù?ادÙ? استÙ?ادÙ? از Ø¢Ù? Ù?ستÛ?د!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">اکÙ?Ù?Ù? با Ù?Ù?Ù?Ù?Û?ت بÙ? شبکÙ? تÙ?ر Ù?صÙ? شدÙ? اÛ?د اÙ?ا بÙ? Ø¢Ù? Ù?عÙ?ا Ù?Û?ست Ú©Ù? سÛ?ستÙ? Ø´Ù?ا اÛ?Ù?Ù? است. Ù?Û? تÙ?اÙ?Û?د از Ù?Ù?Û?Ù? گزÛ?Ù?Ù? /\"Check/\" را براÛ? آزÙ?اÛ?Ø´ Ù?رÙ?رگر اÙ?تخاب Ú©Ù?Û?د. بÙ? Ù?ا در صÙ?Ø­Ù? 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\n تÙ?ر بÙ? Ø´Ù?ا Ú©Ù?Ú© Ù?Û?Ú©Ù?د تا در Ù?Ù?ابÙ? ساÙ?سÙ?ر Ù?طاÙ?بØ? Ø¢Ù?اÙ?Û?ز تراÙ?Û?Ú© Ù? Ù?ظارت بر شبکÙ? Ú©Ù? حرÛ?Ù? خصÙ?صÛ? اÙ?رادØ? اطÙ?اعات Ù?حرÙ?اÙ?Ù? Ù? رÙ?ابط خصÙ?صÛ?تاÙ? را تÙ?دÛ?د Ù?Û? Ú©Ù?د از Ø®Ù?د دÙ?اع Ú©Ù?Û?د. \n\nاÛ?Ù? راÙ?Ù?Ù?ا بÙ? Ø´Ù?ا Ú©Ù?Ú© Ù?Û?Ú©Ù?د تا تÙ?ظÛ?Ù?ات تÙ?ر Ù? ربات Ù¾Û?ازÛ?  را بر رÙ?Û? دستگاÙ? Ø®Ù?دتاÙ? اÙ?جاÙ? دÙ?Û?د </string>
+  <!--Warning screen-->
   <string name="wizard_warning_title">Ù?شدار</string>
-  <string name="wizard_warning_msg"> را Ù?صب Ú©Ù?Û?د بطÙ?ر Ø®Ù?دکار Ù?Ù?Û? تÙ?اÙ?د جرÛ?اÙ? اطÙ?اعات Ù?Ù?باÛ?Ù? Ø´Ù?ا را بصÙ?رت Ú¯Ù?Ù?اÙ? درآÙ?رد
-Orbot  اگر Ù?Ù?Ø· 
-باÛ?د Ø¢Ù?را بÙ? درستÛ? تÙ?ظÛ?Ù? Ú©Ù?Û?دØ? Ù?Ù?Ú?Ù?Û?Ù? تÙ?ظÛ?Ù?ات را بر رÙ?Û? دستگاÙ? Ø®Ù?دتاÙ? Ù? دÛ?گر برÙ?اÙ?Ù? Ù?اÛ?Û? Ú©Ù? از  استÙ?ادÙ? Ú©Ù?Û?دTor اÛ?Ù?ترÙ?ت استÙ?ادÙ? Ù?Û?Ú©Ù?Ù?د اÙ?جاÙ? دÙ?Û?د تا بتÙ?اÙ?Û?د با Ù?Ù?Ù?Ù?Û?ت از </string>
+  <string name="wizard_warning_msg">اگر Ù?Ù?Ø· ربات Ù¾Û?ازÛ? را Ù?صب Ú©Ù?Û?د بطÙ?ر Ø®Ù?دکار Ù?Ù?Û? تÙ?اÙ?د جرÛ?اÙ? اطÙ?اعات Ù?Ù?باÛ?Ù? Ø´Ù?ا را بصÙ?رت Ú¯Ù?Ù?اÙ? درآÙ?رد.\n \nباÛ?د Ø¢Ù?را بÙ? درستÛ? تÙ?ظÛ?Ù? Ú©Ù?Û?دØ? Ù?Ù?Ú?Ù?Û?Ù? تÙ?ظÛ?Ù?ات را بر رÙ?Û? دستگاÙ? Ø®Ù?دتاÙ? Ù? دÛ?گر برÙ?اÙ?Ù? Ù?اÛ?Û? Ú©Ù? از   تÙ?ر استÙ?ادÙ? Ù?Û?Ú©Ù?Ù?د اÙ?جاÙ? دÙ?Û?د تا بتÙ?اÙ?Û?د با Ù?Ù?Ù?Ù?Û?ت از اÛ?Ù?ترÙ?ت استÙ?ادÙ? Ú©Ù?Û?د.</string>
+  <!--Permissions screen-->
   <string name="wizard_permissions_title">دسترسÛ?â??Ù?ا</string>
-  <string name="wizard_permissions_root_msg1">اجازÙ? دسترسÛ? بدÙ?Û?د تا Ù?Û?Ú?Ú¯Û?Ù?اÛ? Ù¾Û?شرÙ?تÙ?  Ù?اÙ?Ù?د پرÙ?کسÛ? Ø´Ù?اÙ? را Ù?عاÙ? Ú©Ù?د Orbot  اگر بخÙ?اÙ?Û?د Ù?Û?تÙ?اÙ?Û?د بÙ? سÙ?پر Û?Ù?زر </string>
-  <string name="wizard_permissions_root_msg2">اگر Ù?Ù?Û?Ø®Ù?اÙ?Û?د اÛ?Ù? کار را اÙ?جاÙ? دÙ?Û?د Ø? Ù?Ø·Ù?ا Ù?Ø·Ù?ئÙ? Ø´Ù?Û?د Ú©Ù? از اپÙ?Û?Ú©Û?Ø´Ù?Ù?اÛ?Û? استÙ?ادÙ? Ù?Û? Ú©Ù?Û?د Ú©Ù? با اÙ?ربات کار Ù?Û? Ú©Ù?Ù?د</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>
-  <string name="wizard_tips_title"> رÙ?Û? Ø¢Ù?Ù?ا Ù?عاÙ? استOrbot Ù?Û?Ú©Û?Ø´Ù?Ù?اÛ?Û? Ú©Ù? </string>
-  <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string>
+  <string name="wizard_permissions_root_msg1">اگر بخÙ?اÙ?Û?د Ù?Û?تÙ?اÙ?Û?د بÙ? ربات Ù¾Û?ازÛ? اجازÙ? دسترسÛ?  سÙ?پر Û?Ù?زر بدÙ?Û?د تا Ù?Û?Ú?Ú¯Û?Ù?اÛ? Ù¾Û?شرÙ?تÙ?  Ù?اÙ?Ù?د پرÙ?کسÛ? Ø´Ù?اÙ? را Ù?عاÙ? Ú©Ù?د </string>
+  <string name="wizard_permissions_root_msg2">اگر Ù?Ù?Û?Ø®Ù?اÙ?Û?د اÛ?Ù? کار را اÙ?جاÙ? دÙ?Û?د Ø? Ù?Ø·Ù?ا Ù?Ø·Ù?ئÙ? Ø´Ù?Û?د Ú©Ù? از اپÙ?Û?Ú©Û?Ø´Ù?Ù?اÛ?Û? استÙ?ادÙ? Ù?Û? Ú©Ù?Û?د Ú©Ù? با ربات Ù¾Û?ازÛ? کار Ù?Û? Ú©Ù?Ù?د</string>
+  <string name="wizard_permissions_no_root_msg">بÙ? Ù?ظر Ù?Ù?Û?رسÙ? Ú©Ù? دستگاÙ? Ø´Ù?ا root شدÙ? Ù? Û?ا دسترسÛ? Superuser بدÙ?دâ??\nâ??\nبراÛ? بÙ?رÙ? بردÙ? از تÙ?رØ? Ø´Ù?ا باÛ?د از برÙ?اÙ?Ù? Ù?اÛ?Û? استÙ?ادÙ? Ú©Ù?Û?د Ú©Ù? Û?ا براÛ? استÙ?ادÙ? با ربات Ù¾Û?ازÛ? طراحÛ? شدÙ? اÙ?د Ù? Û?ا از تÙ?ظÛ?Ù? پرÙ?کسÛ? SOCKS Û?ا HTTP پشتÛ?باÙ?Û? Ù?Û?Ú©Ù?Ù?د.\n\n\n</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">  اپÙ?Û?Ú©Û?Ø´Ù?Ù?اÛ?Û? Ú©Ù? ربات Ù¾Û?ازÛ? رÙ?Û? Ø¢Ù?Ù?ا Ù?عاÙ? است</string>
+  <string name="wizard_tips_gibberbot">ربات پرÚ?Ù?Ù?Ù?: برÙ?اÙ?Ù? Ú¯Ù?تگÙ?Û? اÙ?Ù? با Ù?ابÙ?Û?ت Ú¯Ù?تگÙ?Û? Ù?حرÙ?اÙ?Ù? رÙ?زگذارÛ? شدÙ?</string>
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
-  <string name="wizard_tips_orweb">ORWEB (Ù?Ù?Ø· Ø¢Ù?درÙ?Û?د 1.x) - Ù?رÙ?رگر طراحÛ? شدÙ? براÛ? Ø­Ù?ظ حرÛ?Ù? خصÙ?صÛ? Ù? اÙ?زÙ?Ù?ساز اÙ?ربات</string>
+  <string name="wizard_tips_orweb">Ù?رÙ?رگر Ù¾Û?ازÛ?: Ù?رÙ?رگر طراحÛ? شدÙ? براÛ? Ø­Ù?ظ حرÛ?Ù? خصÙ?صÛ? Ù? اÙ?زÙ?Ù?ساز ربات Ù¾Û?ازÛ?</string>
   <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <string name="wizard_tips_play">تÙ?اÙ?Ù? برÙ?اÙ?Ù? Ù?اÙ? Guardian Project را در Google Play Ù¾Ù?دا Ù?Ù?Ù?د.</string>
+  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
+  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+  <!--Transparent Proxy screen-->
   <string name="wizard_transproxy_title">پرÙ?کسÛ? کردÙ? Ø´Ù?اÙ?</string>
-  <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string>
+  <string name="wizard_transproxy_msg">اÛ?Ù? بÙ? برÙ?اÙ?Ù? Ù?ا بÙ? Ø´Ù?ا اجازÙ? Ù?Û?دÙ?د Ú©Ù? بدÙ?Ù? Ù?Û?Ú? تÙ?ظÛ?Ù?Û?Ø? بصÙ?رت Ø®Ù?دکار از طرÛ?Ù? شبکÙ? تÙ?ر اجرا Ø´Ù?Ù?د</string>
   <string name="wizard_transproxy_hint">(اگر Ù?Û?Ú? اÛ?دÙ?â??اÛ? Ù?دارÛ?د Ú©Ù? راجع بÙ? Ú?Ù? Ú?Û?زÛ? حرÙ? Ù?Û?زÙ?Û?Ù? اÛ?Ù? گزÛ?Ù?Ù? را اÙ?تخاب Ú©Ù?Û?د)</string>
   <string name="wizard_transproxy_none">Ù?Û?Ù?Ú?</string>
-  <string name="pref_transparent_tethering_title">Tor تترÛ?Ù?Ú¯ از طرÛ?Ù? </string>
-  <string name="pref_transparent_tethering_summary"> - از طرÛ?Ù? Û?Ù? اس بÛ? Tethering  براÛ? دستگاÙ? Ù?اÛ? Ù?اÛ? Ù?اÛ? Ù? Tor Ù?عاÙ? کردÙ? پرÙ?کسÛ? Ø´Ù?اÙ? 
-(بÙ? رÛ? استارت Ù?Û?از دارÙ?د)</string>
+  <string name="pref_transparent_tethering_title"> تترÛ?Ù?Ú¯ از طرÛ?Ù? تÙ?ر</string>
+  <string name="pref_transparent_tethering_summary">پرÙ?کسÛ? Ø´Ù?اÙ? از طرÛ?Ù? تÙ?ر را براÛ? دستگاÙ? Ù?اÛ?Û? Ú©Ù? با Û?Ù? اس بÛ? Û?ا Ù?اÛ? Ù?اÛ? تتر شدÙ? اÙ?د Ù?جاز Ú©Ù?. (بÙ? رÛ? استارت Ù?Û?از دارÙ?د)</string>
   <string name="button_grant_superuser">درخÙ?است دسترسÛ? براÛ? سÙ?پرÛ?Ù?زر</string>
   <string name="pref_select_apps">اÙ?تخاب برÙ?اÙ?Ù? Ù?ا</string>
-  <string name="pref_select_apps_summary">Tor اÙ?تخاب اپÙ?Û?Ú©Û?Ø´Ù? براÛ? Ù?سÛ?رÛ?ابÛ? از طرÛ?Ù? </string>
+  <string name="pref_select_apps_summary"> اÙ?تخاب اپÙ?Û?Ú©Û?Ø´Ù? براÛ? Ù?سÛ?رÛ?ابÛ? از طرÛ?Ù? تÙ?ر </string>
   <string name="pref_node_configuration">تÙ?ظÛ?Ù?ات گرÙ?</string>
-  <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string>
+  <string name="pref_node_configuration_summary">اÛ?Ù?Ù?ا تÙ?ظÛ?Ù?ات Ù¾Û?شرÙ?تÙ? اÛ? Ù?ستÙ?د Ú©Ù? Ù?Ù?Ú©Ù? است Ú¯Ù?Ù?اÙ?Û? Ø´Ù?ا را کاÙ?Ø´ دÙ?Ù?د</string>
   <string name="pref_entrance_node">گرÙ? Ù?اÛ? Ù?رÙ?دÛ?</string>
-  <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string>
+  <string name="pref_entrance_node_summary">اثراÙ?گشت Ù?اØ? اساÙ?Û? Ù?ستعارØ? Ú©Ø´Ù?رÙ?ا Ù? آدرسÙ?اÛ? جÙ?Ø´ اÙ?Ù?</string>
   <string name="pref_entrance_node_dialog">گرÙ? Ù?اÛ? Ù?رÙ?دÛ? را Ù?ارد Ú©Ù?Û?د</string>
-  <string name="pref_use_whispercore">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_use_whispercore">Use WhisperCore</string>
+<string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
+  <string name="pref_proxy_title">پراکسÛ? شبکÙ? خرÙ?جÛ?</string>
   <string name="pref_proxy_type_title">Ù?Ù?ع پرÙ?کسÛ?</string>
-  <string name="pref_proxy_type_summary">Protocol to use for proxy server: 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_port_title">Ù¾Ù?رت پرÙ?کسÛ?</string>
+  <string name="pref_proxy_host_title"> پرÙ?کسÛ? Ù?Û?زباÙ?</string>
+  <string name="pref_proxy_host_summary">Ù?اÙ? سرÙ?ر پرÙ?کسÛ? Ù?Û?زباÙ? </string>
+  <string name="pref_proxy_host_dialog">Ù?اÙ? پرÙ?کسÛ? Ù?Û?زباÙ? را Ù?ارد Ú©Ù?Û?د</string>
+  <string name="pref_proxy_port_title">Ù¾Ù?رت پرÙ?کسÛ? خرÙ?جÛ?</string>
   <string name="pref_proxy_port_summary">Ù¾Ù?رت سرÙ?ر پرÙ?کسÛ?</string>
   <string name="pref_proxy_port_dialog">Ù¾Ù?رت پرÙ?کسÛ? را Ù?ارد Ú©Ù?Û?د</string>
   <string name="status">Ù?ضعÛ?ت</string>
   <string name="setting_up_full_transparent_proxying_">Ù?صب پرÙ?کسÛ? کاÙ?Ù?Ù? Ø´Ù?اÙ?...</string>
   <string name="setting_up_app_based_transparent_proxying_">Ù?صب پرÙ?کسÛ? Ø´Ù?اÙ? Ù?بتÙ?Û? بر برÙ?اÙ?Ù?...</string>
   <string name="transparent_proxying_enabled">پرÙ?کسÛ? Ø´Ù?اÙ? Ù?عاÙ? است</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy براÛ? Tethering Ù?عاÙ? شدÙ? است!</string>
   <string name="warning_error_starting_transparent_proxying_">Ù?شدار: خطا در Ù?Ù?گاÙ? راÙ? اÙ?دازÛ? پرÙ?کسÛ? Ø´Ù?اÙ?!</string>
-  <string name="transproxy_rules_cleared">TransProxy rules cleared</string>
-  <string name="couldn_t_start_tor_process_">: را آغاز Ú©Ù?Ù?Tor Ù?تÙ?اÙ?ستÙ? Ù?راÛ?Ù?د </string>
-  <string name="privoxy_is_running_on_port_">پرÙ?کسÛ?Ø? رÙ?Û? Ù¾Ù?رت Ù?Ù?ابÙ? درحاÙ? اجراست:</string>
+  <string name="transproxy_rules_cleared">Ù?Ù?اÙ?Û?Ù? TransProxy پاک شدÙ?د</string>
+  <string name="couldn_t_start_tor_process_"> تÙ?ر Ù?تÙ?است اجرا Ø´Ù?د:</string>
+  <string name="privoxy_is_running_on_port_">پرÛ?Ù?اکسÛ?Ø? رÙ?Û? Ù¾Ù?رت Ù?Ù?ابÙ? درحاÙ? اجراست:</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">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="send_email_for_bridges">از Û?Ú© حساب کاربرÛ? جÛ?Ù?Û?Ù?Ø? اÛ?Ù?Û?Ù?Û? با Ù?تÙ? \"get bridges\" بÙ? آدرس bridges@xxxxxxxxxxxxxx بÙ?رستÛ?د.</string>
   <string name="error">خطا</string>
   <string name="your_reachableaddresses_settings_caused_an_exception_">!تÙ?ظÛ?Ù?ات Ø´Ù?ا براÛ? آدرس Ù?ابÙ? دسترسÛ? باعث اÛ?جاد خطا شدÙ? اÙ?د </string>
-  <string name="your_relay_settings_caused_an_exception_">!تÙ?ظÛ?Ù?ات رÙ?Ù? Ø´Ù?ا Ù?Ù?جب خطا شدÙ? اÙ?د</string>
+  <string name="your_relay_settings_caused_an_exception_">تÙ?ظÛ?Ù?ات رÙ?Ù? Ø´Ù?ا Ù?Ù?جب خطا شدÙ? اÙ?د</string>
   <string name="exit_nodes">گرÙ? Ù?اÛ? خرÙ?جÛ?</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">hop اثر اÙ?گشتÙ?ا Ø? اساÙ?Û? Ù?ستعار Ø? Ú©Ø´Ù?رÙ?ا Ù? آدرسÙ?ا براÛ? آخرÛ?Ù? </string>
-  <string name="enter_exit_nodes"> Ù?ارد کردÙ? گرÙ? Ù?اÛ? خرÙ?جÛ?</string>
-  <string name="exclude_nodes">Ù?ستثÙ?ا کردÙ? گرÙ? Ù?ا</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">اثر اÙ?گشتÙ?اØ? اساÙ?Û? Ù?ستعار Ø? Ú©Ø´Ù?رÙ?ا Ù? آدرسÙ?ا بÙ?Ù?ظÙ?ر Ù?ستثÙ?Û? شدÙ?</string>
-  <string name="enter_exclude_nodes">Ù?ارد کردÙ? گرÙ? Ù?اÛ? Ù?ستثÙ?Û?</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">اثر اÙ?گشتÙ?ا Ø? اساÙ?Û? Ù?ستعار Ø? Ú©Ø´Ù?رÙ?ا Ù? آدرسÙ?ا براÛ? آخرÛ?Ù? جÙ?Ø´ </string>
+  <string name="enter_exit_nodes"> گرÙ? Ù?اÛ? خرÙ?جÛ? را Ù?ارد Ú©Ù?Û?د</string>
+  <string name="exclude_nodes">اÛ?Ù? گرÙ? Ù?ا را استÙ?ادÙ? Ù?Ú©Ù?</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">اثر اÙ?گشتÙ?اØ? اساÙ?Û? Ù?ستعار Ø? Ú©Ø´Ù?رÙ?ا Ù? آدرسÙ?اÛ?Û? Ú©Ù? Ù?باÛ?د استÙ?ادÙ? Ø´Ù?Ù?د</string>
+  <string name="enter_exclude_nodes"> گرÙ? Ù?اÛ?Û? Ú©Ù? Ù?باÛ?د استÙ?ادÙ? Ø´Ù?Ù?د</string>
   <string name="strict_nodes">گرÙ? Ù?اÛ? Ù?حدÙ?د</string>
   <string name="use_only_these_specified_nodes">Ù?Ù?Ø· * از اÛ?Ù? گرÙ? Ù?اÛ? Ù?شخص شدÙ? استÙ?ادÙ? Ú©Ù?Û?د* </string>
   <string name="bridges">Ù¾Ù? Ù?ا</string>
-  <string name="use_bridges">Use Bridges</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</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="use_bridges">از Ù¾Ù? استÙ?ادÙ? Ú©Ù?</string>
+  <string name="bridges_obfuscated">Ù¾Ù? Ù?اÛ? Ú¯Û?ج Ú©Ù?Ù?دÙ?</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">گرÙ? Ù?رÙ?دÛ? Ù?تÙ?اÙ?ب بÙ? شبکÙ? تÙ?ر را Ù?عاÙ? Ú©Ù?Û?د</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">اگر Ù¾Ù?Ù?اÛ? تÙ?ظÛ?Ù? شدÙ? Ù¾Ù?Ù?اÛ? Ù?ربÙ?Ø· بÙ? پرÙ?کسÛ? Ú¯Û?ج Ú©Ù?Ù?دÙ? Ù?ستÙ?د اÛ?Ù? گزÛ?Ù?Ù? را Ù?عاÙ? Ú©Ù?Û?د</string>
+  <string name="ip_address_and_port_of_bridges">آدرس Ø¢Û? Ù¾Û? Ù? Ù¾Ù?رتÙ? Ù¾Ù? Ù?ا</string>
+  <string name="enter_bridge_addresses">آدرس Ù¾Ù? Ù?ا را Ù?ارد Ú©Ù?Û?د</string>
   <string name="relays">بازپخش Ú©Ù?Ù?دÙ? Ù?ا</string>
-  <string name="relaying">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="relaying">درحاÙ? بازپخش</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">دستگاÙ? Ø®Ù?د را براÛ? Û?Ú© بازپخش Ú©Ù?Ù?دÙ? غÛ?ر-خرÙ?جÛ? Ù?عاÙ? Ú©Ù?Û?د</string>
+  <string name="relay_port">Ù¾Ù?رت بازپخش Ú©Ù?Ù?دÙ?</string>
+  <string name="listening_port_for_your_tor_relay"> Ù¾Ù?رت Ø´Ù?Ù?Ù?دÙ? براÛ? باز پخش تÙ?ر</string>
+  <string name="enter_or_port">Ù¾Ù?رت OR را Ù?ارد Ú©Ù?Û?د</string>
+  <string name="relay_nickname">Ù?اÙ? Ù?ستعار بازپخش Ú©Ù?Ù?دÙ?</string>
   <string name="the_nickname_for_your_tor_relay">Ù?اÙ? Ù?ستعار بازپخش Ú©Ù?Ù?دÙ? Ø´Ù?ا</string>
-  <string name="enter_a_custom_relay_nickname">Enter a custom relay nickname</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">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">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="run_servers_accessible_via_the_tor_network">اجازÙ? بدÙ? سرÙ?رÙ?اÛ? رÙ?Û? دستگاÙ? از طرÛ?Ù? شبکÙ? تÙ?ر Ù?ابÙ? دسترسÛ? باشÙ?د</string>
+  <string name="enter_localhost_ports_for_hidden_services">Ù¾Ù?رت Ù?اÛ? Ù?Ù?کاÙ? Ù?است را براÛ? سرÙ?Û?س Ù?Ø®Ù?Û? Ù?ارد Ú©Ù?Û?د</string>
   <string name="hidden_service_ports">Ù¾Ù?رتâ??Ù?اÛ? سرÙ?Û?س Ù?Ø®Ù?Û?</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">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="the_addressable_name_for_your_hidden_service_generated_automatically_">Ù?اÙ? Ù?شاÙ?Û? پذÛ?ر براÛ? سرÙ?Û?س Ù?Ø®Ù?Û? Ø´Ù?ا (بصÙ?رت Ø®Ù?دکار تÙ?Ù?Û?د شدÙ? است)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">ثبت گزارش اشکاÙ? زداÛ?Û? را بÙ? خرÙ?جÛ? Ù?عاÙ? Ú©Ù? (براÛ? Ù?Ù?اÛ?Ø´ باÛ?د از adb Û?ا aLogCat استÙ?ادÙ? Ú©Ù?Û?د)</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">The Tor License</string>
+  <string name="the_tor_license">Ú¯Ù?اÙ?Û? تÙ?ر</string>
   <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3rd-Party-Software: </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="third_party_software">3rd-Party-Software:</string>
+  <string name="tor_version">تÙ?ر 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">Û?Ú© اپÙ?Û?Ú©Û?Ø´Ù? Ù?Û?Ø®Ù?اÙ?د Ù¾Ù?رت %S سرÙ?Û?س Ù?Ø®Ù?Û? را بÙ? شبکÙ? تÙ?ر باز Ú©Ù?د. اگر بÙ? اÛ?Ù? اپÙ?Û?Ú©Û?Ø´Ù? اعتÙ?اد دارÛ?د اÛ?Ù? بÛ? خطر است.</string>
+  <string name="found_existing_tor_process">Û?Ú© تÙ?ر درحاÙ? اجرا Ù¾Û?دا شد...</string>
   <string name="something_bad_happened">اتÙ?اÙ? بدÛ? اÙ?تاد. Ù?Ù?اÛ?ع ثبت شدÙ? را Ú?Ú© Ú©Ù?Û?د</string>
   <string name="hidden_service_on">سرÙ?Û?س Ù?Ø®Ù?Û? رÙ?Û?:</string>
   <string name="unable_to_read_hidden_service_name">Ù?اتÙ?اÙ? در Ø®Ù?اÙ?دÙ? Ù?اÙ? سرÙ?Û?س Ù?Ø®Ù?Û?</string>
   <string name="unable_to_start_tor">Ù?اتÙ?اÙ? در راÙ? اÙ?دازÛ? تÙ?ر:</string>
   <string name="pref_use_sys_iptables_title">از 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="pref_use_sys_iptables_summary">بÙ? جاÛ? Ú?Û?زÛ? Ú©Ù? با ربات Ù¾Û?ازÛ? اÙ?Ù?دÙ?Ø? از باÛ?Ù?رÛ? Ø¢Û? Ù¾Û? تÛ?بÙ?ز داخÙ?Û? استÙ?ادÙ? Ú©Ù?</string>
+  <string name="error_installing_binares">Ù?اÛ?Ù?Ù?اÛ? باÛ?Ù?رÛ? تÙ?ر Ù?ادر بÙ? Ù?صب Ù? Û?ا ارتÙ?ا Ù?بÙ?دÙ?د</string>
+  <string name="pref_use_persistent_notifications">Ù?Ù?تÛ? ربات Ù¾Û?ازÛ? Ù?تصÙ? استØ? Ù?Ù?Û?Ø´Ù? Ø¢Û?Ú©Ù?Ù? Ù?ربÙ?Ø· را در Ù?Ù?ار ابزار Ù?Ú¯Ù? دار.</string>
+  <string name="pref_use_persistent_notifications_title">آگاÙ?سازÛ? Ù?Ù?Û?Ø´Ù? رÙ?Ø´Ù?</string>
+  <string name="notification_using_bridges">Ù¾Ù? Ù?ا Ù?عاÙ? شدÙ?د!</string>
+  <string name="default_bridges"/>
+  <string name="set_locale_title">زباÙ? Ù?Ø­Ù?Û? را Ù?شخص Ú©Ù?Û?د</string>
+  <string name="set_locale_summary">زباÙ? Ù?Ø­Ù?Û?  ربات Ù¾Û?ازÛ?  را اÙ?تخاب Ú©Ù?Û?د</string>
+  <string name="wizard_locale_title">اÙ?تخاب زباÙ?</string>
+  <string name="wizard_locale_msg">زباÙ? Ú©Ù?Ù?Ù?Û? را تعÙ?Û?ض Ù? Û?ا بÙ? Ø´Ú©Ù? Ù¾Û?Ø´Ù?رض رÙ?اÛ?Ø´ Ú©Ù?Û?د</string>
+  <string name="powered_by">Ù?Û?رÙ? گرÙ?تÙ? از پرÙ?Ú?Ù? تÙ?ر</string>
+  <string name="btn_save_settings">ذخÛ?رÙ? تÙ?ظÛ?Ù?ات</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 98b07b5..3807707 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -14,7 +14,7 @@
   <string name="tor_process_starting">Lancement du client Tor</string>
   <string name="tor_process_complete">Terminé</string>
   <string name="tor_process_waiting">Attente...</string>
-  <string name="not_anonymous_yet">AVERTISSEMENT: Votre traffic n\'est pas encore anonyme ! Veuillez configurer vos applications pour qu\'elles utilisent le proxy HTTP Ã  127.0.0.1:8118 ou le proxy SOCKS4A ou SOCKS5 Ã  127.0.0.1:9050</string>
+  <string name="not_anonymous_yet">AVERTISSEMENT: Votre trafic n\'est pas encore anonyme ! Veuillez configurer vos applications pour qu\'elles utilisent le proxy HTTP Ã  127.0.0.1:8118 ou le proxy SOCKS4A ou SOCKS5 Ã  127.0.0.1:9050</string>
   <string name="menu_home">Accueil</string>
   <string name="menu_browse">Parcourir</string>
   <string name="menu_settings">Paramètres</string>
@@ -25,13 +25,14 @@
   <string name="menu_stop">Arrêter</string>
   <string name="menu_about">Ã? propos</string>
   <string name="menu_wizard">Assistant</string>
+  <string name="main_layout_download">Téléchargement (vitesse/total)</string>
+  <string name="main_layout_upload">Envoi (vitesse/total)</string>
   <string name="button_help">Aide</string>
   <string name="button_close">Fermer</string>
   <string name="button_about">Ã? propos</string>
   <string name="button_clear_log">Effacer le journal</string>
   <string name="menu_verify">Vérifier</string>
   <string name="menu_exit">Sortie</string>
-  <string name="powered_by">propulsé par le Projet Tor </string>
   <string name="press_to_start">- appuyez longtemps pour démarrer -</string>
   <string name="pref_trans_proxy_group">Proxy transparent (accès privilégié requis) </string>
   <string name="pref_trans_proxy_title">Proxy transparent</string>
@@ -55,6 +56,7 @@
   <string name="btn_finish">Fin</string>
   <string name="btn_okay">Valider</string>
   <string name="btn_cancel">Annuler</string>
+  <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Quelques détails sur Orbot</string>
   <string name="wizard_details_msg">Orbot est une application logicielle libre qui contient Tor, LibEvent et Privoxy. Il fournit un proxy local HTTP (8118) et un proxy SOCKS (9050) dans le réseau Tor. Orbot a aussi la capacité, avec les droits administrateurs, d\'envoyer tout le trafic Internet à travers Tor.</string>
   <string name="wizard_permissions_root">Permission accordée</string>
@@ -69,36 +71,45 @@
   <string name="wizard_configure_all">Toutes les applications par Tor</string>
   <string name="wizard_configure_select_apps">Choisir les applications utilisant Tor</string>
   <string name="wizard_tips_tricks">Applications avec Orbot</string>
-  <string name="wizard_tips_msg">Nous vous encouragons à télécharger &amp;amp; utiliser les applications conçues pour se connecter directement à Orbot. Cliquez sur les boutons ci-dessous pour installer.</string>
+  <string name="wizard_tips_msg">Nous vous encouragons à télécharger &amp; utiliser les applications conçues pour se connecter directement à Orbot. Cliquez sur les boutons ci-dessous pour installer.</string>
   <string name="wizard_tips_otrchat">Gibberbot - Client de messagerie instantanée pour Android</string>
   <string name="wizard_tips_proxy">Configuration du proxy - Apprendre comment configurer les applications pour qu\'elles fonctionnent avec Orbot</string>
+  <string name="wizard_tips_duckgo">Application DuckDuckgo Search Engine</string>
+  <string name="wizard_tips_firefox">Firefox avec le plugin Proxy Mobile (installation complémentaire)</string>
+  <string name="wizard_tips_twitter">Twitter supporte le proxy http \"localhost:8118\"</string>
   <string name="wizard_proxy_help_info">Configuration du proxy</string>
-  <string name="wizard_proxy_help_msg">Si l\'application Android que vous utilisez peut supporter un proxy HTTP ou un proxy SOCKS, vous pouvez la configurer pour se connecter à Orbot et utiliser Tor./n/n
-    La configuration de l\'hôte est 127.0.0.1 ou \"localhost\". Pour le HTTP, le port utilisé est le 8118. Pour SOCKS, le port utilisé est 9050. Vous devriez, si possible, utiliser SOCKS4A ou SOCKS5.
-    /n/n
-    Vous pouvez en apprendre plus sur la configuration de proxy sous Android sur la FAQ Ã  : http://tinyurl.com/proxyandroid
-    </string>
+  <string name="wizard_proxy_help_msg">Si l\'application Android que vous utilisez peut supporter un proxy HTTP ou un proxy SOCKS, vous pouvez la configurer pour se connecter à Orbot et utiliser Tor./n/n\n    La configuration de l\'hôte est 127.0.0.1 ou \"localhost\". Pour le HTTP, le port utilisé est le 8118. Pour SOCKS, le port utilisé est 9050. Vous devriez, si possible, utiliser SOCKS4A ou SOCKS5.\n    /n/n\n    Vous pouvez en apprendre plus sur la configuration de proxy sous Android sur la FAQ à : http://tinyurl.com/proxyandroid\n    </string>
   <string name="wizard_final">Orbot est prêt!</string>
   <string name="wizard_final_msg">Des milliers de personnes dans le monde utilisent Tor pour une grande variétés de raisons : journalistes et bloggers, défenseurs des droits de l\'homme, policiers, soldats, entreprises, les citoyens de régimes répressifs, et aussi de simples citoyens ... et maintenant vous êtes prêts aussi !</string>
+  <!--END Welcome Wizard strings (DJH)-->
   <string name="connect_first_time"> Vous êtes connectés avec succès au réseau Tor - mais cela ne signifie PAS que votre appareil est sécurisé. Vous pouvez utiliser l\'option \'Vérifier\'  du menu pour vérifier avec votre navigateur. \n\nAllez à la page https://guardianproject.info/apps/orbot ou envoyez un courriel à help@xxxxxxxxxxxxxxxxxxxx pour en savoir plus.</string>
   <string name="tor_check">Ceci va ouvrir la page https://check.torproject.org avec le navigateur web par défaut pour vérifier si Orbot est suffisamment configuré pour vous connecter à Tor.</string>
   <string name="pref_hs_group">Services cachés</string>
   <string name="pref_general_group">Général</string>
   <string name="pref_start_boot_title">Exécuter Orbot automatiquement</string>
   <string name="pref_start_boot_summary">Démarrer automatiquement Orbot et se connecter à Tor quand votre périphérique Android démarre</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
   <string name="wizard_title_msg">Orbot, c\'est Tor sur Android !\n\n Tor vous aide à vous protéger du filtrage de contenu, de l\'analyse de trafic et de la surveillance des réseaux qui menacent la vie privée, les informations confidentielles et les relations interpersonnelles.\n\nCe assistant vous aidera à configurer Orbot et Tor sur votre appareil.</string>
+  <!--Warning screen-->
   <string name="wizard_warning_title">Attention</string>
   <string name="wizard_warning_msg">Installer Orbot ne suffit pas à anonymiser automatiquement le trafic de votre mobile.\n\nVous devez configurer correctement Orbot, votre appareil et d\'autres applications pour utiliser adéquatement Tor.</string>
+  <!--Permissions screen-->
   <string name="wizard_permissions_title">Permissions</string>
   <string name="wizard_permissions_root_msg1">Vous pouvez aussi, optionnellement donner l\'accès \"Super Utilisateur\" à Orbot pour activer les options avancées, comme le Proxy Transparent</string>
   <string name="wizard_permissions_root_msg2">Si vous ne voulez pas faire ça, merci de vous assurer que les applications que vous utilisez ont été faites pour fonctionner avec Orbot.</string>
-  <string name="wizard_permissions_no_root_msg">Votre appareil est en mode standard et ne supporte pas l\'accès root ou «super-utilisateur».\n\nPour bénéficier de Tor, vous avez besoin d\'utiliser des applications conçues pour fonctionner avec Orbot ou permettant de définir un proxy de type HTTP ou SOCKS.\n\n
-</string>
+  <string name="wizard_permissions_no_root_msg">Votre appareil est en mode standard et ne supporte pas l\'accès root ou «super-utilisateur».\n\nPour bénéficier de Tor, vous avez besoin d\'utiliser des applications conçues pour fonctionner avec Orbot ou permettant de définir un proxy de type HTTP ou SOCKS.\n\n\n</string>
+  <!--TipsAndTricks screen-->
   <string name="wizard_tips_title">Applications Orbot</string>
   <string name="wizard_tips_gibberbot">Gibberbot: application de clavardage sécurisé avec chiffrement Off-the-Record</string>
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
-  <string name="wizard_tips_orweb">ORWEB (Android 1.x seulement) - navigateur créé pour protéger votre vie privée &amp;amp; pour Orbot</string>
+  <string name="wizard_tips_orweb">ORWEB (Android 1.x seulement) - navigateur créé pour protéger votre vie privée &amp; pour Orbot</string>
   <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
+  <!--<string name="wizard_tips_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">Proxy transparent</string>
   <string name="wizard_transproxy_msg">Cela permet à vos applications d\'utiliser automatiquement le réseau Tor sans aucune configuration.</string>
   <string name="wizard_transproxy_hint">(Cochez cette case si vous n\'avez aucune idée de ce dont nous parlons)</string>
@@ -113,8 +124,9 @@
   <string name="pref_entrance_node">NÅ?uds d\'entrée</string>
   <string name="pref_entrance_node_summary">Empreintes, pseudos, pays et adresses pour le premier saut</string>
   <string name="pref_entrance_node_dialog">Entrez les nÅ?uds d\'entrée</string>
-  <string name="pref_use_whispercore">Utilisez WhisperCore</string>
-  <string name="pref_use_whispercore_summary">Utilisez les API propriétaires fournis par Netfilter WhisperSystems (dispositif nécessaire avec WhisperCore installé)</string>
+  <!--<string name="pref_use_whispercore">Use WhisperCore</string>
+<string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
+  <string name="pref_proxy_title">Proxy sortant</string>
   <string name="pref_proxy_type_title">Type de proxy</string>
   <string name="pref_proxy_type_summary">Protocole à utiliser pour le serveur proxy : HTTP, HTTPS, Socks4, Socks5</string>
   <string name="pref_proxy_type_dialog">Entrez le type de proxy</string>
@@ -150,7 +162,9 @@
   <string name="use_only_these_specified_nodes">Utiliser * uniquement * les nÅ?uds spécifiés</string>
   <string name="bridges">Ponts</string>
   <string name="use_bridges">Utiliser des ponts</string>
+  <string name="bridges_obfuscated">Ponts Obscurci</string>
   <string name="enable_alternate_entrance_nodes_into_the_tor_network">Activer des nÅ?uds alternatifs d\'entrée dans le réseau Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Activer si les ponts configurés sont des ponts obscurcies</string>
   <string name="ip_address_and_port_of_bridges">Adresse IP et port des ponts</string>
   <string name="enter_bridge_addresses">Entrez les adresses de passerelle</string>
   <string name="relays">Relais</string>
@@ -178,6 +192,11 @@
   <string name="the_tor_license">La licence de Tor</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">Logiciels tierce-partie :</string>
+  <string name="tor_version">Tor v0.2.3.7-alpha: https://www.torproject.org</string>
+  <string name="libevent_version">Libevent v1.4.13 : http://www.monkey.org/~provos/libevent/</string>
+  <string name="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">Une application veut ouvrir le port %S du serveur caché sur le réseau Tor. C\'est sécuritaire si vous faites confiance à l\'application.</string>
   <string name="found_existing_tor_process">trouvé un processus existant de Tor ...</string>
   <string name="something_bad_happened">Quelque chose d\'incorrect s\'est passé. Vérifiez le journal</string>
@@ -189,4 +208,12 @@
   <string name="error_installing_binares">Les fichiers binaires de Tor n\'ont pas pu être installé ou mis à jour.</string>
   <string name="pref_use_persistent_notifications">Toujours conserver l\'icône dans la barre des tâches quand Orbot est connecté.</string>
   <string name="pref_use_persistent_notifications_title">Toujours activé les Notifications</string>
+  <string name="notification_using_bridges">Les ponts sont activés!</string>
+  <string name="default_bridges"/>
+  <string name="set_locale_title">Fixer le Lieu</string>
+  <string name="set_locale_summary">Choisir le lieu and la langue pour Orbot</string>
+  <string name="wizard_locale_title">Choisir la langue</string>
+  <string name="wizard_locale_msg">Laisser aux défaut ou changer la langue actuel</string>
+  <string name="powered_by">propulsé par le Projet Tor </string>
+  <string name="btn_save_settings">Sauver les Paramètres</string>
 </resources>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
new file mode 100644
index 0000000..002f24e
--- /dev/null
+++ b/res/values-he/strings.xml
@@ -0,0 +1,91 @@
+<?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">×?ת×?×? ×?עצ×?ר ×?ת Tor</string>
+  <string name="tor_proxy_service_process">ש×?ר×?ת ×?פר×?קס×? ש×? Tor</string>
+  <string name="status_starting_up">Orbot ×?ת×?×?×?</string>
+  <string name="status_activated">×?×?×?×?ר ×?רשת Tor</string>
+  <string name="status_disabled">Orbot ×?×?×?×?</string>
+  <string name="status_shutting_down">Orbot ×?ת×?×?×?×? ×?×?×?×?×?</string>
+  <string name="tor_process_starting">×?ת×?×?×? ×?ת Tor...</string>
+  <string name="tor_process_complete">×?×?ש×?×?</string>
+  <string name="menu_home">×?×?ת</string>
+  <string name="menu_browse">×?פ×?×£</string>
+  <string name="menu_settings">×?×?×?ר×?ת</string>
+  <string name="menu_log">ר×?ש×?×?</string>
+  <string name="menu_info">×¢×?ר×?</string>
+  <string name="menu_apps">×?×?ש×?×?×?×?</string>
+  <string name="menu_start">×?ת×?×?</string>
+  <string name="menu_stop">עצ×?ר</string>
+  <string name="menu_about">×?×?×?×?ת</string>
+  <string name="menu_wizard">×?שף</string>
+  <string name="button_help">×¢×?ר×?</string>
+  <string name="button_close">ס×?×?ר</string>
+  <string name="button_about">×?×?×?×?ת</string>
+  <string name="button_clear_log">× ×§×? ר×?ש×?×?</string>
+  <string name="menu_verify">×?×?×?ק×?</string>
+  <string name="menu_exit">צ×?</string>
+  <string name="press_to_start">-× ×?×?×¢×? ×?ר×?×?×? ×?×?ת×?×?×?-</string>
+  <string name="pref_transparent_all_title">×?×?×? ×?ר×? Tor</string>
+  <string name="pref_transparent_port_title">רש×?×?ת פ×?ר×?×?×?</string>
+  <string name="pref_has_root">×?ר×?ש ר×?×?</string>
+  <string name="title_error">ש×?×?×?ת ×?×?ש×?×?</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">×?×?×?×?ת Orbot</string>
+  <string name="btn_next">×?×?×?</string>
+  <string name="btn_back">×?ק×?×?×?</string>
+  <string name="btn_finish">ס×?×?×?</string>
+  <string name="btn_okay">OK.</string>
+  <string name="btn_cancel">ס×?×?ר</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_permissions_consent">×?×?× ×ª×? ×?×?× ×? ×?×¢×?×?×£ ×?×?×?ש×?×? ×?×?×? Superuser</string>
+  <string name="wizard_tips_proxy">×?×?×?ר×?ת פר×?קס×?- ×?×?×? ×?×?×? ×?×?×?×?×?ר ×?פ×?×?קצ×?×?ת ×?×¢×?×?×? ×¢×? Orbot</string>
+  <string name="wizard_proxy_help_info">×?×?×?ר×?ת פר×?קס×?</string>
+  <string name="wizard_final">Orbot ×?×?×?×?!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_hs_group">×?×?×?ס×?×? ש×?ר×?ת×?×? × ×¡×ª×¨×?×?</string>
+  <string name="pref_general_group">×?×?×?×?</string>
+  <string name="pref_start_boot_title">×?ת×?×? ×?ת Orbot ×?×?×?×?קת ×?×?×?ש×?ר</string>
+  <string name="pref_start_boot_summary">×?ת×?×? ×?ת Orbot ×?×?ת×?×?ר ×?-Tor ×?×?×?×?×?×?×?ת ×?×?×?×?ש×?ר × ×?×?ק</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <string name="wizard_permissions_root_msg2">×?×? ×?ת×? ×?×? ר×?צ×? ×?עש×?ת ×?ת ×?×?, ×?× ×? ×?קפ×? ×?×?שת×?ש ×?×?×?ש×?×?×?×? ×©× ×¢×©×? ×?×?×? ×?×¢×?×?×? ×¢×? Orbot</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot - ×?×?ש×?×?×?×? ×?×?פע×?×?×?</string>
+  <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
+  <!--<string name="wizard_tips_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_msg">×?×? ×?×?פשר ×?×?×?ש×?×?×?×? ש×?×? ×?×?פע×?×? ×?×?×?פ×? ×?×?×?×?×?×?×? ×?ר×? רשת Tor ×?×?×? ×?×? תצ×?ר×?.</string>
+  <string name="wizard_transproxy_hint">(ס×?×? ת×?×?×? ×?×? ×?×? ×?×?×? ×?×? ×?×?ש×? ×¢×? ×?×? ×?× ×?× ×? ×?×?×?ר×?×?)</string>
+  <string name="button_grant_superuser">×?ר×?ש ×?×?ש×?ר Superuser</string>
+  <string name="pref_select_apps">×?×?ר ×?פ×?קצ×?×?ת</string>
+  <string name="pref_select_apps_summary">×?×?ר ×?פ×?קצ×?×?ת</string>
+  <!--<string name="pref_use_whispercore">Use WhisperCore</string>
+<string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
+  <string name="pref_proxy_type_dialog">ס×?×? ×?פר×?קס×?:</string>
+  <string name="pref_proxy_port_summary">פ×?ר×? ×?שרת ש×? ×?פר×?קס×?</string>
+  <string name="status">ס×?×?×?ס</string>
+  <string name="bridge_error">ש×?×?×?ת ×?שר</string>
+  <string name="error">ש×?×?×?×?</string>
+  <string name="bridges">×?שר×?×?</string>
+  <string name="use_bridges">×?שת×?ש ×?×?שר×?×?</string>
+  <string name="bridges_obfuscated">×?שר×?×? ×?×¢×?רפ×?×?×?</string>
+  <string name="relays">×?×?סר×?×?</string>
+  <string name="relaying">×?×?ס×?ר</string>
+  <string name="enable_hidden_services">×?×?ס×?×? ש×?ר×?ת×?×? × ×¡×ª×¨×?×?</string>
+  <string name="hidden_service_ports">פ×?ר×? ×?ש×?ר×?ת×?×? ×?× ×¡×ª×¨×?×?</string>
+  <string name="https_torproject_org">https://torproject.org/</string>
+  <string name="default_bridges"/>
+  <string name="wizard_locale_title">×?×?ר שפ×?</string>
+  <string name="powered_by">×?×?פע×? ×¢×? ×?×?×? Tor Project</string>
+  <string name="btn_save_settings">ש×?×?רת ×?×?×?ר×?ת</string>
+</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
new file mode 100644
index 0000000..520215c
--- /dev/null
+++ b/res/values-hr/strings.xml
@@ -0,0 +1,213 @@
+<?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>
+  <!--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>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help@xxxxxxxxxxxxxxxxxxxx to learn more.</string>
+  <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string>
+  <string name="pref_hs_group">Hidden Services</string>
+  <string name="pref_general_group">General</string>
+  <string name="pref_start_boot_title">Start Orbot on Boot</string>
+  <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Warning</string>
+  <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Permissions</string>
+  <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string>
+  <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string>
+  <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot-Enabled Apps</string>
+  <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string>
+  <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
+  <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string>
+  <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
+  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparent Proxying</string>
+  <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string>
+  <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string>
+  <string name="wizard_transproxy_none">None</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string>
+  <string name="button_grant_superuser">Request Superuser Access</string>
+  <string name="pref_select_apps">Select Apps</string>
+  <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string>
+  <string name="pref_node_configuration">Node Configuration</string>
+  <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string>
+  <string name="pref_entrance_node">Entrance Nodes</string>
+  <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string>
+  <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string>
+  <string name="pref_use_whispercore">Use WhisperCore</string>
+  <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>
+  <string name="pref_proxy_type_title">Proxy Type</string>
+  <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Enter Proxy Type</string>
+  <string name="pref_proxy_host_title">Proxy Host</string>
+  <string name="pref_proxy_host_summary">Proxy server hostname</string>
+  <string name="pref_proxy_host_dialog">Enter Proxy Host</string>
+  <string name="pref_proxy_port_title">Proxy Port</string>
+  <string name="pref_proxy_port_summary">Proxy server port</string>
+  <string name="pref_proxy_port_dialog">Enter Proxy port</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying...</string>
+  <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string>
+  <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string>
+  <string name="transproxy_rules_cleared">TransProxy rules cleared</string>
+  <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string>
+  <string name="privoxy_is_running_on_port_">Privoxy is running on port: </string>
+  <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string>
+  <string name="bridge_error">Bridge Error</string>
+  <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string>
+  <string name="send_email_for_bridges">Send an email to bridges@xxxxxxxxxxxxxx with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string>
+  <string name="error">Error</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string>
+  <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string>
+  <string name="exit_nodes">Exit Nodes</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string>
+  <string name="enter_exit_nodes">Enter Exit Nodes</string>
+  <string name="exclude_nodes">Exclude Nodes</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string>
+  <string name="enter_exclude_nodes">Enter Exclude Nodes</string>
+  <string name="strict_nodes">Strict Nodes</string>
+  <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string>
+  <string name="bridges">Bridges</string>
+  <string name="use_bridges">Use Bridges</string>
+  <string name="bridges_obfuscated">Obfuscated Bridges</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string>
+  <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string>
+  <string name="enter_bridge_addresses">Enter Bridge Addresses</string>
+  <string name="relays">Relays</string>
+  <string name="relaying">Relaying</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Enable your device to be a non-exit relay</string>
+  <string name="relay_port">Relay Port</string>
+  <string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string>
+  <string name="enter_or_port">Enter OR port</string>
+  <string name="relay_nickname">Relay nickname</string>
+  <string name="the_nickname_for_your_tor_relay">The nickname for your Tor relay</string>
+  <string name="enter_a_custom_relay_nickname">Enter a custom relay nickname</string>
+  <string name="reachable_addresses">Reachable Addresses</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Run as a client behind a firewall with restrictive policies</string>
+  <string name="reachable_ports">Reachable ports</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string>
+  <string name="enter_ports">Enter ports</string>
+  <string name="enable_hidden_services">Enable Hidden Services</string>
+  <string name="run_servers_accessible_via_the_tor_network">run servers accessible via the Tor network</string>
+  <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string>
+  <string name="hidden_service_ports">Hidden Service Ports</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string>
+  <string name="project_home">Project Home(s): </string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">The Tor License</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">3rd-Party-Software: </string>
+  <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
+  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
+  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
+  <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string>
+  <string name="found_existing_tor_process">found existing Tor process...</string>
+  <string name="something_bad_happened">Something bad happened. Check the log</string>
+  <string name="hidden_service_on">hidden service on:</string>
+  <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string>
+  <string name="unable_to_start_tor">Unable to start Tor:</string>
+  <string name="pref_use_sys_iptables_title">Use Default Iptables</string>
+  <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string>
+  <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string>
+  <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string>
+  <string name="pref_use_persistent_notifications_title">Always-On Notifications</string>
+  <string name="notification_using_bridges">Bridges enabled!</string>
+  <string name="default_bridges"/>
+  <string name="set_locale_title">Set Locale</string>
+  <string name="set_locale_summary">Choose the locale and language for Orbot</string>
+  <string name="wizard_locale_title">Choose Language</string>
+  <string name="wizard_locale_msg">Leave default or switch the current language</string>
+  <string name="powered_by">powered by The Tor Project  </string>
+  <string name="btn_save_settings">Save Settings</string>
+</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 0579883..67a4883 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -25,13 +25,14 @@
   <string name="menu_stop">Leállítás</string>
   <string name="menu_about">Névjegy</string>
   <string name="menu_wizard">Varázsló</string>
+  <string name="main_layout_download">Letöltés (sebesség/összes)</string>
+  <string name="main_layout_upload">Feltöltés (sebesség/összes)</string>
   <string name="button_help">Súgó</string>
   <string name="button_close">Bezár</string>
   <string name="button_about">Névjegy</string>
   <string name="button_clear_log">Log ürítése</string>
   <string name="menu_verify">EllenÅ?rzés</string>
   <string name="menu_exit">Kilépés</string>
-  <string name="powered_by">a Tor Project által gondozva</string>
   <string name="press_to_start">- hosszan nyomja az indítást -</string>
   <string name="pref_trans_proxy_group">�tlátszó Proxy használat (Root-olás szükséges)</string>
   <string name="pref_trans_proxy_title">�tlátszó Proxy használat</string>
@@ -55,6 +56,7 @@
   <string name="btn_finish">Befejezés</string>
   <string name="btn_okay">OK</string>
   <string name="btn_cancel">Mégsem</string>
+  <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Néhány Orbot Tudnivaló</string>
   <string name="wizard_details_msg">Az Orbot egy nyílt forrás alkalmazás, ami a Tor, a LibEvent és Privoxy csomagot tartalmazza. Szolgáltatása egy helyi  HTTP proxy (8118) és egy SOCKS proxy (9050) a Tor hálózat felé. Az Orbot további tulajdonsága, hogy rootolt készülék esetén képes a teljes internet forgalom Tor hálózaton keresztül küldésére.</string>
   <string name="wizard_permissions_root">Jogosultság megadva</string>
@@ -72,32 +74,42 @@
   <string name="wizard_tips_msg">Javasoljuk, hogy töltsön le és használjon olyan alkalmazásokat, amelyek tudják, hogyna kell közvetlenül kapcsolódni az Orbot-hoz. Kattintson az gombokra alább a telepítéshez.</string>
   <string name="wizard_tips_otrchat">Gibberbot - Biztonságos azonnali üzenetküldÅ? kliens Android-ra</string>
   <string name="wizard_tips_proxy">Proxy beállítások - Tanulja meg, hogyan állíthatja be alkalmazásait, hogy együttműködjenek az Orbot-tal</string>
+  <string name="wizard_tips_duckgo">Duckduckgo keresÅ?gép alkalmazás</string>
+  <string name="wizard_tips_firefox">Firefox Proxy Mobile kiegészítÅ?vel (külön telepítés utána)</string>
+  <string name="wizard_tips_twitter">A Twitter támogatja a \"localhost:8118\" http proxyt</string>
   <string name="wizard_proxy_help_info">Proxy beállítások</string>
-  <string name="wizard_proxy_help_msg">Ha az Android alkalmazás, amit használ képes a HTTP vagy SOCKS proxy-k használatára, akkor be tudja állítani, hogy csatlakozzon az Orbot-hoz és használj a Tor-t.\n\n
-    A host beállítás 127.0.0.1 vagy \"localhost\". A HTTP-hez a  port értéke 8118. A SOCKS esetében a proxy port értéke 9050. SOCKS4A vagy SOCKS5 proxy javasolt használnia, ha lehetséges.
-    \n\n
-    További információkat talál a proxyzásról Android készülékne a FAQ szekcióban az alábbi oldalon: http://tinyurl.com/proxyandroid
-    </string>
+  <string name="wizard_proxy_help_msg">Ha az Android alkalmazás, amit használ képes a HTTP vagy SOCKS proxy-k használatára, akkor be tudja állítani, hogy csatlakozzon az Orbot-hoz és használj a Tor-t.\n\n\n    A host beállítás 127.0.0.1 vagy \"localhost\". A HTTP-hez a  port értéke 8118. A SOCKS esetében a proxy port értéke 9050. SOCKS4A vagy SOCKS5 proxy javasolt használnia, ha lehetséges.\n    \n\n\n    További információkat talál a proxyzásról Android készülékne a FAQ szekcióban az alábbi oldalon: http://tinyurl.com/proxyandroid\n    </string>
   <string name="wizard_final">Az Orbot kész!</string>
   <string name="wizard_final_msg">Több száezren használják szerte a világon a Tor-t különbözÅ? okokból: újságírók, bloggerek, emberi jogi aktivisták, rendvédelmi szervek dolgozói, katonák, vállalatok, elnyomó rezsimek polgárai, vagy csak egyszerű polgárok... és most készen áll erre Ã?n is!</string>
+  <!--END Welcome Wizard strings (DJH)-->
   <string name="connect_first_time"> Sikeresen csatlakozott a Tor hálózathoz - de ez NEM azt jelenti, hogy a készüléke biztonságos. EllenÅ?rizze az \'EllenÅ?rzés\' opcióval a menübÅ?l a böngészÅ?jét.\n\nLátogassa meg a https://guardianproject.info/apps/orbot oldalt vagy küldjön emailt a help@xxxxxxxxxxxxxxxxxxxx címre a további információkért.</string>
   <string name="tor_check">Ez megnyitja az alapértelmezett böngészÅ?t, és elnavigálja a https://check.torproject.orgoldalra, hogy ellenÅ?rizze, hogy az Orbot helyesen konfigurált-e, és hogy csatlakozott-e a Tor hálózathoz.</string>
   <string name="pref_hs_group">Rejtett szolgáltatások</string>
   <string name="pref_general_group">�ltalános</string>
   <string name="pref_start_boot_title">Az Orbot indítása bekapcsoláskor</string>
   <string name="pref_start_boot_summary">Automatikusan elindítja az Orbot-ot, és csatlakozik a hálózathoz, amikor az Android eszköz elindul</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
   <string name="wizard_title_msg">Az Orbot elhozta a Tor-t Androidra!\n\n\A Tor megvédi a tartalomszűréstÅ?l, forgalomelemzéstÅ?l és hálózatanalízistól, amely a sértheti magánéletét, titkos üzleti információt vagy személyes kapcsolatait.\n\nEz a varázsló segít az Orbot és a Tor bekonfigurálásában az eszközén.</string>
+  <!--Warning screen-->
   <string name="wizard_warning_title">Figyelem</string>
   <string name="wizard_warning_msg">Az Orbot telepítése nem fogja automatikusan névtelenné tenni a mobil forgalmát.\n\nMegfelelÅ?en konfigurálnia kell az Orbot-ot az eszközt és az alkalmazásokat a sikeres Tor használathoz.</string>
+  <!--Permissions screen-->
   <string name="wizard_permissions_title">Jogosultságok</string>
   <string name="wizard_permissions_root_msg1">Opcionálisan adhat az Orbot részére \'Superuser\' hozzáférést, amellyel bekapcsolhatja az olyan speciális szolgáltatásokat, mint például az �tlátszó Proxyzás.</string>
   <string name="wizard_permissions_root_msg2">Ha nem szeretné ezt, akkor legen biztos abban, hogy olyan alkalmazásokat használ, amiket az Orbot-tal együttműködésre terveztek.</string>
   <string name="wizard_permissions_no_root_msg">Az eszköze alap módban fut, nem támogatja a root vagy \'Superuser\' hozzáférést.\n\nAhhoz, hogy részesüljön a Tor elÅ?nyeibÅ?l, olyan alkalmazást kell használnia, amely úgy készült, hogy együtt használható legyen az Orbot-tal, vagy legyen lehetÅ?ség HTTP vagy SOCKS proxy beállítására.\n\n</string>
+  <!--TipsAndTricks screen-->
   <string name="wizard_tips_title">Orbot-engedélyezett Alkalmazások</string>
   <string name="wizard_tips_gibberbot">Gibberbot: Biztonságos csevegÅ? alkalmazás Off-the-Record titkosítással</string>
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
   <string name="wizard_tips_orweb">ORWEB (csak Android 1.x) - BöngészÅ?, kifejezetten adatvédelemre és az Orbot-hoz</string>
   <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <!--<string name="wizard_tips_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">�tlátszó proxyzás</string>
   <string name="wizard_transproxy_msg">Ez lehetÅ?vé teszi az alkalmazások számára a Tor-on keresztül kommunikálást, bármilyen konfiguráció nélkül.</string>
   <string name="wizard_transproxy_hint">(Jelölje ezt négyzetet, ha halvány lila fogalma sincs mirÅ?l van itt szó.)</string>
@@ -112,8 +124,9 @@
   <string name="pref_entrance_node">BelépÅ? csomópontok</string>
   <string name="pref_entrance_node_summary">Ujjlenyomatok, becenevek, országok és címek az elsÅ? ugráshoz</string>
   <string name="pref_entrance_node_dialog">BelépÅ? csomópontok megadása</string>
-  <string name="pref_use_whispercore">WhisperCore használata</string>
-  <string name="pref_use_whispercore_summary">Az eredeti NetFilter API használata amit a WhisperSystems biztosít (olyan eszköz szükséges, amire WhisperCore van telepítve)</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">KimenÅ? hálózati proxy</string>
   <string name="pref_proxy_type_title">Proxy típus</string>
   <string name="pref_proxy_type_summary">A Proxy szerver által használandó protokoll: HTTP, HTTPS, Socks4, Socks5</string>
   <string name="pref_proxy_type_dialog">Adja meg a Proxy típust</string>
@@ -149,7 +162,9 @@
   <string name="use_only_these_specified_nodes">*Csak * a megadott csomópontok használata</string>
   <string name="bridges">Hidak</string>
   <string name="use_bridges">Hidak használata</string>
+  <string name="bridges_obfuscated">FedÅ?hidak</string>
   <string name="enable_alternate_entrance_nodes_into_the_tor_network">Alternatív belépési pontok engedélyezése a Tor hálózatba</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Bekapcsolva, ha a hidak FedÅ?hidak.</string>
   <string name="ip_address_and_port_of_bridges">A Hidek IP címe és portja</string>
   <string name="enter_bridge_addresses">Adja meg a híd címet</string>
   <string name="relays">Elosztók</string>
@@ -193,4 +208,12 @@
   <string name="error_installing_binares">A Tor binárisok nem telepíthetÅ?k, vagy frissíthetÅ?k.</string>
   <string name="pref_use_persistent_notifications">Mindig legyen látható az ikon az eszköztáron, ha az Orbot csatlakozott állapotú.</string>
   <string name="pref_use_persistent_notifications_title">Mindig bekapcsolt értesítések</string>
+  <string name="notification_using_bridges">Hidak engedélyezve!</string>
+  <string name="default_bridges"/>
+  <string name="set_locale_title">Hely beállítása</string>
+  <string name="set_locale_summary">Adja meg a helyi és nyelvi beállításokat</string>
+  <string name="wizard_locale_title">Válasszon nyelvet</string>
+  <string name="wizard_locale_msg">Maradjon alapértelmezetten vagy váltson az aktuális nyelvre</string>
+  <string name="powered_by">a Tor Project által gondozva</string>
+  <string name="btn_save_settings">Beállítások mentése</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 4e50aa2..72fe3ab 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -25,18 +25,19 @@
   <string name="menu_stop">Ferma</string>
   <string name="menu_about">About</string>
   <string name="menu_wizard">Wizard</string>
+  <string name="main_layout_download">Download (velocità /totale)</string>
+  <string name="main_layout_upload">Upload (velocità /totale)</string>
   <string name="button_help">Aiuto</string>
   <string name="button_close">Chiudi</string>
   <string name="button_about">About</string>
   <string name="button_clear_log">Cancella log</string>
   <string name="menu_verify">Controlla</string>
   <string name="menu_exit">Esci</string>
-  <string name="powered_by">powered by the Tor Project</string>
-  <string name="press_to_start">-pressione prolungata per avviare-</string>
+  <string name="press_to_start">- tieni premuto per avviare -</string>
   <string name="pref_trans_proxy_group">Proxying trasparente (Richiede root)</string>
   <string name="pref_trans_proxy_title">Proxying trasparente</string>
   <string name="pref_trans_proxy_summary">Torifying automatico delle app</string>
-  <string name="pref_transparent_all_title">Tor ovunqe</string>
+  <string name="pref_transparent_all_title">Tor ovunque</string>
   <string name="pref_transparent_all_summary">Traffico proxy di tutte le app attraverso Tor</string>
   <string name="pref_transparent_port_fallback_title">Fallback porte proxy</string>
   <string name="pref_transparent_port_fallback_summary">ATTENZIONE: Aggira le porte comuni (80, 443, ecc). *USARE SOLO* se le modalità \'All\' o \'App\' non funzionano.</string>
@@ -55,51 +56,65 @@
   <string name="btn_finish">Fine</string>
   <string name="btn_okay">Ok</string>
   <string name="btn_cancel">Annulla</string>
+  <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Alcuni dettagli su Orbot</string>
   <string name="wizard_details_msg">Orbot è un\' applicazione open-source che contiene Tor, LibEvent and Privoxy. Fornisce un proxy HTTP locale (8118) e un proxy SOCKS (9050) verso la rete Tor. Orbot ha anche la capacità , su dispositivi con root, di far passare tutto il traffico internet attraverso Tor.</string>
   <string name="wizard_permissions_root">Permesso concesso</string>
   <string name="wizard_permissions_stock">Permessi Orbot</string>
   <string name="wizard_premissions_msg_root">Eccellente! Abbiamo rilevato la presenza dei permessi di root attivati per Orbot. Useremo questi poteri con saggezza.</string>
   <string name="wizard_permissions_msg_stock">Anche se non è richiesto, Orbot può diventare uno strumento ancora più potente se il dispositivo ha accesso come root. Utilizza il pulsante qui sotto per concedere i superpoteri a Orbot!</string>
-  <string name="wizard_permissions_no_root">Se non hai i permessi root o non hai idea di cosa siano, tanto per essere sicuro di utilizzare le applicazioni fatte per lavorare con Orbot.</string>
+  <string name="wizard_permissions_no_root">Se non hai i permessi root o non hai idea di cosa siano, assicurati solamente di utilizzare applicazioni fatte per lavorare con Orbot.</string>
   <string name="wizard_permissions_consent">Ho capito e desidero continuare senza il root</string>
   <string name="wizard_permission_enable_root">Concedi permessi root a Orbot</string>
   <string name="wizard_configure">Configura Torification</string>
   <string name="wizard_configure_msg">Orbot dà la possibilità di instradare tutto il traffico delle applicazioni tramite Tor o scegliere le applicazioni singolarmente.</string>
   <string name="wizard_configure_all">Usa Tor come proxy per tutte le applicazioni.</string>
-  <string name="wizard_configure_select_apps">Seleziona singole app per Tor</string>
+  <string name="wizard_configure_select_apps">Seleziona singole App per Tor</string>
   <string name="wizard_tips_tricks">App abilitate per Orbot</string>
-  <string name="wizard_tips_msg">Ti invitiamo a scaricare &amp;amp; usare app che possono connettersi direttamente a Orbot. Fai click sui pulsanti qui sotto per installare.</string>
+  <string name="wizard_tips_msg">Ti invitiamo a scaricare &amp; usare app che possono connettersi direttamente a Orbot. Fai click sui pulsanti qui sotto per installare.</string>
   <string name="wizard_tips_otrchat">Gibberbot - Client sicuro di instant messaging per Android</string>
   <string name="wizard_tips_proxy">Impostazioni proxy - Ulteriori informazioni su come configurare le app per funzionare con Orbot</string>
+  <string name="wizard_tips_duckgo">App del motore di ricerca Duckduckgo</string>
+  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+  <string name="wizard_tips_firefox">Firefox con l\'add-on Proxy Mobile (richiete installazione addizionale)</string>
+  <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
+  <string name="wizard_tips_twitter">Twitter supporta il proxy http \"localhost:8118\"</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Impostazioni proxy</string>
-  <string name="wizard_proxy_help_msg">Se la versione di Android che stai utilizzando supporta l\'utilizzo di un proxy HTTP o SOCKS allora puoi utilizzarla per connetterti a Orbot e utilizzare Tor.\n\n
-L\'impostazione dell\' host è 127.0.0.1 o \"localhost\". La porta HTTP è 8118. Per i SOCKS, il proxy è 9050. Si dovrebbe utilizzare SOCKS4A o SOCKS5 se possibile.
-\n\n
-Ulteriori informazioni sul proxying per Android nelle FAQ all\' indirizzo: http://tinyurl.com/proxyandroid
-    </string>
+  <string name="wizard_proxy_help_msg">Se la versione di Android che stai utilizzando supporta l\'utilizzo di un proxy HTTP o SOCKS allora puoi utilizzarla per connetterti a Orbot e utilizzare Tor.\n\n\nL\'impostazione dell\' host è 127.0.0.1 o \"localhost\". La porta HTTP è 8118. Per i SOCKS, il proxy è 9050. Si dovrebbe utilizzare SOCKS4A o SOCKS5 se possibile.\n\n\n\nUlteriori informazioni sul proxying per Android nelle FAQ all\' indirizzo: http://tinyurl.com/proxyandroid\n    </string>
   <string name="wizard_final">Orbot è pronto!</string>
   <string name="wizard_final_msg">Centinaia di migliaia di persone nel mondo usano Tor per una varietà di motivi: giornalisti e bloggers, lavoratori per i diritti umani, ufficiali delle forze dell\'ordine, soldati, aziende, cittadini di paesi repressivi, e anche cittadini qualunque... e ora sei pronto a farlo anche tu!</string>
-  <string name="connect_first_time">Ti sei collegato correttamente alla rete Tor - ma questo NON significa che il dispositivo è sicuro. � possibile utilizzare l\'opzione \'Controlla\' dal menù per testare il browser. \n\n
-Visita il nostro sito web https://guardianproject.info/apps/orbot o invia una mail a help@xxxxxxxxxxxxxxxxxxxx per saperne di più.</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Ti sei collegato correttamente alla rete Tor - ma questo NON significa che il dispositivo è sicuro. � possibile utilizzare l\'opzione \'Controlla\' dal menù per testare il browser. \n\n\nVisita il nostro sito web https://guardianproject.info/apps/orbot o invia una mail a help@xxxxxxxxxxxxxxxxxxxx per saperne di più.</string>
   <string name="tor_check">Si aprirà il browser web predefinito per https://check.torproject.org per controllare se Orbot probabilmente è configurato e si è connessi a Tor.</string>
   <string name="pref_hs_group">Servizi nascosti</string>
   <string name="pref_general_group">Generale</string>
   <string name="pref_start_boot_title">Avvia Orbot al boot</string>
   <string name="pref_start_boot_summary">Avvia automaticamente Orbot e connetti Tor quando il dispositivo Android viene avviato</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
   <string name="wizard_title_msg">Orbot porta Tor su Android!\n\nTor ti aiuta a difenderti da filtraggio di contenuti, analisi del traffico e sorveglianza della rete che minacciano la privacy, informazioni personali e relazioni personali.\n\nQuesta procedura guidata ti aiuterà a configurare Orbot e Tor sul tuo dispositivo.</string>
+  <!--Warning screen-->
   <string name="wizard_warning_title">Attenzione</string>
   <string name="wizard_warning_msg">La semplice installazione di Orbot non renderà anonimo il tuo traffico di rete mobile.\n\nDevi configurare correttamente Orbot, il tuo dispositivo e le altre applicazioni per usare Tor.</string>
+  <!--Permissions screen-->
   <string name="wizard_permissions_title">Permessi</string>
   <string name="wizard_permissions_root_msg1">Opzionalmente, è possibile concedere ad Orbot l\'accesso da superutente per abilitare funzionalità avanzate come il proxying trasparente.</string>
   <string name="wizard_permissions_root_msg2">Se non si vuole intraprendere questa scelta, ci si assicuri di utilizzare applicazioni fatte per funzionare con Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Il vostro dispositivo non sembra essere rooted o fornire accesso da superutente.\n\nAl fine di beneficiare dell\'uso di Tor, sarà necessario utilizzare applicazioni costruite per funzionare con Orbot, o che supportino configurazioni proxy HTTP o SOCKS.\n\n
-</string>
+  <string name="wizard_permissions_no_root_msg">Il vostro dispositivo non sembra essere rooted o fornire accesso da superutente.\n\nAl fine di beneficiare dell\'uso di Tor, sarà necessario utilizzare applicazioni costruite per funzionare con Orbot, o che supportino configurazioni proxy HTTP o SOCKS.\n\n\n</string>
+  <!--TipsAndTricks screen-->
   <string name="wizard_tips_title">Orbot-App abilitate</string>
   <string name="wizard_tips_gibberbot">Gibberbot: un applicazione per chat sicura con crittografia Off-the-Record</string>
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
-  <string name="wizard_tips_orweb">ORWEB (Solo Android 1.x) - Browser progettato per la privacy e Orbot</string>
+  <string name="wizard_tips_orweb">Orweb - Browser progettato per la privacy e Orbot</string>
   <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <string name="wizard_tips_play">Cerca tutte le app del Guardian Project su 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">Proxying trasparente</string>
   <string name="wizard_transproxy_msg">Questo permette alle tue applicazioni di passare automaticamente attraverso la rete Tor senza necessità di ulteriore configurazione.</string>
   <string name="wizard_transproxy_hint">(Seleziona questa casella se non hai idea di quello di cui stiamo parlando)</string>
@@ -114,8 +129,9 @@ Visita il nostro sito web https://guardianproject.info/apps/orbot o invia una ma
   <string name="pref_entrance_node">Nodi di entrata</string>
   <string name="pref_entrance_node_summary">Identificativi, nicknames, paesi ed indirizzi del primo hop</string>
   <string name="pref_entrance_node_dialog">Inserisci nodi di entrata</string>
-  <string name="pref_use_whispercore">Usa WhisperCore</string>
-  <string name="pref_use_whispercore_summary">Utilizza le API proprietarie NetFilter fornite da WhisperSystems (è richiesto che sul dispositivo sia installato WhisperCore)</string>
+  <!--<string name="pref_use_whispercore">Use WhisperCore</string>
+<string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
+  <string name="pref_proxy_title">Proxy di rete in uscita</string>
   <string name="pref_proxy_type_title">Tipo proxy</string>
   <string name="pref_proxy_type_summary">Protocolli da utilizzare per i server proxy: HTTP, HTTPS, Socks4, Socks5</string>
   <string name="pref_proxy_type_dialog">Inserisci tipo proxy</string>
@@ -151,7 +167,9 @@ Visita il nostro sito web https://guardianproject.info/apps/orbot o invia una ma
   <string name="use_only_these_specified_nodes">Utilizza *solo* i nodi specificati</string>
   <string name="bridges">Ponti</string>
   <string name="use_bridges">Utilizza i bridge</string>
+  <string name="bridges_obfuscated">Bridge mascherati</string>
   <string name="enable_alternate_entrance_nodes_into_the_tor_network">Abilita nodi alternati in entrata nella rete Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Attiva se i Bridge configurati sono mascherati</string>
   <string name="ip_address_and_port_of_bridges">Indirizzo IP e porta dei bridge</string>
   <string name="enter_bridge_addresses">Inserire gli indirizzi dei bridge</string>
   <string name="relays">Relays</string>
@@ -195,4 +213,12 @@ Visita il nostro sito web https://guardianproject.info/apps/orbot o invia una ma
   <string name="error_installing_binares">Non è stato possibile installare o aggiornare i binari di Tor.</string>
   <string name="pref_use_persistent_notifications">Mantieni sempre l\'icona nella barra degli strumenti quando Orbot è connesso.</string>
   <string name="pref_use_persistent_notifications_title">Notifiche sempre attive</string>
+  <string name="notification_using_bridges">Bridge attivati!</string>
+  <string name="default_bridges"/>
+  <string name="set_locale_title">Configura le impostazioni internazionali.</string>
+  <string name="set_locale_summary">Scegli le impostazioni internazionali e la lingua di Orbot</string>
+  <string name="wizard_locale_title">Scegli Lingua</string>
+  <string name="wizard_locale_msg">Lasciare la predefinita o cambiare la lingua corrente</string>
+  <string name="powered_by">powered by the Tor Project</string>
+  <string name="btn_save_settings">Salva impostazioni</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 9b6d746..9ebb63f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -5,7 +5,7 @@
   <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="control_permission_label">Torã??èµ·å??ã?»å??æ­¢ã??ã??</string>
   <string name="tor_proxy_service_process">Torã??ã?­ã?¯ã?·ã?µã?¼ã??ã?¹</string>
   <string name="status_starting_up">Orbotã??é??å§?ã??ã??ã?¦ã??ã?¾ã??...</string>
   <string name="status_activated">Torã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã??ã?¦ã??ã?¾ã??</string>
@@ -13,184 +13,202 @@
   <string name="status_shutting_down">Orbotã??çµ?äº?ã??ã?¦ã??ã?¾ã??</string>
   <string name="tor_process_starting">Torã?¯ã?©ã?¤ã?¨ã?³ã??ã??é??å§?ã??ã?¦ã??ã?¾ã??...</string>
   <string name="tor_process_complete">��</string>
-  <string name="tor_process_waiting">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="tor_process_waiting">ã??å¾?ã?¡ã??ã? ã??ã??</string>
+  <string name="not_anonymous_yet">è­¦å??:ã??ã?®é??ä¿¡ã?¯ã?¾ã? å?¿å??å??ã??ã??ã?¦ã??ã?¾ã??ã??ï¼?ã??HTTP proxy 127.0.0.1:8118ã??ã??ã?? SOCKS4A ã?¾ã??ã?¯ SOCKS5 proxy 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">Apps</string>
+  <string name="menu_apps">ã?¢ã??ã?ª</string>
   <string name="menu_start">ã?¹ã?¿ã?¼ã??</string>
   <string name="menu_stop">å??æ­¢</string>
-  <string name="menu_about">About</string>
+  <string name="menu_about">æ??å ±</string>
   <string name="menu_wizard">ã?¦ã?£ã?¶ã?¼ã??</string>
   <string name="button_help">ã??ã?«ã??</string>
   <string name="button_close">é??ã??ã??</string>
   <string name="button_about">ã?«ã?¤ã??ã?¦</string>
   <string name="button_clear_log">ã?­ã?°ã??å??é?¤ã??ã??</string>
-  <string name="menu_verify">Check</string>
-  <string name="menu_exit">Exit</string>
-  <string name="powered_by">powered by the Tor Project</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="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_title">é??é??ã??ã?­ã?­ã?·</string>
+  <string name="pref_trans_proxy_summary">ã?¢ã??ã?ªã?®è?ªå??Torå??中</string>
+  <string name="pref_transparent_all_title">å?¨ã?¦ã??Torå??</string>
+  <string name="pref_transparent_all_summary">å?¨ã?¦ã?®ã?¢ã??ã?ªã??Torçµ?ç?±ã?§ä½¿ã??</string>
   <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
-  <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
-  <string name="pref_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_transparent_port_fallback_summary">è­¦å??:é??常ã?®ã??ã?¼ã??(80,443ç­?)ã??è¿?å??ã??ã??å?¨ã?¦ã??ã??ã??æ??å®?ã?¢ã??ã?ªã??ã?¢ã?¼ã??ã??å??ä½?ã??ã?ªã??å ´å??ã?«ã?®ã?¿ä½¿ç?¨ã??ã?¦ã??ã? ã??ã??ã??</string>
+  <string name="pref_transparent_port_title">ã??ã?¼ã??ä¸?覧</string>
+  <string name="pref_transparent_port_summary">ã??ã?­ã?­ã?·ã??é??ã??ã??ã?¼ã??ã??*è­¦å??*ã??ã??å?¨ã?¦ã??ã??ã??æ??å®?ã?¢ã??ã?ªã??ã??å??ä½?ã??ã?ªã??å ´å??ã?«ã?®ã?¿ä½¿ç?¨ã??ã?¦ã??ã? ã??ã??ã??</string>
+  <string name="pref_transparent_port_dialog">ã??ã?­ã?­ã?·ã?®ã??ã?¼ã??ç?ªå?·ã??å?¥å??</string>
   <string name="pref_has_root">ã?«ã?¼ã??ã?¢ã?¯ã?»ã?¹ã?®è¨±å?¯ã??è¦?æ±?ã??ã?¾ã??</string>
-  <string name="pref_has_root_summary">Request root access for transparent proxying</string>
+  <string name="pref_has_root_summary">é??é??ã??ã?­ã?­ã?·ã?®ã??ã??ã?«root権é??ã??å¿?è¦?ã?§ã??</string>
   <string name="status_install_success">Torã??ã?¤ã??ã?ªã?¤ã?³ã?¹ã??ã?¼ã?«ã??æ??å??ã??ã?¾ã??ã??</string>
   <string name="status_install_fail">Torã??ã?¤ã??ã?ªã??ã?¡ã?¤ã?«ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??ã?­ã?°ã??調ã?¹ã?¦ã??é??ç?¥ã??tor-assistants@xxxxxxxxxxxxxxã?«é??ä¿¡ã??ã?¦ã??ã? ã??ã??ã??</string>
-  <string name="title_error">Application Error</string>
+  <string name="title_error">ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã?¨ã?©ã?¼</string>
   <string name="wizard_title">Orbot</string>
   <string name="wizard_btn_tell_me_more">Orbotã?«ã?¤ã??ã?¦</string>
   <string name="btn_next">次</string>
-  <string name="btn_back">Back</string>
+  <string name="btn_back">æ?»ã??</string>
   <string name="btn_finish">��</string>
-  <string name="btn_okay">Okay</string>
+  <string name="btn_okay">OK</string>
   <string name="btn_cancel">�����</string>
+  <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Orbot詳細</string>
-  <string name="wizard_details_msg">Orbot 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_details_msg">Orbot ã?¯Torã??LibEvent ã??Privoxyã??å?«ã??ã?ªã?¼ã??ã?³ã?½ã?¼ã?¹ã?¢ã??ã?ªã?§ã??ã?? local HTTP proxy (8118) ã?¨ SOCKS proxy (9050) ã??Toræ?¥ç¶?ã??ã?¾ã??ã??rootå??ã??ã??ã??端æ?«ã?§ã?¯Orbotã?¯å?¨ã?¦ã?®é??ä¿¡ã??Torã??é??ã??ã?¦è¡?ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??</string>
+  <string name="wizard_permissions_root">権é??ã??å??å¾?å®?äº?</string>
+  <string name="wizard_permissions_stock">Orbotã?®æ¨©é??</string>
+  <string name="wizard_premissions_msg_root">Orbotã??root権é??ã??å??å¾?ã??ã??ã??ã?¨ã??確èª?ã??ã?¾ã??ã??ã??å?¨ã?¦ã?®æ©?è?½ã??å?©ç?¨ã?§ã??ã?¾ã??ã??</string>
+  <string name="wizard_permissions_msg_stock">Orbotã?¯rootå??ã??ã??ã??端æ?«ã?§ã?¯å?¨ã?¦ã?®æ©?è?½ã??æ´»ç?¨ã?§ã??ã?¾ã??ã??ä¸?ã?®ã??ã?¿ã?³ã??æ?¼ã??ã?¦Orbotã?«ç®¡ç??è??権é??ã??ä¸?ã??ã?¦ã??ã? ã??ã??ã??</string>
+  <string name="wizard_permissions_no_root">rootå??ã??ã?¦ã??ã?ªã??ã?£ã??ã??ã??ã??ã??ã??ã??rootå??ã??ä½?ã?®ã??ã?¨ã? ã??ã??ã??ã??ã?ªã??æ?¹ã?¯ã??Orbotä¸?ã?§å??ä½?確èª?ã??å??ã??ã?¦ã??ã??ã?¢ã??ã?ªã? ã??ã??使ç?¨ã??ã?¦ã??ã? ã??ã??ã??</string>
+  <string name="wizard_permissions_consent">Superuserã??å?©ç?¨ã??ã??ã?«ç¶?è¡?</string>
+  <string name="wizard_permission_enable_root">Orbotã?«root権é??ã??ä¸?ã??ã??</string>
   <string name="wizard_configure">Torã??ã?½ã??ã??ã?¦ã?§ã?¢ã?«ä½¿ç?¨ã??ã??設å®?</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_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ã??ã??ã??å??ã??ã??ã?®ã??æ?¢ã??ã?¾ã??ã??</string>
+  <string name="wizard_tips_otrchat">Gibberbot - å®?å?¨ã?ªã?¤ã?³ã?¹ã?¿ã?³ã??ã?¡ã??ã?»ã?¼ã?¸ã?¢ã??ã?ª</string>
+  <string name="wizard_tips_proxy">Proxy Settings - Orbotã?§ã?¢ã??ã?ªã??å??ã??ã??ã??ã??ã?®æ??é ?æ?¸</string>
   <string name="wizard_proxy_help_info">ã??ã?­ã?­ã?·è¨­å®?</string>
-  <string name="wizard_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
-    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
-    You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid
-    </string>
-  <string name="wizard_final">Orbot is ready!</string>
-  <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string>
-  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help@xxxxxxxxxxxxxxxxxxxx to learn more.</string>
-  <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string>
+  <string name="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>
+  <string name="wizard_final_msg">ä¸?ç??中ã?§æ?°å??ä¸?人ã??æ§?ã??ã?ªç??ç?±ã?§Torã??å?©ç?¨ã??ã?¦ã??ã?¾ã??ã??\n\nã?¸ã?£ã?¼ã??ã?ªã?¹ã??ã??ã??ã?­ã?¬ã?¼ã??人権å?£ä½?ã??æ³?ç??æ©?é?¢ã??è»?é??ã??ä¼?業ã??ç?¬è£?å?½å®¶ã?®å¸?æ°?ã??æ?®é??ã?®å?½ã?®å°?å¸?æ°?ã??ã??ã??ã??ã??ã??ã?¦ã??ã?ªã??ã??ï¼?</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Torã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?æ??å?? - ã??ã??ã??ã??ã?ªã??ã?®ã??ã??ã?¤ã?¹ã??å®?å?¨ã? ã?¨ã?¯é??ã??ã?¾ã??ã??ã??ã?¡ã??ã?¥ã?¼ã?®ã??ã??ã?§ã??ã?¯ã??ã?ªã??ã?·ã?§ã?³ã??é?¸æ??ã??ã?¦ã??ã?ªã??ã?®ã??ã?©ã?¦ã?¶ã?®ã??ã?¹ã??ã??ã?§ã??ã?¾ã??ã?? \n\nç??å??ã??ã??ã??å ´å??ã?¯https://guardianproject.info/apps/orbot ã??é?²è¦§ã??ã??ã??ã??help@xxxxxxxxxxxxxxxxxxxxã?«å??ã??å??ã??ã??ã?¡ã?¼ã?«ã??è?±èª?ã?§é??ä¿¡ã??ã?¦ã??ã? ã??ã??ã??</string>
+  <string name="tor_check">ã??ã?©ã?¦ã?¶ã??é??ã??ã?¦https://check.torproject.org ã?«Toræ?¥ç¶?ã??ã??Orbotã?®è¨­å®?ã??æ??å??ã??ã??ã??ã??試ã??ã?¾ã??ã??</string>
   <string name="pref_hs_group">Hidden Services</string>
-  <string name="pref_general_group">General</string>
+  <string name="pref_general_group">��</string>
   <string name="pref_start_boot_title">èµ·å??æ??ã?«Orbotã??å®?è¡?ã??ã??</string>
-  <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
-  <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>
+  <string name="pref_start_boot_summary">Android端æ?«ã?®èµ·å??æ??ã?«Orbotã??è?ªå??å®?è¡?</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Androidã?§ã??Orbotã?§Torã??使ã??ã?¾ã??!\n\nã??ã?£ã?«ã?¿ã?ªã?³ã?°ã??é??ä¿¡ã?®æ¤?é?²ã??ã??å??人æ??å ±ç­?ã??å®?ã??ã??ã??ã?«Torã?¯ä½¿ã??ã??ã?¦ã??ã?¾ã??ã??\n\nã??ã?®ã?¦ã?£ã?¶ã?¼ã??ã?§ã?¯Orbotã?¨Torã?®è¨­å®?ã??ã?§ã??ã?¾ã??ã??</string>
+  <!--Warning screen-->
   <string name="wizard_warning_title">注æ??</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_msg">Orbotã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã??ã? ã??ã?§ã?¯é??ä¿¡ã?¯å?¿å??å??ã??ã??ã?¾ã??ã??ã??\n\nOrbotã??Android端æ?«ã??ã?¢ã??ã?ªã?®å?¨ã?¦ã??æ­£ã??ã??設å®?ã??ã?ªã??ã?¨Torã?¯ä½¿ã??ã?¾ã??ã??ã??</string>
+  <!--Permissions screen-->
   <string name="wizard_permissions_title">許�</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>
-  <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="wizard_permissions_root_msg1">ã?ªã??ã?·ã?§ã?³ã?¨ã??ã?¦Orbotã?«ã?¹ã?¼ã??ã?¼ã?¦ã?¼ã?¶ã?¼æ¨©é??ã??ä¸?ã??ã??ã??ã?¨ã?§é??é??ã??ã?­ã?­ã?·ã?ªã?©ã?®è¿½å? æ©?è?½ã??使ã??ã?¾ã??ã??</string>
+  <string name="wizard_permissions_root_msg2">ã??ã??ã??å®?è¡?ã??ã?ªã??å ´å??ã??Orbotç?¨ã?«ä½?ã??ã??ã??ã?¢ã??ã?ªã? ã??ã??使ã?£ã?¦ã??ã? ã??ã??ã??</string>
+  <string name="wizard_permissions_no_root_msg">ã??ã?ªã??ã?®ç«¯æ?«ã?¯rootå??ã??ã??ã?¦ã??ã?ªã??ã??ã??ã?§ã??ã??\n\nTorã?§é??ä¿¡ã??ã??ã??å ´å??ã??Orbotç?¨ã?®ã?¢ã??ã?ªã??使ã??ã??ã??HTTPã?¾ã??ã?¯SOCKSã??ã?­ã?¯ã?·ã??設å®?ã?§ã??ã??ã?¢ã??ã?ªã??使ã??å¿?è¦?ã??ã??ã??ã?¾ã??ã??\n\n</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbotã??æ??å?¹å??ã??ã??ã??ã?¢ã??ã?ª</string>
+  <string name="wizard_tips_gibberbot">Gibberbot:ã??å®?å?¨ã?ªã??ã?£ã??ã??ã?¢ã??ã?ª</string>
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
-  <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</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_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="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">é??é??ã??ã?­ã?­ã?·</string>
+  <string name="wizard_transproxy_msg">ã??ã??ã?¯ã??ã?ªã??ã?®ã?¢ã??ã?ªã??è?ªå??ç??ã?«Torçµ?ç?±ã?§é??ä¿¡ã??ã??ã?¾ã??ã??</string>
+  <string name="wizard_transproxy_hint">(ä½?ã??è¨?ã?£ã?¦ã??ã??ã?®ã??ã??ã??ã??ã?ªã??ã?¨ã??ã?¯ã??ã??ã??ã??ã?§ã??ã?¯ã??ã?¦ã??ã? ã??ã??)</string>
+  <string name="wizard_transproxy_none">ç?¡ã??</string>
+  <string name="pref_transparent_tethering_title">Torã??ã?¶ã?ªã?³ã?°</string>
+  <string name="pref_transparent_tethering_summary">Toré??é??ã??ã?­ã?¯ã?·ã??Wifiã??USBã??ã?¶ã?ªã?³ã?°ã??ã??ã??ã??ã??ã?¤ã?¹ã?«å¯¾ã??ã?¦æ??å?¹å??(å??èµ·å??ã??å¿?è¦?)</string>
   <string name="button_grant_superuser">管ç??許å?¯ã?¢ã?¯ã?»ã?¹ã??è¦?æ±?ã??ã?¾ã??</string>
   <string name="pref_select_apps">ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã??é?¸æ??ã??ã?¾ã??</string>
-  <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string>
+  <string name="pref_select_apps_summary">Torã??çµ?ç?±ã??ã??ã??ã?¢ã??ã?ªã??é?¸æ??</string>
   <string name="pref_node_configuration">ã??ã?¼ã??設å®?</string>
   <string name="pref_node_configuration_summary">ã??注æ??ã??å??é?²è¨­å®?ã??å?¿å??ã?¬ã??ã?«ã??縮å°?ã??ã?¾ã??</string>
-  <string name="pref_entrance_node">Entrance Nodes</string>
-  <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string>
-  <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string>
-  <string name="pref_use_whispercore">Use WhisperCore</string>
-  <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>
-  <string name="pref_proxy_type_title">Proxy Type</string>
-  <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Enter Proxy Type</string>
-  <string name="pref_proxy_host_title">Proxy Host</string>
-  <string name="pref_proxy_host_summary">Proxy server hostname</string>
-  <string name="pref_proxy_host_dialog">Enter Proxy Host</string>
-  <string name="pref_proxy_port_title">Proxy Port</string>
-  <string name="pref_proxy_port_summary">Proxy server port</string>
-  <string name="pref_proxy_port_dialog">Enter Proxy port</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying...</string>
-  <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string>
-  <string name="transproxy_rules_cleared">TransProxy rules cleared</string>
-  <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string>
-  <string name="privoxy_is_running_on_port_">Privoxy is running on port: </string>
-  <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string>
-  <string name="bridge_error">Bridge Error</string>
-  <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string>
-  <string name="send_email_for_bridges">Send an email to bridges@xxxxxxxxxxxxxx with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string>
-  <string name="error">Error</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string>
-  <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string>
-  <string name="exit_nodes">Exit Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string>
-  <string name="enter_exit_nodes">Enter Exit Nodes</string>
-  <string name="exclude_nodes">Exclude Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string>
-  <string name="enter_exclude_nodes">Enter Exclude Nodes</string>
-  <string name="strict_nodes">Strict Nodes</string>
-  <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string>
-  <string name="bridges">Bridges</string>
-  <string name="use_bridges">Use Bridges</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</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="pref_entrance_node">å?¥ã??å?£ã??ã?¼ã??</string>
+  <string name="pref_entrance_node_summary">æ??å??ã?®ã??ã??ã??ã?®ã??ã??ã?®ã??ã?¸ã?¿ã?«æ??ç´?ã??ã??ã??ã?¯ã??ã?¼ã? ã??å?½ã?¨IPã?¢ã??ã?¬ã?¹</string>
+  <string name="pref_entrance_node_dialog">å?¥ã??å?£ã??ã?¼ã??ã??å?¥å??</string>
+  <!--<string name="pref_use_whispercore">Use WhisperCore</string>
+<string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
+  <string name="pref_proxy_title">å¤?æ?¹å??ã??ã??ã??ã?¯ã?¼ã?¯ã??ã?­ã?­ã?·</string>
+  <string name="pref_proxy_type_title">å¤?æ?¹å??ã??ã?­ã?­ã?·ã?®ç¨®é¡?</string>
+  <string name="pref_proxy_type_summary">HTTP,HTTPS,Socks4,Socks5ã?§ä½¿ç?¨ã??ã??ã??ã?­ã??ã?³ã?«</string>
+  <string name="pref_proxy_type_dialog">ã??ã?­ã?­ã?·ã?®ç¨®é¡?ã??å?¥å??ã??ã?¦ã??ã? ã??ã??</string>
+  <string name="pref_proxy_host_title">å¤?æ?¹å??ã??ã?­ã?­ã?·ã?®ã??ã?¹ã??</string>
+  <string name="pref_proxy_host_summary">ã??ã?­ã?­ã?·ã?µã?¼ã??ã?®ã??ã?¹ã??å??</string>
+  <string name="pref_proxy_host_dialog">ã??ã?­ã?¯ã?·ã??ã??ã?¹ã??ã??å?¥å??</string>
+  <string name="pref_proxy_port_title">å¤?æ?¹å??ã??ã?­ã?­ã?·ã?®ã??ã?¼ã??</string>
+  <string name="pref_proxy_port_summary">ã??ã?­ã?­ã?·ã?µã?¼ã??ã??ã??ã?¼ã??</string>
+  <string name="pref_proxy_port_dialog">ã??ã?­ã?­ã?·ã?®ã??ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??</string>
+  <string name="status">ç?¶æ??</string>
+  <string name="setting_up_full_transparent_proxying_">å®?å?¨ã?ªé??é??ã??ã?­ã?­ã?·ã??ã?»ã??ã??ã?¢ã??ã??中...</string>
+  <string name="setting_up_app_based_transparent_proxying_">ã?¢ã??ã?ªã??ã?¼ã?¹ã?®é??é??ã??ã?­ã?­ã?·ã??ã?»ã??ã??ã?¢ã??ã??中...</string>
+  <string name="transparent_proxying_enabled">é??é??ã??ã?­ã?­ã?·ã??æ??å?¹</string>
+  <string name="transproxy_enabled_for_tethering_">ã??ã?¶ã?ªã?³ã?°ã?§ã?®é??é??ã??ã?­ã?­ã?·æ??å?¹</string>
+  <string name="warning_error_starting_transparent_proxying_">è­¦å??: é??é??ã??ã?­ã?­ã?·ã?®é??å§?æ??ã?«ã?¨ã?©ã?¼ç?ºç??</string>
+  <string name="transproxy_rules_cleared">é??é??ã??ã?­ã?­ã?·ã??ã?«ã?¼ã?«ã??æ¶?å?»å®?äº?</string>
+  <string name="couldn_t_start_tor_process_">Torã??ã?­ã?»ã?¹ã?®èµ·å??ã?«å¤±æ??:</string>
+  <string name="privoxy_is_running_on_port_">Privoxyã??å®?è¡?中ã?®ã??ã?¼ã??:</string>
+  <string name="setting_up_port_based_transparent_proxying_">ã??ã?¼ã??ã??ã?¼ã?¹ã?®é??é??ã??ã?­ã?­ã?·ã??ã?»ã??ã??ã?¢ã??ã??中...</string>
+  <string name="bridge_error">ã??ã?ªã??ã?¸ã??ã?¨ã?©ã?¼</string>
+  <string name="bridge_requires_ip">ã??ã?ªã??ã?¸æ©?è?½ã??å?©ç?¨ã??ã??ã?«ã?¯ã??æ??ä½?ä¸?ã?¤ã?®ã??ã?ªã??ã?¸IPã?¢ã??ã?¬ã?¹ã?®å?¥å??ã??å¿?è¦?ã?§ã??ã??</string>
+  <string name="send_email_for_bridges">gmailã??使ã?£ã?¦ã??æ?¬æ??ã?«ã??get bridgesã??ã?¨æ?¸ã??ã??ã?¡ã?¼ã?«ã??bridges@xxxxxxxxxxxxxxã?«é??ä¿¡ã??ã?¦ã??ã? ã??ã??ã??</string>
+  <string name="error">���</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">ã??ã?ªã??ã?®ReachableAddresses設å®?ã?«ã??ã??ä¾?å¤?ã??ç?ºç??ã??ã?¾ã??ã??!</string>
+  <string name="your_relay_settings_caused_an_exception_">ã??ã?ªã??ã?®ã?ªã?¬ã?¼è¨­å®?ã?«ã??ã??ä¾?å¤?ã??ç?ºç??ã??ã?¾ã??ã??!</string>
+  <string name="exit_nodes">å?ºå?£ã??ã?¼ã??</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">æ??å¾?ã?®ã??ã??ã??ã?®ã??ã??ã?®ã??ã?¸ã?¿ã?«æ??ç´?ã??ã??ã??ã?¯ã??ã?¼ã? ã??å?½ã?¨IPã?¢ã??ã?¬ã?¹</string>
+  <string name="enter_exit_nodes">å?ºå?£ã??ã?¼ã??ã??å?¥å??</string>
+  <string name="exclude_nodes">é?¤å¤?ã??ã?¼ã??</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">é?¤å¤?ã??ã??ã??ã?¸ã?¿ã?«æ??ç´?ã??ã??ã??ã?¯ã??ã?¼ã? ã??å?½ã?¨IPã?¢ã??ã?¬ã?¹</string>
+  <string name="enter_exclude_nodes">é?¤å¤?ã??ã?¼ã??ã??å?¥å??</string>
+  <string name="strict_nodes">Strictã??ã?¼ã??</string>
+  <string name="use_only_these_specified_nodes">ã??ã??ã?«æ??å®?ã??ã??ã??ã?¼ã??ã?®ã?¿ã??使ç?¨</string>
+  <string name="bridges">ã??ã?ªã??ã?¸</string>
+  <string name="use_bridges">ã??ã?ªã??ã?¸ã??使ã??</string>
+  <string name="bridges_obfuscated">Obfuså??ã??ã??ã??ã??ã?ªã??ã?¸</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">代æ?¿å?¥ã??å?£ã??ã?¼ã??ã??æ??å?¹å??</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">設å®?ã??ã??ã??ã?ªã??ã?¸ã??Obfuså??ã??ã??ã??ã??ã?ªã??ã?¸ã?§ã??ã??ã?°æ??å?¹</string>
+  <string name="ip_address_and_port_of_bridges">ã??ã?ªã??ã?¸ã?®IPã?¢ã??ã?¬ã?¹ã?¨ã??ã?¼ã??</string>
+  <string name="enter_bridge_addresses">ã??ã?ªã??ã?¸ã?®ã?¢ã??ã?¬ã?¹ã??å?¥å??</string>
+  <string name="relays">���</string>
+  <string name="relaying">���中</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">ã??ã?®ç«¯æ?«ã??é??å?ºå?£ã?ªã?¬ã?¼ã?«ã??ã??</string>
+  <string name="relay_port">ã?ªã?¬ã?¼ã??ã??ã?¼ã??</string>
+  <string name="listening_port_for_your_tor_relay">ã??ã?®Torã?ªã?¬ã?¼ã?®ã?ªã?¹ã??ã?³ã?°ã??ã?¼ã??</string>
+  <string name="enter_or_port">ORã??ã?¼ã??ã??å?¥å??</string>
+  <string name="relay_nickname">ã?ªã?¬ã?¼ã?®ã??ã??ã?¯ã??ã?¼ã? </string>
+  <string name="the_nickname_for_your_tor_relay">ã??ã?®Torã?ªã?¬ã?¼ã?®ã??ã??ã?¯ã??ã?¼ã? </string>
+  <string name="enter_a_custom_relay_nickname">ã?ªã?¬ã?¼ã?®ã?«ã?¹ã?¿ã? ã??ã??ã?¯ã??ã?¼ã? ã??å?¥å??</string>
+  <string name="reachable_addresses">å?°é??å?¯è?½ã?¢ã??ã?¬ã?¹</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">å?¶é??設å®?ã?®ã??ã?¡ã?¤ã?¢ã?¦ã?©ã?¼ã?«ã??é??ã??ã?¦ã?¯ã?©ã?¤ã?¢ã?³ã??ã?¨ã??ã?¦å®?è¡?</string>
+  <string name="reachable_ports">å?°é??å?¯è?½ã??ã?¼ã??</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">å?¶é??設å®?ã?®ã??ã?¡ã?¤ã?¢ã?¦ã?©ã?¼ã?«ã??é??ã??ã?¦å?°é??å?¯è?½ã?ªã??ã?¼ã??</string>
+  <string name="enter_ports">ã??ã?¼ã??ã??å?¥å??</string>
+  <string name="enable_hidden_services">Hidden Serviceã?®ã??ã?¹ã??ã?£ã?³ã?°</string>
+  <string name="run_servers_accessible_via_the_tor_network">ã??ã??ã?¤ã?¹ä¸?ã?®ã?µã?¼ã??ã?¼ã??Torçµ?ç?±ã?§ã?¢ã?¯ã?»ã?¹å?¯è?½ã?«ã??ã??</string>
+  <string name="enter_localhost_ports_for_hidden_services">Hidden Serviceç?¨ã?®localhostã?®ã??ã?¼ã??ã??å?¥å??</string>
+  <string name="hidden_service_ports">Hidden Serviceã?®ã??ã?¼ã??</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">ã??ã?ªã??ã?®Hidden Serviceã?®ã?¢ã??ã?¬ã?¹(è?ªå??ç??æ??ã??ã??ã?¾ã??)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">ã??ã??ã??ã?°ã?­ã?°ã?®å?ºå??ã??æ??å?¹å??(é?²è¦§ã?«ã?¯adbã??aLogCatã??å¿?è¦?)</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">The Tor License</string>
+  <string name="the_tor_license">Tor ã?©ã?¤ã?»ã?³ã?¹æ??æ?¸</string>
   <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3rd-Party-Software: </string>
+  <string name="third_party_software">第ä¸?è??製ã?®ã?½ã??ã??ã?¦ã?§ã?¢</string>
   <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>
   <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
   <string name="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="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string>
+  <string name="hidden_service_request">ã?¢ã??ã?ªã??hidden serverã?® port %Sã??ã??Torã??ã??ã??ã?¯ã?¼ã?¯ã?«é??æ?¾ã??ã??ã??ã?¨ã??ã?¦ã??ã?¾ã??ã??ä¿¡é ¼ã?§ã??ã??ã?¢ã??ã?ªã?§ã??ã??ã?°ã??ã??ã?¯å®?å?¨ã?§ã??ã??</string>
+  <string name="found_existing_tor_process">Torã??ã?­ã?»ã?¹ã??ç?ºè¦?</string>
+  <string name="something_bad_happened">ä½?ã??ã??èµ·ã??ã??ã?¾ã??ã??ã??ã?­ã?°ã??確èª?ã??ã?¦ã??ã? ã??ã??ã??</string>
+  <string name="hidden_service_on">hidden service æ??å?¹:</string>
+  <string name="unable_to_read_hidden_service_name">hidden serviceã?®å??å??読込ä¸?è?½</string>
   <string name="unable_to_start_tor">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="pref_use_sys_iptables_title">ã??ã??ã?©ã?«ã??ã?®lptablesã??使ã??</string>
+  <string name="pref_use_sys_iptables_summary">Orbotã??ã?³ã??ã?«ç??ã?§ã?¯ã?ªã??å??è?µã?®iptablesã??使ã??</string>
+  <string name="error_installing_binares">Torã??ã?¤ã??ã?ªã?®ã?¤ã?³ã?¹ã??ã?¼ã?«ã?¾ã??ã?¯ã?¢ã??ã??ã?°ã?¬ã?¼ã??ã?¯ä¸?å?¯è?½ã?§ã??ã??ã??</string>
+  <string name="pref_use_persistent_notifications">Orbotã??æ?¥ç¶?中ã?¯ã?¢ã?¤ã?³ã?³ã??常ã?«ã??ã?¼ã?«ã??ã?¼ã?«è¡¨ç¤º</string>
+  <string name="pref_use_persistent_notifications_title">é??ç?¥ã??常ã?«æ??å?¹å??</string>
+  <string name="notification_using_bridges">ã??ã?ªã??ã?¸ã??æ??å?¹ã?§ã??ï¼?</string>
+  <string name="default_bridges"/>
+  <string name="set_locale_title">å?°å??ã??é?¸æ??</string>
+  <string name="set_locale_summary">Orbotã?®å?°å??ã?¨è¨?èª?ã??é?¸æ??</string>
+  <string name="wizard_locale_title">è¨?èª?ã??é?¸æ??</string>
+  <string name="wizard_locale_msg">ä»?ã?®è¨?èª?ã??å¤?æ?´ã??ã??ã??ã??ã??ã?®ã?¾ã?¾ã?«ã??ã??</string>
+  <string name="powered_by">powered by the Tor Project</string>
+  <string name="btn_save_settings">設å®?ã??ä¿?å­?</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 144db09..c39f433 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -5,192 +5,129 @@
   <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="powered_by">powered by the Tor Project</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="control_permission_label">í? 르 ì??ì?? ë°? ì¤?ì§?</string>
+  <string name="tor_proxy_service_process">í? 르 í??ë¡?ì?? ì??ë¹?ì?¤</string>
+  <string name="status_starting_up">Orbotì?´ ì??ì??ì¤?...</string>
+  <string name="status_activated">Tor ë?¤í?¸ì??í?¬ì?? ì?°ê²°ë?¨</string>
+  <string name="status_disabled">\"Orbotê°? ë¹?í??ì?±í??ë??ì?´ ì??ì?µë??ë?¤</string>
+  <string name="status_shutting_down">Orbot를 ì¢?ë£?í?©ë??ë?¤</string>
+  <string name="tor_process_starting">Tor í?´ë?¼ì?´ì?¸í?¸ ì??ì??ì¤?...</string>
+  <string name="tor_process_complete">ì??ë£?.</string>
+  <string name="tor_process_waiting">ë??기.</string>
+  <string name="not_anonymous_yet">ê²½ê³ : ê·?í??ì?? í?¸ë??í?½ì?´ ì??ì§? ì?µëª?ì?´ ì??ë??ë??ë?¤! HTTP í??ë¡?ì?? 127.0.0.1:8118 ë??ë?? SOCKS4A ë??ë?? SOCKS5 í??ë¡?ì?? 127.0.0.1:9050ì?? ì?¬ì?©í??ì?¬ ì??ì?© í??ë¡?ê·¸ë?¨ì?? 구ì?±í??ì?­ì??ì?¤</string>
+  <string name="menu_home">í??</string>
+  <string name="menu_browse">í??ì??</string>
+  <string name="menu_settings">ì?¤ì ?</string>
+  <string name="menu_log">ë¡?ê·¸</string>
+  <string name="menu_info">ë??ì??ë§?</string>
+  <string name="menu_apps">ì??ì?© í??ë¡?ê·¸ë?¨</string>
+  <string name="menu_start">ì??ì??</string>
+  <string name="menu_stop">��</string>
+  <string name="menu_about">ì ?ë³´</string>
+  <string name="menu_wizard">���</string>
+  <string name="button_help">ë??ì??ë§?</string>
+  <string name="button_close">�기</string>
+  <string name="button_about">ì ?ë³´</string>
+  <string name="button_clear_log">�그 ��기</string>
+  <string name="menu_verify">í??ì?¸</string>
+  <string name="menu_exit">��</string>
+  <string name="press_to_start">- ì??ì??í??ë ¤ë©´ ì?¤ë?? ë??르기 -</string>
+  <string name="pref_trans_proxy_group">í?¬ëª?í?? í??ë¡?ì?? (루í?¸ í??ì??)</string>
+  <string name="pref_trans_proxy_title">í?¬ëª?í?? í??ë¡?ì??</string>
+  <string name="pref_trans_proxy_summary">ì?±ì?? ì??ë?? Torifying</string>
+  <string name="pref_transparent_all_title">í? 르ì?? 모ë?  ê²?</string>
+  <string name="pref_transparent_all_summary">í? 르를 í?µí?? 모ë?  ì??ì?© í??ë¡?ê·¸ë?¨ì?? ë??í?? í??ë¡?ì?? í?¸ë??í?½</string>
+  <string name="pref_transparent_port_fallback_title">í?¬í?¸ í??ë¡?ì?? ë??ì²´</string>
+  <string name="pref_transparent_port_title">�� 목�</string>
+  <string name="pref_has_root">루í?¸ ê¶?í??ì?? ë??í?? ì ?ê·¼ í??ì??</string>
+  <string name="pref_has_root_summary">ëª?ë°±í?? í??ë¡?ì??를 ì??í?´ 루í?¸ ê¶?í?? ì??구</string>
+  <string name="status_install_success">Tor ë°?ì?´ë??리ê°? ì?±ê³µì ?ì?¼ë¡? ì?¤ì¹?ë?¨!</string>
+  <string name="status_install_fail">Tor ë°?ì?´ë??리 í??ì?¼ì?´ ì?¤ì¹?ë?  ì?? ì??ì?µë??ë?¤. Log를 í??ì?¸í?´ 주ì??ê³  tor-assistants@xxxxxxxxxxxxxx ì?? ì??ë ¤ 주ì?­ì??ì?¤.</string>
+  <string name="title_error">ì? í??리ì¼?ì?´ì?? ì?¤ë¥?</string>
   <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">About Orbot</string>
-  <string name="btn_next">Next</string>
-  <string name="btn_back">Back</string>
-  <string name="btn_finish">Finish</string>
-  <string name="btn_okay">Okay</string>
-  <string name="btn_cancel">Cancel</string>
-  <string name="wizard_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
-    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
-    You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid
-    </string>
-  <string name="wizard_final">Orbot is ready!</string>
-  <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string>
-  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help@xxxxxxxxxxxxxxxxxxxx to learn more.</string>
-  <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string>
-  <string name="pref_hs_group">Hidden Services</string>
-  <string name="pref_general_group">General</string>
-  <string name="pref_start_boot_title">Start Orbot on Boot</string>
-  <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
-  <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>
-  <string name="wizard_warning_title">Warning</string>
-  <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>
-  <string name="wizard_permissions_title">Permissions</string>
-  <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string>
-  <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Your device 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>
-  <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="wizard_btn_tell_me_more">Orbot ì ?ë³´</string>
+  <string name="btn_next">ë?¤ì??</string>
+  <string name="btn_back">��</string>
+  <string name="btn_finish">�침</string>
+  <string name="btn_okay">í??ì?¸</string>
+  <string name="btn_cancel">ì·¨ì??</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_permissions_root">ì?¬ì?© ê¶?í?? ë¶?ì?¬</string>
+  <string name="wizard_permissions_stock">Orbot ì?¬ì?© ê¶?í??</string>
+  <string name="wizard_premissions_msg_root">ì??ë²½í?©ë??ë?¤! Orbotì?? ì??í?´ 루í?¸ ê¶?í??ì?´ í??ì?±í??ë??ê²?ì?? ê°?ì§?í??ì?µë??ë?¤. ì?°ë¦¬ë?? ì?´ í??ì?? í??ëª?í??ê²? ì?¬ì?©í?  ê²?ì??ë??ë?¤.</string>
+  <string name="wizard_permissions_no_root">루í?¸ ê¶?í??ì?? ê°?ì§?ê³  ì??ì§? ì??ê±°ë?? ì?´ê²?ì?´ 무ì??ì?? ë§?í??ì??ë??ì§? ëª¨ë¥´ê² ë?¤ë©´, Orbotì?¼ë¡? ë§?ë?¤ì?´ì§? ì? í??리ì¼?ì?´ì??ë§?ì?? ì?¬ì?©í??ì?­ì??ì?¤.</string>
+  <string name="wizard_permissions_consent">ì?´í?´í??ì??ê³ , ì??í?¼ì? ì ? ê¶?í?? ì??ì?´ ê³?ì??í?©ë??ë?¤.</string>
+  <string name="wizard_permission_enable_root">Orbotì?? ì??í?? 루í?¸ í??ê°?</string>
+  <string name="wizard_configure">Torification ì?¤ì ?</string>
+  <string name="wizard_configure_msg">Orbotì?? 모ë?  ì? í??리ì¼?ì?´ì?? ë??ë?? ì? í??ë?? ì? í??리ì¼?ì?´ì??ì?? Tor를 í?µí?´ í?µì? í??ë??ë¡? í?  ì?? ì??ì?µë??ë?¤.</string>
+  <string name="wizard_configure_all">모ë?  Appì?´ Tor를 ì?¬ì?©í??기</string>
+  <string name="wizard_configure_select_apps">Tor를 ì??í?´ ê°?ê°?ì?? ì?± ì? í??</string>
+  <string name="wizard_tips_tricks">Orbotì?´ í??ì?±í??ë?? ì?±</string>
+  <string name="wizard_tips_otrchat">Gibberbot - ì??ë??ë¡?ì?´ë??를 ì??í?? ë³´ì?? ì?¸ì?¤í?´í?¸ ë©?ì??ì§? í?´ë?¼ì?´ì?¸í?¸</string>
+  <string name="wizard_tips_proxy">Proxy Settings - Orbotì?´ ì??ë??í??ë??ë¡? ì?±ì?? ì?¤ì ?í??ë?? ë°©ë²?ì?? ë°°ì?°ê¸°</string>
+  <string name="wizard_proxy_help_info">í??ë¡?ì?? ì?¤ì ?</string>
+  <string name="wizard_final">Orbot� ���!</string>
+  <string name="wizard_final_msg">ì ?ì?¸ê³?ì??ì?? ì??ë°±ë§?ëª?ì?? ì?¬ë??ë?¤ì?´ ë?¤ì??í?? ì?´ì? ë¡? Tor를 ì?¬ì?©í?©ë??ë?¤.\n\nì?¸ë¡ ì?¸ê³¼ ë¸?ë¡?ê±°, ì?¸ê¶? ì?´ë??ê°?, ë²? ì§?í?? ì??ì??, êµ°ì?¸, 기ì??, ì?µì??í??ë?? ì ?ê¶?ì?? 국민, ê·¸ë¦¬ê³  í??ë²?í?? ì??민 ... ê·¸ë¦¬ê³  ì§?ê¸? ë?¹ì? ì?? ì¤?ë¹?í??ê³  ì??ì?µë??ë?¤!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Tor ë?¤í?¸ì??í?¬ì?? ì?±ê³µì ?ì?¼ë¡? ì?°ê²°ë??ì??ì?µë??ë?¤. í??ì§?ë§? ì?´ê²?ì?? ê·?í??ì?? ì?¥ì¹?ê°? ì??ì ?í??ë?¤ë?? ì??미ê°? ì??ë??ë??ë?¤. ê·?í??ì?? ë¸?ë?¼ì?°ì ?를 í??ì?¤í?¸í??기 ì??í?´ ë©?ë?´ì??ì?? \'í??ì?¸\' ì?µì??ì?? ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤.\n\në?? ë§?ì?? ì ?ë³´ê°? í??ì??í??ì??ë©´, https://guardianproject.info/apps/orbot ì?? 방문í??ì??ê±°ë??, help@xxxxxxxxxxxxxxxxxxxxë¡? ì?´ë©?ì?¼ì?? ë³´ë?´ì£¼ì?­ì??ì?¤.</string>
+  <string name="tor_check">Orbotì?´ ì ?ì??ì ?ì?¼ë¡? ì?¤ì ?ë??ì??ê³  Torì?? ì?°ê²°ë??ì??ë??ì§? í??ì?¸í??기 ì??í?´ ì?´ê²?ì?? https://check.torproject.org ì?? ê·?í??ì?? ì?¹ ë¸?ë?¼ì?°ì ¸ì?? ì?´ë¦¬ê²? í?  ê²?ì??ë??ë?¤.</string>
+  <string name="pref_hs_group">í??ë?  ì??ë¹?ì?¤ í?¸ì?¤í??</string>
+  <string name="pref_general_group">��</string>
+  <string name="pref_start_boot_title">ë¶?í?¸ ì?? Orbot ì??ì??</string>
+  <string name="pref_start_boot_summary">ì??ë??ë¡?ì?´ë?? ì?¥ì¹?ê°? ì??ì??í?  ë?? ì??ë??ì ?ì?¼ë¡? Orbotì?? ì??ì??í??ê³  Torì?? ì?°ê²°</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbotì?? Tor를 ì??ë??ë¡?ì?´ë??ë¡? ê°?ì ¸ì?µë??ë?¤!\n\nTorë?? 컨í??ì¸  í??í?°ë§?, í?¸ë??í?½ ë¶?ì??, 기ë°? ì ?ë³´ì?? ê°?ì?¸ ê´?ê³?, ì?¬í??í??ì?? ì??í??í??ë?? ë?¤í?¸ì??í?¬ ê°?ì??ì?? ë??í?­í??ë??ë¡? í?´ ì¤?ë??ë?¤.\n\nì?´ ë§?ë²?ì?¬ë?? Orbotê³¼ Tor를 ê·?í??ì?? ì?¥ì¹?ì?? ì?¤ì ?í??ë?? ê²?ì?? ë??ì??ì¤? ê²?ì??ë??ë?¤.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">ê²½ê³ </string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">ê¶?í??</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbotì?´ í??ì?±í??ë?? ì?¥ì¹?</string>
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
-  <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</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_transproxy_title">Transparent Proxying</string>
-  <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string>
-  <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string>
-  <string name="wizard_transproxy_none">None</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string>
-  <string name="button_grant_superuser">Request Superuser Access</string>
-  <string name="pref_select_apps">Select Apps</string>
-  <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string>
-  <string name="pref_node_configuration">Node Configuration</string>
-  <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string>
-  <string name="pref_entrance_node">Entrance Nodes</string>
-  <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string>
-  <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string>
-  <string name="pref_use_whispercore">Use WhisperCore</string>
-  <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>
-  <string name="pref_proxy_type_title">Proxy Type</string>
-  <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Enter Proxy Type</string>
-  <string name="pref_proxy_host_title">Proxy Host</string>
-  <string name="pref_proxy_host_summary">Proxy server hostname</string>
-  <string name="pref_proxy_host_dialog">Enter Proxy Host</string>
-  <string name="pref_proxy_port_title">Proxy Port</string>
-  <string name="pref_proxy_port_summary">Proxy server port</string>
-  <string name="pref_proxy_port_dialog">Enter Proxy port</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying...</string>
-  <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string>
-  <string name="transproxy_rules_cleared">TransProxy rules cleared</string>
-  <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string>
-  <string name="privoxy_is_running_on_port_">Privoxy is running on port: </string>
-  <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string>
-  <string name="bridge_error">Bridge Error</string>
-  <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string>
-  <string name="send_email_for_bridges">Send an email to bridges@xxxxxxxxxxxxxx with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string>
-  <string name="error">Error</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string>
-  <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string>
-  <string name="exit_nodes">Exit Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string>
-  <string name="enter_exit_nodes">Enter Exit Nodes</string>
-  <string name="exclude_nodes">Exclude Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string>
-  <string name="enter_exclude_nodes">Enter Exclude Nodes</string>
-  <string name="strict_nodes">Strict Nodes</string>
-  <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string>
-  <string name="bridges">Bridges</string>
-  <string name="use_bridges">Use Bridges</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</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="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+  <!--Transparent Proxy screen-->
+  <string name="button_grant_superuser">ì??í?¼ì? ì ¸ ê¶?í?? ì??ì²­</string>
+  <string name="pref_select_apps">ì?± </string>
+  <string name="pref_node_configuration_summary">ê·?í??ì?? ì?µëª?ì?±ì?? ê°?ì??ì??í?¬ ì?? ì??ë?? ê³ ê¸? ì?¤ì ?ì?´ ì??ì?µë??ë?¤.</string>
+  <!--<string name="pref_use_whispercore">Use WhisperCore</string>
+<string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
+  <string name="pref_proxy_type_summary">í??ë¡?ì?? ì??ë²?를 ì??í?? ì?¬ì?©ë??ë?? í??ë¡?í? ì½? : HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">í??ë¡?ì?? í??ì?? ì??ë ¥</string>
+  <string name="pref_proxy_host_summary">í??ë¡?ì?? ì??ë²? í?¸ì?¤í?¸ë?¤ì??</string>
+  <string name="pref_proxy_host_dialog">í??ë¡?ì?? í?¸ì?¤í?¸ ì??ë ¥</string>
+  <string name="pref_proxy_port_summary">ì??ë²? í?¬í?¸ ì??ë ¥</string>
+  <string name="pref_proxy_port_dialog">í??ë¡?ì?? í?¬í?¸ ì??ë ¥</string>
+  <string name="status">ì??í??</string>
+  <string name="couldn_t_start_tor_process_">Tor í??ë¡?ì?¸ì?¤ ì??ì?? ë¶?ê°?ë?¥:  </string>
+  <string name="bridge_error">�릿� ��</string>
+  <string name="bridge_requires_ip">ë¸?릿ì§? 기ë?¥ì?? ì?¬ì?©í??기 ì??í?´ì??, ìµ?ì??í?? 1ê°? ì?´ì??ì?? ë¸?릿ì§? IP 주ì??ê°? í??ì??í?©ë??ë?¤.</string>
+  <string name="error">��</string>
+  <string name="exit_nodes">ì¶?구 ë?¸ë??</string>
+  <string name="bridges">ì¤?ê³?ì??ë²?</string>
+  <string name="use_bridges">ì¤?ê³?ì??ë²? ì?¬ì?©</string>
+  <string name="ip_address_and_port_of_bridges">ì¤?ê³?ì??ë²?ì?? IP 주ì??ì?? </string>
+  <string name="enter_bridge_addresses">ì¤?ê²?ì??ë²? 주ì?? ì??ë ¥</string>
+  <string name="relays">ì¤?ê³?ì??ë²?</string>
+  <string name="relaying">��</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">ê·?í??ì?? ì?¥ì¹?를 ì¶?구ê°? ì??ë?? ì¤?ê³?ì??ë²?ë¡? í??ì?±í??</string>
+  <string name="relay_port">�� ��</string>
+  <string name="listening_port_for_your_tor_relay">ê·?í??ì?? Tor ì¤?ê³?ì??ë²?를 ì??í?? Listening í?¬í?¸</string>
+  <string name="relay_nickname">ì¤?ê³?ì??ë²? ë³?ëª?</string>
+  <string name="the_nickname_for_your_tor_relay">ê·?í??ì?? ì¤?ê³?ì??ë²?를 ì??í?? ë³?ëª?</string>
+  <string name="enter_a_custom_relay_nickname">ì??ì??ì?? ì¤?ê³?ì??ë²? ë³?ëª?ì?? ì??ë ¥</string>
+  <string name="enable_hidden_services">í??ë?  ì??ë¹?ì?¤ í?¸ì?¤í??</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="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="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="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string>
+  <string name="default_bridges"/>
+  <string name="powered_by">í? 르 í??ë¡?ì ?í?¸ì?? ì??í?´ 구ë??  </string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
new file mode 100644
index 0000000..1cc58d4
--- /dev/null
+++ b/res/values-lv/strings.xml
@@ -0,0 +1,219 @@
+<?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Ä?t un apturÄ?t Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot startÄ?...</string>
+  <string name="status_activated">Izveidots savienojums ar Tor tīklu</string>
+  <string name="status_disabled">\"Orbot ir deaktivÄ?ts</string>
+  <string name="status_shutting_down">Orbot izslÄ?dzas</string>
+  <string name="tor_process_starting">StartÄ? Tor klientu...</string>
+  <string name="tor_process_complete">pabeidz.</string>
+  <string name="tor_process_waiting">gaida.</string>
+  <string name="not_anonymous_yet">BRĪDINÄ?JUMS: JÅ«su datplÅ«sma vÄ?l nav anonÄ«ma! LÅ«dzu konfigurÄ?jiet savas lietotnes, lai tÄ?s izmantotu HTTP starpnieku 127.0.0.1:8118 vai SOCKS4A , vai SOCKS5 starpnieku 127.0.0.1:9050</string>
+  <string name="menu_home">MÄ?jas</string>
+  <string name="menu_browse">PÄ?rlÅ«kot</string>
+  <string name="menu_settings">Iestatījumi</string>
+  <string name="menu_log">ŽurnÄ?ls</string>
+  <string name="menu_info">Palīdzība</string>
+  <string name="menu_apps">Lietotnes</string>
+  <string name="menu_start">StartÄ?t</string>
+  <string name="menu_stop">ApturÄ?t</string>
+  <string name="menu_about">Par</string>
+  <string name="menu_wizard">Vednis</string>
+  <string name="main_layout_download">LejupielÄ?de (Ä?trums/kopÄ?)</string>
+  <string name="main_layout_upload">AugÅ¡upielÄ?de (Ä?trums/kopÄ?)</string>
+  <string name="button_help">Palīdzība</string>
+  <string name="button_close">AizvÄ?rt</string>
+  <string name="button_about">Par</string>
+  <string name="button_clear_log">NotÄ«rÄ«t žurnÄ?lu</string>
+  <string name="menu_verify">PÄ?rbaudÄ«t</string>
+  <string name="menu_exit">Iziet</string>
+  <string name="press_to_start">Lai startÄ?tu, nospiediet ilgi</string>
+  <string name="pref_trans_proxy_group">PÄ?rredzama starpniekoÅ¡ana (nepiecieÅ¡amas saknes pilnvaras)</string>
+  <string name="pref_trans_proxy_title">PÄ?rredzama starpniekoÅ¡ana</string>
+  <string name="pref_trans_proxy_summary">LietotÅ?u automÄ?tiska torificÄ?Å¡ana</string>
+  <string name="pref_transparent_all_title">Tor\'Ä?t visu</string>
+  <string name="pref_transparent_all_summary">Visu lietotÅ?u starpnieku datplÅ«sma caur Tor</string>
+  <string name="pref_transparent_port_fallback_title">Porta starpnieka atkÄ?pnorÄ?de</string>
+  <string name="pref_transparent_port_fallback_summary">BRĪDINÄ?JUMS: Apiet parastos portus (80., 443., u.tml.). *IZMANTOJIET VIENĪGI* ja nestrÄ?dÄ? \'All\' vai \'App\' režīmi.</string>
+  <string name="pref_transparent_port_title">Portu saraksts</string>
+  <string name="pref_transparent_port_summary">Saraksts portiem uz starpnieku. *IZMANTOJIET VIENĪGI* ja nestrÄ?dÄ? \'All\' vai \'App\' režīmi.</string>
+  <string name="pref_transparent_port_dialog">Ievadiet portus uz starpnieku</string>
+  <string name="pref_has_root">Pieprasīt piekļuves saknes tiesības</string>
+  <string name="pref_has_root_summary">PieprasÄ«t piekļuves saknes tiesÄ«bas pÄ?rredzamai starniekoÅ¡anai</string>
+  <string name="status_install_success">SekmÄ«gi instalÄ?tas Tor binÄ?rÄ?s datnes!</string>
+  <string name="status_install_fail">Nebija iespÄ?jams instalÄ?t Tor binÄ?rÄ?s datnes. LÅ«dzu pÄ?rbaudiet žurnÄ?lu, un informÄ?jiet tor-assistants@xxxxxxxxxxxxxx </string>
+  <string name="title_error">Lietojumprogrammas kļūda</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Par Orbot</string>
+  <string name="btn_next">TÄ?lÄ?k</string>
+  <string name="btn_back">Atpakaļ</string>
+  <string name="btn_finish">Beigt</string>
+  <string name="btn_okay">Labi</string>
+  <string name="btn_cancel">Atcelt</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">VairÄ?k informÄ?cijas par Orbot</string>
+  <string name="wizard_details_msg">Orbot ir atvÄ?rta koda lietojumprogramma, kura ietver Tor, LibEvent un Privoxy. Programma nodroÅ¡ina vietÄ?ju HTTP starpnieku (8118) un SOCKS starpnieku (9050) uz Tor tÄ«klu. Bez tam, strÄ?dÄ?jot uz saknes tiesÄ«bu lÄ«menÄ« strÄ?dÄ?joÅ¡as ierÄ«ces, Orbot spÄ?j pÄ?rsÅ«tÄ«t visu interneta datplÅ«smu caur Tor.</string>
+  <string name="wizard_permissions_root">Tiesības piešķirtas</string>
+  <string name="wizard_permissions_stock">Orbot tiesības</string>
+  <string name="wizard_premissions_msg_root">Ä»oti labi! MÄ?s konstatÄ?jÄ?m, ka Orbot\'am ir iespÄ?jotas saknes tiesÄ«bas. MÄ?s apdomÄ«gi izmantosim Å¡Ä«s tiesÄ«bas.</string>
+  <string name="wizard_permissions_msg_stock">Lai gan tas nav obligÄ?ti, Orbot kļūst par vÄ?l ietekmÄ«gÄ?ku rÄ«ku, ja JÅ«su ierÄ«cei ir saknes piekļuves tiesÄ«bas. Izmantojiet zemÄ?k atrodoÅ¡os pogu, lai pieÅ¡Ä·irtu Orbot\'am Ä«paÅ¡u spÄ?ku!  </string>
+  <string name="wizard_permissions_no_root">Ja Jums nav saknes piekļuves tiesÄ«bu vai Jums nav nojausmas par ko te ir runa, pÄ?rliecinieties, ka izmantojat lietotnes, kuras paredzÄ?tas darbam ar Orbot.</string>
+  <string name="wizard_permissions_consent">Es saprotu un vÄ?los turpinÄ?t bez superlietotÄ?ja tiesÄ«bÄ?m.</string>
+  <string name="wizard_permission_enable_root">Piešķirt Orbot saknes tiesības</string>
+  <string name="wizard_configure">KonfigurÄ?t torifikÄ?ciju</string>
+  <string name="wizard_configure_msg">Orbot sniedz iespÄ?ju marÅ¡rutÄ?t visu lietojumu datplÅ«smu caur Tor\'u vai izvÄ?lÄ?ties lietojumprogrammas tÄ?s norÄ?dot individuÄ?li.</string>
+  <string name="wizard_configure_all">Visas lietotnes izmantot starpniecÄ«bas režīmÄ? caur Tor</string>
+  <string name="wizard_configure_select_apps">IzvÄ?lÄ?ties individuÄ?las lietotnes Tor\'am</string>
+  <string name="wizard_tips_tricks">Orbot-iespÄ?jotas lietotnes</string>
+  <string name="wizard_tips_msg">ZemÄ?k norÄ?dÄ«tÄ?s lietotnes ir izveidotas darbam ar Orbot. NoklikÅ¡Ä·iniet katru no pogÄ?m, lai instalÄ?tu tÅ«liÅ?, vai varat tÄ?s uzmeklÄ?t vÄ?lÄ?k Android TirgÅ«.</string>
+  <string name="wizard_tips_otrchat">Gibberbot - DroÅ¡s Android\'a tÅ«lÄ«tÄ?jÄ?s ziÅ?ojumapmaiÅ?as klients</string>
+  <string name="wizard_tips_proxy">Starpnieka iestatÄ«jumi - Uzzini kÄ? konfigurÄ?t lietotnes, lai tÄ?s strÄ?dÄ?tu ar Orbot</string>
+  <string name="wizard_tips_duckgo">MeklÄ?tÄ?jprogrammas Duckduckgo lietotne</string>
+  <string name="wizard_tips_firefox">Firefox ar Proxy Mobile pievienojumu (papildu instalÄ?Å¡ana vÄ?lÄ?k)</string>
+  <string name="wizard_tips_twitter">Twitter atbalsta http starpnieku \"localhost:8118\"</string>
+  <string name="wizard_proxy_help_info">Starpnieka iestatījumi</string>
+  <string name="wizard_proxy_help_msg">Ja izmantotÄ? Android lietotne spÄ?j nodroÅ¡inÄ?t HTTP vai SOCKS starpnieku lietoÅ¡anu, tad lietotni ir ir iespÄ?jams konfigurÄ?t lai to savienotu ar Orbot un izmantotu Tor.\n\n\n    Resursdatora iestatÄ«jumi ir 127.0.0.1 vai \"localhost\". HTTP porta iestatÄ«jums ir 8118. SOCKS\'am starpnieks ir 9050. PÄ?c iespÄ?jas izmantojiet SOCKS4A vai SOCKS5.\n    \n\n\n    VairÄ?k uzzinÄ?t par starpniekoÅ¡anu izmantojot Android var iepazÄ«stoties ar atbildÄ?m, kuras sagatavotas biežÄ?k uzdotiem jautÄ?jumiem jeb Frequently Asked Questions, FAQ tÄ«mekļa vietnÄ?: http://tinyurl.com/proxyandroid\n    </string>
+  <string name="wizard_final">Orbot ir gatavs darbam!</string>
+  <string name="wizard_final_msg">Simtiem tÅ«kstoÅ¡u ļaužu visÄ? pasaulÄ? lieto Tor dažÄ?diem mÄ?rÄ·iem.\n\nŽurnÄ?listi un emuÄ?ru autori, cilvÄ?ktiesÄ«bu aizstÄ?vji, likumsargi, karavÄ«ri, korporÄ?cijas, apspiestÄ«bÄ? dzÄ«vojuÅ¡i iedzÄ«votÄ?ji, un vienkÄ?rÅ¡i parasti cilvÄ?ki .. un tagad arÄ« JÅ«s to varatl!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Esat sekmÄ«gi izveidojis savienojumu ar tÄ«klu Tor - taÄ?u tas vien NEnozÄ«mÄ?, ka JÅ«su ierÄ«ce ir droÅ¡Ä«bÄ?. Lai pÄ?rbaudÄ«tu savu pÄ?rlÅ«ku, no izvÄ?lnes izraugieties izvÄ?li \'PÄ?rbaudÄ«t\'. \n\nApmeklÄ?jiet mÅ«s https://guardianproject.info/apps/orbot vai sÅ«tiet e-pastu uz help@xxxxxxxxxxxxxxxxxxxx , lai uzzinÄ?tu vairÄ?k.</string>
+  <string name="tor_check">Å Ä« darbÄ«ba tÄ«mekļa pÄ?rlÅ«kÄ? atvÄ?rs https://check.torproject.org , lai redzÄ?tu vai Orbot ir konfigurÄ?ts un esat izveidojies savienojumu ar Tor.</string>
+  <string name="pref_hs_group">SlÄ?ptu pakalpojumu mitinÄ?Å¡ana</string>
+  <string name="pref_general_group">VispÄ?rÄ«gi</string>
+  <string name="pref_start_boot_title">StartÄ?t Orbot, kad ielÄ?dÄ?jas</string>
+  <string name="pref_start_boot_summary">AutomÄ?tiski startÄ?t Orbot, un veidot savienojumu ar Tor, kad JÅ«su Android ierÄ«ce ielÄ?dÄ?jas</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot ieved Tor Android\'u pasaulÄ?!\n\nTor palÄ«dz aizsargÄ?ties pret satura filtrÄ?Å¡anu, datplÅ«smas analÄ«zi un tÄ«kla novÄ?roÅ¡anu, kuras apdraud privÄ?tumu, konfidenciÄ?lu informÄ?ciju un personiskas attiecÄ«bas.\n\nÅ is vednis palÄ«dzÄ?s JÅ«su iekÄ?rtÄ? nokonfigurÄ?t Orbot\'u un Tor\'u.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">BrÄ«dinÄ?jums</string>
+  <string name="wizard_warning_msg">VienkÄ?rÅ¡a Orbot instalÄ?Å¡ana nepadarÄ«s anonÄ«mu JÅ«su mobÄ«lo datplÅ«smu.\n\nLai JÅ«su ierÄ«ce un lietotnes sekmÄ«gi lietotu Tor, Jums pareizi jÄ?nokonfigurÄ? Orbot.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Tesības</string>
+  <string name="wizard_permissions_root_msg1">PÄ?c izvÄ?les variet pieÅ¡Ä·irt Orbot\'am \'SuperlietotÄ?ja\' piekļuves tiesÄ«bas, lai iespÄ?ju lietpratÄ«gus lÄ«dzekļus, tÄ?dus kÄ? Transparent Proxying jeb PÄ?rredzamÄ? .</string>
+  <string name="wizard_permissions_root_msg2">Ja nevÄ?laties Å¡o darÄ«t, lÅ«dzu, pÄ?rliecinieties, ka izmantojat lietotnes, kuras paredzÄ?tas darbam ar Orbot</string>
+  <string name="wizard_permissions_no_root_msg">IzskatÄ?s, ka JÅ«su ierÄ«ce nav ar saknes piekļuves tiesÄ«bÄ?m un nenodroÅ¡ina \'SuperlietotÄ?ja\' piekļuves tiesÄ«bas.\n\nLai gÅ«tu labumu no Tor, Jums jÄ?izmanto lietotnes, kuras izveidotas darbam ar Orbot, vai tÄ?das, kuras atbalsta HTTP vai SOCKS starpnieku iestatÄ«jumus.\n\n</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot\'a iespÄ?jotas lietotnes</string>
+  <string name="wizard_tips_gibberbot">Gibberbot: DroÅ¡as tÄ?rzÄ?Å¡anas lietotne, kura izmanto Off-the-Record Å¡ifrÄ?Å¡anu</string>
+  <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
+  <string name="wizard_tips_orweb">Orweb: PÄ?rlÅ«ks ar uzlabotu privÄ?tumu un kurÅ¡ strÄ?dÄ? caur Tor tÄ«klu</string>
+  <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
+  <!--<string name="wizard_tips_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">PÄ?rredzama starpniekoÅ¡ana</string>
+  <string name="wizard_transproxy_msg">Å is ļauj JÅ«su lietotnÄ?m automÄ?tiski, bez jebkÄ?das papildu konfigurÄ?cijas darboties caur Tor tÄ«klu.</string>
+  <string name="wizard_transproxy_hint">(AtzÄ«mÄ?jiet Å¡o kastÄ«ti gadÄ«jumÄ? ja Jums nav ne mazÄ?kÄ?s nojausmas par to, ko mÄ?s te runÄ?jam)</string>
+  <string name="wizard_transproxy_none">Neviens</string>
+  <string name="pref_transparent_tethering_title">Tor tuvapraide</string>
+  <string name="pref_transparent_tethering_summary">IespÄ?jot Tor PÄ?rredzamo starpniekoÅ¡anu Wifi un USB tuvapraides ierÄ«cÄ?m (nepiecieÅ¡ams pÄ?rstartÄ?t)</string>
+  <string name="button_grant_superuser">PieprasÄ«t superlietotÄ?ja piekļuvi</string>
+  <string name="pref_select_apps">IzvÄ?lÄ?ties lietotnes</string>
+  <string name="pref_select_apps_summary">IzvÄ?lÄ?ties lietotnes, lai marÅ¡rutÄ?tu caur Tor</string>
+  <string name="pref_node_configuration">Mezglu konfigurÄ?cija</string>
+  <string name="pref_node_configuration_summary">Å ie it lietpratÄ«gie iestatÄ«jumi, kuri var samazinÄ?t JÅ«su anonimitÄ?ti</string>
+  <string name="pref_entrance_node">Ieejas mezgli</string>
+  <string name="pref_entrance_node_summary">Ciparvirknes, segvÄ?rdi, valstis un adreses pirmajam lÄ?kumam</string>
+  <string name="pref_entrance_node_dialog">Ievadiet ieejas mezglus</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">TÄ«kla Ä?rejoÅ¡ais starpnieks</string>
+  <string name="pref_proxy_type_title">Ä?rvÄ?rstÄ? starpnieka tips</string>
+  <string name="pref_proxy_type_summary">Starpnieka serverim izmantojamais protokols: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Ievadiet starpnieka tipu</string>
+  <string name="pref_proxy_host_title">Ä?rvÄ?rstÄ? starpnieka mitinÄ?tÄ?js</string>
+  <string name="pref_proxy_host_summary">Starpniekservera mitinÄ?tÄ?jvÄ?rds</string>
+  <string name="pref_proxy_host_dialog">Ievadiet starpnieka mitinÄ?tÄ?ju</string>
+  <string name="pref_proxy_port_title">Ä?rvÄ?rstÄ? starpnieka ports</string>
+  <string name="pref_proxy_port_summary">Starpniekservera ports</string>
+  <string name="pref_proxy_port_dialog">Ievadiet starpnieka portu</string>
+  <string name="status">Statuss</string>
+  <string name="setting_up_full_transparent_proxying_">Iestata pilnÄ«bÄ? pÄ?rredzamu starpniekoÅ¡anu...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Iestata lietotÅ?u nodroÅ¡inÄ?tu starpniekoÅ¡anu...</string>
+  <string name="transparent_proxying_enabled">PÄ?rredzama starpniekoÅ¡ana IESPÄ?JOTA</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy iespÄ?jots tuvapraidei!</string>
+  <string name="warning_error_starting_transparent_proxying_">BRĪDINÄ?JUMS: kļūda uzsÄ?kot pÄ?rredzamu starpniekoÅ¡anu!</string>
+  <string name="transproxy_rules_cleared">TransProxy kÄ?rtulas notÄ«rÄ«tas</string>
+  <string name="couldn_t_start_tor_process_">NeizdevÄ?s palaist Tor\'a procesu:</string>
+  <string name="privoxy_is_running_on_port_">Privoxy strÄ?dÄ? portÄ?: </string>
+  <string name="setting_up_port_based_transparent_proxying_">Iestata portu nodroÅ¡inÄ?tu pÄ?rredzamu starpniekoÅ¡anu...</string>
+  <string name="bridge_error">Tilta kļūda</string>
+  <string name="bridge_requires_ip">Lai izmantotu tilta lÄ«dzekli, jÄ?ievada vismaz viena tilta IP adrese.</string>
+  <string name="send_email_for_bridges">No Gmail konta sÅ«tiet e-pastu uz bridges@xxxxxxxxxxxxxx ar rindu \"get bridges\" e-pasta ziÅ?ojuma korpusÄ?.</string>
+  <string name="error">Kļūda</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">JÅ«su ReachableAddresses iestatÄ«jumi izraisÄ«ja izÅ?Ä?muma stÄ?vokli!</string>
+  <string name="your_relay_settings_caused_an_exception_">JÅ«su retranslatora iestatÄ«jumi izraisÄ«ja izÅ?Ä?muma situÄ?ciju!</string>
+  <string name="exit_nodes">Izejas mezgli</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">PÄ?dÄ?jÄ? lÄ?kuma ciparvirknes, segvÄ?rdi, valstis un adreses</string>
+  <string name="enter_exit_nodes">Ievadiet izejas mezglus</string>
+  <string name="exclude_nodes">Neiekļautie mezgli</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">IzslÄ?dzamÄ?s ciparvirknes, segvÄ?rdi, valstis un adreses</string>
+  <string name="enter_exclude_nodes">Ievadīt Neiekļaujamos mezglus</string>
+  <string name="strict_nodes">Precīzie mezgli</string>
+  <string name="use_only_these_specified_nodes">Izmantojiet *vienÄ«gi* Å¡os norÄ?dÄ«tos mezglus</string>
+  <string name="bridges">Tilti</string>
+  <string name="use_bridges">Lietot tiltus</string>
+  <string name="bridges_obfuscated">NomaskÄ?tie tilti</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">IespÄ?jot alternatÄ«vus tÄ«kla Tor ieejas mezglus </string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">IespÄ?jot, ja konfigurÄ?tie tilti ir nomaskÄ?tie tilti</string>
+  <string name="ip_address_and_port_of_bridges">Tiltu ports un IP addrese</string>
+  <string name="enter_bridge_addresses">Ievadiet tiltu adreses</string>
+  <string name="relays">Retranslatori</string>
+  <string name="relaying">RetranslÄ?Å¡ana</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">IespÄ?jot JÅ«su iekÄ?rtu par bezapstÄ?jas retranslatoru</string>
+  <string name="relay_port">Retranslatora ports</string>
+  <string name="listening_port_for_your_tor_relay">JÅ«su Tor retranslatora klausÄ«Å¡anÄ?s ports</string>
+  <string name="enter_or_port">Ievadiet OR portu</string>
+  <string name="relay_nickname">Retranslatora segvÄ?rds</string>
+  <string name="the_nickname_for_your_tor_relay">JÅ«su Tor\'a retranslatora segvÄ?rds</string>
+  <string name="enter_a_custom_relay_nickname">Ievadiet brÄ«vi izraudzÄ«tu rertranslatora segvÄ?rdu</string>
+  <string name="reachable_addresses">SasniedzamÄ?s adreses</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">IzpildÄ«t kÄ? klientprogrammu aiz ugunsmÅ«ra, kurÅ¡ nodroÅ¡ina ierobežojoÅ¡u kÄ?rtÄ«bu</string>
+  <string name="reachable_ports">Sasniedzamie porti</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Porti, kuri sasniedzami otrpus ierobežojoša ugunsmūra</string>
+  <string name="enter_ports">Ievadiet portus</string>
+  <string name="enable_hidden_services">SlÄ?ptu pakalpojumu mitinÄ?Å¡ana</string>
+  <string name="run_servers_accessible_via_the_tor_network">ļaut no tÄ«kla Tor piekļūt serverim, kurÅ¡ ir ierÄ«cÄ?.  </string>
+  <string name="enter_localhost_ports_for_hidden_services">ievadiet slÄ?pto pakalpojumu localhost portus</string>
+  <string name="hidden_service_ports">SlÄ?ptu pakalpojumu porti</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">JÅ«su slÄ?ptÄ? pakalpojuma adresÄ?jams vÄ?rds (tiek Ä£enerÄ?ts automÄ?tiski)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">iespÄ?jot atkļūdoÅ¡anas žurnÄ?lu izvadei (jÄ?lieto adb vai aLogCat , lai skatÄ«tu)</string>
+  <string name="project_home">Projekta mÄ?jas:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Tor licence</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Trešo personu programmatūra:</string>
+  <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string>
+  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
+  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string>
+  <string name="hidden_service_request">Lietotne vÄ?las atvÄ?rt slÄ?ptu servera portu %S uz tÄ«klu Tor. Tas ir droÅ¡i, ja uzticaties lietotnei.</string>
+  <string name="found_existing_tor_process">Atrada esošu Tor procesu...</string>
+  <string name="something_bad_happened">Nav labi. PÄ?rbaudiet žurnÄ?lu</string>
+  <string name="hidden_service_on">SlÄ?pts pakalpojums uz:</string>
+  <string name="unable_to_read_hidden_service_name">NespÄ?j lasÄ«t slÄ?pta pakalpojuma nosaukumu</string>
+  <string name="unable_to_start_tor">Nevar startÄ?t Tor:</string>
+  <string name="pref_use_sys_iptables_title">Izmantot noklusÄ?juma Iptables</string>
+  <string name="pref_use_sys_iptables_summary">lietot iebÅ«vÄ?to binÄ?ro datni iptables nevis to, kura ir Orbot komplektÄ?cijÄ?</string>
+  <string name="error_installing_binares">Tor binÄ?rÄ?s datnes nebija iespÄ?jams ne instalÄ?t, ne jauninÄ?t.</string>
+  <string name="pref_use_persistent_notifications">VienmÄ?r paturÄ?t ikonu rÄ«kjoslÄ?, kad Orbot ir savienots</string>
+  <string name="pref_use_persistent_notifications_title">VienmÄ?r ieslÄ?gtie paziÅ?ojumi</string>
+  <string name="notification_using_bridges">Tilti ir iespÄ?joti!</string>
+  <string name="default_bridges"/>
+  <string name="set_locale_title">Iestatiet lokalizÄ?ciju</string>
+  <string name="set_locale_summary">Iestatiet Orbot lokalizÄ?ciju un valodu</string>
+  <string name="wizard_locale_title">IzvÄ?lÄ?ties valodu</string>
+  <string name="wizard_locale_msg">AtstÄ?jiet noklusÄ?juma vÄ?rtÄ«bas, vai pÄ?rslÄ?dziet paÅ¡reizÄ?jo valodu.</string>
+  <string name="powered_by">Darbību nodrošina Tor projekts</string>
+  <string name="btn_save_settings">SaglabÄ?t iestatÄ«jumus</string>
+</resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 6b38f9b..ce0bcb9 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -11,9 +11,6 @@
   <string name="status_activated">Ð?овÑ?зан на мÑ?ежаÑ?а ТоÑ?</string>
   <string name="status_disabled">\"Ð?Ñ?боÑ? е дезакÑ?ивиÑ?ан</string>
   <string name="status_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">Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?: Ð?аÑ?иоÑ? Ñ?ообÑ?аÑ?аÑ? Ñ?еÑ?Ñ?Ñ?е не е анонимен! ТÑ?еба да ги конÑ?игÑ?Ñ?иÑ?аÑ?е Ð?аÑ?иÑ?е апликаÑ?ии да го коÑ?иÑ?Ñ?аÑ? пÑ?окÑ?иÑ?о за HTTP, 127.0.0.1:8118, или пÑ?окÑ?иÑ?о за SOCKS4A или SOCKS5, 127.0.0.1:9050</string>
   <string name="menu_home">Ð?ома</string>
   <string name="menu_browse">Ð?Ñ?елиÑ?Ñ?Ñ?ваÑ?е</string>
@@ -31,7 +28,6 @@
   <string name="button_clear_log">Ð?збÑ?иÑ?и лог</string>
   <string name="menu_verify">Ð?Ñ?овеÑ?и</string>
   <string name="menu_exit">Ð?злез</string>
-  <string name="powered_by">напоÑ?Ñ?вано од пÑ?оекÑ?оÑ? ТоÑ?</string>
   <string name="press_to_start">- long press to start -</string>
   <string name="pref_trans_proxy_group">ТÑ?анÑ?паÑ?енÑ?но пÑ?окÑ?и (баÑ?а root пÑ?иÑ?Ñ?ап)</string>
   <string name="pref_trans_proxy_title">ТÑ?анÑ?паÑ?енÑ?но пÑ?окÑ?и</string>
@@ -55,6 +51,7 @@
   <string name="btn_finish">Ð?Ñ?аÑ?</string>
   <string name="btn_okay">Ð?о Ñ?ед</string>
   <string name="btn_cancel">Ð?Ñ?кажи Ñ?е</string>
+  <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Ð?екои деÑ?али за Ð?Ñ?боÑ?</string>
   <string name="wizard_details_msg">Ð?Ñ?боÑ? е апликаÑ?иÑ?а Ñ?о оÑ?воÑ?ен код коÑ?аÑ?Ñ?о го Ñ?одÑ?жи ТоÑ?, LibEvent и Privoxy. Таа Ð?и нÑ?ди локални пÑ?окÑ?иÑ?а за HTTP (поÑ?Ñ? 8118) и SOCKS (поÑ?Ñ? 9050) за повÑ?зÑ?ваÑ?е Ñ?о мÑ?ежаÑ?а ТоÑ?. Ð?Ñ?боÑ? иÑ?Ñ?о Ñ?ака нÑ?ди можноÑ?Ñ?, на Ñ?Ñ?еди Ñ?о root пÑ?иÑ?Ñ?ап, Ñ?елиоÑ? Ñ?ообÑ?аÑ?аÑ? да Ñ?е пÑ?енаÑ?оÑ?и пÑ?екÑ? ТоÑ?.</string>
   <string name="wizard_permissions_root">Ð?озволаÑ?а е издадена</string>
@@ -73,124 +70,30 @@
   <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
   <string name="wizard_tips_proxy">Ð?одеÑ?Ñ?ваÑ?а на пÑ?окÑ?и - Ð?аÑ?Ñ?еÑ?е како да ги конÑ?игÑ?Ñ?иÑ?аÑ?е апликаÑ?ииÑ?е да Ñ?абоÑ?аÑ? Ñ?о Ð?Ñ?боÑ?</string>
   <string name="wizard_proxy_help_info">Ð?одеÑ?Ñ?ваÑ?а на пÑ?окÑ?и</string>
-  <string name="wizard_proxy_help_msg">Ð?ко апликаÑ?иÑ?аÑ?а за Ð?ндÑ?оид Ñ?Ñ?о Ñ?а коÑ?иÑ?Ñ?иÑ?е поддÑ?жÑ?ва Ñ?поÑ?Ñ?еба на пÑ?окÑ?и за HTTP или SOCKS, Ñ?огаÑ? може да Ñ?а конÑ?игÑ?Ñ?иÑ?аÑ?е да Ñ?е повÑ?зе Ñ?о Ð?Ñ?боÑ? и да коÑ?иÑ?Ñ?и ТоÑ?. \n\n
-    Ð?одеÑ?Ñ?ваÑ?еÑ?о за Ñ?оÑ?Ñ? е 127.0.0.1 или â??localhostâ??. Ð?а HTTP, подеÑ?Ñ?ваÑ?еÑ?о на поÑ?Ñ? е 8118. Ð?а SOCKS, поÑ?Ñ?оÑ? е 9050. Ð?околкÑ? можеÑ?е, коÑ?иÑ?Ñ?еÑ?е SOCKS4A или SOCKS5.
-    \n\n
-    Ð?ожеÑ?е да наÑ?Ñ?иÑ?е повеÑ?е за пÑ?окÑ?иÑ?аÑ?еÑ?о на Ð?ндÑ?оид пÑ?екÑ? ЧÐ?Ð? на: http://tinyurl.com/proxyandroid
-    </string>
+  <string name="wizard_proxy_help_msg">Ð?ко апликаÑ?иÑ?аÑ?а за Ð?ндÑ?оид Ñ?Ñ?о Ñ?а коÑ?иÑ?Ñ?иÑ?е поддÑ?жÑ?ва Ñ?поÑ?Ñ?еба на пÑ?окÑ?и за HTTP или SOCKS, Ñ?огаÑ? може да Ñ?а конÑ?игÑ?Ñ?иÑ?аÑ?е да Ñ?е повÑ?зе Ñ?о Ð?Ñ?боÑ? и да коÑ?иÑ?Ñ?и ТоÑ?. \n\n\n    Ð?одеÑ?Ñ?ваÑ?еÑ?о за Ñ?оÑ?Ñ? е 127.0.0.1 или â??localhostâ??. Ð?а 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">СÑ?оÑ?иÑ?и илÑ?ади лÑ?Ñ?е низ Ñ?елиоÑ? СвеÑ? го коÑ?иÑ?Ñ?аÑ? ТоÑ? од многÑ? Ñ?азлиÑ?ни пÑ?иÑ?ини: новинаÑ?и и блогеÑ?и, боÑ?Ñ?и за Ñ?овекови пÑ?ава, полиÑ?аÑ?Ñ?и, воÑ?ниÑ?и, коÑ?поÑ?аÑ?ии, гÑ?аÑ?ани на Ñ?епÑ?еÑ?ивни Ñ?ежими, и обиÑ?ни гÑ?аÑ?ани... а Ñ?ега и Ð?ие Ñ?Ñ?е Ñ?пÑ?емин да го коÑ?иÑ?Ñ?иÑ?е!</string>
+  <!--END Welcome Wizard strings (DJH)-->
   <string name="connect_first_time"> УÑ?пеÑ?но Ñ?е повÑ?завÑ?е на мÑ?ежаÑ?а ТоÑ? - но ова Ð?Ð? знаÑ?и дека важиоÑ? Ñ?Ñ?ед е Ñ?игÑ?Ñ?ен. Ð?а да го пÑ?овеÑ?иÑ?е Ð?аÑ?иоÑ? бÑ?аÑ?Ñ?еÑ?, избеÑ?еÑ?е Ñ?а опÑ?иÑ?аÑ?а â??Ð?Ñ?овеÑ?иâ?? во мениÑ?о. \n\nÐ?оÑ?еÑ?еÑ?е нÑ? на https://guardianproject.info/apps/orbot или иÑ?пÑ?аÑ?еÑ?е поÑ?ака на help@xxxxxxxxxxxxxxxxxxxx за повеÑ?е инÑ?оÑ?маÑ?ии.</string>
   <string name="tor_check">Ð?ва Ñ?е Ñ?а оÑ?воÑ?и Ñ?Ñ?Ñ?аниÑ?аÑ?а https://check.torproject.org во Ð?аÑ?иоÑ? веб бÑ?аÑ?Ñ?еÑ? за да видиÑ?е дали Ð?Ñ?боÑ? е пÑ?авилно конÑ?игÑ?Ñ?иÑ?ан и дали Ñ?Ñ?е повÑ?зани на ТоÑ?.</string>
   <string name="pref_hs_group">СкÑ?иени Ñ?еÑ?виÑ?и </string>
   <string name="pref_general_group">General</string>
   <string name="pref_start_boot_title">Start Orbot on Boot</string>
   <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
-  <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>
-  <string name="wizard_warning_title">Warning</string>
-  <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>
-  <string name="wizard_permissions_title">Permissions</string>
-  <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string>
-  <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Your device 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>
-  <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>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
   <string name="wizard_tips_orweb">ORWEB (Ñ?амо Ð?ндÑ?оид 1.x) - Ð?Ñ?аÑ?Ñ?еÑ? дизаÑ?ниÑ?ан за пÑ?иваÑ?ноÑ?Ñ? и за Ð?Ñ?боÑ?</string>
   <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
-  <string name="wizard_transproxy_title">Transparent Proxying</string>
-  <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string>
-  <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string>
-  <string name="wizard_transproxy_none">None</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string>
-  <string name="button_grant_superuser">Request Superuser Access</string>
-  <string name="pref_select_apps">Select Apps</string>
-  <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string>
-  <string name="pref_node_configuration">Node Configuration</string>
-  <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string>
-  <string name="pref_entrance_node">Entrance Nodes</string>
-  <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string>
-  <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string>
-  <string name="pref_use_whispercore">Use WhisperCore</string>
-  <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>
-  <string name="pref_proxy_type_title">Proxy Type</string>
-  <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Enter Proxy Type</string>
-  <string name="pref_proxy_host_title">Proxy Host</string>
-  <string name="pref_proxy_host_summary">Proxy server hostname</string>
-  <string name="pref_proxy_host_dialog">Enter Proxy Host</string>
-  <string name="pref_proxy_port_title">Proxy Port</string>
-  <string name="pref_proxy_port_summary">Proxy server port</string>
-  <string name="pref_proxy_port_dialog">Enter Proxy port</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying...</string>
-  <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string>
-  <string name="transproxy_rules_cleared">TransProxy rules cleared</string>
-  <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string>
-  <string name="privoxy_is_running_on_port_">Privoxy is running on port: </string>
-  <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string>
-  <string name="bridge_error">Bridge Error</string>
-  <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string>
-  <string name="send_email_for_bridges">Send an email to bridges@xxxxxxxxxxxxxx with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string>
-  <string name="error">Error</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string>
-  <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string>
-  <string name="exit_nodes">Exit Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string>
-  <string name="enter_exit_nodes">Enter Exit Nodes</string>
-  <string name="exclude_nodes">Exclude Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string>
-  <string name="enter_exclude_nodes">Enter Exclude Nodes</string>
-  <string name="strict_nodes">Strict Nodes</string>
-  <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string>
-  <string name="bridges">Bridges</string>
-  <string name="use_bridges">Use Bridges</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</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="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 name="powered_by">напоÑ?Ñ?вано од пÑ?оекÑ?оÑ? ТоÑ?</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
new file mode 100644
index 0000000..1a16594
--- /dev/null
+++ b/res/values-ms/strings.xml
@@ -0,0 +1,213 @@
+<?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">mula dan henti Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot telah dimulakan..</string>
+  <string name="status_activated">Bersambung ke rangkaian Tor</string>
+  <string name="status_disabled">\"Orbot telah dinyah-aktifkan</string>
+  <string name="status_shutting_down">Orbot sedang ditutup</string>
+  <string name="tor_process_starting">Memulakan klien Tor..</string>
+  <string name="tor_process_complete">selesai.</string>
+  <string name="tor_process_waiting">menunggu.</string>
+  <string name="not_anonymous_yet">AMARAN: Trafik anda tidak anonymous lagi! Sila tetapkan aplikasi anda untuk menggunakan proxy HTTP 127.0.0.1:8118 atau proxy SOCKS4A atau SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Rumah</string>
+  <string name="menu_browse">Carian</string>
+  <string name="menu_settings">Tetapan</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Bantuan</string>
+  <string name="menu_apps">Apps</string>
+  <string name="menu_start">Mula</string>
+  <string name="menu_stop">Henti</string>
+  <string name="menu_about">Tentang</string>
+  <string name="menu_wizard">Wizard</string>
+  <string name="button_help">Bantuan</string>
+  <string name="button_close">Tutup</string>
+  <string name="button_about">Tentang</string>
+  <string name="button_clear_log">Padam Log</string>
+  <string name="menu_verify">Semak</string>
+  <string name="menu_exit">Keluar</string>
+  <string name="press_to_start">- Tekan lama untuk mulakan - </string>
+  <string name="pref_trans_proxy_group">Proxy Telus (Memerlukan akses Root)</string>
+  <string name="pref_trans_proxy_title">Proxy Telus</string>
+  <string name="pref_trans_proxy_summary">Tetapan Automatik Tor pada Apps</string>
+  <string name="pref_transparent_all_title">Tor segalanya</string>
+  <string name="pref_transparent_all_summary">Trafik proxy untuk semua aplikasi yang melalui Tor</string>
+  <string name="pref_transparent_port_fallback_title">Port proxy undur</string>
+  <string name="pref_transparent_port_fallback_summary">AMARAN: memintasi port biasa (80, 443, dll). * CUMA GUNA * jika mod \'Semua\' atau \'App\' idak berfungsi.</string>
+  <string name="pref_transparent_port_title">Senarai Port</string>
+  <string name="pref_transparent_port_summary">Senarai port untuk proxy. *GUNA HANYA* jika mod \'Semua\' atau \'App\' tidak berfungsi</string>
+  <string name="pref_transparent_port_dialog">Masukkan port untuk proxy</string>
+  <string name="pref_has_root">Minta Akses Root</string>
+  <string name="pref_has_root_summary">Minta akses root untuk proxy telus</string>
+  <string name="status_install_success">Tor berjaya dipasang!</string>
+  <string name="status_install_fail">Fail Tor gagal dipasang. Sila semak log dan maklumkan kepada tor-assistants@xxxxxxxxxxxxxx</string>
+  <string name="title_error">Ralat Aplikasi</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Tentang Orbot</string>
+  <string name="btn_next">Seterusnya</string>
+  <string name="btn_back">Kembali</string>
+  <string name="btn_finish">Tamat</string>
+  <string name="btn_okay">Okay</string>
+  <string name="btn_cancel">Batal</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Maklumat Orbot</string>
+  <string name="wizard_details_msg">Orbot merupakan aplikasi sumber terbuka yang mengandungi Tor, LibEvent dan Privoxy. Ia menyediakan seorang proksi HTTP tempatan (8118) dan proksi SOCKS (9050) ke dalam rangkaian Tor. Orbot juga mempunyai keupayaan, pada peranti berakar umbi, untuk menghantar semua trafik internet melalui Tor.</string>
+  <string name="wizard_permissions_root">Kebenaran disahkan</string>
+  <string name="wizard_permissions_stock">Kebenaran Orbot</string>
+  <string name="wizard_premissions_msg_root">Bagus! Kami mendapati anda ada akses root yang dibenarkan untuk Orbot. Kami akan gunakan kuasa ini dengan bijak.</string>
+  <string name="wizard_permissions_msg_stock">Walaupun ia tidak diperlukan, Orbot boleh menjadi alat yang berguna jika peranti anda mempunyai akses root. Guna butang di bawah untuk memberi Orbot superpower!</string>
+  <string name="wizard_permissions_no_root">Jika anda tidak mempunyai akses root atau tidak tahu mengenai ini, cuma pastikan anda menggunakan aplikasi yang boleh digunakan dengan Orbot.</string>
+  <string name="wizard_permissions_consent">Saya faham dan mahu teruskan tanpa Superuser</string>
+  <string name="wizard_permission_enable_root">Beri akses Root pada Orbot</string>
+  <string name="wizard_configure">Konfigurasi Torification</string>
+  <string name="wizard_configure_msg">Orbot memberi anda pilihan untuk menghala semua trafik aplikasi melalui Tor ATAU untuk memilih aplikasi untuk digunakan secara individual.</string>
+  <string name="wizard_configure_all">Proxy Semua Aplikasi Melalui Tor</string>
+  <string name="wizard_configure_select_apps">Pilih Aplikasi Untuk Tor</string>
+  <string name="wizard_tips_tricks">Aplikasi Yang Dibenar Menggunakan Orbot</string>
+  <string name="wizard_tips_msg">Aplikasi di bawah dibangunkan untuk digunakan bersama Orbot. Klik setiap butang untuk pasang sekarang, atau anda boleh cari nanti di Android Market.</string>
+  <string name="wizard_tips_otrchat">Gibberbot - Klien mesej ringkas selamat untuk Android</string>
+  <string name="wizard_tips_proxy">Tetapan Proksi - Belajar bagaimana untuk mengkonfigurasi aplikasi untuk bekerja dengan Orbot</string>
+  <string name="wizard_proxy_help_info">Tetapan proxy</string>
+  <string name="wizard_proxy_help_msg">Jika aplikasi Android yang anda gunakan boleh menyokong penggunaan proksi HTTP atau SOCKS, kemudian anda boleh menatarajah untuk menyambung kepada Orbot dan menggunakan Tor. â??\nâ??\nâ??\n    Tetapan tuan rumah adalah 127.0.0.1 atau \"localhost\". Untuk HTTP, tetapan pelabuhan 8118. Untuk SOCKS, proksi adalah 9050. Anda harus menggunakan SOCKS4A atau socks5 jika boleh. â??\n    â??\nâ??\nâ??\n    Anda boleh mengetahui lebih lanjut tentang proxying pada Android melalui FAQ di: http://tinyurl.com/proxyandroid â??</string>
+  <string name="wizard_final">Orbot sudah sedia!</string>
+  <string name="wizard_final_msg">Beratus-ratus ribu orang di seluruh dunia menggunakan Tor untuk pelbagai sebab-sebab yang luas. â??\nâ??\nWartawan dan blogger, pembela hak asasi manusia, pegawai penguatkuasa undang-undang, tentera, perbadanan, rakyat rejim menindas, dan warganegara sahaja, biasa ... dan kini anda bersedia untuk, juga!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Anda telah berjaya disambungkan kepada rangkaian Tor - tetapi ini bukanlah bermakna peranti anda adalah selamat. Anda boleh menggunakan pilihan \'Check\' daripada menu untuk menguji pelayar anda. â??\nâ??\nMelawat kami pada https://guardianproject.info/apps/orbot atau menghantar e-mel ke help@xxxxxxxxxxxxxxxxxxxx untuk mengetahui lebih lanjut.</string>
+  <string name="tor_check">Ini akan membuka pelayar web anda untuk https://check.torproject.org untuk melihat jika Orbot mungkin ditetapkan dan anda disambungkan kepada Tor.</string>
+  <string name="pref_hs_group">Perkhidmatan tersembunyi</string>
+  <string name="pref_general_group">Umum</string>
+  <string name="pref_start_boot_title">Mulakan Orbot semasa Boot</string>
+  <string name="pref_start_boot_summary">Mula Orbot secara automatik dan sambung Tor ketika peranti Android boot</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot membawa Tor untuk Android! â??\nâ??\nTor membantu anda mempertahankan terhadap penapisan kandungan, analisis dan pengawasan trafik rangkaian yang mengancam privasi, maklumat sulit dan hubungan peribadi. â??\nâ??\nWizard ini akan membantu anda mengkonfigurasi Orbot dan Tor pada peranti anda.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Amaran</string>
+  <string name="wizard_warning_msg">Hanya memasang Orbot tidak secara automatik akan anonymize trafik mudah alih anda. â??\nâ??\nAnda betul mesti menatarajah Orbot, peranti anda dan aplikasi lain untuk berjaya menggunakan Tor.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">kebenaran</string>
+  <string name="wizard_permissions_root_msg1">Anda juga boleh memberikan akses Orbot \'SuperUser\' untuk membolehkan ciri-ciri yang maju, seperti Proxying Telus.</string>
+  <string name="wizard_permissions_root_msg2">Jika anda tidak mahu berbuat demikian, sila pastikan untuk menggunakan aplikasi yang dibuat untuk bekerjasama dengan Orbot</string>
+  <string name="wizard_permissions_no_root_msg">Peranti anda tidak perlu berakar umbi atau menyediakan \'SuperUser\' akses. â??\nâ??\nDalam untuk anda mendapat manfaat daripada Tor, anda akan perlu menggunakan aplikasi yang dibina untuk bekerja dengan Orbot, atau yang HTTP sokongan atau tetapan proksi SOCKS. â??\n</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Aplikasi yang membenarkan Orbot</string>
+  <string name="wizard_tips_gibberbot">Gibberbot: sembang app selamat dengan Penyulitan Off-the-Rekod</string>
+  <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
+  <string name="wizard_tips_orweb">Orweb: Privasi ditambah penyemak imbas yang bekerja melalui 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">Proxy Telus</string>
+  <string name="wizard_transproxy_msg">Ini membolehkan aplikasi anda secara automatik melalui rangkaian Tor tanpa apa apa konfigurasi</string>
+  <string name="wizard_transproxy_hint">(Tanda kotak ini jika anda belen)</string>
+  <string name="wizard_transproxy_none">Tiada</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Membolehkan Proxying Telus Tor untuk Wifi dan USB Devices terikat (memerlukan restart)</string>
+  <string name="button_grant_superuser">Minta Akses Superuser</string>
+  <string name="pref_select_apps">Pilih Aplikasi</string>
+  <string name="pref_select_apps_summary">Pilih Aplikasi untuk dihalakan melalui Tor</string>
+  <string name="pref_node_configuration">Konfigurasi Nod</string>
+  <string name="pref_node_configuration_summary">Ini ialah tetapan lanjutan yang boleh mengurangkan kadar anonymity anda</string>
+  <string name="pref_entrance_node">Nod Kemasukan</string>
+  <string name="pref_entrance_node_summary">Cap jari, nama samaran, negara, dan alamat untuk lompatan pertama</string>
+  <string name="pref_entrance_node_dialog">Masukkan Nod Kemasukan</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">Jenis Proxy</string>
+  <string name="pref_proxy_type_summary">Protokol untuk digunakan pada pelayan proxy: HTTP,HTTPS,Socks4,Socks5</string>
+  <string name="pref_proxy_type_dialog">Masukkan Jenis Proxy</string>
+  <string name="pref_proxy_host_title">Hos Proxy</string>
+  <string name="pref_proxy_host_summary">Nama hos pelayan proxy</string>
+  <string name="pref_proxy_host_dialog">Masukkan Hos Proxy</string>
+  <string name="pref_proxy_port_title">Port Proxy</string>
+  <string name="pref_proxy_port_summary">Port pelayan proxy</string>
+  <string name="pref_proxy_port_dialog">Masukkan port Proxy</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Tetapkan proxy telus secara keseluruhan</string>
+  <string name="setting_up_app_based_transparent_proxying_">Tetapkan proxy telus berdasarkan aplikasi</string>
+  <string name="transparent_proxying_enabled">Proxy telus dibolehkan</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy dibolehkan untuk Tethering!</string>
+  <string name="warning_error_starting_transparent_proxying_">AMARAN: ralat semasa memulakan proxy telus!</string>
+  <string name="transproxy_rules_cleared">Peraturan TransProxy dipadam</string>
+  <string name="couldn_t_start_tor_process_">Tidak boleh memulakan proses Tor:</string>
+  <string name="privoxy_is_running_on_port_">Privoxy sedang berjalan pada port:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Menetap proxy telus berdasarkan port..</string>
+  <string name="bridge_error">Ralat jambatan</string>
+  <string name="bridge_requires_ip">Untuk menggunakan ciri jambatan, anda mesti masukkan sekurang-kurangnya satu alamat IP jambatan.</string>
+  <string name="send_email_for_bridges">Hantar e-mel kepada bridges@xxxxxxxxxxxxxx dengan garisan \"jambatan\" dengan sendirinya dalam badan mel dari akaun gmail.</string>
+  <string name="error">Ralat</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Tetapan ReachableAddresses anda menyebabkan pengecualian!</string>
+  <string name="your_relay_settings_caused_an_exception_">Tetapan relay anda menyebabkan pengecualian!</string>
+  <string name="exit_nodes">Keluar Nod</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Cap jari, nama samaran, negara, dan alamat untuk lompatan terakhir</string>
+  <string name="enter_exit_nodes">Masukkan Nod Keluar</string>
+  <string name="exclude_nodes">Keluarkan Nod</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Cap jari, nama samaran, negara dan alamat untuk dikeluarkan</string>
+  <string name="enter_exclude_nodes">Masukkan Nod Keluar</string>
+  <string name="strict_nodes">Nod Ketat</string>
+  <string name="use_only_these_specified_nodes">Guna *hanya* nod-nod ini</string>
+  <string name="bridges">Jambatan</string>
+  <string name="use_bridges">Guna Jambatan</string>
+  <string name="bridges_obfuscated">Jambatan Keliru</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Membolehkan nod pintu masuk ganti ke Rangkaian Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Benarkan jika konfigurasi jambatan adalah jambatan keliru</string>
+  <string name="ip_address_and_port_of_bridges">Alamat IP dan pelabuhan jambatan</string>
+  <string name="enter_bridge_addresses">Masukkan Alamat Jambatan</string>
+  <string name="relays">Relays</string>
+  <string name="relaying">Relaying</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Membolehkan peranti anda untuk menjadi geganti bukan keluar</string>
+  <string name="relay_port">Relay Port</string>
+  <string name="listening_port_for_your_tor_relay">Mendapatkan port untuk tetapan relay Tor anda</string>
+  <string name="enter_or_port">Masukkan port OR</string>
+  <string name="relay_nickname">Nama samaran relay</string>
+  <string name="the_nickname_for_your_tor_relay">Nama samaran ini untuk relay Tor anda</string>
+  <string name="enter_a_custom_relay_nickname">Masukkan nama samaran gantian untuk relay</string>
+  <string name="reachable_addresses">Alamat yang dapat dicapai</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Jalan sebagai klien dibelakang firewall dengan peraturan ketat</string>
+  <string name="reachable_ports">Port yang dapat dicapai</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Port yang dapat dicapai dibelakang firewall dengan kawalan ketat</string>
+  <string name="enter_ports">Masukkan port</string>
+  <string name="enable_hidden_services">Benarkan Servis Tersembunyi</string>
+  <string name="run_servers_accessible_via_the_tor_network">Jalankan pelayan boleh diakses melalui rangkaian Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">Masuk port localhost untuk servis tersembunyi</string>
+  <string name="hidden_service_ports">Port servis tersembunyi</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Nama beralamat untuk servis tersembunyi anda (dijana secara automatik)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">benarkan log debug pada output (mesti guna adb atau aLogCat untuk lihat)</string>
+  <string name="project_home">Rumah Projek(s):</string>
+  <string name="project_urls">https://www.torproject.org/docs/androidâ;?? https://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Lesen Tor</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">Satu aplikasi mahu membuka port tersembunyi %S pada rangkaian Tor. Ia selamat jika anda percaya pada aplikasi itu.</string>
+  <string name="found_existing_tor_process">Proses Tor sedia ada ditemui..</string>
+  <string name="something_bad_happened">Sesuatu yang buruk berlaku. Semak log.</string>
+  <string name="hidden_service_on">port tersembunyi pada:</string>
+  <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama servis tersembunyi</string>
+  <string name="unable_to_start_tor">Tidak dapat memulakan Tor:</string>
+  <string name="pref_use_sys_iptables_title">Guna default Iptables</string>
+  <string name="pref_use_sys_iptables_summary">Guna binari built-in iptables daripada yang didatangkan bundle dengan Orbot</string>
+  <string name="error_installing_binares">Tor binari tidak boleh dipasang atau dinaiktaraf</string>
+  <string name="pref_use_persistent_notifications">Sentiasa biar ikon pada toolbar apabila Orbot bersambung</string>
+  <string name="pref_use_persistent_notifications_title">Sentiasa On Notifikasi</string>
+  <string name="notification_using_bridges">Jambatan dibenarkan!</string>
+  <string name="default_bridges"/>
+  <string name="set_locale_title">Tetapan Tempatan</string>
+  <string name="set_locale_summary">Pilihan tempatan dan bahasa untuk Orbot</string>
+  <string name="wizard_locale_title">Pilih Bahasa</string>
+  <string name="wizard_locale_msg">Biar default atau ubah ke bahasa sekarang</string>
+  <string name="powered_by">Dijana oleh Projek Tor</string>
+  <string name="btn_save_settings">Simpan Tetapan</string>
+</resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
new file mode 100644
index 0000000..c2a5e2d
--- /dev/null
+++ b/res/values-my/strings.xml
@@ -0,0 +1,214 @@
+<?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>
+  <!--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>
+  <!--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>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Warning</string>
+  <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Permissions</string>
+  <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string>
+  <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string>
+  <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot-Enabled Apps</string>
+  <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string>
+  <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
+  <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string>
+  <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
+  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparent Proxying</string>
+  <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string>
+  <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string>
+  <string name="wizard_transproxy_none">None</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string>
+  <string name="button_grant_superuser">Request Superuser Access</string>
+  <string name="pref_select_apps">Select Apps</string>
+  <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string>
+  <string name="pref_node_configuration">Node Configuration</string>
+  <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string>
+  <string name="pref_entrance_node">Entrance Nodes</string>
+  <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string>
+  <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string>
+  <!--<string name="pref_use_whispercore">Use WhisperCore</string>
+<string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
+  <string name="pref_proxy_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>
+</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index d4ccc40..c0ab256 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -11,9 +11,9 @@
   <string name="status_activated">Tilkoblet Tor-nettverket</string>
   <string name="status_disabled">\"Orbot er deaktivert</string>
   <string name="status_shutting_down">Orbot skrur seg av</string>
-  <string name="tor_process_starting">Starting Tor client...</string>
-  <string name="tor_process_complete">complete.</string>
-  <string name="tor_process_waiting">waiting.</string>
+  <string name="tor_process_starting">Starter Tor...</string>
+  <string name="tor_process_complete">ferdig.</string>
+  <string name="tor_process_waiting">venter.</string>
   <string name="not_anonymous_yet">ADVARSEL: Trafikken din er ikke anonym helt enda! Vær vennlig og konfigurer applikasjonene dine til å bruke HTTP proxy 127.0.0.1:8118 eller SOCKS4A eller SOCKS5 proxy 127.0.0.1:9050</string>
   <string name="menu_home">Hjem</string>
   <string name="menu_browse">GÃ¥ til</string>
@@ -28,169 +28,51 @@
   <string name="button_help">Hjelp</string>
   <string name="button_close">Avslutt</string>
   <string name="button_about">Om</string>
-  <string name="button_clear_log">Clear Log</string>
+  <string name="button_clear_log">Slett Logg</string>
   <string name="menu_verify">Check</string>
   <string name="menu_exit">Exit</string>
-  <string name="powered_by">powered by the Tor Project</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_transparent_all_title">Tor All Trafikk</string>
+  <string name="pref_transparent_port_title">Port Liste</string>
   <string name="pref_has_root">Request Root Access</string>
-  <string name="pref_has_root_summary">&amp;gt;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="pref_has_root_summary">&gt;Request root access for transparent proxying</string>
   <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">About Orbot</string>
-  <string name="btn_next">Next</string>
-  <string name="btn_back">Back</string>
-  <string name="btn_finish">Finish</string>
-  <string name="btn_okay">Okay</string>
-  <string name="btn_cancel">Cancel</string>
-  <string name="wizard_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
-    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
-    You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid
-    </string>
-  <string name="wizard_final">Orbot is ready!</string>
-  <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string>
-  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help@xxxxxxxxxxxxxxxxxxxx to learn more.</string>
-  <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string>
-  <string name="pref_hs_group">Hidden Services</string>
-  <string name="pref_general_group">General</string>
-  <string name="pref_start_boot_title">Start Orbot on Boot</string>
-  <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
-  <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>
-  <string name="wizard_warning_title">Warning</string>
-  <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>
-  <string name="wizard_permissions_title">Permissions</string>
-  <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string>
-  <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Your device 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>
-  <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="wizard_btn_tell_me_more">Om Orbot</string>
+  <string name="btn_next">Neste</string>
+  <string name="btn_back">Tilbake</string>
+  <string name="btn_finish">Ferdig</string>
+  <string name="btn_okay">Ok</string>
+  <string name="btn_cancel">Avbryt</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <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>
+  <string name="wizard_premissions_msg_root">Glimrende! Vi ser du har aktivert rot-tilgang for Orbot. Vi skal bruke disse kreftene klokt.</string>
+  <string name="wizard_permissions_msg_stock">Selv om det ikke er påkrevd, vil Orbot være et kraftigere verktøy hvis du har rot-tilgang på apparatet ditt. Bruk knappen under for å gi Orbot superkrefter!</string>
+  <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_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_general_group">Generelt</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>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
   <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
-  <string name="wizard_transproxy_title">Transparent Proxying</string>
-  <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string>
-  <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string>
-  <string name="wizard_transproxy_none">None</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string>
-  <string name="button_grant_superuser">Request Superuser Access</string>
-  <string name="pref_select_apps">Select Apps</string>
-  <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string>
-  <string name="pref_node_configuration">Node Configuration</string>
-  <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string>
-  <string name="pref_entrance_node">Entrance Nodes</string>
-  <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string>
-  <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string>
-  <string name="pref_use_whispercore">Use WhisperCore</string>
-  <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>
-  <string name="pref_proxy_type_title">Proxy Type</string>
-  <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Enter Proxy Type</string>
-  <string name="pref_proxy_host_title">Proxy Host</string>
-  <string name="pref_proxy_host_summary">Proxy server hostname</string>
-  <string name="pref_proxy_host_dialog">Enter Proxy Host</string>
-  <string name="pref_proxy_port_title">Proxy Port</string>
-  <string name="pref_proxy_port_summary">Proxy server port</string>
-  <string name="pref_proxy_port_dialog">Enter Proxy port</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying...</string>
-  <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string>
-  <string name="transproxy_rules_cleared">TransProxy rules cleared</string>
-  <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string>
-  <string name="privoxy_is_running_on_port_">Privoxy is running on port: </string>
-  <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string>
-  <string name="bridge_error">Bridge Error</string>
-  <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string>
-  <string name="send_email_for_bridges">Send an email to bridges@xxxxxxxxxxxxxx with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string>
-  <string name="error">Error</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string>
-  <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string>
-  <string name="exit_nodes">Exit Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string>
-  <string name="enter_exit_nodes">Enter Exit Nodes</string>
-  <string name="exclude_nodes">Exclude Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string>
-  <string name="enter_exclude_nodes">Enter Exclude Nodes</string>
-  <string name="strict_nodes">Strict Nodes</string>
-  <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string>
-  <string name="bridges">Bridges</string>
-  <string name="use_bridges">Use Bridges</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</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="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">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="default_bridges"/>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 9daf30a..b49ef0a 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -25,13 +25,14 @@
   <string name="menu_stop">Stop</string>
   <string name="menu_about">Over</string>
   <string name="menu_wizard">Wizard</string>
+  <string name="main_layout_download">Download (snelheid/totaal)</string>
+  <string name="main_layout_upload">Upload (snelheid/totaal)</string>
   <string name="button_help">Help</string>
   <string name="button_close">Afsluiten</string>
   <string name="button_about">Over</string>
   <string name="button_clear_log">Wis logboek</string>
   <string name="menu_verify">Controleer</string>
   <string name="menu_exit">Sluiten</string>
-  <string name="powered_by">mogelijk gemaakt door het Tor Project</string>
   <string name="press_to_start">- Lang indrukken om te starten -</string>
   <string name="pref_trans_proxy_group">Transparant Proxy-en (Vereist Root)</string>
   <string name="pref_trans_proxy_title">Transparant Proxy-en</string>
@@ -55,6 +56,7 @@
   <string name="btn_finish">Einde</string>
   <string name="btn_okay">OK</string>
   <string name="btn_cancel">Annuleren</string>
+  <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Enkele Orbot Details</string>
   <string name="wizard_details_msg">Orbot is een open-source applicatie die Tor, LibEvent en Privoxy bevat. Het creëert een lokale HTTP proxy (8118) en een SOCKS proxy (9050) naar het Tor netwerk. Orbot heeft ook de mogelijkheid om al het internet verkeer over het Tor netwerk te sturen.</string>
   <string name="wizard_permissions_root">Rechten toegewezen</string>
@@ -72,38 +74,47 @@
   <string name="wizard_tips_msg">We raden je aan om apps te downloaden die zich automatisch verbinden met Orbot. Klik op de knoppen hieronder om te installeren.</string>
   <string name="wizard_tips_otrchat">Gibberbot - Veilige instant messaging client voor Android</string>
   <string name="wizard_tips_proxy">Proxy Instellingen - Leer hoe je apps te configureren voor Orbot</string>
+  <string name="wizard_tips_duckgo">Duckduckgo Zoekmachine app</string>
+  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+  <string name="wizard_tips_firefox">Firefox met Proxy Mobile extensie (vergt extra installatie achteraf)</string>
+  <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
+  <string name="wizard_tips_twitter">Twitter ondersteunt http proxy \"localhost:8118\"</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Proxy Instellingen</string>
-  <string name="wizard_proxy_help_msg">Als de Android app die je gebruikt beschikt over een HTTP of SOCKS proxy instelling, dan kun je het configureren zodat het via Orbot over het Tor netwerk gaat.
-
-
-De host instelling is 127.0.0.1 of \"localhost\". De poort voor SOCKS is 9050 en voor HTTP 8118. Gebruik SOCKS4A of SOCKS5 indien mogelijk.
-
-
-Je kunt meer leren over het proxy-en op Android door naar de FAQ op http://tinyurl.com/proxyandroid te gaan
-    </string>
+  <string name="wizard_proxy_help_msg">Als de Android app die je gebruikt beschikt over een HTTP of SOCKS proxy instelling, dan kun je het configureren zodat het via Orbot over het Tor netwerk gaat.\n\n\nDe host instelling is 127.0.0.1 of \"localhost\". De poort voor SOCKS is 9050 en voor HTTP 8118. Gebruik SOCKS4A of SOCKS5 indien mogelijk.\n\n\nJe kunt meer leren over het proxy-en op Android door naar de FAQ op http://tinyurl.com/proxyandroid te gaan\n    </string>
   <string name="wizard_final">Orbot is klaar!</string>
   <string name="wizard_final_msg">Honderdduizenden verschillende mensen over de wereld gebruiken Tor, voor verschillende redenen. Zoals: journalisten, bloggers, mensen rechten medewerkers, soldaten, bedrijven, burgers met onderdrukte religies, en natuurlijk normale mensen... En nu ben jij er ook klaar voor!</string>
-  <string name="connect_first_time">Je bent succesvol verbonden met het Tor netwerk, maar dit betekent NIET dat je apparaat volledig veilig is. Gebruik te \'Check\' optie vanuit het menu om je browser te testen.
-
-Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een email naar help@xxxxxxxxxxxxxxxxxxxx voor vragen.</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Je bent succesvol verbonden met het Tor netwerk, maar dit betekent NIET dat je apparaat volledig veilig is. Gebruik te \'Check\' optie vanuit het menu om je browser te testen.\n\nBezoek onze website op https://guardianproject.info/apps/orbot of stuur een email naar help@xxxxxxxxxxxxxxxxxxxx voor vragen.</string>
   <string name="tor_check">Dit opent je standaard browser naar https://check.torproject.org om te controleren of Orbot succesvol is geconfigureerd om te verbinden met het Tor netwerk.</string>
   <string name="pref_hs_group">Verborgen diensten</string>
   <string name="pref_general_group">Algemeen</string>
   <string name="pref_start_boot_title">Start Orbot bij boot</string>
   <string name="pref_start_boot_summary">Start Orbot automatisch en verbind metTor wanneer je Android apparaat opstart.</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
   <string name="wizard_title_msg">Orbot brengt Tor naar Android!\n\nTor helpt je verdedigen tegen filtering, verkeersanalyse en netwerktoezicht dat privacy, vertrouwelijke informatie en persoonlijke relaties bedreigt.\n\n Deze wizard helpt je met configureren van Orbot en Tor op jouw apparaat.</string>
+  <!--Warning screen-->
   <string name="wizard_warning_title">Waarschuwing</string>
   <string name="wizard_warning_msg">Alleen Orbot installeren zal niet automatisch alle je mobiele verkeer anonimiseren.\n\nJe moet Orbot, je apparaat en andere apps juist instellen om succesvol Tor te gebruiken.</string>
+  <!--Permissions screen-->
   <string name="wizard_permissions_title">Rechten</string>
   <string name="wizard_permissions_root_msg1">Je kan optioneeel Orbot \'superuser\' toegang geven om geavanceerde functies beschikbaar te stellen, zoals Tranparante Proxy.</string>
   <string name="wizard_permissions_root_msg2">Als je dit niet wilt doen, zorg er dan voor dat je apps gebruikt die gemaakt zijn om te werken met Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Je apparaat draait in standaard modus en ondersteunt geen root of \'superuser\' toegang.\n\nOm voordeel te hebben van Tor moet je gebruik maken van apps die gemaakt zijn om te werken met Tor, of die HTTP of SOCKS proxy instellingen ondersteunen.\n\n
-</string>
+  <string name="wizard_permissions_no_root_msg">Je apparaat draait in standaard modus en ondersteunt geen root of \'superuser\' toegang.\n\nOm voordeel te hebben van Tor moet je gebruik maken van apps die gemaakt zijn om te werken met Tor, of die HTTP of SOCKS proxy instellingen ondersteunen.\n\n\n</string>
+  <!--TipsAndTricks screen-->
   <string name="wizard_tips_title">Orbot geschikte Apps</string>
   <string name="wizard_tips_gibberbot">Gibberbot: Veilige chat app met Off-the-Record encryptie</string>
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
-  <string name="wizard_tips_orweb">ORWEB (Alleen Android 1.x) - Browser gemaakt voor privacy &amp;amp; voor Orbot</string>
+  <string name="wizard_tips_orweb">ORWEB (Alleen Android 1.x) - Browser gemaakt voor privacy &amp; voor Orbot</string>
   <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <string name="wizard_tips_play">Vind alle Guardian Project apps op 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">Tranparante Proxy</string>
   <string name="wizard_transproxy_msg">Dit maakt het mogelijk voor jouw apps om automatisch via het Tor netwerk te draaien zonder enige configuratie.</string>
   <string name="wizard_transproxy_hint">(Vink dit aan al je geen idee hebt waar we het over hebben)</string>
@@ -118,8 +129,9 @@ Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een emai
   <string name="pref_entrance_node">Toegangsnodes.</string>
   <string name="pref_entrance_node_summary">Fingerprints, nicks, landen en adressen voor de eerste hop</string>
   <string name="pref_entrance_node_dialog">Voer Toegangsnode in</string>
-  <string name="pref_use_whispercore">Gebruik WhisperCore</string>
-  <string name="pref_use_whispercore_summary">Gebruik de propriëtaire NetFilter APIs aangeboden door WhisperSystems (vereist een apparaat met WhisperCore geïnstaleerd)</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">Uitgaande netwerk proxy</string>
   <string name="pref_proxy_type_title">Proxy type</string>
   <string name="pref_proxy_type_summary">Protocol om te gebruiken voor proxy server: HTTP, HTTPS, SOCKS4, SOCKS5</string>
   <string name="pref_proxy_type_dialog">Voer proxy type in</string>
@@ -155,7 +167,9 @@ Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een emai
   <string name="use_only_these_specified_nodes">Gebruik *alleen* deze nodes</string>
   <string name="bridges">Bridges</string>
   <string name="use_bridges">Gebruik bridges</string>
+  <string name="bridges_obfuscated">Versluierde bridges</string>
   <string name="enable_alternate_entrance_nodes_into_the_tor_network">Gebruik alternatieve toegangsnodes naar het Tor Netwerk</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Schakel in als de geconfigureerde bridges versluierde bridges zijn</string>
   <string name="ip_address_and_port_of_bridges">IP-adres en poort van bridges</string>
   <string name="enter_bridge_addresses">Voer bridge adres in</string>
   <string name="relays">Relays</string>
@@ -199,4 +213,12 @@ Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een emai
   <string name="error_installing_binares">De Tor binaries konden niet worden geïnstalleerd of geüpgraded.</string>
   <string name="pref_use_persistent_notifications">Houd icoon in toolbar zolang Orbot verbonden is</string>
   <string name="pref_use_persistent_notifications_title">Meldingen altijd aan</string>
+  <string name="notification_using_bridges">Bridges ingeschakeld!</string>
+  <string name="default_bridges"/>
+  <string name="set_locale_title">Stel landsinstellingen in</string>
+  <string name="set_locale_summary">Kies de landsinstellingen en taal voor Orbot</string>
+  <string name="wizard_locale_title">Kies taal</string>
+  <string name="wizard_locale_msg">Laat standaard of schakel over naar huidige taal</string>
+  <string name="powered_by">mogelijk gemaakt door het Tor Project</string>
+  <string name="btn_save_settings">Sla instellingen op</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 4d3c429..3355fd6 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -5,17 +5,14 @@
   <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">wÅ?Ä?cz i wyÅ?Ä?cz Tor</string>
+  <string name="control_permission_label">Uruchom / Zatrzymaj Tor</string>
   <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot startuje...</string>
-  <string name="status_activated">PodÅ?Ä?czony do sieci Tor</string>
-  <string name="status_disabled">Orbot wyÅ?Ä?czony</string>
-  <string name="status_shutting_down">Orbot wyÅ?Ä?cza siÄ?</string>
-  <string name="tor_process_starting">Starting Tor client...</string>
-  <string name="tor_process_complete">gotowe.</string>
-  <string name="tor_process_waiting">waiting.</string>
-  <string name="not_anonymous_yet">UWAGA: Twoja komunikacja nie jest jeszcze anonimowa! ProszÄ? skonfiguruj aplikacje aby używaÅ?y serwera proxy HTTP 127.0.0.1:8118 lub SOCKS4A lub SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Start</string>
+  <string name="status_starting_up">Orbot uruchamia siÄ?...</string>
+  <string name="status_activated">PoÅ?Ä?czony do Sieci Tor</string>
+  <string name="status_disabled">Orbot jest Nieaktywny</string>
+  <string name="status_shutting_down">Ortbot wyÅ?Ä?cza siÄ?</string>
+  <string name="not_anonymous_yet">UWAGA: twój ruch w sieci nie jest jeszcze anonimowy! Skonfiguruj swoje aplikacje by używaÅ?y HTTP proxy 127.0.0.1:8118 lub SOCKS4A lub SOCKS5 proxy 127.0.0.1:9050</string>
+  <string name="menu_home">Strona GÅ?ówna</string>
   <string name="menu_browse">PrzeglÄ?daj</string>
   <string name="menu_settings">Ustawienia</string>
   <string name="menu_log">Logi</string>
@@ -23,174 +20,65 @@
   <string name="menu_apps">Aplikacje</string>
   <string name="menu_start">Start</string>
   <string name="menu_stop">Stop</string>
-  <string name="menu_about">O programie</string>
-  <string name="menu_wizard">Kreator</string>
+  <string name="menu_about">Informacje</string>
+  <string name="menu_wizard">Wizard</string>
   <string name="button_help">Pomoc</string>
   <string name="button_close">Zamknij</string>
-  <string name="button_about">O programie</string>
-  <string name="button_clear_log">CzyÅ?Ä? dziennik</string>
-  <string name="menu_verify">Sprawdź</string>
+  <string name="button_about">Informacje</string>
+  <string name="button_clear_log">WyczyÅ?Ä? Logi</string>
+  <string name="menu_verify">Zaznacz</string>
   <string name="menu_exit">WyjÅ?cie</string>
-  <string name="powered_by">napÄ?dzane oprogramowaniem Projektu Tor</string>
-  <string name="press_to_start">- wciÅ?nij na dÅ?użej, by uruchomiÄ? -</string>
-  <string name="pref_trans_proxy_group">Przekierowanie przezroczyste (Wymaga uprawnieÅ? administratora)</string>
-  <string name="pref_trans_proxy_title">Przekierowanie przezroczyste</string>
-  <string name="pref_trans_proxy_summary">Automatyczne toryfikowanie aplikacji</string>
-  <string name="pref_transparent_all_title">PrzepuÅ?Ä? wszystko przez Tora</string>
-  <string name="pref_transparent_all_summary">Przekierowanie ruchu wszystkich aplikacji przez Tora</string>
-  <string name="pref_transparent_port_fallback_title">Zapasowy Port Proxy</string>
-  <string name="pref_transparent_port_fallback_summary">UWAGA: Unika powszechnych portów (80, 443, etc). *UÅ»YWAÄ? TYLKO* gdy \'All\' lub tryb \'App\' nie dziaÅ?a.</string>
-  <string name="pref_transparent_port_title">Lista Portów</string>
-  <string name="pref_transparent_port_summary">Lista portów, które przechwytywaÄ?. *UÅ»YWAÄ? TYLKO* gdy \'All\' lub tryb \'App\' nie dziaÅ?a.</string>
-  <string name="pref_transparent_port_dialog">Wpisz porty do przechwytywania</string>
-  <string name="pref_has_root">Å»Ä?daj dostÄ?pu administratora</string>
-  <string name="pref_has_root_summary">Å»Ä?daj dostÄ?pu administratora dla przezroczystego przekierowania</string>
-  <string name="status_install_success">Binarki Tora pomyslnie zainstalowane!</string>
-  <string name="status_install_fail">Nie można zainstalowaÄ? plików binarnych Tora. Zajrzyj do dziennika i powiadom tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">BÅ?Ä?d Aplikacji</string>
-  <string name="wizard_title">Witamy w Orbocie</string>
-  <string name="wizard_btn_tell_me_more">O Orbocie</string>
+  <string name="press_to_start">-NaciÅ?nij i przytrzymaj by uruchomiÄ?-</string>
+  <string name="pref_trans_proxy_group">Transparenty Proxing (wymaga ROOT\'a)</string>
+  <string name="pref_trans_proxy_title">Transparenty Proxing</string>
+  <string name="pref_trans_proxy_summary">Automatyczne zastosowanie Tor\'a do aplikacji</string>
+  <string name="pref_transparent_all_title">Użyj Tor\'a dla wszystkich aplikacji</string>
+  <string name="pref_transparent_all_summary">Ruch proxy dla wszystkich aplikacji przez Tor\'a</string>
+  <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="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>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">O aplikacji Orbot</string>
   <string name="btn_next">Dalej</string>
-  <string name="btn_back">wstecz</string>
-  <string name="btn_finish">Koniec</string>
+  <string name="btn_back">Powrót</string>
+  <string name="btn_finish">ZakoÅ?cz</string>
   <string name="btn_okay">OK</string>
   <string name="btn_cancel">Anuluj</string>
-  <string name="wizard_details">Niektóre szczegóÅ?y o Orbocie</string>
-  <string name="wizard_details_msg">Orbot jest otwartÄ? aplikacjÄ? zawierajÄ?cÄ? Tora, LibEvent i Privoxy. Dostarcza lokalnego poÅ?rednika HTTP (8118) i SOCKS (9050) do sieci Tora. Orbot ma możliwoÅ?Ä?, na urzÄ?dzeniu uruchomionym z prawami administratora, wysyÅ?aÄ? caÅ?y ruch internetowy przez Tora.</string>
-  <string name="wizard_permissions_root">DostÄ?p zezwolony</string>
-  <string name="wizard_permissions_stock">Prawa dostepu Orbota</string>
-  <string name="wizard_premissions_msg_root">Doskonale! OdkryliÅ?my, że masz uprawnienia administratora wÅ?Ä?czone dla Orbota. BÄ?dziemy mÄ?drze korzystaÄ? z tej wÅ?adzy.</string>
-  <string name="wizard_permissions_msg_stock"> Podczas gdy nie jest to wymagane, Orbot może staÄ? siÄ? znacznie potÄ?żniejszym narzÄ?dziem, gdy masz prawa administratora na swoim urzÄ?dzeniu. Użyj przycisku poniżej, by daÄ? Orbotowi duży uprawnienia.</string>
-  <string name="wizard_permissions_no_root">JeÅ?li nie masz uprawnieÅ? administratora lub nie masz pojÄ?cia, o czym mówimy, używaj aplikacji skonfigurowanych do pracy z Orbotem.</string>
-  <string name="wizard_permissions_consent">Rozumiem i chcÄ? kontynuowaÄ? bez uprawnieÅ? administratora</string>
-  <string name="wizard_permission_enable_root">Daj uprawnienia administratora Orbotowi</string>
-  <string name="wizard_configure">Skonfiguruj ToryfikacjÄ?</string>
-  <string name="wizard_configure_msg">Orbot daje Ci możliwoÅ?Ä? przekierowania caÅ?ego ruchu aplikacji przez Tora ALBO wybrania aplikacji pojedynczo.</string>
-  <string name="wizard_configure_all">Przekierowuj wszystkie aplikacje przez Tora</string>
-  <string name="wizard_configure_select_apps">Wybierz poszczególne aplikacje dla Tora</string>
-  <string name="wizard_tips_tricks">Aplikacje skonfigurowane dla Orbota</string>
-  <string name="wizard_tips_msg">ZachÄ?camy do pobierania i używania aplikacji, które wiedzÄ?, jak Å?Ä?czyÄ? siÄ? bezpoÅ?rednio z Orbotem. Kliknij na poniższe przyciski, by zainstalowaÄ?.</string>
-  <string name="wizard_tips_otrchat">Gibberbot - Bezpieczny komunikator dla Androida</string>
-  <string name="wizard_tips_proxy">Ustawienia Proxy - NDowiedz siÄ?, jak konfiguroaÄ? aplikacje do wspóÅ?pracy z Orbotem</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">SzczegóÅ?y</string>
+  <string name="wizard_details_msg">Orbot jest aplikacjÄ? open-source zawierajÄ?cÄ? Tor\'a, LibEvent oraz Privoxy. Ortbot zapewnia local HTTP proxy (8118) oraz SOCKS proxy (9050) w sieci Tor. Na urzÄ?dzeniach z ROOT\'em możliwe jest przekierowanie caÅ?ego ruchu przez TOR\'a.</string>
+  <string name="wizard_permissions_root">Pozwolenie Udzielone</string>
+  <string name="wizard_permissions_stock">Pozwolenia Orbot\'a</string>
+  <string name="wizard_premissions_msg_root">Doskonale! WykryliÅ?my, że posiadasz pozwolenia Root\'a dla Orbot\'a.\nBÄ?dziemy używaÄ? tych możliwoÅ?ci mÄ?drze.</string>
+  <string name="wizard_permissions_msg_stock">ChoÄ? nie jest to wymagane, Orbot staje siÄ? potÄ?żniejszym narzÄ?dziem, jeżeli twoje urzÄ?dzenie posiada pozwolenia Root\'a. Użyj poniższego przycisku by daÄ? Orbot\'owi dodatkowe możliwoÅ?ci.</string>
+  <string name="wizard_permissions_no_root">Jeżeli nie masz pozwoleÅ? Root\'a lub nie wiesz o czym tak naprawdÄ? jest mowa, pamiÄ?taj tylko by używaÄ? aplikacji, które sÄ? przystosowane do pracy z Orbot\'em</string>
+  <string name="wizard_permissions_consent">Rozumiem, chcÄ? kontynuowaÄ? bez pozwoleÅ? \"Super użytkownika\"</string>
+  <string name="wizard_permission_enable_root">UdostÄ?pnij pozwolenia Root\'a dla Orbot\'a</string>
+  <string name="wizard_configure_msg">Orbot daje ci możliwoÅ?Ä? przekierowywania caÅ?Ä?go ruchu przez Tor\'a lub przekierowywania tylko wybranych aplikacji.</string>
+  <string name="wizard_configure_all">Przekieruj caÅ?y ruch przez Tor\'a</string>
+  <string name="wizard_configure_select_apps">Przekieruj wybrane aplikacje przez Tor\'a</string>
+  <string name="wizard_tips_tricks">Aplikacje z dziaÅ?ajÄ?cym Orbot\'em</string>
+  <string name="wizard_tips_msg">Poniższe aplikacje zostaÅ?y stworzone do pracy z Orbot\'em. NaciÅ?nij każdy z przycisków by zainstalowaÄ? aplikacje lub zrób to później wyszukujÄ?c je w Android Market/Google PLAY</string>
+  <string name="wizard_tips_otrchat">Gibberbot - bezpieczny klient \"instant messaging\" dla Androida</string>
+  <string name="wizard_tips_proxy">Ustawienia Proxy - Naucz siÄ? jak skonfigurowaÄ? aplikacje by dziaÅ?aÅ?y z Orbot\'em</string>
   <string name="wizard_proxy_help_info">Ustawienia Proxy</string>
-  <string name="wizard_proxy_help_msg">JeÅ?li aplikacja na Androida, której używasz ma obsÅ?ugÄ? proxy HTTP lub SOCKS, możesz skonfigurowaÄ? jÄ? do Å?Ä?czenia siÄ? z Orbotem i używania Tora.\n\n
-    Ustawienie hosta to 127.0.0.1 lub \"localhost\". Dla HTTP, numer portu to 8118. Dla SOCKS poÅ?rednik to 9050. Powinno siÄ? używaÄ? SOCKS4A lub SOCKS5, jeÅ?li to możliwe.
-    \n\n
-    Możesz dowiedzieÄ? siÄ? wiÄ?cej o przekierowaniu ruchu na Androidzie z FAQ pod adresem: http://tinyurl.com/proxyandroid
-    </string>
-  <string name="wizard_final">Orbot jest gotowy!</string>
-  <string name="wizard_final_msg">Setki tysiÄ?cy ludzi na caÅ?ym Å?wiecie używajÄ? Tora z różnych powodów: dziennikarze i blogerzy, dziaÅ?acze na rzecz praw czÅ?owieka, stróże prawa, żoÅ?nierze, korporacje, obywatele represyjnych reżimów i zwykli obywatele... teraz Ty też możesz!</string>
-  <string name="connect_first_time">PomyÅ?lnie poÅ?aczono z sieciÄ? Tora - ale to NIE oznacza, że Twoje urzÄ?dzenie jest bezpieczne. Możesz użyÄ? opcji \'Sprawdź\' w menu, aby przetestowaÄ? swojÄ? przeglÄ?darkÄ?. \n\nOdwiedź nas na https://guardianproject.info/apps/orbot lub wyÅ?lij email na help@xxxxxxxxxxxxxxxxxxxx, by dowiedzieÄ? siÄ? wiÄ?cej.</string>
-  <string name="tor_check">To otworzy TwojÄ? domyÅ?lnÄ? przeglÄ?darkÄ? na adresie https://check.torproject.org w celu sprawdzenia, czy Orbot jest skonfigurowany i jest poÄ?Å?czenie z Torem.</string>
-  <string name="pref_hs_group">UsÅ?ugi ukryte</string>
-  <string name="pref_general_group">Ogólne</string>
-  <string name="pref_start_boot_title">Uruchamiaj Orbota przy starcie</string>
-  <string name="pref_start_boot_summary">Automatycznie uruchamiaj Orbota i Å?Ä?cz siÄ? z Torem, gdy Twoje urzÄ?dzenie z Androidem siÄ? uruchomi</string>
-  <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>
-  <string name="wizard_warning_title">Warning</string>
-  <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>
-  <string name="wizard_permissions_title">Permissions</string>
-  <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string>
-  <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Your device 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>
-  <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 (tylko Android 1.x) - PrzeglÄ?darka zaprojektowana do prywatnoÅ?ci i dla Orbota</string>
-  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
-  <string name="wizard_transproxy_title">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">Typ Proxy</string>
-  <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Wpis Typ Proxy</string>
-  <string name="pref_proxy_host_title">Proxy Host</string>
-  <string name="pref_proxy_host_summary">Proxy server hostname</string>
-  <string name="pref_proxy_host_dialog">Enter Proxy Host</string>
-  <string name="pref_proxy_port_title">Proxy Port</string>
-  <string name="pref_proxy_port_summary">Proxy server port</string>
-  <string name="pref_proxy_port_dialog">Enter Proxy port</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying...</string>
-  <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string>
-  <string name="transproxy_rules_cleared">TransProxy rules cleared</string>
-  <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string>
-  <string name="privoxy_is_running_on_port_">Privoxy is running on port: </string>
-  <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string>
-  <string name="bridge_error">Bridge Error</string>
-  <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string>
-  <string name="send_email_for_bridges">Send an email to bridges@xxxxxxxxxxxxxx with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string>
-  <string name="error">Error</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string>
-  <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string>
-  <string name="exit_nodes">Exit Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string>
-  <string name="enter_exit_nodes">Enter Exit Nodes</string>
-  <string name="exclude_nodes">Exclude Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string>
-  <string name="enter_exclude_nodes">Enter Exclude Nodes</string>
-  <string name="strict_nodes">Strict Nodes</string>
-  <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string>
-  <string name="bridges">Bridges</string>
-  <string name="use_bridges">Use Bridges</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</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-alpha: 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">Nie można wystartowaÄ? aplikacji 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>
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_orweb">Orweb: PrzeglÄ?darka dziaÅ?ajÄ?ca z Tor\'em, posiadajÄ?ca wzmocnionÄ? ochronÄ? prywatnoÅ?ci.</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="pref_use_whispercore">Use WhisperCore</string>
+<string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
+  <string name="default_bridges"/>
+  <string name="powered_by">powered by The Tor Project </string>
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 42c6c8c..f7579bc 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -31,7 +31,6 @@
   <string name="button_clear_log">Limpar Log</string>
   <string name="menu_verify">Checar</string>
   <string name="menu_exit">Sair</string>
-  <string name="powered_by">powered by the Tor Project</string>
   <string name="press_to_start">- longo clique para iniciar -</string>
   <string name="pref_trans_proxy_group">Proxying Transparente (Requer Root)</string>
   <string name="pref_trans_proxy_title">Proxying Transparente</string>
@@ -55,6 +54,7 @@
   <string name="btn_finish">Terminar</string>
   <string name="btn_okay">Okay</string>
   <string name="btn_cancel">Cancelar</string>
+  <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Alguns detalher do Orbot</string>
   <string name="wizard_details_msg">Orbot é uma aplicação de código aberto que contém o Tor, LibEvent e Privoxy. Ela provê um proxy HTTP local (8118) e um proxy SOCKS (9050) dentro da rede Tor. Orbot também tem a habilidade, num dispositivo roteado, enviar todo o tráfego da Internet através do Tor</string>
   <string name="wizard_permissions_root">Permissão Concedida</string>
@@ -73,33 +73,38 @@
   <string name="wizard_tips_otrchat">Gibberbot - Cliente de mensagem instantânea seguro para Android</string>
   <string name="wizard_tips_proxy">Configurações de Proxy - Aprenda como configurar apps para trabalhar com Orbot</string>
   <string name="wizard_proxy_help_info">Configurações de Proxy</string>
-  <string name="wizard_proxy_help_msg">Se a app Android que você está usando puder suportar o uso de proxy HTTP ou SOCKS, então você pode configurar para conectar ao Orbot e usar o Tor.\n\n
-    As configurações de host são 127.0.0.1 ou \"localhost\". Para HTTP, a porta configurada é 8118. Para SOCKS, o proxy é 9050. Você deve usar SOCKS4A ou SOCKS5 se possível.
-    \n\n
-    Você pode aprender mais sobre proxy no Android através do FAQ em: http://tinyurl.com/proxyandroid
-    </string>
+  <string name="wizard_proxy_help_msg">Se a app Android que você está usando puder suportar o uso de proxy HTTP ou SOCKS, então você pode configurar para conectar ao Orbot e usar o Tor.\n\n\n    As configurações de host são 127.0.0.1 ou \"localhost\". Para HTTP, a porta configurada é 8118. Para SOCKS, o proxy é 9050. Você deve usar SOCKS4A ou SOCKS5 se possível.\n    \n\n\n    Você pode aprender mais sobre proxy no Android através do FAQ em: http://tinyurl.com/proxyandroid\n    </string>
   <string name="wizard_final">Orbot está pronto!</string>
   <string name="wizard_final_msg">Centenas de milhares de pessoas ao redor do mundo usam o Tor por uma enorme variedade de razões.\n\nJornalistas e bloggers, defensores dos direitos humanos, oficiais da lei, soldados, corporações, cidadãos em regimes repressivos, e somente cidadãos comuns... e agora você está pronto para usar, também! </string>
+  <!--END Welcome Wizard strings (DJH)-->
   <string name="connect_first_time">Você se conectou à rede Tor com sucesso - mas isto N�O significa que seu dispositivo é seguro. Você pode usar a opção \'Checar\' no menu para testar seu navegador.\n\nVisite-nos em https://guardianproject.info/apps/orbot ou envie um e-mail para help@xxxxxxxxxxxxxxxxxxxx para saber mais.</string>
   <string name="tor_check">Isto irá abrir seu navegador web em https://check.torproject.org com o intuito de ver se o Orbot está provavelmente configurado e você está conectado ao Tor.</string>
   <string name="pref_hs_group">Serviços Ocultos</string>
   <string name="pref_general_group">Geral</string>
   <string name="pref_start_boot_title">Iniciar Orbot no Boot</string>
   <string name="pref_start_boot_summary">Automaticamente iniciar o Orbot e conectar o Tor quando seu Android bootar.</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
   <string name="wizard_title_msg">Orbot trouxe Tor para Android!!\n\nTor ajuda você a se defender contra filtro de conteúdo, análises de tráfego e vigilância de rede que ameaçam sua privacidade, informação confidencial e relacionamentos pessoais.\n\nEste assistente irá ajudá-lo a configurar o Orbot e Tor no seu dispositivo.</string>
+  <!--Warning screen-->
   <string name="wizard_warning_title">Aviso</string>
   <string name="wizard_warning_msg">Simplesmente instalando o Orbot não irá automaticamente anonimizar seu tráfego móvel.\n\nVocê deve configurar apropriadamente o Orbot, seu dispositivo e outras apps para usar o Tor com sucesso.</string>
+  <!--Permissions screen-->
   <string name="wizard_permissions_title">Permissões</string>
   <string name="wizard_permissions_root_msg1">Você pode opcionalmente garantir ao Orbot acesso de \'Superusuário\' para habilitar recursos avançados, como um proxy transparente.</string>
   <string name="wizard_permissions_root_msg2">Se você não quiser fazer isto, tenha certeza de usar apps feitas para trabalhar com o Orbot.</string>
-  <string name="wizard_permissions_no_root_msg">Seu dispositivo não parece ser roteado ou prover um acesso \'Superusuário\'.\n\nDe maneira a você se beneficiar do Tor, você precisará usar apps criadas para trabalhar com o Orbot, ou que suportem configurações de proxy HTTP ou SOCKS.
-
-</string>
+  <string name="wizard_permissions_no_root_msg">Seu dispositivo não parece ser roteado ou prover um acesso \'Superusuário\'.\n\nDe maneira a você se beneficiar do Tor, você precisará usar apps criadas para trabalhar com o Orbot, ou que suportem configurações de proxy HTTP ou SOCKS.\n\n</string>
+  <!--TipsAndTricks screen-->
   <string name="wizard_tips_title">Apps Orbot Habilitadas</string>
   <string name="wizard_tips_gibberbot">Gibberbot: App segura para chat com encriptação sem gravação </string>
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
   <string name="wizard_tips_orweb">Orweb: Navegador de reforço de privacidade que trabalha através do Tor</string>
   <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
+  <!--<string name="wizard_tips_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">Proxy Transparente</string>
   <string name="wizard_transproxy_msg">Isto permite à suas apps automaticamente rodarem através da rede Tor sem nenhuma configuração.</string>
   <string name="wizard_transproxy_hint">(Selecione esta caixa se você não souber do que estamos falando)</string>
@@ -114,8 +119,9 @@
   <string name="pref_entrance_node">Nós de Entrada</string>
   <string name="pref_entrance_node_summary">Impressões digitais, apelidos, países e endereços para a primeira etapa</string>
   <string name="pref_entrance_node_dialog">Insira os Nós de Entrada</string>
-  <string name="pref_use_whispercore">Usar WhisperCore</string>
-  <string name="pref_use_whispercore_summary">Usar as NetFilter APIs proprietárias providas por WhisperSystems (requerido dispositivo com WhisperCore instalado)</string>
+  <!--<string name="pref_use_whispercore">Use WhisperCore</string>
+<string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
+  <string name="pref_proxy_title">Proxy de Saída da Rede</string>
   <string name="pref_proxy_type_title">Tipo de Proxy</string>
   <string name="pref_proxy_type_summary">Protocolo para usar no servidor proxy: HTTP, HTTPS, Socks4, Socks5</string>
   <string name="pref_proxy_type_dialog">Insira o Tipo de Proxy</string>
@@ -151,7 +157,9 @@
   <string name="use_only_these_specified_nodes">Use *somente* estes nós específicos</string>
   <string name="bridges">Pontes</string>
   <string name="use_bridges">Usar pontes</string>
+  <string name="bridges_obfuscated">Pontes Ofuscadas</string>
   <string name="enable_alternate_entrance_nodes_into_the_tor_network">Habilitar nós de entrada alternativos dentro da rede Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Habilitar se pontes configuradas forem pontes ofuscadas</string>
   <string name="ip_address_and_port_of_bridges">Endereço IP e porta das pontes</string>
   <string name="enter_bridge_addresses">Insira os Endereços das Pontes</string>
   <string name="relays">Retransmissores</string>
@@ -195,4 +203,12 @@
   <string name="error_installing_binares">Os binários Tor não estão disponíveis para serem instalados ou atualizados.</string>
   <string name="pref_use_persistent_notifications">Sempre manter o ícone na barra de tarefas quando o Orbot está conectado</string>
   <string name="pref_use_persistent_notifications_title">Notificações Sempre Ligadas</string>
+  <string name="notification_using_bridges">Pontes habilitadas!</string>
+  <string name="default_bridges"/>
+  <string name="set_locale_title">Selecionar Local</string>
+  <string name="set_locale_summary">Escolha o local e idioma para o Orbot</string>
+  <string name="wizard_locale_title">Escolha o Idioma</string>
+  <string name="wizard_locale_msg">Deixe o padrão ou troque o idioma atual</string>
+  <string name="powered_by">powered by the Tor Project</string>
+  <string name="btn_save_settings">Salvar Configurações</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 60ec1ee..3e7f20a 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -11,9 +11,6 @@
   <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_starting">Starting Tor client...</string>
-  <string name="tor_process_complete">complete.</string>
-  <string name="tor_process_waiting">waiting.</string>
   <string name="not_anonymous_yet">ATEN��O: A sua ligação ainda não é anónima! Por favor configure as suas aplicações para utilizarem o proxy HTTP 127.0.0.1:8118 ou o proxy SOCKS4A ou SOCKS5 127.0.0.1:9050</string>
   <string name="menu_home">Início</string>
   <string name="menu_browse">Explorar</string>
@@ -31,166 +28,43 @@
   <string name="button_clear_log">Limpar relatório</string>
   <string name="menu_verify">Check</string>
   <string name="menu_exit">Exit</string>
-  <string name="powered_by">powered by the Tor Project</string>
   <string name="press_to_start">- aguentar pressionado para iniciar - </string>
   <string name="pref_trans_proxy_group">Proxy Transparente (necessita de root)</string>
   <string name="pref_trans_proxy_title">Proxy Transparente</string>
-  <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string>
   <string name="pref_transparent_all_title">Tor em Tudo</string>
   <string name="pref_transparent_all_summary">Passar todo o tráfego das apps pelo 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">Lista de Portos</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">Introduza portos para proxy</string>
-  <string name="pref_has_root">Request Root Access</string>
-  <string name="pref_has_root_summary">&amp;gt;Request root access for transparent proxying</string>
+  <string name="pref_transparent_port_title">Lista de Portas</string>
+  <string name="pref_transparent_port_dialog">Introduza portas para proxy</string>
+  <string name="pref_has_root">Pedir Acesso como Root</string>
+  <string name="pref_has_root_summary">Request root access for transparent proxying</string>
   <string name="status_install_success">Binários do Tor instalados com sucesso!</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">Erro de Aplicação</string>
   <string name="wizard_title">Orbot</string>
   <string name="wizard_btn_tell_me_more">Sobre o Orbot</string>
   <string name="btn_next">Próximo</string>
-  <string name="btn_back">Back</string>
-  <string name="btn_finish">Finish</string>
-  <string name="btn_okay">Okay</string>
-  <string name="btn_cancel">Cancel</string>
-  <string name="wizard_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
-    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
-    You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid
-    </string>
-  <string name="wizard_final">Orbot is ready!</string>
-  <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string>
-  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help@xxxxxxxxxxxxxxxxxxxx to learn more.</string>
-  <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string>
-  <string name="pref_hs_group">Hidden Services</string>
-  <string name="pref_general_group">General</string>
-  <string name="pref_start_boot_title">Start Orbot on Boot</string>
-  <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
-  <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>
-  <string name="wizard_warning_title">Warning</string>
-  <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>
-  <string name="wizard_permissions_title">Permissions</string>
-  <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string>
-  <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Your device 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>
-  <string name="wizard_tips_title">Orbot-Enabled Apps</string>
-  <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string>
-  <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
-  <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string>
-  <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
-  <string name="wizard_transproxy_title">Transparent Proxying</string>
-  <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string>
-  <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string>
-  <string name="wizard_transproxy_none">None</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string>
-  <string name="button_grant_superuser">Request Superuser Access</string>
-  <string name="pref_select_apps">Select Apps</string>
-  <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string>
-  <string name="pref_node_configuration">Node Configuration</string>
-  <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string>
-  <string name="pref_entrance_node">Entrance Nodes</string>
-  <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string>
-  <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string>
-  <string name="pref_use_whispercore">Use WhisperCore</string>
-  <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>
-  <string name="pref_proxy_type_title">Proxy Type</string>
-  <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Enter Proxy Type</string>
-  <string name="pref_proxy_host_title">Proxy Host</string>
-  <string name="pref_proxy_host_summary">Proxy server hostname</string>
-  <string name="pref_proxy_host_dialog">Enter Proxy Host</string>
-  <string name="pref_proxy_port_title">Proxy Port</string>
-  <string name="pref_proxy_port_summary">Proxy server port</string>
-  <string name="pref_proxy_port_dialog">Enter Proxy port</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying...</string>
-  <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string>
-  <string name="transproxy_rules_cleared">TransProxy rules cleared</string>
-  <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string>
-  <string name="privoxy_is_running_on_port_">Privoxy is running on port: </string>
-  <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string>
-  <string name="bridge_error">Bridge Error</string>
-  <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string>
-  <string name="send_email_for_bridges">Send an email to bridges@xxxxxxxxxxxxxx with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string>
-  <string name="error">Error</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string>
-  <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string>
-  <string name="exit_nodes">Exit Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string>
-  <string name="enter_exit_nodes">Enter Exit Nodes</string>
-  <string name="exclude_nodes">Exclude Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string>
-  <string name="enter_exclude_nodes">Enter Exclude Nodes</string>
-  <string name="strict_nodes">Strict Nodes</string>
-  <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string>
-  <string name="bridges">Bridges</string>
-  <string name="use_bridges">Use Bridges</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</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="btn_back">Anterior</string>
+  <string name="btn_finish">Terminar</string>
+  <string name="btn_okay">OK</string>
+  <string name="btn_cancel">Cancelar</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Alguns detalhes sobre o Orbot</string>
+  <string name="wizard_permissions_root">Autorização concedida</string>
+  <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>
+  <!--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 name="powered_by">powered by the Tor Project</string>
 </resources>
diff --git a/res/values-rs-rAR/strings.xml b/res/values-rs-rAR/strings.xml
new file mode 100644
index 0000000..dc0d516
--- /dev/null
+++ b/res/values-rs-rAR/strings.xml
@@ -0,0 +1,58 @@
+<?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">reiniciar Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot está iniciándose...</string>
+  <string name="status_activated">Conectado a la red Tor</string>
+  <string name="status_disabled">\"Orbot está Desactivado</string>
+  <string name="status_shutting_down">Orbot se está apagando</string>
+  <string name="tor_process_complete">Completar</string>
+  <string name="not_anonymous_yet">CIUDADO: Tu tráfico no es anónimo aún! Por favor configura tus aplicaciones para que usen el HTTP proxy 127.0.0.1:8118 o SOCKS4A o el proxy SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Inicio</string>
+  <string name="menu_browse">Navegar</string>
+  <string name="menu_settings">Configuración</string>
+  <string name="menu_log">Registro</string>
+  <string name="menu_info">Ayuda</string>
+  <string name="menu_apps">Apps</string>
+  <string name="menu_start">Iniciar</string>
+  <string name="menu_stop">Detener</string>
+  <string name="menu_about">Acerca de</string>
+  <string name="menu_wizard">Asistente</string>
+  <string name="button_help">Ayuda</string>
+  <string name="button_close">Cerrar</string>
+  <string name="button_about">Acerca de</string>
+  <string name="button_clear_log">Borrar Registros</string>
+  <string name="menu_verify">Chequear</string>
+  <string name="menu_exit">Salir</string>
+  <string name="pref_trans_proxy_group">Proxying Transparente (Requiere Root)</string>
+  <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="btn_next">Siguiente</string>
+  <string name="btn_back">Atrás</string>
+  <string name="btn_finish">Finalizar</string>
+  <string name="btn_cancel">Cancelar</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_final">Orbot está listo!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">General</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="default_bridges"/>
+  <string name="powered_by">potenciado por The Tor Project</string>
+</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ea44987..aa89294 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -14,57 +14,57 @@
   <string name="tor_process_starting">Ð?апÑ?Ñ?каеÑ?Ñ?Ñ? клиенÑ? Tor...</string>
   <string name="tor_process_complete">завеÑ?Ñ?ено.</string>
   <string name="tor_process_waiting">ожидание.</string>
-  <string name="not_anonymous_yet">Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?! Ð?аÑ? поÑ?ок даннÑ?Ñ? еÑ?е не анонимен! Ð?ожалÑ?йÑ?Ñ?а, наÑ?Ñ?Ñ?ойÑ?е Ñ?вои пÑ?иложениÑ? на иÑ?полÑ?зование HTTP пÑ?окÑ?и 127.0.0.1:8118 или SOCKS4A или SOCKS5 пÑ?окÑ?и 127.0.0.1:9050</string>
+  <string name="not_anonymous_yet">Ð?Ð Ð?Ð?УÐ?Ð Ð?Ð?Ð?Ð?Ð?Ð?Ð?: Ð?аÑ? Ñ?Ñ?аÑ?ик еÑ?е не анонимен! Ð?ожалÑ?йÑ?Ñ?а, наÑ?Ñ?Ñ?ойÑ?е Ñ?вои пÑ?иложениÑ? на иÑ?полÑ?зование HTTP пÑ?окÑ?и 127.0.0.1:8118 или же SOCKS4A или SOCKS5 пÑ?окÑ?и 127.0.0.1:9050</string>
   <string name="menu_home">Ð?омаÑ?нÑ?Ñ? Ñ?Ñ?Ñ?аниÑ?а</string>
   <string name="menu_browse">Ð?Ñ?оÑ?моÑ?Ñ?</string>
-  <string name="menu_settings">Ð?аÑ?амеÑ?Ñ?Ñ?</string>
+  <string name="menu_settings">Ð?аÑ?Ñ?Ñ?ойки</string>
   <string name="menu_log">Ð?Ñ?Ñ?нал</string>
   <string name="menu_info">СпÑ?авка</string>
   <string name="menu_apps">Ð?Ñ?иложениÑ?</string>
   <string name="menu_start">Ð?апÑ?Ñ?Ñ?иÑ?Ñ?</string>
   <string name="menu_stop">Ð?Ñ?Ñ?ановиÑ?Ñ?</string>
   <string name="menu_about">Ð? пÑ?огÑ?амме</string>
-  <string name="menu_wizard">Wizard</string>
+  <string name="menu_wizard">Ð?аÑ?Ñ?еÑ?</string>
   <string name="button_help">СпÑ?авка</string>
   <string name="button_close">Ð?акÑ?Ñ?Ñ?Ñ?</string>
   <string name="button_about">Ð? пÑ?огÑ?амме</string>
   <string name="button_clear_log">Ð?Ñ?иÑ?Ñ?иÑ?Ñ? жÑ?Ñ?нал</string>
   <string name="menu_verify">Ð?Ñ?овеÑ?ка</string>
   <string name="menu_exit">Ð?Ñ?Ñ?од</string>
-  <string name="powered_by">powered by the Tor Project</string>
-  <string name="press_to_start">- long press to start -</string>
-  <string name="pref_trans_proxy_group">Ð?Ñ?озÑ?аÑ?нÑ?й пÑ?окÑ?и (ТÑ?ебÑ?Ñ?Ñ?Ñ?Ñ? пÑ?ивилегии root)</string>
+  <string name="press_to_start">- долгое нажаÑ?ие длÑ? запÑ?Ñ?ка -</string>
+  <string name="pref_trans_proxy_group">Ð?Ñ?озÑ?аÑ?нÑ?й пÑ?окÑ?и (ТÑ?ебÑ?Ñ?Ñ?Ñ?Ñ? root)</string>
   <string name="pref_trans_proxy_title">Ð?Ñ?озÑ?аÑ?нÑ?й пÑ?окÑ?и</string>
-  <string name="pref_trans_proxy_summary">Ð?вÑ?омаÑ?иÑ?еÑ?каÑ? Ñ?оÑ?иÑ?икаÑ?иÑ? пÑ?иложений</string>
+  <string name="pref_trans_proxy_summary">Ð?вÑ?омаÑ?иÑ?еÑ?каÑ? Tor-иÑ?икаÑ?иÑ? Ð?Ñ?иложений</string>
   <string name="pref_transparent_all_title">Ð?апÑ?авлÑ?Ñ?Ñ? вÑ?е Ñ?еÑ?ез Tor</string>
-  <string name="pref_transparent_all_summary">ТÑ?аÑ?ик вÑ?еÑ? пÑ?иложений бÑ?деÑ? пÑ?оÑ?одиÑ?Ñ? Ñ?еÑ?ез Tor</string>
+  <string name="pref_transparent_all_summary">Ð?апÑ?авлÑ?Ñ?Ñ? Ñ?Ñ?аÑ?ик вÑ?еÑ? пÑ?иложений Ñ?еÑ?ез Tor</string>
   <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
-  <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
-  <string name="pref_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="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_summary">Ð?апÑ?оÑ?иÑ?Ñ? root доÑ?Ñ?Ñ?п длÑ? пÑ?озÑ?аÑ?ной пÑ?окÑ?иÑ?икаÑ?ии</string>
   <string name="status_install_success">Ð?Ñ?огÑ?амма Tor Ñ?Ñ?пеÑ?но Ñ?Ñ?Ñ?ановлена!</string>
   <string name="status_install_fail">Ð?е Ñ?далоÑ?Ñ? Ñ?Ñ?Ñ?ановиÑ?Ñ? пÑ?огÑ?аммÑ? Tor. Ð?ожалÑ?йÑ?Ñ?а, пÑ?овеÑ?Ñ?Ñ?е Ñ?иÑ?Ñ?емнÑ?й жÑ?Ñ?нал и Ñ?ообÑ?иÑ?е нам: tor-assistants@xxxxxxxxxxxxxx</string>
   <string name="title_error">Ð?Ñ?ибка пÑ?иложениÑ?</string>
-  <string name="wizard_title">Ð?обÑ?о пожаловаÑ?Ñ? в Orbot</string>
+  <string name="wizard_title">Orbot</string>
   <string name="wizard_btn_tell_me_more">Ð?б Orbot</string>
   <string name="btn_next">Ð?пеÑ?ед</string>
   <string name="btn_back">Ð?азад</string>
   <string name="btn_finish">Ð?авеÑ?Ñ?иÑ?Ñ?</string>
-  <string name="btn_okay">Ok</string>
+  <string name="btn_okay">OK</string>
   <string name="btn_cancel">Ð?Ñ?мена</string>
+  <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Ð?екоÑ?оÑ?Ñ?е Ñ?веденÑ?Ñ? о пÑ?огÑ?амме Orbot</string>
-  <string name="wizard_details_msg">Orbot - Ñ?Ñ?о пÑ?иложение Ñ? оÑ?кÑ?Ñ?Ñ?Ñ?м кодом, коÑ?оÑ?ое Ñ?одеÑ?жиÑ? Tor, LibEvent и Privoxy. Ð?на обеÑ?пеÑ?иваеÑ? Ñ?абоÑ?Ñ? локалÑ?ного HTTP пÑ?окÑ?и (8118) и SOCKS пÑ?окÑ?и (9050) в Ñ?еÑ?и Tor. Orbot Ñ?акже позволÑ?еÑ?, из коÑ?нÑ? Ñ?Ñ?Ñ?Ñ?ойÑ?ва, пеÑ?еÑ?Ñ?лаÑ?Ñ? веÑ?Ñ? инÑ?еÑ?неÑ? Ñ?Ñ?аÑ?ик Ñ?еÑ?ез Tor.</string>
+  <string name="wizard_details_msg">Orbot - Ñ?Ñ?о пÑ?иложение Ñ? оÑ?кÑ?Ñ?Ñ?Ñ?м иÑ?Ñ?однÑ?м кодом, коÑ?оÑ?ое Ñ?одеÑ?жиÑ? Tor, LibEvent и Privoxy. Ð?но пÑ?едоÑ?Ñ?авлÑ?еÑ? локалÑ?нÑ?й HTTP пÑ?окÑ?и (8118) и SOCKS пÑ?окÑ?и (9050) в Ñ?еÑ?Ñ? Tor. Orbot Ñ?акже позволÑ?еÑ? на Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?ваÑ? Ñ? пÑ?авами root пеÑ?еÑ?Ñ?лаÑ?Ñ? веÑ?Ñ? инÑ?еÑ?неÑ? Ñ?Ñ?аÑ?ик Ñ?еÑ?ез Tor.</string>
   <string name="wizard_permissions_root">РазÑ?еÑ?ение полÑ?Ñ?ено</string>
   <string name="wizard_permissions_stock">РазÑ?еÑ?ениÑ? Orbot</string>
-  <string name="wizard_premissions_msg_root">Ð?Ñ?лиÑ?но! Ð?Ñ? опÑ?еделили, Ñ?Ñ?о доÑ?Ñ?Ñ?п к коÑ?невомÑ? каÑ?алогÑ?  в Orbot Ñ?азÑ?еÑ?ен. Ð?Ñ? бÑ?дем иÑ?полÑ?зоваÑ?Ñ? Ñ?Ñ?о Ñ? Ñ?мом.</string>
-  <string name="wizard_permissions_msg_stock">ХоÑ?Ñ? Ñ?Ñ?о не Ñ?Ñ?ебÑ?еÑ?Ñ?Ñ?, Orbot можеÑ? бÑ?Ñ?Ñ? более моÑ?нÑ?м инÑ?Ñ?Ñ?Ñ?менÑ?ом, еÑ?ли доÑ?Ñ?Ñ?п к коÑ?невомÑ? каÑ?алогÑ? Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?ва Ñ?азÑ?еÑ?ен. Ð?ажимиÑ?е на кнопкÑ? ниже и дайÑ?е Orbot Ñ?Ñ?пеÑ?Ñ?илÑ?!</string>
-  <string name="wizard_permissions_no_root">Ð?Ñ?ли Ñ? ваÑ? неÑ? доÑ?Ñ?Ñ?па к коÑ?невомÑ? каÑ?алогÑ? или вÑ? понÑ?Ñ?иÑ? не имееÑ?е о Ñ?ем мÑ? говоÑ?им, пÑ?оÑ?Ñ?о Ñ?бедиÑ?еÑ?Ñ?, Ñ?Ñ?о иÑ?полÑ?зÑ?еÑ?е пÑ?иложениÑ?, Ñ?азÑ?абоÑ?аннÑ?е длÑ? Orbot.</string>
-  <string name="wizard_permissions_consent">Я вÑ?е понÑ?л, пÑ?одолжÑ? без доÑ?Ñ?Ñ?па к коÑ?нÑ?</string>
-  <string name="wizard_permission_enable_root">Ð?аÑ?Ñ? доÑ?Ñ?Ñ?п к коÑ?Ñ? пÑ?огÑ?амме Orbot</string>
-  <string name="wizard_configure">Ð?аÑ?Ñ?Ñ?оиÑ?Ñ? ТоÑ?иÑ?икаÑ?иÑ?</string>
+  <string name="wizard_premissions_msg_root">Ð?Ñ?лиÑ?но! Ð?Ñ? опÑ?еделили, Ñ?Ñ?о вÑ? пÑ?едоÑ?Ñ?авили root пÑ?ава длÑ? Orbot. Ð?Ñ? бÑ?дем иÑ?полÑ?зоваÑ?Ñ? Ñ?Ñ?Ñ? возможноÑ?Ñ?Ñ? Ñ? Ñ?мом.</string>
+  <string name="wizard_permissions_msg_stock"> ХоÑ?Ñ? Ñ?Ñ?о и не Ñ?Ñ?ебÑ?еÑ?Ñ?Ñ?, Orbot можеÑ? бÑ?Ñ?Ñ? более моÑ?нÑ?м инÑ?Ñ?Ñ?Ñ?менÑ?ом, еÑ?ли ваÑ?е Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?во имееÑ? пÑ?ава root. Ð?ажмиÑ?е на кнопкÑ? ниже и дайÑ?е Orbot Ñ?Ñ?пеÑ?Ñ?илÑ?! </string>
+  <string name="wizard_permissions_no_root">Ð?Ñ?ли Ñ? ваÑ? неÑ? root пÑ?ав или вÑ? не имееÑ?е пÑ?едÑ?Ñ?авлениÑ? о Ñ?ем мÑ? говоÑ?им, пÑ?оÑ?Ñ?о Ñ?бедиÑ?еÑ?Ñ?, Ñ?Ñ?о иÑ?полÑ?зÑ?еÑ?е пÑ?иложениÑ?, Ñ?азÑ?абоÑ?аннÑ?е длÑ? Orbot.</string>
+  <string name="wizard_permissions_consent">Я понимаÑ? и Ñ?оÑ?Ñ? пÑ?одолжиÑ?Ñ? без пÑ?ав Ñ?Ñ?пеÑ?полÑ?зоваÑ?елÑ?</string>
+  <string name="wizard_permission_enable_root">Ð?аÑ?Ñ? root пÑ?ава Orbot</string>
+  <string name="wizard_configure">Ð?аÑ?Ñ?Ñ?оиÑ?Ñ? Tor-иÑ?икаÑ?иÑ?</string>
   <string name="wizard_configure_msg">Ð?Ñ?огÑ?амма Orbot даеÑ? вам возможноÑ?Ñ?Ñ? маÑ?Ñ?Ñ?Ñ?Ñ?изиÑ?оваÑ?Ñ? Ñ?Ñ?аÑ?ик вÑ?еÑ? пÑ?иложений Ñ?еÑ?ез Tor Ð?Ð?Ð? вÑ?бÑ?аÑ?Ñ? пÑ?иложениÑ? длÑ? маÑ?Ñ?Ñ?Ñ?Ñ?изаÑ?ии Ñ?амоÑ?Ñ?оÑ?Ñ?елÑ?но.</string>
   <string name="wizard_configure_all">Ð?аÑ?Ñ?Ñ?Ñ?Ñ?изиÑ?оваÑ?Ñ? вÑ?е пÑ?иложениÑ? Ñ?еÑ?ез Tor</string>
   <string name="wizard_configure_select_apps">Ð?Ñ?беÑ?иÑ?е пÑ?иложениÑ? длÑ? маÑ?Ñ?Ñ?Ñ?Ñ?изаÑ?ии Ñ?еÑ?ез Tor</string>
@@ -72,33 +72,42 @@
   <string name="wizard_tips_msg">Ð?Ñ? Ñ?овеÑ?Ñ?ем вам Ñ?каÑ?аÑ?Ñ? и иÑ?полÑ?зоваÑ?Ñ? пÑ?иложениÑ?, коÑ?оÑ?Ñ?е Ñ?меÑ?Ñ? Ñ?абоÑ?аÑ?Ñ? напÑ?Ñ?мÑ?Ñ? Ñ?еÑ?ез Orbot. Ð?ажмиÑ?е на кнопки ниже, Ñ?Ñ?обÑ? запÑ?Ñ?Ñ?иÑ?Ñ? пÑ?оÑ?еÑ?Ñ? Ñ?Ñ?Ñ?ановки.</string>
   <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
   <string name="wizard_tips_proxy">Ð?аÑ?Ñ?Ñ?ойки пÑ?окÑ?и - Ñ?знайÑ?е как наÑ?Ñ?Ñ?оиÑ?Ñ? пÑ?иложениÑ? длÑ? Ñ?абоÑ?Ñ? Ñ? Orbot</string>
+  <string name="wizard_tips_duckgo">Ð?Ñ?иложение поиÑ?ковой Ñ?иÑ?Ñ?емÑ? Duckduckgo</string>
+  <string name="wizard_tips_firefox">Firefox Ñ? дополнением Proxy Mobile (поÑ?ле оÑ?делÑ?ной Ñ?Ñ?Ñ?ановки)</string>
+  <string name="wizard_tips_twitter">Twitter поддеÑ?живаеÑ? http пÑ?окÑ?и \"localhost:8118\"</string>
   <string name="wizard_proxy_help_info">Ð?аÑ?Ñ?Ñ?ойки Ð?Ñ?окÑ?и</string>
-  <string name="wizard_proxy_help_msg">Ð?Ñ?ли иÑ?полÑ?зÑ?емое вами пÑ?иложение длÑ? Android поддеÑ?живаеÑ? HTTP или SOCKS, Ñ?о вÑ? можеÑ?е наÑ?Ñ?оиÑ?Ñ? его на подклÑ?Ñ?ение к Orbot и иÑ?полÑ?зование Tor.\n\n
-    Ð?аÑ?Ñ?Ñ?ойки Ñ?оÑ?Ñ?а (или localhost) - 127.0.0.1. Ð?лÑ? HTTP, номеÑ? поÑ?Ñ?а - 8118. Ð?лÑ? SOCKS пÑ?окÑ?и - 9050. Ð?о возможноÑ?Ñ?и иÑ?полÑ?зÑ?йÑ?е SOCKS4A или SOCKS5.
-    \n\n
-    Ð?Ñ? можеÑ?е Ñ?знаÑ?Ñ? болÑ?Ñ?е о Ñ?абоÑ?е Ñ?еÑ?ез пÑ?окÑ?и на Android, пÑ?оÑ?иÑ?ав Ñ?Ñ?оÑ? FAQ: http://tinyurl.com/proxyandroid
-    </string>
+  <string name="wizard_proxy_help_msg">Ð?Ñ?ли иÑ?полÑ?зÑ?емое вами пÑ?иложение длÑ? Android поддеÑ?живаеÑ? HTTP или SOCKS пÑ?окÑ?и, Ñ?о вÑ? можеÑ?е наÑ?Ñ?Ñ?оиÑ?Ñ? его на подклÑ?Ñ?ение к Orbot и иÑ?полÑ?зование Tor.\n\n\n    Ð?наÑ?ение Ñ?оÑ?Ñ?а - 127.0.0.1 или \"localhost\". Ð?лÑ? HTTP, номеÑ? поÑ?Ñ?а - 8118. Ð?лÑ? SOCKS пÑ?окÑ?и - 9050. Ð?о возможноÑ?Ñ?и иÑ?полÑ?зÑ?йÑ?е SOCKS4A или SOCKS5.\n\n    \n    Ð?Ñ? можеÑ?е Ñ?знаÑ?Ñ? болÑ?Ñ?е о Ñ?абоÑ?е Ñ?еÑ?ез пÑ?окÑ?и на Android, пÑ?оÑ?иÑ?ав Ñ?Ñ?оÑ? FAQ: http://tinyurl.com/proxyandroid\n    </string>
   <string name="wizard_final">Ð?Ñ?огÑ?амма Orbot гоÑ?ова к иÑ?полÑ?зованиÑ?!</string>
   <string name="wizard_final_msg">СоÑ?ни Ñ?Ñ?Ñ?Ñ?Ñ? лÑ?дей по вÑ?емÑ? миÑ?Ñ? иÑ?полÑ?зÑ?Ñ?Ñ? Tor по Ñ?азлиÑ?нÑ?м пÑ?иÑ?инам: жÑ?Ñ?налиÑ?Ñ?Ñ? и блоггеÑ?Ñ?, акÑ?ивиÑ?Ñ?Ñ? оÑ?ганизаÑ?ий, вÑ?Ñ?Ñ?Ñ?паÑ?Ñ?иÑ? в заÑ?иÑ?Ñ? пÑ?ав Ñ?еловека, Ñ?Ñ?дебнÑ?е иÑ?полниÑ?ели, Ñ?олдаÑ?Ñ?, коÑ?поÑ?аÑ?ии, гÑ?аждане Ñ?Ñ?Ñ?ан Ñ? Ñ?епÑ?еÑ?Ñ?ивнÑ?м Ñ?ежимом, и пÑ?оÑ?Ñ?Ñ?е лÑ?ди... а Ñ?епеÑ?Ñ? гоÑ?овÑ? и вÑ?!</string>
-  <string name="connect_first_time"> Ð?Ñ? Ñ?Ñ?пеÑ?но подклÑ?Ñ?илиÑ?Ñ? к Ñ?еÑ?и Tor, но Ñ?Ñ?о Ð?Ð? знаÑ?иÑ?, Ñ?Ñ?о ваÑ?е Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?во безопаÑ?но. Ð?Ñ? можеÑ?е воÑ?полÑ?зоваÑ?Ñ?Ñ?Ñ? Ñ?Ñ?нкÑ?ией \'Ð?Ñ?овеÑ?ки\' из менÑ?, Ñ?Ñ?обÑ? поÑ?еÑ?Ñ?иÑ?оваÑ?Ñ? ваÑ? бÑ?аÑ?зеÑ?. \n\nÐ?оÑ?еÑ?иÑ?е наÑ? Ñ?айÑ?: https://guardianproject.info/apps/orbot или оÑ?пÑ?авÑ?Ñ?е нам пиÑ?Ñ?мо на адÑ?еÑ?: help@xxxxxxxxxxxxxxxxxxxx, Ñ?Ñ?обÑ? Ñ?знаÑ?Ñ? болÑ?Ñ?е.</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Ð?Ñ? Ñ?Ñ?пеÑ?но подклÑ?Ñ?илиÑ?Ñ? к Ñ?еÑ?и Tor, но Ñ?Ñ?о Ð?Ð? знаÑ?иÑ?, Ñ?Ñ?о ваÑ?е Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?во безопаÑ?но. Ð?Ñ? можеÑ?е воÑ?полÑ?зоваÑ?Ñ?Ñ?Ñ? Ñ?Ñ?нкÑ?ией \'Ð?Ñ?овеÑ?ка\' из менÑ?, Ñ?Ñ?обÑ? пÑ?оÑ?еÑ?Ñ?иÑ?оваÑ?Ñ? ваÑ? бÑ?аÑ?зеÑ?.\n\nÐ?оÑ?еÑ?иÑ?е наÑ? Ñ?айÑ?: https://guardianproject.info/apps/orbot или оÑ?пÑ?авÑ?Ñ?е нам пиÑ?Ñ?мо на адÑ?еÑ? help@xxxxxxxxxxxxxxxxxxxx, Ñ?Ñ?обÑ? Ñ?знаÑ?Ñ? болÑ?Ñ?е.</string>
   <string name="tor_check">ЭÑ?о пÑ?иведеÑ? к запÑ?Ñ?кÑ? веб-бÑ?аÑ?зеÑ?а, вÑ?бÑ?анного на ваÑ?ем компÑ?Ñ?Ñ?еÑ?е по-Ñ?молÑ?аниÑ?, и подклÑ?Ñ?ениÑ? к Ñ?айÑ?Ñ? https://check.torproject.org, Ñ? Ñ?елÑ?Ñ? пÑ?овеÑ?ки пÑ?авилÑ?ноÑ?Ñ?и Ñ?абоÑ?Ñ? Orbot и опÑ?еделениÑ?, подклÑ?Ñ?енÑ? ли вÑ? к Ñ?еÑ?и Tor.</string>
   <string name="pref_hs_group">СкÑ?Ñ?Ñ?Ñ?е Ñ?еÑ?виÑ?Ñ?</string>
   <string name="pref_general_group">General</string>
   <string name="pref_start_boot_title">Start Orbot on Boot</string>
   <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
-  <string name="wizard_title_msg">Orbot позволÑ?еÑ? иÑ?полÑ?зоваÑ?Ñ? Tor в Android!\n\nTor позволÑ?еÑ? вам заÑ?иÑ?иÑ?Ñ?Ñ?Ñ? оÑ? Ñ?илÑ?Ñ?Ñ?аÑ?ии конÑ?енÑ?а, анализа Ñ?Ñ?аÑ?ика и наблÑ?дениÑ? за Ñ?еÑ?Ñ?Ñ?, Ñ?Ñ?о Ñ?Ñ?авиÑ? под Ñ?гÑ?озÑ? пÑ?иваÑ?ноÑ?Ñ?Ñ?, конÑ?иденÑ?иалÑ?нÑ?Ñ? инÑ?оÑ?маÑ?иÑ? и лиÑ?нÑ?е оÑ?ноÑ?ениÑ?.\n\nЭÑ?оÑ? маÑ?Ñ?еÑ? поможеÑ? вам наÑ?Ñ?Ñ?оиÑ?Ñ? Orbot и Tor на ваÑ?ем Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?ве.</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot позволÑ?еÑ? иÑ?полÑ?зоваÑ?Ñ? Tor на Android!\n\nTor позволÑ?еÑ? вам заÑ?иÑ?иÑ?Ñ?Ñ?Ñ? оÑ? Ñ?илÑ?Ñ?Ñ?аÑ?ии Ñ?одеÑ?жимого, анализа Ñ?Ñ?аÑ?ика и наблÑ?дениÑ? за Ñ?еÑ?Ñ?Ñ?, коÑ?оÑ?Ñ?е Ñ?Ñ?авÑ?Ñ? под Ñ?гÑ?озÑ? пÑ?иваÑ?ноÑ?Ñ?Ñ?, конÑ?иденÑ?иалÑ?нÑ?Ñ? инÑ?оÑ?маÑ?иÑ? и лиÑ?нÑ?е оÑ?ноÑ?ениÑ?.\n\nЭÑ?оÑ? маÑ?Ñ?еÑ? поможеÑ? вам наÑ?Ñ?Ñ?оиÑ?Ñ? Orbot и Tor на ваÑ?ем Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?ве.</string>
+  <!--Warning screen-->
   <string name="wizard_warning_title">Ð?Ñ?едÑ?пÑ?еждение</string>
-  <string name="wizard_warning_msg">Ð?Ñ?оÑ?Ñ?о Ñ?Ñ?Ñ?ановка Orbot не бÑ?деÑ? авÑ?омаÑ?иÑ?еÑ?ки анонимиÑ?оваÑ?Ñ? ваÑ? мобилÑ?нÑ?й Ñ?Ñ?аÑ?ик.\n\nÐ?Ñ? должнÑ? пÑ?авилÑ?но наÑ?Ñ?Ñ?оиÑ?Ñ? Orbot, ваÑ?е Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?во и дÑ?Ñ?гие пÑ?иложениÑ?, Ñ?Ñ?о бÑ? Ñ?Ñ?пеÑ?но иÑ?полÑ?зоваÑ?Ñ? Tor.</string>
+  <string name="wizard_warning_msg">Ð?Ñ?оÑ?Ñ?о Ñ?Ñ?Ñ?ановка Orbot не Ñ?делаеÑ? авÑ?омаÑ?иÑ?еÑ?ки ваÑ? мобилÑ?нÑ?й Ñ?Ñ?аÑ?ик анонимнÑ?м.\n\nÐ?Ñ? должнÑ? пÑ?авилÑ?но наÑ?Ñ?Ñ?оиÑ?Ñ? Orbot, ваÑ?е Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?во и дÑ?Ñ?гие пÑ?иложениÑ?, Ñ?Ñ?о бÑ? Ñ?Ñ?пеÑ?но иÑ?полÑ?зоваÑ?Ñ? Tor.</string>
+  <!--Permissions screen-->
   <string name="wizard_permissions_title">РазÑ?еÑ?ениÑ?</string>
   <string name="wizard_permissions_root_msg1">Ð?Ñ? Ñ?ак же можеÑ?е по желаниÑ? даÑ?Ñ? Orbot пÑ?ава \'СÑ?пеÑ?полÑ?зоваÑ?елÑ?\' длÑ? доÑ?Ñ?Ñ?па к пÑ?одвинÑ?Ñ?Ñ?м возможноÑ?Ñ?Ñ?м, Ñ?ипа Ð?Ñ?озÑ?аÑ?наÑ? Ð?Ñ?окÑ?иÑ?икаÑ?иÑ?.</string>
   <string name="wizard_permissions_root_msg2">Ð?Ñ?ли вÑ? не Ñ?оÑ?иÑ?е делаÑ?Ñ? Ñ?Ñ?о, пожалÑ?йÑ?Ñ?а, Ñ?доÑ?Ñ?овеÑ?Ñ?Ñ?еÑ?Ñ?, Ñ?Ñ?о иÑ?полÑ?зÑ?еÑ?е пÑ?иложениÑ? Ñ?озданнÑ?е длÑ? Ñ?абоÑ?Ñ? Ñ? Orbot.</string>
-  <string name="wizard_permissions_no_root_msg">Ð?оÑ?оже ваÑ?е Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?во не имееÑ? root пÑ?ав и не пÑ?едоÑ?Ñ?авлÑ?еÑ? доÑ?Ñ?Ñ?п \'СÑ?пеÑ?полÑ?зоваÑ?елÑ?\'.\n\nЧÑ?о бÑ? иÑ?полÑ?зоваÑ?Ñ? Tor, вам надо иÑ?полÑ?зоваÑ?Ñ? пÑ?иложениÑ? поÑ?Ñ?Ñ?оеннÑ?е длÑ? Ñ?абоÑ?Ñ? Ñ? Orbot или Ñ?е, коÑ?оÑ?Ñ?е поддеÑ?живаÑ?Ñ? наÑ?Ñ?Ñ?ойкÑ? HTTP или SOCKS пÑ?окÑ?и.\n\n
-</string>
+  <string name="wizard_permissions_no_root_msg">Ð?оÑ?оже ваÑ?е Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?во не имееÑ? root пÑ?ав и не пÑ?едоÑ?Ñ?авлÑ?еÑ? доÑ?Ñ?Ñ?п \'СÑ?пеÑ?полÑ?зоваÑ?елÑ?\'.\n\nЧÑ?о бÑ? иÑ?полÑ?зоваÑ?Ñ? Tor, вам надо иÑ?полÑ?зоваÑ?Ñ? пÑ?иложениÑ? поÑ?Ñ?Ñ?оеннÑ?е длÑ? Ñ?абоÑ?Ñ? Ñ? Orbot или Ñ?е, коÑ?оÑ?Ñ?е поддеÑ?живаÑ?Ñ? иÑ?полÑ?зование HTTP или SOCKS пÑ?окÑ?и.\n\n</string>
+  <!--TipsAndTricks screen-->
   <string name="wizard_tips_title">Ð?Ñ?иложениÑ?, Ñ?абоÑ?аÑ?Ñ?ие Ñ? Orbot:</string>
   <string name="wizard_tips_gibberbot">Gibberbot: пÑ?иложение длÑ? безопаÑ?ной пеÑ?епиÑ?ки Ñ? конÑ?иденÑ?иалÑ?нÑ?м Ñ?иÑ?Ñ?ованием</string>
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
   <string name="wizard_tips_orweb">ORWEB (ТолÑ?ко длÑ? веÑ?Ñ?ии Android 1.x) - Ð?Ñ?аÑ?зеÑ?, Ñ?азÑ?абоÑ?аннÑ?й длÑ? обеÑ?пеÑ?ениÑ? безопаÑ?ноÑ?Ñ?и и длÑ? Orbot</string>
   <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+  <!--Transparent Proxy screen-->
   <string name="wizard_transproxy_title">Ð?Ñ?озÑ?аÑ?ное Ð?Ñ?окÑ?иÑ?ование</string>
   <string name="wizard_transproxy_msg">ЭÑ?о позволÑ?еÑ? ваÑ?им пÑ?иложениÑ?м авÑ?омаÑ?иÑ?еÑ?ки Ñ?абоÑ?аÑ?Ñ? по Ñ?еÑ?и Tor без какого-либо конÑ?игÑ?Ñ?иÑ?ованиÑ?.</string>
   <string name="wizard_transproxy_hint">(Ð?Ñ?меÑ?Ñ?Ñ?е даннÑ?й пÑ?нкÑ?, еÑ?ли вÑ? не знаеÑ?е о Ñ?ем идеÑ? Ñ?еÑ?Ñ?)</string>
@@ -113,8 +122,9 @@
   <string name="pref_entrance_node">Ð?Ñ?однÑ?е Ñ?злÑ?</string>
   <string name="pref_entrance_node_summary">Ð?Ñ?пеÑ?аÑ?ки, ники, Ñ?Ñ?Ñ?анÑ? и адÑ?еÑ?а длÑ? пеÑ?вого пÑ?Ñ?жка</string>
   <string name="pref_entrance_node_dialog">Ð?ведиÑ?е вÑ?однÑ?е Ñ?злÑ?</string>
-  <string name="pref_use_whispercore">Ð?Ñ?полÑ?зоваÑ?Ñ? WhisperCore</string>
-  <string name="pref_use_whispercore_summary">Ð?Ñ?полÑ?зоваÑ?Ñ? пÑ?опÑ?иеÑ?аÑ?нÑ?й NetFilter APIs пÑ?едоÑ?Ñ?авленнÑ?й WhisperSystems (Ñ?Ñ?ебÑ?еÑ? Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?во Ñ? Ñ?Ñ?Ñ?ановленнÑ?м WhisperCore)</string>
+  <!--<string name="pref_use_whispercore">Use WhisperCore</string>
+<string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
+  <string name="pref_proxy_title">Ð?Ñ?Ñ?одÑ?Ñ?аÑ? пÑ?окÑ?и Ñ?еÑ?Ñ?</string>
   <string name="pref_proxy_type_title">Тип Ð?Ñ?окÑ?и</string>
   <string name="pref_proxy_type_summary">Ð?Ñ?оÑ?окол длÑ? иÑ?полÑ?зованиÑ? пÑ?окÑ?и-Ñ?еÑ?веÑ?ом: HTTP, HTTPS, Socks4, Socks5</string>
   <string name="pref_proxy_type_dialog">Ð?ведиÑ?е Тип Ð?Ñ?окÑ?и</string>
@@ -150,7 +160,9 @@
   <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">Ð?клÑ?Ñ?иÑ?Ñ? алÑ?Ñ?еÑ?наÑ?ивнÑ?е вÑ?однÑ?е Ñ?злÑ? в Ñ?еÑ?Ñ? Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Ð?аданнÑ?е моÑ?Ñ?Ñ? обÑ?Ñ?Ñ?Ñ?иÑ?ованÑ?</string>
   <string name="ip_address_and_port_of_bridges">IP адÑ?еÑ?а и поÑ?Ñ?Ñ? моÑ?Ñ?ов</string>
   <string name="enter_bridge_addresses">Ð?ведиÑ?е Ð?дÑ?еÑ?а Ð?оÑ?Ñ?ов</string>
   <string name="relays">РеÑ?Ñ?анÑ?лÑ?Ñ?оÑ?Ñ?</string>
@@ -194,4 +206,12 @@
   <string name="error_installing_binares">Ð?инаÑ?нÑ?е Ñ?айлÑ? Tor не Ñ?могли Ñ?Ñ?Ñ?ановиÑ?Ñ?Ñ?Ñ? или обновиÑ?Ñ?Ñ?.</string>
   <string name="pref_use_persistent_notifications">Ð?Ñ?егда оÑ?обÑ?ажаÑ?Ñ? иконкÑ? в панели задаÑ? когда Orbot подклÑ?Ñ?ен</string>
   <string name="pref_use_persistent_notifications_title">УведомлениÑ? о поÑ?Ñ?оÑ?нной Ñ?абоÑ?е</string>
+  <string name="notification_using_bridges">Ð?оÑ?Ñ?Ñ? вклÑ?Ñ?енÑ?!</string>
+  <string name="default_bridges"/>
+  <string name="set_locale_title">Ð?адаÑ?Ñ? локалÑ?</string>
+  <string name="set_locale_summary">Ð?Ñ?бÑ?аÑ?Ñ? локалÑ? и Ñ?зÑ?к длÑ? Orbot</string>
+  <string name="wizard_locale_title">Ð?Ñ?бÑ?аÑ?Ñ? ЯзÑ?к</string>
+  <string name="wizard_locale_msg">Ð?Ñ?Ñ?авиÑ?Ñ? по Ñ?молÑ?аниÑ? или пеÑ?еклÑ?Ñ?иÑ?Ñ? Ñ?екÑ?Ñ?ий Ñ?зÑ?к</string>
+  <string name="powered_by">powered by the Tor Project  </string>
+  <string name="btn_save_settings">СоÑ?Ñ?аниÑ?Ñ? Ð?аÑ?Ñ?Ñ?ойки</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index c01c197..2c4f2d9 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -11,9 +11,6 @@
   <string name="status_activated">Uppkopplad till Tor nätverket</string>
   <string name="status_disabled">\"Orbot är inaktiverad</string>
   <string name="status_shutting_down">Orbot avslutas</string>
-  <string name="tor_process_starting">Starting Tor client...</string>
-  <string name="tor_process_complete">complete.</string>
-  <string name="tor_process_waiting">waiting.</string>
   <string name="not_anonymous_yet">VARNING: Din trafik är inte anonym än! Vänligen konfigurera dina apps att använda HTTP proxy 127.0.0.1:8118 eller SOCKS4A/5 proxy 127.0.0.1:9050</string>
   <string name="menu_home">Hem</string>
   <string name="menu_browse">Browse</string>
@@ -29,168 +26,66 @@
   <string name="button_close">Stäng</string>
   <string name="button_about">Om</string>
   <string name="button_clear_log">Rensa logg</string>
-  <string name="menu_verify">Check</string>
-  <string name="menu_exit">Exit</string>
-  <string name="powered_by">drivs av Tor-projektet</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="menu_verify">Kontrollera</string>
+  <string name="menu_exit">Avsluta</string>
+  <string name="press_to_start">- tryck länge för att starta -</string>
+  <string name="pref_trans_proxy_group">Transparent Proxy (Kräver Root)</string>
+  <string name="pref_trans_proxy_title">Transparent Proxy</string>
+  <string name="pref_trans_proxy_summary">Automatisk Torifiering av Appar</string>
+  <string name="pref_transparent_all_title">Tor:a Allt</string>
+  <string name="pref_transparent_port_fallback_summary">VARNING: Kringgår vanliga portar (80, 443, etc). *ANV�ND ENDAST* om \'Alla\' eller \'App\'-läge inte fungerar.</string>
+  <string name="pref_transparent_port_title">Port-lista</string>
+  <string name="pref_transparent_port_summary">Lista över portar att köra genom proxy. *ANV�ND ENDAST* om \'Alla\' eller \'App\'-läge inte fungerar</string>
   <string name="pref_has_root">Request Root Access</string>
-  <string name="pref_has_root_summary">&amp;gt;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="pref_has_root_summary">&gt;Request root access for transparent proxying</string>
+  <string name="status_install_success">Tor-binärer installerades utan problem!</string>
+  <string name="status_install_fail">Tor-binärfilerna kunde inte installeras. Kontrollera loggen och underrätta tor-assistants@xxxxxxxxxxxxxx</string>
+  <string name="title_error">Applikationsfel</string>
   <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">About Orbot</string>
-  <string name="btn_next">Next</string>
-  <string name="btn_back">Back</string>
-  <string name="btn_finish">Finish</string>
-  <string name="btn_okay">Okay</string>
-  <string name="btn_cancel">Cancel</string>
-  <string name="wizard_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
-    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
-    You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid
-    </string>
-  <string name="wizard_final">Orbot is ready!</string>
-  <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string>
-  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help@xxxxxxxxxxxxxxxxxxxx to learn more.</string>
-  <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string>
-  <string name="pref_hs_group">Hidden Services</string>
-  <string name="pref_general_group">General</string>
-  <string name="pref_start_boot_title">Start Orbot on Boot</string>
-  <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
-  <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>
-  <string name="wizard_warning_title">Warning</string>
-  <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>
-  <string name="wizard_permissions_title">Permissions</string>
-  <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string>
-  <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Your device 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>
-  <string name="wizard_tips_title">Orbot-Enabled Apps</string>
-  <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string>
-  <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
-  <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string>
-  <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
-  <string name="wizard_transproxy_title">Transparent Proxying</string>
-  <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string>
-  <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string>
-  <string name="wizard_transproxy_none">None</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string>
-  <string name="button_grant_superuser">Request Superuser Access</string>
-  <string name="pref_select_apps">Select Apps</string>
-  <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string>
-  <string name="pref_node_configuration">Node Configuration</string>
-  <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string>
-  <string name="pref_entrance_node">Entrance Nodes</string>
-  <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string>
-  <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string>
-  <string name="pref_use_whispercore">Use WhisperCore</string>
-  <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>
-  <string name="pref_proxy_type_title">Proxy Type</string>
-  <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Enter Proxy Type</string>
-  <string name="pref_proxy_host_title">Proxy Host</string>
-  <string name="pref_proxy_host_summary">Proxy server hostname</string>
-  <string name="pref_proxy_host_dialog">Enter Proxy Host</string>
-  <string name="pref_proxy_port_title">Proxy Port</string>
-  <string name="pref_proxy_port_summary">Proxy server port</string>
-  <string name="pref_proxy_port_dialog">Enter Proxy port</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying...</string>
-  <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string>
-  <string name="transproxy_rules_cleared">TransProxy rules cleared</string>
-  <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string>
-  <string name="privoxy_is_running_on_port_">Privoxy is running on port: </string>
-  <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string>
-  <string name="bridge_error">Bridge Error</string>
-  <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string>
-  <string name="send_email_for_bridges">Send an email to bridges@xxxxxxxxxxxxxx with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string>
-  <string name="error">Error</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string>
-  <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string>
-  <string name="exit_nodes">Exit Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string>
-  <string name="enter_exit_nodes">Enter Exit Nodes</string>
-  <string name="exclude_nodes">Exclude Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string>
-  <string name="enter_exclude_nodes">Enter Exclude Nodes</string>
-  <string name="strict_nodes">Strict Nodes</string>
-  <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string>
-  <string name="bridges">Bridges</string>
-  <string name="use_bridges">Use Bridges</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</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="wizard_btn_tell_me_more">Om Orbot</string>
+  <string name="btn_next">Nästa</string>
+  <string name="btn_back">Tillbaka</string>
+  <string name="btn_finish">Slutför</string>
+  <string name="btn_okay">OK</string>
+  <string name="btn_cancel">Avbryt</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Orbot-information</string>
+  <string name="wizard_details_msg">Orbot är en öppen källkods-applikation som innehåller Tor, LibEvent och Privoxy. Den tillhandahåller en local HTTP-proxy (8118) och en SOCKS-proxy (9050) in i Tor-nätverket. Orbot har också möjligheten, på en rootad enhet, att skicka all internet-trafik genom Tor.</string>
+  <string name="wizard_proxy_help_info">Proxy-inställningar</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Det här kommer att öppna din webbläsare mot https://check.torproject.org för att se om Orbot är rätt konfigurerad och du är uppkopplad mot Tor.</string>
+  <string name="pref_general_group">Allmänt</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_node_configuration_summary">Det här är avancerade inställningar som kan minska din anonymitet</string>
+  <string name="pref_entrance_node">Ingångsnoder</string>
+  <!--<string name="pref_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-typ</string>
+  <string name="pref_proxy_type_summary">Protokoll att använda för proxyserver: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_host_title">Proxy-värd</string>
+  <string name="pref_proxy_host_summary">Proxy-servernamn</string>
+  <string name="setting_up_full_transparent_proxying_">Ställer in full transparent proxyfiering...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Ställer in app-baserad transparent proxyfiering...</string>
+  <string name="couldn_t_start_tor_process_">Kunde inte starta Tor-process:</string>
+  <string name="privoxy_is_running_on_port_">Privoxy körs på port:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Ställer in port-baserad transparent proxyfiering...</string>
+  <string name="error">Fel</string>
+  <string name="exit_nodes">Utgångsnoder</string>
+  <string name="enter_or_port">Allmänt</string>
+  <string name="project_home">Projektets hemsidor:</string>
+  <string name="the_tor_license">Tor-licensen</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="third_party_software">Tredjepartsprogramvara:</string>
+  <string name="default_bridges"/>
+  <string name="wizard_locale_title">Välj språk</string>
+  <string name="powered_by">drivs av Tor-projektet</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
new file mode 100644
index 0000000..aac14cd
--- /dev/null
+++ b/res/values-tr/strings.xml
@@ -0,0 +1,74 @@
+<?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">Tor\'u baÅ?lat ve durdur</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot baÅ?latılıyor...</string>
+  <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="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>
+  <string name="menu_settings">Ayarlar</string>
+  <string name="menu_log">Günlük</string>
+  <string name="menu_info">Yardım</string>
+  <string name="menu_apps">Uygulamalar</string>
+  <string name="menu_start">BaÅ?lat</string>
+  <string name="menu_stop">Durdur</string>
+  <string name="menu_about">Hakkında</string>
+  <string name="menu_wizard">Sihirbaz</string>
+  <string name="button_help">Yardım</string>
+  <string name="button_close">Kapat</string>
+  <string name="button_about">Hakkında</string>
+  <string name="button_clear_log">GünlüÄ?ü Temizle</string>
+  <string name="menu_verify">Kontrol Et</string>
+  <string name="menu_exit">Ã?ıkıÅ?</string>
+  <string name="press_to_start">- baÅ?latmak için uzun basın -</string>
+  <string name="pref_trans_proxy_group">Transparan Vekil SunuculuÄ?u (Yeniden BaÅ?latma Gerektirir)</string>
+  <string name="pref_trans_proxy_title">Transparan Vekil SunuculuÄ?u</string>
+  <string name="pref_trans_proxy_summary">Uygulamalar için Otomatik Tor Uyarlaması</string>
+  <string name="pref_transparent_all_title">HerÅ?eyi Tor ile Uyarla</string>
+  <string name="pref_transparent_all_summary">Tor\'a uyarlanmıÅ? uygulamaların vekil sunucu baÄ?lantıları</string>
+  <string name="pref_transparent_port_fallback_title">Vekil Sunucu Yanıtsız Kalma Bildirim Portu</string>
+  <string name="pref_transparent_port_fallback_summary">UYARI: Genel portlardan (80,443, v.b.) kaçınınız. SADECE \'Hepsi\' veya \'Uygulama\' modu çalıÅ?madıÄ?ında kullanınız.</string>
+  <string name="pref_transparent_port_title">Port Listesi</string>
+  <string name="pref_transparent_port_summary">Vekil sunucu port listesi. SADECE \'Hepsi\' veya \'Uygulama\' modu çalıÅ?madıÄ?ında kullanınız.</string>
+  <string name="pref_transparent_port_dialog">Vekil sunucu portlarını giriniz</string>
+  <string name="pref_has_root">Yönetici EriÅ?imi Talebi</string>
+  <string name="pref_has_root_summary">Transparan Vekil Sunuculuk için Yönetici EriÅ?imi Talebi</string>
+  <string name="status_install_success">Tor binarileri baÅ?arıyla yüklendi!</string>
+  <string name="status_install_fail">Tor binari dosyaları yüklenemedi. Lütfen günlüÄ?ü kontrol ediniz ve tor-assistants@xxxxxxxxxxxxxx adresini kullanarak bilgilendirme yapınız.</string>
+  <string name="title_error">Uygulama Hatası</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Orbot Hakkında</string>
+  <string name="btn_next">Ä°leri</string>
+  <string name="btn_back">Geri</string>
+  <string name="btn_finish">Bitir</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="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>
+  <string name="pref_node_configuration">Nokta Konfigürasyonu</string>
+  <string name="pref_node_configuration_summary">Bu ayarlar baÄ?lantınızın anonimliÄ?ini azaltabilecek geliÅ?miÅ? ayarlardır.</string>
+  <string name="pref_entrance_node">GiriÅ? Noktaları</string>
+  <!--<string name="pref_use_whispercore">Use WhisperCore</string>
+<string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
+  <string name="default_bridges"/>
+  <string name="powered_by">The Tor Project tarafından desteklenmektedir.</string>
+</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
new file mode 100644
index 0000000..461bf86
--- /dev/null
+++ b/res/values-uk/strings.xml
@@ -0,0 +1,214 @@
+<?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>
+  <!--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>
+  <!--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>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Warning</string>
+  <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Permissions</string>
+  <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string>
+  <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string>
+  <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot-Enabled Apps</string>
+  <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string>
+  <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
+  <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string>
+  <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
+  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparent Proxying</string>
+  <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string>
+  <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string>
+  <string name="wizard_transproxy_none">None</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string>
+  <string name="button_grant_superuser">Request Superuser Access</string>
+  <string name="pref_select_apps">Select Apps</string>
+  <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string>
+  <string name="pref_node_configuration">Node Configuration</string>
+  <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string>
+  <string name="pref_entrance_node">Entrance Nodes</string>
+  <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string>
+  <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string>
+  <!--<string name="pref_use_whispercore">Use WhisperCore</string>
+<string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
+  <string name="pref_proxy_title">Outbound Network Proxy</string>
+  <string name="pref_proxy_type_title">Outbound Proxy Type</string>
+  <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Enter Proxy Type</string>
+  <string name="pref_proxy_host_title">Outbound Proxy Host</string>
+  <string name="pref_proxy_host_summary">Proxy server hostname</string>
+  <string name="pref_proxy_host_dialog">Enter Proxy Host</string>
+  <string name="pref_proxy_port_title">Outbound Proxy Port</string>
+  <string name="pref_proxy_port_summary">Proxy server port</string>
+  <string name="pref_proxy_port_dialog">Enter Proxy port</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying...</string>
+  <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string>
+  <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string>
+  <string name="transproxy_rules_cleared">TransProxy rules cleared</string>
+  <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string>
+  <string name="privoxy_is_running_on_port_">Privoxy is running on port: </string>
+  <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string>
+  <string name="bridge_error">Bridge Error</string>
+  <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string>
+  <string name="send_email_for_bridges">Send an email to bridges@xxxxxxxxxxxxxx with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string>
+  <string name="error">Error</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string>
+  <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string>
+  <string name="exit_nodes">Exit Nodes</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string>
+  <string name="enter_exit_nodes">Enter Exit Nodes</string>
+  <string name="exclude_nodes">Exclude Nodes</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string>
+  <string name="enter_exclude_nodes">Enter Exclude Nodes</string>
+  <string name="strict_nodes">Strict Nodes</string>
+  <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string>
+  <string name="bridges">Bridges</string>
+  <string name="use_bridges">Use Bridges</string>
+  <string name="bridges_obfuscated">Obfuscated Bridges</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string>
+  <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string>
+  <string name="enter_bridge_addresses">Enter Bridge Addresses</string>
+  <string name="relays">Relays</string>
+  <string name="relaying">Relaying</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Enable your device to be a non-exit relay</string>
+  <string name="relay_port">Relay Port</string>
+  <string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string>
+  <string name="enter_or_port">Enter OR port</string>
+  <string name="relay_nickname">Relay nickname</string>
+  <string name="the_nickname_for_your_tor_relay">The nickname for your Tor relay</string>
+  <string name="enter_a_custom_relay_nickname">Enter a custom relay nickname</string>
+  <string name="reachable_addresses">Reachable Addresses</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Run as a client behind a firewall with restrictive policies</string>
+  <string name="reachable_ports">Reachable ports</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string>
+  <string name="enter_ports">Enter ports</string>
+  <string name="enable_hidden_services">Hidden Service Hosting</string>
+  <string name="run_servers_accessible_via_the_tor_network">allow on-device server to be accessible via the Tor network</string>
+  <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string>
+  <string name="hidden_service_ports">Hidden Service Ports</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string>
+  <string name="project_home">Project Home(s): </string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">The Tor License</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">3rd-Party-Software: </string>
+  <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string>
+  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
+  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string>
+  <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string>
+  <string name="found_existing_tor_process">found existing Tor process...</string>
+  <string name="something_bad_happened">Something bad happened. Check the log</string>
+  <string name="hidden_service_on">hidden service on:</string>
+  <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string>
+  <string name="unable_to_start_tor">Unable to start Tor:</string>
+  <string name="pref_use_sys_iptables_title">Use Default Iptables</string>
+  <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string>
+  <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string>
+  <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string>
+  <string name="pref_use_persistent_notifications_title">Always-On Notifications</string>
+  <string name="notification_using_bridges">Bridges enabled!</string>
+  <string name="default_bridges"/>
+  <string name="set_locale_title">Set Locale</string>
+  <string name="set_locale_summary">Choose the locale and language for Orbot</string>
+  <string name="wizard_locale_title">Choose Language</string>
+  <string name="wizard_locale_msg">Leave default or switch the current language</string>
+  <string name="powered_by">powered by The Tor Project  </string>
+  <string name="btn_save_settings">Save Settings</string>
+</resources>
diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml
deleted file mode 100644
index d408cbc..0000000
--- a/res/values-v11/styles.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<resources>
-
-    <style name="AppTheme" parent="android:Theme.Holo.Light" />
-
-</resources>
\ No newline at end of file
diff --git a/res/values-v14/styles.xml b/res/values-v14/styles.xml
deleted file mode 100644
index 1c089a7..0000000
--- a/res/values-v14/styles.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<resources>
-
-    <style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar" />
-
-</resources>
\ No newline at end of file
diff --git a/res/values-zh/strings.xml b/res/values-zh/strings.xml
index 3e90dbc..964adb0 100644
--- a/res/values-zh/strings.xml
+++ b/res/values-zh/strings.xml
@@ -31,7 +31,6 @@
   <string name="button_clear_log">Clear Log</string>
   <string name="menu_verify">��</string>
   <string name="menu_exit">é??å?º</string>
-  <string name="powered_by">ç?± Tor 项ç?®å¼ºå??驱å?¨</string>
   <string name="press_to_start">- é?¿æ??以å?¯å?¨ -</string>
   <string name="pref_trans_proxy_group">é??æ??代ç??(é??è¦? root)</string>
   <string name="pref_trans_proxy_title">é??æ??代ç??</string>
@@ -55,6 +54,7 @@
   <string name="btn_finish">å®?æ??</string>
   <string name="btn_okay">确�</string>
   <string name="btn_cancel">å??æ¶?</string>
+  <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">ä¸?äº? Orbot 详æ??</string>
   <string name="wizard_details_msg">Orbot æ?¯å??å?« Torã??LibEvent å?? Privoxy ç??å¼?æº?软件ã??å®?å??å?«äº?ä¸?个æ?¬å?° HTTP 代ç??(8118)å?? SOCKS 代ç??(9050)ï¼?使æ?¨æ?¥å?¥ Tor ç½?ç»?ã??Orbot å?¨å?¯ä»¥è?·å¾? root æ??é??ç??设å¤?ä¸?æ?¥ç®¡æ??æ??æµ?é??ç»?ç?± Tor ç½?ç»?ã??</string>
   <string name="wizard_permissions_root">å·²èµ?äº?æ??é??</string>
@@ -73,118 +73,46 @@
   <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
   <string name="wizard_tips_proxy">代ç??设置 - å­¦ä¹ å¦?ä½?é??ç½®åº?ç?¨ç¨?åº?使ç?¨ Orbot</string>
   <string name="wizard_proxy_help_info">代ç??设置</string>
-  <string name="wizard_proxy_help_msg">å¦?æ??æ?¨æ­£å?¨ä½¿ç?¨ç?? Android åº?ç?¨ç¨?åº?æ?¯æ??使ç?¨ HTTP æ?? SOCKS 代ç??ï¼?æ?¨å?¯ä»¥é??ç½®å®?è¿?æ?¥å?° Orbot 并使ç?¨ Torã??\n\n
-    主æ?ºè®¾ç½®ä¸º 127.0.0.1 æ?? localhostã??对äº? HTTPï¼?端å?£ä¸º 8118ï¼?对äº? SOCKS 端å?£ä¸º 9050ã??å¦?æ??å?¯è?½ï¼?åº?å½?使ç?¨ SOCKS4A æ?? SOCKS5ã??
-    \n\n
-    æ?¨å?¯ä»¥é??è¿? http://tinyurl.com/proxyandroid äº?解æ?´å¤? Android ä¸?使ç?¨ä»£ç??ç??ç?¥è¯?ã??</string>
+  <string name="wizard_proxy_help_msg">å¦?æ??æ?¨æ­£å?¨ä½¿ç?¨ç?? Android åº?ç?¨ç¨?åº?æ?¯æ??使ç?¨ HTTP æ?? SOCKS 代ç??ï¼?æ?¨å?¯ä»¥é??ç½®å®?è¿?æ?¥å?° Orbot 并使ç?¨ Torã??\n\n\n    主æ?ºè®¾ç½®ä¸º 127.0.0.1 æ?? localhostã??对äº? HTTPï¼?端å?£ä¸º 8118ï¼?对äº? SOCKS 端å?£ä¸º 9050ã??å¦?æ??å?¯è?½ï¼?åº?å½?使ç?¨ SOCKS4A æ?? SOCKS5ã??\n    \n\n\n    æ?¨å?¯ä»¥é??è¿? http://tinyurl.com/proxyandroid äº?解æ?´å¤? Android ä¸?使ç?¨ä»£ç??ç??ç?¥è¯?ã??</string>
   <string name="wizard_final">Orbot 已就绪�</string>
   <string name="wizard_final_msg">æ?°ä»¥ä¸?计ç??å??å?½äººä»¬å? 为å??ç§?å??å? 使ç?¨ Torï¼?è®°è??ã??人æ??å·¥ä½?è??ã??æ³?å¾?å·¥ä½?è??ã??士å?µã??å?¬å?¸ã??è¿«äº?å®?é??æ??å?µä½¿ç?¨ç??å¸?æ°?ï¼?å½?ç?¶ä¹?æ??æ?®é??ç??å¸?æ°?ã??ç?°å?¨ä½ ä¹?å?³å°?æ??为å?¶ä¸­ç??ä¸?å??ï¼?</string>
+  <!--END Welcome Wizard strings (DJH)-->
   <string name="connect_first_time">æ?¨å·²æ??å??è¿?æ?¥è?³ Tor ç½?ç»? - ä½?è¿?并ä¸?æ??å?³ç??æ?¨ç??设å¤?å®?å?¨ã??æ?¨å?¯ä»¥ä½¿ç?¨â??æ£?æ?¥â??é??项æµ?è¯?æ?¨ç??æµ?è§?å?¨ã??\n\n访é?® https://guardianproject.info/apps/orbot æ??å??é??é?®ä»¶å?° help@xxxxxxxxxxxxxxxxxxxx 以äº?解æ?´å¤?ä¿¡æ?¯ã??</string>
   <string name="tor_check">è¿?å°?å?¯å?¨é»?认æµ?è§?å?¨å¹¶è®¿é?® https://check.torproject.org 以æµ?è¯?æ?¯å?¦æ­£ç¡®é??ç½®äº? Orbot 并确认æ?¨æ?¯å?¦å·²ç»?è¿?æ?¥å?° Torã??</string>
   <string name="pref_hs_group">é??è??æ??å?¡</string>
   <string name="pref_general_group">General</string>
   <string name="pref_start_boot_title">����Orbot</string>
   <string name="pref_start_boot_summary">å½?æ?¨ç?? Android 设å¤?å¼?æ?ºæ?¶è?ªå?¨å?¯å?¨ Orbot 并è¿?æ?¥è?³ Tor ç½?ç»?</string>
-  <string name="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>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
   <string name="wizard_warning_title">è­¦å??</string>
-  <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>
+  <!--Permissions screen-->
   <string name="wizard_permissions_title">å??许</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>
-  <string name="wizard_tips_title">Orbot-Enabled Apps</string>
-  <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string>
+  <!--TipsAndTricks screen-->
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
   <string name="wizard_tips_orweb">ORWEB (ä»? Android 1.x) - ç??é??é??ç§?设计ç??æµ?è§?å?¨</string>
   <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
-  <string name="wizard_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_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="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">ç½?æ¡¥é??误</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">é??误</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">ç½?æ¡¥</string>
   <string name="use_bridges">使��桥</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string>
   <string name="ip_address_and_port_of_bridges">ç½?æ¡¥ç??IPå?°å??å??端å?£</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">Tor许��</string>
   <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3rd-Party-Software: </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="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>
+  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
+  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
+  <string name="default_bridges"/>
+  <string name="powered_by">ç?± Tor 项ç?®å¼ºå??驱å?¨</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 34be55c..35837d8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,288 +1,224 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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="main_layout_download">Download</string> 
-<string name="main_layout_upload">Upload</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>
-
-
- <!-- 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 on Google Play, at GuardianProject.info website or via F-Droid.org.</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_tips_duckgo">DuckDuckGo Search Engine app</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">Set Twitter proxy to host "localhost" and port 8118</string>
-    <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-    <string name="wizard_proxy_help_info">Proxy 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
-    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
-    You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid
-    </string>
-    
-    <string name="wizard_final">Orbot is ready!</string>
-    <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons.\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>
-    
- <!-- 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>
- <!--  New Wizard Strings -->
-	<!-- Title Screen -->
-	<string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>
-	<!-- Warning screen -->
-	<string name="wizard_warning_title">Warning</string>
-	<string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>
-	<!-- Permissions screen -->
-	<string name="wizard_permissions_title">Permissions</string>
-	<string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string>
-	<string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string>
-	<string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>
-	<!-- TipsAndTricks screen -->
-	<string name="wizard_tips_title">Orbot-Enabled Apps</string>
-	<string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string>
-	
-	<string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string>
-	
-	<string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string>
-	<string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.xpi</string>
-
-	<string name="wizard_tips_play">Find all Guardian Project apps on 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="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="main_layout_download">Download</string>
+  <string name="main_layout_upload">Upload</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>
+  <!--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 on Google Play, at GuardianProject.info website or via F-Droid.org.</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_tips_duckgo">DuckDuckGo Search Engine app</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">Set Twitter proxy to host \"localhost\" and port 8118</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
+  <string name="wizard_proxy_help_info">Proxy 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>
+  <!--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>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Warning</string>
+  <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Permissions</string>
+  <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string>
+  <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string>
+  <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot-Enabled Apps</string>
+  <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string>
+  <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string>
+  <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string>
+  <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.xpi</string>
+  <string name="wizard_tips_play">Find all Guardian Project apps on 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 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_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.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">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>
-
-<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="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_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.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">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>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
deleted file mode 100644
index bc024be..0000000
--- a/res/values/styles.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<resources>
-
-    <style name="AppTheme" parent="android:Theme.Black.NoTitleBar" />
-
-</resources>
\ No newline at end of file



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