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

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



commit 2667ffe0c7fb88f7f8a1a9aca5d6d663932f5a20
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Fri Mar 16 09:15:24 2012 +0000

    Update translations for orbot_completed
---
 values-ar/strings.xml    |   22 +++++
 values-de/strings.xml    |   24 +++++-
 values-es/strings.xml    |  225 ++++++++++++++++++++++++++++++++++++++++++++++
 values-fr/strings.xml    |   28 +++++-
 values-it/strings.xml    |   26 +++++-
 values-nl/strings.xml    |   24 +++++-
 values-pt_BR/strings.xml |   22 +++++
 values/strings.xml       |   22 +++++
 8 files changed, 386 insertions(+), 7 deletions(-)

diff --git a/values-ar/strings.xml b/values-ar/strings.xml
index 01a6a12..fd4592a 100644
--- a/values-ar/strings.xml
+++ b/values-ar/strings.xml
@@ -55,6 +55,7 @@
   <string name="btn_finish">Ø¥Ù?Ù?اء</string>
   <string name="btn_okay">Ù?Ù?اÙ?Ù?</string>
   <string name="btn_cancel">Ø¥Ù?غاء</string>
+  <!-- Welcome Wizard strings (DJH) -->
   <string name="wizard_details">بعض اÙ?تÙ?اصÙ?Ù? عÙ? Ø£Ù?ربÙ?ت</string>
   <string name="wizard_details_msg">Ø£Ù?ربÙ?ت Ù?Ù? تطبÙ?Ù? Ù?Ù?تÙ?Ø­ اÙ?Ù?صدر Ù?اÙ?Ø°Ù? Ù?ضÙ? تÙ?ر, LibEvent Ù?Prixovy. Ù?عÙ?Ù? عÙ?Ù? تÙ?Ù?Ù?ر Ù?Ù?Ù?Ù? HTTP Ù?Ø­Ù?Ù? (8118) Ù?Ù?Ù?Ù?Ù? SOCKS (9050) Ø¥Ù?Ù? شبÙ?Ø© تÙ?ر. Ù?تÙ?Ù?ر Ù?دÙ? Ø£Ù?ربÙ?ت اÙ?Ù?درة عÙ?Ù? إرساÙ? جÙ?Ù?ع حرÙ?ات Ù?رÙ?ر اÙ?اÙ?ترÙ?ت Ù?Ù? Ø®Ù?اÙ? تÙ?ر عÙ?Ù? اÙ?جÙ?از ذات Ø­Ù?Ù?Ù? اÙ?Ù?سؤÙ?Ù? (root). </string>
   <string name="wizard_permissions_root">تÙ? Ù?Ù?Ø­ اÙ?إذÙ?</string>
@@ -84,6 +85,7 @@
     </string>
   <string name="wizard_final">Ø£Ù?ربÙ?ت جاÙ?ز!</string>
   <string name="wizard_final_msg">Ù?ئات اÙ?Ø¢Ù?اÙ? Ù?Ù? اÙ?Ù?اس Ù?Ù? جÙ?Ù?ع Ø£Ù?حاء اÙ?عاÙ?Ù? Ù?ستخدÙ?Ù?Ù? تÙ?ر Ù?أسباب عدÙ?دة: اÙ?صحÙ?Ù?Ù?Ù? Ù?اÙ?Ù?دÙ?Ù?Ù?Ù?Ø? Ù?اÙ?عاÙ?Ù?Ù?Ù? Ù?Ù? Ù?جاÙ? Ø­Ù?Ù?Ù? اÙ?Ø¥Ù?ساÙ?Ø? Ù?اÙ?جÙ?Ù?د Ù?اÙ?شرÙ?ات Ù?اÙ?Ù?Ù?اطÙ?Ù?Ù? Ù?Ù? اÙ?Ø£Ù?ظÙ?Ø© اÙ?Ù?Ù?عÙ?Ø©Ø? Ù?اÙ?Ù?Ù?اطÙ?Ù?Ù? اÙ?عادÙ?Ù?Ù? ... Ù?اÙ?Ø¢Ù? Ø£Ù?ت Ù?ستعد Ù?Ø£Ù? تستخدÙ?Ù? Ù?Ø°Ù?Ù?!</string>
+  <!-- END Welcome Wizard strings (DJH) -->
   <string name="connect_first_time"> Ù?Ù?د Ù?Ù?ت بإتصاÙ? Ù?اجح اÙ?Ù? شبÙ?Ø© تÙ?ر - Ù?Ù?Ù? Ù?ذا Ù?ا Ù?عÙ?Ù? بأÙ? جÙ?ازÙ? Ù?Ù? Ù?Ø£Ù?Ù?. Ù?Ù?Ù?Ù?Ù? استخداÙ? Ø®Ù?ار \'تحÙ?Ù?\' Ù?Ù? اÙ?Ù?ائÙ?Ø© Ù?إختبار اÙ?Ù?تصÙ?Ø­ اÙ?خاص بÙ?. 
 
  Ù?Ù? بزÙ?ارتÙ?ا عÙ?Ù? https://guardianproject.info/apps/orbot اÙ? ارسÙ? رساÙ?Ø© اÙ?Ù?ترÙ?Ù?Ù?Ø© اÙ?Ù? help@xxxxxxxxxxxxxxxxxxxx Ù?Ù?عرÙ?Ø© اÙ?Ù?زÙ?د.</string>
@@ -92,18 +94,30 @@
   <string name="pref_general_group">General</string>
   <string name="pref_start_boot_title">Start Orbot on Boot</string>
   <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
+  <!--  New Wizard Strings -->
+  <!-- Title Screen -->
   <string name="wizard_title_msg">Ø£Ù?ربÙ?ت Ù?جÙ?ب Ù?Ù? شبÙ?Ø© تÙ?ر Ù?Ù?Ø£Ù?درÙ?Ù?د! تÙ?ر Ù?ساعدÙ?  Ù?Ù?تغÙ?ب عÙ?Ù? حجب اÙ?Ù?حتÙ?Ù?Ø? Ù?حص اÙ?اتصاÙ?Ø? Ù? اÙ?رÙ?ابة Ù? اÙ?تجسس عÙ?Ù? اÙ?شبÙ?اتØ? Ù? اÙ?تÙ? تÙ?دد اÙ?خصÙ?صÙ?Ø© Ù? اÙ?عÙ?اÙ?ات اÙ?شخصÙ?Ø© Ù? اÙ?Ù?عÙ?Ù?Ù?ات اÙ?سرÙ?Ø©. سÙ?Ù?Ù?Ù? اÙ?Ø¢Ù? بÙ?ساعدتÙ? Ù?ضبط Ø£Ù?ربÙ?ت Ù? تÙ?ر عÙ?Ù? جÙ?ازÙ?.</string>
+  <!-- Warning screen -->
   <string name="wizard_warning_title">تحذÙ?ر</string>
   <string name="wizard_warning_msg">Ù?جرد تÙ?زÙ?Ù? Ø£Ù?ربÙ?ت Ù?Ù? Ù?عطÙ?Ù? اÙ?خصÙ?صÙ?Ø©. Ù?جب عÙ?Ù?Ù? Ø£Ù?ضاÙ? اعداد Ø£Ù?ربÙ?ت Ù? جÙ?ازÙ? Ù? اÙ?براÙ?ج اÙ?Ù?ستÙ?Ù?دة Ù?Ù? تÙ?ر.</string>
