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

n8fr8 at torproject.org n8fr8 at torproject.org
Thu Jul 18 02:44:32 UTC 2013


commit bbf8d8a03bff12ecf4e412bf58ba2d80ec8b65d4
Author: n8fr8 <nathan at freitas.net>
Date:   Wed Jul 17 22:37:56 2013 -0400

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

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index f56d446..3e5b8d3 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1,214 +1,224 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Orbot</string>
+  <string name="app_name">اوربوت</string>
   <string name="internal_web_url">http://orbot/</string>
   <string name="default_web_url">http://check.torproject.org</string>
   <string name="secure_default_web_url">https://check.torproject.org</string>
   <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Tor بدء وإيقاف</string>
+  <string name="control_permission_label">فعل و اوقف تور</string>
   <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">...Orbot جاري تشغيل</string>
-  <string name="status_activated">أنا متصل بشبكة تور</string>
-  <string name="status_disabled">\"تم إيقاف اوربوت</string>
+  <string name="status_starting_up">جاري تشغيل اوربوت...</string>
+  <string name="status_activated">متصل بشبكة تور</string>
+  <string name="status_disabled">تم إيقاف اوربوت</string>
   <string name="status_shutting_down">جاري إغلاق اوربوت</string>
-  <string name="tor_process_starting">تشغيل برنامج تور...</string>
-  <string name="tor_process_complete">انتهاء</string>
-  <string name="tor_process_waiting">انتظار</string>
-  <string name="not_anonymous_yet">تحذير: حركة مرورك ليست خفية الى الآن! من فضلك قم بتكوين التطبيقات الخاصة بك لإستخدام HTTP proxy 127.0.0.1:8118 أو SOCK4A أو SOKS5 127.0.0.1:9050</string>
-  <string name="menu_home">الصفحة الرئيسية</string>
+  <string name="tor_process_starting">جاري تشغيل تور...</string>
+  <string name="tor_process_complete">كامل.</string>
+  <string name="tor_process_waiting">انتظار.</string>
+  <string name="not_anonymous_yet">تحذير: حركة مرورك ليست خفية حتي الآن! من فضلك قم بتكوين التطبيقات الخاصة بك لإستخدام بروكسي HTTP 127.0.0.1:8118 أو SOCK4A أو SOKS5 127.0.0.1:9050</string>
+  <string name="menu_home">القائمة الرئيسية</string>
   <string name="menu_browse">تصفّح</string>
   <string name="menu_settings">إعدادات</string>
   <string name="menu_log">السجل</string>
   <string name="menu_info">مساعدة</string>
   <string name="menu_apps">تطبيقات</string>
   <string name="menu_start">بدء</string>
-  <string name="menu_stop">إيقاف</string>
+  <string name="menu_stop">توقف</string>
   <string name="menu_about">حول</string>
   <string name="menu_wizard">Wizard</string>
+  <string name="main_layout_download">تحميل</string>
+  <string name="main_layout_upload">رفع</string>
   <string name="button_help">مساعدة</string>
   <string name="button_close">إغلاق</string>
   <string name="button_about">حول</string>
   <string name="button_clear_log">مسح السجل</string>
-  <string name="menu_verify">فحص</string>
+  <string name="menu_verify">تحقق</string>
   <string name="menu_exit">خروج</string>
-  <string name="press_to_start">- long press to start -</string>
-  <string name="pref_trans_proxy_group">عملية توكيل غير مرئية أو ضمنية (يتطلب حقوق المسؤول- Root-)</string>
-  <string name="pref_trans_proxy_title">عملية توكيل غير مرئية أو ضمنية</string>
+  <string name="press_to_start">- اضغط لفترة طويلة للبدء -</string>
+  <string name="pref_trans_proxy_group">بروكسي ضمني (يتطلب اذن حساب رووت)</string>
+  <string name="pref_trans_proxy_title">بروكسي ضمني</string>
   <string name="pref_trans_proxy_summary">عملية توريفاي أوتوماتيكية للتطبيقات</string>
-  <string name="pref_transparent_all_title">تور كل شيء</string>
-  <string name="pref_transparent_all_summary">حركة مرور الوكيل لجميع التطبيقات عبر تور</string>
-  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
-  <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
-  <string name="pref_transparent_port_title">Port List</string>
-  <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
-  <string name="pref_transparent_port_dialog">Enter ports to proxy</string>
-  <string name="pref_has_root">Request Root Access</string>
-  <string name="pref_has_root_summary">Request root access for transparent proxying</string>
-  <string name="status_install_success">تم تثبيت ثنائيات تور بنجاح!</string>
-  <string name="status_install_fail">غير قادر على تثبيت ملفات ثنائيات تور. يرجى التحقق من السجل وإعلامنا على البريد الإلكتروني tor-assistants at torproject.org</string>
+  <string name="pref_transparent_all_title">استخدم تور مع جميع التطبيقات</string>
+  <string name="pref_transparent_all_summary">مرر كل بيانات المرور الخاصة بالتطبيقات عبر تور</string>
+  <string name="pref_transparent_port_fallback_title">تراجع منفذ البروكسي</string>
+  <string name="pref_transparent_port_fallback_summary">تحذير: تتحايل علي المنافذ الشائعة  (80, 443, إلى آخره) *استخدم فقط* إذا كان وضع \'كل\' أو \'التطبيق\' لا يعمل.</string>
+  <string name="pref_transparent_port_title">قائمة المنافذ</string>
+  <string name="pref_transparent_port_summary">قائمة بجميع المنافذ إلي البروكسي. *استخدم فقط* إذا كان وضع \'كل\' أو \'التطبيق\' لا يعمل.</string>
+  <string name="pref_transparent_port_dialog">ادخل المناقذ للبروكسي</string>
+  <string name="pref_has_root">اطلب إذن رووت</string>
+  <string name="pref_has_root_summary">اطلب إذن رووت لتفعيل البروكسي الضمني</string>
+  <string name="status_install_success">تم تثبيت تور بنجاح!</string>
+  <string name="status_install_fail">غير قادر على تثبيت ملفات تور. يرجى مراجعة السجل وإعلامنا على البريد الإلكتروني tor-assistants at torproject.org</string>
   <string name="title_error">خطأ في التطبيق</string>
-  <string name="wizard_title">مرحبا بك في أوربوت</string>
-  <string name="wizard_btn_tell_me_more">عن أوربوت</string>
+  <string name="wizard_title">اوربوت</string>
+  <string name="wizard_btn_tell_me_more">عن اوربوت</string>
   <string name="btn_next">التالي</string>
   <string name="btn_back">رجوع</string>
   <string name="btn_finish">إنهاء</string>
   <string name="btn_okay">موافق</string>
   <string name="btn_cancel">إلغاء</string>
   <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">بعض التفاصيل عن أوربوت</string>
-  <string name="wizard_details_msg">أوربوت هو تطبيق مفتوح المصدر والذي يضم تور, LibEvent وPrixovy. يعمل على توفير وكيل HTTP محلي (8118) ووكيل SOCKS (9050) إلى شبكة تور. يتوفر لدى أوربوت القدرة على إرسال جميع حركات مرور الانترنت من خلال تور على الجهاز ذات حقوق المسؤول (root). </string>
+  <string name="wizard_details">بعض التفاصيل عن اوربوت</string>
+  <string name="wizard_details_msg">اوربوت هو تطبيق مفتوح المصدر ويضم تور, LibEvent وPrixovy. يعمل على توفير بروكسي HTTP محلي (8118) وبروكسي SOCKS (9050) إلى شبكة تور. و يتوفر لدى اوربوت ايضاً - علي الاجهزة ذات حساب رووت - القدرة على إرسال جميع حركات مرور التطبيقات إلي تور.</string>
   <string name="wizard_permissions_root">تم منح الإذن</string>
-  <string name="wizard_permissions_stock">أذونات أوربوت</string>
-  <string name="wizard_premissions_msg_root">ممتاز! لقد وجدنا بأنه لديك أذونات حقوق المسؤول (root) لتمكين أوربوت. سوف نستخدم هذه السلطة بحكمة.</string>
-  <string name="wizard_permissions_msg_stock">رغم أنه ليس ضروريا، يمكن ان يصبح أوربوت أداة قوية إذا كان لدى جهازك صلاحية حقوق المسؤول (root). استخدم الزر بالأسفل لمنح أوربوت قوة أكبر!</string>
-  <string name="wizard_permissions_no_root">إذا لم يكن لديك صلاحية حقوق المسؤول (root) أو ليست لديك أدنى فكرة عما نتحدث عنه، تأكد فقط من استخدام تطبيقات تعمل مع أوربوت.</string>
-  <string name="wizard_permissions_consent">أفهم ذلك وأود أن أستمر بدون حقوق المسؤول (root)</string>
-  <string name="wizard_permission_enable_root">منح أوربوت حقوق المسؤول (root)</string>
+  <string name="wizard_permissions_stock">أذونات اوربوت</string>
+  <string name="wizard_premissions_msg_root">ممتاز! لقد وجدنا بأنه لديك صلاحية حساب رووت لتمكين اوربوت. سوف نستخدم هذه السلطة بحكمة.</string>
+  <string name="wizard_permissions_msg_stock">رغم أنه ليس ضروريا، يمكن ان يصبح أوربوت أداة قوية إذا كان لدى جهازك صلاحية حساب رووت. استخدم الزر بالأسفل لمنح اوربوت قوة أكبر!</string>
+  <string name="wizard_permissions_no_root">إذا لم يكن لديك صلاحية حساب رووت أو ليست لديك أدنى فكرة عما نتحدث عنه، تأكد فقط من استخدام تطبيقات تعمل مع اوربوت.</string>
+  <string name="wizard_permissions_consent">أفهم ذلك وأود أن أستمر بدون صلاحيات حساب رووت</string>
+  <string name="wizard_permission_enable_root">امنح اوربوت صلاحية حساب رووت</string>
   <string name="wizard_configure">تكوين توريفاي</string>
-  <string name="wizard_configure_msg">أوربوت يعطيك الخيار لتوجيه جميع حركات مرور التطبيقات عبر تور OR لإختيار تطبيقاتك بشكل فردي.</string>
-  <string name="wizard_configure_all">توكيل جميع التطبيقات عبر تور</string>
+  <string name="wizard_configure_msg">اوربوت يعطيك الخيار لتوجيه جميع حركات مرور التطبيقات عبر تور او لإختيار التطبيقات بشكل فردي.</string>
+  <string name="wizard_configure_all">مرر جميع التطبيقات عبر تور</string>
   <string name="wizard_configure_select_apps">اختر التطبيقات الفردية لتور</string>
-  <string name="wizard_tips_tricks">تطبيقات مهيئة لأوربوت</string>
-  <string name="wizard_tips_msg">نشجعكم على تحميل واستخدام التطبيقات التي تعرف كيفية الاتصال مباشرة بأوربوت. اضغط على الأزرار في الأسفل للتثبيت.</string>
-  <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
-  <string name="wizard_tips_proxy">إعدادات الوكيل - تعلم كيفية تكوين التطبيقات لتعمل مع أوربوت</string>
-  <string name="wizard_proxy_help_info">إعدادات الوكيل</string>
-  <string name="wizard_proxy_help_msg">اذا كان تطبيق أندرويد الذي تستخدمه يمكن ان يدعم استخدام وكيل HTTP او SOCKS , عندها يمكنك تكوينه للإتصال بأوربوت واستخدام تور.\n\n\n    اعدادات المستضيف هي 127.0.0.1 او \"المستضيف المحلي\". بالنسبة الى HTTP, فإن ضبط المنفذ هو 8118. بالنسبة الى SOCKS, فإن الوكيل هو 9050. يجب عليك استخدام SOCKS4A او SOCKS5 اذا امكن.\n    \n\n\n    يمكنك معرفة المزيد عن عملية توكيل غير مرئية للأندرويد عن طريق الأسئلة المتداولة (FAQ)  في: http://tinyurl.com/proxyandroid\n    </string>
-  <string name="wizard_final">أوربوت جاهز!</string>
-  <string name="wizard_final_msg">مئات الآلاف من الناس في جميع أنحاء العالم يستخدمون تور لأسباب عديدة: الصحفيين والمدونين، والعاملين في مجال حقوق الإنسان، والجنود والشركات والمواطنين من الأنظمة القمعية، والمواطنين العاديين ... والآن أنت مستعد لأن تستخدمه كذلك!</string>
+  <string name="wizard_tips_tricks">تطبيقات مهيئة لاوربوت</string>
+  <string name="wizard_tips_msg">التطبيقات التالية تم تطويرها حتي تعمل مع اوربوت. اضغط علي ما تريد تثبيتة علي جهازك الأن, أو يمكنك ان تجدهم لاحقاً علي جوجل بلاي, أو علي موقعنا GuardianProject.info أو من خلال F-Droid.org.</string>
+  <string name="wizard_tips_otrchat">Gibberbot - تطبيق أمن للمراسلة الفورية للأندرويد.</string>
+  <string name="wizard_tips_proxy">إعدادات البروكسي - تعلم كيفية تكوين التطبيقات لتعمل مع اوربوت</string>
+  <string name="wizard_tips_duckgo">تطبيق محرك البحث DuckDuckGo</string>
+  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+  <string name="wizard_tips_firefox">البرنامج الإضافي \"Proxy Mobile\" لفايرفوكس (http://tinyurl.com/getproxymob)</string>
+  <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
+  <string name="wizard_tips_twitter">اضبط البروكسي الخاص بتويتر إلي مستضيف \"localhost\" و المنفذ إلي 8118</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
+  <string name="wizard_proxy_help_info">إعدادات البروكسي</string>
+  <string name="wizard_proxy_help_msg">إذا كان تطبيق الأندرويد الذي تستخدمه يمكن ان يدعم استخدام بروكسي HTTP او SOCKS , عندها يمكنك تكوينه للإتصال باوربوت واستخدام تور.\n\n\nإعدادات المستضيف هي 127.0.0.1 او \"المستضيف المحلي\". بالنسبة إلى HTTP, فإن المنفذ هو 8118. أما بالنسبة إلى SOCKS, فإن المنفذ هو 9050. من الأفضل استخدام SOCKS4A او SOCKS5 إذا أمكن.\n    \n\n\nيمكنك معرفة المزيد عن استخدام البروكسي علي أندرويد عن طريق زيارة صفحة الأسئلة المتداولة: http://tinyurl.com/proxyandroid\n    </string>
+  <string name="wizard_final">اوربوت جاهز للاستخدام!</string>
+  <string name="wizard_final_msg">مئات الآلاف من الناس في جميع أنحاء العالم يستخدمون تور لأسباب عديدة.\n\nالصحفيين والمدونين، والمدافعين عن حقوق الإنسان، والضباط والجنود والشركات والمواطنين تحت الأنظمة القمعية، والمواطنين العاديين ... والآن أنت مستعد لتستخدمه مثلهم!</string>
   <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time"> لقد قمت بإتصال ناجح الى شبكة تور - لكن هذا لا يعني بأن جهازك في مأمن. يمكنك استخدام خيار \'تحقق\' من القائمة لإختبار المتصفح الخاص بك. \n\n قم بزيارتنا على https://guardianproject.info/apps/orbot او ارسل رسالة الكترونية الى help at guardianproject.info لمعرفة المزيد.</string>
-  <string name="tor_check">سيؤدي هذا إلى فتح المتصفح الافتراضي الخاص بك على العنوان https://check.torproject.org من اجل التحقق من تكوين أوربوت بشكل صحيح وبأنك متصل بتور.</string>
-  <string name="pref_hs_group">خدمات خفية</string>
-  <string name="pref_general_group">General</string>
-  <string name="pref_start_boot_title">Start Orbot on Boot</string>
-  <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
+  <string name="connect_first_time">أنت الأن متصل شبكة تور - لكن هذا لا يعني بأن جهازك في مأمن. يمكنك استخدام خيار \'تحقق\' من القائمة لإختبار المتصفح الخاص بك. \n\n قم بزيارتنا على https://guardianproject.info/apps/orbot او ارسل رسالة إلكترونية إلى help at guardianproject.info لمعرفة المزيد.</string>
+  <string name="tor_check">سيؤدي هذا إلى فتح المتصفح الخاص بك لزيارة عنوان https://check.torproject.org من اجل التحقق إذا كان تكوين اوربوت يعمل بشكل صحيح ام لا وبأنك متصل بتور.</string>
+  <string name="pref_hs_group">استضافة الخدمة المخفية</string>
+  <string name="pref_general_group">عام</string>
+  <string name="pref_start_boot_title">شغل اوربوت عند فتح الجهاز</string>
+  <string name="pref_start_boot_summary">فعل اوربوت و اتصل بتور تلقائياً عندما يبدء جهاز الأندرويد الخاص بك بالعمل</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">أوربوت يجلب لك شبكة تور للأندرويد! تور يساعدك  للتغلب على حجب المحتوى، فحص الاتصال، و الرقابة و التجسس على الشبكات، و التي تهدد الخصوصية و العلاقات الشخصية و المعلومات السرية. سنقوم الآن بمساعدتك لضبط أوربوت و تور على جهازك.</string>
+  <string name="wizard_title_msg">اوربوت يجلب شبكة تور للأندرويد!\n\nتور يساعدك في التغلب على تصفية المحتوى، فحص الاتصال و الرقابة على الشبكات التي تهدد خصوصيتك، و علاقاتك الشخصية و معلوماتك السرية.\n\nستقوم هذه النافذة بمساعدتك علي ضبط تكوين اوربوت و تور على جهازك.</string>
   <!--Warning screen-->
   <string name="wizard_warning_title">تحذير</string>
-  <string name="wizard_warning_msg">مجرد تنزيل أوربوت لن يعطيك الخصوصية. يجب عليك أيضاً اعداد أوربوت و جهازك و البرامج المستفيدة من تور.</string>
+  <string name="wizard_warning_msg">أن تثبيت اوربوت فقط لن يمنحك الخصوصية تلقائياً.\n\nيجب عليك تكوين اوربوت بشكل صحيح ، و جهازك ، و البرامج الاخري التي تريدها ان تستخدم تور.</string>
   <!--Permissions screen-->
   <string name="wizard_permissions_title">الصلاحيات</string>
-  <string name="wizard_permissions_root_msg1">يمكنك اعطاء أوربوت صلاحية المستخدم السوبر لتشغيل المميزات المتقدمة مثل البروكسي الشفاف.</string>
-  <string name="wizard_permissions_root_msg2">إذا كنت تريد أن تقوم بهذا فعليك التأكد من استخدام برامج معدة لتشتغل مع أوربوت.</string>
-  <string name="wizard_permissions_no_root_msg">لا يوجد روت أو صلاحيات خارقة على جهازك  و لذلك لتستفيد من من تور عليك استخدام برامج صممت لتعمل مع أوربوت أو التي تدعم بروكسي HTTP أو SOCKS .</string>
+  <string name="wizard_permissions_root_msg1">يمكنك اعطاء اوربوت صلاحيات حساب رووت لتشغيل المميزات المتقدمة مثل البروكسي الضمني.</string>
+  <string name="wizard_permissions_root_msg2">إذا كنت لا تريد أن تفعل هذا, الرجاء إستخدام برامج معدة للعمل مع اوربوت</string>
+  <string name="wizard_permissions_no_root_msg">يبدو أن جهازك لا يتمتع بصلاحيات حساب رووت.\n\nولتستفيد من من تور عليك استخدام برامج صممت لتعمل مع اوربوت أو التي تدعم بروكسي HTTP أو SOCKS .\n\n</string>
   <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">برامج معدة لتشتغل مع أوربوت</string>
-  <string name="wizard_tips_gibberbot">جيبربوت: محادثات آمنة باستخدام التشفير خارج السجل.</string>
-  <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
-  <string name="wizard_tips_orweb">ORWEB (أندرويد 1.x فقط) - متصفح مصمّم للخصوصية لأوربوت </string>
+  <string name="wizard_tips_title"> برامج معدة للعمل مع اوربوت</string>
+  <string name="wizard_tips_gibberbot">Gibberbot: برنامج للمراسلة الفورية الآمنة يعمل ببروتوكول التشفير Off-the-Record</string>
+  <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string>
+  <string name="wizard_tips_orweb">Orweb: متصفح مصمّم للخصوصية و يعمل مع تور</string>
   <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <string name="wizard_tips_play">يمكنك الحصول علي جميع تطبيقات مشروع الجاردين على جوجل بلاي</string>
+  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject\n</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">بروكسي شفاف</string>
+  <string name="wizard_transproxy_title">بروكسي ضمني</string>
   <string name="wizard_transproxy_msg">هذه ستسمح للبرامج بالاتصال بشبكة تور تلقائياً دون اعداد مسبق.</string>
-  <string name="wizard_transproxy_hint">اختر هذا المربع اذا كنت لا تعلم عما نتحدث عنه هنا</string>
-  <string name="wizard_transproxy_none">و لا شيء</string>
+  <string name="wizard_transproxy_hint">(اختر هذا المربع إذا كنت لا تعلم عما نتحدث)</string>
+  <string name="wizard_transproxy_none">لا شيء</string>
   <string name="pref_transparent_tethering_title">الربط بتور</string>
-  <string name="pref_transparent_tethering_summary">اسمح بالبروكسي الشفاف للواي فاي و اليو اس بي (تحتاج لإعادة تشغيل الجهاز)</string>
-  <string name="button_grant_superuser">اطلب صلاحيات المستخدم الخارق</string>
-  <string name="pref_select_apps">اختر البرامج</string>
-  <string name="pref_select_apps_summary">اختر البرامح التي تريد اتصالها بشبكة تور</string>
-  <string name="pref_node_configuration">اعدادات نقطة الاتصال</string>
-  <string name="pref_node_configuration_summary">هذه الاعدادات متقدمة و قد تقلل من خصوصيتك و اخفاء هويتك.</string>
+  <string name="pref_transparent_tethering_summary">اسمح بالبروكسي الضمني للواي فاي و اجهزة اليو اس بي  (تحتاج لإعادة تشغيل الجهاز)</string>
+  <string name="button_grant_superuser">اطلب صلاحيات حساب رووت</string>
+  <string name="pref_select_apps">حدد البرامج</string>
+  <string name="pref_select_apps_summary">اختر البرامح التي تريد تمريرها إلي شبكة تور</string>
+  <string name="pref_node_configuration">تكوين نقطة الاتصال</string>
+  <string name="pref_node_configuration_summary">هذه الإعدادات متقدمة و قد تقلل من حماية هويتك</string>
   <string name="pref_entrance_node">نقاط الدخول</string>
   <string name="pref_entrance_node_summary">بصمات، اسماء مستعارة، البلدان و العناوين لأول نقطة اتصال</string>
   <string name="pref_entrance_node_dialog">أدخل نقاط الدخول</string>
   <!--<string name="pref_use_whispercore">Use WhisperCore</string>
 <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
-  <string name="pref_proxy_title">بروكسي الشبكة</string>
-  <string name="pref_proxy_type_title">نوع البروكسي</string>
-  <string name="pref_proxy_type_summary">البروتوكول ليستخدم مع خادم البروكسي: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_title">بروكسي الشبكة الصادرة</string>
+  <string name="pref_proxy_type_title">نوع البروكسي الصادر</string>
+  <string name="pref_proxy_type_summary">البروتوكول المستخدم لخادم البروكسي: HTTP, HTTPS, Socks4, Socks5</string>
   <string name="pref_proxy_type_dialog">أدخل نوع البروكسي</string>
-  <string name="pref_proxy_host_title">عنوان البروكسي</string>
-  <string name="pref_proxy_host_summary">عنوان خادم البروكسي</string>
-  <string name="pref_proxy_host_dialog">أدخل عنوان البروكسي</string>
-  <string name="pref_proxy_port_title">منفذ البروكسي</string>
+  <string name="pref_proxy_host_title">عنوان البروكسي الصادر</string>
+  <string name="pref_proxy_host_summary">اسم المضيف خادم البروكسي</string>
+  <string name="pref_proxy_host_dialog">أدخل مضيف البروكسي</string>
+  <string name="pref_proxy_port_title">منفذ البروكسي الصادر</string>
   <string name="pref_proxy_port_summary">منفذ خادم البروكسي</string>
   <string name="pref_proxy_port_dialog">أدخل منفذ البروكسي</string>
   <string name="status">الحالة</string>
-  <string name="setting_up_full_transparent_proxying_">يتم اعداد البروكسي كامل الشفافية</string>
-  <string name="setting_up_app_based_transparent_proxying_">يتم اعداد البروكسي الشفاف الخاص بالبرامج</string>
-  <string name="transparent_proxying_enabled">البروكسي الشفاف مفعل</string>
-  <string name="transproxy_enabled_for_tethering_">البروكسي الشفاف جاهز للربط!</string>
-  <string name="warning_error_starting_transparent_proxying_">تحذير: حصل خطأ بتشغيل البروكسي الشفاف</string>
-  <string name="transproxy_rules_cleared">تم مسح قواعد البروكسي الشفاف</string>
-  <string name="couldn_t_start_tor_process_">تعذر تشغيل تور</string>
-  <string name="privoxy_is_running_on_port_">Privoxy يشتغل على منفذ:</string>
-  <string name="setting_up_port_based_transparent_proxying_">يتم اعداد البروكسي الشفاف حسب المنفذ</string>
-  <string name="bridge_error">خطأ بجسر الاتصال</string>
-  <string name="bridge_requires_ip">لتستخدم ميزة جسور الاتصال، يجب عليك ادخال عنوان انترنت لجسر واحد عالأقل.</string>
-  <string name="send_email_for_bridges">أرسل رسالة بريد الكتروني إلى bridges at torproject.org مع عبارة get bridges بداخل الرسالة من حساب بريد جيميل gmail.</string>
+  <string name="setting_up_full_transparent_proxying_">يتم إعداد بروكسي ضمني كامل...</string>
+  <string name="setting_up_app_based_transparent_proxying_">يتم إعداد البروكسي الضمني حسب البرامج...</string>
+  <string name="transparent_proxying_enabled">البروكسي الضمني مُفعل</string>
+  <string name="transproxy_enabled_for_tethering_">البروكسي الضمني جاهز للربط!</string>
+  <string name="warning_error_starting_transparent_proxying_">تحذير: حصل خطأ بتشغيل البروكسي الضمني!</string>
+  <string name="transproxy_rules_cleared">تم مسح قواعد البروكسي الضمني</string>
+  <string name="couldn_t_start_tor_process_">لقد تعذر بدء تشغيل تور:</string>
+  <string name="privoxy_is_running_on_port_">Privoxy يعمل على منفذ:</string>
+  <string name="setting_up_port_based_transparent_proxying_">يتم إعداد البروكسي الضمني حسب المنفذ...</string>
+  <string name="bridge_error">خطأ بالجسر</string>
+  <string name="bridge_requires_ip">حتي تستطيع إستخدم ميزة الجسور، يجب عليك ادخال عنوان انترنت لجسر واحد علي الأقل.</string>
+  <string name="send_email_for_bridges">أرسل بريد إلكتروني إلى bridges at torproject.org مع عبارة \"get bridges\" بداخل الرسالة من حساب بريد gmail.</string>
   <string name="error">خطأ</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">اعدادات العنوان القابل للاتصال لديك تسببت بخطأ!</string>
-  <string name="your_relay_settings_caused_an_exception_">اعدادات نقاط التحويل لديك تسببت بخطأ!</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">إعدادات العنوان القابل للاتصال لديك تسببت بخطأ!</string>
+  <string name="your_relay_settings_caused_an_exception_">إعدادات المرحلات لديك تسببت بخطأ!</string>
   <string name="exit_nodes">نقاط الخروج</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">البصمات، الاسماء المستعارة، البلدان  و العناوين لآخر نقطة اتصال</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">البصمات، الاسماء المستعارة، البلدان و العناوين لآخر نقطة اتصال</string>
   <string name="enter_exit_nodes">أدخل نقاط الخروج</string>
   <string name="exclude_nodes">استثني النقاط</string>
   <string name="fingerprints_nicks_countries_and_addresses_to_exclude">بصمات، الأسماء المستعارة، البلدان و العناوين ليتم استثنائها</string>
   <string name="enter_exclude_nodes">أدخل النقاط المستثناه</string>
   <string name="strict_nodes">النقاط المشددة</string>
-  <string name="use_only_these_specified_nodes">فقط استخدم هذه النقاط المحددة</string>
+  <string name="use_only_these_specified_nodes">استخدم فقط تلك النقاط المحددة</string>
   <string name="bridges">الجسور</string>
   <string name="use_bridges">استخدم الجسور</string>
-  <string name="bridges_obfuscated">الجسور المخفية</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">اسمح باستخدام نقاط دخول بديلة على شبكة تور</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">تفعيل هذا الخيار اذا كانت الجسور مخفية</string>
-  <string name="ip_address_and_port_of_bridges">عناوين الانترنت و منافذ الجسور</string>
-  <string name="enter_bridge_addresses">أدخل عنوان الجسر</string>
-  <string name="relays">نقاط التحويل</string>
-  <string name="relaying">يتم التحويل</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">اسمح لجهازك ليكون منفذ تحويل غير نهائي</string>
-  <string name="relay_port">منافذ تحويل الاتصال</string>
-  <string name="listening_port_for_your_tor_relay">المنفذ المصغي لمنفذ تحويل تور الخاص بك</string>
+  <string name="bridges_obfuscated">الجسور الغامضة</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">اسمح باستخدام نقاط دخول بديلة إلي شبكة تور</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">فعل هذا الخيار إذا كانت الجسور المحددة جسور غامضة</string>
+  <string name="ip_address_and_port_of_bridges">عنوان الانترنت و المنفذ للجسور</string>
+  <string name="enter_bridge_addresses">أدخل عناوين الجسور</string>
+  <string name="relays">المرحلات</string>
+  <string name="relaying">يرحل</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">اسمح لجهازك ليكون مرحل غير نهائي</string>
+  <string name="relay_port">منفذ المرحل</string>
+  <string name="listening_port_for_your_tor_relay">المنفذ المصغي لمُرحل تور الخاص بك</string>
   <string name="enter_or_port">أدخل منفذ OR</string>
