From cb473fac65386dd41bbdece1bd09e83d8bec475b Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sat, 5 Feb 2022 12:12:16 +0100
Subject: update translations

---
 app/src/main/res/values-ar/strings.xml     | 65 ++++++++++++++++++++----------
 app/src/main/res/values-az/strings.xml     |  3 +-
 app/src/main/res/values-bn/strings.xml     |  4 +-
 app/src/main/res/values-br/strings.xml     |  2 +-
 app/src/main/res/values-ca/strings.xml     |  4 +-
 app/src/main/res/values-cs/strings.xml     |  3 ++
 app/src/main/res/values-de/strings.xml     | 25 +++++++-----
 app/src/main/res/values-el/strings.xml     | 23 ++++++-----
 app/src/main/res/values-es-rAR/strings.xml | 21 ++++++----
 app/src/main/res/values-es/strings.xml     | 25 +++++++-----
 app/src/main/res/values-et/strings.xml     |  3 +-
 app/src/main/res/values-eu/strings.xml     |  3 +-
 app/src/main/res/values-fa-rIR/strings.xml | 54 ++++++++++++++++++++++++-
 app/src/main/res/values-fi/strings.xml     |  4 ++
 app/src/main/res/values-fr/strings.xml     | 17 +++++---
 app/src/main/res/values-gl/strings.xml     |  3 +-
 app/src/main/res/values-he/strings.xml     |  4 +-
 app/src/main/res/values-hr/strings.xml     |  2 +
 app/src/main/res/values-hu/strings.xml     | 12 +-----
 app/src/main/res/values-id/strings.xml     |  4 ++
 app/src/main/res/values-it/strings.xml     |  3 ++
 app/src/main/res/values-ja/strings.xml     | 22 +++++++++-
 app/src/main/res/values-my/strings.xml     |  4 +-
 app/src/main/res/values-nl/strings.xml     | 15 ++++---
 app/src/main/res/values-no/strings.xml     |  3 +-
 app/src/main/res/values-pl/strings.xml     |  5 ++-
 app/src/main/res/values-pt-rBR/strings.xml |  4 +-
 app/src/main/res/values-pt-rPT/strings.xml |  4 +-
 app/src/main/res/values-ro/strings.xml     |  3 ++
 app/src/main/res/values-ru/strings.xml     | 39 ++++++++++--------
 app/src/main/res/values-tr/strings.xml     | 21 ++++++----
 app/src/main/res/values-ug/strings.xml     |  2 +-
 app/src/main/res/values-vi/strings.xml     | 46 ++++++++++++++++++++-
 app/src/main/res/values-zh-rCN/strings.xml |  3 ++
 34 files changed, 334 insertions(+), 121 deletions(-)

(limited to 'app')

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 2e113a48..f12a0a74 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -1,12 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="retry">حاول مجددا</string>
-  <string name="repository_url_text">الكود المصدري متوفر على https://0xacab.org/leap/bitmask_android</string>
-  <string name="leap_tracker">متتبع المشاكل متوفر هنا https://0xacab.org/leap/bitmask_android/issues</string>
-  <string name="translation_project_text">الترجمات مرحب بها جدا. اطلع على مشروع الترجمة الخاص بنا هنا https://www.transifex.com/projects/p/bitmask-android/</string>
+  <string name="retry">حاول مجدداً</string>
+  <string name="repository_url_text">كود المصدر متواجد هنا  https://0xacab.org/leap/bitmask_android</string>
+  <string name="leap_tracker">متتبع الأعطال متوافر هنا https://0xacab.org/leap/bitmask_android/issues</string>
+  <string name="translation_project_text">يمكنك الترجمة؟ اطلع على مشروع الترجمة الخاص بنا عبر هذا الرابط https://www.transifex.com/projects/p/bitmask-android/</string>
   <string name="switch_provider_menu_option">بدّل مزود الخدمة</string>
   <string name="info">معلومات</string>
   <string name="show_connection_details">عرض تفاصيل الاتصال</string>
+  <string name="connection_details">تفاصيل الاتصال</string>
   <string name="routes_info">المسارات: %s</string>
   <string name="routes_info6">مسارات IPv6: %s</string>
   <string name="error_empty_username">اسم المستخدم ينبغي أن لا يكون فارغا.</string>
@@ -87,11 +88,11 @@
   <string name="action_example">مثال لإجراء</string>
   <string name="action_settings">الإعدادات</string>
   <string name="void_vpn_establish">%s يحجب جميع اتصالات الإنترنت الخارجة.</string>
-  <string name="void_vpn_error_establish">فشل تفعيل VPN حاجب.</string>
+  <string name="void_vpn_error_establish">فشل حجب جميع اتصالات الانترنت</string>
   <string name="void_vpn_stopped">تم إيقاف حجب الاتصالات الخارجة.</string>
   <string name="void_vpn_title">جاري حجب الاتصالات</string>
-  <string name="update_provider_details">حدث تفاصيل المزود</string>
-  <string name="update_certificate">حدث الشهادة</string>
+  <string name="update_provider_details">قم بتحديث تفاصيل المزود</string>
+  <string name="update_certificate">قم بتحديث الشهادة</string>
   <string name="warning_eip_json_corrupted">فشل تحديث ضبط مزود الخدمة.</string>
   <string name="eip_json_corrupted_user_message">فشل تحديث ضبط مزود الخدمة. سجل دخول وأعد المحاولة.</string>
   <string name="warning_client_parsing_error_gateways">لا يمكن التعرف على بوابة مزود الخدمة. من المحتمل أنها مضبوطة بطريقة خاطئة.</string>
@@ -102,7 +103,7 @@
   <string name="vpn_certificate_is_invalid">شهادة VPN غير صالحة. حاول تحميل أخرى جديدة.</string>
   <string name="vpn_certificate_user_message">شهادة VPN غير صالحة. سجل دخول لتحميل أخرى جديدة.</string>
   <string name="save_battery">وفّر البطارية</string>
-  <string name="subtitle_save_battery">إلغاء التفعيل في حالة استخدام نقطة اتصال شبكة خاصة افتراضية VPN</string>
+  <string name="subtitle_save_battery">معطل في حالة استخدام نقطة اتصال VPN</string>
   <string name="save_battery_message">اتصالات البيانات في الخلفية ستتوقف حين يكون هاتفك غير نشط.</string>
   <string name="always_on_vpn">‏شبكة افتراضية خاصة (VPN) دائمة التشغيل</string>
   <string name="subtitle_always_on_vpn">افتح إعدادات نظام الأندرويد</string>
@@ -110,16 +111,17 @@
   <string name="ipv6Firewall">حظر الإصدار السادس من عناوين الإنترنت IPv6</string>
   <string name="require_root">يتطلب صلاحية الجذر (الروت)</string>
   <string name="show_experimental">عرض مزايا تجريبية</string>
-  <string name="hide_experimental">إخفاء المزايا التجريبية</string>
+  <string name="hide_experimental">إخفاء الخصائص التجريبية</string>
+  <string name="experimental_features">خصائص تجريبية</string>
   <string name="tethering_enabled_message">يُرجى التأكد من تفعيل خيار الربط من <![CDATA[1<b> إعدادات النظام أولا </b>]]> أولا.</string>
   <string name="tethering_message">مشاركة اتصال الـ VPN الخاص بك مع الآخرين عبر:</string>
   <string name="tethering_wifi">نقطة اتصال واي فاي</string>
-  <string name="tethering_usb">اتصال عبر الناقل التسلسلي العام USB</string>
+  <string name="tethering_usb">اتصال USB</string>
   <string name="tethering_bluetooth">اتصال بلوتوث</string>
-  <string name="do_not_show_again">‮لا تظهر مجددا</string>
+  <string name="do_not_show_again">‮لا تظهر مجدداً</string>
   <string name="always_on_vpn_user_message">لتفعيل الاتصال الدائم بالشبكة الافتراضية الخاصة في إعدادات آندرويد لل VPN، يجب النقر على أيقونة الضبط [img src] ومن ثمّ تشغيل \"شبكة ظاهريّة خاصّة (VPN) دائمة التشغيل\".</string>
   <string name="always_on_blocking_vpn_user_message">لحماية خصوصيتكم على نحو أمثل ، يجب عليكم أيضا تفعيل خيار \"منع الاتصالات بدون الشبكة الافتراضية الخاصة\".</string>
-  <string name="donate_title">ادعم</string>
+  <string name="donate_title">تبرّع</string>
   <string name="donate_default_message">فضلا تبرع اليوم إذا كنت تُقدّر الاتصال الآمن المتوفر بسهولة سواءا للمستخدم النهائي ولمزود الخدمة.</string>
   <string name="donate_message">LEAP تعتمد على التبرعات والمنح. فضلا تبرع اليوم إذا كنت تقدر الاتصال الآمن المتوفر بسهولة للمستخدم النهائي ومزود الخدمة.</string>
   <string name="donate_button_remind_later">ذكرني لاحقا</string>
@@ -128,7 +130,7 @@
   <string name="obfuscated_connection_try">جارى محاولة استخدام اتصال مموه.</string>
   <string name="nav_drawer_obfuscated_connection">استخدم الجسور</string>
   <string name="nav_drawer_subtitle_obfuscated_connection">تخطى تصفية VPN</string>
-  <string name="warning_exclude_apps_message">خذ حذرك و أنت تستثنى البرامج من VPN. هذا سيكشف هويتك و سيأخذ من تأمينك.</string>
+  <string name="warning_exclude_apps_message">إحذر استثناء التطبيقات من الشبكة الافتراضية الخاصة (VPN). هذا سيكشف هويتك ويعرضك للخطر.</string>
   <plurals name="subtitle_exclude_apps">
     <item quantity="zero">%d لا يوجد تطبيقات غير محمية</item>
     <item quantity="one">%d تطبيق واحد غير محمي</item>
@@ -138,13 +140,14 @@
     <item quantity="other">%d تطبيق غير محمي</item>
   </plurals>
   <string name="warning_no_more_gateways_use_pt">%s لا يمكنه الاتصال. من المحتمل ان اتصالات ال VPN محجوبة. هل تريد أن تحاول الاتصال ياستخدام الاتصالات المموهة؟</string>
-  <string name="warning_no_more_gateways_no_pt">%s لا يمكنه الاتصال. هل تريد اعادة المحاولة؟</string>
+  <string name="warning_no_more_gateways_no_pt">%s لم نتمكن من الاتصال. هل تريد إعادة المحاولة؟</string>
   <string name="warning_no_more_gateways_use_ovpn">%s لا يمكنه الاتصال ياستخدام اتصالات VPN مموهة. هل تريد أن تحاول الاتصال باستخدام VPN عادية؟</string>
-  <string name="warning_option_try_pt">حاول باتصال مموه</string>
-  <string name="warning_option_try_ovpn">حاول باتصال عادي</string>
-  <string name="vpn_error_establish">فشل أندرويد في تأسيس خدمة ال VPN. </string>
+  <string name="warning_option_try_best">جرّب الموقع الجغرافي الأفضل</string>
+  <string name="warning_option_try_pt">جرّب الاتصال المموه</string>
+  <string name="warning_option_try_ovpn">جرّب الاتصال العادي</string>
+  <string name="vpn_error_establish">فشل نظام أندرويد في تأسيس خدمة الشبكة الافتراضية الخاصة (VPN). </string>
   <string name="root_permission_error">%s لا يمكن عمل مميزات مثل نقطة اتصال لشبكة خاصة افتراضية VPN أو جدار ناري للإصدار السادس من عنوان الإنترنت IPv6 بدون صلاحية الجذر (الروت).</string>
-  <string name="qs_enable_vpn">بدأ %s</string>
+  <string name="qs_enable_vpn">إبدأ%s</string>
   <string name="version_update_found">انقر هنا لبدء التحميل.</string>
   <string name="version_update_title">تم اكتشاف %s نسخة جديدة.</string>
   <string name="version_update_apk_description">تحميل %s نسخة جديدة.</string>
@@ -153,11 +156,31 @@
   <string name="version_update_error_pgp_verification">خطأ في التحقق من صحة التوقيع. تجاهل التحميل.</string>
   <string name="version_update_error">فشل التحديث.</string>
   <string name="version_update_error_permissions">لاتوجد صلاحيات لتثبيت التطبيق.</string>
-  <string name="gateway_selection_automatic">أوتوماتيكي</string>
+  <string name="gateway_selection_title">اختار الموقع</string>
+  <string name="gateway_selection_recommended_location">الموقع المقترح</string>
+  <string name="gateway_selection_recommended">مقترح</string>
+  <string name="gateway_selection_manually">اختار يدوياً</string>
+  <string name="gateway_selection_automatic_location">اختار الاتصال الأفضل تلقائياً</string>
+  <string name="gateway_selection_automatic">تلقائي</string>
+  <string name="reconnecting">إعادة الاتصال...</string>
+  <string name="tor_stopping">إيقاف الجسور</string>
   <string name="log_onehop_create">ينشئ اتصالا مشفرا بالدليل</string>
-  <string name="log_circuit_create">ينشئ دائرة تور</string>
+  <string name="log_loading_keys">يحمل شهادات السلطة</string>
+  <string name="log_circuit_create">ينشئ دائرة Tor</string>
   <string name="log_done">يعمل</string>
+  <string name="channel_name_tor_service">خدمة الجسور%s</string>
   <string name="hide">إخفاء</string>
   <string name="use_snowflake">استخدم Snowflake</string>
-  <string name="vpn_settings">إعدادات الشبكة الخاصة الافتراضية</string>
+  <string name="vpn_settings">إعدادات الشبكة الخاصة الافتراضية (VPN)</string>
+  <string name="prefer_udp">استخدم UDP إن كان متواجداً</string>
+  <string name="disabled_while_bridges_on">معطّل أثناء استخدام الجسور</string>
+  <string name="hint_bridges">فقط المواقع التي تدعم الجسور متاحة للاختيار</string>
+  <string name="option_disable_bridges">عطّل الجسور</string>
+  <string name="eip_state_insecure">الاتصال غير آمن</string>
+  <string name="connection_not_connected">من الممكن أن معلوماتك تتسرب لشركة الاتصالات أو الشبكة المحلية </string>
+  <string name="eip_state_no_network">لا يوجد إنترنت. عندما يتوفر الإنترنت، ستتصل تلقائياً إلى</string>
+  <string name="eip_state_blocking">%1$s يقوم بحجب الاتصال</string>
+  <string name="disabled_while_udp_on">معطّل في حال تشغيل UDP</string>
+  <string name="advanced_settings">إعدادات متقدمة</string>
+  <string name="cancel_connection">قطع الإتصال</string>
 </resources>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index 1f72a84f..450bdc18 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -87,7 +87,6 @@
   <string name="action_example">Fəaliyyət nümunəsi</string>
   <string name="action_settings">Tənzimləmələr</string>
   <string name="void_vpn_establish">%s bütün gedən internet trafikini blok etdirir.</string>