+  <!-- Permissions screen -->
   <string name="wizard_permissions_title">اÙ?صÙ?احÙ?ات</string>
   <string name="wizard_permissions_root_msg1">Ù?Ù?Ù?Ù?Ù? اعطاء Ø£Ù?ربÙ?ت صÙ?احÙ?Ø© اÙ?Ù?ستخدÙ? اÙ?سÙ?بر Ù?تشغÙ?Ù? اÙ?Ù?Ù?Ù?زات اÙ?Ù?تÙ?دÙ?Ø© Ù?Ø«Ù? اÙ?برÙ?Ù?سÙ? اÙ?Ø´Ù?اÙ?.</string>
   <string name="wizard_permissions_root_msg2">إذا Ù?Ù?ت ترÙ?د Ø£Ù? تÙ?Ù?Ù? بÙ?ذا Ù?عÙ?Ù?Ù? اÙ?تأÙ?د Ù?Ù? استخداÙ? براÙ?ج Ù?عدة Ù?تشتغÙ? Ù?ع Ø£Ù?ربÙ?ت.</string>
   <string name="wizard_permissions_no_root_msg">Ù?ا Ù?Ù?جد رÙ?ت Ø£Ù? صÙ?احÙ?ات خارÙ?Ø© عÙ?Ù? جÙ?ازÙ?  Ù? Ù?Ø°Ù?Ù? Ù?تستÙ?Ù?د Ù?Ù? Ù?Ù? تÙ?ر عÙ?Ù?Ù? استخداÙ? براÙ?ج صÙ?Ù?ت Ù?تعÙ?Ù? Ù?ع Ø£Ù?ربÙ?ت Ø£Ù? اÙ?تÙ? تدعÙ? برÙ?Ù?سÙ? HTTP Ø£Ù? SOCKS .</string>
+  <!-- TipsAndTricks screen -->
   <string name="wizard_tips_title">براÙ?ج Ù?عدة Ù?تشتغÙ? Ù?ع Ø£Ù?ربÙ?ت</string>
   <string name="wizard_tips_gibberbot">جÙ?بربÙ?ت: Ù?حادثات Ø¢Ù?Ù?Ø© باستخداÙ? اÙ?تشÙ?Ù?ر خارج اÙ?سجÙ?.</string>
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
   <string name="wizard_tips_orweb">ORWEB (Ø£Ù?درÙ?Ù?د 1.x Ù?Ù?Ø·) - Ù?تصÙ?Ø­ Ù?صÙ?Ù?Ù? Ù?Ù?خصÙ?صÙ?Ø© Ù?Ø£Ù?ربÙ?ت </string>
   <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <!-- 
+	<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>
+  -->
+  <!-- Transparent Proxy screen -->
   <string name="wizard_transproxy_title">برÙ?Ù?سÙ? Ø´Ù?اÙ?</string>
   <string name="wizard_transproxy_msg">Ù?Ø°Ù? ستسÙ?Ø­ Ù?Ù?براÙ?ج باÙ?اتصاÙ? بشبÙ?Ø© تÙ?ر تÙ?Ù?ائÙ?اÙ? دÙ?Ù? اعداد Ù?سبÙ?.</string>
   <string name="wizard_transproxy_hint">اختر Ù?ذا اÙ?Ù?ربع اذا Ù?Ù?ت Ù?ا تعÙ?Ù? عÙ?ا Ù?تحدث عÙ?Ù? Ù?Ù?ا</string>
@@ -155,7 +169,9 @@
   <string name="use_only_these_specified_nodes">Ù?Ù?Ø· استخدÙ? Ù?Ø°Ù? اÙ?Ù?Ù?اط اÙ?Ù?حددة</string>
   <string name="bridges">اÙ?جسÙ?ر</string>
   <string name="use_bridges">استخدÙ? اÙ?جسÙ?ر</string>
+  <string name="bridges_obfuscated">اÙ?جسÙ?ر اÙ?Ù?Ø®Ù?Ù?Ø©</string>
   <string name="enable_alternate_entrance_nodes_into_the_tor_network">اسÙ?Ø­ باستخداÙ? Ù?Ù?اط دخÙ?Ù? بدÙ?Ù?Ø© عÙ?Ù? شبÙ?Ø© تÙ?ر</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">تÙ?عÙ?Ù? Ù?ذا اÙ?Ø®Ù?ار اذا Ù?اÙ?ت اÙ?جسÙ?ر Ù?Ø®Ù?Ù?Ø©</string>
   <string name="ip_address_and_port_of_bridges">عÙ?اÙ?Ù?Ù? اÙ?اÙ?ترÙ?ت Ù? Ù?Ù?اÙ?Ø° اÙ?جسÙ?ر</string>
   <string name="enter_bridge_addresses">أدخÙ? عÙ?Ù?اÙ? اÙ?جسر</string>
   <string name="relays">Ù?Ù?اط اÙ?تحÙ?Ù?Ù?</string>
@@ -199,4 +215,10 @@
   <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>
+  <string name="set_locale_title">تغÙ?Ù?ر اÙ?Ù?غة</string>
+  <string name="set_locale_summary">غÙ?ر اÙ?Ù?غة Ù? اÙ?اعدادات اÙ?اÙ?Ù?Ù?Ù?Ù?Ø© Ù?Ø£Ù?ربÙ?ت</string>
+  <string name="wizard_locale_title">اختÙ?ار اÙ?Ù?غة</string>
+  <string name="wizard_locale_msg">اختر اÙ?Ù?غة اÙ?اÙ?تراضÙ?Ø©</string>
 </resources>
diff --git a/values-de/strings.xml b/values-de/strings.xml
index 9b75c7f..39e48ba 100644
--- a/values-de/strings.xml
+++ b/values-de/strings.xml
@@ -55,6 +55,7 @@
   <string name="btn_finish">Fertigstellen</string>
   <string name="btn_okay">OK</string>
   <string name="btn_cancel">Abbrechen</string>
+  <!-- Welcome Wizard strings (DJH) -->
   <string name="wizard_details">Nähere Informationen zu Orbot</string>
   <string name="wizard_details_msg">Orbot ist eine quelloffene Anwendung die Tor, LibEvent und Privoxy enthält. Es stellt einen lokalen HTTP Proxy (8118) und einen SOCKS Proxy (9050) zum Tor-Netzwerk zur Verfügung. Orbot hat auf einem System mit Administrationsrechten auch die Fähigkeit, jeglichen Internetverkehr über das Tor-Netzwerk abzuwickeln.</string>
   <string name="wizard_permissions_root">Berechtigung erteilt</string>
@@ -84,6 +85,7 @@ Erfahren Sie mehr über die Verwendung von Proxys unter Android in den FAQ unter
     </string>
   <string name="wizard_final">Orbot ist bereit!</string>
   <string name="wizard_final_msg">Hunderttausende Menschen auf der ganzen Welt nutzen Tor aus einer Vielzahl von Gründen: Journalisten und Blogger, Menschenrechtsaktivisten, Strafverfolgungsbehörden, Soldaten, Unternehmen, Bürger repressiver Regime und ganz normale Menschen... und jetzt können Sie das auch!</string>