-  <string name="relay_nickname">الاسم المستعار لمنفذ التحويل</string>
-  <string name="the_nickname_for_your_tor_relay">الاسم المستعار لمنفذ تحويل تور الخاص بك</string>
-  <string name="enter_a_custom_relay_nickname">أدخل اسم مستعار لنقطة تحويل</string>
+  <string name="relay_nickname">الاسم المستعار للمُرحل</string>
+  <string name="the_nickname_for_your_tor_relay">الاسم المستعار لمُرحل تور الخاص بك</string>
+  <string name="enter_a_custom_relay_nickname">أدخل اسم مستعار للمُرحل</string>
   <string name="reachable_addresses">العناوين التي يمكن الوصول إليها</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">قم بالتشغيل كخدمة من وراء جدار ناري</string>
-  <string name="reachable_ports">المنافذ القابلة للاتصال</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">المنافذ القابلة للاتصال عبر الجدار الناري</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">العمل كخدمة من وراء جدار ناري بسياسات تقيدية</string>
+  <string name="reachable_ports">المنافذ التي يمكن الوصول إليها</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">منافذ مفتوحة عبر جدار ناري تقيدي</string>
   <string name="enter_ports">أدخل المنافذ</string>
-  <string name="enable_hidden_services">تشغيل الخدمات المخفية</string>
-  <string name="run_servers_accessible_via_the_tor_network">شغل خوادم قابلة للاتصال من داخل شبكة تور</string>
-  <string name="enter_localhost_ports_for_hidden_services">أدخل منافذ localhost للخدمات المخفية</string>
+  <string name="enable_hidden_services">استضافة الخدمة المخفية</string>
+  <string name="run_servers_accessible_via_the_tor_network">السماح للخادم الذي علي جهازك بأمكانية الوصول إليه من خلال شبكة تور</string>
+  <string name="enter_localhost_ports_for_hidden_services">أدخل المنافذ المحلية للخدمات المخفية</string>
   <string name="hidden_service_ports">منافذ الخدمات المخفية</string>
   <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">اسم العنوان لخدمتك المخفية (يتم انشائه تلقائياً)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">شغل سجل المعالجة debug</string>
-  <string name="project_home">الموقع الرسمي للمشروع:</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">شغل سجل الـdebug ( للمراجعة يجب استخدام adb أو LogCat)</string>
+  <string name="project_home">الموقع الرسمي للمشروع (المشاريع):</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
   <string name="the_tor_license">رخصة استخدام تور</string>
   <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">برامج من جهات أخرى:</string>
-  <string name="tor_version">Tor v0.2.3.10: https://www.torproject.orgب</string>
-  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
+  <string name="third_party_software">برامج من الطرف الثالث:</string>
+  <string name="tor_version">Tor v0.2.4.3-alpha: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.1.1-alpha: http://www.monkey.org/~provos/libevent/</string>
   <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
   <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
-  <string name="hidden_service_request">أحد البرامج يحاول تشغيل خدمة مخفية بمنفذ %S على شبكة تور. هذه الميزة آمنة فقط اذا كنت تثق بالبرنامج</string>
-  <string name="found_existing_tor_process">تم العثور على برنامج تور </string>
+  <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string>
+  <string name="hidden_service_request">هناك برنامج يحاول فتح منفذ لخادم مخفي %S إلي شبكة تور. هذا السلوك آمن إذا كنت تثق بهذا البرنامج.</string>
+  <string name="found_existing_tor_process">عُثر علي عملية تور سابقة تعمل...</string>
   <string name="something_bad_happened">حصل خطأ ما. افحص السجل</string>
-  <string name="hidden_service_on">تشغيل الخدمات المخفية</string>
+  <string name="hidden_service_on">الخدمات المخفية التي تعمل حالياً:</string>
   <string name="unable_to_read_hidden_service_name">غير قادر على قراءة اسم الخدمة المخفية</string>
-  <string name="unable_to_start_tor">غير قادر على تشغيل تور</string>
-  <string name="pref_use_sys_iptables_title">استخدم iptables التلقائي</string>
-  <string name="pref_use_sys_iptables_summary">استخدم مكونات iptables الموجودة ضمناً بالجهاز بدل النسخة المربوطة مع أوربوت</string>
-  <string name="error_installing_binares">لم يتم تثبيت أو تحديث مكونات تور</string>
-  <string name="pref_use_persistent_notifications">ضع الأيقونة في شريط التنبيهات عندما يكون أوربوت متصلاً</string>
-  <string name="pref_use_persistent_notifications_title">تفعيل التنبيهات دائماً</string>
+  <string name="unable_to_start_tor">غير قادر على بدء تور:</string>
+  <string name="pref_use_sys_iptables_title">استخدم الـiptables التلقائية</string>
+  <string name="pref_use_sys_iptables_summary">استخدم مكونات الـiptables الموجودة ضمناً بالجهاز بدل النسخة المرفقة مع اوربوت</string>
+  <string name="error_installing_binares">غير قادرة على تثبيت أو تحديث تور</string>
+  <string name="pref_use_persistent_notifications">دائما ضع الأيقونة في شريط الأدوات عندما يكون اوربوت متصلاً</string>
+  <string name="pref_use_persistent_notifications_title">تنبيهات دائمة</string>
   <string name="notification_using_bridges">تم تفعيل الجسور!</string>
-  <string name="default_bridges"/>
-  <string name="set_locale_title">تغيير اللغة</string>
-  <string name="set_locale_summary">غير اللغة و الاعدادات الاقليمية لأوربوت</string>
-  <string name="wizard_locale_title">اختيار اللغة</string>
-  <string name="wizard_locale_msg">اختر اللغة الافتراضية</string>
-  <string name="powered_by">بدعم من مشروع تور</string>
-  <string name="btn_save_settings">حفظ الاعدادات</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">ضبط الإعدادات المحلية</string>
+  <string name="set_locale_summary">اختار  الإعدادات المحلية و اللغة لاوربوت</string>
+  <string name="wizard_locale_title">اختار اللغة</string>
+  <string name="wizard_locale_msg">إما ان تترك اللغة الافتراضية او إما ان تغير اللغة</string>
+  <string name="powered_by">مدعوم من قبل مشروع تور</string>
+  <string name="btn_save_settings">حفظ الإعدادات</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index fa92c48..c249f53 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -73,6 +73,7 @@
   <string name="wizard_final_msg">Стотици хиляди хора по света използват Тор по различни причини.\n\nЖурналисти и блогъри, защитници на човешките права, служители на закона, военни, корпорации, граждани под ограничителни режими, и просто обикновени граждани... и сега и ти си готов да го направиш също!</string>
   <!--END Welcome Wizard strings (DJH)-->
   <string name="pref_hs_group">Скрити услуги</string>
+  <string name="pref_general_group">Главни</string>
   <string name="pref_start_boot_title">Стартирай Орбот при стартиране на устройството</string>
   <string name="pref_start_boot_summary">Автоматично стартирай Орбот и се свържи към Тор когато твоето Андроид устройство стартира</string>
   <!--New Wizard Strings-->
@@ -163,7 +164,7 @@
   <string name="error_installing_binares">Двуичните файлове на Тор не бяха инсталирани или обновени.</string>
   <string name="pref_use_persistent_notifications">Винаги показвай икона в тулбара когато Орбот е свързан</string>
   <string name="pref_use_persistent_notifications_title">Уведомления винаги включени</string>
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="set_locale_title">Избери местоположение</string>
   <string name="set_locale_summary">Избери местоположение и език за Орбот</string>
   <string name="wizard_locale_title">Избери език</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index f834ccb..6c721b8 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1,99 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Engega o atura Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot s\'està iniciant...</string>
-  <string name="status_activated">Connectat a la xarxa Tor</string>
-  <string name="status_disabled">Orbot està desactivat</string>
-  <string name="status_shutting_down">Orbot s\'està aturant</string>
-  <string name="not_anonymous_yet">ATENCIÓ : El trànsit de la teva connexió ja no es anònim! Siusplau, configura les teves aplicacions per a usar HTTP proxy 127.0.0.1:8118, per SOCKS4A o SOCKS5 proxy 127.0.0.1:9050</string>
-  <string name="menu_home">Lloc d\'inici</string>
   <string name="menu_browse">Navega</string>
-  <string name="menu_settings">Preferències</string>
-  <string name="menu_log">Registre</string>
-  <string name="menu_info">Ajut</string>
-  <string name="menu_apps">Aplicacions</string>
-  <string name="menu_start">Inici</string>
-  <string name="menu_stop">Atura</string>
-  <string name="menu_about">Quant a...</string>
-  <string name="menu_wizard">Wizard</string>
-  <string name="button_help">Ajut</string>
-  <string name="button_close">Tanca</string>
-  <string name="button_about">Quant a...</string>
-  <string name="button_clear_log">Esborra el registre</string>
-  <string name="menu_verify">Prova</string>
-  <string name="menu_exit">Surt</string>
-  <string name="press_to_start">- long press to start -</string>
-  <string name="pref_trans_proxy_group">Utilitza un proxy transparent (requereix accés)</string>
-  <string name="pref_trans_proxy_title">Utilitza un proxy transparent</string>
-  <string name="pref_trans_proxy_summary">Automatitza Tor per a les aplicacions</string>
-  <string name="pref_transparent_all_title">Automatitza Tor per a tot</string>
-  <string name="pref_transparent_all_summary">Canalitza tot el trànsit de proxy de les aplicacions per Tor</string>
-  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
-  <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
-  <string name="pref_transparent_port_title">Port List</string>
-  <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
-  <string name="pref_transparent_port_dialog">Enter ports to proxy</string>
-  <string name="pref_has_root">Request Root Access</string>
-  <string name="pref_has_root_summary">Request root access for transparent proxying</string>
-  <string name="status_install_success">Binaris de Tor instal·lats correctament!</string>
-  <string name="status_install_fail">Els fitxers binaris de Tor no s\'han pogut instalar. Per favor, comprova el registre i notifica-ho a tor-assistants at torproject.org</string>
-  <string name="title_error">Error de l\'aplicació</string>
-  <string name="wizard_title">Benvingut/da a Orbot</string>
-  <string name="wizard_btn_tell_me_more">Quant a Orbot...</string>
-  <string name="btn_next">Següent</string>
-  <string name="btn_back">Enrere</string>
-  <string name="btn_finish">Fi</string>
-  <string name="btn_okay">D\'acord</string>
   <string name="btn_cancel">Cancel·la</string>
   <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Alguns detalls d\'Orbot...</string>
-  <string name="wizard_details_msg">Orbot és una aplicació de codi lliure que conté Tor, LibEvent i Privoxy. Proporciona un Proxy HTTP local (8118) i un proxy SOCKS (9050) a la xarxa Tor. Orbot també té capacitat d\'enviar tot el trànsit de dades d\'internet a través de Tor.</string>
-  <string name="wizard_permissions_root">Permís concedit</string>
-  <string name="wizard_permissions_stock">Permisos d\'Orbot</string>
-  <string name="wizard_premissions_msg_root">Perfecte! Hem detectat que tens els permisos matriu activats per a Orbot. Utilitzarem aquest poder sàviament.</string>
-  <string name="wizard_permissions_msg_stock">Encara que no és imprescindible, Orbot pot esdevenir una eina molt més potent si el teu terminal té accés complet. Utilitza el botó d\'aquí sota per conferir superpoders a Orbot!</string>
-  <string name="wizard_permissions_no_root">Si no tens accés complet, o no tens ni idea del què t\'estem parlant, simplement assegura\'t d\'utilitzar aplicacions fetes per a funcionar amb Orbot.</string>
-  <string name="wizard_permissions_consent">Ho entenc i vull continuar sense accés complet.</string>
-  <string name="wizard_permission_enable_root">Concedeix accés complet a Orbot</string>
-  <string name="wizard_configure">Configura la connexió a Tor</string>
-  <string name="wizard_configure_msg">Orbot t\'ofereix l\'opció de conduir el trànsit de totes les aplicacions per Tor o bé escollir quines aplicacions vols utilitzar amb Tor.</string>
-  <string name="wizard_configure_all">Connecta totes les aplicacions per Proxy per Tor.</string>
-  <string name="wizard_configure_select_apps">Selecciona aplicacions individuals per a funcionar amb Tor</string>
-  <string name="wizard_tips_tricks">Aplicacions per a usar-se amb Orbot</string>
-  <string name="wizard_tips_msg">T\'animem a descarregar-te & utilitza aplicacions que sàpiguen com connectar-se directament a Orbot. Fes clic als botons de sota per instal·lar.</string>
-  <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
-  <string name="wizard_tips_proxy">Coniguració de Proxy - Aprèn a configurar aplicacions per a què funcionin amb Orbot</string>
-  <string name="wizard_proxy_help_info">Configuració de Proxy</string>
-  <string name="wizard_proxy_help_msg">Si l\'aplicació d\'Android que estàs utilitzant admet l\'ús d\'un proxy HTTP o SOCKS, pots configurar-la per a connectar-se a Orbot i utilitzar Tor.\n\n\nLa configuració de l\'amfitrió és 127.0.0.1 o \"localhost\". Per a HTTP, el port actiu és 8118. Per a SOCKS, el proxy és 9050. Hauries d\'utlitzar SOCKS4A o SOCKS5 si és possible.\n\n\n\nPots aprendre més coses sobre l\'ús dels proxys a Android al FAQ de: http://tinyurl.com/proxyandroid\n    </string>
-  <string name="wizard_final">Orbot és a punt!</string>
-  <string name="wizard_final_msg">Centenars de milers de persones arreu del món utilitzen Tor per un gran ventall de raons: periodistes i blocaires, treballadors pels drets humans, agents de l\'autoritat, soldats, corporacions, ciutadans de règims opressors, i ciutadans qualssevol... I ara tu també ho pots fer!</string>
   <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">T\'has connectat correctament a la xarxa Tor, però això NO vol dir que el teu dispositiu sigui segur. Pots utilitzar la opció \'Comprova\' del menú per provar el teu navegador. \n\nVisita\'ns a https://guardianproject.info/apps/orbot o envia\'ns un correu electrònic a help at guardianproject.info per a saber-ne més.</string>
-  <string name="tor_check">Això obrirà el teu navegador web per defecte i es connectarà a https://check.torproject.org per tal de comprovar si Orbot està configurat correctament i estàs connectat/da a Tor.</string>
-  <string name="pref_hs_group">Serveis ocults</string>
-  <string name="pref_general_group">General</string>
-  <string name="pref_start_boot_title">Start Orbot on Boot</string>
-  <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
-  <string name="wizard_tips_orweb">ORWEB (Només Android 1.x) - Navegador dissenyat per la privacitat & per a Orbot</string>
-  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_none">Cap</string>
   <!--<string name="pref_use_whispercore">Use WhisperCore</string>
 <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
-  <string name="default_bridges"/>
-  <string name="powered_by">Funciona gràcies al Projecte Tor</string>
+  <string name="default_bridges"></string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index e335fa3..2a1604d 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -23,9 +23,11 @@
   <string name="menu_apps">Aplikace</string>
   <string name="menu_start">Zapnout</string>
   <string name="menu_stop">Vypnout</string>
+  <string name="menu_about">O aplikaci</string>
   <string name="menu_wizard">Průvodce</string>
   <string name="button_help">Pomoc</string>
   <string name="button_close">Zavřít</string>
+  <string name="button_about">O aplikaci</string>
   <string name="button_clear_log">Vyčistit log</string>
   <string name="menu_verify">Ověřit</string>
   <string name="menu_exit">Konec</string>
@@ -55,6 +57,7 @@
   <string name="wizard_proxy_help_info">Nastavení Proxy</string>
   <string name="wizard_final">Orbot je připraven!</string>
   <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Hlavní</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
@@ -67,7 +70,12 @@
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparentní proxy</string>
+  <string name="wizard_transproxy_none">Není</string>
   <!--<string name="pref_use_whispercore">Use WhisperCore</string>
 <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
-  <string name="default_bridges"/>
+  <string name="status">Status</string>
+  <string name="error">Chyba</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">Uloz nastaveni</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 994a9fe..f4d40dc 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -9,7 +9,7 @@
   <string name="tor_proxy_service_process">Tor Proxydienst</string>
   <string name="status_starting_up">Orbot startet...</string>
   <string name="status_activated">Verbunden mit dem Tor-Netzwerk</string>
-  <string name="status_disabled">\"Orbot ist deaktiviert</string>
+  <string name="status_disabled">Orbot ist deaktiviert</string>
   <string name="status_shutting_down">Orbot wird beendet</string>
   <string name="tor_process_starting">Starte Tor-Software...</string>
   <string name="tor_process_complete">abgeschlossen.</string>
@@ -34,7 +34,7 @@
   <string name="menu_verify">Überprüfen</string>
   <string name="menu_exit">Beenden</string>
   <string name="press_to_start">- Zum Starten gedrückt halten -</string>
-  <string name="pref_trans_proxy_group">Transparenter Proxy (benötigt Administratorrechte)</string>
+  <string name="pref_trans_proxy_group">Transparenter Proxy (benötigt Root-Rechte)</string>
   <string name="pref_trans_proxy_title">Transparenter Proxy</string>
   <string name="pref_trans_proxy_summary">Anwendungen automatisch durch Tor leiten</string>
   <string name="pref_transparent_all_title">Alles durch Tor leiten</string>
@@ -58,16 +58,16 @@
   <string name="btn_cancel">Abbrechen</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Nähere Informationen zu Orbot</string>
-  <string name="wizard_details_msg">Orbot ist eine quelloffene Anwendung die Tor, LibEvent und Privoxy enthält. Es stellt einen lokalen HTTP Proxy (8118) und einen SOCKS Proxy (9050) zum Tor-Netzwerk zur Verfügung. Orbot hat auf einem System mit Administrationsrechten auch die Fähigkeit, jeglichen Internetverkehr über das Tor-Netzwerk abzuwickeln.</string>
+  <string name="wizard_details_msg">Orbot ist eine quelloffene Anwendung, die Tor, LibEvent und Privoxy enthält. Es stellt einen lokalen HTTP Proxy (8118) und einen SOCKS Proxy (9050) zum Tor-Netzwerk zur Verfügung. Orbot hat auf einem System mit Root-Rechten auch die Fähigkeit, jeglichen Internetverkehr über das Tor-Netzwerk abzuwickeln.</string>
   <string name="wizard_permissions_root">Berechtigung erteilt</string>
   <string name="wizard_permissions_stock">Orbot Rechte</string>
-  <string name="wizard_premissions_msg_root">Exzellent! Wir haben festgestellt, dass Sie Orbot Administrator-Rechte eingeräumt haben. Wir werden diese Macht weise nutzen.</string>
-  <string name="wizard_permissions_msg_stock">Obwohl es nicht nötig ist, kann Orbot ein mächtigeres Tool werden, wenn Sie ihm Administrator-Rechte einräumen. Drücken Sie auf den Kopf unten, um Orbot diese Superkräfte einzuräumen.</string>
-  <string name="wizard_permissions_no_root">Falls Sie keinen Administrator-Zugriff haben oder nicht wissen was das ist, achten Sie darauf, dass Sie Anwendungen verwenden, die Orbot nutzen können.</string>
-  <string name="wizard_permissions_consent">Ich habe verstanden und möchte ohne Administrator-Rechte weitermachen.</string>
-  <string name="wizard_permission_enable_root">Orbot Administrator-Rechte einräumen</string>
+  <string name="wizard_premissions_msg_root">Exzellent! Wir haben festgestellt, dass Sie Orbot Root-Rechte eingeräumt haben. Wir werden diese Macht weise nutzen.</string>
+  <string name="wizard_permissions_msg_stock">Obwohl es nicht nötig ist, kann Orbot ein mächtigeres Tool werden, wenn Sie ihm Root-Rechte einräumen. Drücken Sie auf den Kopf unten, um Orbot diese Superkräfte einzuräumen.</string>
+  <string name="wizard_permissions_no_root">Falls Sie keinen Root-Zugriff haben oder nicht wissen, was das ist, achten Sie darauf, dass Sie Anwendungen verwenden, die Orbot nutzen können.</string>
+  <string name="wizard_permissions_consent">Ich habe verstanden und möchte ohne Root-Rechte weitermachen.</string>
+  <string name="wizard_permission_enable_root">Orbot Root-Rechte einräumen</string>
   <string name="wizard_configure">Torification konfigurieren</string>
-  <string name="wizard_configure_msg">Orbot gibt Ihnen die Wahl, den Datenverkehr aller Apps durch Tor zu leiten ODER die Wahl für alle Apps einzeln zu treffen.</string>
+  <string name="wizard_configure_msg">Orbot gibt Ihnen die Wahl, den Datenverkehr aller Apps durch Tor zu leiten ODER einzelne Apps auszuwählen.</string>
   <string name="wizard_configure_all">Den Verkehr aller Apps durch Tor leiten</string>
   <string name="wizard_configure_select_apps">Apps einzeln wählen</string>
   <string name="wizard_tips_tricks">Apps, für die Orbot aktiviert ist</string>
@@ -78,7 +78,7 @@
   <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
   <string name="wizard_tips_firefox">Firefox mir Proxy Mobile-Add-On (extra Installation im Anschluss)</string>
   <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
-  <string name="wizard_tips_twitter">Twitter unterstützt den http proxy \"localhost:8118\"</string>
+  <string name="wizard_tips_twitter">Twitter unterstützt den HTTP-Proxy \"localhost:8118\"</string>
   <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Proxy-Einstellungen</string>
   <string name="wizard_proxy_help_msg">Wenn das Android-App, das Sie benutzen, die Verwendung von HTTP- oder SOCKS-Proxys unterstützt, können Sie es so konfigurieren, dass es sich mit Orbot verbindet und Tor verwendet.\n\n\nDie Host-Einstellungen sind 127.0.0.1 oder \"localhost\". Die Port-Einstellungen sind 8118 für HTTP und 9050 für SOCKS. Sie sollten versuchen, SOCKS4A oder SOCKS5 zu verwenden.\n\n\n\nErfahren Sie mehr über die Verwendung von Proxys unter Android in den FAQ unter http://tinyurl.com/proxyandroid\n    </string>
@@ -99,16 +99,16 @@
   <string name="wizard_warning_msg">Die reine Installation von Orbot wird Ihren Datenverkehr nicht anonymisieren. Tor muss korrekt konfiguriert sein, damit ihr Gerät Tor erfolgreich verwenden kann.</string>
   <!--Permissions screen-->
   <string name="wizard_permissions_title">Rechte</string>
-  <string name="wizard_permissions_root_msg1">Sie können Orbot wahlweise \'Administrator\'-Rechte geben, um erweiterte Optionen wie die Nutzung von transparenten Proxys zu ermöglichen.</string>
+  <string name="wizard_permissions_root_msg1">Sie können Orbot wahlweise \'Root\'-Rechte geben, um erweiterte Optionen wie die Nutzung von transparenten Proxys zu ermöglichen.</string>
   <string name="wizard_permissions_root_msg2">Wenn Sie dies nicht möchten, dann verwenden Sie bitte Apps, die mit Orbot zusammen arbeiten können.</string>
   <string name="wizard_permissions_no_root_msg">Ihr Gerät läuft im Standard-Modus und unterstützt keine Administrator-Rechte. In diesem Fall müssen Sie Apps verwenden, die von Haus aus mit Orbot zusammenarbeiten oder die HTTP bzw. SOCKS Proxy Einstellungen ermöglichen.\n</string>
   <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Apps die Orbot unterstützt</string>
+  <string name="wizard_tips_title">Apps, die Orbot unterstützen</string>
   <string name="wizard_tips_gibberbot">Gibberbot: Sichere Chat App mit inoffizieller Verschlüsselung</string>
-  <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
+  <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string>
   <string name="wizard_tips_orweb">ORWEB (Nur Android 1.x) - Ein für Privatsphäre & Orbot entworfener Browser</string>
-  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
-  <string name="wizard_tips_play">Finde alle Guardian Project Apss im Google Play Store</string>
+  <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.xpi</string>
+  <string name="wizard_tips_play">Finde alle Guardian Project Apps im Google Play Store</string>
   <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
@@ -116,24 +116,24 @@
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
   <string name="wizard_transproxy_title">Benutze transparenten Proxy</string>
-  <string name="wizard_transproxy_msg">Dies ermöglicht Ihnen Apps, automatisch das Tor Netzwerk zu verwenden ohne dies konfigurieren zu müssen.</string>
+  <string name="wizard_transproxy_msg">Dies ermöglicht Ihren Apps automatisch das Tor Netzwerk zu verwenden ohne dies konfigurieren zu müssen.</string>
   <string name="wizard_transproxy_hint">(Klicken Sie dieses Kästchen an wenn Sie nicht wissen wovon wir reden)</string>
   <string name="wizard_transproxy_none">Nichts</string>
   <string name="pref_transparent_tethering_title">Tor Anbindung</string>
   <string name="pref_transparent_tethering_summary">Aktiviere transparenten Proxy für Wifi und angebunde USB-Geräte (benötigt einen Neustart)</string>
-  <string name="button_grant_superuser">Administrator-Rechte anfordern</string>
+  <string name="button_grant_superuser">Root-Rechte anfordern</string>
   <string name="pref_select_apps">Apps auswählen</string>
-  <string name="pref_select_apps_summary">Wählen Sie die Apps die Tor benutzen sollen</string>
+  <string name="pref_select_apps_summary">Wählen Sie die Apps, die Tor benutzen sollen</string>
   <string name="pref_node_configuration">Knoten-Konfiguration</string>
   <string name="pref_node_configuration_summary">Dies sind erweiterte Einstellungen, die Ihre Anonymität beeinträchtigen können</string>
   <string name="pref_entrance_node">Eingangs-Knoten</string>
-  <string name="pref_entrance_node_summary">Fingerprints, Spitznamen, Land und Adressen für den ersten Punkt</string>
+  <string name="pref_entrance_node_summary">Fingerprints, Spitznamen, Länder und Adressen für den ersten Punkt</string>
   <string name="pref_entrance_node_dialog">Eingangs-Knoten angeben</string>
   <!--<string name="pref_use_whispercore">Use WhisperCore</string>
 <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
   <string name="pref_proxy_title">Ausgehender Netzwerk-Proxy</string>
   <string name="pref_proxy_type_title">Proxy-Typ</string>
-  <string name="pref_proxy_type_summary">Protokoll zur Verwendung des Proxy Servers:HTTP,HTTPS,Socks4,Socks5</string>
+  <string name="pref_proxy_type_summary">Protokoll zur Verwendung des Proxy Servers: HTTP, HTTPS, Socks4, Socks5</string>
   <string name="pref_proxy_type_dialog">Proxy-Typ angeben</string>
   <string name="pref_proxy_host_title">Proxy-Server</string>
   <string name="pref_proxy_host_summary">Hostname des Proxys-Servers</string>
@@ -152,31 +152,31 @@
   <string name="privoxy_is_running_on_port_">Privoxy läuft auf Port:</string>
   <string name="setting_up_port_based_transparent_proxying_">Richte Port-basiertes transparentes Proxiying ein...</string>
   <string name="bridge_error">Bridge-Fehler</string>
-  <string name="bridge_requires_ip">Um das Bridge-Feature nutzen zu können müssen Sie mindestens eine IP-Adresse eingeben.</string>
-  <string name="send_email_for_bridges">Senden Sie von Ihrem gmail-Account ein e-Mail an bridges at torproject.org mit dem Text \"get bridges\" im Nachrichten-Feld.</string>
+  <string name="bridge_requires_ip">Um das Bridge-Feature nutzen zu können, müssen Sie mindestens eine IP-Adresse eingeben.</string>
+  <string name="send_email_for_bridges">Senden Sie von Ihrem Gmail-Account eine eMail an bridges at torproject.org mit dem Text \"get bridges\" im Nachrichten-Feld.</string>
   <string name="error">Fehler</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Ihre eingestellte erreichbare e-Mail Adresse hat einen Ausnahme-Fehler erzeugt.</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Ihre eingestellte erreichbare eMail Adresse hat einen Ausnahme-Fehler erzeugt.</string>
   <string name="your_relay_settings_caused_an_exception_">Ihre Relay Einstellungen haben einen Ausnahme-Fehler erzeugt.</string>
   <string name="exit_nodes">Exit Nodes</string>
   <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerabdrücke, Spitznamen, Länder und Adressen für den letzten Knoten-Punkt.</string>
-  <string name="enter_exit_nodes">Tragen Sie die Exit-Nodes ein.</string>
+  <string name="enter_exit_nodes">Tragen Sie die Exit-Nodes ein</string>
   <string name="exclude_nodes">Nodes Ausnahmen</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerabdrücke, Spitz-Namen, Länder und Adressen die ausgenommen werden sollen.</string>
-  <string name="enter_exclude_nodes">Geben Sie die auszunehmenden Nodes ein.</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerabdrücke, Spitznamen, Länder und Adressen, die ignoriert werden sollen</string>
+  <string name="enter_exclude_nodes">Geben Sie die zu ignorierenden Nodes ein</string>
   <string name="strict_nodes">Strikte Nodes</string>
   <string name="use_only_these_specified_nodes">Benutze *ausschließlich* diese angegebenen Nodes</string>
   <string name="bridges">Bridges</string>
-  <string name="use_bridges">Benutze Bridges</string>
+  <string name="use_bridges">Bridges benutzen</string>
   <string name="bridges_obfuscated">Verschleierte Brücken</string>
   <string name="enable_alternate_entrance_nodes_into_the_tor_network">Benutze alternative Eingangs-Nodes in das TOR-Netzwerk</string>
   <string name="enable_if_configured_bridges_are_obfuscated_bridges">Aktivieren, falls konfigurierte Brücken verschleierte Brücken sind.</string>
-  <string name="ip_address_and_port_of_bridges">IP Adresse und Port der Bridges</string>
-  <string name="enter_bridge_addresses">Geben Sie die Bridge_Adressen ein</string>
+  <string name="ip_address_and_port_of_bridges">IP-Adresse und Port der Bridges</string>
+  <string name="enter_bridge_addresses">Geben Sie die Bridge-Adressen ein</string>
   <string name="relays">Relays</string>
   <string name="relaying">Relaying</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Aktivieren das Ihr Gerät ein non-exit Relay ist.</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Aktivieren, dass Ihr Gerät ein non-exit Relay ist</string>
   <string name="relay_port">Relay Port</string>