-  <string name="void_vpn_error_establish">VPN kilidini qura bilmədi.</string>
   <string name="void_vpn_stopped">Bütün gedən internet trafikini dayandırıldı. </string>
   <string name="void_vpn_title">Trafik kilidi</string>
   <string name="update_provider_details">Provayder məlumatlarının yenilənməsi</string>
@@ -130,7 +129,9 @@
   <string name="vpn_error_establish">Android VPN xidmətini qura bilmədi.</string>
   <string name="gateway_selection_automatic">Avtomatik</string>
   <string name="log_onehop_create">Şifrələnmiş kataloq əlaqəsinin yaradılması</string>
+  <string name="log_loading_keys">Səlahiyyət sertifikatlarının yüklənməsi</string>
   <string name="log_circuit_create">Tor dövrəsinin yaradılması</string>
   <string name="log_done">İşləyir</string>
   <string name="hide">Gizlət</string>
+  <string name="advanced_settings">Təkmilləşdirilmiş tənzimləmələr</string>
 </resources>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 077e951b..3cad442f 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -82,7 +82,6 @@
   <string name="navigation_drawer_close">ন্যাভিগেশন ড্রয়ার বন্ধ করুন</string>
   <string name="action_example">কাজের উদাহরণ</string>
   <string name="action_settings">সেটিংস</string>
-  <string name="void_vpn_error_establish">VPN ব্লক স্থাপন করতে ব্যর্থ।</string>
   <string name="void_vpn_stopped">সমস্ত বহির্গামী ইন্টারনেট ট্রাফিক ব্লক করা বন্ধ।</string>
   <string name="void_vpn_title">ট্রাফিক ব্লক করা হচ্ছে</string>
   <string name="update_provider_details">প্রদানকারীর বিবরণ আপডেট করুন</string>
@@ -103,7 +102,10 @@
   <string name="donate_button_remind_later">আমাকে পরে মনে করিয়ে দিবেন</string>
   <string name="donate_button_donate">দান করুন</string>
   <string name="log_onehop_create">Establishing an encrypted directory connection</string>
+  <string name="log_loading_keys">কর্তৃপক্ষ সার্টিফিকেট লোড হচ্ছে</string>
   <string name="log_circuit_create">একটি টর্ক সার্কিট স্থাপন</string>
   <string name="log_done">চলমান</string>
   <string name="hide">লুকাও</string>
+  <string name="advanced_settings">আডভান্সড সেটিংস</string>
+  <string name="cancel_connection">সংযোগ বিচ্ছিন্ন করা</string>
 </resources>
diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml
index 9b07988c..7495cf96 100644
--- a/app/src/main/res/values-br/strings.xml
+++ b/app/src/main/res/values-br/strings.xml
@@ -74,7 +74,6 @@
   <string name="navigation_drawer_close">Serriñ an diretenn verdeiñ</string>
   <string name="action_example">Skouer obererezh</string>
   <string name="action_settings">Arventennoù</string>
-  <string name="void_vpn_error_establish">Dibosupl eo da ziazezañ ur VPN stankus.</string>
   <string name="void_vpn_stopped">Herzel da stankañ ar froud genrouedadel ezvont a-bezh.</string>
   <string name="void_vpn_title">Stankañ ar froud</string>
   <string name="update_provider_details">Hizivaat munudoù ar pourvezer</string>
@@ -95,4 +94,5 @@
   <string name="donate_button_donate">Reiñ arc\'hant</string>
   <string name="log_done">O vont en-dro</string>
   <string name="hide">Kuzhaat</string>
+  <string name="advanced_settings">Arventennoù araokaet</string>
 </resources>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index c141bf2a..0005729e 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -87,7 +87,6 @@
   <string name="action_example">Exemple d\'acció</string>
   <string name="action_settings">Configuració</string>
   <string name="void_vpn_establish">%s bloqueja tot el trànsit d\'Internet sortint.</string>
-  <string name="void_vpn_error_establish">No s\'ha pogut establir el bloqueig de la VPN.</string>
   <string name="void_vpn_stopped">S\'ha deixat de bloquejar tot el trànsit sortint d\'Internet.</string>
   <string name="void_vpn_title">Bloqueja el trànsit</string>
   <string name="update_provider_details">Actualitza els detalls del proveïdor</string>
@@ -150,8 +149,11 @@
   <string name="version_update_error">No s\'ha pogut actualitzar.</string>
   <string name="version_update_error_permissions">No hi ha permisos per instal·lar l\'aplicació.</string>
   <string name="log_onehop_create">S\'està establint una connexió xifrada amb un directori</string>
+  <string name="log_loading_keys">S\'estan carregant els certificats d\'autoritat</string>
   <string name="log_circuit_create">S\'està establint un circuit Tor</string>
   <string name="log_done">S\'està executant</string>
   <string name="hide">Oculta</string>
   <string name="use_snowflake">Utilitzi Snowflake</string>
+  <string name="advanced_settings">Configuració avançada</string>
+  <string name="cancel_connection">Desconecta</string>
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index dcdd54ac..96170e5d 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -50,8 +50,11 @@
   <string name="nav_drawer_obfuscated_connection">Použít bridge</string>
   <string name="gateway_selection_automatic">Automaticky</string>
   <string name="log_onehop_create">Spojování s šifrovaným adresářem</string>
+  <string name="log_loading_keys">Nahrávání certifikátů autorit</string>
   <string name="log_circuit_create">Navazování okruhu Tor</string>
   <string name="log_done">Běží</string>
   <string name="hide">Skrýt</string>
   <string name="use_snowflake">Použít Snowflake</string>
+  <string name="advanced_settings">Rozšířené nastavení</string>
+  <string name="cancel_connection">Odpojit</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 02f6bfbc..510e12c7 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -52,6 +52,7 @@
   <string name="setup_error_configure_button">Konfigurieren</string>
   <string name="setup_error_close_button">Beenden</string>
   <string name="setup_error_text">Es gab einen Fehler beim Konfigurieren von %s. \n\n Starte die Konfiguration erneut oder wähle einen anderen Provider aus, der beim nächsten Start eingerichtet werden soll</string>
+  <string name="setup_error_text_custom">Es gab einen Fehler beim Konfigurieren von %s.\n\nMöchtest du erneut konfigurieren oder die App beenden?</string>
   <string name="server_unreachable_message">Der Server ist nicht erreichbar. Bitte versuche es noch einmal.</string>
   <string name="error.security.pinnedcertificate">Sicherheitsfehler. Aktualisiere die App oder wähle einen anderen Provider.</string>
   <string name="malformed_url">Dies scheint kein Provider für %s zu sein.</string>
@@ -88,7 +89,7 @@
   <string name="action_example">Beispielaktion</string>
   <string name="action_settings">Einstellungen</string>
   <string name="void_vpn_establish"> %s blockt den ausgehenden Internetverkehr. </string>
-  <string name="void_vpn_error_establish">Die Einrichtung des blockierenden VPNs ist fehlgeschlagen. </string>
+  <string name="void_vpn_error_establish">Das Blockieren deines Internetverkehrs schlug fehl. </string>
   <string name="void_vpn_stopped">Blockieren des ausgehenden Internetverkehrs wurde beendet.</string>
   <string name="void_vpn_title">Internetverkehr wird blockiert</string>
   <string name="update_provider_details">Providerdetails werden aktualisiert</string>
@@ -138,6 +139,8 @@
   <string name="warning_no_more_gateways_use_pt">%s konnte sich nicht verbinden. Es kann sein, dass VPN Verkehr geblockt wird. Möchtest du versuchen, eine verschleierte Verbindung herzustellen?</string>
   <string name="warning_no_more_gateways_no_pt">%s konnte sich nicht verbinden. Möchtest du es noch einmal versuchen?</string>
   <string name="warning_no_more_gateways_use_ovpn">%s konnte keine verschleierte Verbindung herstellen. Möchtest du versuchen, eine normale VPN Verbindung herzustellen?</string>
+  <string name="warning_no_more_gateways_manual_gw_selection">%1$skonnte sich nicht mit %2$s verbinden. Möchtest du versuchen, dich automatisch mit dem besten Standort zu verbinden?</string>
+  <string name="warning_option_try_best">Versuche besten Standort</string>
   <string name="warning_option_try_pt">Teste verschleierte Verbindung</string>
   <string name="warning_option_try_ovpn">Teste normale Verbindung</string>
   <string name="vpn_error_establish">Android konnte nicht den VPN Dienst starten.</string>
@@ -155,25 +158,25 @@
   <string name="gateway_selection_recommended_location">Empfohlener Standort</string>
   <string name="gateway_selection_recommended">Empfohlen</string>
   <string name="gateway_selection_manually">Manuell auswählen</string>
-  <string name="gateway_selection_automatic_location">Automatisch die beste Verbindung nutzen.</string>
+  <string name="gateway_selection_automatic_location">Benutze automatisch die beste Verbindung</string>
   <string name="gateway_selection_automatic">Automatisch</string>
   <string name="reconnecting">Wiederverbindung...</string>
   <string name="tor_starting">Brücken werden gestartet, um Zensur zu umgehen...</string>
-  <string name="tor_stopping">Brücken werden gestoppt.</string>
-  <string name="tor_started">Brücken werden genutzt, um Zensur zu umgehen.</string>
+  <string name="tor_stopping">Stoppe Brücken</string>
+  <string name="tor_started">Benutze Brücken, um Internetzensur zu umgehen</string>
   <string name="log_conn_done_pt">Mit der austauschbaren Übertragungsart verbunden</string>
   <string name="log_conn_pt">Verbinde mit einer austauschbaren Übertragungsart</string>
   <string name="log_conn_done">Verbunden mit einem Tor Relay</string>
-  <string name="log_handshake">Verbindungsaufbau mit einem Tor Relay</string>
-  <string name="log_handshake_done">Verbindungsaufbau mit einem Tor Relay abgeschlossen</string>
+  <string name="log_handshake">Baue Verbindung mit Relay auf</string>
+  <string name="log_handshake_done">Verbindung mit Relay aufgebaut</string>
   <string name="log_onehop_create">Es wird eine verschlüsselte Verbindung zu einem Verzeichnis hergestellt</string>
-  <string name="log_requesting_status">Netzwerkstatus abfragen</string>
-  <string name="log_loading_status">Lade Netzwerkstatus</string>
-  <string name="log_loading_keys">Lade Schlüsselzertifikate</string>
+  <string name="log_requesting_status">Frage den Konsens zum Netzwerkstatus ab</string>
+  <string name="log_loading_status">Lade den Konsens zum Netzwerkstatus</string>
+  <string name="log_loading_keys">Autorisierungszertifikate werden geladen</string>
   <string name="log_requesting_descriptors">Frage Relay-Deskriptoren ab</string>
   <string name="log_loading_descriptors">Lade Relay-Deskriptoren</string>
   <string name="log_enough_dirinfo">Ausreichend Verzeichnisinformationen geladen, um einen Tor-Kanal aufzubauen</string>
-  <string name="log_ap_handshake_done">Verbindungsaufbau mit Relay abgeschlossen, um einen Tor-Kanal aufzubauen.</string>
+  <string name="log_ap_handshake_done">Relay-Aushandlung zum Aufbau eines Pfades durch das Tor-Netzwerk beendet</string>
   <string name="log_circuit_create">Tor-Kanal wird hergestellt</string>
   <string name="log_done">Läuft</string>
   <string name="channel_name_tor_service">%s Brücken Service</string>
@@ -196,4 +199,6 @@
   <string name="eip_state_no_network">Du hast keine funktionierende Internetverbindung. Sobald sie wieder da ist, wirst du automatisch verbunden mit</string>
   <string name="eip_state_blocking">%1$s blockiert die Intenetverbindung</string>
   <string name="disabled_while_udp_on">Deaktiviert während UDP eingeschaltet ist</string>
+  <string name="advanced_settings">Erweiterte Einstellungen</string>
+  <string name="cancel_connection">Trennen</string>
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 6972e1d2..6f340d08 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -52,6 +52,7 @@
   <string name="setup_error_configure_button">Ρύθμιση </string>
   <string name="setup_error_close_button">Έξοδος</string>
   <string name="setup_error_text">Υπήρξε ένα σφάλμα κατά τη ρύθμιση του %s με τον πάροχο που επιλέξατε.\n\nΜπορείτε να ξανακάνετε τις ρυθμίσεις ή να κλείσετε την εφαρμογή και να ρυθμίσετε έναν άλλο πάροχο με την επανεκκίνηση της.</string>
+  <string name="setup_error_text_custom">Παρουσιάστηκε σφάλμα κατά τη διαμόρφωση του %s.\n\nΜπορείτε να επιλέξετε επαναδιαμόρφωση ή έξοδο.</string>
   <string name="server_unreachable_message">Ο διακομιστής δεν είναι προσπελάσιμος, παρακαλούμε προσπάθησε ξανά.</string>
   <string name="error.security.pinnedcertificate">Σφάλμα ασφάλειας. Αναβαθμίστε την εφαρμογή ή επιλέξτε άλλο πάροχο.</string>
   <string name="malformed_url">Δεν φαίνεται να είναι πάροχος %s.</string>
@@ -88,7 +89,7 @@
   <string name="action_example">Ενέργεια - παράδειγμα</string>
   <string name="action_settings">Ρυθμίσεις</string>
   <string name="void_vpn_establish">Το %s μπλοκάρει όλη την εξερχόμενη κίνηση διαδικτύου.</string>
-  <string name="void_vpn_error_establish">Αποτυχία εγκαθίδρυσης VPN μπλοκαρίσματος.</string>
+  <string name="void_vpn_error_establish">Ο αποκλεισμός όλης της κίνησης στο διαδίκτυο απέτυχε.</string>
   <string name="void_vpn_stopped">Παύση μπλοκαρίσματος όλης της εξερχόμενης κίνησης διαδικτύου.</string>
   <string name="void_vpn_title">Η κίνηση διαδικτύου μπλοκάρεται</string>
   <string name="update_provider_details">Αναβάθμιση λεπτομερειών παρόχου</string>