+  <!-- END Welcome Wizard strings (DJH) -->
   <string name="connect_first_time">Sie haben sich erfolgreich mit dem Tor-Netzwerk verbunden - das bedeutet aber NICHT, dass Ihr Gerät sicher ist. Sie können die \'�berprüfen\'-Option aus dem Menü benutzen, um Ihren Browser zu testen. 
 
 Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail an help@xxxxxxxxxxxxxxxxxxxx um mehr darüber zu erfahren.</string>
@@ -92,19 +94,31 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail
   <string name="pref_general_group">Allgemein</string>
   <string name="pref_start_boot_title">Orbot beim Systemstart ausführen</string>
   <string name="pref_start_boot_summary">Automatisches Starten von Orbot und Verbinden von Tor beim Start des Android-Gerätes</string>
+  <!--  New Wizard Strings -->
+  <!-- Title Screen -->
   <string name="wizard_title_msg">Orbot sorgt dafür, dass Sie Tor mit Android nutzen können. Tor schützt vor Filterung von Inhalten, Traffic Analysen und Netzwerk-�berwachung, die Ihre Privatsphäre, vertrauliche Informationen und persönliche Verhältnisse gefährdet. Dieser Assistent wird Ihnen dabei helfen, Orbot und Tor auf Ihrem Gerät zu konfigurieren.</string>
+  <!-- Warning screen -->
   <string name="wizard_warning_title">Warnung</string>
   <string name="wizard_warning_msg">Die reine Installation von Orbot wird Ihren Datenverkehr nicht anonymisieren. Tor muss korrekt konfiguriert sein, damit ihr Gerät Tor erfolgreich verwenden kann.</string>
+  <!-- Permissions screen -->
   <string name="wizard_permissions_title">Rechte</string>
   <string name="wizard_permissions_root_msg1">Sie können Orbot wahlweise \'Administrator\'-Rechte geben, um erweiterte Optionen wie die Nutzung von transparenten Proxys zu ermöglichen.</string>
   <string name="wizard_permissions_root_msg2">Wenn Sie dies nicht möchten, dann verwenden Sie bitte Apps, die mit Orbot zusammen arbeiten können.</string>
   <string name="wizard_permissions_no_root_msg">Ihr Gerät läuft im Standard-Modus und unterstützt keine Administrator-Rechte. In diesem Fall müssen Sie Apps verwenden, die von Haus aus mit Orbot zusammenarbeiten oder die HTTP bzw. SOCKS Proxy Einstellungen ermöglichen.
 </string>
+  <!-- TipsAndTricks screen -->
   <string name="wizard_tips_title">Apps die Orbot unterstützt</string>
   <string name="wizard_tips_gibberbot">Gibberbot: Sichere Chat App mit inoffizieller Verschlüsselung</string>
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
-  <string name="wizard_tips_orweb">ORWEB (Nur Android 1.x) - Ein für Privatsphäre &amp;amp; Orbot entworfener Browser</string>
+  <string name="wizard_tips_orweb">ORWEB (Nur Android 1.x) - Ein für Privatsphäre &amp; Orbot entworfener Browser</string>
   <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <!-- 
+	<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>
+  -->
+  <!-- Transparent Proxy screen -->
   <string name="wizard_transproxy_title">Benutze transparenten Proxy</string>
   <string name="wizard_transproxy_msg">Dies ermöglicht Ihnen Apps, automatisch das Tor Netzwerk zu verwenden ohne dies konfigurieren zu müssen.</string>
   <string name="wizard_transproxy_hint">(Klicken Sie dieses Kästchen an wenn Sie nicht wissen wovon wir reden)</string>
@@ -156,7 +170,9 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail
   <string name="use_only_these_specified_nodes">Benutze *ausschlieÃ?lich* diese angegebenen Nodes</string>
   <string name="bridges">Bridges</string>
   <string name="use_bridges">Benutze Bridges</string>
+  <string name="bridges_obfuscated">Verschleierte Brücken</string>
   <string name="enable_alternate_entrance_nodes_into_the_tor_network">Benutze alternative Eingangs-Nodes in das TOR-Netzwerk</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Aktivieren, falls konfigurierte Brücken verschleierte Brücken sind.</string>
   <string name="ip_address_and_port_of_bridges">IP Adresse und Port der Bridges</string>
   <string name="enter_bridge_addresses">Geben Sie die Bridge_Adressen ein</string>
   <string name="relays">Relays</string>
@@ -200,4 +216,10 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail
   <string name="error_installing_binares">Die Tor-Binarys konnten nicht installiert oder aktualisiert werden.</string>
   <string name="pref_use_persistent_notifications">Behalte das Icon immer in der Benutzerleiste (Toolbar) wenn Orbot verbunden ist.</string>
   <string name="pref_use_persistent_notifications_title">Immer-eingeschaltet Benachrichtigungen</string>
+  <string name="notification_using_bridges">Brücke aktiviert!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Gebietsschema festlegen</string>
+  <string name="set_locale_summary">Gebietsschema und Sprache wählen</string>
+  <string name="wizard_locale_title">Sprache wählen</string>
+  <string name="wizard_locale_msg">Grundeinstellung beibehalten oder Sprache ändern</string>
 </resources>