-  <string name="listening_port_for_your_tor_relay">Port auf den bei Ihrem TOR-Relay gehört werden soll</string>
+  <string name="listening_port_for_your_tor_relay">Port, auf dem bei Ihrem TOR-Relay gehört werden soll</string>
   <string name="enter_or_port">OR-Port eingeben</string>
   <string name="relay_nickname">Relay Spitzname</string>
   <string name="the_nickname_for_your_tor_relay">Der Spitzname für Ihren TOR-Relay</string>
@@ -188,33 +188,33 @@
   <string name="enter_ports">Ports eingeben</string>
   <string name="enable_hidden_services">Versteckte Dienste aktivieren</string>
   <string name="run_servers_accessible_via_the_tor_network">Betrieben von Servern auf die vom TOR-Netzwerk aus zugegriffen werden kann.</string>
-  <string name="enter_localhost_ports_for_hidden_services">TRagen Sie die lokelen Ports für die versteckten Dienste ein</string>
-  <string name="hidden_service_ports">Versteckte Dienste Ports</string>
+  <string name="enter_localhost_ports_for_hidden_services">Tragen Sie die lokelen Ports für die versteckten Dienste ein</string>
+  <string name="hidden_service_ports">Ports der versteckten Dienste</string>
   <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Der adressierbare Name für Ihre versteckten Dienste (werden automatisch generiert)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Aktiviere Debug Log Ausgabe (benötigt adb oder alogcat zur Ansicht)</string>
-  <string name="project_home">Heimat des Projekt(s):</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Aktiviere Debug-Log Ausgabe (benötigt adb oder alogcat zur Ansicht)</string>
+  <string name="project_home">Webseite(n) des Projekts:</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Die Tor Lizenz</string>
+  <string name="the_tor_license">Tor Lizenz</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">Drittanbieter-Software:</string>
-  <string name="tor_version">Tor v0.2.3.7-alpha: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
+  <string name="tor_version">Tor v0.2.4.3-alpha: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.1.1-alpha: http://www.monkey.org/~provos/libevent/</string>
   <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
   <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
+  <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string>
   <string name="hidden_service_request">Eine Anwendungen möchte den Port für versteckte Dienste %S öffnen. Dies ist sicher wenn Sie der Anwendung vertrauen.</string>
   <string name="found_existing_tor_process">existierender Tor Prozess gefunden...</string>
-  <string name="something_bad_happened">Etwasist schief gelaufen. Bitte Log prüfen</string>
-  <string name="hidden_service_on">Verstckte Dienste auf:</string>
+  <string name="something_bad_happened">Etwas ist schief gelaufen. Bitte Log prüfen</string>
+  <string name="hidden_service_on">Versteckte Dienste auf:</string>
   <string name="unable_to_read_hidden_service_name">Kann den Namen des versteckten Dienstes nicht lesen</string>
   <string name="unable_to_start_tor">Kann Tor nicht starten:</string>
   <string name="pref_use_sys_iptables_title">Benutze die Standard (default) Iptables</string>
   <string name="pref_use_sys_iptables_summary">Benutze den mitgelieferten Iptables-Binary anstatt des mit Orbot mitgelieferten.</string>
   <string name="error_installing_binares">Die Tor-Binarys konnten nicht installiert oder aktualisiert werden.</string>
-  <string name="pref_use_persistent_notifications">Behalte das Icon immer in der Benutzerleiste (Toolbar) wenn Orbot verbunden ist.</string>
+  <string name="pref_use_persistent_notifications">Behalte das Icon immer in der Benutzerleiste (Toolbar), wenn Orbot verbunden ist.</string>
   <string name="pref_use_persistent_notifications_title">Immer-eingeschaltet Benachrichtigungen</string>
-  <string name="notification_using_bridges">Brücke aktiviert!</string>
-  <string name="default_bridges"/>
+  <string name="notification_using_bridges">Brücken aktiviert!</string>
+  <string name="default_bridges"></string>
   <string name="set_locale_title">Gebietsschema festlegen</string>
   <string name="set_locale_summary">Gebietsschema und Sprache wählen</string>
   <string name="wizard_locale_title">Sprache wählen</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index b429371..dcab7b3 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -214,7 +214,7 @@
   <string name="pref_use_persistent_notifications">Να διατηρείται πάντοτε το εικονίδιο στην γραμμή εργαλείων όταν το Orbot συνδέεται</string>
   <string name="pref_use_persistent_notifications_title">Ειδοποιήσεις διαρκούς σύνδεσης</string>
   <string name="notification_using_bridges">Οι γέφυρες ενεργοποιήθηκαν!</string>
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="set_locale_title">Ορισμός τοπικών προσαρμογών</string>
   <string name="set_locale_summary">Επιλέξτε ρυθμίσεις τοπικότητας και γλώσσας για το Orbot</string>
   <string name="wizard_locale_title">Επιλέξτε γλώσσα</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 876434e..04146d6 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -2,213 +2,223 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="default_web_url">https://check.torproject.org/?lang=es</string>
+  <string name="secure_default_web_url">https://check.torproject.org/?lang=es</string>
   <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
   <string name="control_permission_label">iniciar y detener Tor</string>
   <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot está iniciando...</string>
-  <string name="status_activated">Conectado a la Red de Tor</string>
-  <string name="status_disabled">\"Orbot está desactivado</string>
+  <string name="status_starting_up">Orbot está iniciandose...</string>
+  <string name="status_activated">Conectado a la red Tor</string>
+  <string name="status_disabled">Orbot está desactivado</string>
   <string name="status_shutting_down">Orbot se está cerrando</string>
-  <string name="tor_process_starting">Lanzando cliente Tor ...</string>
-  <string name="tor_process_complete">Completado</string>
-  <string name="tor_process_waiting">En espera</string>
-  <string name="not_anonymous_yet">ADVERTENCIA: ¡Su tráfico no es anónimo aún! Por favor, configure sus aplicaciones para usar el Proxy HTTP 127.0.0.1:8118, el SOCKS4A o el Proxy SOCKS5 127.0.0.1:9050</string>
+  <string name="tor_process_starting">Iniciando cliente Tor...</string>
+  <string name="tor_process_complete">completado.</string>
+  <string name="tor_process_waiting">en espera.</string>
+  <string name="not_anonymous_yet">ADVERTENCIA: ¡Su tráfico no es anónimo aún! Configure sus aplicaciones para utilizar proxy HTTP 127.0.0.1:8118, o proxy SOCKS4A o SOCKS5 127.0.0.1:9050 (o podría habilitar la proxyficación transparente si su dispositivo está rooteado)</string>
   <string name="menu_home">Principal</string>
   <string name="menu_browse">Examinar</string>
   <string name="menu_settings">Configuración</string>
-  <string name="menu_log">Historial</string>
+  <string name="menu_log">Registro (log)</string>
   <string name="menu_info">Ayuda</string>
   <string name="menu_apps">Aplicaciones</string>
   <string name="menu_start">Iniciar</string>
   <string name="menu_stop">Detener</string>
   <string name="menu_about">Acerca de</string>
-  <string name="menu_wizard">Wizard</string>
+  <string name="menu_wizard">Asistente</string>
+  <string name="main_layout_download">Descarga</string>
+  <string name="main_layout_upload">Subida</string>
   <string name="button_help">Ayuda</string>
   <string name="button_close">Cerrar</string>
   <string name="button_about">Acerca de</string>
-  <string name="button_clear_log">Limpiar Historial</string>
-  <string name="menu_verify">Comprobar</string>
+  <string name="button_clear_log">Limpiar registro (log)</string>
+  <string name="menu_verify">Verificar</string>
   <string name="menu_exit">Salir</string>
-  <string name="press_to_start">- long press to start -</string>
-  <string name="pref_trans_proxy_group">Proxy transparente (Requiere ser Administrador)</string>
-  <string name="pref_trans_proxy_title">Proxy transparente</string>
-  <string name="pref_trans_proxy_summary">Torificado automático de las Aplicaciones</string>
-  <string name="pref_transparent_all_title">Pasar todo el tráfico por Tor</string>
-  <string name="pref_transparent_all_summary">Tráfico Proxy para todas las aplicaciones mediante Tor</string>
-  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
-  <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
-  <string name="pref_transparent_port_title">Port List</string>
-  <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
-  <string name="pref_transparent_port_dialog">Enter ports to proxy</string>
-  <string name="pref_has_root">Request Root Access</string>
-  <string name="pref_has_root_summary">Request root access for transparent proxying</string>
-  <string name="status_install_success">¡Binarios de Tor instalados con éxito!</string>
-  <string name="status_install_fail">Los archivos binarios de Tor no se han podido instalar. Por favor, verifique el Historial y notifique a: tor-assistants at torproject.org</string>
-  <string name="title_error">Error de aplicación</string>
-  <string name="wizard_title">Bienvenido a Orbot</string>
+  <string name="press_to_start">- mantega pulsado para iniciar -</string>
+  <string name="pref_trans_proxy_group">Proxyficación transparente (requiere root)</string>
+  <string name="pref_trans_proxy_title">Proxyficación transparente</string>
+  <string name="pref_trans_proxy_summary">Torificado automático de aplicaciones</string>
+  <string name="pref_transparent_all_title">Torificar todo</string>
+  <string name="pref_transparent_all_summary">Proxyfica vía Tor el tráfico de todas las aplicaciones sin configurarlas</string>
+  <string name="pref_transparent_port_fallback_title">Puertos a proxyficar para contingencias</string>
+  <string name="pref_transparent_port_fallback_summary">ADVERTENCIA: Evita puertos comunes (80, 443, etc). *USAR SÓLO* si los modos \'Todo\' o \'Aplicaciones\' no funcionan.</string>
+  <string name="pref_transparent_port_title">Lista de puertos</string>
+  <string name="pref_transparent_port_summary">Lista de puertos a proxyficar. *USAR SÓLO* si los modos \'Todo\' o \'Aplicaciones\' no funcionan</string>
+  <string name="pref_transparent_port_dialog">Introduzca los puertos a proxyficar</string>
+  <string name="pref_has_root">Solicitar permisos de root</string>
+  <string name="pref_has_root_summary">Solicita permisos de root para usar proxyficación transparente</string>
+  <string name="status_install_success">¡Los binarios de Tor se instalaron con éxito!</string>
+  <string name="status_install_fail">Los archivos binarios de Tor no pudieron ser instalados. Revise el registro (log) y notifique a tor-assistants at torproject.org</string>
+  <string name="title_error">Error de la aplicación</string>
+  <string name="wizard_title">Orbot</string>
   <string name="wizard_btn_tell_me_more">Acerca de Orbot</string>
   <string name="btn_next">Siguiente</string>
   <string name="btn_back">Atrás</string>
   <string name="btn_finish">Finalizar</string>
-  <string name="btn_okay">OK</string>
+  <string name="btn_okay">Aceptar</string>
   <string name="btn_cancel">Cancelar</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Algunos detalles de Orbot</string>
-  <string name="wizard_details_msg">Orbot es una aplicación de código abierto que contiene Tor, LibEvent y Privoxy. Provee un Proxy HTTP local (8118) y un Proxy SOCKS (9050) en la red Tor. Orbot también tiene la habilidad, en un dispositivo enrutador, de enviar todo el tráfico de Internet a través de Tor.</string>
-  <string name="wizard_permissions_root">Permiso Concedido</string>
+  <string name="wizard_details_msg">Orbot es una aplicación de código abierto que contiene Tor, LibEvent y Privoxy. Proporciona un proxy HTTP (8118) y un proxy SOCKS (9050) locales, hacia la red Tor. También tiene la capacidad, en un dispositivo rooteado (modificado para acceder como root), de enviar el tráfico de Internet a través de Tor con proxyficación transparente (sin necesidad de configurar cada aplicación para conectar al proxy).</string>
+  <string name="wizard_permissions_root">Permiso concedido</string>
   <string name="wizard_permissions_stock">Permisos de Orbot</string>
-  <string name="wizard_premissions_msg_root">¡Excelente! Hemos detectado que usted tiene permisos administravitos activados para Orbot. Utilizaremos estos poderes sabiamente.</string>
-  <string name="wizard_permissions_msg_stock">Mientras no sea requerido, Orbot puede convertirse en una herramienta aún más poderosa si su dispositivo tiene acceso de administrador. Utilice el botón a continuación para conceder superpoderes a Orbot</string>
-  <string name="wizard_permissions_no_root">Si no tiene acceso de admnistrador o no tiene idea de qué estamos hablando, sólo asegúrese de utilizar aplicaciones hechas para trabajar con Orbot.</string>
-  <string name="wizard_permissions_consent">Comprendo y quiero continuar sin poderes administrativos</string>
-  <string name="wizard_permission_enable_root">Conceder poderes administrativos a Orbot</string>
-  <string name="wizard_configure">Configurar Torificación</string>
-  <string name="wizard_configure_msg">Orbot le da la opción de dirigir todo el tráfico de las aplicaciones a través de Tor O de seleccionar sus aplicaciones individualmente.</string>
-  <string name="wizard_configure_all">Configurar Proxy para todas las aplicaciones a través de Tor</string>
-  <string name="wizard_configure_select_apps">Seleccionar aplicaciones individualmente para Tor</string>
-  <string name="wizard_tips_tricks">Aplicaciones activas en Orbot</string>
-  <string name="wizard_tips_msg">Le invitamos a descargar y utilizar aplicaciones que saben cómo conectarse directamente a Orbot. Haga clic en los botones a continuación para Instalar.</string>
-  <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
-  <string name="wizard_tips_proxy">Configuraciones Proxy - Aprenda cómo configurar aplicaciones para que trabajen con Orbot</string>
-  <string name="wizard_proxy_help_info">Configuraciones Proxy</string>
-  <string name="wizard_proxy_help_msg">Si la aplicación Android que está utilizando puede soportar el uso de un Proxy HTTP o SOCKS, entonces puede configurarla para conectar a Orbot y utilizar Tor.\n\n\nLa configuración del dominio es 127.0.0.1 o \"localhost\". Para HTTP, la configuración del puerto es 8118. Para SOCKS, el proxy es 9050. Puede utilizar SOCKS4A o SOCKS5 si es posible.\n\n\n\nPuede aprender más acerca de los proxys en Android a través de las Preguntas Frecuentes ubicadas en: http://tinyurl.com/proxyandroid\n    </string>
+  <string name="wizard_premissions_msg_root">¡Excelente! Hemos detectado que ha concedido a Orbot permisos de root. Utilizaremos estos poderes sabiamente.</string>
+  <string name="wizard_permissions_msg_stock"> Aunque no es un requisito, Orbot puede convertirse en una herramienta más potente si accede a su dispositivo con permisos de root. ¡Utilice el botón inferior para conceder superpoderes a Orbot!</string>
+  <string name="wizard_permissions_no_root">Si no tiene acceso como root o no tiene idea de qué estamos hablando, tan solo asegúrese de utilizar aplicaciones específicamente preparadas para trabajar con Orbot (o que permitan conexión por proxy HTTP o SOCKS).</string>
+  <string name="wizard_permissions_consent">Comprendo, y quiero continuar sin poderes administrativos</string>
+  <string name="wizard_permission_enable_root">Conceder permisos de root a Orbot</string>
+  <string name="wizard_configure">Configurar torificación</string>
+  <string name="wizard_configure_msg">Orbot le da la opción de dirigir el tráfico de todas las aplicaciones a través de Tor - o - de seleccionar sus aplicaciones a torificar individualmente.</string>
+  <string name="wizard_configure_all">Proxyficar todas la aplicaciones a través de Tor</string>
+  <string name="wizard_configure_select_apps">Seleccionar aplicaciones individuales para Tor</string>
+  <string name="wizard_tips_tricks">Aplicaciones habilitadas para Orbot</string>
+  <string name="wizard_tips_msg">Las siguientes aplicaciones fueron desarrolladas para trabajar con Orbot. Haga clic en cada botón para instalarlas ahora, o puede encontrarlas más tarde en Google Play, en la web guardianproject.info o vía f-droid.org </string>
+  <string name="wizard_tips_otrchat">Gibberbot - cliente de mensajería instantánea segura para Android</string>
+  <string name="wizard_tips_proxy">Preferencias para proxy - aprenda cómo configurar aplicaciones para que trabajen con Orbot</string>
+  <string name="wizard_tips_duckgo">Aplicación del motor de búsqueda DuckDuckGo</string>
+  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+  <string name="wizard_tips_firefox">Add-on \'Proxy Mobile\' para Firefox (http://tinyurl.com/getproxymob)</string>
+  <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
+  <string name="wizard_tips_twitter">Configure por proxy la aplicación de Twitter en localhost:8118</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
+  <string name="wizard_proxy_help_info">Preferencias para proxy</string>
+  <string name="wizard_proxy_help_msg">Si la aplicación Android que esté utilizando soporta el uso de un proxy HTTP o SOCKS, entonces puede configurarla para conectarse a Orbot (que será el proxy) y utilizar Tor.\n \n \nDebe configurar el servidor (host) proxy en 127.0.0.1 o \"localhost\". Para proxy por HTTP por el puerto 8118. Para proxy por SOCKS por el puerto 9050, y debe configurar para SOCKS4A o SOCKS5 si es posible.\n \n \n \nPuede aprender más acerca del uso de proxys sobre Android a través de las Preguntas Frecuentes (FAQ) en: http://tinyurl.com/proxyandroid\n </string>
   <string name="wizard_final">¡Orbot está listo!</string>
-  <string name="wizard_final_msg">Cientos de miles de personas alrededor del mundo usan Tor por una amplia variedad de razones: periodistas y bloggers, trabajadores de los derechos humanos, oficiales de policía, soldados, corporaciones, ciudadanos de regímenes represivos y ciudadanos ordinarios... ¡y ahora también lo estás!</string>
+  <string name="wizard_final_msg">Cientos de miles de personas por todo el mundo usan Tor por una amplia variedad de razones.\n\nPeriodistas y bloggers, defensores de los derechos humanos, oficiales de policía, soldados, corporaciones, ciudadanos de regímenes represivos y ciudadanos ordinarios... ¡y ahora usted también está preparado!</string>
   <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Se ha conectado con éxito a la red Tor, pero eso NO significa que su dispositivo es seguro. Puede utilizar la opción \'Comprobar\' desde el menú para probar su navegador.\n\nVisítenos en https://guardianproject.info/apps/orbot o envíenos un correo electrónico a help at guardianproject.info para aprender más.</string>
-  <string name="tor_check">Esto abrirá https://check.torproject.org en su navegador predeterminado con el fin de comprobar si Orbot está configurado y si está conectado a Tor.</string>
-  <string name="pref_hs_group">Servicios Ocultados</string>
+  <string name="connect_first_time">Ha conectado con éxito a la red Tor - pero esto NO significa que su dispositivo ya sea seguro. Puede utilizar la opción \'Verificar\' desde el menú para probar su navegador.\n\nVisítenos en https://guardianproject.info/apps/orbot o envíenos un correo a help at guardianproject.info para aprender más.</string>
+  <string name="tor_check">Esto abrirá https://check.torproject.org/?lang=es en su navegador predeterminado para comprobar que Orbot esté configurado y que esté conectado a Tor.</string>
+  <string name="pref_hs_group">Alojamiento de servicios ocultos (dentro de la red Tor)</string>
   <string name="pref_general_group">General</string>
-  <string name="pref_start_boot_title">Start Orbot on Boot</string>
-  <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
+  <string name="pref_start_boot_title">Iniciar Orbot en el arranque</string>
+  <string name="pref_start_boot_summary">Inicia Orbot y conecta a Tor automáticamente cuando arranca su dispositivo Android</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot activa el acceso a la red Tor, en su Android! \n\nTor le ayuda a defenderse del filtrado de contenido, análisis de tráfico y la vigilancia que amenaza su privacidad, su información confidencial y sus relaciones personales. \n\nEste asistente le ayudará a configurar Orbot y Tor en su dispositivo Android.</string>
+  <string name="wizard_title_msg">¡Orbot trae Tor a Android!\n\nTor le ayuda a defenderse del filtrado de contenidos, del análisis de tráfico y la vigilancia de red que atenta contra la privacidad, la información confidencial y las relaciones personales.\n\nEste asistente le ayudará a configurar Orbot y Tor en su dispositivo.</string>
   <!--Warning screen-->
   <string name="wizard_warning_title">Advertencia</string>
-  <string name="wizard_warning_msg">Simplemente instalando Orbort, no automatiza de por si, la proteccion anonima del trafico generado por su dispositivo \n\nPara anonimizar su trafico con garantias, debe configurar adecuadamente Orbot, el dispositivo y las aplicaciones que utilize en su conexion.</string>
+  <string name="wizard_warning_msg">Sólo instalando Orbot no anonimizará automáticamente su tráfico móvil.\n\nDebe configurar adecuadamente Orbot, así como su dispositivo y otras aplicaciones, para utilizar Tor con éxito.</string>
   <!--Permissions screen-->
   <string name="wizard_permissions_title">Permisos</string>
-  <string name="wizard_permissions_root_msg1">Si lo desea, puede conceder acceso \'superusuario\' a Orbot para habilitar las características avanzadas de configuracion y acceso a la red Tor, tales como los proxys transparentes.</string>
-  <string name="wizard_permissions_root_msg2">Si no desea habilitar esta opcion, por favor asegúrese de utilizar aplicaciones compatibles con Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Su dispositivo se esta ejecutando en modo estándar, y no admite el acceso root o \"superusuario\".\n\nPara que pueda beneficiarse de todo el potencial de Tor, tendrá que utilizar aplicaciones creadas para trabajar con Orbot, o compatibles con la configuracion proxy basada en los protocolos HTTP o SOCKS\n\n</string>
+  <string name="wizard_permissions_root_msg1">Opcionalmente puede conceder permisos de \'Superusuario\' a Orbot para habilitar las características avanzadas, como la proxyficación transparente.</string>
+  <string name="wizard_permissions_root_msg2">Si no desea hacer esto, asegúrese de utilizar aplicaciones específicamente preparadas para trabajar con Orbot (o configurables para ello)</string>
+  <string name="wizard_permissions_no_root_msg">Su dispositivo no parece estar rooteado (modificado para permitir acceso como root), o estar concediendo permisos de \'Superusuario\' a Orbot.\n\nPara que pueda beneficiarse de Tor, tendrá que utilizar aplicaciones específicamente preparadas para trabajar con Orbot, o que soporten conexión a través proxy HTTP o SOCKS.\n </string>
   <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Aplicaciones habilitadas para utilizar con Orbot</string>
-  <string name="wizard_tips_gibberbot">Gibberbot: Asegure su aplicación de chat con nuestro sistema de cifrado </string>
-  <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
-  <string name="wizard_tips_orweb">ORWEB (Sólo Android 1.x) - Navegador diseñado para la privacidad y para Orbot</string>
-  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <string name="wizard_tips_title">Aplicaciones habilitadas para Orbot</string>
+  <string name="wizard_tips_gibberbot">Gibberbot: Aplicación de chat segura con cifrado OTR (Off-The-Record)</string>
+  <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string>
+  <string name="wizard_tips_orweb">Orweb - navegador de privacidad-mejorada que funciona a través de Tor</string>
+  <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.xpi</string>
+  <string name="wizard_tips_play">Descubre todas las aplicaciones de Guardian Project en Google Play</string>
+  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">conexion proxy transparente activada </string>
-  <string name="wizard_transproxy_msg">Esto permite que sus aplicaciones se ejecuten automáticamente a través de la red Tor sin necesidad de realizar ninguna configuración.</string>
-  <string name="wizard_transproxy_hint">(Si no tiene idea de lo que estamos hablando, marque esta casilla ;o)</string>
+  <string name="wizard_transproxy_title">Proxyficación transparente</string>
+  <string name="wizard_transproxy_msg">Permite que sus aplicaciones se ejecuten automáticamente a través de la red Tor sin realizar configuración alguna.</string>
+  <string name="wizard_transproxy_hint">(Marque esta casilla si no tiene idea de qué estamos hablando)</string>
   <string name="wizard_transproxy_none">Ninguno</string>