@@ -138,6 +139,8 @@
   <string name="warning_no_more_gateways_use_pt">Το %s δεν μπόρεσε να συνδεθεί. Ίσως οι συνδέσεις VPN να μπλοκάρονται. Θέλετε να προσπαθήσετε να συνδεθείτε χρησιμοποιώντας καμουφλαρισμένες συνδέσεις;</string>
   <string name="warning_no_more_gateways_no_pt">Το %s δεν μπόρεσε να συνδεθεί. Θέλετε να προσπαθήσετε ξανά;</string>
   <string name="warning_no_more_gateways_use_ovpn">Το %s δεν μπόρεσε να συνδεθεί χρησιμοποιώντας καμουφλαρισμένες συνδέσεις VPN. Θέλετε να προσπαθήσετε να συνδεθείτε χρησιμοποιώντας ένα κανονικό VPN;</string>
+  <string name="warning_no_more_gateways_manual_gw_selection">Το %1$s δεν μπόρεσε να συνδεθεί στο %2$s. Θέλετε να προσπαθήσετε να συνδεθείτε αυτόματα με την καλύτερη τοποθεσία;</string>
+  <string name="warning_option_try_best">Δοκιμή καλύτερης τοποθεσίας</string>
   <string name="warning_option_try_pt">Δοκιμή καμουφλαρισμένης σύνδεσης</string>
   <string name="warning_option_try_ovpn">Δοκιμή κανονικής σύνδεσης</string>
   <string name="vpn_error_establish">Το Android απέτυχε να εγκαθιδρύσει την υπηρεσία VPN.</string>
@@ -159,21 +162,21 @@
   <string name="gateway_selection_automatic">Αυτόματο</string>
   <string name="reconnecting">Επανασυνδέεται...</string>
   <string name="tor_starting">Εκκίνηση γεφυρών για παράκαμψη λογοκρισίας...</string>
-  <string name="tor_stopping">Σταμάτημα γεφυρών.</string>
-  <string name="tor_started">Χρησιμοποιούνται γέφυρες για παράκαμψη λογοκρισίας.</string>
+  <string name="tor_stopping">Παύση γεφυρών</string>
+  <string name="tor_started">Χρήση γεφυρών για παράκαμψη λογοκρισίας</string>
   <string name="log_conn_done_pt">Συνδέθηκε στο pluggable transport</string>
   <string name="log_conn_pt">Συνδέεται στο pluggable transport</string>
   <string name="log_conn_done">Συνδέθηκε σε αναμεταδότη</string>
-  <string name="log_handshake">Γίνεται χειραψία με αναμεταδότη</string>
-  <string name="log_handshake_done">Ολοκλήρωση χειραψίας με αναμεταδότη</string>
+  <string name="log_handshake">Πραγματοποιείται διαπραγμάτευση σύνδεσης με κόμβο</string>
+  <string name="log_handshake_done">Η διαπραγμάτευση σύνδεσης με κόμβο έχει ολοκληρωθεί</string>
   <string name="log_onehop_create">Πραγματοποιήθηκε σύνδεση σε κρυπτογραφημένο κατάλογο</string>
-  <string name="log_requesting_status">Αίτημα του networkstatus consensus</string>
-  <string name="log_loading_status">Φόρτωση του networkstatus consensus</string>
-  <string name="log_loading_keys">Φόρτωση των πιστοποιητικών κλειδιών του φορέα</string>
+  <string name="log_requesting_status">Αίτηση για συναίνεση κατάστασης δικτύου</string>
+  <string name="log_loading_status">Φόρτωση συναίνεσης κατάστασης δικτύου</string>
+  <string name="log_loading_keys">Φόρτωση των πιστοποιητικών του φορέα</string>
   <string name="log_requesting_descriptors">Αίτημα περιγραφέων του αναμεταδότη</string>
   <string name="log_loading_descriptors">Φόρτωση περιγραφέων αναμεταδότη</string>
   <string name="log_enough_dirinfo">Φορτώθηκαν αρκετές πληροφορίες καταλόγου για τη δημιουργία κυκλωμάτων</string>
-  <string name="log_ap_handshake_done">Ολοκληρώθηκε η χειραψία με αναμεταδότη για τη δημιουργία κυκλωμάτων</string>
+  <string name="log_ap_handshake_done">Η διαπραγμάτευση με κόμβο ολοκληρώθηκε για δημιουργία κυκλωμάτων</string>
   <string name="log_circuit_create">Σύνδεση σε ένα κύκλωμα Tor</string>
   <string name="log_done">Εκτελείται</string>
   <string name="channel_name_tor_service">Υπηρεσία γεφυρών %s</string>
@@ -196,4 +199,6 @@
   <string name="eip_state_no_network">Δεν έχεις σύνδεση στο διαδίκτυο. Μόλις αυτή επανέλθει, θα συνδεθείς αυτόματα στο </string>
   <string name="eip_state_blocking">Το %1$s μπλοκάρει όλη τη κίνηση διαδικτύου.</string>
   <string name="disabled_while_udp_on">Απενεργοποιημένο όταν είναι ενεργό το UDP.</string>
+  <string name="advanced_settings">Προηγμένες ρυθμίσεις</string>
+  <string name="cancel_connection">Αποσύνδεση</string>
 </resources>
diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml
index cfccb3d9..d8cee3a3 100644
--- a/app/src/main/res/values-es-rAR/strings.xml
+++ b/app/src/main/res/values-es-rAR/strings.xml
@@ -52,6 +52,7 @@
   <string name="setup_error_configure_button">Configurar</string>
   <string name="setup_error_close_button">Salir</string>
   <string name="setup_error_text">Hubo un error al configurar %s con tu proveedor seleccionado.\n\nPodés elegir reconfigurar, o salir y configurar un proveedor en el próximo inicio.</string>
+  <string name="setup_error_text_custom">Hubo un error configurando %s.\n\nPodrías elegir reconfigurar, o salir.</string>
   <string name="server_unreachable_message">El servidor es inalcanzable, por favor intentá de nuevo.</string>
   <string name="error.security.pinnedcertificate">Error de seguridad, instalar una nueva versión de la aplicación o elegir otro proveedor.</string>
   <string name="malformed_url">No parece ser un proveedor %s.</string>
@@ -88,7 +89,7 @@
   <string name="action_example">Acción de ejemplo</string>
   <string name="action_settings">Ajustes</string>
   <string name="void_vpn_establish">%s bloquea todo el tráfico saliente de internet</string>
-  <string name="void_vpn_error_establish">Falló al establecer RPV de bloqueo.</string>
+  <string name="void_vpn_error_establish">Fallo al bloquear todo el tráfico de Internet.</string>
   <string name="void_vpn_stopped">Detener bloqueo a todo el tráfico saliente hacia Internet.</string>
   <string name="void_vpn_title">Bloqueando tráfico</string>
   <string name="update_provider_details">Actualizar detalles de proveedor</string>
@@ -138,6 +139,8 @@
   <string name="warning_no_more_gateways_use_pt">%s no se pudo conectar. Puede ser que las conexiones al VPN estén bloqueadas. ¿Querés intentar conectar usando conexiones ofuscadas?</string>
   <string name="warning_no_more_gateways_no_pt">%s no se pudo conectar. ¿Querés intentarlo de nuevo?</string>
   <string name="warning_no_more_gateways_use_ovpn">%s no se pudo conectar al VPN usando conexiones ofuscadas. ¿Querés intentar conectar usando VPN estándar? </string>
+  <string name="warning_no_more_gateways_manual_gw_selection">%1$s no pudo conectarse a %2$s. ¿Querés intentar conectarte automáticamente con la mejor ubicación?</string>
+  <string name="warning_option_try_best">Intentar la mejor ubicación</string>
   <string name="warning_option_try_pt">Probar conexión ofuscada</string>
   <string name="warning_option_try_ovpn">Probar conexión estándar</string>
   <string name="vpn_error_establish">Android no pudo establecer el servicio VPN.</string>
@@ -155,25 +158,25 @@
   <string name="gateway_selection_recommended_location">Ubicación recomendada</string>
   <string name="gateway_selection_recommended">Recomendado</string>
   <string name="gateway_selection_manually">Seleccionado manualmente</string>
-  <string name="gateway_selection_automatic_location">Usar la mejor conexión automáticamente.</string>
+  <string name="gateway_selection_automatic_location">Usar la mejor conexión automáticamente</string>
   <string name="gateway_selection_automatic">Automática</string>
   <string name="reconnecting">Reconectando...</string>
   <string name="tor_starting">Iniciando puentes para la evasión de la censura...</string>
-  <string name="tor_stopping">Deteniendo puentes.</string>
-  <string name="tor_started">Usando puentes para la evasión de la censura.</string>
+  <string name="tor_stopping">Deteniendo puentes</string>
+  <string name="tor_started">Usando puentes para la evasión de la censura</string>
   <string name="log_conn_done_pt">Vinculado con transporte conectable</string>
   <string name="log_conn_pt">Vinculando con transporte conectable</string>
   <string name="log_conn_done">Conectado a un repetidor</string>
-  <string name="log_handshake">Intercambiando con un repetidor</string>
-  <string name="log_handshake_done">Intercambio con repetidor efectuado</string>
+  <string name="log_handshake">Negociando la conexión con un repetidor</string>
+  <string name="log_handshake_done">Conexión con repetidor negociada</string>
   <string name="log_onehop_create">Estableciendo una conexión encriptada al directorio</string>
   <string name="log_requesting_status">Solicitando consenso de estado de red</string>
   <string name="log_loading_status">Cargando consenso de estado de red</string>
-  <string name="log_loading_keys">Cargando certificados de claves de autoridad</string>
+  <string name="log_loading_keys">Cargando certificados de autoridad</string>
   <string name="log_requesting_descriptors">Solicitando descriptores de repetidores</string>
   <string name="log_loading_descriptors">Cargando descriptores de repetidores</string>
   <string name="log_enough_dirinfo">Suficiente información de directorios cargada para establecer circuitos</string>
-  <string name="log_ap_handshake_done">Intercambio con repetidor finalizado para establecer circuitos</string>
+  <string name="log_ap_handshake_done">Negociación con repetidor finalizada para establecer circuitos</string>
   <string name="log_circuit_create">Estableciendo un circuito Tor</string>
   <string name="log_done">Ejecutándose</string>
   <string name="channel_name_tor_service">%s Servicio de Puentes</string>
@@ -196,4 +199,6 @@
   <string name="eip_state_no_network">No tenés una conexión a Internet funcional. Una vez que la tengas, automáticamente vas a estar conectado a</string>
   <string name="eip_state_blocking">%1$s está bloqueando todo el tráfico de Internet.</string>
   <string name="disabled_while_udp_on">Deshabilitado mientras está activo UDP.</string>
+  <string name="advanced_settings">Configuraciones avanzadas</string>
+  <string name="cancel_connection">Desconectar</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index af0cd46e..cf8e3485 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -52,6 +52,7 @@
   <string name="setup_error_configure_button">Configurar</string>
   <string name="setup_error_close_button">Salir</string>
   <string name="setup_error_text">Hubo un error al configurar %s con tu proveedor seleccionado.\n\nPuedes escoger reconfigurar, o salir y configurar un proveedor en el próximo inicio.</string>
+  <string name="setup_error_text_custom">Hubo un error configurando %s.\n\nPodrías elegir reconfigurar, o salir.</string>
   <string name="server_unreachable_message">No se pudo alcanzar el servidor, por favor inténtalo de nuevo.</string>
   <string name="error.security.pinnedcertificate">Error de seguridad, actualiza la aplicación o escoge otro proveedor.</string>
   <string name="malformed_url">No parece ser un proveedor %s.</string>
@@ -88,7 +89,7 @@
   <string name="action_example">Acción de ejemplo</string>
   <string name="action_settings">Configuración</string>
   <string name="void_vpn_establish">%s bloquea todo el tráfico saliente de internet</string>
-  <string name="void_vpn_error_establish">No se pudo establecer VPN de bloqueo.</string>
+  <string name="void_vpn_error_establish">Fallo al bloquear todo el tráfico de Internet.</string>
   <string name="void_vpn_stopped">Se detuvo el bloqueo de todo el tráfico saliente de Internet.</string>
   <string name="void_vpn_title">Bloqueando el tráfico</string>
   <string name="update_provider_details">Actualizar detalles del proveedor</string>
@@ -138,6 +139,8 @@
   <string name="warning_no_more_gateways_use_pt">%s no se pudo conectar. Puede ser que las conexiones al VPN estén bloqueadas. ¿Quieres intentar a conectar usando conexiones ofuscadas?</string>
   <string name="warning_no_more_gateways_no_pt">%s no se pudo conectar. ¿Quieres intentarlo de nuevo?</string>
   <string name="warning_no_more_gateways_use_ovpn">%s no se pudo conectar al VPN usando conexiones ofuscadas. ¿Quieres intentar a conectar usando el VPN estándar? </string>
+  <string name="warning_no_more_gateways_manual_gw_selection">%1$s no pudo conectarse a %2$s. ¿Quieres intentar conectarte automáticamente con la mejor ubicación?</string>
+  <string name="warning_option_try_best">Intentar la mejor ubicación</string>
   <string name="warning_option_try_pt">Probar conexión ofuscada</string>
   <string name="warning_option_try_ovpn">Probar conexión estándar</string>
   <string name="vpn_error_establish">Android no se pudo establecer el servicio VPN.</string>
@@ -155,25 +158,25 @@
   <string name="gateway_selection_recommended_location">Ubicación recomendada</string>
   <string name="gateway_selection_recommended">Recomendado</string>
   <string name="gateway_selection_manually">Seleccionar manualmente</string>
-  <string name="gateway_selection_automatic_location">Usa la mejor conexión automáticamente.</string>
+  <string name="gateway_selection_automatic_location">Usar la mejor conexión automáticamente</string>
   <string name="gateway_selection_automatic">Automática</string>
   <string name="reconnecting">Reconectando...</string>
   <string name="tor_starting">Iniciando puentes para evasión de censura...</string>
-  <string name="tor_stopping">Deteniendo puentes.</string>
-  <string name="tor_started">Usando puentes para evasión de censura.</string>
+  <string name="tor_stopping">Deteniendo puentes</string>
+  <string name="tor_started">Usando puentes para la evasión de la censura</string>
   <string name="log_conn_done_pt">Conectado al transporte conectable</string>
   <string name="log_conn_pt">Vinculando con transporte conectable</string>
   <string name="log_conn_done">Conectado a un repetidor</string>
-  <string name="log_handshake">Intercambiando con un repetidor</string>
-  <string name="log_handshake_done">Intercambio con repetidor realizado</string>
+  <string name="log_handshake">Negociando la conexión con un repetidor</string>
+  <string name="log_handshake_done">Conexión con repetidor negociada</string>
   <string name="log_onehop_create">Estableciendo una conexión cifrada con el repositorio de repetidores</string>