diff --git a/values-es/strings.xml b/values-es/strings.xml
new file mode 100644
index 0000000..258084f
--- /dev/null
+++ b/values-es/strings.xml
@@ -0,0 +1,225 @@
+<?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">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_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="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_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="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="menu_exit">Salir</string>
+  <string name="powered_by">potenciado por Tor Project</string>
+  <string name="press_to_start">- long press to start -</string>
+  <string name="pref_trans_proxy_group">Proxy transparente (Requiere ser Administrador)</string>
+  <string name="pref_trans_proxy_title">Proxy transparente</string>
+  <string name="pref_trans_proxy_summary">Torificado automático de las Aplicaciones</string>
+  <string name="pref_transparent_all_title">Pasar todo el tráfico por Tor</string>
+  <string name="pref_transparent_all_summary">Tráfico Proxy para todas las aplicaciones mediante Tor</string>
+  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
+  <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
+  <string name="pref_transparent_port_title">Port List</string>
+  <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
+  <string name="pref_transparent_port_dialog">Enter ports to proxy</string>
+  <string name="pref_has_root">Request Root Access</string>
+  <string name="pref_has_root_summary">Request root access for transparent proxying</string>
+  <string name="status_install_success">¡Binarios de Tor instalados con éxito!</string>
+  <string name="status_install_fail">Los archivos binarios de Tor no se han podido instalar. Por favor, verifique el Historial y notifique a: tor-assistants@xxxxxxxxxxxxxx</string>
+  <string name="title_error">Error de aplicación</string>
+  <string name="wizard_title">Bienvenido a Orbot</string>
+  <string name="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_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_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.
+
+
+La configuración del dominio es 127.0.0.1 o \"localhost\". Para HTTP, la configuración del puerto es 8118. Para SOCKS, el proxy es 9050. Puede utilizar SOCKS4A o SOCKS5 si es posible.
+
+
+
+Puede aprender más acerca de los proxys en Android a través de las Preguntas Frecuentes ubicadas en: http://tinyurl.com/proxyandroid
+    </string>
+  <string name="wizard_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>
+  <!-- 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.
+
+Visítenos en https://guardianproject.info/apps/orbot o envíenos un correo electrónico a help@xxxxxxxxxxxxxxxxxxxx para aprender más.</string>
+  <string name="tor_check">Esto abrirá https://check.torproject.org en su navegador predeterminado con el fin de comprobar si Orbot está configurado y si está conectado a Tor.</string>
+  <string name="pref_hs_group">Servicios Ocultados</string>
+  <string name="pref_general_group">General</string>
+  <string name="pref_start_boot_title">Start Orbot on Boot</string>
+  <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
+  <!--  New Wizard Strings -->
+  <!-- Title Screen -->
+  <string name="wizard_title_msg">Orbot activa el acceso a la red Tor, en su Android! \n\nTor le ayuda a defenderse del filtrado de contenido, análisis de tráfico y la vigilancia que amenaza su privacidad, su información confidencial y sus relaciones personales. \n\nEste asistente le ayudará a configurar Orbot y Tor en su dispositivo Android.</string>
+  <!-- Warning screen -->
+  <string name="wizard_warning_title">Advertencia</string>
+  <string name="wizard_warning_msg">Simplemente instalando Orbort, no automatiza de por si, la proteccion anonima del trafico generado por su dispositivo \n\nPara anonimizar su trafico con garantias, debe configurar adecuadamente Orbot, el dispositivo y las aplicaciones que utilize en su conexion.</string>
+  <!-- Permissions screen -->
+  <string name="wizard_permissions_title">Permisos</string>
+  <string name="wizard_permissions_root_msg1">Si lo desea, puede conceder acceso \'superusuario\' a Orbot para habilitar las características avanzadas de configuracion y acceso a la red Tor, tales como los proxys transparentes.</string>
+  <string name="wizard_permissions_root_msg2">Si no desea habilitar esta opcion, por favor asegúrese de utilizar aplicaciones compatibles con Orbot</string>
+  <string name="wizard_permissions_no_root_msg">Su dispositivo se esta ejecutando en modo estándar, y no admite el acceso root o \"superusuario\".\n\nPara que pueda beneficiarse de todo el potencial de Tor, tendrá que utilizar aplicaciones creadas para trabajar con Orbot, o compatibles con la configuracion proxy basada en los protocolos HTTP o SOCKS\n\n</string>
+  <!-- TipsAndTricks screen -->
+  <string name="wizard_tips_title">Aplicaciones habilitadas para utilizar con Orbot</string>
+  <string name="wizard_tips_gibberbot">Gibberbot: Asegure su aplicación de chat con nuestro sistema de cifrado </string>
+  <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
+  <string name="wizard_tips_orweb">ORWEB (Sólo Android 1.x) - Navegador diseñado para la privacidad y para Orbot</string>
+  <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <!-- 
+	<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>
+  -->
+  <!-- Transparent Proxy screen -->
+  <string name="wizard_transproxy_title">conexion proxy transparente activada </string>
+  <string name="wizard_transproxy_msg">Esto permite que sus aplicaciones se ejecuten automáticamente a través de la red Tor sin necesidad de realizar ninguna configuración.</string>
+  <string name="wizard_transproxy_hint">(Si no tiene idea de lo que estamos hablando, marque esta casilla ;o)</string>
+  <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_use_whispercore">Utilizar plataforma de seguridad WhisperCore</string>
+  <string name="pref_use_whispercore_summary">Utilizar las API de NetFilter proporcionada por WhisperSystems (es necesario que su dispositivo tenga WhisperCore instalado)</string>
+  <string name="pref_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="status">Estado</string>
+  <string name="setting_up_full_transparent_proxying_">Configuración completa, aplicando y arrancando el proxy ...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Configurando las aplicaciones que utilizaran el proxy  ...</string>
+  <string name="transparent_proxying_enabled">Servicio Proxy -- HABILITADO Y ACTIVO</string>
+  <string name="transproxy_enabled_for_tethering_">Pasarela proxy habilitado para, los dispositivos conectados, a su dispositivo movil!</string>
+  <string name="warning_error_starting_transparent_proxying_">ADVERTENCIA: vaya .. hemos tenido un error al iniciar el proxy !</string>
+  <string name="transproxy_rules_cleared">Reglas de pasarela proxy, Borradas</string>
+  <string name="couldn_t_start_tor_process_">ADVERTENCIA: No se pudo iniciar el proceso  Tor:</string>
+  <string name="privoxy_is_running_on_port_">Privoxy se está ejecutando en el puerto:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Configuración de puerto proxy  ...</string>
+  <string name="bridge_error">ADVERTENCIA: Error al establecer el Bridge ( dispositivo puente )</string>
+  <string name="bridge_requires_ip">Para utilizar la función Brigde (dispositivo puente), se debe introducir al menos una dirección IP del Bridge.</string>
+  <string name="send_email_for_bridges">Enviar un correo electrónico a bridges@xxxxxxxxxxxxxx desde una cuenta de gmail , con el siguiente texto en el cuerpo del mensaje \"get bridges\" </string>
+  <string name="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="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="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Software de terceras partes</string>
+  <string name="tor_version">Tor v0.2.3.7-alfa: https://www.torproject.org</string>
+  <string name="libevent_version">Libevent v1.4.13: http://www.monkey.org/ ~ provos / libevent /</string>
+  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
+  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
+  <string name="hidden_service_request">Una aplicación esta intentando abrir el siguiente puerto %S a la red Tor. Esto es seguro, si confía en la aplicación, que lo esta intentando abrir.</string>
+  <string name="found_existing_tor_process">Se ha encontrado proceso activo de Tor ...</string>
+  <string name="something_bad_happened">Algo ha ocurrido con el normal funcionamiento de la aplicacion. Compruebe el log de registro del sistema Tor</string>
+  <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="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>
+  <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
+</string>
+  <string name="wizard_locale_msg">Dejar por defecto o cambiar el lenguaje actual</string>
+</resources>
diff --git a/values-fr/strings.xml b/values-fr/strings.xml
index ee3d796..f121914 100644
--- a/values-fr/strings.xml
+++ b/values-fr/strings.xml
@@ -14,7 +14,7 @@
   <string name="tor_process_starting">Lancement du client Tor</string>
   <string name="tor_process_complete">Terminé</string>
   <string name="tor_process_waiting">Attente...</string>
-  <string name="not_anonymous_yet">AVERTISSEMENT: Votre traffic n\'est pas encore anonyme ! Veuillez configurer vos applications pour qu\'elles utilisent le proxy HTTP à 127.0.0.1:8118 ou le proxy SOCKS4A ou SOCKS5 à 127.0.0.1:9050</string>
+  <string name="not_anonymous_yet">AVERTISSEMENT: Votre trafic n\'est pas encore anonyme ! Veuillez configurer vos applications pour qu\'elles utilisent le proxy HTTP à 127.0.0.1:8118 ou le proxy SOCKS4A ou SOCKS5 à 127.0.0.1:9050</string>
   <string name="menu_home">Accueil</string>
   <string name="menu_browse">Parcourir</string>
   <string name="menu_settings">Paramètres</string>
@@ -55,6 +55,7 @@
   <string name="btn_finish">Fin</string>
   <string name="btn_okay">Valider</string>
   <string name="btn_cancel">Annuler</string>
+  <!-- Welcome Wizard strings (DJH) -->
   <string name="wizard_details">Quelques détails sur Orbot</string>
   <string name="wizard_details_msg">Orbot est une application logicielle libre qui contient Tor, LibEvent et Privoxy. Il fournit un proxy local HTTP (8118) et un proxy SOCKS (9050) dans le réseau Tor. Orbot a aussi la capacité, avec les droits administrateurs, d\'envoyer tout le trafic Internet à travers Tor.</string>
   <string name="wizard_permissions_root">Permission accordée</string>