-  <string name="pref_transparent_tethering_title">Tor, como pasarela de acceso</string>
-  <string name="pref_transparent_tethering_summary">Habilitar Tor como proxy cuando este dispositivo movil se utilize, a traves de conexiones WI-FI o USB como pasarela de acceso a internet (requiere reinicio)</string>
-  <string name="button_grant_superuser">Solicitud de acceso como superusuario root</string>
-  <string name="pref_select_apps">Seleccion de Aplicaciones</string>
-  <string name="pref_select_apps_summary">Elija las Aplicaciones que utilizaran Tor</string>
-  <string name="pref_node_configuration">Configuración de nodo</string>
-  <string name="pref_node_configuration_summary">Estas son las configuraciones avanzadas que pueden reducir su anonimato</string>
-  <string name="pref_entrance_node">Los nodos de entrada</string>
-  <string name="pref_entrance_node_summary">Las llaves publicas, apodos, países y direcciones para el primer salto, o nodo (primer servidor que se conectara para acceder a la red Tor)</string>
-  <string name="pref_entrance_node_dialog">Introduzca los nodos de entrada</string>
+  <string name="pref_transparent_tethering_title">Tor tethering</string>
+  <string name="pref_transparent_tethering_summary">Habilita la proxyficación transparente de Tor para dispositivos tethered (dispositivos móviles \"amarrados\", pasarela a Internet para otros dispositivos conectados a ellos mediante Wifi, USB o Bluetooth) -- (requiere reinicio)</string>
+  <string name="button_grant_superuser">Solicitar permisos de superusuario</string>
+  <string name="pref_select_apps">Seleccionar aplicaciones</string>
+  <string name="pref_select_apps_summary">Escoja las aplicaciones a redirigir través de Tor</string>
+  <string name="pref_node_configuration">Configuración de nodos</string>
+  <string name="pref_node_configuration_summary">¡Estas son configuraciones avanzadas que pueden reducir su anonimato! Afectan a los circuitos (túneles) que se establezcan para su propio tráfico a través de Tor; si repite tráfico ajeno estas configuraciones no afectan a esos circuitos.</string>
+  <string name="pref_entrance_node">Nodos de entrada</string>
+  <string name="pref_entrance_node_summary">Reglas de identificación de repetidores de entrada a la red Tor, mediante huellas de validación de claves (fingerprints), alias (nicks), códigos de país y \ndirecciones (o rangos). No prevalecen sobre las configuraciones de exclusión de nodos, y las configuraciones de bridges.</string>
+  <string name="pref_entrance_node_dialog">Introduzca nodos de entrada</string>
   <!--<string name="pref_use_whispercore">Use WhisperCore</string>
 <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
-  <string name="pref_proxy_title">Proxy de Red Saliente</string>
-  <string name="pref_proxy_type_title">Tipo de proxy</string>
-  <string name="pref_proxy_type_summary">Protocolo que se utilizará para la configuracion del servidor proxy: HTTP, HTTPS, SOCKS4, SOCKS5</string>
-  <string name="pref_proxy_type_dialog">Introduzca el Tipo de Proxy</string>
-  <string name="pref_proxy_host_title">Servidor Proxy</string>
-  <string name="pref_proxy_host_summary">Nombre para el Servidor Proxy</string>
-  <string name="pref_proxy_host_dialog">Introduzca el servidor anfitrion Proxy</string>
-  <string name="pref_proxy_port_title">Puerto proxy</string>
-  <string name="pref_proxy_port_summary">Puerto del servidor proxy</string>
-  <string name="pref_proxy_port_dialog">Introducir el puerto proxy</string>
+  <string name="pref_proxy_title">Proxy de salida (a Internet)</string>
+  <string name="pref_proxy_type_title">Tipo de proxy saliente</string>
+  <string name="pref_proxy_type_summary">Protocolo a usar para el servidor proxy saliente: HTTP, HTTPS, Socks4, Socks5.</string>
+  <string name="pref_proxy_type_dialog">Introduzca tipo de proxy</string>
+  <string name="pref_proxy_host_title">Servidor proxy saliente</string>
+  <string name="pref_proxy_host_summary">Dirección o nombre del servidor (host) proxy saliente.</string>
+  <string name="pref_proxy_host_dialog">Introduzca el servidor proxy</string>
+  <string name="pref_proxy_port_title">Puerto del proxy saliente </string>
+  <string name="pref_proxy_port_summary">Puerto del servidor proxy saliente</string>
+  <string name="pref_proxy_port_dialog">Introduzca el puerto del proxy</string>
   <string name="status">Estado</string>
-  <string name="setting_up_full_transparent_proxying_">Configuración completa, aplicando y arrancando el proxy ...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Configurando las aplicaciones que utilizaran el proxy  ...</string>
-  <string name="transparent_proxying_enabled">Servicio Proxy -- HABILITADO Y ACTIVO</string>
-  <string name="transproxy_enabled_for_tethering_">Pasarela proxy habilitado para, los dispositivos conectados, a su dispositivo movil!</string>
-  <string name="warning_error_starting_transparent_proxying_">ADVERTENCIA: vaya .. hemos tenido un error al iniciar el proxy !</string>
-  <string name="transproxy_rules_cleared">Reglas de pasarela proxy, Borradas</string>
-  <string name="couldn_t_start_tor_process_">ADVERTENCIA: No se pudo iniciar el proceso  Tor:</string>
-  <string name="privoxy_is_running_on_port_">Privoxy se está ejecutando en el puerto:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Configuración de puerto proxy  ...</string>
-  <string name="bridge_error">ADVERTENCIA: Error al establecer el Bridge ( dispositivo puente )</string>
-  <string name="bridge_requires_ip">Para utilizar la función Brigde (dispositivo puente), se debe introducir al menos una dirección IP del Bridge.</string>
-  <string name="send_email_for_bridges">Enviar un correo electrónico a bridges at torproject.org desde una cuenta de gmail , con el siguiente texto en el cuerpo del mensaje \"get bridges\" </string>
+  <string name="setting_up_full_transparent_proxying_">Estableciendo proxyficación transparente completa... </string>
+  <string name="setting_up_app_based_transparent_proxying_">Estableciendo proxyficación transparente por aplicaciones... </string>
+  <string name="transparent_proxying_enabled">Proxyficación transparente ACTIVADA</string>
+  <string name="transproxy_enabled_for_tethering_">¡TransProxy (proxyficación transparente) habilitado para tethering (pasarela)!</string>
+  <string name="warning_error_starting_transparent_proxying_">ADVERTENCIA: ¡Error al iniciar la proxyficación transparente!</string>
+  <string name="transproxy_rules_cleared">Reglas de TransProxy (proxyficación transparente) borradas</string>
+  <string name="couldn_t_start_tor_process_">No se pudo iniciar el proceso de Tor: </string>
+  <string name="privoxy_is_running_on_port_">Privoxy (proxy web de filtrado) se está ejecutando en el puerto: </string>
+  <string name="setting_up_port_based_transparent_proxying_">Estableciendo proxyficación transparente por puertos... </string>
+  <string name="bridge_error">Error de bridge (repetidor puente)</string>
+  <string name="bridge_requires_ip">Para utilizar la función bridge (repetidor puente, acceso a Tor de publicitación restringida), debe introducir al menos una dirección IP de bridge.</string>
+  <string name="send_email_for_bridges">Envíe un correo a bridges at torproject.org incluyendo en el cuerpo del mensaje una línea sólo con \"get bridges\", desde una cuenta con dominio gmail.com, yahoo.com o yahoo.cn (que soportan DKIM)</string>
   <string name="error">Error</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">La configuración de ReachableAddresses (Reglas, sobre listas de rangos ip) ha producido una excepción!</string>
-  <string name="your_relay_settings_caused_an_exception_">La configuración de la transmision ha producido una excepción!</string>
-  <string name="exit_nodes">Los nodos de salida</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Llaves publicas, alias, países y las direcciones para el último nodo de salto</string>
-  <string name="enter_exit_nodes">Introduzca los nodos de salida</string>
-  <string name="exclude_nodes">Nodos de exclusion</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Llaves publicas, alias, países y las direcciones a excluir</string>
-  <string name="enter_exclude_nodes">Introduzca los nodos a excluir</string>
-  <string name="strict_nodes">Nodos Obligatorios</string>
-  <string name="use_only_these_specified_nodes">Usar * sólamente * los nodos especificados</string>
-  <string name="bridges">Puentes/Bridges</string>
-  <string name="use_bridges">Utilizar Puentes/Bridges</string>
-  <string name="bridges_obfuscated">Puentes ofuscados</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Activar nodos de entrada alternativos en la red Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Habilitar si puentes configurados estan ofuscados</string>
-  <string name="ip_address_and_port_of_bridges">Dirección IP y el puerto del puente/Bridge</string>
-  <string name="enter_bridge_addresses">Introduzca la dirección del puente/Bridge</string>
-  <string name="relays">Retransmisores de trafico</string>
-  <string name="relaying">Retransmitiendo Trafico</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Desactivar su dispositivo, como repetidor de salida</string>
-  <string name="relay_port">Puerto del Repetidor</string>
-  <string name="listening_port_for_your_tor_relay">Puerto de escucha de su servidor Tor</string>
-  <string name="enter_or_port">Introduzca el Puerto OR</string>
-  <string name="relay_nickname">Alias para referirse al Repetidor</string>
-  <string name="the_nickname_for_your_tor_relay">Alias de su servidor Tor</string>
-  <string name="enter_a_custom_relay_nickname">Introduzca un alias personalizado para el repetidor de trafico</string>
-  <string name="reachable_addresses">Listado de ips, accesibles</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Ejecutar como cliente, situado tras un cortafuegos con politicas restrictivas</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">¡Sus \'Reglas de direcciones accesibles\' han producido una excepción!</string>
+  <string name="your_relay_settings_caused_an_exception_">¡La configuración de su repetidor ha producido una excepción!</string>
+  <string name="exit_nodes">Nodos de salida</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Reglas de identificación de repetidores de salida de la red Tor, mediante huellas de validación de claves (fingerprints), alias (nicks), códigos de país y direcciones (o rangos)</string>
+  <string name="enter_exit_nodes">Introduzca repetidores de salida</string>
+  <string name="exclude_nodes">Excluír nodos</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Reglas de identificación de repetidores a evitar en la red Tor, mediante huellas de validación de claves (fingerprints), alias (nicks), códigos de país y direcciones (o rangos)</string>
+  <string name="enter_exclude_nodes">Introduzca repetidores a evitar</string>
+  <string name="strict_nodes">Hacer estricta la exclusión de nodos (incluso si falla la comunicación)</string>
+  <string name="use_only_these_specified_nodes">Usar *sólo* estos nodos especificados</string>
+  <string name="bridges">Bridges (repetidores puente) </string>
+  <string name="use_bridges">Usar bridges</string>
+  <string name="bridges_obfuscated">Bridges ofuscados (contra análisis DPI del tráfico) </string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Habilita nodos alternativos de entrada a la red Tor, de publicitación restringida. Prevalece sobre \'Nodos de entrada\'</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Habilítelo si los bridges (repetidores puente) de su lista de configuración están ofuscados (encapsulando el tráfico SSL para evitar ser detectados) </string>
+  <string name="ip_address_and_port_of_bridges">Direcciones IP y puertos de los bridges</string>
+  <string name="enter_bridge_addresses">Introduzca direcciones de bridge</string>
+  <string name="relays">Repetidores</string>
+  <string name="relaying">Repetición de tráfico</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Habilitar que su dispositivo no sea repetidor de salida (de la red Tor) </string>
+  <string name="relay_port">Puerto de repetidor</string>
+  <string name="listening_port_for_your_tor_relay">Puerto de escucha para su repetidor Tor</string>
+  <string name="enter_or_port">Introduzca puerto OR (Onion Routing, repositorio de repetidores)</string>
+  <string name="relay_nickname">Alias del repetidor</string>
+  <string name="the_nickname_for_your_tor_relay">El apodo que identificará a su repetidor en la red Tor</string>
+  <string name="enter_a_custom_relay_nickname">Introduzca un alias personalizado para su repetidor</string>
+  <string name="reachable_addresses">Reglas de direcciones accesibles ([accept(*)|reject] IP:port, etc.)</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Ejecutar Tor como sólo cliente detrás de un cortafuegos (firewall) con políticas restrictivas</string>
   <string name="reachable_ports">Puertos accesibles</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Puertos accesibles detrás de un firewall restrictivo</string>
-  <string name="enter_ports">Introduzca los puertos</string>
-  <string name="enable_hidden_services">Activar los servicios ocultos</string>
-  <string name="run_servers_accessible_via_the_tor_network">Ejecutar servidores accesibles a través de la red de Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">Introduzca los puertos locales de los servicios ocultos activados</string>
-  <string name="hidden_service_ports">Ocultar puertos de servicio</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Nombre direccionable para su servicio oculto (generado automáticamente)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">permitir  el registro de depuración de la aplicacion (debe utilizar adb o aLogCat para poder verlos)</string>
-  <string name="project_home">Localizacion del proyecto: </string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/Orbot/</string>
-  <string name="the_tor_license">Licencia de uso Tor</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Puertos accesibles detrás de un firewall restrictivo (80 y 443 por defecto)</string>
+  <string name="enter_ports">Introduzca puertos</string>
+  <string name="enable_hidden_services">Activar alojamiento de servicios ocultos (en la red Tor)</string>
+  <string name="run_servers_accessible_via_the_tor_network">Permite el acceso a servidores ocultos por dispositivo (IP oculta al usuario) accesibles a través de la red Tor (dominio .onion, sin DNS)</string>
+  <string name="enter_localhost_ports_for_hidden_services">Introduzca los puertos locales de sus servicios ocultos</string>
+  <string name="hidden_service_ports">Puertos de los servicios ocultos</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">El nombre direccionable (sin DNS, .onion generado automáticamente) para su servicio oculto</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Habilitar el registro de depuración (debug log) a la salida (debe utilizar adb o aLogCat para verlo)</string>
+  <string name="project_home">Página(s) principal(es) del proyecto:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Licencia de Tor</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">Software de terceras partes</string>
-  <string name="tor_version">Tor v0.2.3.7-alfa: https://www.torproject.org</string>
-  <string name="libevent_version">Libevent v1.4.13: http://www.monkey.org/ ~ provos / libevent /</string>
+  <string name="tor_version">Tor v0.2.4.3-alpha: https://www.torproject.org</string>
+  <string name="libevent_version">Libevent v2.1.1-alpha: http://www.monkey.org/~provos/libevent/</string>
   <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
   <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
-  <string name="hidden_service_request">Una aplicación esta intentando abrir el siguiente puerto %S a la red Tor. Esto es seguro, si confía en la aplicación, que lo esta intentando abrir.</string>
-  <string name="found_existing_tor_process">Se ha encontrado proceso activo de Tor ...</string>
-  <string name="something_bad_happened">Algo ha ocurrido con el normal funcionamiento de la aplicacion. Compruebe el log de registro del sistema Tor</string>
+  <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string>
+  <string name="hidden_service_request">Una aplicación está intentando abrir el puerto %S de servicio oculto hacia la red Tor. Esto es seguro si su aplicación es de su confianza.</string>
+  <string name="found_existing_tor_process">Se encontró un proceso de Tor ya existente...</string>
+  <string name="something_bad_happened">Hubo algún tipo de problema. Compruebe el registro (log)</string>
   <string name="hidden_service_on">Servicio oculto en:</string>
-  <string name="unable_to_read_hidden_service_name">No se puede leer el nombre del servicio oculto</string>
-  <string name="unable_to_start_tor">ADVERTENCIA: No Puedo iniciar la Red Tor:</string>
-  <string name="pref_use_sys_iptables_title">Usar Iptables por defecto</string>
-  <string name="pref_use_sys_iptables_summary">Usar built-in iptables binario en lugar del paquete con Orbot</string>
-  <string name="error_installing_binares">Los binario de Tor no se pudieron instalar o actualizar</string>
+  <string name="unable_to_read_hidden_service_name">No fue posible leer el nombre del servicio oculto</string>
+  <string name="unable_to_start_tor">No fue posible iniciar Tor: </string>
+  <string name="pref_use_sys_iptables_title">Usar el Iptables por defecto</string>
+  <string name="pref_use_sys_iptables_summary">Usa el binario de Iptables del sistema en lugar del incluído en el paquete de Orbot</string>
+  <string name="error_installing_binares">No fue posible instalar o actualizar los binarios de Tor.</string>
   <string name="pref_use_persistent_notifications">Mantener siempre el icono de Orbot en la barra de tareas cuando esté conectado</string>
-  <string name="pref_use_persistent_notifications_title">Notificaciones siempre encendidas</string>
-  <string name="notification_using_bridges">Puentes activados!</string>
-  <string name="default_bridges"/>
-  <string name="set_locale_title">Establecer configuración regional</string>
-  <string name="set_locale_summary">Elija la configuración regional y de idioma para Orbot</string>
-  <string name="wizard_locale_title">Escoja lenguaje\n</string>
-  <string name="wizard_locale_msg">Dejar por defecto o cambiar el lenguaje actual</string>
-  <string name="powered_by">potenciado por Tor Project</string>
+  <string name="pref_use_persistent_notifications_title">Notificaciones siempre activadas</string>
+  <string name="notification_using_bridges">¡Bridges habilitados! </string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Configuración regional</string>
+  <string name="set_locale_summary">Elija la configuración regional y el idioma para Orbot</string>
+  <string name="wizard_locale_title">Escoja idioma</string>
+  <string name="wizard_locale_msg">Deje el predeterminado o cambie de idioma</string>
+  <string name="powered_by">impulsado por The Tor Project</string>
   <string name="btn_save_settings">Guardar configuración</string>
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 613218b..cb86f58 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -78,6 +78,7 @@
   <string name="wizard_permissions_title">Baimenak</string>
   <!--TipsAndTricks screen-->
   <string name="wizard_tips_title">Orbot-Gaitutako Aplikazioak</string>
+  <string name="wizard_tips_gibberbot">Gibberbot: Txat aplikazio segurua Off-the-Record enkriptazioarekin.</string>
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
   <string name="wizard_tips_orweb">Orweb - Tor bidez lan egiten duen pribatutasun-hobetua duen nabigatzailea</string>
   <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
@@ -142,10 +143,11 @@
   <string name="unable_to_start_tor">Ezin izan da Tor hasi:</string>
   <string name="pref_use_sys_iptables_title">Lehenetsitako Iptables erabili</string>
   <string name="notification_using_bridges">Zubiak gaituta!</string>
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="set_locale_title">Lokala ezarri</string>
   <string name="set_locale_summary">Aukeratu Orbotentzako lokala eta hizkuntza</string>
   <string name="wizard_locale_title">Hizkuntza aukeratu</string>
   <string name="wizard_locale_msg">Lehenetsia utzi edo uneko hizkuntzara aldatu</string>
   <string name="powered_by">Tor Projectek indartua</string>
+  <string name="btn_save_settings">Ezarpenak gorde</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 7afc086..c20f110 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -214,7 +214,7 @@
   <string name="pref_use_persistent_notifications">وقتی ربات پیازی متصل است، همیشه آیکون مربوط را در نوار ابزار نگه دار.</string>
   <string name="pref_use_persistent_notifications_title">آگاهسازی همیشه روشن</string>
   <string name="notification_using_bridges">پل ها فعال شدند!</string>
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="set_locale_title">زبان محلی را مشخص کنید</string>
   <string name="set_locale_summary">زبان محلی  ربات پیازی  را انتخاب کنید</string>
   <string name="wizard_locale_title">انتخاب زبان</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 3807707..5a2908f 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -9,11 +9,11 @@
   <string name="tor_proxy_service_process">torproxyservice</string>
   <string name="status_starting_up">Orbot démarre...</string>
   <string name="status_activated">Connecté au réseau Tor</string>
-  <string name="status_disabled">\"Orbot est désactivé</string>
+  <string name="status_disabled">Orbot est désactivé</string>
   <string name="status_shutting_down">Orbot s\'arrête</string>
   <string name="tor_process_starting">Lancement du client Tor</string>
-  <string name="tor_process_complete">Terminé</string>
-  <string name="tor_process_waiting">Attente...</string>
+  <string name="tor_process_complete">terminé.</string>
+  <string name="tor_process_waiting">attente.</string>
   <string name="not_anonymous_yet">AVERTISSEMENT: Votre trafic n\'est pas encore anonyme ! Veuillez configurer vos applications pour qu\'elles utilisent le proxy HTTP à 127.0.0.1:8118 ou le proxy SOCKS4A ou SOCKS5 à 127.0.0.1:9050</string>
   <string name="menu_home">Accueil</string>
   <string name="menu_browse">Parcourir</string>
@@ -47,7 +47,7 @@
   <string name="pref_has_root">Demander un accès privilégié</string>
   <string name="pref_has_root_summary">Demande un accès privilégié pour le proxy transparent</string>
   <string name="status_install_success">Tor a été installé avec succès !</string>
-  <string name="status_install_fail">Tor n\'a pas pu installé. S\'il vous plaît, vérifiez le fichier journal et contactez tor-assistants at torproject.org</string>
+  <string name="status_install_fail">Tor n\'a pu être installé. Veuillez vérifier le fichier journal et contacter tor-assistants at torproject.org</string>
   <string name="title_error">Erreur de l\'application</string>
   <string name="wizard_title">Bienvenue dans Orbot</string>
   <string name="wizard_btn_tell_me_more">À propos de Orbot</string>
@@ -62,12 +62,12 @@
   <string name="wizard_permissions_root">Permission accordée</string>
   <string name="wizard_permissions_stock">Permissions d\'Orbot</string>
   <string name="wizard_premissions_msg_root">Excellent ! Nous avons détecté que vous avez donné les droits privilégiés pour Orbot. Nous utiliserions ces droits avec sagesse.</string>
-  <string name="wizard_permissions_msg_stock"> Bien que cela ne soit pas nécessaire, Orbot peut devenir un outil bien plus utile si vous lui donnez un accès privilégié. Utilisez le bouton ci-dessous pour donner à Orbot de grands pouvoirs ! </string>
-  <string name="wizard_permissions_no_root">Si vous n\'avez pas d\'accès privilégié ou n\'avez pas idée de ce que cela est, vérifiez bien que vous utilisez des applications conçues pour fonctionner avec Orbot.</string>
+  <string name="wizard_permissions_msg_stock">Bien que cela ne soit pas nécessaire, Orbot peut devenir un outil bien plus utile si vous lui donnez un accès privilégié. Utilisez le bouton ci-dessous pour donner à Orbot de grands pouvoirs ! </string>
+  <string name="wizard_permissions_no_root">Si vous n\'avez pas d\'accès privilégié ou n\'avez pas idée de ce que cela signifie, vérifiez bien que vous utilisez des applications conçues pour fonctionner avec Orbot.</string>
   <string name="wizard_permissions_consent">Je comprends et je souhaite continuer sans les droits privilégiés</string>
   <string name="wizard_permission_enable_root">Donner les droits privilégiés à Orbot</string>
   <string name="wizard_configure">Configurer la Torification</string>
-  <string name="wizard_configure_msg">Orbot vous donne le choix entre faire passer le trafic de toutes les applications à travers Tor OU de choisir pour chaque application</string>
+  <string name="wizard_configure_msg">Orbot vous donne le choix entre faire passer le trafic de toutes les applications à travers Tor OU de choisir pour chaque application.</string>
   <string name="wizard_configure_all">Toutes les applications par Tor</string>
   <string name="wizard_configure_select_apps">Choisir les applications utilisant Tor</string>
   <string name="wizard_tips_tricks">Applications avec Orbot</string>
@@ -75,11 +75,14 @@
   <string name="wizard_tips_otrchat">Gibberbot - Client de messagerie instantanée pour Android</string>
   <string name="wizard_tips_proxy">Configuration du proxy - Apprendre comment configurer les applications pour qu\'elles fonctionnent avec Orbot</string>
   <string name="wizard_tips_duckgo">Application DuckDuckgo Search Engine</string>
+  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
   <string name="wizard_tips_firefox">Firefox avec le plugin Proxy Mobile (installation complémentaire)</string>
+  <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
   <string name="wizard_tips_twitter">Twitter supporte le proxy http \"localhost:8118\"</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Configuration du proxy</string>
   <string name="wizard_proxy_help_msg">Si l\'application Android que vous utilisez peut supporter un proxy HTTP ou un proxy SOCKS, vous pouvez la configurer pour se connecter à Orbot et utiliser Tor./n/n\n    La configuration de l\'hôte est 127.0.0.1 ou \"localhost\". Pour le HTTP, le port utilisé est le 8118. Pour SOCKS, le port utilisé est 9050. Vous devriez, si possible, utiliser SOCKS4A ou SOCKS5.\n    /n/n\n    Vous pouvez en apprendre plus sur la configuration de proxy sous Android sur la FAQ à : http://tinyurl.com/proxyandroid\n    </string>
-  <string name="wizard_final">Orbot est prêt!</string>
+  <string name="wizard_final">Orbot est prêt !</string>
   <string name="wizard_final_msg">Des milliers de personnes dans le monde utilisent Tor pour une grande variétés de raisons : journalistes et bloggers, défenseurs des droits de l\'homme, policiers, soldats, entreprises, les citoyens de régimes répressifs, et aussi de simples citoyens ... et maintenant vous êtes prêts aussi !</string>
   <!--END Welcome Wizard strings (DJH)-->
   <string name="connect_first_time"> Vous êtes connectés avec succès au réseau Tor - mais cela ne signifie PAS que votre appareil est sécurisé. Vous pouvez utiliser l\'option \'Vérifier\'  du menu pour vérifier avec votre navigateur. \n\nAllez à la page https://guardianproject.info/apps/orbot ou envoyez un courriel à help at guardianproject.info pour en savoir plus.</string>
@@ -105,6 +108,8 @@
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
   <string name="wizard_tips_orweb">ORWEB (Android 1.x seulement) - navigateur créé pour protéger votre vie privée & pour Orbot</string>
   <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
+  <string name="wizard_tips_play">Trouver toutes les applications de Guardian Project sur Google Play</string>
+  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
@@ -148,7 +153,7 @@
   <string name="setting_up_port_based_transparent_proxying_">Configuration du proxy transparent par port...</string>
   <string name="bridge_error">Erreur de passerelle</string>
   <string name="bridge_requires_ip">Avant de pouvoir utiliser les passerelles, vous devez entrer au moins l\'adresse IP d\'une passerelle</string>
-  <string name="send_email_for_bridges">Envoyez un e-mail à bridges at torproject.org avec \"get bridges\" dans le corps de l\'e-mail - fonctionne si le mail est envoyé d\'une adresse Gmail</string>
+  <string name="send_email_for_bridges">Envoyez un e-mail à bridges at torproject.org avec \"get bridges\" dans le corps de l\'e-mail - fonctionne si le mail est envoyé d\'une adresse Gmail.</string>
   <string name="error">Erreur</string>
   <string name="your_reachableaddresses_settings_caused_an_exception_">Les paramètres pour ReachableAddresses ont provoqué une erreur !</string>
   <string name="your_relay_settings_caused_an_exception_">Vos paramètres de relais ont provoqué une erreur !</string>
@@ -209,7 +214,7 @@
   <string name="pref_use_persistent_notifications">Toujours conserver l\'icône dans la barre des tâches quand Orbot est connecté.</string>
   <string name="pref_use_persistent_notifications_title">Toujours activé les Notifications</string>
   <string name="notification_using_bridges">Les ponts sont activés!</string>
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="set_locale_title">Fixer le Lieu</string>
   <string name="set_locale_summary">Choisir le lieu and la langue pour Orbot</string>
   <string name="wizard_locale_title">Choisir la langue</string>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
index 002f24e..1c94b69 100644
--- a/res/values-he/strings.xml
+++ b/res/values-he/strings.xml
@@ -13,6 +13,8 @@
   <string name="status_shutting_down">Orbot בתהליך כיבוי</string>
   <string name="tor_process_starting">מתחיל את Tor...</string>
   <string name="tor_process_complete">הושלם</string>
+  <string name="tor_process_waiting">מחכה</string>
+  <string name="not_anonymous_yet">                                                                                                                אזהרה: הגלישה שלך לא אנונימית עדיין! בבקשה הגדר את האפליקציות שלך כך שיתאפשר שימוש בפרוקסי HTTP 127.0.0.1:8118 או SOCKS4A או SOCKS5\nproxy 127.0.0.1:9050</string>
   <string name="menu_home">בית</string>
   <string name="menu_browse">דפדף</string>
   <string name="menu_settings">הגדרות</string>
@@ -30,9 +32,20 @@
   <string name="menu_verify">בדיקה</string>
   <string name="menu_exit">צא</string>
   <string name="press_to_start">-נגיעה ארוכה להתחלה-</string>
+  <string name="pref_trans_proxy_group">פרוקסי שקוף (שורש נדרש)</string>
+  <string name="pref_trans_proxy_title">פרוקסי שקוף</string>
+  <string name="pref_trans_proxy_summary">עבודה אוטומטית עם אפליקציות דרך Tor</string>
   <string name="pref_transparent_all_title">הכל דרך Tor</string>
+  <string name="pref_transparent_all_summary">תעבור דרך פרוקסי  עבור כל האפליקציות דרך Tor</string>
+  <string name="pref_transparent_port_fallback_title">גיבוי ל Port Proxy</string>
+  <string name="pref_transparent_port_fallback_summary">אזהרה: עקוף פורטים נפוצים (80,443 וכו\'). *השתמש רק* אם האופנים \'All\' או \'App\'  לא עובדים.</string>
   <string name="pref_transparent_port_title">רשימת פורטים</string>
+  <string name="pref_transparent_port_summary">רשימת פורטים לפרוקסי. *השתמש רק* אם האופנים \'All\' או \'App\'  לא עובדים.</string>
+  <string name="pref_transparent_port_dialog">בחר פורטים לפרוקסים</string>
   <string name="pref_has_root">דרוש רוט</string>
+  <string name="pref_has_root_summary">בקש גישה עליונה עבור שימוש בפרוקסי שקוף</string>
+  <string name="status_install_success">קבצים ברי הרצה של Tor הותקנו בהצלחה!</string>
+  <string name="status_install_fail">הקבצים ברי ההרצה של Tor לא ניתנו להתקנה. בבקשה בדוק את הלוג והודע ל \ntor-assistants at torproject.org</string>
   <string name="title_error">שגיאת יישום</string>
   <string name="wizard_title">Orbot</string>
   <string name="wizard_btn_tell_me_more">אודות Orbot</string>
@@ -42,38 +55,87 @@
   <string name="btn_okay">OK.</string>
   <string name="btn_cancel">סגור</string>
   <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">מספר פרטים של  Orbot </string>
+  <string name="wizard_details_msg"> Orbot היא אפליקצית קוד פתוח שמכילה Tor, libEvevt ופרוקסי. היא מספקת פרוקסי    HTTP  מקומי (8118) ו SOCKS   פרוקסי (9050) לרשת ה Tor. ל Orbot יש גם יכולת, במכשיר פתוח, לשלוח את כל תעבורת האינטרנט דרך Tor.</string>
+  <string name="wizard_permissions_root">ניתנה רשות</string>
+  <string name="wizard_permissions_stock">רשויות של Orbot</string>
+  <string name="wizard_premissions_msg_root">מצוין! גילינו שיש לך רשויות עליוניות מאופשרות בשביל Orbot. נשתמש בכוח הזה בחוכמה.</string>
+  <string name="wizard_permissions_msg_stock">בזמן שזה לא נדרש, Orbot יכולה להפוך להיות כלי חזק יותר אם למכשיר שלך יש גישה עליונה. תשתמש בכפתור למטה כדי לקבל כוחות על של Orbot !</string>
+  <string name="wizard_permissions_no_root">אם אין לך גישה עליונה או אין לך מושג על מה אנחנו מדברים, רק תוודא שתשתמש באפליקציות שנועדו לעבוד עם Orbot.</string>
   <string name="wizard_permissions_consent">הבנתי ואני מעדיף להמשיך בלי Superuser</string>
+  <string name="wizard_permission_enable_root">אפשר גישה מלאה עבור Orbot</string>
+  <string name="wizard_configure">הגדר עבודה באמצעות Tor</string>
+  <string name="wizard_configure_msg">Orbot נותנת לך אפשרות לכוון את כל תעבורת האפליקציות דרך Tor או לבחור את האפליקציות שלך בנפרד.</string>
+  <string name="wizard_configure_all">השץמש בפרוקסי בכל האפליקציות דרך Tor</string>
+  <string name="wizard_configure_select_apps">בחר אפליקציות מסוימות עבור Tor</string>
+  <string name="wizard_tips_tricks">Orbot מתאפשר על ידי אפליקציות</string>
+  <string name="wizard_tips_msg">האפליקציות מתחת פותחו לעבודה עם Orbot. לחץ על כל כפתור להתקנה מיידית, או שאתה יכול למצוא אותם אחר כך ב Google Play, באתר GuardianProject.info או\nדרך  F-Droid.org</string>
+  <string name="wizard_tips_otrchat">Gibberbot-שליחת הודעות לקוח מיידית מאובטחת  עבור אנדרואיד.</string>
   <string name="wizard_tips_proxy">הגדרות פרוקסי- למד איך להגדיר אפליקציות לעבוד עם Orbot</string>
   <string name="wizard_proxy_help_info">הגדרות פרוקסי</string>
+  <string name="wizard_proxy_help_msg">אם אפליקציית האנדרואיד שאתה משתמש תומכת בשימוש של פרוקסי   HTTP  או SOCKS, תוכל להגדיר זאת בשביל להתחבר ל Orbot ולהשתמש ב Tor. \nהגדרות המארח הם 127.0.0.1 או \"localhost\". עבור HTTP, הגדרת הפורט היא 8118. עבור SOCKS הפרוקסי הוא 9050. אתה יכול להשתמש ב SOCKS4A או ב SOCKS5 אם מתאפשר. אתה יכול ללמוד עוד על עבודה עם פרוקסי באנדרואיד דרך FAQ\nב http://tinyurl.com/proxyandroid</string>
   <string name="wizard_final">Orbot מוכן!</string>
+  <string name="wizard_final_msg">מאות אלפי אנשים סביב העולם משתמשים ב Tor  עבור מגוון סיבות. עיתונאים ובלוגרים, מגיני זכויות אדם, שוטרים, חיילים, תאגידים, אזרחים במשטרים מדכאים וגם אזרחים רגילים.. ועכשיו גם אתה!</string>
   <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">אתה מחובר בהצלחה לרשת Tor- אבל זה לא אומר שהמכשיר שלך מאובטח. אתה יכול להשתמש באפשרות ה   \'Check\' מהתפריט כדי לבדוק את הדפדפן שלך. בקר ב \nhttps://guardianproject.info/apps/orbot  או שלח אימייל ל help at guardianproject.info\nכדי ללמוד עוד.</string>
+  <string name="tor_check">דבר זה יפתח את דפדפן הרשת שלך ל  https://check.torproject.org כדי לראות אם Orbot הוגדרה ואם אתה מחובר ל Tor.</string>
   <string name="pref_hs_group">איחסון שירותים נסתרים</string>
   <string name="pref_general_group">כללי</string>
   <string name="pref_start_boot_title">התחל את Orbot בהדלקת המכשיר</string>
   <string name="pref_start_boot_summary">התחל את Orbot והתחבר ל-Tor אוטומטית כהמכשיר נדלק</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot מביאה את Tor לאנדרואיד! Tor  עוזרת לך בהגנה נגד סינון תכנים, ניתוח תעבורה ומעקב רשת שמאיימים על פרטיות, מידע סודי וקשרים אישיים.  כלי זה עוזר לך להגדיר את Orbot ואת Tor על המכשיר שלך. </string>
   <!--Warning screen-->
+  <string name="wizard_warning_title">אזהרה</string>
+  <string name="wizard_warning_msg">רק התקנת Orbot לא תאפשר אנונימיות לתעבורת המכשיר שלך. אתה חייב להגדיר Orbot , את המכשיר שלך ואפליקציות אחרות בהתאם כדי להשתמש בהצלחה  בTor.</string>
   <!--Permissions screen-->
+  <string name="wizard_permissions_title">רשויות</string>
+  <string name="wizard_permissions_root_msg1">אתה יכול לקבל גישת   \'Superuser\'   ב Orbot כדי לאפשר מאפיינים מתקדמים כמו למשל, פרוקסי שקוף.</string>
   <string name="wizard_permissions_root_msg2">אם אתה לא רוצה לעשות את זה, אנא הקפד להשתמש ביישומים שנעשו כדי לעבוד עם Orbot</string>
+  <string name="wizard_permissions_no_root_msg">לא נראה שהמכשיר שלך בעל סמכות עליונה או קיבל גישת  \'Superuser\'. כדי ש Tor יהיה יעיל, תצטרך להשתמש באפליקציות שנבנו בשביל לעבוד עם Orbot, או כאלה שתומכות \nבהגדרות פרוקסי של   HTTP או של SOCKS.\n</string>
   <!--TipsAndTricks screen-->
   <string name="wizard_tips_title">Orbot - יישומים מופעלים</string>
+  <string name="wizard_tips_gibberbot">Gibberbot: אפליקצית צ\'אט מאובטחת עם הצפנת Off-the-Record</string>
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
+  <string name="wizard_tips_orweb">Orweb- דפדפן עם פרטיות רבה שעובד דרך Tor</string>
+  <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.xpi</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">פרוקסי שקוף</string>
   <string name="wizard_transproxy_msg">זה מאפשר ליישומים שלך להפעיל באופן אוטומטי דרך רשת Tor ללא כל תצורה.</string>
   <string name="wizard_transproxy_hint">(סמן תיבה זו אם אין לך מושג על מה אנחנו מדברים)</string>
+  <string name="wizard_transproxy_none">כלום</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">מאפשר עבודה עם פרוקסי שקוף עבור רשת אלחוטית ומכשירי  USB Tethered (דורש אתחול מחדש)</string>
   <string name="button_grant_superuser">דרוש אישור Superuser</string>
   <string name="pref_select_apps">בחר אפלקציות</string>
   <string name="pref_select_apps_summary">בחר אפלקציות</string>
+  <string name="pref_node_configuration">הגדרות Node</string>
+  <string name="pref_node_configuration_summary">קיימות הגדרות מתקדמות שיכולות להפחית את האנונימיות שלך</string>
+  <string name="pref_entrance_node">Entrance Nodes</string>
+  <string name="pref_entrance_node_summary">טביעות אצבע, כינויים, ארצות וכתובות עבור המעבר הראשון</string>
+  <string name="pref_entrance_node_dialog">הכנס Entrance Nodes</string>
   <!--<string name="pref_use_whispercore">Use WhisperCore</string>
 <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
-  <string name="pref_proxy_type_dialog">סוג הפרוקסי:</string>
+  <string name="pref_proxy_type_title">Outbound Proxy Type</string>
+  <string name="pref_proxy_type_summary">פרוטוקול שימוש בשרת פרוקסי:  HTTP, HTTPS, Socks4,Socks5</string>
+  <string name="pref_proxy_type_dialog">סוג הפרוקסי</string>
+  <string name="pref_proxy_host_title">מארח של Outbound Proxy</string>
+  <string name="pref_proxy_host_summary">שם מארח של שרת פרוקסי</string>
+  <string name="pref_proxy_host_dialog">הכנס מארח פרוקסי</string>
+  <string name="pref_proxy_port_title">פורט של Outbound Proxy</string>
   <string name="pref_proxy_port_summary">פורט השרת של הפרוקסי</string>
+  <string name="pref_proxy_port_dialog">הכנס פורט של פרוקסי</string>
   <string name="status">סטטוס</string>
+  <string name="setting_up_full_transparent_proxying_">הכנה של הפרוקסי השקוף...</string>
+  <string name="setting_up_app_based_transparent_proxying_">הכנה של הפרוקסי השקוף מבוסס אפליקציות...</string>
+  <string name="transparent_proxying_enabled">פרוקסי שקוף מאופשר</string>
+  <string name="transproxy_enabled_for_tethering_">פרוקסי שקוף מאופשר ל Tathering!</string>
+  <string name="warning_error_starting_transparent_proxying_">אזהרה: שגיאה התחילה את הפרוקסי השקוף!</string>
   <string name="bridge_error">שגיאת גשר</string>
   <string name="error">שגיאה</string>
   <string name="bridges">גשרים</string>
@@ -84,7 +146,7 @@
   <string name="enable_hidden_services">אחסון שירותים נסתרים</string>
   <string name="hidden_service_ports">פורט השירותים הנסתרים</string>
   <string name="https_torproject_org">https://torproject.org/</string>
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="wizard_locale_title">בחר שפה</string>
   <string name="powered_by">מופעל על ידי Tor Project</string>
   <string name="btn_save_settings">שמירת הגדרות</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 520215c..cda2f90 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -1,213 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">start and stop Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot is starting...</string>
-  <string name="status_activated">Connected to the Tor network</string>
-  <string name="status_disabled">\"Orbot is Deactivated</string>
-  <string name="status_shutting_down">Orbot is shutting down</string>
-  <string name="tor_process_starting">Starting Tor client...</string>
-  <string name="tor_process_complete">complete.</string>
-  <string name="tor_process_waiting">waiting.</string>
-  <string name="not_anonymous_yet">WARNING: Your traffic is not anonymous yet! Please configure your applications to use HTTP proxy 127.0.0.1:8118 or SOCKS4A or SOCKS5 proxy 127.0.0.1:9050</string>
-  <string name="menu_home">Home</string>
-  <string name="menu_browse">Browse</string>
-  <string name="menu_settings">Settings</string>
-  <string name="menu_log">Log</string>
-  <string name="menu_info">Help</string>
-  <string name="menu_apps">Apps</string>
-  <string name="menu_start">Start</string>
-  <string name="menu_stop">Stop</string>
-  <string name="menu_about">About</string>
-  <string name="menu_wizard">Wizard</string>
-  <string name="button_help">Help</string>
-  <string name="button_close">Close</string>
-  <string name="button_about">About</string>
-  <string name="button_clear_log">Clear Log</string>
-  <string name="menu_verify">Check</string>
-  <string name="menu_exit">Exit</string>
-  <string name="press_to_start">- long press to start -</string>
-  <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string>
-  <string name="pref_trans_proxy_title">Transparent Proxying</string>
-  <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string>
-  <string name="pref_transparent_all_title">Tor Everything</string>
-  <string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string>
-  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
-  <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
-  <string name="pref_transparent_port_title">Port List</string>
-  <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
-  <string name="pref_transparent_port_dialog">Enter ports to proxy</string>
-  <string name="pref_has_root">Request Root Access</string>
-  <string name="pref_has_root_summary">Request root access for transparent proxying</string>
-  <string name="status_install_success">Tor binaries successfully installed!</string>
-  <string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants at torproject.org</string>
-  <string name="title_error">Application Error</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">About Orbot</string>
-  <string name="btn_next">Next</string>
-  <string name="btn_back">Back</string>
-  <string name="btn_finish">Finish</string>
-  <string name="btn_okay">Okay</string>
-  <string name="btn_cancel">Cancel</string>
+  <string name="menu_info">Pomoć</string>
+  <string name="button_help">Pomoć</string>
   <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Some Orbot Details</string>
-  <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, LibEvent and Privoxy. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string>
-  <string name="wizard_permissions_root">Permission Granted</string>
-  <string name="wizard_permissions_stock">Orbot Permissions</string>
-  <string name="wizard_premissions_msg_root">Excellent! We\'ve detected that you have root permissions enabled for Orbot. We will use this power wisely.</string>
-  <string name="wizard_permissions_msg_stock"> While it is not required, Orbot can become a more powerful tool if your device has root access. Use the button below to grant Orbot superpowers! </string>
-  <string name="wizard_permissions_no_root">If you don\'t have root access or have no idea what we\'re talking about, just be sure to use apps made to work with Orbot.</string>
-  <string name="wizard_permissions_consent">I understand and would like to continue without Superuser</string>
-  <string name="wizard_permission_enable_root">Grant Root for Orbot</string>
-  <string name="wizard_configure">Configure Torification</string>
-  <string name="wizard_configure_msg">Orbot gives you the option to route all application traffic through Tor OR to choose your applications individually.</string>
-  <string name="wizard_configure_all">Proxy All Apps Through Tor</string>
-  <string name="wizard_configure_select_apps">Select Individual Apps for Tor</string>
-  <string name="wizard_tips_tricks">Orbot-enabled Apps</string>
-  <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later in the Android Market.</string>
-  <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
-  <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string>
-  <string name="wizard_proxy_help_info">Proxy Settings</string>
-  <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n\n    The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n    \n\n\n    You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n    </string>
-  <string name="wizard_final">Orbot is ready!</string>
-  <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string>
+  <string name="wizard_proxy_help_info">Proxy postavke</string>
   <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help at guardianproject.info 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 at torproject.org with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string>
-  <string name="error">Error</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string>
-  <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string>
-  <string name="exit_nodes">Exit Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string>
-  <string name="enter_exit_nodes">Enter Exit Nodes</string>
-  <string name="exclude_nodes">Exclude Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string>
-  <string name="enter_exclude_nodes">Enter Exclude Nodes</string>
-  <string name="strict_nodes">Strict Nodes</string>
-  <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string>
-  <string name="bridges">Bridges</string>
-  <string name="use_bridges">Use Bridges</string>
-  <string name="bridges_obfuscated">Obfuscated Bridges</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string>
-  <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string>
-  <string name="enter_bridge_addresses">Enter Bridge Addresses</string>
-  <string name="relays">Relays</string>
-  <string name="relaying">Relaying</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Enable your device to be a non-exit relay</string>
-  <string name="relay_port">Relay Port</string>
-  <string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string>
-  <string name="enter_or_port">Enter OR port</string>
-  <string name="relay_nickname">Relay nickname</string>
-  <string name="the_nickname_for_your_tor_relay">The nickname for your Tor relay</string>
-  <string name="enter_a_custom_relay_nickname">Enter a custom relay nickname</string>
-  <string name="reachable_addresses">Reachable Addresses</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Run as a client behind a firewall with restrictive policies</string>
-  <string name="reachable_ports">Reachable ports</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string>
-  <string name="enter_ports">Enter ports</string>
-  <string name="enable_hidden_services">Enable Hidden Services</string>
-  <string name="run_servers_accessible_via_the_tor_network">run servers accessible via the Tor network</string>
-  <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string>
-  <string name="hidden_service_ports">Hidden Service Ports</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string>
-  <string name="project_home">Project Home(s): </string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">The Tor License</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3rd-Party-Software: </string>
-  <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
-  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
-  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
-  <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string>
-  <string name="found_existing_tor_process">found existing Tor process...</string>
-  <string name="something_bad_happened">Something bad happened. Check the log</string>
-  <string name="hidden_service_on">hidden service on:</string>
-  <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string>
-  <string name="unable_to_start_tor">Unable to start Tor:</string>
-  <string name="pref_use_sys_iptables_title">Use Default Iptables</string>
-  <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string>
-  <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string>
-  <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string>
-  <string name="pref_use_persistent_notifications_title">Always-On Notifications</string>
-  <string name="notification_using_bridges">Bridges enabled!</string>
-  <string name="default_bridges"/>
-  <string name="set_locale_title">Set Locale</string>
-  <string name="set_locale_summary">Choose the locale and language for Orbot</string>
-  <string name="wizard_locale_title">Choose Language</string>
-  <string name="wizard_locale_msg">Leave default or switch the current language</string>
-  <string name="powered_by">powered by The Tor Project  </string>
-  <string name="btn_save_settings">Save Settings</string>
+  <!--<string name="pref_use_whispercore">Use WhisperCore</string>
+<string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
+  <string name="default_bridges"></string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 67a4883..0acc964 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -75,8 +75,11 @@
   <string name="wizard_tips_otrchat">Gibberbot - Biztonságos azonnali üzenetküldő kliens Android-ra</string>
   <string name="wizard_tips_proxy">Proxy beállítások - Tanulja meg, hogyan állíthatja be alkalmazásait, hogy együttműködjenek az Orbot-tal</string>
   <string name="wizard_tips_duckgo">Duckduckgo keresőgép alkalmazás</string>
+  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
   <string name="wizard_tips_firefox">Firefox Proxy Mobile kiegészítővel (külön telepítés utána)</string>
+  <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
   <string name="wizard_tips_twitter">A Twitter támogatja a \"localhost:8118\" http proxyt</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Proxy beállítások</string>
   <string name="wizard_proxy_help_msg">Ha az Android alkalmazás, amit használ képes a HTTP vagy SOCKS proxy-k használatára, akkor be tudja állítani, hogy csatlakozzon az Orbot-hoz és használj a Tor-t.\n\n\n    A host beállítás 127.0.0.1 vagy \"localhost\". A HTTP-hez a  port értéke 8118. A SOCKS esetében a proxy port értéke 9050. SOCKS4A vagy SOCKS5 proxy javasolt használnia, ha lehetséges.\n    \n\n\n    További információkat talál a proxyzásról Android készülékne a FAQ szekcióban az alábbi oldalon: http://tinyurl.com/proxyandroid\n    </string>
   <string name="wizard_final">Az Orbot kész!</string>
@@ -105,6 +108,8 @@
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
   <string name="wizard_tips_orweb">ORWEB (csak Android 1.x) - Böngésző, kifejezetten adatvédelemre és az Orbot-hoz</string>
   <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <string name="wizard_tips_play">Az összes Guardian Project alkalmazás keresése a Google Play-en</string>
+  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
@@ -209,7 +214,7 @@
   <string name="pref_use_persistent_notifications">Mindig legyen látható az ikon az eszköztáron, ha az Orbot csatlakozott állapotú.</string>
   <string name="pref_use_persistent_notifications_title">Mindig bekapcsolt értesítések</string>
   <string name="notification_using_bridges">Hidak engedélyezve!</string>
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="set_locale_title">Hely beállítása</string>
   <string name="set_locale_summary">Adja meg a helyi és nyelvi beállításokat</string>
   <string name="wizard_locale_title">Válasszon nyelvet</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 72fe3ab..84211ec 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -214,7 +214,7 @@
   <string name="pref_use_persistent_notifications">Mantieni sempre l\'icona nella barra degli strumenti quando Orbot è connesso.</string>
   <string name="pref_use_persistent_notifications_title">Notifiche sempre attive</string>
   <string name="notification_using_bridges">Bridge attivati!</string>
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="set_locale_title">Configura le impostazioni internazionali.</string>
   <string name="set_locale_summary">Scegli le impostazioni internazionali e la lingua di Orbot</string>
   <string name="wizard_locale_title">Scegli Lingua</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 9ebb63f..a859789 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -25,6 +25,8 @@
   <string name="menu_stop">停止</string>
   <string name="menu_about">情報</string>
   <string name="menu_wizard">ウィザード</string>
+  <string name="main_layout_download">ダウンロード</string>
+  <string name="main_layout_upload">アップロード</string>
   <string name="button_help">ヘルプ</string>
   <string name="button_close">閉じる</string>
   <string name="button_about">について</string>
@@ -72,6 +74,12 @@
   <string name="wizard_tips_msg">以下のアプリはOrbot用に作られています。それぞれのボタンを押すと今すぐインストールできます。Google Playからも同じものが探せます。</string>
   <string name="wizard_tips_otrchat">Gibberbot - 安全なインスタントメッセージアプリ</string>
   <string name="wizard_tips_proxy">Proxy Settings - Orbotでアプリを動かすための手順書</string>
+  <string name="wizard_tips_duckgo">DuckDuckGo 検索エンジンアプリ</string>
+  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+  <string name="wizard_tips_firefox">Proxy Mobile add-on for Firefox (http://tinyurl.com/getproxymob)</string>
+  <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
+  <string name="wizard_tips_twitter">Twitter proxyを「localhost」と8118番ポートに合わせる</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">プロキシ設定</string>
   <string name="wizard_proxy_help_msg">AndroidアプリがHTTPかSOCKSプロキシを利用できる場合、Orbotを使ってTor接続をすることが可能です。\n\n\n    ホスト設定は127.0.0.1またはlocalhostです。HTTPでは使用ポートは8118です。SOCKSでは9050です。可能であればSOCKS4AかSOCKS5の利用を推奨します。\n    \n\n\n    Android上のプロキシについて学びたい場合は http://tinyurl.com/proxyandroid のFAQを参照してください。\n    </string>
   <string name="wizard_final">Orbotの準備が完了しました</string>
@@ -100,6 +108,8 @@
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
   <string name="wizard_tips_orweb">Orweb: Torを使う匿名インターネットブラウザ</string>
   <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
+  <string name="wizard_tips_play">Google Playで全てのGuardian Projectのアプリを見つける</string>
+  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
@@ -204,7 +214,7 @@
   <string name="pref_use_persistent_notifications">Orbotが接続中はアイコンを常にツールバーに表示</string>
   <string name="pref_use_persistent_notifications_title">通知を常に有効化</string>
   <string name="notification_using_bridges">ブリッジが有効です!</string>
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="set_locale_title">地域を選択</string>
   <string name="set_locale_summary">Orbotの地域と言語を選択</string>
   <string name="wizard_locale_title">言語を選択</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index c39f433..7074e64 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1,133 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">토르 시작 및 중지</string>
-  <string name="tor_proxy_service_process">토르 프록시 서비스</string>
-  <string name="status_starting_up">Orbot이 시작중...</string>
-  <string name="status_activated">Tor 네트워크에 연결됨</string>
-  <string name="status_disabled">\"Orbot가 비활성화되어 있습니다</string>
-  <string name="status_shutting_down">Orbot를 종료합니다</string>
-  <string name="tor_process_starting">Tor 클라이언트 시작중...</string>
-  <string name="tor_process_complete">완료.</string>
-  <string name="tor_process_waiting">대기.</string>
-  <string name="not_anonymous_yet">경고: 귀하의 트래픽이 아직 익명이 아닙니다! HTTP 프록시 127.0.0.1:8118 또는 SOCKS4A 또는 SOCKS5 프록시 127.0.0.1:9050을 사용하여 응용 프로그램을 구성하십시오</string>
-  <string name="menu_home">홈</string>
-  <string name="menu_browse">탐색</string>
+  <string name="menu_home">표지</string>
+  <string name="menu_browse">찾아보기</string>
   <string name="menu_settings">설정</string>
-  <string name="menu_log">로그</string>
   <string name="menu_info">도움말</string>
-  <string name="menu_apps">응용 프로그램</string>
-  <string name="menu_start">시작</string>
-  <string name="menu_stop">중지</string>
-  <string name="menu_about">ì •ë³´</string>
-  <string name="menu_wizard">마법사</string>
+  <string name="menu_about">소개</string>
   <string name="button_help">도움말</string>
   <string name="button_close">닫기</string>
-  <string name="button_about">ì •ë³´</string>
-  <string name="button_clear_log">로그 지우기</string>
-  <string name="menu_verify">확인</string>
-  <string name="menu_exit">종료</string>
-  <string name="press_to_start">- 시작하려면 오래 누르기 -</string>
-  <string name="pref_trans_proxy_group">투명한 프록시 (루트 필요)</string>
-  <string name="pref_trans_proxy_title">투명한 프록시</string>
-  <string name="pref_trans_proxy_summary">앱의 자동 Torifying</string>
-  <string name="pref_transparent_all_title">토르의 모든 것</string>
-  <string name="pref_transparent_all_summary">토르를 통한 모든 응용 프로그램에 대한 프록시 트래픽</string>
-  <string name="pref_transparent_port_fallback_title">포트 프록시 대체</string>
-  <string name="pref_transparent_port_title">포트 목록</string>
-  <string name="pref_has_root">루트 권한에 대한 접근 필요</string>
-  <string name="pref_has_root_summary">명백한 프록시를 위해 루트 권한 요구</string>
-  <string name="status_install_success">Tor 바이너리가 성공적으로 설치됨!</string>
-  <string name="status_install_fail">Tor 바이너리 파일이 설치될 수 없습니다. Log를 확인해 주시고 tor-assistants at torproject.org 에 알려 주십시오.</string>
-  <string name="title_error">애플리케이션 오류</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Orbot ì •ë³´</string>
-  <string name="btn_next">다음</string>
+  <string name="button_about">소개</string>
+  <string name="menu_exit">나가기</string>
   <string name="btn_back">뒤로</string>
-  <string name="btn_finish">마침</string>
-  <string name="btn_okay">확인</string>
   <string name="btn_cancel">취소</string>
   <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_permissions_root">사용 권한 부여</string>
-  <string name="wizard_permissions_stock">Orbot 사용 권한</string>
-  <string name="wizard_premissions_msg_root">완벽합니다! Orbot을 위해 루트 권한이 활성화된것을 감지했습니다. 우리는 이 힘을 현명하게 사용할 것입니다.</string>
-  <string name="wizard_permissions_no_root">루트 권한을 가지고 있지 않거나 이것이 무엇을 말하시는지 모르겠다면, Orbot으로 만들어진 애플리케이션만을 사용하십시오.</string>
-  <string name="wizard_permissions_consent">이해하였고, 수퍼유저 권한 없이 계속합니다.</string>
-  <string name="wizard_permission_enable_root">Orbot을 위하 루트 허가</string>
-  <string name="wizard_configure">Torification 설정</string>
-  <string name="wizard_configure_msg">Orbot은 모든 애플리케이션 또는 선택된 애플리케이션을 Tor를 통해 통신하도록 할 수 있습니다.</string>
-  <string name="wizard_configure_all">모든 App이 Tor를 사용하기</string>
-  <string name="wizard_configure_select_apps">Tor를 위해 각각의 앱 선택</string>
-  <string name="wizard_tips_tricks">Orbot이 활성화된 앱</string>
-  <string name="wizard_tips_otrchat">Gibberbot - 안드로이드를 위한 보안 인스턴트 메시징 클라이언트</string>
-  <string name="wizard_tips_proxy">Proxy Settings - Orbot이 작동하도록 앱을 설정하는 방법을 배우기</string>
   <string name="wizard_proxy_help_info">프록시 설정</string>
-  <string name="wizard_final">Orbot이 준비됨!</string>
-  <string name="wizard_final_msg">전세계에서 수백만명의 사람들이 다양한 이유로 Tor를 사용합니다.\n\n언론인과 블로거, 인권 운동가, 법 집행 임원, 군인, 기업, 억압하는 정권의 국민, 그리고 평범한 시민 ... 그리고 지금 당신은 준비하고 있습니다!</string>
   <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Tor 네트워크에 성공적으로 연결되었습니다. 하지만 이것은 귀하의 장치가 안전하다는 의미가 아닙니다. 귀하의 브라우저를 테스트하기 위해 메뉴에서 \'확인\' 옵션을 사용할 수 있습니다.\n\n더 많은 정보가 필요하시면, https://guardianproject.info/apps/orbot 을 방문하시거나, help at guardianproject.info로 이메일을 보내주십시오.</string>
-  <string name="tor_check">Orbot이 정상적으로 설정되었고 Tor에 연결되었는지 확인하기 위해 이것은 https://check.torproject.org 을 귀하의 웹 브라우져에 열리게 할 것입니다.</string>
-  <string name="pref_hs_group">히든 서비스 호스팅</string>
   <string name="pref_general_group">일반</string>
-  <string name="pref_start_boot_title">부트 시 Orbot 시작</string>
-  <string name="pref_start_boot_summary">안드로이드 장치가 시작할 때 자동적으로 Orbot을 시작하고 Tor에 연결</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot은 Tor를 안드로이드로 가져옵니다!\n\nTor는 컨텐츠 필터링, 트래픽 분석, 기밀 정보와 개인 관계, 사행활을 위협하는 네트워크 감시에 대항하도록 해 줍니다.\n\n이 마법사는 Orbot과 Tor를 귀하의 장치에 설정하는 것을 도와줄 것입니다.</string>
   <!--Warning screen-->
   <string name="wizard_warning_title">경고</string>
   <!--Permissions screen-->
-  <string name="wizard_permissions_title">권한</string>
   <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot이 활성화된 장치</string>
-  <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
-  <string name="wizard_tips_orweb">Orweb: Tor를 통해 작동하는 보안 강화 브라우저</string>
-  <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
-  <string name="button_grant_superuser">수퍼유져 권한 요청</string>
-  <string name="pref_select_apps">앱 </string>
-  <string name="pref_node_configuration_summary">귀하의 익명성을 감소시킬 수 있는 고급 설정이 있습니다.</string>
+  <string name="wizard_transproxy_none">없음</string>
   <!--<string name="pref_use_whispercore">Use WhisperCore</string>
 <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
-  <string name="pref_proxy_type_summary">프록시 서버를 위한 사용되는 프로토콜 : HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">프록시 형식 입력</string>
-  <string name="pref_proxy_host_summary">프록시 서버 호스트네입</string>
-  <string name="pref_proxy_host_dialog">프록시 호스트 입력</string>
-  <string name="pref_proxy_port_summary">서버 포트 입력</string>
-  <string name="pref_proxy_port_dialog">프록시 포트 입력</string>
   <string name="status">상태</string>
-  <string name="couldn_t_start_tor_process_">Tor 프로세스 시작 불가능:  </string>
-  <string name="bridge_error">브릿지 오류</string>
-  <string name="bridge_requires_ip">브릿지 기능을 사용하기 위해서, 최소한 1개 이상의 브릿지 IP 주소가 필요합니다.</string>
   <string name="error">오류</string>
-  <string name="exit_nodes">출구 노드</string>
-  <string name="bridges">중계서버</string>
-  <string name="use_bridges">중계서버 사용</string>
-  <string name="ip_address_and_port_of_bridges">중계서버의 IP 주소와 </string>
-  <string name="enter_bridge_addresses">중게서버 주소 입력</string>
-  <string name="relays">중계서버</string>
-  <string name="relaying">중계</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">귀하의 장치를 출구가 아닌 중계서버로 활성화</string>
-  <string name="relay_port">중계 포트</string>
-  <string name="listening_port_for_your_tor_relay">귀하의 Tor 중계서버를 위한 Listening 포트</string>
-  <string name="relay_nickname">중계서버 별명</string>
-  <string name="the_nickname_for_your_tor_relay">귀하의 중계서버를 위한 별명</string>
-  <string name="enter_a_custom_relay_nickname">임의의 중계서버 별명을 입력</string>
-  <string name="enable_hidden_services">히든 서비스 호스팅</string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string>
-  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
-  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string>
-  <string name="default_bridges"/>
-  <string name="powered_by">토르 프로젝트에 의해 구동  </string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">설정 저장하기</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 1cc58d4..785a81d 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -5,11 +5,11 @@
   <string name="default_web_url">http://check.torproject.org</string>
   <string name="secure_default_web_url">https://check.torproject.org</string>
   <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">startēt un apturēt Tor</string>
+  <string name="control_permission_label">uzsākt un apturēt Tor</string>
   <string name="tor_proxy_service_process">torproxyservice</string>
   <string name="status_starting_up">Orbot startē...</string>
   <string name="status_activated">Izveidots savienojums ar Tor tīklu</string>
-  <string name="status_disabled">\"Orbot ir deaktivēts</string>
+  <string name="status_disabled">Orbot ir deaktivēts</string>
   <string name="status_shutting_down">Orbot izslēdzas</string>
   <string name="tor_process_starting">Startē Tor klientu...</string>
   <string name="tor_process_complete">pabeidz.</string>
@@ -25,8 +25,8 @@
   <string name="menu_stop">Apturēt</string>
   <string name="menu_about">Par</string>
   <string name="menu_wizard">Vednis</string>
-  <string name="main_layout_download">Lejupielāde (ātrums/kopā)</string>
-  <string name="main_layout_upload">Augšupielāde (ātrums/kopā)</string>
+  <string name="main_layout_download">Lejupielāde</string>
+  <string name="main_layout_upload">Augšupielāde</string>
   <string name="button_help">Palīdzība</string>
   <string name="button_close">Aizvērt</string>
   <string name="button_about">Par</string>
@@ -75,16 +75,19 @@
   <string name="wizard_tips_otrchat">Gibberbot - Drošs Android\'a tūlītējās ziņojumapmaiņas klients</string>
   <string name="wizard_tips_proxy">Starpnieka iestatījumi - Uzzini kā konfigurēt lietotnes, lai tās strādātu ar Orbot</string>
   <string name="wizard_tips_duckgo">Meklētājprogrammas Duckduckgo lietotne</string>
+  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
   <string name="wizard_tips_firefox">Firefox ar Proxy Mobile pievienojumu (papildu instalēšana vēlāk)</string>
+  <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
   <string name="wizard_tips_twitter">Twitter atbalsta http starpnieku \"localhost:8118\"</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Starpnieka iestatījumi</string>
-  <string name="wizard_proxy_help_msg">Ja izmantotā Android lietotne spēj nodrošināt HTTP vai SOCKS starpnieku lietošanu, tad lietotni ir ir iespējams konfigurēt lai to savienotu ar Orbot un izmantotu Tor.\n\n\n    Resursdatora iestatījumi ir 127.0.0.1 vai \"localhost\". HTTP porta iestatījums ir 8118. SOCKS\'am starpnieks ir 9050. Pēc iespējas izmantojiet SOCKS4A vai SOCKS5.\n    \n\n\n    Vairāk uzzināt par starpniekošanu izmantojot Android var iepazīstoties ar atbildēm, kuras sagatavotas biežāk uzdotiem jautājumiem jeb Frequently Asked Questions, FAQ tīmekļa vietnē: http://tinyurl.com/proxyandroid\n    </string>
+  <string name="wizard_proxy_help_msg">Ja izmantotā Android lietotne spēj nodrošināt HTTP vai SOCKS starpnieku lietošanu, tad lietotni ir ir iespējams konfigurēt lai to savienotu ar Orbot un izmantotu Tor.\n\n\n    Viesotāja iestatījumi ir 127.0.0.1 vai \"localhost\". HTTP porta iestatījums ir 8118. SOCKS\'am starpnieks ir 9050. Pēc iespējas izmantojiet SOCKS4A vai SOCKS5.\n    \n\n\n    Vairāk uzzināt par starpniekošanu izmantojot Android var iepazīstoties ar atbildēm, kuras sagatavotas biežāk uzdotiem jautājumiem jeb FAQ tīmekļa vietnē: http://tinyurl.com/proxyandroid\n    </string>
   <string name="wizard_final">Orbot ir gatavs darbam!</string>
   <string name="wizard_final_msg">Simtiem tūkstošu ļaužu visā pasaulē lieto Tor dažādiem mērķiem.\n\nŽurnālisti un emuāru autori, cilvēktiesību aizstāvji, likumsargi, karavīri, korporācijas, apspiestībā dzīvojuši iedzīvotāji, un vienkārši parasti cilvēki .. un tagad arī Jūs to varatl!</string>
   <!--END Welcome Wizard strings (DJH)-->
   <string name="connect_first_time">Esat sekmīgi izveidojis savienojumu ar tīklu Tor - taču tas vien NEnozīmē, ka Jūsu ierīce ir drošībā. Lai pārbaudītu savu pārlūku, no izvēlnes izraugieties izvēli \'Pārbaudīt\'. \n\nApmeklējiet mūs https://guardianproject.info/apps/orbot vai sūtiet e-pastu uz help at guardianproject.info , lai uzzinātu vairāk.</string>
   <string name="tor_check">Šī darbība tīmekļa pārlūkā atvērs https://check.torproject.org , lai redzētu vai Orbot ir konfigurēts un esat izveidojies savienojumu ar Tor.</string>
-  <string name="pref_hs_group">Slēptu pakalpojumu mitināšana</string>
+  <string name="pref_hs_group">Slēptu pakalpojumu viesošana</string>
   <string name="pref_general_group">Vispārīgi</string>
   <string name="pref_start_boot_title">Startēt Orbot, kad ielādējas</string>
   <string name="pref_start_boot_summary">Automātiski startēt Orbot, un veidot savienojumu ar Tor, kad Jūsu Android ierīce ielādējas</string>
@@ -105,6 +108,8 @@
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
   <string name="wizard_tips_orweb">Orweb: Pārlūks ar uzlabotu privātumu un kurš strādā caur Tor tīklu</string>
   <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
+  <string name="wizard_tips_play">Visas Guardian Project\'a lietotnes atrodamas Google Play\'ā</string>
+  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
@@ -114,8 +119,8 @@
   <string name="wizard_transproxy_msg">Šis ļauj Jūsu lietotnēm automātiski, bez jebkādas papildu konfigurācijas darboties caur Tor tīklu.</string>
   <string name="wizard_transproxy_hint">(Atzīmējiet šo kastīti gadījumā ja Jums nav ne mazākās nojausmas par to, ko mēs te runājam)</string>
   <string name="wizard_transproxy_none">Neviens</string>
-  <string name="pref_transparent_tethering_title">Tor tuvapraide</string>
-  <string name="pref_transparent_tethering_summary">Iespējot Tor Pārredzamo starpniekošanu Wifi un USB tuvapraides ierīcēm (nepieciešams pārstartēt)</string>
+  <string name="pref_transparent_tethering_title">Tor valgošana</string>
+  <string name="pref_transparent_tethering_summary">Iespējot Tor Pārredzamo starpniekošanu Wifi\'m un USB valgošanas ierīcēm (nepieciešams pārstartēt)</string>
   <string name="button_grant_superuser">Pieprasīt superlietotāja piekļuvi</string>
   <string name="pref_select_apps">Izvēlēties lietotnes</string>
   <string name="pref_select_apps_summary">Izvēlēties lietotnes, lai maršrutētu caur Tor</string>
@@ -130,9 +135,9 @@
   <string name="pref_proxy_type_title">Ārvērstā starpnieka tips</string>
   <string name="pref_proxy_type_summary">Starpnieka serverim izmantojamais protokols: HTTP, HTTPS, Socks4, Socks5</string>
   <string name="pref_proxy_type_dialog">Ievadiet starpnieka tipu</string>
-  <string name="pref_proxy_host_title">Ārvērstā starpnieka mitinātājs</string>
-  <string name="pref_proxy_host_summary">Starpniekservera mitinātājvārds</string>
-  <string name="pref_proxy_host_dialog">Ievadiet starpnieka mitinātāju</string>
+  <string name="pref_proxy_host_title">Ārvērstā starpnieka viesotājs</string>
+  <string name="pref_proxy_host_summary">Starpniekservera viesotājvārds</string>
+  <string name="pref_proxy_host_dialog">Ievadiet starpnieka viesotāju</string>
   <string name="pref_proxy_port_title">Ārvērstā starpnieka ports</string>
   <string name="pref_proxy_port_summary">Starpniekservera ports</string>
   <string name="pref_proxy_port_dialog">Ievadiet starpnieka portu</string>
@@ -140,7 +145,7 @@
   <string name="setting_up_full_transparent_proxying_">Iestata pilnībā pārredzamu starpniekošanu...</string>
   <string name="setting_up_app_based_transparent_proxying_">Iestata lietotņu nodrošinātu starpniekošanu...</string>
   <string name="transparent_proxying_enabled">Pārredzama starpniekošana IESPĒJOTA</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy iespējots tuvapraidei!</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy iespējots valgošanai!</string>
   <string name="warning_error_starting_transparent_proxying_">BRĪDINĀJUMS: kļūda uzsākot pārredzamu starpniekošanu!</string>
   <string name="transproxy_rules_cleared">TransProxy kārtulas notīrītas</string>
   <string name="couldn_t_start_tor_process_">Neizdevās palaist Tor\'a procesu:</string>
@@ -181,7 +186,7 @@
   <string name="reachable_ports">Sasniedzamie porti</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Porti, kuri sasniedzami otrpus ierobežojoša ugunsmūra</string>
   <string name="enter_ports">Ievadiet portus</string>
-  <string name="enable_hidden_services">Slēptu pakalpojumu mitināšana</string>
+  <string name="enable_hidden_services">Slēptu pakalpojumu viesošana</string>
   <string name="run_servers_accessible_via_the_tor_network">ļaut no tīkla Tor piekļūt serverim, kurš ir ierīcē.  </string>
   <string name="enter_localhost_ports_for_hidden_services">ievadiet slēpto pakalpojumu localhost portus</string>
   <string name="hidden_service_ports">Slēptu pakalpojumu porti</string>
@@ -209,7 +214,7 @@
   <string name="pref_use_persistent_notifications">Vienmēr paturēt ikonu rīkjoslā, kad Orbot ir savienots</string>
   <string name="pref_use_persistent_notifications_title">Vienmēr ieslēgtie paziņojumi</string>
   <string name="notification_using_bridges">Tilti ir iespējoti!</string>
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="set_locale_title">Iestatiet lokalizāciju</string>
   <string name="set_locale_summary">Iestatiet Orbot lokalizāciju un valodu</string>
   <string name="wizard_locale_title">Izvēlēties valodu</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index ce0bcb9..4b319fe 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -11,6 +11,8 @@
   <string name="status_activated">Поврзан на мрежата Тор</string>
   <string name="status_disabled">\"Орбот е дезактивиран</string>
   <string name="status_shutting_down">Орбот се исклучува</string>
+  <string name="tor_process_complete">готово.</string>
+  <string name="tor_process_waiting">чекање.</string>
   <string name="not_anonymous_yet">ВНИМАНИЕ: Вашиот сообраќај сеуште не е анонимен! Треба да ги конфигурирате Вашите апликации да го користат проксито за HTTP, 127.0.0.1:8118, или проксито за SOCKS4A или SOCKS5, 127.0.0.1:9050</string>
   <string name="menu_home">Дома</string>
   <string name="menu_browse">Прелистување</string>
@@ -92,8 +94,9 @@
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Транспарентно прокси</string>
   <!--<string name="pref_use_whispercore">Use WhisperCore</string>
 <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="powered_by">напојувано од проектот Тор</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 1a16594..0aafb9a 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -203,7 +203,7 @@
   <string name="pref_use_persistent_notifications">Sentiasa biar ikon pada toolbar apabila Orbot bersambung</string>
   <string name="pref_use_persistent_notifications_title">Sentiasa On Notifikasi</string>
   <string name="notification_using_bridges">Jambatan dibenarkan!</string>
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="set_locale_title">Tetapan Tempatan</string>
   <string name="set_locale_summary">Pilihan tempatan dan bahasa untuk Orbot</string>
   <string name="wizard_locale_title">Pilih Bahasa</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index c2a5e2d..cbacdd7 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -1,214 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">start and stop Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot is starting...</string>
-  <string name="status_activated">Connected to the Tor network</string>
-  <string name="status_disabled">\"Orbot is Deactivated</string>
-  <string name="status_shutting_down">Orbot is shutting down</string>
-  <string name="tor_process_starting">Starting Tor client...</string>
-  <string name="tor_process_complete">complete.</string>
-  <string name="tor_process_waiting">waiting.</string>
-  <string name="not_anonymous_yet">WARNING: Your traffic is not anonymous yet! Please configure your applications to use HTTP proxy 127.0.0.1:8118 or SOCKS4A or SOCKS5 proxy 127.0.0.1:9050</string>
-  <string name="menu_home">Home</string>
-  <string name="menu_browse">Browse</string>
-  <string name="menu_settings">Settings</string>
-  <string name="menu_log">Log</string>
-  <string name="menu_info">Help</string>
-  <string name="menu_apps">Apps</string>
-  <string name="menu_start">Start</string>
-  <string name="menu_stop">Stop</string>
-  <string name="menu_about">About</string>
-  <string name="menu_wizard">Wizard</string>
-  <string name="button_help">Help</string>
-  <string name="button_close">Close</string>
-  <string name="button_about">About</string>
-  <string name="button_clear_log">Clear Log</string>
-  <string name="menu_verify">Check</string>
-  <string name="menu_exit">Exit</string>
-  <string name="press_to_start">- long press to start -</string>
-  <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string>
-  <string name="pref_trans_proxy_title">Transparent Proxying</string>
-  <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string>
-  <string name="pref_transparent_all_title">Tor Everything</string>
-  <string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string>
-  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
-  <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
-  <string name="pref_transparent_port_title">Port List</string>
-  <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
-  <string name="pref_transparent_port_dialog">Enter ports to proxy</string>
-  <string name="pref_has_root">Request Root Access</string>
-  <string name="pref_has_root_summary">Request root access for transparent proxying</string>
-  <string name="status_install_success">Tor binaries successfully installed!</string>
-  <string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants at torproject.org</string>
-  <string name="title_error">Application Error</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">About Orbot</string>
-  <string name="btn_next">Next</string>
-  <string name="btn_back">Back</string>
-  <string name="btn_finish">Finish</string>
-  <string name="btn_okay">Okay</string>
-  <string name="btn_cancel">Cancel</string>
+  <string name="menu_home">ပင်မ စာမျက်နှာ</string>
+  <string name="menu_browse">ဖွင့်ကြည့်ရန်</string>
+  <string name="menu_settings">ချိန်ညှိချက်များ</string>
+  <string name="menu_info">အကူအညီ</string>
+  <string name="menu_about">အကြောင်း</string>
+  <string name="button_help">အကူအညီ</string>
+  <string name="button_close">ပိတ်ရန်</string>
+  <string name="button_about">အကြောင်း</string>
+  <string name="menu_exit">ထွက်ရန်</string>
+  <string name="btn_back">နောက်သို့</string>
+  <string name="btn_cancel">ဖျက်သိမ်းရန်</string>
   <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Some Orbot Details</string>
-  <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, LibEvent and Privoxy. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string>
-  <string name="wizard_permissions_root">Permission Granted</string>
-  <string name="wizard_permissions_stock">Orbot Permissions</string>
-  <string name="wizard_premissions_msg_root">Excellent! We\'ve detected that you have root permissions enabled for Orbot. We will use this power wisely.</string>
-  <string name="wizard_permissions_msg_stock"> While it is not required, Orbot can become a more powerful tool if your device has root access. Use the button below to grant Orbot superpowers! </string>
-  <string name="wizard_permissions_no_root">If you don\'t have root access or have no idea what we\'re talking about, just be sure to use apps made to work with Orbot.</string>
-  <string name="wizard_permissions_consent">I understand and would like to continue without Superuser</string>
-  <string name="wizard_permission_enable_root">Grant Root for Orbot</string>
-  <string name="wizard_configure">Configure Torification</string>
-  <string name="wizard_configure_msg">Orbot gives you the option to route all application traffic through Tor OR to choose your applications individually.</string>
-  <string name="wizard_configure_all">Proxy All Apps Through Tor</string>
-  <string name="wizard_configure_select_apps">Select Individual Apps for Tor</string>
-  <string name="wizard_tips_tricks">Orbot-enabled Apps</string>
-  <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later in the Android Market.</string>
-  <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
-  <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string>
-  <string name="wizard_proxy_help_info">Proxy Settings</string>
-  <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n\n    The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n    \n\n\n    You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n    </string>
-  <string name="wizard_final">Orbot is ready!</string>
-  <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string>
+  <string name="wizard_proxy_help_info">ပရောက်ဇီ ချိန်ညှိချက်များ</string>
   <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help at guardianproject.info to learn more.</string>
-  <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string>
-  <string name="pref_hs_group">Hidden Service Hosting</string>
-  <string name="pref_general_group">General</string>
-  <string name="pref_start_boot_title">Start Orbot on Boot</string>
-  <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
+  <string name="pref_general_group">ယေဘုယျ</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>
   <!--Warning screen-->
-  <string name="wizard_warning_title">Warning</string>
-  <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>
+  <string name="wizard_warning_title">သတိပေးချက်</string>
   <!--Permissions screen-->
-  <string name="wizard_permissions_title">Permissions</string>
-  <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string>
-  <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>
   <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-Enabled Apps</string>
-  <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string>
-  <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
-  <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string>
-  <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transparent Proxying</string>
-  <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string>
-  <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string>
-  <string name="wizard_transproxy_none">None</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string>
-  <string name="button_grant_superuser">Request Superuser Access</string>
-  <string name="pref_select_apps">Select Apps</string>
-  <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string>
-  <string name="pref_node_configuration">Node Configuration</string>
-  <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string>
-  <string name="pref_entrance_node">Entrance Nodes</string>
-  <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string>
-  <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string>
+  <string name="wizard_transproxy_none">ဘာမှမရှိ</string>
   <!--<string name="pref_use_whispercore">Use WhisperCore</string>
 <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
-  <string name="pref_proxy_title">Outbound Network Proxy</string>
-  <string name="pref_proxy_type_title">Outbound Proxy Type</string>
-  <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Enter Proxy Type</string>
-  <string name="pref_proxy_host_title">Outbound Proxy Host</string>
-  <string name="pref_proxy_host_summary">Proxy server hostname</string>
-  <string name="pref_proxy_host_dialog">Enter Proxy Host</string>
-  <string name="pref_proxy_port_title">Outbound Proxy Port</string>
-  <string name="pref_proxy_port_summary">Proxy server port</string>
-  <string name="pref_proxy_port_dialog">Enter Proxy port</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying...</string>
-  <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string>
-  <string name="transproxy_rules_cleared">TransProxy rules cleared</string>
-  <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string>
-  <string name="privoxy_is_running_on_port_">Privoxy is running on port: </string>
-  <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string>
-  <string name="bridge_error">Bridge Error</string>
-  <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string>
-  <string name="send_email_for_bridges">Send an email to bridges at torproject.org with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string>
-  <string name="error">Error</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string>
-  <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string>
-  <string name="exit_nodes">Exit Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string>
-  <string name="enter_exit_nodes">Enter Exit Nodes</string>
-  <string name="exclude_nodes">Exclude Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string>
-  <string name="enter_exclude_nodes">Enter Exclude Nodes</string>
-  <string name="strict_nodes">Strict Nodes</string>
-  <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string>
-  <string name="bridges">Bridges</string>
-  <string name="use_bridges">Use Bridges</string>
-  <string name="bridges_obfuscated">Obfuscated Bridges</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string>
-  <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string>
-  <string name="enter_bridge_addresses">Enter Bridge Addresses</string>
-  <string name="relays">Relays</string>
-  <string name="relaying">Relaying</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Enable your device to be a non-exit relay</string>
-  <string name="relay_port">Relay Port</string>
-  <string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string>
-  <string name="enter_or_port">Enter OR port</string>
-  <string name="relay_nickname">Relay nickname</string>
-  <string name="the_nickname_for_your_tor_relay">The nickname for your Tor relay</string>
-  <string name="enter_a_custom_relay_nickname">Enter a custom relay nickname</string>
-  <string name="reachable_addresses">Reachable Addresses</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Run as a client behind a firewall with restrictive policies</string>
-  <string name="reachable_ports">Reachable ports</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string>
-  <string name="enter_ports">Enter ports</string>
-  <string name="enable_hidden_services">Hidden Service Hosting</string>
-  <string name="run_servers_accessible_via_the_tor_network">allow on-device server to be accessible via the Tor network</string>
-  <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string>
-  <string name="hidden_service_ports">Hidden Service Ports</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string>
-  <string name="project_home">Project Home(s): </string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">The Tor License</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3rd-Party-Software: </string>
-  <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string>
-  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
-  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
-  <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string>
-  <string name="found_existing_tor_process">found existing Tor process...</string>
-  <string name="something_bad_happened">Something bad happened. Check the log</string>
-  <string name="hidden_service_on">hidden service on:</string>
-  <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string>
-  <string name="unable_to_start_tor">Unable to start Tor:</string>
-  <string name="pref_use_sys_iptables_title">Use Default Iptables</string>
-  <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string>
-  <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string>
-  <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string>
-  <string name="pref_use_persistent_notifications_title">Always-On Notifications</string>
-  <string name="notification_using_bridges">Bridges enabled!</string>
-  <string name="default_bridges"/>
-  <string name="set_locale_title">Set Locale</string>
-  <string name="set_locale_summary">Choose the locale and language for Orbot</string>
-  <string name="wizard_locale_title">Choose Language</string>
-  <string name="wizard_locale_msg">Leave default or switch the current language</string>
-  <string name="powered_by">powered by The Tor Project  </string>
-  <string name="btn_save_settings">Save Settings</string>
+  <string name="status">အနေအထား</string>
+  <string name="error">ချို့ယွင်းချက်</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">ချိန်ညှိချက်များကို သိမ်းဆည်းရန်</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index c0ab256..cef8f4e 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -25,16 +25,30 @@
   <string name="menu_stop">Stopp</string>
   <string name="menu_about">About</string>
   <string name="menu_wizard">Wizard</string>
+  <string name="main_layout_download">Nedlasting</string>
+  <string name="main_layout_upload">Opplasting</string>
   <string name="button_help">Hjelp</string>
   <string name="button_close">Avslutt</string>
   <string name="button_about">Om</string>
   <string name="button_clear_log">Slett Logg</string>
   <string name="menu_verify">Check</string>
   <string name="menu_exit">Exit</string>
+  <string name="press_to_start">- trykk lenge for å starte -</string>
+  <string name="pref_trans_proxy_group">Transparent Proxy (Krever Root)</string>
+  <string name="pref_trans_proxy_title">Transparent Proxy</string>
+  <string name="pref_trans_proxy_summary">Automatisk Torifisering av apps</string>
   <string name="pref_transparent_all_title">Tor All Trafikk</string>
+  <string name="pref_transparent_all_summary">Proxytrafikk for alle apper gjennom Tor</string>
+  <string name="pref_transparent_port_fallback_title">Proxyport fallback</string>
+  <string name="pref_transparent_port_fallback_summary">ADVARSEL: Omgår vanlige porter (80, 443, etc). *KUN BRUK* hvis \'Alle\'- eller \'App\'-modus ikke virker.</string>
   <string name="pref_transparent_port_title">Port Liste</string>
+  <string name="pref_transparent_port_summary">Liste over porter som skal gjennom proxy. *KUN BRUK* hvis \'Alle\'- eller \'App\'-modus ikke virker.</string>
+  <string name="pref_transparent_port_dialog">Angi porter som skal gjennom proxy</string>
   <string name="pref_has_root">Request Root Access</string>
   <string name="pref_has_root_summary">>Request root access for transparent proxying</string>
+  <string name="status_install_success">Suksess! Tor-binærene ble installert.</string>
+  <string name="status_install_fail">Tors binærfiler kunne ikke installeres. Vennligst sjekk loggen og informer tor-assistants at torproject.org</string>
+  <string name="title_error">Applikasjonsfeil</string>
   <string name="wizard_title">Orbot</string>
   <string name="wizard_btn_tell_me_more">Om Orbot</string>
   <string name="btn_next">Neste</string>
@@ -43,6 +57,7 @@
   <string name="btn_okay">Ok</string>
   <string name="btn_cancel">Avbryt</string>
   <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Informasjon om Orbot</string>
   <string name="wizard_details_msg">Orbot er åpen programvare som inneholder Tor, LibEvent og Privoxy.  Det leverer en lokal HTTP proxy (8118) og en SOCKS proxy (9050) tilkobling til Tor nettverket. Orbot kan også, med rot-tilgang, sende all internett-trafikk gjennom Tor.</string>
   <string name="wizard_permissions_root">Tilgang Innvilget</string>
   <string name="wizard_permissions_stock">Orbot Tilgangsnivåer</string>
@@ -51,28 +66,159 @@
   <string name="wizard_permissions_no_root">Hvis du ikke har rot-tilgang (eller ikke aner hva vi snakker om), sørg ihvertfall for å bruke programmer som er kompatible med Orbot.</string>
   <string name="wizard_permissions_consent">Jeg forstår og ønsker å fortsette uten Superbruker.</string>
   <string name="wizard_permission_enable_root">Gi Orbot tilgang.</string>
+  <string name="wizard_configure">Konfigurer Torification</string>
+  <string name="wizard_configure_msg">Orbot gir deg muligheten til å sende all applikasjons-trafikk gjennom Tor ELLER å velge applikasjonene individuelt.</string>
+  <string name="wizard_configure_all">Proxytrafikk for alle apper gjennom Tor</string>
+  <string name="wizard_configure_select_apps">Velg individuelle apps som skal brukes med Tor</string>
+  <string name="wizard_tips_tricks">Orbot-aktiverte apps</string>
+  <string name="wizard_tips_msg">Appene under er utviklet for å fungere sammen med Orbot. Klikk på hver enkelt for å installere nå, eller du kan finne dem senere på Google Play, på nettsiden GuardianProject.info eller via F-Droid.org</string>
+  <string name="wizard_tips_otrchat">Gibberbot - Sikker lynmeldingsklient til Android</string>
+  <string name="wizard_tips_proxy">Proxy-innstillinger - Lær hvordan du konfigurerer apper til å fungere med Orbot</string>
+  <string name="wizard_tips_duckgo">DuckDuckGo søkemotor app</string>
+  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+  <string name="wizard_tips_firefox">Proxy Mobile tillegg til Firefox (http://tinyurl.com/getproxymob)</string>
+  <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
+  <string name="wizard_tips_twitter">Sett Twitters proxy til \"localhost\" og port 8118</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
+  <string name="wizard_proxy_help_info">Proxyinnstillinger</string>
+  <string name="wizard_proxy_help_msg">Hvis Android-appen du bruker støtter bruken av en HTTP- eller SOCKS-proxy, så kan du konfigurere den til å koble til Orbot og bruke Tor.\n\n\nVertens innstillinger er 127.0.0.1 eller \"localhost\". For HTTP er porten 8118. For SOCKS er proxyen 9050. Du kan bruke SOCKS4A eller SOCKS5 om mulig.\n\n\n\nDu kan lære mer om proxyer på Android i FAQ på: http://tinyurl.com/proxyandroid\n    </string>
   <string name="wizard_final">Orbot er klar!</string>
   <string name="wizard_final_msg">Hundretusener av mennesker over hele verden bruker Tor til en lang rekke forskjellige formål.\n\nJournalister og bloggere, menneskerettighetsforkjempere, politietterforskere, militære, bedrifter, mennesker i undertrykkende regimer, og vanlige borgere...og nå er du klar til å bruke det også!</string>
   <!--END Welcome Wizard strings (DJH)-->
   <string name="connect_first_time">Du er nå tilkoblet Tor-nettverket - men det betyr IKKE at ditt apparat er sikret.  Du kan bruke \"Sjekk\" valget fra menyen for å sjekke din nettleser.\n\nBesøk oss på https://guardianproject.info/apps/orbot eller send en email til help at guardianproject.info for å få vite mer.</string>
   <string name="tor_check">Dette vil åpne din nettleser på https://check.torproject.org og sjekke om Orbot er riktig innstilt og om du er koblet til Tor.</string>
+  <string name="pref_hs_group">Hidden service hosting</string>
   <string name="pref_general_group">Generelt</string>
+  <string name="pref_start_boot_title">Start Orbot ved oppstart</string>
   <string name="pref_start_boot_summary">Start Orbot og Tor automatisk når din Android starter opp.</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <string name="wizard_title_msg">Orbot bringer Tor til Android!\n\nTor hjelper deg med å forsvare deg mot innholdsfiltrering, trafikkanalyse og nettverksovervåkning som kan true ditt personvern, din konfidensielle informasjon og dine personlige forhold.\n\nDenne steg-for-steg guiden hjelper deg med å konfigurere Orbot og Tor på ditt apparat.</string>
   <!--Warning screen-->
   <string name="wizard_warning_title">Advarsel</string>
+  <string name="wizard_warning_msg">Installering av Orbot vil ikke automatisk anonymisere mobiltrafikken din.\n\nDu må konfigurere Orbot skikkelig for å bruke enheten og andre apper med Tor.</string>
   <!--Permissions screen-->
+  <string name="wizard_permissions_title">Tillatelser</string>
+  <string name="wizard_permissions_root_msg1">Du kan velge å gi Orbot \'Superuser\'-tilgang for å aktivere avanserte instillinger, som Transparent Proxy.</string>
+  <string name="wizard_permissions_root_msg2">Hvis du ikke vil dette, sørg for å bruke appene som er lagd for å virke med Orbot</string>
+  <string name="wizard_permissions_no_root_msg">Enheten din ser ikke ut til ha root eller gi \'Superuser\'-tilgang.\n\nFor å utnytte Tor fullt ut, må du bruke apper som er lagd for å fungere med Orbot, eller som støtter HTTP eller SOCKS-proxy innstillinger.\n\n\n</string>
   <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot-aktiverte apps</string>
+  <string name="wizard_tips_gibberbot">Gibberbot: Sikker chat app med Off-The-Record kryptering</string>
+  <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string>
+  <string name="wizard_tips_orweb">Orweb: Personverns-forsterket nettleser som virker gjennom Tor</string>
   <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
+  <string name="wizard_tips_play">Finn alle apps fra Guardian Project på Google Play</string>
+  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparent Proxy</string>
+  <string name="wizard_transproxy_msg">Dette tillater appene dine å automatisk kjøre gjennom Tor-nettverket uten konfigurasjon</string>
+  <string name="wizard_transproxy_hint">(Kryss av i denne boksen hvis du ikke har peiling på hva vi snakker om)</string>
   <string name="wizard_transproxy_none">Ingen</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Aktiver Tor Transparent Proxy for Wifi og USB Tethered enheter (krever omstart)</string>
+  <string name="button_grant_superuser">Krev superbruker tilgang</string>
+  <string name="pref_select_apps">Velg apps</string>
+  <string name="pref_select_apps_summary">Velg apper som skal sendes gjennom Tor</string>
+  <string name="pref_node_configuration">Node konfigurering</string>
+  <string name="pref_node_configuration_summary">Dette er avanserte innstillinger som kan redusere anonymiteten din</string>
+  <string name="pref_entrance_node">Inngangsnoder</string>
+  <string name="pref_entrance_node_summary">Fingeravtrykk, kallenavn, land og adresser til første hoppet</string>
+  <string name="pref_entrance_node_dialog">Angi inngangsnoder</string>
   <!--<string name="pref_use_whispercore">Use WhisperCore</string>
 <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
-  <string name="default_bridges"/>
+  <string name="pref_proxy_title">Utgående nettverksproxy</string>
+  <string name="pref_proxy_type_title">Utgående proxytype</string>
+  <string name="pref_proxy_type_summary">Protokoller som skal brukes med proxyserver: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Angi proxytype</string>
+  <string name="pref_proxy_host_title">Utgående proxyvert</string>
+  <string name="pref_proxy_host_summary">Proxyserverens vertsnavn</string>
+  <string name="pref_proxy_host_dialog">Angi proxyvert</string>
+  <string name="pref_proxy_port_title">Utgående proxyport</string>
+  <string name="pref_proxy_port_summary">Proxyserverens port</string>
+  <string name="pref_proxy_port_dialog">Angi proxyport</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Konfigurerer full transparent proxy...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Konfigurerer app-basert transparent proxy...</string>
+  <string name="transparent_proxying_enabled">Transparent proxy AKTIVERT</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy aktivert for Tethering!</string>
+  <string name="warning_error_starting_transparent_proxying_">ADVARSEL: Feil under oppstart av transparent proxy!</string>
+  <string name="transproxy_rules_cleared">TransProxy reglene fjernet</string>
+  <string name="couldn_t_start_tor_process_">Kunne ikke starte Tor-prosess:</string>
+  <string name="privoxy_is_running_on_port_">Privoxy kjører på port:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Konfigurerer portbasert transparent proxy...</string>
+  <string name="bridge_error">Brofeil</string>
+  <string name="bridge_requires_ip">For å bruke disse brofunksjonene, må du angi minst en broadresse.</string>
+  <string name="send_email_for_bridges">Send en e-post til bridges at torproject.org med tekstlinjen \"get bridges\" som eneste innhold i en e-post fra en gmail-konto.</string>
+  <string name="error">Feil</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Dine \"adresser som kan nås\"-innstillinger forårsaket et unntak!</string>
+  <string name="your_relay_settings_caused_an_exception_">Relé-innstillingene dine forårsaket et unntak!</string>
+  <string name="exit_nodes">Utgående noder</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingeravtrykk, kallenavn, land og adresser for siste hopp</string>
+  <string name="enter_exit_nodes">Angi utgående noder</string>
+  <string name="exclude_nodes">Ekskluder noder</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fineravtrykk, kallenavn, land og adresser som skal ekskluderes</string>
+  <string name="enter_exclude_nodes">Angi ekskluderte noder</string>
+  <string name="strict_nodes">Strikte noder</string>
+  <string name="use_only_these_specified_nodes">Bruk *bare* disse spesifiserte nodene</string>
+  <string name="bridges">Broer</string>
+  <string name="use_bridges">Bruk broer</string>
+  <string name="bridges_obfuscated">Maskerte broer</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Aktiver alternative inngangsnoder til Tor-nettverket</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Aktiver hvis de konfigurerte broene er maskerte broer</string>
+  <string name="ip_address_and_port_of_bridges">IP-adresser og broporter</string>
+  <string name="enter_bridge_addresses">Angi broadresser</string>
+  <string name="relays">Reléer</string>
+  <string name="relaying">Videresending</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Aktiver enheten din som et relé uten utgående trafikk</string>
+  <string name="relay_port">Relé-port</string>
+  <string name="listening_port_for_your_tor_relay">Porten Tor-reléet ditt lytter på</string>
+  <string name="enter_or_port">Angi OR-port</string>
+  <string name="relay_nickname">Reléets kallenavn</string>
+  <string name="the_nickname_for_your_tor_relay">Kallenavnet på ditt Tor-relé</string>
+  <string name="enter_a_custom_relay_nickname">Angi et egendefinert kallenavn på reléet</string>
+  <string name="reachable_addresses">Adresser som kan nås</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Kjør som en klient bak en brannmur med restriktive regler</string>
+  <string name="reachable_ports">Porter som kan nås</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Porter som kan nås bak en restriktiv brannmur</string>
+  <string name="enter_ports">Angi porter</string>
+  <string name="enable_hidden_services">Hidden service hosting</string>
+  <string name="run_servers_accessible_via_the_tor_network">Tillatt at server på enheten er tilgjengelig via Tor-nettverket</string>
+  <string name="enter_localhost_ports_for_hidden_services">angi localhost-portene til hidden services</string>
+  <string name="hidden_service_ports">Hidden service porter</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">det adresserbare navnet på din hidden service (generert automatisk)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">aktiver feilsøkingslogg for output (må bruke adb eller aLogCat for å vise)</string>
+  <string name="project_home">Prosjektets nettside(r):</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Tor-lisensen</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Tredjepartsprogramvare:</string>
+  <string name="tor_version">Tor v0.2.4.3-alpha: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.1.1-alpha: http://www.monkey.org/~provos/libevent/</string>
+  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
+  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string>
+  <string name="hidden_service_request">En app vil åpne den skjulte tjenesteporten %S til Tor-nettverket. Dette er trygt hvis du stoler på appen. </string>
+  <string name="found_existing_tor_process">fant eksisterende Tor-prosess</string>
+  <string name="something_bad_happened">Noe alvorlig skjedde. Sjekk loggen.</string>
+  <string name="hidden_service_on">hidden service på:</string>
+  <string name="unable_to_read_hidden_service_name">kunne ikke lese hidden service navnet</string>
+  <string name="unable_to_start_tor">Kunne ikke starte Tor:</string>
+  <string name="pref_use_sys_iptables_title">Bruk standard Iptables</string>
+  <string name="pref_use_sys_iptables_summary">bruk de innebygde iptables-binærene istedenfor de som kommer med Orbot</string>
+  <string name="error_installing_binares">Tor-binærene kunne ikke installeres eller oppgraderes.</string>
+  <string name="pref_use_persistent_notifications">Behold ikonet i verktøylinjen mens Orbot er tilkoblet</string>
+  <string name="pref_use_persistent_notifications_title">Alltid-PÃ¥ Varslinger</string>
+  <string name="notification_using_bridges">Broer aktivert!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Angi land</string>
+  <string name="set_locale_summary">Velg landet og språket til Orbot</string>
+  <string name="wizard_locale_title">Velg språk</string>
+  <string name="wizard_locale_msg">Fortsett med standard eller endre til gjeldende språk</string>
+  <string name="powered_by">driftet av Tor-prosjektet</string>
+  <string name="btn_save_settings">Lagre Inntillinger</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index b49ef0a..cd3084e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -214,7 +214,7 @@
   <string name="pref_use_persistent_notifications">Houd icoon in toolbar zolang Orbot verbonden is</string>
   <string name="pref_use_persistent_notifications_title">Meldingen altijd aan</string>
   <string name="notification_using_bridges">Bridges ingeschakeld!</string>
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="set_locale_title">Stel landsinstellingen in</string>
   <string name="set_locale_summary">Kies de landsinstellingen en taal voor Orbot</string>
   <string name="wizard_locale_title">Kies taal</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 3355fd6..25e7504 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -37,6 +37,7 @@
   <string name="pref_transparent_port_title">Lista portów</string>
   <string name="pref_transparent_port_dialog">Wprowadź porty dla proxy</string>
   <string name="pref_has_root">Wymaga dostępu Root\'a</string>
+  <string name="pref_has_root_summary">Wymaga dostępu ROOT\'a dla transparent proxying</string>
   <string name="status_install_success">Pliki binarne Tora zainstalowane poprawnie!</string>
   <string name="status_install_fail">Pliki binarne Tora nie mogły być zainstalowane. Sprawdź Log i skontaktuj się z nami mailowo: tor-assistants at torproject.org</string>
   <string name="title_error">BÅ‚Ä…d aplikacji</string>
@@ -77,8 +78,11 @@
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparenty Proxing</string>
+  <string name="wizard_transproxy_none">Brak</string>
   <!--<string name="pref_use_whispercore">Use WhisperCore</string>
 <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
-  <string name="default_bridges"/>
+  <string name="status">Status</string>
+  <string name="default_bridges"></string>
   <string name="powered_by">powered by The Tor Project </string>
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index f7579bc..8adb909 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -25,6 +25,8 @@
   <string name="menu_stop">Parar</string>
   <string name="menu_about">Sobre</string>
   <string name="menu_wizard">Assistente</string>
+  <string name="main_layout_download">Download</string>
+  <string name="main_layout_upload">Upload</string>
   <string name="button_help">Ajuda</string>
   <string name="button_close">Fechar</string>
   <string name="button_about">Sobre</string>
@@ -72,6 +74,12 @@
   <string name="wizard_tips_msg">As apps abaixo foram desenvolvidas para trabalhar com Orbot. Clique em cada botão para instalar agora, ou você pode encontrá-las posteriormente no Android Market.</string>
   <string name="wizard_tips_otrchat">Gibberbot - Cliente de mensagem instantânea seguro para Android</string>
   <string name="wizard_tips_proxy">Configurações de Proxy - Aprenda como configurar apps para trabalhar com Orbot</string>
+  <string name="wizard_tips_duckgo">Ferramenta de Busca DuckDuckGo</string>
+  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+  <string name="wizard_tips_firefox">Aplicativo Proxy Mobile para Firefox (http://tinyurl.com/getproxymob)</string>
+  <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
+  <string name="wizard_tips_twitter">Define o proxy do Twitter para \"localhost\" e a porta 8118</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Configurações de Proxy</string>
   <string name="wizard_proxy_help_msg">Se a app Android que você está usando puder suportar o uso de proxy HTTP ou SOCKS, então você pode configurar para conectar ao Orbot e usar o Tor.\n\n\n    As configurações de host são 127.0.0.1 ou \"localhost\". Para HTTP, a porta configurada é 8118. Para SOCKS, o proxy é 9050. Você deve usar SOCKS4A ou SOCKS5 se possível.\n    \n\n\n    Você pode aprender mais sobre proxy no Android através do FAQ em: http://tinyurl.com/proxyandroid\n    </string>
   <string name="wizard_final">Orbot está pronto!</string>
@@ -100,6 +108,8 @@
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
   <string name="wizard_tips_orweb">Orweb: Navegador de reforço de privacidade que trabalha através do Tor</string>
   <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
+  <string name="wizard_tips_play">Encontre todos os aplicativos da Guardian Project no Google Play</string>
+  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
@@ -204,7 +214,7 @@
   <string name="pref_use_persistent_notifications">Sempre manter o ícone na barra de tarefas quando o Orbot está conectado</string>
   <string name="pref_use_persistent_notifications_title">Notificações Sempre Ligadas</string>
   <string name="notification_using_bridges">Pontes habilitadas!</string>
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="set_locale_title">Selecionar Local</string>
   <string name="set_locale_summary">Escolha o local e idioma para o Orbot</string>
   <string name="wizard_locale_title">Escolha o Idioma</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 3e7f20a..a92e94c 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -11,6 +11,8 @@
   <string name="status_activated">Ligação estabelecida à rede Tor</string>
   <string name="status_disabled">\"Orbot está Desactivado</string>
   <string name="status_shutting_down">Orbot a encerrar</string>
+  <string name="tor_process_complete">completo.</string>
+  <string name="tor_process_waiting">a aguardar.</string>
   <string name="not_anonymous_yet">ATENÇÃO: A sua ligação ainda não é anónima! Por favor configure as suas aplicações para utilizarem o proxy HTTP 127.0.0.1:8118 ou o proxy SOCKS4A ou SOCKS5 127.0.0.1:9050</string>
   <string name="menu_home">Início</string>
   <string name="menu_browse">Explorar</string>
@@ -52,10 +54,13 @@
   <string name="wizard_permissions_stock">Permissões do Orbot</string>
   <string name="wizard_permission_enable_root">Autorizar acesso Root para o Orbot</string>
   <string name="wizard_configure">Configurar acesso com Tor</string>
+  <string name="wizard_proxy_help_info">Configurações do Proxy</string>
   <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Geral</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
+  <string name="wizard_warning_title">Aviso</string>
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
@@ -63,8 +68,13 @@
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Proxy Transparente</string>
+  <string name="wizard_transproxy_none">Nenhum</string>
   <!--<string name="pref_use_whispercore">Use WhisperCore</string>
 <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
-  <string name="default_bridges"/>
+  <string name="status">Estado</string>
+  <string name="error">Erro</string>
+  <string name="default_bridges"></string>
   <string name="powered_by">powered by the Tor Project</string>
+  <string name="btn_save_settings">Salvar as Configurações</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index aa89294..da6feff 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -25,6 +25,8 @@
   <string name="menu_stop">Остановить</string>
   <string name="menu_about">О программе</string>
   <string name="menu_wizard">Мастер</string>
+  <string name="main_layout_download">Загрузить</string>
+  <string name="main_layout_upload">Загрузить</string>
   <string name="button_help">Справка</string>
   <string name="button_close">Закрыть</string>
   <string name="button_about">О программе</string>
@@ -73,8 +75,11 @@
   <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
   <string name="wizard_tips_proxy">Настройки прокси - узнайте как настроить приложения для работы с Orbot</string>
   <string name="wizard_tips_duckgo">Приложение поисковой системы Duckduckgo</string>
+  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
   <string name="wizard_tips_firefox">Firefox с дополнением Proxy Mobile (после отдельной установки)</string>
+  <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
   <string name="wizard_tips_twitter">Twitter поддерживает http прокси \"localhost:8118\"</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Настройки Прокси</string>
   <string name="wizard_proxy_help_msg">Если используемое вами приложение для Android поддерживает HTTP или SOCKS прокси, то вы можете настроить его на подключение к Orbot и использование Tor.\n\n\n    Значение хоста - 127.0.0.1 или \"localhost\". Для HTTP, номер порта - 8118. Для SOCKS прокси - 9050. По возможности используйте SOCKS4A или SOCKS5.\n\n    \n    Вы можете узнать больше о работе через прокси на Android, прочитав этот FAQ: http://tinyurl.com/proxyandroid\n    </string>
   <string name="wizard_final">Программа Orbot готова к использованию!</string>
@@ -103,6 +108,8 @@
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
   <string name="wizard_tips_orweb">ORWEB (Только для версии Android 1.x) - Браузер, разработанный для обеспечения безопасности и для Orbot</string>
   <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <string name="wizard_tips_play">Найти все приложения Guardian Project на Google Play</string>
+  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
@@ -207,7 +214,7 @@
   <string name="pref_use_persistent_notifications">Всегда отображать иконку в панели задач когда Orbot подключен</string>
   <string name="pref_use_persistent_notifications_title">Уведомления о постоянной работе</string>
   <string name="notification_using_bridges">Мосты включены!</string>
-  <string name="default_bridges"/>
+  <string name="default_bridges"></string>
   <string name="set_locale_title">Задать локаль</string>
   <string name="set_locale_summary">Выбрать локаль и язык для Orbot</string>
   <string name="wizard_locale_title">Выбрать Язык</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 2c4f2d9..1115dc4 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -11,6 +11,9 @@
   <string name="status_activated">Uppkopplad till Tor nätverket</string>
   <string name="status_disabled">\"Orbot är inaktiverad</string>
   <string name="status_shutting_down">Orbot avslutas</string>
+  <string name="tor_process_starting">Startar Tor klient...</string>
+  <string name="tor_process_complete">färdig.</string>
+  <string name="tor_process_waiting">väntar.</string>
   <string name="not_anonymous_yet">VARNING: Din trafik är inte anonym än! Vänligen konfigurera dina apps att använda HTTP proxy 127.0.0.1:8118 eller SOCKS4A/5 proxy 127.0.0.1:9050</string>
   <string name="menu_home">Hem</string>
   <string name="menu_browse">Browse</string>
@@ -22,6 +25,8 @@
   <string name="menu_stop">Stopp</string>
   <string name="menu_about">About</string>
   <string name="menu_wizard">Wizard</string>
+  <string name="main_layout_download">Ladda Ner</string>
+  <string name="main_layout_upload">Ladda Upp</string>
   <string name="button_help">Hjälp</string>
   <string name="button_close">Stäng</string>
   <string name="button_about">Om</string>
@@ -33,9 +38,12 @@
   <string name="pref_trans_proxy_title">Transparent Proxy</string>
   <string name="pref_trans_proxy_summary">Automatisk Torifiering av Appar</string>
   <string name="pref_transparent_all_title">Tor:a Allt</string>
+  <string name="pref_transparent_all_summary">Proxy trafik för alla appar genom Tor</string>
+  <string name="pref_transparent_port_fallback_title">Port Proxy Ã…terfall</string>
   <string name="pref_transparent_port_fallback_summary">VARNING: Kringgår vanliga portar (80, 443, etc). *ANVÄND ENDAST* om \'Alla\' eller \'App\'-läge inte fungerar.</string>
   <string name="pref_transparent_port_title">Port-lista</string>
   <string name="pref_transparent_port_summary">Lista över portar att köra genom proxy. *ANVÄND ENDAST* om \'Alla\' eller \'App\'-läge inte fungerar</string>
+  <string name="pref_transparent_port_dialog">Skriv in portar till proxy</string>
   <string name="pref_has_root">Request Root Access</string>
   <string name="pref_has_root_summary">>Request root access for transparent proxying</string>
   <string name="status_install_success">Tor-binärer installerades utan problem!</string>
@@ -51,41 +59,166 @@
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Orbot-information</string>
   <string name="wizard_details_msg">Orbot är en öppen källkods-applikation som innehåller Tor, LibEvent och Privoxy. Den tillhandahåller en local HTTP-proxy (8118) och en SOCKS-proxy (9050) in i Tor-nätverket. Orbot har också möjligheten, på en rootad enhet, att skicka all internet-trafik genom Tor.</string>
+  <string name="wizard_permissions_root">Tillstånd Givet</string>
+  <string name="wizard_permissions_stock">Orbot Tillstånd</string>
+  <string name="wizard_premissions_msg_root">Utmärkt! Vi har upptäckt att du har root tillstånd aktiverat för Orbot. Vi kommer använda denna makt ansvarsfullt.</string>
+  <string name="wizard_permissions_msg_stock">Det är inte nödvändigt, men Orbot kan bli ett kraftfullare verktyg om din enhet har root tillgång. Använd knappen nedan för att ge Orbot superkrafter!</string>
+  <string name="wizard_permissions_no_root">Om du inte har root tillgång eller inte har en aning om vad vi pratar om, använd bara appar som är gjorda att fungera med Orbot.</string>
+  <string name="wizard_permissions_consent">Jag förstår och vill fortsätta utan Superuser.</string>
+  <string name="wizard_permission_enable_root">Ge Orbot Root Tillgång</string>
+  <string name="wizard_configure">Konfigurera Torifikation</string>
+  <string name="wizard_configure_msg">Orbot ger dig möjligheten att skicka all applikationstrafik genom Tor ELLER att själv välja applikationer individuellt.</string>
+  <string name="wizard_configure_all">Proxy Alla Appar Genom Tor</string>
+  <string name="wizard_configure_select_apps">Välj Enskilda Appar för Tor</string>
+  <string name="wizard_tips_tricks">Orbot-anpassade Appar</string>
+  <string name="wizard_tips_msg">Apparna nedanför var utvecklade att fungera med Orbot. Klicka varje knapp för att installera nu, eller hitta dom senare på Google Play, på GuardianProject.info, eller via F-Droid.org.</string>
+  <string name="wizard_tips_otrchat">Gibberbot - Säker chattklient för Android</string>
+  <string name="wizard_tips_proxy">Proxy-inställningar - Lär dig hur du konfigurerar appar att fungera med Orbot</string>
+  <string name="wizard_tips_duckgo">DuckDuckGo Sökmotor App</string>
+  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+  <string name="wizard_tips_firefox">Proxy Mobile tillägg för Firefox (http://tinyurl.com/getproxymob)</string>
+  <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
+  <string name="wizard_tips_twitter">Ställ in Twitter proxy till värd \"localhost\" och port 8118</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Proxy-inställningar</string>
+  <string name="wizard_proxy_help_msg">Om Android appen du använder kan stödja användandet av HTTP eller SOCKS proxy, så kan du konfigurera den att ansluta till Orbot och använda Tor.\n\n\nVärd inställningarna är 127.0.0.1 eller \"localhost\". För HTTP är port inställningen 8118. För SOCKS är proxyn 9050. Du bör använda SOCKS4A eller SOCKS5 om möjligt.\n\n\nDu kan lära dig mer om proxys på Android via FAQ:n på http://tinyurl.com/proxyandroid\n</string>
+  <string name="wizard_final">Orbot är redo!</string>
+  <string name="wizard_final_msg">Hundratusentals personer runt om i världen använder Tor för många olika anledningar.\n\nJournalister och bloggare, försvarare av mänskliga rättigheter, polis, soldater, företag, medborgare i totalitära regimer, och bara vanliga medborgare... och nu är du också redo!</string>
   <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Du har framgångsrikt anslutit till Tor nätverket - men det betyder INTE att din enhet är säker. Du kan använda \"Check\" valet i menyn för att testa din webbläsare.\n\nBesök oss på https://guardianproject.info/apps/orbot eller skicka ett mail till help at guardianproject.info för att få reda på mer.</string>
   <string name="tor_check">Det här kommer att öppna din webbläsare mot https://check.torproject.org för att se om Orbot är rätt konfigurerad och du är uppkopplad mot Tor.</string>
+  <string name="pref_hs_group">Gömd Service Hosting</string>
   <string name="pref_general_group">Allmänt</string>
+  <string name="pref_start_boot_title">Starta Orbot vid Uppstart</string>
+  <string name="pref_start_boot_summary">Starta Orbot automatiskt och anslut till Tor när din Android enhet startar upp</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot tar Tor till Android!\n\nTor hjälper dig försvara dig mot innehållsfiltrering, trafikanalys, och nätverksövervakning som hotar din integritet, konfidentiell information, och personliga relationer.\n\nDenna guide hjälper dig att konfigurera Orbot och Tor på din enhet.</string>
   <!--Warning screen-->
+  <string name="wizard_warning_title">Varning</string>
+  <string name="wizard_warning_msg">Bara att installera Orbot kommer inte automatiskt att anonymisera din mobila trafik.\n\nDu måste konfigurera Orbot, din enhet, och andra appar att framgångsrikt använda Tor.</string>
   <!--Permissions screen-->
+  <string name="wizard_permissions_title">Tillstånd</string>
+  <string name="wizard_permissions_root_msg1">Du kan alternativt ge Orbot \'Superuser\' tillgång för att aktivera avancerade inställningar, som till exempel Transparent Proxy.</string>
+  <string name="wizard_permissions_root_msg2">Om du inte vill göra detta, se till att bara använda appar som anpassats till Orbot.</string>
+  <string name="wizard_permissions_no_root_msg">Din enhet verkar inte vara rootad eller ge \'Superuser\' tillgång.\n\nFör att du ska ha användning av Tor måste du använda appar som är anpassade till Orbot, eller som stödjer HTTP eller SOCKS proxy inställningar.\n\n</string>
   <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot-Anpassade Appar</string>
+  <string name="wizard_tips_gibberbot">Gibberbot: Säker chatt app med Off-the-Record Kryptering</string>
+  <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string>
+  <string name="wizard_tips_orweb">Orweb: Integritets-förbättrande webbläsare som fungerar genom Tor</string>
+  <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.xpi</string>
+  <string name="wizard_tips_play">Hitta alla Guardian Project appar på Google Play</string>
+  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparent Proxy</string>
+  <string name="wizard_transproxy_msg">Detta tillåter dina appar att automatiskt köra genom Tor nätverket utan någon konfiguration.</string>
+  <string name="wizard_transproxy_hint">(Markera denna om du inte har någon aning om vad vi pratar om)</string>
+  <string name="wizard_transproxy_none">Ingen</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Aktivera Tor Transparent Proxy för Wifi och USB Thetered Enheter (omstart krävs)</string>
+  <string name="button_grant_superuser">Begär Superuser Tillgång</string>
+  <string name="pref_select_apps">Välj Appar</string>
+  <string name="pref_select_apps_summary">Välj Appar att Leda Genom Tor</string>
+  <string name="pref_node_configuration">Nod Konfiguration</string>
   <string name="pref_node_configuration_summary">Det här är avancerade inställningar som kan minska din anonymitet</string>
   <string name="pref_entrance_node">Ingångsnoder</string>
+  <string name="pref_entrance_node_summary">Fingeravtryck, nicks, länder, och adresser för första hoppet</string>
+  <string name="pref_entrance_node_dialog">Skriv in Ingångs Noder</string>
   <!--<string name="pref_use_whispercore">Use WhisperCore</string>
 <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
+  <string name="pref_proxy_title">Utgående Nätverksproxy</string>
   <string name="pref_proxy_type_title">Proxy-typ</string>
   <string name="pref_proxy_type_summary">Protokoll att använda för proxyserver: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Skriv in Proxy Typ</string>
   <string name="pref_proxy_host_title">Proxy-värd</string>
   <string name="pref_proxy_host_summary">Proxy-servernamn</string>
+  <string name="pref_proxy_host_dialog">Skriv in Proxy Värd</string>
+  <string name="pref_proxy_port_title">Utgående Proxy Port</string>
+  <string name="pref_proxy_port_summary">Proxy server port</string>
+  <string name="pref_proxy_port_dialog">Skriv in Proxy port</string>
+  <string name="status">Status</string>
   <string name="setting_up_full_transparent_proxying_">Ställer in full transparent proxyfiering...</string>
   <string name="setting_up_app_based_transparent_proxying_">Ställer in app-baserad transparent proxyfiering...</string>
+  <string name="transparent_proxying_enabled">Transparent proxy AKTIVERAD</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy aktiverad för Tethering!</string>
+  <string name="warning_error_starting_transparent_proxying_">VARNING: kunde ej starta transparent proxy!</string>
+  <string name="transproxy_rules_cleared">TransProxy regler rensade</string>
   <string name="couldn_t_start_tor_process_">Kunde inte starta Tor-process:</string>
   <string name="privoxy_is_running_on_port_">Privoxy körs på port:</string>
   <string name="setting_up_port_based_transparent_proxying_">Ställer in port-baserad transparent proxyfiering...</string>
+  <string name="bridge_error">Bro Error</string>
+  <string name="bridge_requires_ip">För att använda bro funktionen måste du skriva in minst en bro IP adress.</string>
+  <string name="send_email_for_bridges">Skicka ett email till bridges at torproject.org med linjen \"get bridges\" ensamt som meddelande från ett gmail konto.</string>
   <string name="error">Fel</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Din NåbaraAdresser inställning orsakade ett undantag!</string>
+  <string name="your_relay_settings_caused_an_exception_">Din relä inställning orsakade ett undantag!</string>
   <string name="exit_nodes">Utgångsnoder</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingeravtryck, nicks, länder, och adresser för sista hoppet</string>
+  <string name="enter_exit_nodes">Skriv in Exit Noder</string>
+  <string name="exclude_nodes">Exkludera Noder</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingeravtryck, nicks, länder och adresser att exkludera</string>
+  <string name="enter_exclude_nodes">Skriv in Exkluderade Noder</string>
+  <string name="strict_nodes">Strikta Noder</string>
+  <string name="use_only_these_specified_nodes">Använd *enbart* dessa specificerade noder</string>
+  <string name="bridges">Broar</string>
+  <string name="use_bridges">Använd Broar</string>
+  <string name="bridges_obfuscated">Förvillande Broar</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Aktivera alternativa ingångsnoder till Tor nätverket</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Aktivera om konfigurerade broar är förvillande broar</string>
+  <string name="ip_address_and_port_of_bridges">IP adress och port för broar</string>
+  <string name="enter_bridge_addresses">Skriv in Bro Adresser</string>
+  <string name="relays">Reläer</string>
+  <string name="relaying">Överföring</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Aktivera din enhet till att vara ett icke-utgångsrelä</string>
+  <string name="relay_port">Relä Port</string>
+  <string name="listening_port_for_your_tor_relay">Lyssningsport för din Tor relä</string>
   <string name="enter_or_port">Allmänt</string>
+  <string name="relay_nickname">Relä namn</string>
+  <string name="the_nickname_for_your_tor_relay">Namnet för din Tor relä</string>
+  <string name="enter_a_custom_relay_nickname">Skriv in ett anpassat relä namn</string>
+  <string name="reachable_addresses">NÃ¥bara Adresser</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Kör som klient bakom en brandvägg med restriktiva policys</string>
+  <string name="reachable_ports">NÃ¥bara portar</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Portar nåbara bakom en restriktiv brandvägg</string>
+  <string name="enter_ports">Skriv in portar</string>
+  <string name="enable_hidden_services">Gömd Tjänstehosting</string>
+  <string name="run_servers_accessible_via_the_tor_network">Tillåt server på enheten att vara tillgänglig via Tor nätverket</string>
+  <string name="enter_localhost_ports_for_hidden_services">Skriv in localhost portar för gömda tjänster</string>
+  <string name="hidden_service_ports">Gömda Tjänsteportar</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">det adresserade namnet för din gömda tjänst (genereras automatiskt)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Aktivera debug loggen för output (måste använda adb eller aLogCat för att se)</string>
   <string name="project_home">Projektets hemsidor:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
   <string name="the_tor_license">Tor-licensen</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">Tredjepartsprogramvara:</string>
-  <string name="default_bridges"/>
+  <string name="tor_version">Tor v0.2.4.3-alpha: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.1.1-alpha: http://www.monkey.org/~provos/libevent/</string>
+  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
+  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string>
+  <string name="hidden_service_request">En app vill öppna gömd tjänsteport %S till Tor nätverket. Detta är säkert om du litar på appen.</string>
+  <string name="found_existing_tor_process">hittade existerande Tor process...</string>
+  <string name="something_bad_happened">Något dåligt hände. Kolla loggen.</string>
+  <string name="hidden_service_on">gömd tjänst på:</string>
+  <string name="unable_to_read_hidden_service_name">kan inte läsa gömda tjänstens namn</string>
+  <string name="unable_to_start_tor">Kan inte starta Tor:</string>
+  <string name="pref_use_sys_iptables_title">Använd standard Iptables</string>
+  <string name="pref_use_sys_iptables_summary">Använd den inbyggda iptables binären istället för den som kommer med Orbot</string>
+  <string name="error_installing_binares">Tor binärerna kunde inte installeras eller uppgraderas.</string>
+  <string name="pref_use_persistent_notifications">Behåll alltid ikonen i verktygsfältet när Orbot är ansluten</string>
+  <string name="pref_use_persistent_notifications_title">Alltid-PÃ¥ Notifikationer</string>
+  <string name="notification_using_bridges">Broar aktiverade!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Välj Plats</string>
+  <string name="set_locale_summary">Välj plats och språk för Orbot</string>
   <string name="wizard_locale_title">Välj språk</string>
+  <string name="wizard_locale_msg">Lämna standard eller byt nuvarande språk</string>
   <string name="powered_by">drivs av Tor-projektet</string>
+  <string name="btn_save_settings">Spara Inställningar</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index aac14cd..ac350f1 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -11,6 +11,8 @@
   <string name="status_activated">Tor ağına bağlandı</string>
   <string name="status_disabled">Orbot devre dışı bırakıldı</string>
   <string name="status_shutting_down">Orbot kapatılıyor</string>
+  <string name="tor_process_complete">tamamlandı.</string>
+  <string name="tor_process_waiting">bekliyor.</string>
   <string name="not_anonymous_yet">UYARI: Bağlantınız henüz anonim değildir! Lütfen uygulamalarınızı HTTP 127.0.0.1:8118  veya SOCKS4A / SOCKS5 127.0.0.1:9050 vekil sunucusu kullanacak şekilde yapılandırınız.</string>
   <string name="menu_home">Başlangıç</string>
   <string name="menu_browse">Göz At</string>
@@ -49,11 +51,17 @@
   <string name="btn_next">Ä°leri</string>
   <string name="btn_back">Geri</string>
   <string name="btn_finish">Bitir</string>
+  <string name="btn_okay">Tamam</string>
+  <string name="btn_cancel">Ä°ptal\n            </string>
   <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Proxy Ayarları</string>
+  <string name="wizard_final">Orbot hazır!</string>
   <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Genel</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
+  <string name="wizard_warning_title">Uyarı</string>
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
@@ -61,6 +69,8 @@
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparan Vekil SunuculuÄŸu</string>
+  <string name="wizard_transproxy_none">Hiçbiri</string>
   <string name="button_grant_superuser">Süper Kullanıcı Erişimi Talebi</string>
   <string name="pref_select_apps">Uygulamaları Seç</string>
   <string name="pref_select_apps_summary">Tor Üzerinden Yönlendirilecek Uygulamaları Seç</string>
@@ -69,6 +79,9 @@
   <string name="pref_entrance_node">Giriş Noktaları</string>
   <!--<string name="pref_use_whispercore">Use WhisperCore</string>
 <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
-  <string name="default_bridges"/>
+  <string name="status">Durum</string>
+  <string name="error">Hata</string>
+  <string name="default_bridges"></string>
   <string name="powered_by">The Tor Project tarafından desteklenmektedir.</string>
+  <string name="btn_save_settings">Ayarları kaydet</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 461bf86..f047e2d 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1,214 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">start and stop Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot is starting...</string>
-  <string name="status_activated">Connected to the Tor network</string>
-  <string name="status_disabled">\"Orbot is Deactivated</string>
-  <string name="status_shutting_down">Orbot is shutting down</string>
-  <string name="tor_process_starting">Starting Tor client...</string>
-  <string name="tor_process_complete">complete.</string>
-  <string name="tor_process_waiting">waiting.</string>
-  <string name="not_anonymous_yet">WARNING: Your traffic is not anonymous yet! Please configure your applications to use HTTP proxy 127.0.0.1:8118 or SOCKS4A or SOCKS5 proxy 127.0.0.1:9050</string>
-  <string name="menu_home">Home</string>
-  <string name="menu_browse">Browse</string>
-  <string name="menu_settings">Settings</string>
-  <string name="menu_log">Log</string>
-  <string name="menu_info">Help</string>
-  <string name="menu_apps">Apps</string>
-  <string name="menu_start">Start</string>
-  <string name="menu_stop">Stop</string>
-  <string name="menu_about">About</string>
-  <string name="menu_wizard">Wizard</string>
-  <string name="button_help">Help</string>
-  <string name="button_close">Close</string>
-  <string name="button_about">About</string>
-  <string name="button_clear_log">Clear Log</string>
-  <string name="menu_verify">Check</string>
-  <string name="menu_exit">Exit</string>
-  <string name="press_to_start">- long press to start -</string>
-  <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string>
-  <string name="pref_trans_proxy_title">Transparent Proxying</string>
-  <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string>
-  <string name="pref_transparent_all_title">Tor Everything</string>
-  <string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string>
-  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
-  <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
-  <string name="pref_transparent_port_title">Port List</string>
-  <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
-  <string name="pref_transparent_port_dialog">Enter ports to proxy</string>
-  <string name="pref_has_root">Request Root Access</string>
-  <string name="pref_has_root_summary">Request root access for transparent proxying</string>
-  <string name="status_install_success">Tor binaries successfully installed!</string>
-  <string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants at torproject.org</string>
-  <string name="title_error">Application Error</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">About Orbot</string>
-  <string name="btn_next">Next</string>
-  <string name="btn_back">Back</string>
-  <string name="btn_finish">Finish</string>
-  <string name="btn_okay">Okay</string>
-  <string name="btn_cancel">Cancel</string>
+  <string name="menu_browse">Огялд</string>
+  <string name="menu_settings">Налаштування</string>
+  <string name="menu_info">Допомога</string>
+  <string name="button_help">Допомога</string>
+  <string name="button_close">Закрити</string>
+  <string name="btn_back">Назад</string>
+  <string name="btn_cancel">Відмова</string>
   <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Some Orbot Details</string>
-  <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, LibEvent and Privoxy. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string>
-  <string name="wizard_permissions_root">Permission Granted</string>
-  <string name="wizard_permissions_stock">Orbot Permissions</string>
-  <string name="wizard_premissions_msg_root">Excellent! We\'ve detected that you have root permissions enabled for Orbot. We will use this power wisely.</string>
-  <string name="wizard_permissions_msg_stock"> While it is not required, Orbot can become a more powerful tool if your device has root access. Use the button below to grant Orbot superpowers! </string>
-  <string name="wizard_permissions_no_root">If you don\'t have root access or have no idea what we\'re talking about, just be sure to use apps made to work with Orbot.</string>
-  <string name="wizard_permissions_consent">I understand and would like to continue without Superuser</string>
-  <string name="wizard_permission_enable_root">Grant Root for Orbot</string>
-  <string name="wizard_configure">Configure Torification</string>
-  <string name="wizard_configure_msg">Orbot gives you the option to route all application traffic through Tor OR to choose your applications individually.</string>
-  <string name="wizard_configure_all">Proxy All Apps Through Tor</string>
-  <string name="wizard_configure_select_apps">Select Individual Apps for Tor</string>
-  <string name="wizard_tips_tricks">Orbot-enabled Apps</string>
-  <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later in the Android Market.</string>
-  <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
-  <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string>
-  <string name="wizard_proxy_help_info">Proxy Settings</string>
-  <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n\n    The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n    \n\n\n    You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n    </string>
-  <string name="wizard_final">Orbot is ready!</string>
-  <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string>
+  <string name="wizard_proxy_help_info">Параметри проксі</string>
   <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help at guardianproject.info to learn more.</string>
-  <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string>
-  <string name="pref_hs_group">Hidden Service Hosting</string>
-  <string name="pref_general_group">General</string>
-  <string name="pref_start_boot_title">Start Orbot on Boot</string>
-  <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
+  <string name="pref_general_group">Основні</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>
   <!--Warning screen-->
-  <string name="wizard_warning_title">Warning</string>
-  <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>
   <!--Permissions screen-->
-  <string name="wizard_permissions_title">Permissions</string>
-  <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string>
-  <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>
   <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-Enabled Apps</string>
-  <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string>
-  <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
-  <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string>
-  <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transparent Proxying</string>
-  <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string>
-  <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string>
-  <string name="wizard_transproxy_none">None</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string>
-  <string name="button_grant_superuser">Request Superuser Access</string>
-  <string name="pref_select_apps">Select Apps</string>
-  <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string>
-  <string name="pref_node_configuration">Node Configuration</string>
-  <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string>
-  <string name="pref_entrance_node">Entrance Nodes</string>
-  <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string>
-  <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string>
+  <string name="wizard_transproxy_none">Нічого</string>
   <!--<string name="pref_use_whispercore">Use WhisperCore</string>
 <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
-  <string name="pref_proxy_title">Outbound Network Proxy</string>
-  <string name="pref_proxy_type_title">Outbound Proxy Type</string>
-  <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Enter Proxy Type</string>
-  <string name="pref_proxy_host_title">Outbound Proxy Host</string>
-  <string name="pref_proxy_host_summary">Proxy server hostname</string>
-  <string name="pref_proxy_host_dialog">Enter Proxy Host</string>
-  <string name="pref_proxy_port_title">Outbound Proxy Port</string>
-  <string name="pref_proxy_port_summary">Proxy server port</string>
-  <string name="pref_proxy_port_dialog">Enter Proxy port</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying...</string>
-  <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string>
-  <string name="transproxy_rules_cleared">TransProxy rules cleared</string>
-  <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string>
-  <string name="privoxy_is_running_on_port_">Privoxy is running on port: </string>
-  <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string>
-  <string name="bridge_error">Bridge Error</string>
-  <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string>
-  <string name="send_email_for_bridges">Send an email to bridges at torproject.org with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string>
-  <string name="error">Error</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string>
-  <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string>
-  <string name="exit_nodes">Exit Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string>
-  <string name="enter_exit_nodes">Enter Exit Nodes</string>
-  <string name="exclude_nodes">Exclude Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string>
-  <string name="enter_exclude_nodes">Enter Exclude Nodes</string>
-  <string name="strict_nodes">Strict Nodes</string>
-  <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string>
-  <string name="bridges">Bridges</string>
-  <string name="use_bridges">Use Bridges</string>
-  <string name="bridges_obfuscated">Obfuscated Bridges</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string>
-  <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string>
-  <string name="enter_bridge_addresses">Enter Bridge Addresses</string>
-  <string name="relays">Relays</string>
-  <string name="relaying">Relaying</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Enable your device to be a non-exit relay</string>
-  <string name="relay_port">Relay Port</string>
-  <string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string>
-  <string name="enter_or_port">Enter OR port</string>
-  <string name="relay_nickname">Relay nickname</string>
-  <string name="the_nickname_for_your_tor_relay">The nickname for your Tor relay</string>
-  <string name="enter_a_custom_relay_nickname">Enter a custom relay nickname</string>
-  <string name="reachable_addresses">Reachable Addresses</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Run as a client behind a firewall with restrictive policies</string>
-  <string name="reachable_ports">Reachable ports</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string>
-  <string name="enter_ports">Enter ports</string>
-  <string name="enable_hidden_services">Hidden Service Hosting</string>
-  <string name="run_servers_accessible_via_the_tor_network">allow on-device server to be accessible via the Tor network</string>
-  <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string>
-  <string name="hidden_service_ports">Hidden Service Ports</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string>
-  <string name="project_home">Project Home(s): </string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">The Tor License</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3rd-Party-Software: </string>
-  <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string>
-  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
-  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string>
-  <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string>
-  <string name="found_existing_tor_process">found existing Tor process...</string>
-  <string name="something_bad_happened">Something bad happened. Check the log</string>
-  <string name="hidden_service_on">hidden service on:</string>
-  <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string>
-  <string name="unable_to_start_tor">Unable to start Tor:</string>
-  <string name="pref_use_sys_iptables_title">Use Default Iptables</string>
-  <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string>
-  <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string>
-  <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string>
-  <string name="pref_use_persistent_notifications_title">Always-On Notifications</string>
-  <string name="notification_using_bridges">Bridges enabled!</string>
-  <string name="default_bridges"/>
-  <string name="set_locale_title">Set Locale</string>
-  <string name="set_locale_summary">Choose the locale and language for Orbot</string>
-  <string name="wizard_locale_title">Choose Language</string>
-  <string name="wizard_locale_msg">Leave default or switch the current language</string>
-  <string name="powered_by">powered by The Tor Project  </string>
-  <string name="btn_save_settings">Save Settings</string>
+  <string name="status">Статус</string>
+  <string name="default_bridges"></string>
 </resources>
diff --git a/res/values-zh/strings.xml b/res/values-zh/strings.xml
index 964adb0..38db494 100644
--- a/res/values-zh/strings.xml
+++ b/res/values-zh/strings.xml
@@ -11,43 +11,45 @@
   <string name="status_activated">已连接到 Tor 网络</string>
   <string name="status_disabled">Orbot 已停用</string>
   <string name="status_shutting_down">Orbot 正在关闭</string>
-  <string name="tor_process_starting">开启Tor客户端...</string>
+  <string name="tor_process_starting">正在启动 Tor 客户端...</string>
   <string name="tor_process_complete">完成。</string>
   <string name="tor_process_waiting">等待。</string>
-  <string name="not_anonymous_yet">警告: 您的通讯还不是匿名的! 请设置您的应用程序使用代理服务器 127.0.0.1:8118 或者 SOCKS4A 或者 SOCKS5 代理服务器 127.0.0.1:9050</string>
+  <string name="not_anonymous_yet">警告:你的网络通讯并非匿名!请设置应用程序,使用 HTTP 代理 127.0.0.1:8118 或者 SOCKS4A、SOCKS5 代理 127.0.0.1:9050</string>
   <string name="menu_home">首页</string>
   <string name="menu_browse">浏览</string>
   <string name="menu_settings">设置</string>
   <string name="menu_log">日志</string>
   <string name="menu_info">帮助</string>
-  <string name="menu_apps">应用</string>
+  <string name="menu_apps">应用程序</string>
   <string name="menu_start">启动</string>
   <string name="menu_stop">停止</string>
   <string name="menu_about">关于</string>
-  <string name="menu_wizard">Wizard</string>
+  <string name="menu_wizard">向导</string>
+  <string name="main_layout_download">下载</string>
+  <string name="main_layout_upload">上传</string>
   <string name="button_help">帮助</string>
   <string name="button_close">关闭</string>
   <string name="button_about">关于</string>
-  <string name="button_clear_log">Clear Log</string>
+  <string name="button_clear_log">清除日志</string>
   <string name="menu_verify">检查</string>
   <string name="menu_exit">退出</string>
-  <string name="press_to_start">- 长按以启动 -</string>
-  <string name="pref_trans_proxy_group">透明代理(需要 root)</string>
+  <string name="press_to_start">- 长按启动 -</string>
+  <string name="pref_trans_proxy_group">透明代理(需要 Root 权限)</string>
   <string name="pref_trans_proxy_title">透明代理</string>
-  <string name="pref_trans_proxy_summary">自动对应用程序使用 Tor</string>
-  <string name="pref_transparent_all_title">对所有应用使用 Tor</string>
-  <string name="pref_transparent_all_summary">使用 Tor 代理所有程序的流量</string>
-  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
-  <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
+  <string name="pref_trans_proxy_summary">应用程序自动使用 Tor</string>
+  <string name="pref_transparent_all_title">所有应用程序使用 Tor</string>
+  <string name="pref_transparent_all_summary">所有应用程序都通过 Tor 连接网络</string>
+  <string name="pref_transparent_port_fallback_title">备用代理端口</string>
+  <string name="pref_transparent_port_fallback_summary">警告:避免使用常用端口(80、443 等)。仅在“应用程序”或“应用程序”模式无法工作时使用。</string>
   <string name="pref_transparent_port_title">端口列表</string>
-  <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
-  <string name="pref_transparent_port_dialog">Enter ports to proxy</string>
-  <string name="pref_has_root">Request Root Access</string>
-  <string name="pref_has_root_summary">Request root access for transparent proxying</string>
-  <string name="status_install_success">Tor 二进制程序安装成功!</string>
-  <string name="status_install_fail">Tor 二进制程序无法安装。请查看日志 tor-assistants at torproject.org</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 at torproject.org</string>
   <string name="title_error">应用程序错误</string>
-  <string name="wizard_title">欢迎使用 Orbot</string>
+  <string name="wizard_title">Orbot</string>
   <string name="wizard_btn_tell_me_more">关于 Orbot</string>
   <string name="btn_next">下一步</string>
   <string name="btn_back">上一步</string>
@@ -55,64 +57,168 @@
   <string name="btn_okay">确定</string>
   <string name="btn_cancel">取消</string>
   <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">一些 Orbot 详情</string>
-  <string name="wizard_details_msg">Orbot 是包含 Tor、LibEvent 和 Privoxy 的开源软件。它包含了一个本地 HTTP 代理(8118)和 SOCKS 代理(9050),使您接入 Tor 网络。Orbot 在可以获得 root 权限的设备上接管所有流量经由 Tor 网络。</string>
-  <string name="wizard_permissions_root">已赋予权限</string>
+  <string name="wizard_details">更多 Orbot 信息</string>
+  <string name="wizard_details_msg">Orbot 是一个包含 Tor、LibEvent 和 Privoxy 的开源程序。它使用本地 HTTP 代理 (8118) 和 SOCKS 代理 (9050) 来接入到 Tor 网络。对于已获得 ROOT 权限的设备,利用 Orbot,所有应用程序都可通过 Tor 来进行网络通讯。</string>
+  <string name="wizard_permissions_root">已获取权限</string>
   <string name="wizard_permissions_stock">Orbot 权限</string>
-  <string name="wizard_premissions_msg_root">非常好!我们检测到您已经为 Orbot 配置了 root 权限。我们会聪明地使用这个特权。</string>
-  <string name="wizard_permissions_msg_stock">虽然并非必须,如果你的设备有 root 权限,Orbot 可以表现得更为强大。使用以下按钮来赋予 Orbot 超级能力!</string>
-  <string name="wizard_permissions_no_root">如果你没有 root 权限,或不明白上面说的是什么,那么只需使用可与 Orbot 工作的应用程序。</string>
-  <string name="wizard_permissions_consent">我明白并会以非 root 继续</string>
-  <string name="wizard_permission_enable_root">为 Orbot 赋予 root 权限</string>
-  <string name="wizard_configure">配置 Tor 使用</string>
-  <string name="wizard_configure_msg">Orbot 给予您路由所有应用程序流量通过 Tor 或者为单个程序设置选择的选项。</string>
-  <string name="wizard_configure_all">通过 Tor 代理全部应用程序</string>
-  <string name="wizard_configure_select_apps">选择使用 Tor 的单个应用程序</string>
-  <string name="wizard_tips_tricks">可用 Orbot 的应用程序</string>
-  <string name="wizard_tips_msg">我们建议您下载和使用能直接连接到 Orbot 的应用程序。点击以下按钮安装。</string>
-  <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
+  <string name="wizard_premissions_msg_root">好极了!我们检测到 Orbot 已获取 Root 权限 。我们会谨慎地使用这一权限。</string>
+  <string name="wizard_permissions_msg_stock">虽非必须,但是具有 Root 访问权限的设备可以让 Orbot 变得更强大。请使用下面的按钮授予 Orbot 这一强大的能力!</string>
+  <string name="wizard_permissions_no_root">如果没有 Root 访问权限或不明白此处所说的内容,只需确保 Orbot 支持所用的应用即可。</string>
+  <string name="wizard_permissions_consent">我明白并愿意在未获取 Root 权限的情况下继续操作</string>
+  <string name="wizard_permission_enable_root">为 Orbot 获取 Root 权限</string>
+  <string name="wizard_configure">配置 Tor 网络</string>
+  <string name="wizard_configure_msg">Orbot 提供了选项,可指定所有应用程序使用 Tor 网络或指定某些应用通过 Tor 网络进行通讯。</string>
+  <string name="wizard_configure_all">所有应用程序都使用 Tor</string>
+  <string name="wizard_configure_select_apps">选择使用 Tor 的应用程序</string>
+  <string name="wizard_tips_tricks">Orbot 支持的应用</string>
+  <string name="wizard_tips_msg">以下应用可与 Orbot 一起使用。点击下面的按钮安装,也可以通过 Google Play 商店、GuardianProject.info 网站或 F-Droid.org 查找。</string>
+  <string name="wizard_tips_otrchat">Gibberbot - Android 设置上的安全即时通讯客户端</string>
   <string name="wizard_tips_proxy">代理设置 - 学习如何配置应用程序使用 Orbot</string>
+  <string name="wizard_tips_duckgo">DuckDuckGo 搜索引擎应用程序</string>
+  <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+  <string name="wizard_tips_firefox">用于 Firefox 的 Proxy Mobile 扩展 (http://tinyurl.com/getproxymob)</string>
+  <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
+  <string name="wizard_tips_twitter">将 Twitter 代理的主机设置 localhost 并将端口设置为 8118</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">代理设置</string>
-  <string name="wizard_proxy_help_msg">如果您正在使用的 Android 应用程序支持使用 HTTP 或 SOCKS 代理,您可以配置它连接到 Orbot 并使用 Tor。\n\n\n    主机设置为 127.0.0.1 或 localhost。对于 HTTP,端口为 8118,对于 SOCKS 端口为 9050。如果可能,应当使用 SOCKS4A 或 SOCKS5。\n    \n\n\n    您可以通过 http://tinyurl.com/proxyandroid 了解更多 Android 上使用代理的知识。</string>
+  <string name="wizard_proxy_help_msg">如果 Android 应用程序支持 HTTP 或 SOCKS 代理,那么可其进行配置以连接 Orbot 并使用 Tor 网络。\n\n主机设置为 127.0.0.1 或 localhost。对于 HTTP,端口设置为 8118;对于 SOCKS,端口设置为 9050。如果可以,请尽量使用 SOCKS4A 或 SOCKS5 代理。\n\n更多有关 Android 代理信息,请参阅 http://tinyurl.com/proxyandroid 中的常见问题</string>
   <string name="wizard_final">Orbot 已就绪!</string>
-  <string name="wizard_final_msg">数以万计的各国人们因为各种原因使用 Tor:记者、人权工作者、法律工作者、士兵、公司、迫于实际情况使用的市民,当然也有普通的市民。现在你也即将成为其中的一员!</string>
+  <string name="wizard_final_msg">在世界各地成有千上万的人出于各种各样的原因需要使用 Tor:\n\n记者和博客、人权工作者、法律工作者、军人、企业、专制国家的人民,以及像你我一样的普通公民...\n 现在你已准备就绪,欢迎加入!</string>
   <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">您已成功连接至 Tor 网络 - 但这并不意味着您的设备安全。您可以使用“检查”选项测试您的浏览器。\n\n访问 https://guardianproject.info/apps/orbot 或发送邮件到 help at guardianproject.info 以了解更多信息。</string>
-  <string name="tor_check">这将启动默认浏览器并访问 https://check.torproject.org 以测试是否正确配置了 Orbot 并确认您是否已经连接到 Tor。</string>
-  <string name="pref_hs_group">隐藏服务</string>
-  <string name="pref_general_group">General</string>
-  <string name="pref_start_boot_title">开机启动Orbot</string>
-  <string name="pref_start_boot_summary">当您的 Android 设备开机时自动启动 Orbot 并连接至 Tor 网络</string>
+  <string name="connect_first_time">已成功连接 Tor 网络。不过,这并不表示你的设备是安全的。通过菜单中的“检查”选项可对浏览器进行测试。\n\n更多信息,请访问 https://guardianproject.info/apps/orbot 或发送邮件到 help at guardianproject.info。</string>
+  <string name="tor_check">浏览器将启动并访问:https://check.torproject.org,以便检查 Orbot 配置是否正确以及是否可连接 Tor 网络。</string>
+  <string name="pref_hs_group">隐藏服务主机</string>
+  <string name="pref_general_group">常规</string>
+  <string name="pref_start_boot_title">开机时启动 Orbot</string>
+  <string name="pref_start_boot_summary">Android 设备开机时自动启动 Orbot 并连接 Tor 网络</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot 将 Tor 引入 Android 平台!\n\nTor 可以避免用户遭受内容过滤、通讯分析以及威胁隐私、机密信息与人际关系信息的网络监控。\n\n此向导将帮助用户在设备上对 Orbot 和 Tor 进行配置。</string>
   <!--Warning screen-->
   <string name="wizard_warning_title">警告</string>
+  <string name="wizard_warning_msg">仅仅安装 Orbot 并不能自动使移动通信匿名化。\n\n为了正常使用 Tor 网络,必须正确地对 Orbot、设备以及其他应用进行配置。</string>
   <!--Permissions screen-->
-  <string name="wizard_permissions_title">允许</string>
+  <string name="wizard_permissions_title">权限</string>
+  <string name="wizard_permissions_root_msg1">可选择授予 Orbot “Superuser”访问权限,以便启用高级功能,例如透明代理。</string>
+  <string name="wizard_permissions_root_msg2">如果不愿授予 Orbot 该权限,请确保应用程序可使用 Orbot。</string>
+  <string name="wizard_permissions_no_root_msg">设备未获取 Root 权限或未提供 Superuser 访问权限。\n\n为了使用 Tor 网络,所用的应用程序需支持 Orbot 或支持 HTTP 或 SOCKS 代理设置。\n</string>
   <!--TipsAndTricks screen-->
-  <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
-  <string name="wizard_tips_orweb">ORWEB (仅 Android 1.x) - 着重隐私设计的浏览器</string>
-  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <string name="wizard_tips_title">使用 Orbot 的应用程序</string>
+  <string name="wizard_tips_gibberbot">Gibberbot:加密且不会留下记录的安全聊天应用程序</string>
+  <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string>
+  <string name="wizard_tips_orweb">Orweb:使用 Tor 网络的隐私保护浏览器</string>
+  <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.xpi</string>
+  <string name="wizard_tips_play">在 Google Play 商店查找所有 Guardian Project 的应用程序</string>
+  <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
   <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
     <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
     <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>-->
   <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">透明代理</string>
+  <string name="wizard_transproxy_msg">可使应用程序无需配置即可自动通过 Tor 连接网络。</string>
+  <string name="wizard_transproxy_hint">(如果不明白这里所说的问题,请选择该选项)</string>
+  <string name="wizard_transproxy_none">æ— </string>
+  <string name="pref_transparent_tethering_title">Tor 网络共享</string>
+  <string name="pref_transparent_tethering_summary">对 Wifi 和 USB 网络共享设备启用透明代理(需重新启动)</string>
+  <string name="button_grant_superuser">请求 Superuser 访问权限</string>
+  <string name="pref_select_apps">选择应用程序</string>
+  <string name="pref_select_apps_summary">选择通过 Tor 连接网络的应用程序</string>
+  <string name="pref_node_configuration">节点配置</string>
+  <string name="pref_node_configuration_summary">这些高级设置可降低你的匿名度</string>
+  <string name="pref_entrance_node">入口节点</string>
+  <string name="pref_entrance_node_summary">用于首次跳转的密钥指纹、昵称、国家与地址</string>
+  <string name="pref_entrance_node_dialog">输入入口节点</string>
   <!--<string name="pref_use_whispercore">Use WhisperCore</string>
 <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
+  <string name="pref_proxy_title">出站网络代理</string>
+  <string name="pref_proxy_type_title">出站代理类型</string>
+  <string name="pref_proxy_type_summary">代理服务器使用的协议:HTTP、HTTPS、Socks4、Socks5</string>
+  <string name="pref_proxy_type_dialog">输入代理类型</string>
+  <string name="pref_proxy_host_title">出站代理主机</string>
+  <string name="pref_proxy_host_summary">代理服务器主机名</string>
+  <string name="pref_proxy_host_dialog">输入代理主机</string>
+  <string name="pref_proxy_port_title">出站代理端口</string>
+  <string name="pref_proxy_port_summary">代理服务器端口</string>
+  <string name="pref_proxy_port_dialog">输入代理端口</string>
   <string name="status">状态</string>
+  <string name="setting_up_full_transparent_proxying_">正在对所有应用程序进行透明代理设置...</string>
+  <string name="setting_up_app_based_transparent_proxying_">正在对所选应用程序进行透明代理设置...</string>
+  <string name="transparent_proxying_enabled">透明代理已启用</string>
+  <string name="transproxy_enabled_for_tethering_">已为网络共享激活 TransProxy !</string>
+  <string name="warning_error_starting_transparent_proxying_">警告:启动透明代理时发生错误!</string>
+  <string name="transproxy_rules_cleared">已清除 TransProxy 规则</string>
+  <string name="couldn_t_start_tor_process_">无法启动 Tor 进程:</string>
+  <string name="privoxy_is_running_on_port_">Privoxy  当前所用的端口:</string>
+  <string name="setting_up_port_based_transparent_proxying_">正在对基于端口的透明代理进行设置...</string>
   <string name="bridge_error">网桥错误</string>
+  <string name="bridge_requires_ip">为了需使用网桥,必须至少输入一个网桥 IP 地址。</string>
+  <string name="send_email_for_bridges">如需获取网桥地址,请使用 gmail 发送电子邮件至 bridges at torproject.org 并在正文内填上“ get bridges”。</string>
   <string name="error">错误</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">可访问地址设置导致异常!</string>
+  <string name="your_relay_settings_caused_an_exception_">中继设置导致异常!</string>
+  <string name="exit_nodes">出口节点</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">最后跳转的密钥指纹、昵称、国家与地址</string>
+  <string name="enter_exit_nodes">输入出口节点</string>
+  <string name="exclude_nodes">排除节点</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">排除的密钥指纹、昵称、国家与地址</string>
+  <string name="enter_exclude_nodes">输入排除节点</string>
+  <string name="strict_nodes">限制节点</string>
+  <string name="use_only_these_specified_nodes">仅使用这些指定节点</string>
   <string name="bridges">网桥</string>
   <string name="use_bridges">使用网桥</string>
-  <string name="ip_address_and_port_of_bridges">网桥的IP地址和端口</string>
+  <string name="bridges_obfuscated">混淆网桥</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">使用其他入口节点连接到 Tor 网络</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">已配置的网桥为混淆网桥时启用</string>
+  <string name="ip_address_and_port_of_bridges">网桥的 IP 地址和端口</string>
+  <string name="enter_bridge_addresses">输入网桥地址</string>
+  <string name="relays">中继</string>
+  <string name="relaying">中继转发</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">仅设置被设置为非出口中继</string>
+  <string name="relay_port">中继端口</string>
+  <string name="listening_port_for_your_tor_relay">Tor 中继的侦听端口</string>
+  <string name="enter_or_port">输入 OR 端口</string>
+  <string name="relay_nickname">中继昵称</string>
+  <string name="the_nickname_for_your_tor_relay">Tor 中继昵称</string>
+  <string name="enter_a_custom_relay_nickname">输入自定义中继昵称</string>
+  <string name="reachable_addresses">可访问地址</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">在具有限制策略防火墙内,作为客户端运行</string>
+  <string name="reachable_ports">可访问端口</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">防火墙限定的可访问端口</string>
+  <string name="enter_ports">输入端口</string>
+  <string name="enable_hidden_services">隐藏服务主机</string>
+  <string name="run_servers_accessible_via_the_tor_network">允许设备上的服务器可通过 Tor 网络访问</string>
+  <string name="enter_localhost_ports_for_hidden_services">输入隐藏服务的本地主机端口</string>
+  <string name="hidden_service_ports">隐藏服务端口</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">隐藏服务的地址(自动生成)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">启用调试日志输出(必须使用 adb 或 aLongCat 查看)</string>
+  <string name="project_home">项目主页(s):</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Tor许可证</string>
+  <string name="the_tor_license">Tor 许可证</string>
   <string name="https_torproject_org">https://torproject.org</string>
-  <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>
+  <string name="third_party_software">第三方软件:</string>
+  <string name="tor_version">Tor v0.2.4.3-alpha:https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.1.1-alpha:http://www.monkey.org/~provos/libevent/</string>
   <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
-  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
-  <string name="default_bridges"/>
-  <string name="powered_by">由 Tor 项目强力驱动</string>
+  <string name="iptables_version">Iptables v1.4.7:http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v0.9.8h:http://www.openssl.org</string>
+  <string name="hidden_service_request">应用程序试图打开隐藏服务主机端口 %S 连接 Tor 网络。对于可信应用这是安全的。</string>
+  <string name="found_existing_tor_process">发现当前已存在 Tor 进程...</string>
+  <string name="something_bad_happened">发生错误,请检查日志</string>
+  <string name="hidden_service_on">隐藏服务位于:</string>
+  <string name="unable_to_read_hidden_service_name">无法读取隐藏服务名称</string>
+  <string name="unable_to_start_tor">无法启动 Tor:</string>
+  <string name="pref_use_sys_iptables_title">使用默认 iptables </string>
+  <string name="pref_use_sys_iptables_summary">使用内置的 iptables 程序替代 Orbot 绑定的 iptables </string>
+  <string name="error_installing_binares">无法安装或更新 Tor 程序。</string>
+  <string name="pref_use_persistent_notifications">Orbot 连接后始终在通知栏显示图标</string>
+  <string name="pref_use_persistent_notifications_title">始终显示通知</string>
+  <string name="notification_using_bridges">已启用网桥!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">区域设置</string>
+  <string name="set_locale_summary">选择 Orbot 的区域设置与语言</string>
+  <string name="wizard_locale_title">选择语言</string>
+  <string name="wizard_locale_msg">保持默认或切换为当前所用语言</string>
+  <string name="powered_by">由 Tor Project 提供技术支持</string>
+  <string name="btn_save_settings">保存设置</string>
 </resources>





More information about the tor-commits mailing list