-  <string name="log_requesting_status">Solicitando consenso del estado de red</string>
-  <string name="log_loading_status">Cargando consenso del estado de red</string>
-  <string name="log_loading_keys">Cargando certificados de claves de autoridad</string>
+  <string name="log_requesting_status">Solicitando consenso de estado de red</string>
+  <string name="log_loading_status">Cargando consenso de estado de red</string>
+  <string name="log_loading_keys">Cargando los certificados de autoridades</string>
   <string name="log_requesting_descriptors">Solicitando descriptores de repetidores</string>
   <string name="log_loading_descriptors">Cargando descriptores de repetidores</string>
   <string name="log_enough_dirinfo">Suficiente información de directorios cargada para establecer circuitos</string>
-  <string name="log_ap_handshake_done">Intercambio con repetidor finalizado para establecer circuitos</string>
+  <string name="log_ap_handshake_done">Negociación con repetidor finalizada para establecer circuitos</string>
   <string name="log_circuit_create">Estableciendo un circuito Tor</string>
   <string name="log_done">En marcha</string>
   <string name="channel_name_tor_service">%s Servicio de Puentes</string>
@@ -196,4 +199,6 @@
   <string name="eip_state_no_network">No tenés una conexión a Internet funcional. Una vez que la tengas, automáticamente vas a estar conectado a</string>
   <string name="eip_state_blocking">%1$s está bloqueando todo el tráfico de Internet.</string>
   <string name="disabled_while_udp_on">Deshabilitado mientras UDP está activado.</string>
+  <string name="advanced_settings">Configuración avanzada</string>
+  <string name="cancel_connection">Desconectar</string>
 </resources>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 70618baa..9ec76c35 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -87,7 +87,6 @@
   <string name="action_example">Näidistegevus</string>
   <string name="action_settings">Seaded</string>
   <string name="void_vpn_establish">%s blokeerib kogu väljuva internetiliikluse.</string>
-  <string name="void_vpn_error_establish">Blokeeriva VPNi loomine ebaõnnestus.</string>
   <string name="void_vpn_stopped">Kogu väljuva internetiliikluse blokeerimine peatatud.</string>
   <string name="void_vpn_title">Liikluse blokeerimine</string>
   <string name="update_provider_details">Uuenda pakkuja andmeid</string>
@@ -115,4 +114,6 @@
   <string name="log_circuit_create">Tor\'i ringtee sätestamine</string>
   <string name="log_done">Töötab</string>
   <string name="hide">Peida</string>
+  <string name="advanced_settings">Täpsemad seaded</string>
+  <string name="cancel_connection">Katkesta ühendus</string>
 </resources>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 5f3cb93f..65417420 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -87,7 +87,6 @@
   <string name="action_example">Ekintza adibidea</string>
   <string name="action_settings">Ezarpenak</string>
   <string name="void_vpn_establish">%s nterneteko irteerako trafiko guztia blokeatzen du.</string>
-  <string name="void_vpn_error_establish">Ezin izan da VPN blokeoa ezarri.</string>
   <string name="void_vpn_stopped">Interneteko irteera trafikoaren blokeoa gelditu da.</string>
   <string name="void_vpn_title">Trafikoa blokeatzen</string>
   <string name="update_provider_details">Eduneratu hornitzailearen xehetasunak</string>
@@ -142,6 +141,8 @@
   <string name="root_permission_error">Ezin dira VPNra sarbide-puntua eta IPv6 suebakia funtzionalitateak abiarazi %s-i supererabiltzailearen baimenik eman ez zaiolako</string>
   <string name="qs_enable_vpn">%sabiarazi</string>
   <string name="log_onehop_create">Enkriptatutako direktorio batera konexioa ezartzen</string>
+  <string name="log_loading_keys">Aginpide ziurtagiriak kargatzen</string>
   <string name="log_circuit_create">Tor zirkuitu bat ezartzen</string>
   <string name="hide">Ezkutatu</string>
+  <string name="cancel_connection">Deskonektatu</string>
 </resources>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
index f4fabc24..22f31346 100644
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -7,6 +7,7 @@
   <string name="switch_provider_menu_option">تعویض ارائه دهنده</string>
   <string name="info">اطلاعات</string>
   <string name="show_connection_details">نمایش جزئیات ارتباط</string>
+  <string name="connection_details">جزئیات اتصال</string>
   <string name="routes_info">مسیرها: %s</string>
   <string name="routes_info6">مسیرهای IPv6: %s</string>
   <string name="error_empty_username">نام کاربری نباید خالی باشد.</string>
@@ -51,6 +52,7 @@
   <string name="setup_error_configure_button">تنظیم</string>
   <string name="setup_error_close_button">خروج</string>
   <string name="setup_error_text">هنگام تنظیم %s با سرویس دهنده‌ی شما خطایی رخ داد. می‌توانید تنظیم را دوباره انجام دهید یا از برنامه خارج شوید و بار دیگر که برنامه را آغاز کردید یک سرویس دهنده تنظیم کنید.</string>
+  <string name="setup_error_text_custom">در پیکربندی خطایی روی داد.%s\n\nمی‌توانید پیکربندی مجدد یا خروج را انتخاب کنید.</string>
   <string name="server_unreachable_message">سرور قابل دسترس نیست، لطفا دوباره تلاش کنید.</string>
   <string name="error.security.pinnedcertificate">اخطار امنیتی، برنامه app را به‌روز رسانی کنید یا ارائه‌دهنده دیگری انتخاب کنید.</string>
   <string name="malformed_url">به نظر نمی‌آید یک سرویس دهنده‌ی%s باشد.</string>
@@ -87,7 +89,7 @@
   <string name="action_example">فعالیت نمونه</string>
   <string name="action_settings">تنظیمات</string>
   <string name="void_vpn_establish">%s تمام ترافیک خروجی را مسدود می‌کند.</string>
-  <string name="void_vpn_error_establish">ناموفق در راه‌اندازی وی‌پی‌ان مسدودکننده</string>
+  <string name="void_vpn_error_establish">مسدود کردن تمام ترافیک اینترنت انجام نشد.</string>
   <string name="void_vpn_stopped">مسدودکردن تمام ترافیک خروجی اینترنت متوقف شد.</string>
   <string name="void_vpn_title">مسدود کردن ترافیک</string>
   <string name="update_provider_details">به‌روز رسانی اطلاعات ارائه‌دهنده</string>
@@ -111,8 +113,10 @@
   <string name="require_root">نیازمند دسترسی به روت</string>
   <string name="show_experimental">نمایش ویژگی‌های آزمایشی</string>
   <string name="hide_experimental">پنهان‌سازی ویژگی‌های آزمایشی</string>
+  <string name="experimental_features">ویژگی‌های آزمایشی</string>
   <string name="tethering_enabled_message">ابتدا اطمینان حاصی کنید که اشتراک‌گذاری در <![CDATA[system settings]]> فعال است.</string>
   <string name="tethering_message">به اشتراک گذاری VPN با دیگر دستگاه ها از طریق:</string>
+  <string name="tethering_wifi">هات اسپات Wi-Fi</string>
   <string name="tethering_usb">اتصال به USB</string>
   <string name="tethering_bluetooth">اتصال به بلوتوث</string>
   <string name="do_not_show_again">دوباره نشان نده</string>
@@ -125,6 +129,7 @@
   <string name="donate_button_donate">کمک مالی</string>
   <string name="obfuscated_connection">با استفاده از یک ارتباط مبهم شده.</string>
   <string name="obfuscated_connection_try">در حال امتحان یک ارتباط مبهم شده.</string>
+  <string name="nav_drawer_obfuscated_connection">استفاده از پل‌ها</string>
   <string name="nav_drawer_subtitle_obfuscated_connection">دور زدن فیلترینگ VPN</string>
   <string name="warning_exclude_apps_message">در استثناء کردن برنامه ها از اتصال با VPN احتیاط کنید. این کار هویت شما را آشکار می‌کند و امنیت شما را به خطر می‌اندازد. </string>
   <plurals name="subtitle_exclude_apps">
@@ -134,6 +139,8 @@
   <string name="warning_no_more_gateways_use_pt">%s نتوانست متصل شود. ممکن است ارتباط VPN مسدود باشد. آیا می‌خواهید اتصال های مبهم شده را امتحان کنید؟</string>
   <string name="warning_no_more_gateways_no_pt">%s نتوانست متصل شود. می‌خواهید دوباره امتحان کنید؟</string>
   <string name="warning_no_more_gateways_use_ovpn">%s نتوانست با ارتباط مبهم شده‌ی VPN متصل شود. می‌خواهید یک VPN استاندارد را امتحان کنید؟</string>
+  <string name="warning_no_more_gateways_manual_gw_selection">%1$s قادر به اتصال به %2$s نیست. آیا می‌خواهید به طور خودکار به بهترین مکان متصل شوید؟</string>
+  <string name="warning_option_try_best">امتحان بهترین مکان</string>
   <string name="warning_option_try_pt">اتصال مبهم شده را امتحان کنید.</string>
   <string name="warning_option_try_ovpn">اتصال عادی را امتحان کنید.</string>
   <string name="vpn_error_establish">آندروید نتوانست با یک سرویس VPN ارتباط برقرار کند.</string>
@@ -147,6 +154,51 @@
   <string name="version_update_error_pgp_verification">خطا در اعتبارسنجی PGP. نادیده‌گرفتن بارگیری.</string>
   <string name="version_update_error">به‌روزرسانی با شکست مواجه شد.</string>
   <string name="version_update_error_permissions">مجوزی برای نصب برنامه داده نشده است.</string>
+  <string name="gateway_selection_title">انتخاب مکان</string>
+  <string name="gateway_selection_recommended_location">مکان پیشنهادی</string>
   <string name="gateway_selection_recommended">توصیه‌شده</string>
+  <string name="gateway_selection_manually">انتخاب دستی</string>
+  <string name="gateway_selection_automatic_location">استفاده از بهترین مکان به صورت خودکار</string>
+  <string name="gateway_selection_automatic">خودکار</string>
+  <string name="reconnecting">اتصال مجدد...</string>
+  <string name="tor_starting">راه‌اندازی پل‌ها برای دور زدن سانسور...</string>
+  <string name="tor_stopping">توقف پل‌ها</string>
+  <string name="tor_started">در حال استفاده از پل‌ها برای دور زدن سانسور</string>
+  <string name="log_conn_done_pt">متصل به حامل‌های قابل جابجایی</string>
+  <string name="log_conn_pt">در حال اتصال به حامل‌های قابل جابجایی</string>
+  <string name="log_conn_done">متصل به یک رله</string>
+  <string name="log_handshake">در حال مذاکره برای اتصال با یک رله</string>
+  <string name="log_handshake_done">مذاکره برای اتصال با رله انجام شد</string>
+  <string name="log_onehop_create">در حال ایجاد یک اتصال دایرکتوری رمزگذاری شده</string>
+  <string name="log_requesting_status">درخواست موافقت وضعیت شبکه</string>
+  <string name="log_loading_status">بارگیری موافقت وضعیت شبکه</string>
+  <string name="log_loading_keys">بارگیری گواهینامه‌های مرجع</string>
+  <string name="log_requesting_descriptors">در حال درخواست توصیف‌کننده‌های رله</string>
+  <string name="log_loading_descriptors">بارگیری توصیف‌کننده‌های رله</string>
+  <string name="log_enough_dirinfo">اطلاعات دایرکتوری کافی برای ساخت مدارها بارگیری شد</string>
+  <string name="log_ap_handshake_done">مذاکره با یک رله برای ساخت مدارها به پایان رسید</string>
+  <string name="log_circuit_create">در حال ایجاد مدار تور</string>
   <string name="log_done">در حال اجرا</string>
+  <string name="channel_name_tor_service">خدمات پل‌های %s</string>
+  <string name="channel_description_tor_service">در مورد استفاده از پل‌ها هنگام پیکربندی %s اطلاعات می‌دهد.</string>
+  <string name="error_tor_timeout">راه‌اندازی پل‌ها ناموفق بود. آیا می‌خواهید دوباره امتحان کنید یا با یک اتصال امن غیرمبهم برای پیکربندی %s ادامه دهید؟</string>
+  <string name="retry_unobfuscated">به صورت غیرمبهم امتحان کن</string>
+  <string name="hide">پنهان کردن</string>
+  <string name="error_network_connection">%s به اینترنت متصل نیست. لطفا تنظیمات WiFi و داده‌های تلفن خود را ببررسی کنید.</string>
+  <string name="censorship_circumvention">دور زدن سانسور</string>
+  <string name="use_snowflake">استفاده از Snowflake</string>
+  <string name="snowflake_description">از فرآیند پیکربندی در برابر سانسور محافظت کنید.</string>
+  <string name="vpn_settings">تنظیمات VPN</string>
+  <string name="prefer_udp">استفاده از UDP در صورت مهیا بودن</string>
+  <string name="prefer_udp_subtitle">UDP می‌تواند برای استریم سریع‌تر و بهتر باشد، اما در همه شبکه‌ها کار نمی‌کند.</string>
+  <string name="disabled_while_bridges_on">در هنگام استفاده از پل‌ها غیرفعال است.</string>
+  <string name="hint_bridges">در حال حاضر تنها مکان‌هایی که از پل‌ها پشتیبانی می‌کنند قابل انتخاب هستند.</string>
+  <string name="option_disable_bridges">غیرفعال‌سازی پل‌ها</string>
+  <string name="eip_state_insecure">اتصال ناامن</string>
+  <string name="connection_not_connected">شما ممکن است اطلاعاتی را به ارائه‌دهنده اینترنت یا شبکه محلی خود نشت کنید.</string>
+  <string name="eip_state_no_network">شما هیچ اتصال اینترنتی فعال ندارید. به محض اینکه که آن را برگردانید، به طور خودکار متصل خواهید شد</string>
+  <string name="eip_state_blocking">%1$s تمامی ترافیک اینترنت را مسدود کرده است.</string>
+  <string name="disabled_while_udp_on">غیرفعال در صورت روشن بودن UDP</string>
+  <string name="advanced_settings">تنظیمات پیشرفته</string>
+  <string name="cancel_connection">قطع اتصال</string>
 </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 6eb1d6d6..e88ae5c0 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -47,13 +47,17 @@
   <string name="navigation_drawer_close">Sulje navigointilaatikko</string>
   <string name="action_settings">Asetukset</string>
   <string name="donate_title">Lahjoita</string>