@@ -69,7 +70,7 @@
   <string name="wizard_configure_all">Toutes les applications par Tor</string>
   <string name="wizard_configure_select_apps">Choisir les applications utilisant Tor</string>
   <string name="wizard_tips_tricks">Applications avec Orbot</string>
-  <string name="wizard_tips_msg">Nous vous encouragons à télécharger &amp;amp; utiliser les applications conçues pour se connecter directement à Orbot. Cliquez sur les boutons ci-dessous pour installer.</string>
+  <string name="wizard_tips_msg">Nous vous encouragons à télécharger &amp; utiliser les applications conçues pour se connecter directement à Orbot. Cliquez sur les boutons ci-dessous pour installer.</string>
   <string name="wizard_tips_otrchat">Gibberbot - Client de messagerie instantanée pour Android</string>
   <string name="wizard_tips_proxy">Configuration du proxy - Apprendre comment configurer les applications pour qu\'elles fonctionnent avec Orbot</string>
   <string name="wizard_proxy_help_info">Configuration du proxy</string>
@@ -80,25 +81,38 @@
     </string>
   <string name="wizard_final">Orbot est prêt!</string>
   <string name="wizard_final_msg">Des milliers de personnes dans le monde utilisent Tor pour une grande variétés de raisons : journalistes et bloggers, défenseurs des droits de l\'homme, policiers, soldats, entreprises, les citoyens de régimes répressifs, et aussi de simples citoyens ... et maintenant vous êtes prêts aussi !</string>
+  <!-- END Welcome Wizard strings (DJH) -->
   <string name="connect_first_time"> Vous êtes connectés avec succès au réseau Tor - mais cela ne signifie PAS que votre appareil est sécurisé. Vous pouvez utiliser l\'option \'Vérifier\'  du menu pour vérifier avec votre navigateur. \n\nAllez à la page https://guardianproject.info/apps/orbot ou envoyez un courriel à help@xxxxxxxxxxxxxxxxxxxx pour en savoir plus.</string>
   <string name="tor_check">Ceci va ouvrir la page https://check.torproject.org avec le navigateur web par défaut pour vérifier si Orbot est suffisamment configuré pour vous connecter à Tor.</string>
   <string name="pref_hs_group">Services cachés</string>
   <string name="pref_general_group">Général</string>
   <string name="pref_start_boot_title">Exécuter Orbot automatiquement</string>
   <string name="pref_start_boot_summary">Démarrer automatiquement Orbot et se connecter à Tor quand votre périphérique Android démarre</string>
+  <!--  New Wizard Strings -->
+  <!-- Title Screen -->
   <string name="wizard_title_msg">Orbot, c\'est Tor sur Android !\n\n Tor vous aide à vous protéger du filtrage de contenu, de l\'analyse de trafic et de la surveillance des réseaux qui menacent la vie privée, les informations confidentielles et les relations interpersonnelles.\n\nCe assistant vous aidera à configurer Orbot et Tor sur votre appareil.</string>
+  <!-- Warning screen -->
   <string name="wizard_warning_title">Attention</string>
   <string name="wizard_warning_msg">Installer Orbot ne suffit pas à anonymiser automatiquement le trafic de votre mobile.\n\nVous devez configurer correctement Orbot, votre appareil et d\'autres applications pour utiliser adéquatement Tor.</string>
+  <!-- Permissions screen -->
   <string name="wizard_permissions_title">Permissions</string>
   <string name="wizard_permissions_root_msg1">Vous pouvez aussi, optionnellement donner l\'accès \"Super Utilisateur\" à Orbot pour activer les options avancées, comme le Proxy Transparent</string>
   <string name="wizard_permissions_root_msg2">Si vous ne voulez pas faire ça, merci de vous assurer que les applications que vous utilisez ont été faites pour fonctionner avec Orbot.</string>
   <string name="wizard_permissions_no_root_msg">Votre appareil est en mode standard et ne supporte pas l\'accès root ou «super-utilisateur».\n\nPour bénéficier de Tor, vous avez besoin d\'utiliser des applications conçues pour fonctionner avec Orbot ou permettant de définir un proxy de type HTTP ou SOCKS.\n\n
 </string>
+  <!-- TipsAndTricks screen -->
   <string name="wizard_tips_title">Applications Orbot</string>
   <string name="wizard_tips_gibberbot">Gibberbot: application de clavardage sécurisé avec chiffrement Off-the-Record</string>
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
-  <string name="wizard_tips_orweb">ORWEB (Android 1.x seulement) - navigateur créé pour protéger votre vie privée &amp;amp; pour Orbot</string>
+  <string name="wizard_tips_orweb">ORWEB (Android 1.x seulement) - navigateur créé pour protéger votre vie privée &amp; pour Orbot</string>
   <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