+  <string name="donate_button_remind_later">Muistuta minua myöhemmin</string>
   <string name="donate_button_donate">Lahjoita</string>
   <string name="nav_drawer_obfuscated_connection">Käytä siltoja</string>
   <string name="gateway_selection_recommended">Suositeltu</string>
   <string name="gateway_selection_automatic">Automaattinen</string>
   <string name="log_onehop_create">Muodostetaan suojattu yhteys hakemistoon</string>
+  <string name="log_loading_keys">Ladataan juurivarmenteita</string>
   <string name="log_circuit_create">Muodostetaan Tor-kiertotie</string>
   <string name="log_done">Käynnissä</string>
   <string name="hide">Piilota</string>
   <string name="use_snowflake">Käytä Snowflakea</string>
+  <string name="advanced_settings">Lisäasetukset</string>
+  <string name="cancel_connection">Katkaise yhteys</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 4aab87a0..d1405767 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -52,6 +52,7 @@
   <string name="setup_error_configure_button">Configurer</string>
   <string name="setup_error_close_button">Quitter</string>
   <string name="setup_error_text">Une erreur est survenue lors de la configuration de %s avec le fournisseur de votre choix.\n\nVous pouvez soit reconfigurer, soit quitter et configurer un fournisseur lors du prochain lancement.</string>
+  <string name="setup_error_text_custom">Une erreur est survenue en configurant %s.\n\nVous pouvez soit reconfigurer soit sortir.</string>
   <string name="server_unreachable_message">Le serveur est inaccessible, veuillez réessayer.</string>
   <string name="error.security.pinnedcertificate">Erreur de sécurité. Mettre l’appli à niveau ou choisir un autre fournisseur.</string>
   <string name="malformed_url">Cela ne semble pas être un fournisseur %s.</string>
@@ -88,7 +89,7 @@
   <string name="action_example">Exemple d’action</string>
   <string name="action_settings">Paramètres</string>
   <string name="void_vpn_establish">%s bloque tout le trafic Internet sortant.</string>
-  <string name="void_vpn_error_establish">Échec de mise en place du RPV bloquant.</string>
+  <string name="void_vpn_error_establish">Échec de blocage de tout le trafic d’Internet</string>
   <string name="void_vpn_stopped">Le trafic Internet sortant n’est plus bloqué.</string>
   <string name="void_vpn_title">Blocage du trafic</string>
   <string name="update_provider_details">Mettre les renseignements de fournisseur à jour</string>
@@ -138,6 +139,8 @@
   <string name="warning_no_more_gateways_use_pt">%s n’a pas pu se connecter. Les connexions RPV sont peut-être bloquées. Voulez-vous tenter de vous connecter en essayant des connexions brouillées ?</string>
   <string name="warning_no_more_gateways_no_pt">%s n’a pas pu se connecter. Voulez-vous réessayer ?</string>
   <string name="warning_no_more_gateways_use_ovpn">%s n’a pas pu se connecter en utilisant des connexions RPV brouillées. Voulez-vous tenter de vous connecter en essayant un RPV normal ?</string>
+  <string name="warning_no_more_gateways_manual_gw_selection">%1$s n’a pas réussi à se connecter à %2$s. Voulez-vous essayer de vous connecter automatiquement avec le meilleur emplacement ?</string>
+  <string name="warning_option_try_best">Essayer le meilleur emplacement</string>
   <string name="warning_option_try_pt">Essayer une connexion brouillée.</string>
   <string name="warning_option_try_ovpn">Essayer une connexion normal.</string>
   <string name="vpn_error_establish">Android n’a pas réussi à établir le service RPV.</string>
@@ -159,13 +162,13 @@
   <string name="gateway_selection_automatic">Automatique</string>
   <string name="reconnecting">Reconnexion…</string>
   <string name="tor_starting">Démarrage des ponts pour le contournement de la censure…</string>
-  <string name="tor_stopping">Arrêt des ponts.</string>
-  <string name="tor_started">Utilisation de ponts pour le contournement de la censure.</string>
+  <string name="tor_stopping">Arrêt des ponts</string>
+  <string name="tor_started">Utilisation de ponts pour le contournement de la censure</string>
   <string name="log_conn_done_pt">Connecté au transport enfichable</string>
   <string name="log_conn_pt">Connexion au transport enfichable</string>
   <string name="log_conn_done">Connecté au relais</string>
-  <string name="log_handshake">Négociation avec un relais</string>
-  <string name="log_handshake_done">La négociation avec un relais est terminée</string>
+  <string name="log_handshake">Négociation de la connexion avec relais</string>
+  <string name="log_handshake_done">La connexion avec le relais a été négociée</string>
   <string name="log_onehop_create">Mise en place d’une connexion chiffrée vers l’annuaire</string>
   <string name="log_requesting_status">Demande du consensus de l’état du réseau</string>
   <string name="log_loading_status">Chargement du consensus de l’état du réseau</string>
@@ -173,7 +176,7 @@
   <string name="log_requesting_descriptors">Demande des descripteurs de relais</string>
   <string name="log_loading_descriptors">Chargement des descripteurs de relais</string>
   <string name="log_enough_dirinfo">Suffisamment de renseignements d’annuaire ont été chargés pour établir les circuits</string>
-  <string name="log_ap_handshake_done">Négociation terminée avec un relais pour construire les circuits</string>
+  <string name="log_ap_handshake_done">Négociation terminée avec un relais afin de construire les circuits</string>
   <string name="log_circuit_create">Mise en place d’un circuit Tor</string>
   <string name="log_done">En fonction</string>
   <string name="channel_name_tor_service">Service de ponts %s</string>
@@ -196,4 +199,6 @@
   <string name="eip_state_no_network">Vous n’avez pas de connexion Internet fonctionnelle. Une fois qu’elle sera rétablie, vous pourrez automatiquement vous connecter à</string>
   <string name="eip_state_blocking">%1$s bloque tout le trafic Internet.</string>
   <string name="disabled_while_udp_on">Désactivé pendant que l’UDP est activé</string>
+  <string name="advanced_settings">Paramètres avancés</string>
+  <string name="cancel_connection">Se déconnecter</string>
 </resources>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 046ecb7b..d6f8d19c 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -87,7 +87,6 @@
   <string name="action_example">Acción de exemplo</string>
   <string name="action_settings">Axustes</string>
   <string name="void_vpn_establish">%s bloquea todo o tráfico saínte de internet.</string>
-  <string name="void_vpn_error_establish">Fallo ao establecer bloqueo VPN.</string>
   <string name="void_vpn_stopped">Deixou de bloquear todo o tráfico saínte.</string>
   <string name="void_vpn_title">Bloqueando tráfico</string>
   <string name="update_provider_details">Actualizar detalles do provedor</string>
@@ -152,7 +151,9 @@
   <string name="gateway_selection_title">Establecer localización</string>
   <string name="gateway_selection_automatic">Automática</string>
   <string name="log_onehop_create">Estabelecendo unha conexión cifrada co directorio</string>
+  <string name="log_loading_keys">Cargando os certificados de autoridade</string>
   <string name="log_circuit_create">Estabelecendo o circuíto Tor</string>
   <string name="log_done">Executando</string>
   <string name="hide">Agochar</string>
+  <string name="advanced_settings">Configuración avanzada</string>
 </resources>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 6e408b90..054b4a20 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -87,7 +87,6 @@
   <string name="action_example">פעולת דוגמה</string>
   <string name="action_settings">הגדרות</string>
   <string name="void_vpn_establish">%s חוסם את כל תעבורת האינטרנט היוצאת.</string>
-  <string name="void_vpn_error_establish">נכשל בהקמת VPN חסימה.</string>
   <string name="void_vpn_stopped">הפסיק לחסום את כל תעבורת האינטרנט היוצאת.</string>
   <string name="void_vpn_title">חוסם תעבורה</string>
   <string name="update_provider_details">עדכן פרטי ספק</string>
@@ -152,8 +151,11 @@
   <string name="version_update_error">עדכון נכשל.</string>
   <string name="version_update_error_permissions">אין הרשאות להתקין את היישום.</string>
   <string name="log_onehop_create">מקים חיבור סיפרייה מוצפן</string>
+  <string name="log_loading_keys">טוען אישורי רָשׁוּת</string>
   <string name="log_circuit_create">מקים מעגל Tor</string>
   <string name="log_done">רץ</string>
   <string name="hide">הסתר</string>
   <string name="use_snowflake">השתמש ב־Snowflake</string>
+  <string name="advanced_settings">הגדרות מתקדמות</string>
+  <string name="cancel_connection">התנתק</string>
 </resources>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index ce889616..5d8eca75 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -55,7 +55,9 @@
   <string name="gateway_selection_recommended">Preporučeno</string>
   <string name="gateway_selection_automatic">Automatski</string>
   <string name="log_onehop_create">Uspostavljanje šifrirane veze direktorija</string>
+  <string name="log_loading_keys">Učitavanje certifikata autoriteta</string>
   <string name="log_circuit_create">Uspostavljanje Tor kruga</string>
   <string name="hide">Sakrij</string>
   <string name="use_snowflake">Koristi Snowflake</string>
+  <string name="cancel_connection">Odspoji</string>
 </resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 71aec1f8..f3d9bc3a 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -88,7 +88,6 @@
   <string name="action_example">Példa művelet</string>
   <string name="action_settings">Beállítások</string>
   <string name="void_vpn_establish">%sblokkol minden kimenő internet forgalmat.</string>
-  <string name="void_vpn_error_establish">Sikertelen a blokkoló VPN létrehozása.</string>
   <string name="void_vpn_stopped">Minden kimenő internet forgalom blokkolása leállítva.</string>
   <string name="void_vpn_title">Forgalom blokkolása</string>
   <string name="update_provider_details">Szolgáltató adatainak frissítése</string>
@@ -155,25 +154,17 @@
   <string name="gateway_selection_recommended_location">Ajánlott hely</string>
   <string name="gateway_selection_recommended">Ajánlott</string>
   <string name="gateway_selection_manually">Kézi kiválasztás</string>
-  <string name="gateway_selection_automatic_location">A legjobb kapcsolat automatikus használata.</string>
   <string name="gateway_selection_automatic">Automatikus</string>
   <string name="reconnecting">Újrakapcsolódás...</string>
   <string name="tor_starting">Hidak indítása a cenzúra megkerülése érdekében...</string>
-  <string name="tor_stopping">Hidak leállítása.</string>
-  <string name="tor_started">Hidak használata a cenzúra megkerülése érdekében.</string>
   <string name="log_conn_done_pt">Csatlakoztatva a cserélhető átvitelhez</string>
   <string name="log_conn_pt">Csatlakozás a cserélhető átvitelhez</string>
   <string name="log_conn_done">Csatlakoztatva egy reléhez</string>
-  <string name="log_handshake">Egyeztetés egy relével</string>
-  <string name="log_handshake_done">Egyeztetés egy relével megtörtént</string>
   <string name="log_onehop_create">Titkosított címtárkapcsolat létrehozása</string>
-  <string name="log_requesting_status">A hálózati állapot konszenzus lekérdezése</string>
-  <string name="log_loading_status">A hálózati állapot konszenzus betöltése</string>
-  <string name="log_loading_keys">A tanúsítványkiadó kulcsok tanúsítványainak betöltése</string>
+  <string name="log_loading_keys">Tanúsítványkiadó tanúsítványok betöltése</string>
   <string name="log_requesting_descriptors">Relé leírók kérése</string>
   <string name="log_loading_descriptors">Relé leírók betöltése</string>
   <string name="log_enough_dirinfo">Elegendő könyvtár információ betöltve az áramkörök építéséhez</string>
-  <string name="log_ap_handshake_done">Az egyeztetés megtörtént egy relével az áramkörök építéséhez</string>
   <string name="log_circuit_create">Tor kapcsolat felépítése</string>
   <string name="log_done">Fut</string>
   <string name="channel_name_tor_service">%s híd szolgáltatás</string>
@@ -196,4 +187,5 @@
   <string name="eip_state_no_network">Nincs működő internet kapcsolatod. Ha visszajött, automatikusan csatlakoztatva leszel</string>
   <string name="eip_state_blocking">%1$s blokkolja az internet forgalmat.</string>
   <string name="disabled_while_udp_on">Letiltás, ha az UDP bekapcsolt.</string>
+  <string name="cancel_connection">Kapcsolat bontása</string>
 </resources>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index b97d3edb..da63aa0f 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -49,15 +49,19 @@
   <string name="action_settings">Pengaturan</string>
   <string name="always_on_vpn">VPN selalu menyala</string>
   <string name="donate_title">Donasi</string>
+  <string name="donate_button_remind_later">Ingatkan saya nanti</string>
   <string name="donate_button_donate">Donasi</string>
   <string name="nav_drawer_obfuscated_connection">Pakai Bridges</string>
   <string name="gateway_selection_title">Lokasi yang dipilih</string>
   <string name="gateway_selection_recommended">Direkomendasikan</string>
   <string name="gateway_selection_automatic">Otomatis</string>
   <string name="log_onehop_create">Membuat koneksi direktori terenkripsi </string>
+  <string name="log_loading_keys">Memuat sertifikat otoritas</string>
   <string name="log_circuit_create">Membuat sirkuit Tor</string>
   <string name="log_done">Menjalankan</string>
   <string name="hide">Sembunyikan</string>
   <string name="use_snowflake">Gunakan Snowflake</string>
   <string name="vpn_settings">Pengaturan VPN</string>
+  <string name="advanced_settings">Pengaturan lanjutan</string>
+  <string name="cancel_connection">Putus sambungan</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index f26b3145..2438f724 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -64,8 +64,11 @@
   <string name="gateway_selection_recommended">Raccomandate</string>
   <string name="gateway_selection_automatic">Automatica</string>
   <string name="log_onehop_create">Sto creando una connessione cifrata alla directory</string>
+  <string name="log_loading_keys">Caricamento dei certificati delle authority</string>
   <string name="log_circuit_create">Sto creando un circuito Tor</string>
   <string name="log_done">Attivo</string>
   <string name="hide">Nascosto</string>
   <string name="use_snowflake">Usa Snowflake</string>
+  <string name="advanced_settings">Impostazioni avanzate</string>
+  <string name="cancel_connection">Disconnetti</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index a4e1f7a3..f029bda9 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -7,6 +7,7 @@
   <string name="switch_provider_menu_option">プロバイダーを切り替え</string>
   <string name="info">情報</string>
   <string name="show_connection_details">接続の詳細を表示</string>
+  <string name="connection_details">接続の詳細</string>
   <string name="routes_info">経路：%s</string>
   <string name="routes_info6">IPv6 経路: %s</string>
   <string name="error_empty_username">ユーザ名を空に設定することはできません</string>
@@ -51,6 +52,7 @@
   <string name="setup_error_configure_button">構成</string>
   <string name="setup_error_close_button">終了</string>
   <string name="setup_error_text">選択されたプロバイダーで%sを構成中にエラーが発生しました。\n\nもう一度構成するか、終了して次回の起動時にプロバイダーを構成することができます。</string>
+  <string name="setup_error_text_custom">%sを構成中にエラーが発生しました。\n\nもう一度構成するか、終了することができます。</string>
   <string name="server_unreachable_message">サーバーに到達できません。再度実行してください。</string>
   <string name="error.security.pinnedcertificate">セキュリティエラー。アプリをアップデートするか別のプロバイダーを選択してください。</string>
   <string name="malformed_url">%sのプロバイダーではないようです。</string>
@@ -87,7 +89,7 @@
   <string name="action_example">サンプルアクション</string>
   <string name="action_settings">設定</string>
   <string name="void_vpn_establish">%sはすべての送信インターネット通信をブロックします</string>
-  <string name="void_vpn_error_establish">VPNのブロックの確立に失敗しました。</string>
+  <string name="void_vpn_error_establish">すべてのインターネット通信のブロックに失敗しました。</string>
   <string name="void_vpn_stopped">すべての送信インターネット通信のブロックを停止しました。</string>
   <string name="void_vpn_title">通信のブロック</string>
   <string name="update_provider_details">プロバイダーの詳細をアップデート</string>
@@ -111,6 +113,7 @@
   <string name="require_root">root権限が必要です</string>
   <string name="show_experimental">試験的な機能を表示する</string>
   <string name="hide_experimental">試験的な機能を表示しない</string>
+  <string name="experimental_features">試験的な機能</string>
   <string name="tethering_enabled_message">先に <![CDATA[<b>システム設定</b>]]> で、テザリングを有効にしてください。</string>
   <string name="tethering_message">お使いのVPNを他のデバイスと共有:</string>
   <string name="tethering_wifi">Wi-Fiホットスポット</string>
@@ -135,6 +138,8 @@
   <string name="warning_no_more_gateways_use_pt">%sは接続できませんでした。 VPN接続がブロックされている可能性があります。難読化された接続を使用して接続を試みますか?</string>
   <string name="warning_no_more_gateways_no_pt">%s は接続できませんでした。 再試行しますか?</string>
   <string name="warning_no_more_gateways_use_ovpn">%s は難読化されたVPN接続を使用して接続できませんでした。標準VPNを使用して接続を試みますか?</string>
+  <string name="warning_no_more_gateways_manual_gw_selection">%1$sは%2$sへ接続できませんでした。最適な場所と自動的な接続を試みますか?</string>
+  <string name="warning_option_try_best">最適な場所を試みる</string>
   <string name="warning_option_try_pt">難読化された接続を試みる</string>
   <string name="warning_option_try_ovpn">標準接続を試みる</string>
   <string name="vpn_error_establish">AndroidはVPNサービスを確立できませんでした。</string>
@@ -149,10 +154,25 @@
   <string name="version_update_error">アップデート失敗。</string>
   <string name="version_update_error_permissions">アプリをインストールする権限がありません。</string>
   <string name="gateway_selection_title">場所を選択</string>
+  <string name="gateway_selection_recommended_location">推奨の場所</string>
+  <string name="gateway_selection_manually">手動で選択</string>
+  <string name="gateway_selection_automatic_location">自動的に最適な接続を使用</string>
   <string name="gateway_selection_automatic">自動</string>
+  <string name="reconnecting">再接続中…</string>
+  <string name="tor_starting">検閲を回避するためにブリッジを起動中…</string>
+  <string name="tor_stopping">ブリッジを停止</string>
+  <string name="tor_started">検閲を回避するためにブリッジを使用</string>
   <string name="log_onehop_create">暗号化されたディレクトリとの接続を確立中</string>
+  <string name="log_loading_keys">認証局の署名を読込中</string>
   <string name="log_circuit_create">Tor サーキットを設置しています</string>
   <string name="log_done">実行中</string>
   <string name="hide">隠す</string>
+  <string name="censorship_circumvention">検閲を回避</string>
   <string name="use_snowflake">Snowflake を使用</string>
+  <string name="vpn_settings">VPN設定</string>
+  <string name="prefer_udp">利用可能であればUDPを使用</string>
+  <string name="prefer_udp_subtitle">UDPは高速になり、ストリーミングに好ましいですが、ネットワークのすべてには動作しません。</string>
+  <string name="disabled_while_bridges_on">ブリッジ使用中に無効化されます。</string>
+  <string name="advanced_settings">詳細な設定</string>
+  <string name="cancel_connection">切断</string>
 </resources>
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
index a105129e..a5b8264c 100644
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@@ -87,7 +87,6 @@
   <string name="action_example">နမူနာ လုပ်ဆောင်ချက်</string>
   <string name="action_settings">အပြင်အဆင်များ</string>
   <string name="void_vpn_establish">%sသည် အထွက်အင်တာနက်အသွားအလာများ ပိတ်ဆို့သည်</string>
-  <string name="void_vpn_error_establish">VPN မခံထားသော အခြားချိတ်ဆက်မှုများအား ပိတ်ဆို့ခြင်းပြုလုပ်သော VPN ထူထောင်ရန် မအောင်မြင်ပါ။</string>
   <string name="void_vpn_stopped">အထွက်အင်တာနက်အသွားအလာများ ပိတ်ဆို့ခြင်း မရှိတော့ပါ။</string>
   <string name="void_vpn_title">လိုင်းပိတ်နေသည်</string>
   <string name="update_provider_details">ဝန်ဆောင်မှုပေးသူ၏ အချက်အလက်များအား အဆင့်မြှင့်မယ်</string>
@@ -148,9 +147,12 @@
   <string name="version_update_error">အဆင်မြှင့်ခြင်း မအောင်မြင်ပါ။</string>
   <string name="version_update_error_permissions">အပ္ပလီကေးရှင်းကို ဒေါင်းလုပ်ဆွဲရန် ခွင့်ပြုချက်မရှိပါ။</string>
   <string name="log_onehop_create">ကုဒ်ဖြင့်စာဝှက်ထားသည့် ဖိုင်လမ်းကြောင်း ချိတ်ဆက်မှု တစ်ခု တည်ဆောက်နေသည်</string>
+  <string name="log_loading_keys">လုပ်ပိုင်ခွင့် လက်မှတ်များကို ရယူနေသည်</string>
   <string name="log_circuit_create">Tor ဆားကစ် တစ်ခုကို တည်ဆောက်နေသည်</string>
   <string name="log_done">လုပ်ဆောင်နေသည်</string>
   <string name="hide">ဝှက်မည်</string>
   <string name="use_snowflake">Snowflake အသုံးပြုရန်</string>
   <string name="vpn_settings">VPN အပြင်အဆင်များ</string>
+  <string name="advanced_settings">အဆင့်မြင့်သော ဆက်တင်များ</string>
+  <string name="cancel_connection">ချိတ်ဆက်မှုဖြတ်တောက်မယ်</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index ed16ba53..7881f5c8 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -54,6 +54,7 @@
   <string name="setup_error_text">Er is een probleem opgetreden om %s te configureren met je gekozen provider.
 
 Je kan kiezen om te herconfigureren of af te sluiten en bij de volgende start een provider in te stellen.</string>
+  <string name="setup_error_text_custom">Er was een probleem bij het configureren van %s.\n\nJe kan opnieuw configureren of afsluiten.</string>
   <string name="server_unreachable_message">Server is onbereikbaar, probeer later opnieuw.</string>
   <string name="error.security.pinnedcertificate">Beveiligingsprobleem, upgrade de app of kies een andere provider.</string>
   <string name="malformed_url">Dit lijkt geen %s provider te zijn.</string>
@@ -90,7 +91,7 @@ Je kan kiezen om te herconfigureren of af te sluiten en bij de volgende start ee
   <string name="action_example">Voorbeeld</string>
   <string name="action_settings">Instellingen</string>
   <string name="void_vpn_establish">%s blokkeert alle uitgaande internetverkeer.</string>
-  <string name="void_vpn_error_establish">Niet gelukt om een blokkerende VPN op te zetten.</string>
+  <string name="void_vpn_error_establish">Blokeren van alle internetverkeerd mislukt.</string>
   <string name="void_vpn_stopped">Gestopt met blokkkeren van alle uitgaande internetverkeer.</string>
   <string name="void_vpn_title">Blokkeert verkeer</string>
   <string name="update_provider_details">Update provider details</string>
@@ -140,6 +141,8 @@ Je kan kiezen om te herconfigureren of af te sluiten en bij de volgende start ee
   <string name="warning_no_more_gateways_use_pt">%s kon geen verbinding maken. Het kan zijn dat VPN-verbindingen worden geblokkeerd. Wil je je proberen te verbinden met versluierde verbindingen?</string>
   <string name="warning_no_more_gateways_no_pt">%s kon niet verbinden. Wil je opnieuw proberen?</string>
   <string name="warning_no_more_gateways_use_ovpn">%s kon geen verbinding maken met versluierde VPN-verbindingen. Wil je het opnieuw proberen met een standaard VPN?</string>
+  <string name="warning_no_more_gateways_manual_gw_selection">%1$s kon niet verbinden met %2$s. Wil je proberen om automatisch met de beste locatie te verbinden?</string>
+  <string name="warning_option_try_best">Probeer de beste locatie</string>
   <string name="warning_option_try_pt">Probeer een versluierde verbinding</string>
   <string name="warning_option_try_ovpn">Probeer een standaard verbinding</string>
   <string name="vpn_error_establish">Android is er niet in geslaagd de VPN-dienst op te zetten.</string>
@@ -157,7 +160,7 @@ Je kan kiezen om te herconfigureren of af te sluiten en bij de volgende start ee
   <string name="gateway_selection_recommended_location">Aanbevolen locatie</string>
   <string name="gateway_selection_recommended">Aanbevolen</string>
   <string name="gateway_selection_manually">Selecteer manueel</string>
-  <string name="gateway_selection_automatic_location">Automatisch de beste verbinding kiezen</string>
+  <string name="gateway_selection_automatic_location">Gebruik automatisch de beste verbinding</string>
   <string name="gateway_selection_automatic">Automatisch</string>
   <string name="reconnecting">Opnieuw verbinden…</string>
   <string name="tor_starting">Bridges starten om censuur te omzeilen…</string>
@@ -166,12 +169,12 @@ Je kan kiezen om te herconfigureren of af te sluiten en bij de volgende start ee
   <string name="log_conn_done_pt">Verbonden met inplugbare transport</string>
   <string name="log_conn_pt">Verbinden met inplugbare transport</string>
   <string name="log_conn_done">Verbonden met een relay</string>
-  <string name="log_handshake">Verbinding opbouwen met een relay</string>
-  <string name="log_handshake_done">Verbinding met een relay opgebouwd</string>
+  <string name="log_handshake">Onderhandelen van de verbinding met een relay</string>
+  <string name="log_handshake_done">Verbinding met relay onderhandeld</string>
   <string name="log_onehop_create">Een versleutelde adreslijstverbinding maken</string>
   <string name="log_requesting_status">Netwerk consensus status opvragen</string>
   <string name="log_loading_status">Netwerk consensusstatus status laden</string>
-  <string name="log_loading_keys">Laden van de authoriteitcertificaten</string>
+  <string name="log_loading_keys">Autoriteitscertificaten laden</string>
   <string name="log_requesting_descriptors">Relay beschrijving opvragen</string>
   <string name="log_loading_descriptors">Relay beschrijving laden</string>
   <string name="log_enough_dirinfo">Voldoende directory informatien om circuits te bouwen</string>
@@ -198,4 +201,6 @@ Je kan kiezen om te herconfigureren of af te sluiten en bij de volgende start ee
   <string name="eip_state_no_network">Je internetverbinding werkt niet. Zodra die weer werkt, wil je automatisch verbinden met</string>
   <string name="eip_state_blocking">%1$s blokkeert alle internetverkeer.</string>
   <string name="disabled_while_udp_on">Uitgeschakeld wanneer UDP aan is.</string>
+  <string name="advanced_settings">Geavanceerde instellingen</string>
+  <string name="cancel_connection">Verbreek</string>
 </resources>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 21a989b3..c5fea00d 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -74,7 +74,6 @@
   <string name="navigation_drawer_close">Lukk navigasjonsskuff</string>
   <string name="action_example">Eksempelhanding</string>
   <string name="action_settings">Innstillinger</string>
-  <string name="void_vpn_error_establish">Klarte ikke å etablere blokkerings-VPN.</string>
   <string name="void_vpn_stopped">Stoppet blokkering av all utgående internettrafikk.</string>
   <string name="void_vpn_title">Blokkerer trafikk</string>
   <string name="update_provider_details">Oppdater tilbyderdetaljer</string>
@@ -95,8 +94,10 @@
   <string name="nav_drawer_obfuscated_connection">Bruk broer</string>
   <string name="gateway_selection_automatic">Automatisk</string>
   <string name="log_onehop_create">Etablerer en kryptert katalogforbindelse</string>
+  <string name="log_loading_keys">Laster identitetsbekreftende sertifikater</string>
   <string name="log_circuit_create">Etablerer en Tor-krets</string>
   <string name="log_done">Kjører</string>
   <string name="hide">Gjem</string>
   <string name="use_snowflake">Bruk Snowflake</string>
+  <string name="advanced_settings">Avanserte innstillinger</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 191f9094..70a6ed66 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -82,7 +82,6 @@
   <string name="navigation_drawer_close">Zamknij pasek nawigacyjny</string>
   <string name="action_example">Przykładowa akcja</string>
   <string name="action_settings">Ustawienia</string>
-  <string name="void_vpn_error_establish">Nie udało się ustanowić blokowania VPN.</string>
   <string name="void_vpn_stopped">Zatrzymano blokowanie całego wychodzącego ruchu.</string>
   <string name="void_vpn_title">Blokowanie ruchu</string>
   <string name="update_provider_details">Zaktualizuj szczegóły dostawcy</string>
@@ -95,6 +94,7 @@
   <string name="save_battery">Oszczędzaj baterię</string>
   <string name="save_battery_message">Połączenia w tle zostaną zahibernowane, gdy Twój telefon jest nieaktywny.</string>
   <string name="always_on_vpn">Stałe połączenie VPN</string>