+  <!-- 
+	<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>
+  -->
+  <!-- Transparent Proxy screen -->
   <string name="wizard_transproxy_title">Proxy transparent</string>
   <string name="wizard_transproxy_msg">Cela permet à vos applications d\'utiliser automatiquement le réseau Tor sans aucune configuration.</string>
   <string name="wizard_transproxy_hint">(Cochez cette case si vous n\'avez aucune idée de ce dont nous parlons)</string>
@@ -150,7 +164,9 @@
   <string name="use_only_these_specified_nodes">Utiliser * uniquement * les nÅ?uds spécifiés</string>
   <string name="bridges">Ponts</string>
   <string name="use_bridges">Utiliser des ponts</string>
+  <string name="bridges_obfuscated">Ponts Obscurci</string>
   <string name="enable_alternate_entrance_nodes_into_the_tor_network">Activer des nÅ?uds alternatifs d\'entrée dans le réseau Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Activer si les ponts configurés sont des ponts obscurcies</string>
   <string name="ip_address_and_port_of_bridges">Adresse IP et port des ponts</string>
   <string name="enter_bridge_addresses">Entrez les adresses de passerelle</string>
   <string name="relays">Relais</string>
@@ -194,4 +210,10 @@
   <string name="error_installing_binares">Les fichiers binaires de Tor n\'ont pas pu être installé ou mis à jour.</string>
   <string name="pref_use_persistent_notifications">Toujours conserver l\'icône dans la barre des tâches quand Orbot est connecté.</string>
   <string name="pref_use_persistent_notifications_title">Toujours activé les Notifications</string>
+  <string name="notification_using_bridges">Les ponts sont activés!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Fixer le Lieu</string>
+  <string name="set_locale_summary">Choisir le lieu and la langue pour Orbot</string>
+  <string name="wizard_locale_title">Choisir la langue</string>
+  <string name="wizard_locale_msg">Laisser aux défaut ou changer la langue actuel</string>
 </resources>
diff --git a/values-it/strings.xml b/values-it/strings.xml
index 4e50aa2..23a3dd7 100644
--- a/values-it/strings.xml
+++ b/values-it/strings.xml
@@ -32,7 +32,7 @@
   <string name="menu_verify">Controlla</string>
   <string name="menu_exit">Esci</string>
   <string name="powered_by">powered by the Tor Project</string>
-  <string name="press_to_start">-pressione prolungata per avviare-</string>
+  <string name="press_to_start">- tieni premuto per avviare -</string>
   <string name="pref_trans_proxy_group">Proxying trasparente (Richiede root)</string>
   <string name="pref_trans_proxy_title">Proxying trasparente</string>
   <string name="pref_trans_proxy_summary">Torifying automatico delle app</string>
@@ -55,6 +55,7 @@
   <string name="btn_finish">Fine</string>
   <string name="btn_okay">Ok</string>
   <string name="btn_cancel">Annulla</string>
+  <!-- Welcome Wizard strings (DJH) -->
   <string name="wizard_details">Alcuni dettagli su Orbot</string>
   <string name="wizard_details_msg">Orbot è un\' applicazione open-source che contiene Tor, LibEvent and Privoxy. Fornisce un proxy HTTP locale (8118) e un proxy SOCKS (9050) verso la rete Tor. Orbot ha anche la capacità, su dispositivi con root, di far passare tutto il traffico internet attraverso Tor.</string>
   <string name="wizard_permissions_root">Permesso concesso</string>
@@ -69,7 +70,7 @@
   <string name="wizard_configure_all">Usa Tor come proxy per tutte le applicazioni.</string>
   <string name="wizard_configure_select_apps">Seleziona singole app per Tor</string>
   <string name="wizard_tips_tricks">App abilitate per Orbot</string>
-  <string name="wizard_tips_msg">Ti invitiamo a scaricare &amp;amp; usare app che possono connettersi direttamente a Orbot. Fai click sui pulsanti qui sotto per installare.</string>
+  <string name="wizard_tips_msg">Ti invitiamo a scaricare &amp; usare app che possono connettersi direttamente a Orbot. Fai click sui pulsanti qui sotto per installare.</string>
   <string name="wizard_tips_otrchat">Gibberbot - Client sicuro di instant messaging per Android</string>
   <string name="wizard_tips_proxy">Impostazioni proxy - Ulteriori informazioni su come configurare le app per funzionare con Orbot</string>
   <string name="wizard_proxy_help_info">Impostazioni proxy</string>
@@ -80,6 +81,7 @@ Ulteriori informazioni sul proxying per Android nelle FAQ all\' indirizzo: http:
     </string>
   <string name="wizard_final">Orbot è pronto!</string>
   <string name="wizard_final_msg">Centinaia di migliaia di persone nel mondo usano Tor per una varietà di motivi: giornalisti e bloggers, lavoratori per i diritti umani, ufficiali delle forze dell\'ordine, soldati, aziende, cittadini di paesi repressivi, e anche cittadini qualunque... e ora sei pronto a farlo anche tu!</string>
+  <!-- END Welcome Wizard strings (DJH) -->
   <string name="connect_first_time">Ti sei collegato correttamente alla rete Tor - ma questo NON significa che il dispositivo è sicuro. � possibile utilizzare l\'opzione \'Controlla\' dal menù per testare il browser. \n\n
 Visita il nostro sito web https://guardianproject.info/apps/orbot o invia una mail a help@xxxxxxxxxxxxxxxxxxxx per saperne di più.</string>
   <string name="tor_check">Si aprirà il browser web predefinito per https://check.torproject.org per controllare se Orbot probabilmente è configurato e si è connessi a Tor.</string>
@@ -87,19 +89,31 @@ Visita il nostro sito web https://guardianproject.info/apps/orbot o invia una ma
   <string name="pref_general_group">Generale</string>
   <string name="pref_start_boot_title">Avvia Orbot al boot</string>
   <string name="pref_start_boot_summary">Avvia automaticamente Orbot e connetti Tor quando il dispositivo Android viene avviato</string>
+  <!--  New Wizard Strings -->
+  <!-- Title Screen -->
   <string name="wizard_title_msg">Orbot porta Tor su Android!\n\nTor ti aiuta a difenderti da filtraggio di contenuti, analisi del traffico e sorveglianza della rete che minacciano la privacy, informazioni personali e relazioni personali.\n\nQuesta procedura guidata ti aiuterà a configurare Orbot e Tor sul tuo dispositivo.</string>
+  <!-- Warning screen -->
   <string name="wizard_warning_title">Attenzione</string>
   <string name="wizard_warning_msg">La semplice installazione di Orbot non renderà anonimo il tuo traffico di rete mobile.\n\nDevi configurare correttamente Orbot, il tuo dispositivo e le altre applicazioni per usare Tor.</string>
+  <!-- Permissions screen -->
   <string name="wizard_permissions_title">Permessi</string>
   <string name="wizard_permissions_root_msg1">Opzionalmente, è possibile concedere ad Orbot l\'accesso da superutente per abilitare funzionalità avanzate come il proxying trasparente.</string>
   <string name="wizard_permissions_root_msg2">Se non si vuole intraprendere questa scelta, ci si assicuri di utilizzare applicazioni fatte per funzionare con Orbot</string>
   <string name="wizard_permissions_no_root_msg">Il vostro dispositivo non sembra essere rooted o fornire accesso da superutente.\n\nAl fine di beneficiare dell\'uso di Tor, sarà necessario utilizzare applicazioni costruite per funzionare con Orbot, o che supportino configurazioni proxy HTTP o SOCKS.\n\n
 </string>
+  <!-- TipsAndTricks screen -->
   <string name="wizard_tips_title">Orbot-App abilitate</string>
   <string name="wizard_tips_gibberbot">Gibberbot: un applicazione per chat sicura con crittografia Off-the-Record</string>
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
   <string name="wizard_tips_orweb">ORWEB (Solo Android 1.x) - Browser progettato per la privacy e Orbot</string>
   <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <!-- 
+	<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>
+  -->
+  <!-- Transparent Proxy screen -->
   <string name="wizard_transproxy_title">Proxying trasparente</string>
   <string name="wizard_transproxy_msg">Questo permette alle tue applicazioni di passare automaticamente attraverso la rete Tor senza necessità di ulteriore configurazione.</string>
   <string name="wizard_transproxy_hint">(Seleziona questa casella se non hai idea di quello di cui stiamo parlando)</string>
@@ -151,7 +165,9 @@ Visita il nostro sito web https://guardianproject.info/apps/orbot o invia una ma
   <string name="use_only_these_specified_nodes">Utilizza *solo* i nodi specificati</string>
   <string name="bridges">Ponti</string>
   <string name="use_bridges">Utilizza i bridge</string>
+  <string name="bridges_obfuscated">Bridge mascherati</string>
   <string name="enable_alternate_entrance_nodes_into_the_tor_network">Abilita nodi alternati in entrata nella rete Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Attiva se i Bridge configurati sono mascherati</string>
   <string name="ip_address_and_port_of_bridges">Indirizzo IP e porta dei bridge</string>
   <string name="enter_bridge_addresses">Inserire gli indirizzi dei bridge</string>
   <string name="relays">Relays</string>
@@ -195,4 +211,10 @@ Visita il nostro sito web https://guardianproject.info/apps/orbot o invia una ma
   <string name="error_installing_binares">Non è stato possibile installare o aggiornare i binari di Tor.</string>
   <string name="pref_use_persistent_notifications">Mantieni sempre l\'icona nella barra degli strumenti quando Orbot è connesso.</string>
   <string name="pref_use_persistent_notifications_title">Notifiche sempre attive</string>
+  <string name="notification_using_bridges">Bridge attivati!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Configura le impostazioni internazionali.</string>
+  <string name="set_locale_summary">Scegli le impostazioni internazionali e la lingua di Orbot</string>
+  <string name="wizard_locale_title">Scegli Lingua</string>
+  <string name="wizard_locale_msg">Lasciare la predefinita o cambiare la lingua corrente</string>
 </resources>
diff --git a/values-nl/strings.xml b/values-nl/strings.xml
index 9daf30a..bce8f07 100644
--- a/values-nl/strings.xml
+++ b/values-nl/strings.xml
@@ -55,6 +55,7 @@
   <string name="btn_finish">Einde</string>
   <string name="btn_okay">OK</string>
   <string name="btn_cancel">Annuleren</string>
+  <!-- Welcome Wizard strings (DJH) -->
   <string name="wizard_details">Enkele Orbot Details</string>
   <string name="wizard_details_msg">Orbot is een open-source applicatie die Tor, LibEvent en Privoxy bevat. Het creëert een lokale HTTP proxy (8118) en een SOCKS proxy (9050) naar het Tor netwerk. Orbot heeft ook de mogelijkheid om al het internet verkeer over het Tor netwerk te sturen.</string>
   <string name="wizard_permissions_root">Rechten toegewezen</string>
@@ -83,6 +84,7 @@ Je kunt meer leren over het proxy-en op Android door naar de FAQ op http://tinyu
     </string>
   <string name="wizard_final">Orbot is klaar!</string>
   <string name="wizard_final_msg">Honderdduizenden verschillende mensen over de wereld gebruiken Tor, voor verschillende redenen. Zoals: journalisten, bloggers, mensen rechten medewerkers, soldaten, bedrijven, burgers met onderdrukte religies, en natuurlijk normale mensen... En nu ben jij er ook klaar voor!</string>
+  <!-- END Welcome Wizard strings (DJH) -->
   <string name="connect_first_time">Je bent succesvol verbonden met het Tor netwerk, maar dit betekent NIET dat je apparaat volledig veilig is. Gebruik te \'Check\' optie vanuit het menu om je browser te testen.
 
 Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een email naar help@xxxxxxxxxxxxxxxxxxxx voor vragen.</string>
@@ -91,19 +93,31 @@ Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een emai
   <string name="pref_general_group">Algemeen</string>
   <string name="pref_start_boot_title">Start Orbot bij boot</string>
   <string name="pref_start_boot_summary">Start Orbot automatisch en verbind metTor wanneer je Android apparaat opstart.</string>
+  <!--  New Wizard Strings -->
+  <!-- Title Screen -->
   <string name="wizard_title_msg">Orbot brengt Tor naar Android!\n\nTor helpt je verdedigen tegen filtering, verkeersanalyse en netwerktoezicht dat privacy, vertrouwelijke informatie en persoonlijke relaties bedreigt.\n\n Deze wizard helpt je met configureren van Orbot en Tor op jouw apparaat.</string>
+  <!-- Warning screen -->
   <string name="wizard_warning_title">Waarschuwing</string>
   <string name="wizard_warning_msg">Alleen Orbot installeren zal niet automatisch alle je mobiele verkeer anonimiseren.\n\nJe moet Orbot, je apparaat en andere apps juist instellen om succesvol Tor te gebruiken.</string>
+  <!-- Permissions screen -->
   <string name="wizard_permissions_title">Rechten</string>
   <string name="wizard_permissions_root_msg1">Je kan optioneeel Orbot \'superuser\' toegang geven om geavanceerde functies beschikbaar te stellen, zoals Tranparante Proxy.</string>
   <string name="wizard_permissions_root_msg2">Als je dit niet wilt doen, zorg er dan voor dat je apps gebruikt die gemaakt zijn om te werken met Orbot</string>
   <string name="wizard_permissions_no_root_msg">Je apparaat draait in standaard modus en ondersteunt geen root of \'superuser\' toegang.\n\nOm voordeel te hebben van Tor moet je gebruik maken van apps die gemaakt zijn om te werken met Tor, of die HTTP of SOCKS proxy instellingen ondersteunen.\n\n
 </string>
+  <!-- TipsAndTricks screen -->
   <string name="wizard_tips_title">Orbot geschikte Apps</string>
   <string name="wizard_tips_gibberbot">Gibberbot: Veilige chat app met Off-the-Record encryptie</string>
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
-  <string name="wizard_tips_orweb">ORWEB (Alleen Android 1.x) - Browser gemaakt voor privacy &amp;amp; voor Orbot</string>
+  <string name="wizard_tips_orweb">ORWEB (Alleen Android 1.x) - Browser gemaakt voor privacy &amp; voor Orbot</string>
   <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string>
+  <!-- 
+	<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>
+  -->
+  <!-- Transparent Proxy screen -->
   <string name="wizard_transproxy_title">Tranparante Proxy</string>
   <string name="wizard_transproxy_msg">Dit maakt het mogelijk voor jouw apps om automatisch via het Tor netwerk te draaien zonder enige configuratie.</string>
   <string name="wizard_transproxy_hint">(Vink dit aan al je geen idee hebt waar we het over hebben)</string>
@@ -155,7 +169,9 @@ Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een emai
   <string name="use_only_these_specified_nodes">Gebruik *alleen* deze nodes</string>
   <string name="bridges">Bridges</string>
   <string name="use_bridges">Gebruik bridges</string>
+  <string name="bridges_obfuscated">Versluierde bridges</string>
   <string name="enable_alternate_entrance_nodes_into_the_tor_network">Gebruik alternatieve toegangsnodes naar het Tor Netwerk</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Schakel in als de geconfigureerde bridges versluierde bridges zijn</string>
   <string name="ip_address_and_port_of_bridges">IP-adres en poort van bridges</string>
   <string name="enter_bridge_addresses">Voer bridge adres in</string>
   <string name="relays">Relays</string>
@@ -199,4 +215,10 @@ Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een emai
   <string name="error_installing_binares">De Tor binaries konden niet worden geïnstalleerd of geüpgraded.</string>
   <string name="pref_use_persistent_notifications">Houd icoon in toolbar zolang Orbot verbonden is</string>
   <string name="pref_use_persistent_notifications_title">Meldingen altijd aan</string>
+  <string name="notification_using_bridges">Bridges ingeschakeld!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Stel landsinstellingen in</string>
+  <string name="set_locale_summary">Kies de landsinstellingen en taal voor Orbot</string>
+  <string name="wizard_locale_title">Kies taal</string>
+  <string name="wizard_locale_msg">Laat standaard of schakel over naar huidige taal</string>
 </resources>
diff --git a/values-pt_BR/strings.xml b/values-pt_BR/strings.xml
index 42c6c8c..0bfad06 100644
--- a/values-pt_BR/strings.xml
+++ b/values-pt_BR/strings.xml
@@ -55,6 +55,7 @@
   <string name="btn_finish">Terminar</string>
   <string name="btn_okay">Okay</string>
   <string name="btn_cancel">Cancelar</string>
+  <!-- Welcome Wizard strings (DJH) -->
   <string name="wizard_details">Alguns detalher do Orbot</string>
   <string name="wizard_details_msg">Orbot é uma aplicação de código aberto que contém o Tor, LibEvent e Privoxy. Ela provê um proxy HTTP local (8118) e um proxy SOCKS (9050) dentro da rede Tor. Orbot também tem a habilidade, num dispositivo roteado, enviar todo o tráfego da Internet através do Tor</string>
   <string name="wizard_permissions_root">Permissão Concedida</string>
@@ -80,26 +81,39 @@
     </string>
   <string name="wizard_final">Orbot está pronto!</string>
   <string name="wizard_final_msg">Centenas de milhares de pessoas ao redor do mundo usam o Tor por uma enorme variedade de razões.\n\nJornalistas e bloggers, defensores dos direitos humanos, oficiais da lei, soldados, corporações, cidadãos em regimes repressivos, e somente cidadãos comuns... e agora você está pronto para usar, também! </string>
+  <!-- END Welcome Wizard strings (DJH) -->
   <string name="connect_first_time">Você se conectou à rede Tor com sucesso - mas isto N�O significa que seu dispositivo é seguro. Você pode usar a opção \'Checar\' no menu para testar seu navegador.\n\nVisite-nos em https://guardianproject.info/apps/orbot ou envie um e-mail para help@xxxxxxxxxxxxxxxxxxxx para saber mais.</string>
   <string name="tor_check">Isto irá abrir seu navegador web em https://check.torproject.org com o intuito de ver se o Orbot está provavelmente configurado e você está conectado ao Tor.</string>
   <string name="pref_hs_group">Serviços Ocultos</string>
   <string name="pref_general_group">Geral</string>
   <string name="pref_start_boot_title">Iniciar Orbot no Boot</string>
   <string name="pref_start_boot_summary">Automaticamente iniciar o Orbot e conectar o Tor quando seu Android bootar.</string>
+  <!--  New Wizard Strings -->
+  <!-- Title Screen -->
   <string name="wizard_title_msg">Orbot trouxe Tor para Android!!\n\nTor ajuda você a se defender contra filtro de conteúdo, análises de tráfego e vigilância de rede que ameaçam sua privacidade, informação confidencial e relacionamentos pessoais.\n\nEste assistente irá ajudá-lo a configurar o Orbot e Tor no seu dispositivo.</string>
+  <!-- Warning screen -->
   <string name="wizard_warning_title">Aviso</string>
   <string name="wizard_warning_msg">Simplesmente instalando o Orbot não irá automaticamente anonimizar seu tráfego móvel.\n\nVocê deve configurar apropriadamente o Orbot, seu dispositivo e outras apps para usar o Tor com sucesso.</string>
+  <!-- Permissions screen -->
   <string name="wizard_permissions_title">Permissões</string>
   <string name="wizard_permissions_root_msg1">Você pode opcionalmente garantir ao Orbot acesso de \'Superusuário\' para habilitar recursos avançados, como um proxy transparente.</string>
   <string name="wizard_permissions_root_msg2">Se você não quiser fazer isto, tenha certeza de usar apps feitas para trabalhar com o Orbot.</string>
   <string name="wizard_permissions_no_root_msg">Seu dispositivo não parece ser roteado ou prover um acesso \'Superusuário\'.\n\nDe maneira a você se beneficiar do Tor, você precisará usar apps criadas para trabalhar com o Orbot, ou que suportem configurações de proxy HTTP ou SOCKS.
 
 </string>
+  <!-- TipsAndTricks screen -->
   <string name="wizard_tips_title">Apps Orbot Habilitadas</string>
   <string name="wizard_tips_gibberbot">Gibberbot: App segura para chat com encriptação sem gravação </string>
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
   <string name="wizard_tips_orweb">Orweb: Navegador de reforço de privacidade que trabalha através do Tor</string>
   <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
+  <!-- 
+	<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>
+  -->
+  <!-- Transparent Proxy screen -->
   <string name="wizard_transproxy_title">Proxy Transparente</string>
   <string name="wizard_transproxy_msg">Isto permite à suas apps automaticamente rodarem através da rede Tor sem nenhuma configuração.</string>
   <string name="wizard_transproxy_hint">(Selecione esta caixa se você não souber do que estamos falando)</string>
@@ -151,7 +165,9 @@
   <string name="use_only_these_specified_nodes">Use *somente* estes nós específicos</string>
   <string name="bridges">Pontes</string>
   <string name="use_bridges">Usar pontes</string>
+  <string name="bridges_obfuscated">Pontes Ofuscadas</string>
   <string name="enable_alternate_entrance_nodes_into_the_tor_network">Habilitar nós de entrada alternativos dentro da rede Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Habilitar se pontes configuradas forem pontes ofuscadas</string>
   <string name="ip_address_and_port_of_bridges">Endereço IP e porta das pontes</string>
   <string name="enter_bridge_addresses">Insira os Endereços das Pontes</string>
   <string name="relays">Retransmissores</string>
@@ -195,4 +211,10 @@
   <string name="error_installing_binares">Os binários Tor não estão disponíveis para serem instalados ou atualizados.</string>
   <string name="pref_use_persistent_notifications">Sempre manter o ícone na barra de tarefas quando o Orbot está conectado</string>
   <string name="pref_use_persistent_notifications_title">Notificações Sempre Ligadas</string>
+  <string name="notification_using_bridges">Pontes habilitadas!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Selecionar Local</string>
+  <string name="set_locale_summary">Escolha o local e idioma para o Orbot</string>
+  <string name="wizard_locale_title">Escolha o Idioma</string>
+  <string name="wizard_locale_msg">Deixe o padrão ou troque o idioma atual</string>
 </resources>
diff --git a/values/strings.xml b/values/strings.xml
index 144db09..590f4a2 100644
--- a/values/strings.xml
+++ b/values/strings.xml
@@ -55,6 +55,7 @@
   <string name="btn_finish">Finish</string>
   <string name="btn_okay">Okay</string>
   <string name="btn_cancel">Cancel</string>
+  <!-- Welcome Wizard strings (DJH) -->
   <string name="wizard_details">Some Orbot Details</string>
   <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, LibEvent and Privoxy. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string>
   <string name="wizard_permissions_root">Permission Granted</string>
@@ -80,24 +81,37 @@
     </string>
   <string name="wizard_final">Orbot is ready!</string>
   <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string>
+  <!-- END Welcome Wizard strings (DJH) -->
   <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help@xxxxxxxxxxxxxxxxxxxx to learn more.</string>
   <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string>
   <string name="pref_hs_group">Hidden Services</string>
   <string name="pref_general_group">General</string>
   <string name="pref_start_boot_title">Start Orbot on Boot</string>
   <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
+  <!--  New Wizard Strings -->
+  <!-- Title Screen -->
   <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>
+  <!-- Warning screen -->
   <string name="wizard_warning_title">Warning</string>
   <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>
+  <!-- Permissions screen -->
   <string name="wizard_permissions_title">Permissions</string>
   <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string>
   <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string>
   <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>
+  <!-- TipsAndTricks screen -->
   <string name="wizard_tips_title">Orbot-Enabled Apps</string>
   <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string>
   <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
   <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string>
   <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
+  <!-- 
+	<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>
+  -->
+  <!-- Transparent Proxy screen -->
   <string name="wizard_transproxy_title">Transparent Proxying</string>
   <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string>
   <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string>
@@ -149,7 +163,9 @@
   <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>
@@ -193,4 +209,10 @@
   <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string>
   <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string>
   <string name="pref_use_persistent_notifications_title">Always-On Notifications</string>
+  <string name="notification_using_bridges">Bridges enabled!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Set Locale</string>
+  <string name="set_locale_summary">Choose the locale and language for Orbot</string>
+  <string name="wizard_locale_title">Choose Language</string>
+  <string name="wizard_locale_msg">Leave default or switch the current language</string>
 </resources>

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