+  <string name="tethering_wifi">Hotspot Wi-Fi</string>
   <string name="do_not_show_again">Nie pokazuj ponownie</string>
   <string name="always_on_vpn_user_message">Aby włączyć stałe połączenie VPN w ustawieniach VPN Androida, kliknij ikonę konfiguracji [img src] i włącz przełącznik.</string>
   <string name="donate_title">Wpłać darowiznę</string>
@@ -107,8 +107,11 @@
   <string name="gateway_selection_recommended">Polecane</string>
   <string name="gateway_selection_automatic">Automatycznie</string>
   <string name="log_onehop_create">Ustanawianie szyfrowanego połączenia z katalogiem</string>
+  <string name="log_loading_keys">Wczytywanie certyfikatów uwierzytelnienia</string>
   <string name="log_circuit_create">Ustanawianie ścieżki Tora</string>
   <string name="log_done">Uruchomiony</string>
   <string name="hide">Ukryj</string>
   <string name="use_snowflake">Użyj Snowflake</string>
+  <string name="advanced_settings">Ustawienia zaawansowane</string>
+  <string name="cancel_connection">Rozłącz</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index c1608f6c..bf0559d4 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -87,7 +87,6 @@
   <string name="action_example">Ação de exemplo</string>
   <string name="action_settings">Configurações</string>
   <string name="void_vpn_establish">%s bloqueia todo o tráfego de saída de internet.</string>
-  <string name="void_vpn_error_establish">Falha ao estabelecer VPN de bloqueio</string>
   <string name="void_vpn_stopped">Parou de bloquear todo o tráfego de saída de internet.</string>
   <string name="void_vpn_title">Bloqueando tráfego</string>
   <string name="update_provider_details">Atualizar detalhes do provedor</string>
@@ -133,8 +132,11 @@
   <string name="gateway_selection_recommended">Recomendado</string>
   <string name="gateway_selection_automatic">Automático</string>
   <string name="log_onehop_create">Estabelecendo uma conexão de diretório criptografado</string>
+  <string name="log_loading_keys">Carregando certificados de autoridade</string>
   <string name="log_circuit_create">Estabelecendo um circuito Tor</string>
   <string name="log_done">Executando</string>
   <string name="hide">Esconder</string>
   <string name="use_snowflake">Usar Snowflake</string>
+  <string name="advanced_settings">Configurações avançadas</string>
+  <string name="cancel_connection">Desconectar</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 0dfc80ee..5630906e 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -76,7 +76,6 @@
   <string name="navigation_drawer_close">Fechar gaveta de navegação</string>
   <string name="action_example">Exemplo de ação</string>
   <string name="action_settings">Definições</string>
-  <string name="void_vpn_error_establish">Não foi possível estabelecer a VPN de bloqueio.</string>
   <string name="void_vpn_stopped">Parado o bloqueio de todo o tráfego de saída da Internet.</string>
   <string name="void_vpn_title">A bloquear tráfego</string>
   <string name="update_provider_details">Atualizar detalhes do provedor</string>
@@ -97,8 +96,11 @@
   <string name="nav_drawer_obfuscated_connection">Usar Pontes</string>
   <string name="gateway_selection_automatic">Automático</string>
   <string name="log_onehop_create">A estabelecer uma ligação de diretório encriptada</string>
+  <string name="log_loading_keys">A carregar os certificados de autoridade</string>
   <string name="log_circuit_create">A estabelecer um circuito Tor</string>
   <string name="log_done">Em execução</string>
   <string name="hide">Ocultar</string>
   <string name="use_snowflake">Use o Snowflake</string>
+  <string name="advanced_settings">Configurações Avançadas</string>
+  <string name="cancel_connection">Desligar</string>
 </resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index cfbf7b14..c995442c 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -51,8 +51,11 @@
   <string name="gateway_selection_title">Alege locația</string>
   <string name="gateway_selection_automatic">Automatic</string>
   <string name="log_onehop_create">Se stabileşte o conexiune criptată la director</string>
+  <string name="log_loading_keys">Se încarcă certificatele de autoritate</string>
   <string name="log_circuit_create">Se stabileşte un circuit Tor</string>
   <string name="log_done">Rulează</string>
   <string name="hide">Ascunde</string>
   <string name="use_snowflake">Folosește Snowflake</string>
+  <string name="advanced_settings">Setări avansate</string>
+  <string name="cancel_connection">Deconectaţi</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 73462adf..d6709891 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -12,7 +12,7 @@ https://www.transifex.com/projects/p/bitmask-android/</string>
   <string name="connection_details">Сведения о соединении</string>
   <string name="routes_info">Маршруты: %s</string>
   <string name="routes_info6">Маршруты IPv6: %s</string>
-  <string name="error_empty_username">Имя пользователя не должно быть пустым.</string>
+  <string name="error_empty_username">Имя пользователя не должно быть пустым</string>
   <string name="cert_from_keystore">Получен сертификат \"%s\" из хранилища ключей</string>
   <string name="provider_label">Провайдер:</string>
   <string name="provider_label_none">Ни один провайдер не настроен</string>
@@ -24,7 +24,7 @@ https://www.transifex.com/projects/p/bitmask-android/</string>
   <string name="save">Сохранить</string>
   <string name="new_provider_uri">Имя домена</string>
   <string name="valid_url_entered">URL действителен</string>
-  <string name="not_valid_url_entered">Неверно сформированный URL</string>
+  <string name="not_valid_url_entered">Неправильно сформированный URL</string>
   <string name="provider_details_title">Информация о провайдере</string>
   <string name="use_anonymously_button">Использовать анонимно</string>
   <string name="username_hint">Имя пользователя</string>
@@ -36,8 +36,8 @@ https://www.transifex.com/projects/p/bitmask-android/</string>
   <string name="user_message">Сообщение пользователя</string>
   <string name="about_fragment_title">О нас</string>
   <string name="exclude_apps_fragment_title">Исключение приложений</string>
-  <string name="error_srp_math_error_user_message">Попытайтесь снова: ошибка сервера.</string>
-  <string name="error_bad_user_password_user_message">Неверное имя пользователя или пароль</string>
+  <string name="error_srp_math_error_user_message">Попытайтесь снова: ошибка сервера</string>
+  <string name="error_bad_user_password_user_message">Неправильное имя пользователя или пароль</string>
   <string name="error_not_valid_password_user_message">Должно быть не менее 8 символов</string>
   <string name="error_client_http_user_message">Попытайтесь снова: ошибка HTTP-клиента</string>
   <string name="error_io_exception_user_message">Попытайтесь снова: ошибка ввода/вывода</string>
@@ -54,6 +54,7 @@ https://www.transifex.com/projects/p/bitmask-android/</string>
   <string name="setup_error_configure_button">Настройка</string>
   <string name="setup_error_close_button">Выход</string>
   <string name="setup_error_text">Произошла ошибка при настройке %s с выбранным провайдером.\n\nВы можете выбрать перенастройку или выход и настройку поставщика при следующем запуске.</string>
+  <string name="setup_error_text_custom">Произошла ошибка в конфигурации %s.\n\nМожно изменить конфигурацию или выйти.</string>
   <string name="server_unreachable_message">Сервер недоступен, попробуйте ещё раз.</string>
   <string name="error.security.pinnedcertificate">Ошибка безопасности, обновите приложение или выберите другого провайдера.</string>
   <string name="malformed_url">Не похоже, что %s провайдер.</string>
@@ -90,7 +91,7 @@ https://www.transifex.com/projects/p/bitmask-android/</string>
   <string name="action_example">Пример действия</string>
   <string name="action_settings">Настройки</string>
   <string name="void_vpn_establish">%s блокирует весь исходящий интернет-трафик.</string>
-  <string name="void_vpn_error_establish">Невозможно установить блокировку VPN</string>
+  <string name="void_vpn_error_establish">Невозможно блокировать весь интернет-трафик.</string>
   <string name="void_vpn_stopped">Перестал блокироваться весь исходящий интернет-трафик.</string>
   <string name="void_vpn_title">Блокирование трафика</string>
   <string name="update_provider_details">Обновление информации провайдера</string>
@@ -142,8 +143,10 @@ https://www.transifex.com/projects/p/bitmask-android/</string>
   <string name="warning_no_more_gateways_use_pt">%s не удалось подключиться. Возможно, что VPN-соединения блокируются. Попробовать подключиться с помощью запутанных соединений?</string>
   <string name="warning_no_more_gateways_no_pt">%s не удалось подключиться. Повторить попытку?</string>
   <string name="warning_no_more_gateways_use_ovpn">%s не удалось подключиться с помощью запутанных VPN-подключений. Попробовать подключиться с помощью стандартного VPN?</string>
-  <string name="warning_option_try_pt">Попробуйте запутать соединение</string>
-  <string name="warning_option_try_ovpn">Попробуйте стандартное соединение</string>
+  <string name="warning_no_more_gateways_manual_gw_selection">%1$s не может подключиться к %2$s. Использовать автоматический выбор лучшего расположения?</string>
+  <string name="warning_option_try_best">Попробовать лучшее расположение</string>
+  <string name="warning_option_try_pt">Попробовать запутать соединение</string>
+  <string name="warning_option_try_ovpn">Попробовать стандартное соединение</string>
   <string name="vpn_error_establish">Android не удалось установить службу VPN.</string>
   <string name="root_permission_error">%s не может использовать такие функции, как точка доступа VPN или блокировка IPv6, без root-прав.</string>
   <string name="qs_enable_vpn">Запустить %s</string>
@@ -155,29 +158,29 @@ https://www.transifex.com/projects/p/bitmask-android/</string>
   <string name="version_update_error_pgp_verification">Ошибка проверки PGP: загрузка отклонена.</string>
   <string name="version_update_error">Обновление не выполнено.</string>
   <string name="version_update_error_permissions">Нет разрешения на установку приложения.</string>
-  <string name="gateway_selection_title">Выбор местоположения</string>
-  <string name="gateway_selection_recommended_location">Рекомендуемое местоположение</string>
+  <string name="gateway_selection_title">Выбор расположения</string>
+  <string name="gateway_selection_recommended_location">Рекомендуемое расположение</string>
   <string name="gateway_selection_recommended">Рекомендовано</string>
   <string name="gateway_selection_manually">Выбор вручную</string>
-  <string name="gateway_selection_automatic_location">Автоматически использовать лучшее соединение.</string>
+  <string name="gateway_selection_automatic_location">Автоматически использовать лучшее соединение</string>
   <string name="gateway_selection_automatic">Автоматически</string>
   <string name="reconnecting">Повторное подключение…</string>
   <string name="tor_starting">Запуск мостов для обхода цензуры…</string>
-  <string name="tor_stopping">Остановка мостов.</string>
-  <string name="tor_started">Использовать мосты для обхода цензуры.</string>
+  <string name="tor_stopping">Остановка мостов</string>
+  <string name="tor_started">Использовать мосты для обхода цензуры</string>
   <string name="log_conn_done_pt">Подключено к подключаемому транспорту</string>
   <string name="log_conn_pt">Подключение к подключаемому транспорту</string>
   <string name="log_conn_done">Подключено к ретранслятору</string>
-  <string name="log_handshake">Подтверждение связи с ретранслятором</string>
-  <string name="log_handshake_done">Подтверждение связи с ретранслятором выполнено</string>
+  <string name="log_handshake">Согласование соединения с ретранслятором</string>
+  <string name="log_handshake_done">Соединение с ретранслятором согласовано</string>
   <string name="log_onehop_create">Создание шифрованного соединения</string>
-  <string name="log_requesting_status">Запрос консенсуса по состоянию сети</string>
+  <string name="log_requesting_status">Запрос консенсуса состояния сети</string>
   <string name="log_loading_status">Загрузка консенсуса состояния сети</string>
-  <string name="log_loading_keys">Загрузка сертификатов ключей центра сертификации</string>
+  <string name="log_loading_keys">Загрузка сертификатов</string>
   <string name="log_requesting_descriptors">Запрос дескрипторов ретранслятора</string>
   <string name="log_loading_descriptors">Загрузка дескрипторов ретранслятора</string>
   <string name="log_enough_dirinfo">Загружено достаточно информации для построения цепочек</string>
-  <string name="log_ap_handshake_done">Подтверждение связи с ретранслятором выполнено с построением цепочек</string>
+  <string name="log_ap_handshake_done">Согласование соединения с ретранслятором выполнено с построением цепочек</string>
   <string name="log_circuit_create">Создание цепочки Tor</string>
   <string name="log_done">Запущено</string>
   <string name="channel_name_tor_service">Служба мостов %s</string>
@@ -200,4 +203,6 @@ https://www.transifex.com/projects/p/bitmask-android/</string>
   <string name="eip_state_no_network">Отсутствует рабочее подключение к интернету. Как только оно появится, вы будете автоматически подключены к</string>
   <string name="eip_state_blocking">%1$s блокирует весь интернет-трафик.</string>
   <string name="disabled_while_udp_on">Отключено при использовании UDP.</string>
+  <string name="advanced_settings">Дополнительно</string>
+  <string name="cancel_connection">Отключить</string>
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 6e0c55ad..9002b5eb 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -52,6 +52,7 @@
   <string name="setup_error_configure_button">Yapılandır</string>
   <string name="setup_error_close_button">Çık</string>
   <string name="setup_error_text">Seçtiğiniz hizmet sağlayıcıda %s yapılandırırken bir sorun çıktı.\n\nHizmet sağlayıcıyı yeniden yapılandırmayı ya da çıkıp bir sonraki açılışta hizmet sağlayıcı yapılandırmayı seçebilirsiniz.</string>
+  <string name="setup_error_text_custom">%s yapılandırılırken bir sorun çıktı.\n\nYeniden yapılandırmayı ya da çıkmayı seçebilirsiniz.</string>
   <string name="server_unreachable_message">Sunucuya ulaşılamıyor. Lütfen yeniden deneyin.</string>
   <string name="error.security.pinnedcertificate">Güvenlik hatası. Uygulamayı yükseltin veya başka bir hizmet sağlayıcı seçin.</string>
   <string name="malformed_url">%s bir hizmet sağlayıcısı gibi görünmüyor.</string>
@@ -88,7 +89,7 @@
   <string name="action_example">Örnek işlem</string>
   <string name="action_settings">Ayarlar</string>
   <string name="void_vpn_establish">%s tüm giden internet trafiğini engeller.</string>
-  <string name="void_vpn_error_establish">VPN engellemesi başlatılamadı.</string>
+  <string name="void_vpn_error_establish">Tüm İnternet trafiği engellenemedi.</string>
   <string name="void_vpn_stopped">Tüm giden İnternet trafiğinin engellenmesi durduruldu.</string>
   <string name="void_vpn_title">Trafik engelleme</string>
   <string name="update_provider_details">Hizmet sağlayıcı bilgilerini güncelle</string>
@@ -138,6 +139,8 @@
   <string name="warning_no_more_gateways_use_pt">%s bağlantı kuramadı. VPN bağlantıları engelleniyor olabilir. Karartılmış bağlantıları kullanarak bağlantı kurmayı denemek ister misiniz?</string>
   <string name="warning_no_more_gateways_no_pt">%s bağlantı kuramadı. Yeniden denemek ister misiniz?</string>
   <string name="warning_no_more_gateways_use_ovpn">%s karartılmış VPN bağlantılarını kullanarak bağlantı kuramadı. Standart VPN bağlantıları kullanarak bağlantı kurmayı denemek ister misiniz?</string>
+  <string name="warning_no_more_gateways_manual_gw_selection">%1$s ile %2$s bağlantısı kurulamadı. Bağlantı en iyi konumdan kurulmaya çalışılsın mı?</string>
+  <string name="warning_option_try_best">En iyi konum denensin</string>
   <string name="warning_option_try_pt">Karartılmış bağlantıyı dene</string>
   <string name="warning_option_try_ovpn">Standart bağlantıyı dene</string>
   <string name="vpn_error_establish">Android, VPN hizmetini başlatamadı.</string>
@@ -155,25 +158,25 @@
   <string name="gateway_selection_recommended_location">Önerilen konum</string>
   <string name="gateway_selection_recommended">Önerilen</string>
   <string name="gateway_selection_manually">El ile seçim</string>
-  <string name="gateway_selection_automatic_location">Otomatik olarak en iyi bağlantı kullanılır.</string>
+  <string name="gateway_selection_automatic_location">Otomatik olarak en iyi bağlantı kullanılsın</string>
   <string name="gateway_selection_automatic">Otomatik</string>
   <string name="reconnecting">Yeniden bağlantı kuruluyor…</string>
   <string name="tor_starting">Sansürü aşmak için köprüler başlatılıyor…</string>
-  <string name="tor_stopping">Köprüler durduruluyor.</string>
-  <string name="tor_started">Sansürü aşmak için köprüler kullanılır.</string>
+  <string name="tor_stopping">Köprüler durduruluyor</string>
+  <string name="tor_started">Sansürü aşmak için köprüler kullanılıyor</string>
   <string name="log_conn_done_pt">Değiştirilebilir taşıyıcı ile bağlantı kuruldu</string>
   <string name="log_conn_pt">Değiştirilebilir taşıyıcı ile bağlantı kuruluyor</string>
   <string name="log_conn_done">Bir aktarıcı ile bağlantı kuruldu</string>
-  <string name="log_handshake">Bir aktarıcı ile el sıkışılıyor</string>
-  <string name="log_handshake_done">Bir aktarıcı ile el sıkışma tamamlandı</string>
+  <string name="log_handshake">Bir aktarıcı ile bağlantı kuruluyor</string>
+  <string name="log_handshake_done">Aktarıcı ile bağlantı kuruldu</string>
   <string name="log_onehop_create">Bir şifrelenmiş dizin bağlantısı kuruluyor</string>
   <string name="log_requesting_status">Ağ durumu uzlaşması soruluyor</string>
   <string name="log_loading_status">Ağ durumu uzlaşması yükleniyor</string>
-  <string name="log_loading_keys">Otorite anahtar sertifikaları yükleniyor</string>
+  <string name="log_loading_keys">Otorite sertifikaları yükleniyor</string>
   <string name="log_requesting_descriptors">Aktarıcı tanımlayıcıları soruluyor</string>
   <string name="log_loading_descriptors">Aktarıcı tanımlayıcıları yükleniyor</string>
   <string name="log_enough_dirinfo">Devreleri kurmak için yeterli dizin bilgisi yüklendi</string>
-  <string name="log_ap_handshake_done">Devreleri kurmak için bir aktarıcıyla el sıkışma tamamlandı</string>
+  <string name="log_ap_handshake_done">Devreleri kurmak için bir aktarıcıyla uzlaşma tamamlandı</string>
   <string name="log_circuit_create">Bir Tor devresi kuruluyor</string>
   <string name="log_done">Çalışıyor</string>
   <string name="channel_name_tor_service">%s köprü hizmeti</string>
@@ -196,4 +199,6 @@
   <string name="eip_state_no_network">Çalışan bir İnternet bağlantınız yok. Geri geldiğinde, bağlantınız otomatik olarak kurulacak.</string>
   <string name="eip_state_blocking">%1$s tüm İnternet trafiğini engelliyor.</string>
   <string name="disabled_while_udp_on">UDP açıkken devre dışı.</string>
+  <string name="advanced_settings">Gelişmiş ayarlar</string>
+  <string name="cancel_connection">Bağlantıyı kes</string>
 </resources>
diff --git a/app/src/main/res/values-ug/strings.xml b/app/src/main/res/values-ug/strings.xml
index db5491aa..4f600302 100644
--- a/app/src/main/res/values-ug/strings.xml
+++ b/app/src/main/res/values-ug/strings.xml
@@ -87,7 +87,6 @@
   <string name="action_example">ئۈلگىلىك ھەرىكەت</string>
   <string name="action_settings">ئورناتمىلار</string>
   <string name="void_vpn_establish">%s پۈتۈن سىرتقا چىقىدىغان ئىنتېرنېت قاتنىشىنى چەكلەش.</string>
-  <string name="void_vpn_error_establish">چەكلەنگەن VPN قۇرالمىدۇق</string>
   <string name="void_vpn_stopped">بارلىق سىرتقا چىقىدىغان ئىنتېرنېت قاتنىشىنى چەكلەشنى توختىتىش</string>
   <string name="void_vpn_title">ئالاقىنى تاقاش</string>
   <string name="update_provider_details">تەمىنلىگۈچىنىڭ تەپسىلاتلىرىنى يېڭىلاش</string>
@@ -153,4 +152,5 @@
   <string name="gateway_selection_automatic">ئاپتۇماتىك</string>
   <string name="log_done">ئىجرا قىلىنىۋاتىدۇ</string>
   <string name="hide">يوشۇر</string>
+  <string name="advanced_settings">ئالىي تەڭشەكلەر</string>
 </resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 0a483485..b6abbcdd 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -7,6 +7,7 @@
   <string name="switch_provider_menu_option">Chuyển nhà cung cấp</string>
   <string name="info">thông tin</string>
   <string name="show_connection_details">Hiện chi tiết kết nối</string>
+  <string name="connection_details">Chi tiết kết nối</string>
   <string name="routes_info">Đường dẫn: %s</string>
   <string name="routes_info6">Đường dẫn IPv6: %s</string>
   <string name="error_empty_username">Tên người dùng không được trống.</string>
@@ -87,7 +88,7 @@
   <string name="action_example">Hành động ví dụ</string>
   <string name="action_settings">Cài đặt</string>
   <string name="void_vpn_establish">%s chặn tất cả lưu lượng internet đi ra.</string>
-  <string name="void_vpn_error_establish">Tạo VPN chặn thất bại.</string>
+  <string name="void_vpn_error_establish">Chặn tất cả lưu lượng internet thất bại.</string>
   <string name="void_vpn_stopped">Đã dừng chặn tất cả lưu lượng internet đi ra.</string>
   <string name="void_vpn_title">Đang chặn lưu lượng</string>
   <string name="update_provider_details">Cập nhật chi tiết nhà cung cấp</string>
@@ -111,6 +112,7 @@
   <string name="require_root">Yêu cầu quyền root</string>
   <string name="show_experimental">Hiện các tính năng thử nghiệm</string>
   <string name="hide_experimental">Ẩn các tính năng thử nghiệm</string>
+  <string name="experimental_features">Tính năng thử nghiệm</string>
   <string name="tethering_enabled_message">Vui lòng chắc chắn là bạn bật chia sẻ mạng trong <![CDATA[<b>cài đặt hệ thống</b>]]> trước.</string>
   <string name="tethering_message">Chia sẻ VPN của bạn với các thiết bị khác qua:</string>
   <string name="tethering_wifi">Điểm phát sóng Wi-Fi</string>
@@ -135,6 +137,8 @@
   <string name="warning_no_more_gateways_use_pt">%s không thể kết nối. Có thể là các kết nối VPN bị chặn. Bạn có muốn thử kết nối bằng các kết nối được làm rối tung không?</string>
   <string name="warning_no_more_gateways_no_pt">%s không thể kết nối. Bạn có muốn thử lại không?</string>
   <string name="warning_no_more_gateways_use_ovpn">%s không thể kết nối bằng các kết nối VPN được làm rối tung. Bạn có muốn thử kết nối bằng VPN tiêu chuẩn không?</string>
+  <string name="warning_no_more_gateways_manual_gw_selection">%1$s không thể kết nối đến %2$s. Bạn có muốn thử kết nối tự động với vị trí tốt nhất không?</string>
+  <string name="warning_option_try_best">Thử vị trí tốt nhất</string>
   <string name="warning_option_try_pt">Thử kết nối được làm rối tung</string>
   <string name="warning_option_try_ovpn">Thử kết nối tiêu chuẩn</string>
   <string name="vpn_error_establish">Android đã không thể tạo dịch vụ VPN.</string>
@@ -149,10 +153,50 @@
   <string name="version_update_error">Cập nhật thất bại.</string>
   <string name="version_update_error_permissions">Không có quyền để cài đặt ứng dụng.</string>
   <string name="gateway_selection_title">Chọn vị trí</string>
+  <string name="gateway_selection_recommended_location">Vị trí khuyên dùng</string>
+  <string name="gateway_selection_recommended">Khuyên dùng</string>
+  <string name="gateway_selection_manually">Chọn thủ công</string>
+  <string name="gateway_selection_automatic_location">Tự động dùng kết nối tốt nhất</string>
   <string name="gateway_selection_automatic">Tự động</string>
+  <string name="reconnecting">Đang kết nối lại...</string>
+  <string name="tor_starting">Đang khởi động cầu nối để vượt qua sự che đậy...</string>
+  <string name="tor_stopping">Đang dừng cầu nối</string>
+  <string name="tor_started">Đang sử dụng cầu nối để vượt qua sự che đậy</string>
+  <string name="log_conn_done_pt">Đã kết nối đến điểm trung chuyển có thể sử dụng</string>
+  <string name="log_conn_pt">Đang kết nối đến điểm trung chuyển có thể sử dụng</string>
+  <string name="log_conn_done">Đã kết nối đến một rơle</string>
+  <string name="log_handshake">Đang thương lượng kết nối với một rơle</string>
+  <string name="log_handshake_done">Đã thương lượng kết nối với rơle</string>
   <string name="log_onehop_create">Đang thiết lập một kết nối danh mục được mã hóa</string>
+  <string name="log_requesting_status">Đang hỏi sự nhất trí trạng thái mạng</string>
+  <string name="log_loading_status">Đang tải sự nhất trí trạng thái mạng</string>
+  <string name="log_loading_keys">Đang tải chứng nhận quyền</string>
+  <string name="log_requesting_descriptors">Đang hỏi bộ mô tả rơle</string>
+  <string name="log_loading_descriptors">Đang tải bộ mô tả rơle</string>
+  <string name="log_enough_dirinfo">Đã tải đủ thông tin thư mục để xây dựng mạch</string>
+  <string name="log_ap_handshake_done">Đã hoàn thành thương lượng với một rowle để xây dụng mạch</string>
   <string name="log_circuit_create">Thành lập một mạch Tor</string>
   <string name="log_done">Đang chạy</string>
+  <string name="channel_name_tor_service">Dịch vụ cầu nối %s</string>
+  <string name="channel_description_tor_service">Thông báo về việc sử dụng cầu nối khi thiết lập %s.</string>
+  <string name="error_tor_timeout">Khởi động cầu nối thất bại. Bạn có muốn thử lại, hay tiếp tục với kết nối bảo mật không được làm rối để thiết lập %s?</string>
+  <string name="retry_unobfuscated">Thử lại (không làm rối)</string>
   <string name="hide">Dấu</string>
+  <string name="error_network_connection">%s không có kết nối internet. Vui lòng kiểm tra cài đặt WiFi và dữ liệu di động.</string>
+  <string name="censorship_circumvention">Vượt qua sự che đậy</string>
   <string name="use_snowflake">Dùng Snowflake</string>
+  <string name="snowflake_description">Bảo vệ quá trình thiết lập khỏi sự che đậy.</string>
+  <string name="vpn_settings">Cài đặt VPN</string>
+  <string name="prefer_udp">Sử dụng UDP nếu có sẵn</string>
+  <string name="prefer_udp_subtitle">UDP có thể nhanh hơn và tốt hơn với việc stream, nhưng không hoạt động với tất cả các mạng.</string>
+  <string name="disabled_while_bridges_on">Bị tắt khi sử dụng cầu nối.</string>
+  <string name="hint_bridges">Hiện tại chỉ có các vị trí có hỗ trợ cầu nối mới có thể chọn được.</string>
+  <string name="option_disable_bridges">Tắt cầu nối</string>
+  <string name="eip_state_insecure">Kết nối không bảo mật</string>
+  <string name="connection_not_connected">Bạn có thể đang làm rò rỉ thông tin đến nhà cung cấp internet hoặc mạng cục bộ.</string>
+  <string name="eip_state_no_network">Bạn không có kết nối internet hoạt động. Khi bạn có lại kết nối, bạn sẽ được tự động kết nối đến</string>
+  <string name="eip_state_blocking">%1$s đang chặn tất cả lưu lượng internet.</string>
+  <string name="disabled_while_udp_on">Bị tắt khi UDP đang bật.</string>
+  <string name="advanced_settings">Thiết đặt nâng cao</string>
+  <string name="cancel_connection">Ngắt kết nối</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 07c96ea4..c4f0e125 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -61,8 +61,11 @@
   <string name="gateway_selection_recommended">（推荐）</string>
   <string name="gateway_selection_automatic">自动</string>
   <string name="log_onehop_create">正在建立加密的目录连接</string>
+  <string name="log_loading_keys">正在载入证书颁发机构证书</string>
   <string name="log_circuit_create">正在建立 Tor 线路</string>
   <string name="log_done">正在运行</string>
   <string name="hide">隐藏</string>
   <string name="use_snowflake">使用 Snowflake</string>
+  <string name="advanced_settings">进阶设置</string>
+  <string name="cancel_connection">断开</string>
 </resources>
-- 
cgit v1.2.3