[tor-commits] [orbot/master] Removes V2 Onion Services From Orbot

[n8fr8 at torproject.org]

commit cb98e7febd379268c3f15eb0f884197a57e17928
Author: bim <dsnake at protonmail.com>
Date:   Thu Sep 23 13:22:46 2021 -0400

    Removes V2 Onion Services From Orbot
     - Removes V2 Hosted Services and Client Cookies
     - Removes Assocaited Code in OrbotService
     - OrbotApp will delete local v2 databases
     - Removes XML Resources
     - Refactored V2 code that V3 used to appropriate V3 Backages
---
 app-mini/src/main/res/values-ar/strings.xml        |  13 +-
 app-mini/src/main/res/values-ay/strings.xml        |  13 +-
 app-mini/src/main/res/values-az/strings.xml        |   3 +-
 app-mini/src/main/res/values-be/strings.xml        |  13 +-
 app-mini/src/main/res/values-bg/strings.xml        |   6 +-
 app-mini/src/main/res/values-ca/strings.xml        |  13 +-
 app-mini/src/main/res/values-cs-rCZ/strings.xml    |   3 +-
 app-mini/src/main/res/values-cs/strings.xml        |   3 +-
 app-mini/src/main/res/values-cy/strings.xml        |   3 +-
 app-mini/src/main/res/values-da/strings.xml        |   6 +-
 app-mini/src/main/res/values-de/strings.xml        |  13 +-
 app-mini/src/main/res/values-el/strings.xml        |  13 +-
 app-mini/src/main/res/values-eo/strings.xml        |   3 +-
 app-mini/src/main/res/values-es/strings.xml        |  13 +-
 app-mini/src/main/res/values-et/strings.xml        |   3 +-
 app-mini/src/main/res/values-eu/strings.xml        |  13 +-
 app-mini/src/main/res/values-fa/strings.xml        |  13 +-
 app-mini/src/main/res/values-fi/strings.xml        |   6 +-
 app-mini/src/main/res/values-fr-rFR/strings.xml    |   3 +-
 app-mini/src/main/res/values-fr/strings.xml        |  13 +-
 app-mini/src/main/res/values-gl/strings.xml        |  13 +-
 app-mini/src/main/res/values-hi/strings.xml        |  13 +-
 app-mini/src/main/res/values-hr/strings.xml        |   3 +-
 app-mini/src/main/res/values-hu/strings.xml        |  13 +-
 app-mini/src/main/res/values-in/strings.xml        |   3 +-
 app-mini/src/main/res/values-is/strings.xml        |  13 +-
 app-mini/src/main/res/values-it/strings.xml        |  13 +-
 app-mini/src/main/res/values-iw/strings.xml        |   3 +-
 app-mini/src/main/res/values-ja/strings.xml        |  13 +-
 app-mini/src/main/res/values-ko/strings.xml        |   3 +-
 app-mini/src/main/res/values-lv/strings.xml        |   6 +-
 app-mini/src/main/res/values-mk/strings.xml        |  13 +-
 app-mini/src/main/res/values-ms-rMY/strings.xml    |   6 +-
 app-mini/src/main/res/values-ms/strings.xml        |   3 +-
 app-mini/src/main/res/values-my/strings.xml        |   3 +-
 app-mini/src/main/res/values-nb/strings.xml        |  13 +-
 app-mini/src/main/res/values-nl/strings.xml        |  13 +-
 app-mini/src/main/res/values-pl/strings.xml        |   6 +-
 app-mini/src/main/res/values-pt-rBR/strings.xml    |   8 +-
 app-mini/src/main/res/values-pt/strings.xml        |   6 +-
 app-mini/src/main/res/values-ro/strings.xml        |   6 +-
 app-mini/src/main/res/values-ru/strings.xml        |  13 +-
 app-mini/src/main/res/values-si-rLK/strings.xml    |   6 +-
 app-mini/src/main/res/values-sk/strings.xml        |   3 +-
 app-mini/src/main/res/values-sr/strings.xml        |  13 +-
 app-mini/src/main/res/values-sv/strings.xml        |  13 +-
 app-mini/src/main/res/values-ta/strings.xml        |   6 +-
 app-mini/src/main/res/values-th/strings.xml        |  13 +-
 app-mini/src/main/res/values-tl/strings.xml        |   3 +-
 app-mini/src/main/res/values-tr/strings.xml        |  13 +-
 app-mini/src/main/res/values-uk/strings.xml        |  13 +-
 app-mini/src/main/res/values-vi/strings.xml        |   3 +-
 app-mini/src/main/res/values-zh-rCN/strings.xml    |   3 +-
 app-mini/src/main/res/values-zh-rTW/strings.xml    |  13 +-
 app-mini/src/main/res/values/strings.xml           |  11 -
 app-tv/src/main/res/values-ar/strings.xml          |  13 +-
 app-tv/src/main/res/values-ay/strings.xml          |  13 +-
 app-tv/src/main/res/values-az/strings.xml          |   3 +-
 app-tv/src/main/res/values-be/strings.xml          |  13 +-
 app-tv/src/main/res/values-bg/strings.xml          |   6 +-
 app-tv/src/main/res/values-ca/strings.xml          |  13 +-
 app-tv/src/main/res/values-cs-rCZ/strings.xml      |   3 +-
 app-tv/src/main/res/values-cs/strings.xml          |   3 +-
 app-tv/src/main/res/values-cy/strings.xml          |   3 +-
 app-tv/src/main/res/values-da/strings.xml          |   6 +-
 app-tv/src/main/res/values-de/strings.xml          |  13 +-
 app-tv/src/main/res/values-el/strings.xml          |  13 +-
 app-tv/src/main/res/values-eo/strings.xml          |   3 +-
 app-tv/src/main/res/values-es/strings.xml          |  13 +-
 app-tv/src/main/res/values-et/strings.xml          |   3 +-
 app-tv/src/main/res/values-eu/strings.xml          |  13 +-
 app-tv/src/main/res/values-fa/strings.xml          |  13 +-
 app-tv/src/main/res/values-fi/strings.xml          |   6 +-
 app-tv/src/main/res/values-fr-rFR/strings.xml      |   3 +-
 app-tv/src/main/res/values-fr/strings.xml          |  13 +-
 app-tv/src/main/res/values-gl/strings.xml          |  13 +-
 app-tv/src/main/res/values-hi/strings.xml          |  13 +-
 app-tv/src/main/res/values-hr/strings.xml          |   3 +-
 app-tv/src/main/res/values-hu/strings.xml          |  13 +-
 app-tv/src/main/res/values-in/strings.xml          |   3 +-
 app-tv/src/main/res/values-is/strings.xml          |  13 +-
 app-tv/src/main/res/values-it/strings.xml          |  13 +-
 app-tv/src/main/res/values-iw/strings.xml          |   3 +-
 app-tv/src/main/res/values-ja/strings.xml          |  13 +-
 app-tv/src/main/res/values-ko/strings.xml          |   3 +-
 app-tv/src/main/res/values-lv/strings.xml          |   6 +-
 app-tv/src/main/res/values-mk/strings.xml          |  13 +-
 app-tv/src/main/res/values-ms-rMY/strings.xml      |   6 +-
 app-tv/src/main/res/values-ms/strings.xml          |   3 +-
 app-tv/src/main/res/values-my/strings.xml          |   3 +-
 app-tv/src/main/res/values-nb/strings.xml          |  13 +-
 app-tv/src/main/res/values-nl/strings.xml          |  13 +-
 app-tv/src/main/res/values-pl/strings.xml          |   6 +-
 app-tv/src/main/res/values-pt-rBR/strings.xml      |   8 +-
 app-tv/src/main/res/values-pt/strings.xml          |   6 +-
 app-tv/src/main/res/values-ro/strings.xml          |   6 +-
 app-tv/src/main/res/values-ru/strings.xml          |  13 +-
 app-tv/src/main/res/values-si-rLK/strings.xml      |   6 +-
 app-tv/src/main/res/values-sk/strings.xml          |   3 +-
 app-tv/src/main/res/values-sr/strings.xml          |  13 +-
 app-tv/src/main/res/values-sv/strings.xml          |  13 +-
 app-tv/src/main/res/values-ta/strings.xml          |   6 +-
 app-tv/src/main/res/values-th/strings.xml          |  13 +-
 app-tv/src/main/res/values-tl/strings.xml          |   3 +-
 app-tv/src/main/res/values-tr/strings.xml          |  13 +-
 app-tv/src/main/res/values-uk/strings.xml          |  13 +-
 app-tv/src/main/res/values-vi/strings.xml          |   3 +-
 app-tv/src/main/res/values-zh-rCN/strings.xml      |   3 +-
 app-tv/src/main/res/values-zh-rTW/strings.xml      |  13 +-
 app-tv/src/main/res/values/strings.xml             |  11 -
 app/src/main/AndroidManifest.xml                   |  28 --
 .../main/java/org/torproject/android/OrbotApp.java |   3 +
 .../org/torproject/android/OrbotMainActivity.java  | 179 +---------
 .../ui/hiddenservices/ClientCookiesActivity.java   | 175 ----------
 .../ui/hiddenservices/HiddenServicesActivity.java  | 194 -----------
 .../adapters/ClientCookiesAdapter.java             |  52 ---
 .../hiddenservices/adapters/OnionListAdapter.java  |  59 ----
 .../ui/hiddenservices/backup/BackupUtils.java      | 388 ---------------------
 .../ui/hiddenservices/database/HSDatabase.java     |  50 ---
 .../ui/hiddenservices/dialogs/AddCookieDialog.java |  95 -----
 .../dialogs/CookieActionsDialog.java               | 119 -------
 .../hiddenservices/dialogs/CookieDeleteDialog.java |  37 --
 .../ui/hiddenservices/dialogs/HSActionsDialog.java | 117 -------
 .../ui/hiddenservices/dialogs/HSCookieDialog.java  |  57 ---
 .../ui/hiddenservices/dialogs/HSDataDialog.java    | 106 ------
 .../ui/hiddenservices/dialogs/HSDeleteDialog.java  |  46 ---
 .../providers/CookieContentProvider.java           | 133 -------
 .../providers/HSContentProvider.java               | 143 --------
 .../android/ui/onboarding/OnboardingActivity.java  |   2 +-
 .../OnionServiceActionsDialogFragment.java         |   5 +-
 .../ui/v3onionservice/OnionServiceActivity.java    |   7 +-
 .../PermissionManager.java                         |   2 +-
 .../android/ui/v3onionservice/V3BackupUtils.java   | 188 ++++++++++
 .../backup => v3onionservice}/ZipUtilities.java    |   3 +-
 .../clientauth/ClientAuthActivity.java             |   6 +-
 .../clientauth/ClientAuthBackupDialogFragment.java |   6 +-
 .../res/layout/layout_activity_client_cookies.xml  |  36 --
 .../res/layout/layout_add_client_cookie_dialog.xml |  33 --
 .../res/layout/layout_content_client_cookies.xml   |  20 --
 app/src/main/res/menu/cookie_menu.xml              |  10 -
 app/src/main/res/menu/orbot_main.xml               |  15 -
 app/src/main/res/values-ar/strings.xml             |  11 -
 app/src/main/res/values-ay/strings.xml             |  13 +-
 app/src/main/res/values-az/strings.xml             |   3 +-
 app/src/main/res/values-be/strings.xml             |  13 +-
 app/src/main/res/values-bg/strings.xml             |   6 +-
 app/src/main/res/values-ca/strings.xml             |  11 -
 app/src/main/res/values-cs-rCZ/strings.xml         |   1 -
 app/src/main/res/values-cs/strings.xml             |   3 +-
 app/src/main/res/values-cy/strings.xml             |   3 +-
 app/src/main/res/values-da/strings.xml             |   6 +-
 app/src/main/res/values-de/strings.xml             |  12 -
 app/src/main/res/values-el/strings.xml             |  11 -
 app/src/main/res/values-eo/strings.xml             |   3 +-
 app/src/main/res/values-es/strings.xml             |  11 -
 app/src/main/res/values-et/strings.xml             |   3 +-
 app/src/main/res/values-eu/strings.xml             |  11 -
 app/src/main/res/values-fa/strings.xml             |  11 -
 app/src/main/res/values-fi/strings.xml             |   5 -
 app/src/main/res/values-fr-rFR/strings.xml         |  12 -
 app/src/main/res/values-fr/strings.xml             |  13 +-
 app/src/main/res/values-gl/strings.xml             |  11 -
 app/src/main/res/values-hi/strings.xml             |  11 -
 app/src/main/res/values-hr/strings.xml             |   3 +-
 app/src/main/res/values-hu/strings.xml             |  11 -
 app/src/main/res/values-in/strings.xml             |   2 -
 app/src/main/res/values-is/strings.xml             |  12 -
 app/src/main/res/values-it/strings.xml             |  11 -
 app/src/main/res/values-iw/strings.xml             |   1 -
 app/src/main/res/values-ja/strings.xml             |  11 -
 app/src/main/res/values-ko/strings.xml             |   3 +-
 app/src/main/res/values-lt-rLT/strings.xml         |  12 -
 app/src/main/res/values-lv/strings.xml             |   6 +-
 app/src/main/res/values-mk/strings.xml             |  11 -
 app/src/main/res/values-ms-rMY/strings.xml         |   2 -
 app/src/main/res/values-ms/strings.xml             |   3 +-
 app/src/main/res/values-my/strings.xml             |   3 +-
 app/src/main/res/values-nb/strings.xml             |  11 -
 app/src/main/res/values-nl/strings.xml             |  11 -
 app/src/main/res/values-pl/strings.xml             |  11 -
 app/src/main/res/values-pt-rBR/strings.xml         |  12 -
 app/src/main/res/values-pt-rPT/strings.xml         |  12 -
 app/src/main/res/values-pt/strings.xml             |  12 -
 app/src/main/res/values-ro-rRO/strings.xml         |  12 -
 app/src/main/res/values-ro/strings.xml             |   6 +-
 app/src/main/res/values-ru/strings.xml             |  12 -
 app/src/main/res/values-si-rLK/strings.xml         |   2 -
 app/src/main/res/values-sk/strings.xml             |   3 +-
 app/src/main/res/values-sr/strings.xml             |  13 +-
 app/src/main/res/values-sv/strings.xml             |  11 -
 app/src/main/res/values-ta/strings.xml             |   6 +-
 app/src/main/res/values-th/strings.xml             |  11 -
 app/src/main/res/values-tl/strings.xml             |   3 +-
 app/src/main/res/values-tr/strings.xml             |  12 -
 app/src/main/res/values-uk/strings.xml             |  12 -
 app/src/main/res/values-vi/strings.xml             |  12 -
 app/src/main/res/values-zh-rCN/strings.xml         |  12 -
 app/src/main/res/values-zh-rTW/strings.xml         |  13 +-
 app/src/main/res/values/strings.xml                |  12 -
 .../torproject/android/service/OrbotService.java   | 158 +--------
 orbotservice/src/main/res/values-ar/strings.xml    |   3 +-
 orbotservice/src/main/res/values-az/strings.xml    |   3 +-
 orbotservice/src/main/res/values-bg/strings.xml    |   3 +-
 orbotservice/src/main/res/values-ca/strings.xml    |   3 +-
 .../src/main/res/values-cs-rCZ/strings.xml         |   3 +-
 orbotservice/src/main/res/values-da/strings.xml    |   3 +-
 orbotservice/src/main/res/values-de/strings.xml    |   3 +-
 orbotservice/src/main/res/values-el/strings.xml    |   3 +-
 orbotservice/src/main/res/values-eo/strings.xml    |   3 +-
 orbotservice/src/main/res/values-es/strings.xml    |   3 +-
 orbotservice/src/main/res/values-et/strings.xml    |   3 +-
 orbotservice/src/main/res/values-eu/strings.xml    |   3 +-
 orbotservice/src/main/res/values-fa/strings.xml    |   3 +-
 orbotservice/src/main/res/values-fi/strings.xml    |   3 +-
 .../src/main/res/values-fr-rFR/strings.xml         |   3 +-
 orbotservice/src/main/res/values-gl/strings.xml    |   3 +-
 orbotservice/src/main/res/values-hr/strings.xml    |   3 +-
 orbotservice/src/main/res/values-hu/strings.xml    |   3 +-
 orbotservice/src/main/res/values-in/strings.xml    |   3 +-
 orbotservice/src/main/res/values-is/strings.xml    |   3 +-
 orbotservice/src/main/res/values-it/strings.xml    |   3 +-
 orbotservice/src/main/res/values-iw/strings.xml    |   3 +-
 orbotservice/src/main/res/values-ja/strings.xml    |   3 +-
 orbotservice/src/main/res/values-ko/strings.xml    |   3 +-
 orbotservice/src/main/res/values-lv/strings.xml    |   3 +-
 orbotservice/src/main/res/values-mk/strings.xml    |   3 +-
 .../src/main/res/values-ms-rMY/strings.xml         |   3 +-
 orbotservice/src/main/res/values-ms/strings.xml    |   3 +-
 orbotservice/src/main/res/values-nb/strings.xml    |   3 +-
 orbotservice/src/main/res/values-nl/strings.xml    |   3 +-
 orbotservice/src/main/res/values-pl/strings.xml    |   3 +-
 .../src/main/res/values-pt-rBR/strings.xml         |   3 +-
 orbotservice/src/main/res/values-pt/strings.xml    |   3 +-
 orbotservice/src/main/res/values-ro/strings.xml    |   3 +-
 orbotservice/src/main/res/values-ru/strings.xml    |   3 +-
 .../src/main/res/values-si-rLK/strings.xml         |   3 +-
 orbotservice/src/main/res/values-sr/strings.xml    |   3 +-
 orbotservice/src/main/res/values-sv/strings.xml    |   3 +-
 orbotservice/src/main/res/values-th/strings.xml    |   3 +-
 orbotservice/src/main/res/values-tl/strings.xml    |   3 +-
 orbotservice/src/main/res/values-tr/strings.xml    |   3 +-
 orbotservice/src/main/res/values-uk/strings.xml    |   3 +-
 orbotservice/src/main/res/values-vi/strings.xml    |   3 +-
 .../src/main/res/values-zh-rCN/strings.xml         |   3 +-
 orbotservice/src/main/res/values/strings.xml       |   1 -
 245 files changed, 408 insertions(+), 3629 deletions(-)

diff --git a/app-mini/src/main/res/values-ar/strings.xml b/app-mini/src/main/res/values-ar/strings.xml
index 9f65f0ac..5f78ed25 100644
--- a/app-mini/src/main/res/values-ar/strings.xml
+++ b/app-mini/src/main/res/values-ar/strings.xml
@@ -92,8 +92,7 @@
   <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
   <string name="found_existing_tor_process">عُثر علي عملية تور سابقة تعمل...</string>
   <string name="something_bad_happened">حصل خطأ ما. افحص السجل</string>
-  <string name="unable_to_read_hidden_service_name">غير قادر على قراءة اسم الخدمة المخفية</string>
-  <string name="unable_to_start_tor">غير قادر على بدء تور:</string>
+    <string name="unable_to_start_tor">غير قادر على بدء تور:</string>
   <string name="pref_use_persistent_notifications">دائما ضع الأيقونة في شريط الأدوات عندما يكون اوربوت متصلاً</string>
   <string name="pref_use_persistent_notifications_title">تنبيهات دائمة</string>
   <string name="pref_use_expanded_notifications">قم بأظهار التنبيه بشكل موسع بأستخدام تور. أخرج من البلد ورقم الآي بي رقم العنوان على الشبكة</string>
@@ -125,7 +124,6 @@
   <string name="send_email">أرسل بريد الكتروني</string>
   <string name="vpn_default_world">شامل (تلقائي)</string>
   <string name="hidden_services">خدمات خفية</string>
-  <string name="title_activity_hidden_services">خدمات خفية</string>
   <string name="menu_hidden_services">خدمات خفية</string>
   <string name="save">حفظ</string>
   <string name="local_port">المنفذ المحلي</string>
@@ -133,7 +131,6 @@
   <string name="name">الاسم</string>
   <string name="done">تم !</string>
     <string name="copy_address_to_clipboard">نسخ العنوان إلى الحافظة</string>
-  <string name="show_auth_cookie">عرض كعكة المصادقة</string>
   <string name="backup_service">النسخ الإحتياطي للخدمة</string>
   <string name="delete_service">حذف الخدمة</string>
   <string name="backup_saved_at_external_storage">تمت عملية حفظ النسخة الإحتياطية في ذاكرة التخزين الخارجية</string>
@@ -144,16 +141,8 @@
   <string name="click_again_for_backup">قم بالنقر ثانية للقيام بالنسخ الإحتياطي</string>
   <string name="service_type">نوع الخدمة</string>
   <string name="auth_cookie">كعكة المصادقة</string>
-  <string name="copy_cookie_to_clipboard">نسخ الكعكة إلى الحافظة</string>
-  <string name="auth_cookie_was_not_configured">لم يتم إعداد كعكة المصادقة</string>
   <string name="please_restart_Orbot_to_enable_the_changes">الرجاء إعادة تشغيل أوربوت لتفعيل التعديلات</string>
-  <string name="client_cookies">كعكات العميل</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">القراءة مِن رمز الكيو آر</string>
-  <string name="backup_cookie">النسخ الإحتياطي للكعكة</string>
-  <string name="delete_cookie">حذف الكعكة</string>
-  <string name="confirm_cookie_deletion">تأكيد إزالة الكعكة</string>
-  <string name="hosted_services">الخدمات المستضافة</string>
   <string name="share_as_qr">شارك كرمز كيو آر</string>
   <string name="disable">إلغاء</string>
   <string name="enable">تمكين</string>
diff --git a/app-mini/src/main/res/values-ay/strings.xml b/app-mini/src/main/res/values-ay/strings.xml
index e4ab9f4c..ecfb9328 100644
--- a/app-mini/src/main/res/values-ay/strings.xml
+++ b/app-mini/src/main/res/values-ay/strings.xml
@@ -95,8 +95,7 @@
   <string name="hidden_service_request">Imantat apayañ thakhinak Tor llikar mä wakichäwiw jist\'arañ muni %1$d. Wakichawitix uñt\'atachixa, iyaw sama.</string>
   <string name="found_existing_tor_process">Utjir Toraw jikxatata...</string>
   <string name="something_bad_happened">Mä jan walt\'äwiw utji. Qillqantayasit uñakipam</string>
-  <string name="unable_to_read_hidden_service_name">Janiw imantat yanapirin sutiman ullarañjamakänti</string>
-  <string name="unable_to_start_tor">Janiw Torax aqtayañjamäkiti:</string>
+    <string name="unable_to_start_tor">Janiw Torax aqtayañjamäkiti:</string>
   <string name="pref_use_persistent_notifications">Orbot aqtatäki ukjax chimpup uñstayañapuni</string>
   <string name="pref_use_persistent_notifications_title">Yatiyäwinakax purinipuniniwa</string>
   <string name="pref_use_expanded_notifications">Kawkja markans IP ukamp Toramp  uñstani uka yatiyäw juk\'amp uñacht\'ayaña</string>
@@ -129,7 +128,6 @@
   <string name="send_email">Qillqat apayaña</string>
   <string name="vpn_default_world">Uraqpacha (justupaki)</string>
   <string name="hidden_services">Imantat lurañanaka</string>
-  <string name="title_activity_hidden_services">Imantat lurañanaka</string>
   <string name="menu_hidden_services">Imantat lurañanaka</string>
   <string name="save">Imaña</string>
   <string name="local_port">Akankïr apayañ thakhi</string>
@@ -137,7 +135,6 @@
   <string name="name">Suti</string>
   <string name="done">¡Tukuyata!</string>
     <string name="copy_address_to_clipboard">Utjirinak waruqañawjar imam</string>
-  <string name="show_auth_cookie"> Uñt\'ayktam uka cookie uñstayam</string>
   <string name="backup_service">Yanapirit imat luratanakam waruqam</string>
   <string name="delete_service">Lurañanak pichsuña</string>
   <string name="backup_saved_at_external_storage">Imat luratanakamax yaqha yänakar imataxiwa</string>
@@ -148,16 +145,8 @@
   <string name="click_again_for_backup">Imat luratanak utjañapatak mayamp limt\'am</string>
   <string name="service_type">Kunayman lurañanaka</string>
   <string name="auth_cookie">Chiqat k\'arich uk katjir cookie</string>
-  <string name="copy_cookie_to_clipboard">Cookie waruqañawjar imam</string>
-  <string name="auth_cookie_was_not_configured">Chiqat k\'arich uk katjir cookiex janiw mayjt\'ayatäkiti</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Mayjt\'ayatanak aqtayañatak Orbot mayamp qhant\'ayam, amp suma</string>
-  <string name="client_cookies">Apnaqirin Cookiepa</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">QR ukamp ullaraña</string>
-  <string name="backup_cookie">Cookien imat luratanakapa</string>
-  <string name="delete_cookie">Cookie pichsum</string>
-  <string name="confirm_cookie_deletion">Cookie pichsut mayamp uñxatam</string>
-  <string name="hosted_services">Qurpachat lurañanaka</string>
   <string name="share_as_qr">QRjam ch\'iqiyaña</string>
   <string name="disable">Jiwt\'ayaña</string>
   <string name="enable">Aqtayaña</string>
diff --git a/app-mini/src/main/res/values-az/strings.xml b/app-mini/src/main/res/values-az/strings.xml
index 4fcd73c3..76b784b6 100644
--- a/app-mini/src/main/res/values-az/strings.xml
+++ b/app-mini/src/main/res/values-az/strings.xml
@@ -92,8 +92,7 @@ Tor: https://www.torproject.org</string>
 LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">mövcud Tor prosesi tapıldı...</string>
   <string name="something_bad_happened">NÉ™ isÉ™ pis bir ÅŸey oldu. GiriÅŸi yoxla</string>
-    <string name="unable_to_read_hidden_service_name">gizli xidmət adını oxumağı deaktivləşdir</string>
-  <string name="unable_to_start_tor">Tor-un başlanmasını dayandır:</string>
+    <string name="unable_to_start_tor">Tor-un başlanmasını dayandır:</string>
     <string name="pref_use_persistent_notifications">Həmişə Orbot qoşulduğu hallarda nişanı alətlət panelində saxla</string>
   <string name="pref_use_persistent_notifications_title">Həmişə Açıq Xəbərdarlıqlar</string>
   <string name="pref_use_expanded_notifications">Torla birlikdə ətraflı bildirişi göstərib ölkə və IP-dən çıxın. </string>
diff --git a/app-mini/src/main/res/values-be/strings.xml b/app-mini/src/main/res/values-be/strings.xml
index d49d5fbb..cda22e5a 100644
--- a/app-mini/src/main/res/values-be/strings.xml
+++ b/app-mini/src/main/res/values-be/strings.xml
@@ -95,8 +95,7 @@
   <string name="hidden_service_request">Дадатак хоча адкрыць схаваны порт сервера %1$d сеткі Tor. Гэта бяспечна, калі вы давяраеце дадзенаму дадатку.</string>
   <string name="found_existing_tor_process">знойдзены існавалы працэс Tor...</string>
   <string name="something_bad_happened">Адбылася нейкая памылка. Праверце журнал.</string>
-  <string name="unable_to_read_hidden_service_name">немагчыма прачытаць імя схаванай службы</string>
-  <string name="unable_to_start_tor">Немагчыма запусціць Tor:</string>
+    <string name="unable_to_start_tor">Немагчыма запусціць Tor:</string>
   <string name="pref_use_persistent_notifications">Заўсёды адлюстроўваць іконку у панэлі заданняў калі Orbot падключаны</string>
   <string name="pref_use_persistent_notifications_title">Нязменнае апавяшчэнне пра працу</string>
   <string name="pref_use_expanded_notifications">Паказаць пашыранае апавяшчэнне Tor з краінай выхаду і IP</string>
@@ -129,7 +128,6 @@
   <string name="send_email">Адправіць ліст</string>
   <string name="vpn_default_world">Свет (аўта)</string>
   <string name="hidden_services">Схаваныя службы</string>
-  <string name="title_activity_hidden_services">Схаваныя службы</string>
   <string name="menu_hidden_services">Схаваныя службы</string>
   <string name="save">Захаваць</string>
   <string name="local_port">Лакальны порт</string>
@@ -137,7 +135,6 @@
   <string name="name">Імя</string>
   <string name="done">Гатова!</string>
     <string name="copy_address_to_clipboard">Скапіяваць адрас у буфер памену</string>
-  <string name="show_auth_cookie">Паказаць аўтарызуючыя cookie</string>
   <string name="backup_service">Рэзерваваць службу</string>
   <string name="delete_service">Выдаліць службу</string>
   <string name="backup_saved_at_external_storage">Рэзервовая копія захавана на вонкавым сховішчы</string>
@@ -148,16 +145,8 @@
   <string name="click_again_for_backup">Націсніце яшчэ раз для рэзервавання</string>
   <string name="service_type">Тып службы</string>
   <string name="auth_cookie">Аўтарызучыя cookie</string>
-  <string name="copy_cookie_to_clipboard">Капіяваць cookie у буфер памену</string>
-  <string name="auth_cookie_was_not_configured">Аўтарызучыя cookie не наладжаны</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Калі ласка, перазапусціце Orbot для ўступу змены ў сілу</string>
-  <string name="client_cookies">Cookies кліента</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Прачытаць з QR-кода</string>
-  <string name="backup_cookie">Рэзерваваць cookie</string>
-  <string name="delete_cookie">Выдаліць cookies</string>
-  <string name="confirm_cookie_deletion">Пацвердзіце выдаленне cookie</string>
-  <string name="hosted_services">Размешчаныя службы</string>
   <string name="share_as_qr">Падзяліцца праз QR-код</string>
   <string name="disable">Адключыць</string>
   <string name="enable">Уключыць</string>
diff --git a/app-mini/src/main/res/values-bg/strings.xml b/app-mini/src/main/res/values-bg/strings.xml
index 9452b2ab..667ec542 100644
--- a/app-mini/src/main/res/values-bg/strings.xml
+++ b/app-mini/src/main/res/values-bg/strings.xml
@@ -91,8 +91,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">намерил си съвместим Tor проект...</string>
   <string name="something_bad_happened">Нещо лошо се случи. Проверете лога</string>
-    <string name="unable_to_read_hidden_service_name">не може да прочете име на скрита услуга</string>
-  <string name="unable_to_start_tor">Не може да стартира Тор:</string>
+    <string name="unable_to_start_tor">Не може да стартира Тор:</string>
     <string name="pref_use_persistent_notifications">Винаги показвай икона в тулбара когато Орбот е свързан</string>
   <string name="pref_use_persistent_notifications_title">Уведомления винаги включени</string>
   <string name="pref_use_expanded_notifications">Покажи разширена информация за Tor изходната държава и IP в лентата за известия</string>
@@ -122,8 +121,7 @@
     <string name="activate">Активирай</string>
   <string name="send_email">Изпрати имейл</string>
   <string name="hidden_services">Скрити услуги</string>
-  <string name="title_activity_hidden_services">Скрити услуги</string>
-  <string name="menu_hidden_services">Скрити услуги</string>
+    <string name="menu_hidden_services">Скрити услуги</string>
   <string name="save">Запази</string>
   <string name="name">Име</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Моля, рестартирай Orbot, за да влязат в действие промените</string>
diff --git a/app-mini/src/main/res/values-ca/strings.xml b/app-mini/src/main/res/values-ca/strings.xml
index b7de95f9..ba0c0bd4 100644
--- a/app-mini/src/main/res/values-ca/strings.xml
+++ b/app-mini/src/main/res/values-ca/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Una aplicació vol obrir el port de servidor ocults%1$d a la xarxa Tor. Això és segur si confieu en l\'aplicació</string>
   <string name="found_existing_tor_process">s\'ha trobat un procés Tor existent...</string>
   <string name="something_bad_happened">Ha fallat alguna cosa. Comproveu el registre</string>
-    <string name="unable_to_read_hidden_service_name">ha estat impossible llegir el nom del servei ocult</string>
-  <string name="unable_to_start_tor">Ha estat impossible iniciar Tor:</string>
+    <string name="unable_to_start_tor">Ha estat impossible iniciar Tor:</string>
     <string name="pref_use_persistent_notifications">Manté la icona sempre a la barra d\'eines mentre l\'Orbot està connectat</string>
   <string name="pref_use_persistent_notifications_title">Notificacions sempre activades</string>
   <string name="pref_use_expanded_notifications">Mostra la informació de sortida addicional del Tor amb  el país i la IP</string>
@@ -130,7 +129,6 @@
     <string name="send_email">Envia correu-e</string>
   <string name="vpn_default_world">Global (auto)</string>
   <string name="hidden_services">Serveis ocults</string>
-  <string name="title_activity_hidden_services">Serveis ocults</string>
   <string name="menu_hidden_services">Serveis ocults</string>
   <string name="save">Desa</string>
     <string name="local_port">Port local</string>
@@ -138,7 +136,6 @@
   <string name="name">Nom</string>
   <string name="done">Fet!</string>
     <string name="copy_address_to_clipboard">Copia adreça al portapapers</string>
-  <string name="show_auth_cookie">Mostrar galetes d\'autentificació</string>
   <string name="backup_service">Servei de còpia de seguretat</string>
   <string name="delete_service">Esborrar servei</string>
   <string name="backup_saved_at_external_storage">Còpia de seguretat desada a emmagatzematge extern</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Feu clic novament per fer còpia de seguretat</string>
   <string name="service_type">Tipus de servei</string>
   <string name="auth_cookie">Auth cookie</string>
-  <string name="copy_cookie_to_clipboard">Copieu les galetes al porta-retalls</string>
-  <string name="auth_cookie_was_not_configured">No s\'ha configurat l\'Auth cookie</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Reinicieu l\'Orbot per aplicar els canvis</string>
-  <string name="client_cookies">Client cookies</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Llegir de QR</string>
-  <string name="backup_cookie">Backup cookie</string>
-  <string name="delete_cookie">Elimina la galeta</string>
-  <string name="confirm_cookie_deletion">Confirma la supressió de les galetes</string>
-  <string name="hosted_services">Serveis allotjats</string>
   <string name="share_as_qr">Comparteix com a QR</string>
   <string name="disable">Deshabilitar </string>
   <string name="enable">Habilitar</string>
diff --git a/app-mini/src/main/res/values-cs-rCZ/strings.xml b/app-mini/src/main/res/values-cs-rCZ/strings.xml
index 04544c89..641a4eed 100644
--- a/app-mini/src/main/res/values-cs-rCZ/strings.xml
+++ b/app-mini/src/main/res/values-cs-rCZ/strings.xml
@@ -90,8 +90,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">nalezev existující Tor proces…</string>
   <string name="something_bad_happened">Stalo se něco špatného. Zkontrolujte log</string>
-    <string name="unable_to_read_hidden_service_name">nelze číst název skryté služby</string>
-  <string name="unable_to_start_tor">Nelze spustit Tor:</string>
+    <string name="unable_to_start_tor">Nelze spustit Tor:</string>
     <string name="pref_use_persistent_notifications">Vždy zobrazit ikonu ve stavovém řádku, pokud je Orbot připojen.</string>
   <string name="pref_use_persistent_notifications_title">Notifikace vždy zapnuté</string>
   <string name="pref_use_expanded_notifications">Zobrazit rozšířené oznánemí s Tor výstupní zemí a IP</string>
diff --git a/app-mini/src/main/res/values-cs/strings.xml b/app-mini/src/main/res/values-cs/strings.xml
index 17b7fb4f..373d8467 100644
--- a/app-mini/src/main/res/values-cs/strings.xml
+++ b/app-mini/src/main/res/values-cs/strings.xml
@@ -35,8 +35,7 @@
     <string name="get_bridges_email">Email</string>
   <string name="activate">Aktivovat</string>
   <string name="hidden_services">Skryté Služby</string>
-  <string name="title_activity_hidden_services">Skryté Služby</string>
-  <string name="menu_hidden_services">Skryté Služby</string>
+    <string name="menu_hidden_services">Skryté Služby</string>
   <string name="save">Uložit</string>
   <string name="name">Jméno</string>
   <string name="done">Hotovo!</string>
diff --git a/app-mini/src/main/res/values-cy/strings.xml b/app-mini/src/main/res/values-cy/strings.xml
index a1c168d6..e91f2549 100644
--- a/app-mini/src/main/res/values-cy/strings.xml
+++ b/app-mini/src/main/res/values-cy/strings.xml
@@ -36,8 +36,7 @@
     <string name="set_locale_title">Iaith</string>
     <string name="activate">Ysgogi</string>
   <string name="hidden_services">Gwasanaethau Cudd</string>
-  <string name="title_activity_hidden_services">Gwasanaethau Cudd</string>
-  <string name="menu_hidden_services">Gwasanaethau Cudd</string>
+    <string name="menu_hidden_services">Gwasanaethau Cudd</string>
   <string name="save">Cadw</string>
   <string name="name">Enw</string>
 </resources>
diff --git a/app-mini/src/main/res/values-da/strings.xml b/app-mini/src/main/res/values-da/strings.xml
index cd08b493..43d49f7c 100644
--- a/app-mini/src/main/res/values-da/strings.xml
+++ b/app-mini/src/main/res/values-da/strings.xml
@@ -88,8 +88,7 @@
   <string name="tor_version">Tor: https://www.torproject.org</string>
   <string name="found_existing_tor_process">fandt eksisterende Tor process...</string>
   <string name="something_bad_happened">Noget slemt er sket. Check loggen</string>
-    <string name="unable_to_read_hidden_service_name">ikke i stand til at læse navnet på den skjulte service</string>
-  <string name="unable_to_start_tor">Kunne ikke starte Tor:</string>
+    <string name="unable_to_start_tor">Kunne ikke starte Tor:</string>
     <string name="pref_use_persistent_notifications">Vis altid ikonet i statuslinien når Orbot er forbundet til netværket</string>
   <string name="pref_use_persistent_notifications_title">Vis altid notifikationer</string>
     <string name="set_locale_title">Sprog</string>
@@ -98,8 +97,7 @@
   <string name="get_bridges_email">Mail</string>
   <string name="activate">Aktiver</string>
   <string name="hidden_services">Skjulte tjenester</string>
-  <string name="title_activity_hidden_services">Skjulte tjenester</string>
-  <string name="menu_hidden_services">Skjulte tjenester</string>
+    <string name="menu_hidden_services">Skjulte tjenester</string>
   <string name="save">Gem</string>
   <string name="name">Navn</string>
   <string name="disable">Deaktivere</string>
diff --git a/app-mini/src/main/res/values-de/strings.xml b/app-mini/src/main/res/values-de/strings.xml
index 0e7867c1..c8fde947 100644
--- a/app-mini/src/main/res/values-de/strings.xml
+++ b/app-mini/src/main/res/values-de/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Eine Anwendung möchte den Versteckten Server-Anschluss %1$d zum Tor-Netz öffnen. Dies ist sicher, wenn Sie der Anwendung vertrauen.</string>
   <string name="found_existing_tor_process">bestehenden Tor-Prozess gefunden …</string>
   <string name="something_bad_happened">Etwas ist schief gelaufen. Bitte Protokoll überprüfen</string>
-    <string name="unable_to_read_hidden_service_name">Name des versteckten Dienstes kann nicht gelesen werden</string>
-  <string name="unable_to_start_tor">Tor kann nicht gestartet werden:</string>
+    <string name="unable_to_start_tor">Tor kann nicht gestartet werden:</string>
     <string name="pref_use_persistent_notifications">Behalte immer das Symbol in der Symbolleiste, wenn Orbot verbunden ist</string>
   <string name="pref_use_persistent_notifications_title">Aktivitätsanzeige</string>
   <string name="pref_use_expanded_notifications">Zeige erweiterte Benachrichtigung mit Tor-Ausgangsland und IP an</string>
@@ -130,7 +129,6 @@
     <string name="send_email">E-Mail senden</string>
   <string name="vpn_default_world">Global (Automatisch)</string>
   <string name="hidden_services">Versteckte Dienste</string>
-  <string name="title_activity_hidden_services">Versteckte Dienste</string>
   <string name="menu_hidden_services">Versteckte Dienste</string>
   <string name="save">Speichern</string>
     <string name="local_port">Lokaler Anschluss</string>
@@ -138,7 +136,6 @@
   <string name="name">Name</string>
   <string name="done">Fertig!</string>
     <string name="copy_address_to_clipboard">Adresse in die Zwischenablage kopieren</string>
-  <string name="show_auth_cookie">Authentifikationscookie anzeigen</string>
   <string name="backup_service">Sicherungsdienst</string>
   <string name="delete_service">Dienst löschen</string>
   <string name="backup_saved_at_external_storage">Sicherung auf externem Speicher gespeichert </string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Zum Sichern noch einmal klicken</string>
   <string name="service_type">Dienst-Typ</string>
   <string name="auth_cookie">Authentifikationscookie</string>
-  <string name="copy_cookie_to_clipboard">Cookie in die Zwischenablage kopieren</string>
-  <string name="auth_cookie_was_not_configured">Es wurde kein Authentifikationscookie festgelegt</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Bitte Orbot zum Aktivieren der Änderungen neustarten</string>
-  <string name="client_cookies">Client Cookies</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Lese QR-Code</string>
-  <string name="backup_cookie">Cookie sichern</string>
-  <string name="delete_cookie">Cookie löschen</string>
-  <string name="confirm_cookie_deletion">Cookie-Löschung bestätigen</string>
-  <string name="hosted_services">Gehostete Dienste</string>
   <string name="share_as_qr">Teile als QR-Code</string>
   <string name="disable">Deaktivieren</string>
   <string name="enable">Aktivieren</string>
diff --git a/app-mini/src/main/res/values-el/strings.xml b/app-mini/src/main/res/values-el/strings.xml
index d15f1026..9d9bfc92 100644
--- a/app-mini/src/main/res/values-el/strings.xml
+++ b/app-mini/src/main/res/values-el/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Κάποια εφαρμογή προσπαθεί να ανοίξει την κρυφή θύρα διακομιστή %1$dστο δίκτυο Tor. Πρόκειται για ασφαλή ενέργεια, εφόσον γνωρίζετε την εφαρμογή.</string>
   <string name="found_existing_tor_process">αναζήτηση διεργασιών Tor...</string>
   <string name="something_bad_happened">Κάτι κακό συνέβη. Ελέγξτε τις καταγραφές</string>
-    <string name="unable_to_read_hidden_service_name">αδυναμία ανάγνωσης του ονόματος της κρυφής υπηρεσίας</string>
-  <string name="unable_to_start_tor">Αδυναμία εκκίνησης του Tor:</string>
+    <string name="unable_to_start_tor">Αδυναμία εκκίνησης του Tor:</string>
     <string name="pref_use_persistent_notifications">Να διατηρείται πάντοτε το εικονίδιο στην γραμμή εργαλείων όταν το Orbot συνδέεται</string>
   <string name="pref_use_persistent_notifications_title">Ειδοποιήσεις διαρκούς σύνδεσης</string>
   <string name="pref_use_expanded_notifications">Εμφάνιση εκτεταμένης ειδοποίησης με τη χώρα εξόδου του Tor και τη διεύθυνση IP</string>
@@ -130,7 +129,6 @@
     <string name="send_email">Στείλτε Email</string>
   <string name="vpn_default_world">Παγκόσμια (Auto)</string>
   <string name="hidden_services">Αποκρυφες υπηρεσιες</string>
-  <string name="title_activity_hidden_services">Αποκρυφες υπηρεσιες</string>
   <string name="menu_hidden_services">Αποκρυφες υπηρεσιες</string>
   <string name="save">Αποθήκευση</string>
     <string name="local_port">Τοπική θύρα</string>
@@ -138,7 +136,6 @@
   <string name="name">Όνομα</string>
   <string name="done">Έγινε!</string>
     <string name="copy_address_to_clipboard">Αντιγραφή διέυθυνσης στο πρόχειρο</string>
-  <string name="show_auth_cookie">Εμφάνιση αναγνωριστικού cookie</string>
   <string name="backup_service">Υπηρεσία δημιουργίας αντιγράφου ασφαλείας</string>
   <string name="delete_service">Διαγραφή υπηρεσίας</string>
   <string name="backup_saved_at_external_storage">Το αντίγράφο ασφαλείας αποθηκεύθηκε σε εξωτερικό μέσο αποθήκευσης</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Πατήστε ξανά για το αντίγραφο ασφαλείας</string>
   <string name="service_type">Τύπος υπηρεσίας</string>
   <string name="auth_cookie">Αναγνωριστικό cookie</string>
-  <string name="copy_cookie_to_clipboard">Αντιγραφή τού cookie στο πρόχειρο</string>
-  <string name="auth_cookie_was_not_configured">Το αναγνωριστικό cookie δεν διαμορφώθηκε</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Παρακαλούμε επανεκκινήστε το Orbot για να ενεργοποιήσετε τις αλλαγές</string>
-  <string name="client_cookies">Cookies πελατών</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Ανάγνωση από QR</string>
-  <string name="backup_cookie">Cookie αντίγραφου ασφαλείας </string>
-  <string name="delete_cookie">Αφαίρεση Cookie</string>
-  <string name="confirm_cookie_deletion">Επιβεβαίωση διαγραφής τού cookie </string>
-  <string name="hosted_services">Φιλοξενημένες υπηρεσίες</string>
   <string name="share_as_qr">Κοινοποίηση ως QR</string>
   <string name="disable">Απενεργοποίηση</string>
   <string name="enable">Ενεργοποίηση</string>
diff --git a/app-mini/src/main/res/values-eo/strings.xml b/app-mini/src/main/res/values-eo/strings.xml
index 488fdda3..6210d740 100644
--- a/app-mini/src/main/res/values-eo/strings.xml
+++ b/app-mini/src/main/res/values-eo/strings.xml
@@ -67,8 +67,7 @@
   <string name="enter_ports">Entajpu pordojn</string>
     <string name="project_home">Retpaĝaro(j) de la Projekto:</string>
     <string name="found_existing_tor_process">trovi ekzistantan Tor-procedon...</string>
-    <string name="unable_to_read_hidden_service_name">ne eblas legi nomon de la kaŝita servo</string>
-  <string name="unable_to_start_tor">Ne eblas startigi Tor:</string>
+    <string name="unable_to_start_tor">Ne eblas startigi Tor:</string>
     <string name="set_locale_title">Lingvo</string>
     <string name="activate">Aktivi</string>
   <string name="save">Konservi</string>
diff --git a/app-mini/src/main/res/values-es/strings.xml b/app-mini/src/main/res/values-es/strings.xml
index 39e20868..05214259 100644
--- a/app-mini/src/main/res/values-es/strings.xml
+++ b/app-mini/src/main/res/values-es/strings.xml
@@ -97,8 +97,7 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
   <string name="hidden_service_request">Una aplicación quiere abrir el puerto %1$d de servidor oculto a la red Tor. Esto es seguro si confía en la aplicación.</string>
   <string name="found_existing_tor_process">Se encontró un proceso de Tor ya existente...</string>
   <string name="something_bad_happened">Hubo algún tipo de problema. Compruebe el registro (log)</string>
-    <string name="unable_to_read_hidden_service_name">No fue posible leer el nombre del servicio oculto</string>
-  <string name="unable_to_start_tor">No fue posible iniciar Tor: </string>
+    <string name="unable_to_start_tor">No fue posible iniciar Tor: </string>
     <string name="pref_use_persistent_notifications">Mantener siempre el icono de Orbot en la barra de tareas cuando esté conectado</string>
   <string name="pref_use_persistent_notifications_title">Notificaciones siempre activadas</string>
   <string name="pref_use_expanded_notifications">Mostrar notificación expandida con el país de salida de Tor y la IP</string>
@@ -131,7 +130,6 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
     <string name="send_email">Enviar correo</string>
   <string name="vpn_default_world">Global (Automático)</string>
   <string name="hidden_services">Servicios ocultos</string>
-  <string name="title_activity_hidden_services">Servicios ocultos</string>
   <string name="menu_hidden_services">Servicios ocultos</string>
   <string name="save">Guardar</string>
     <string name="local_port">Puerto local</string>
@@ -139,7 +137,6 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
   <string name="name">Nombre</string>
   <string name="done">¡Hecho!</string>
     <string name="copy_address_to_clipboard">Copiar dirección al portapapeles</string>
-  <string name="show_auth_cookie">Mostrar cookie de autentificación</string>
   <string name="backup_service">Hacer copia de seguridad del servicio</string>
   <string name="delete_service">Borrar servicio</string>
   <string name="backup_saved_at_external_storage">Copia de seguridad guardada en un almacenamiento externo</string>
@@ -150,16 +147,8 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
   <string name="click_again_for_backup">Pulse de nuevo para realizar copia de seguridad</string>
   <string name="service_type">Tipo de servicio</string>
   <string name="auth_cookie">Cookie de autentificación</string>
-  <string name="copy_cookie_to_clipboard">Copiar cookie al portapapeles</string>
-  <string name="auth_cookie_was_not_configured">La cookie de autentificación no fue configurada</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Por favor, reinicie Orbot para habilitar los cambios</string>
-  <string name="client_cookies">Cookies de cliente</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Leer desde QR</string>
-  <string name="backup_cookie">Realizar copia de seguridad de cookie</string>
-  <string name="delete_cookie">Borrar cookie</string>
-  <string name="confirm_cookie_deletion">Confirmar borrado de cookie</string>
-  <string name="hosted_services">Servicios alojados</string>
   <string name="share_as_qr">Compartir como QR</string>
   <string name="disable">Deshabilitar</string>
   <string name="enable">Habilitar</string>
diff --git a/app-mini/src/main/res/values-et/strings.xml b/app-mini/src/main/res/values-et/strings.xml
index a3c8da10..286e76e5 100644
--- a/app-mini/src/main/res/values-et/strings.xml
+++ b/app-mini/src/main/res/values-et/strings.xml
@@ -84,8 +84,7 @@
     <string name="third_party_software">Kolmanda osapoole tarkvara:</string>
   <string name="found_existing_tor_process">leidus töötav Tor protsess...</string>
   <string name="something_bad_happened">Juhtus midagi halba. Kontrollige logi</string>
-    <string name="unable_to_read_hidden_service_name">ei õnnestu lugeda varjatud teenuse nime</string>
-  <string name="unable_to_start_tor">Tor käivitamine ebaõnnestus:</string>
+    <string name="unable_to_start_tor">Tor käivitamine ebaõnnestus:</string>
     <string name="pref_use_persistent_notifications">Ühendatud Orbot korral näidata katkematult ikoonide tööriistariba</string>
   <string name="pref_use_persistent_notifications_title">Pidevalt kuvatavad teated</string>
     <string name="pref_disable_network_title">Pole võrgu auto-und</string>
diff --git a/app-mini/src/main/res/values-eu/strings.xml b/app-mini/src/main/res/values-eu/strings.xml
index 8850ac3c..40f2c73a 100644
--- a/app-mini/src/main/res/values-eu/strings.xml
+++ b/app-mini/src/main/res/values-eu/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Aplikazio batek ezkutuko zerbitzariko %1$d ataka ireki nau du Tor sarera. Segurua da aplikazioaz fidatzen bazara.</string>
   <string name="found_existing_tor_process">aurreko Tor prozesu bat aurkitu da...</string>
   <string name="something_bad_happened">Zerbait txarra gertatu da. Begiratu egunkarian</string>
-    <string name="unable_to_read_hidden_service_name">ezin izan da ezkutuko zerbitzuaren izena irakurri</string>
-  <string name="unable_to_start_tor">Ezin izan da Tor hasi:</string>
+    <string name="unable_to_start_tor">Ezin izan da Tor hasi:</string>
     <string name="pref_use_persistent_notifications">Mantendu ikonoa tresna barran Orbot konektatuta dagoenean</string>
   <string name="pref_use_persistent_notifications_title">Beti piztutako jakinarazpenak</string>
   <string name="pref_use_expanded_notifications">Erakutsi hedatutako jakinarazpenak Tor irteera herrialde eta IP-arekin</string>
@@ -130,7 +129,6 @@
     <string name="send_email">Bidali E-maila</string>
   <string name="vpn_default_world">Orokorra (Automatikoa)</string>
   <string name="hidden_services">Ezkutuko zerbitzuak</string>
-  <string name="title_activity_hidden_services">Ezkutuko zerbitzuak</string>
   <string name="menu_hidden_services">Ezkutuko zerbitzuak</string>
   <string name="save">Gorde</string>
     <string name="local_port">Ataka lokala</string>
@@ -138,7 +136,6 @@
   <string name="name">Izena</string>
   <string name="done">Egina!</string>
     <string name="copy_address_to_clipboard">Kopiatu helbidea arbelera</string>
-  <string name="show_auth_cookie">Erakutsi autentifikazio cookie-a</string>
   <string name="backup_service">Egin zerbitzuaren babeskopia</string>
   <string name="delete_service">Ezabatu zerbitzua</string>
   <string name="backup_saved_at_external_storage">Babeskopia kanpo biltegiratzean gorde da</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Egin klik berriro babeskopiarako</string>
   <string name="service_type">Zerbitzu mota</string>
   <string name="auth_cookie">Autentifikazio cookie-a</string>
-  <string name="copy_cookie_to_clipboard">Kopiatu cookie-a arbelera</string>
-  <string name="auth_cookie_was_not_configured">Ez da autentifikazio cookie-a konfiguratu</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Mesedez berrabiarazi Orbot aldaketak aktibatzeko</string>
-  <string name="client_cookies">Bezero-cookie-ak</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Irakurri QR-tik</string>
-  <string name="backup_cookie">Egin cookie-aren babeskopia</string>
-  <string name="delete_cookie">Ezabatu cookie-a</string>
-  <string name="confirm_cookie_deletion">Berretsi cookie-a ezabatzea</string>
-  <string name="hosted_services">Ostatatutako zerbitzuak</string>
   <string name="share_as_qr">Partekatu QR gisa</string>
   <string name="disable">Desgaitu</string>
   <string name="enable">Gaitu</string>
diff --git a/app-mini/src/main/res/values-fa/strings.xml b/app-mini/src/main/res/values-fa/strings.xml
index cb822f0b..1e6f1e8d 100644
--- a/app-mini/src/main/res/values-fa/strings.xml
+++ b/app-mini/src/main/res/values-fa/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">اپلیکیشنی می‌خواهد پورت سرور %1$d را به شبکه تور بگشاید. در صورتی که به این برنامه اطمینان دارید، چنین کاری امن است.</string>
   <string name="found_existing_tor_process">یک تور درحال اجرا پیدا شد...</string>
   <string name="something_bad_happened">اتفاق بدی افتاد. وقایع ثبت شده را چک کنید</string>
-    <string name="unable_to_read_hidden_service_name">ناتوان در خواندن نام سرویس مخفی</string>
-  <string name="unable_to_start_tor">ناتوان در راه اندازی تور:</string>
+    <string name="unable_to_start_tor">ناتوان در راه اندازی تور:</string>
     <string name="pref_use_persistent_notifications">وقتی ربات پیازی متصل است، همیشه آیکون مربوط را در نوار ابزار نگه دار.</string>
   <string name="pref_use_persistent_notifications_title">آگاهسازی همیشه روشن</string>
   <string name="pref_use_expanded_notifications">نمایش اطلاع رسانی گسترده با کشور خروجی Tor و IP</string>
@@ -130,7 +129,6 @@
     <string name="send_email">ایمیل بفرست</string>
   <string name="vpn_default_world">جهانی (خودکار)</string>
   <string name="hidden_services">سرویس‌های مخفی</string>
-  <string name="title_activity_hidden_services">سرویس‌های مخفی</string>
   <string name="menu_hidden_services">سرویس‌های مخفی</string>
   <string name="save">ذخيره</string>
     <string name="local_port">درگاه محلی</string>
@@ -138,7 +136,6 @@
   <string name="name">نام</string>
   <string name="done">انجام شد!</string>
     <string name="copy_address_to_clipboard">رونوشت نشانی‌ها در حافظه موقت</string>
-  <string name="show_auth_cookie">نمایش کوکی احراز هویت</string>
   <string name="backup_service">سرویس بک‌آپ</string>
   <string name="delete_service">حذف سرویس</string>
   <string name="backup_saved_at_external_storage">بک‌آپ در انباره خارجی ذخیره شد</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">برای بک‌آپ، دوباره کلیک کنید</string>
   <string name="service_type">نوع سرویس</string>
   <string name="auth_cookie">کوکی Auth</string>
-  <string name="copy_cookie_to_clipboard">کپی کردن کوکی به کلیپ بورد</string>
-  <string name="auth_cookie_was_not_configured">کوکی احراز هویت پیکربندی نشده بود</string>
   <string name="please_restart_Orbot_to_enable_the_changes">برای دیدن تغییرات، اوربات  را دوباره راه اندازی کنید</string>
-  <string name="client_cookies">کوکی‌های Client</string>
   <string name="onion">onion.</string>
-  <string name="cookie_from_QR">از QR بخوان</string>
-  <string name="backup_cookie">بک‌آپ از کوکی</string>
-  <string name="delete_cookie">حذف کوکی</string>
-  <string name="confirm_cookie_deletion">تایید حذف کوکی</string>
-  <string name="hosted_services">سرویس‌های میزبانی‌شده</string>
   <string name="share_as_qr">هم‌رسانی با QR</string>
   <string name="disable">غیرفعال کن</string>
   <string name="enable">فعال کن</string>
diff --git a/app-mini/src/main/res/values-fi/strings.xml b/app-mini/src/main/res/values-fi/strings.xml
index 46b634ba..76f31184 100644
--- a/app-mini/src/main/res/values-fi/strings.xml
+++ b/app-mini/src/main/res/values-fi/strings.xml
@@ -91,8 +91,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">löytyi olemassaoleva Tor-prosessi...</string>
   <string name="something_bad_happened">Jotain pahaa tapahtui. Tarkista loki</string>
-  <string name="unable_to_read_hidden_service_name">piilopalvelunimen lukeminen epäonnistui</string>
-  <string name="unable_to_start_tor">Torin käynnistys epäonnistui:</string>
+    <string name="unable_to_start_tor">Torin käynnistys epäonnistui:</string>
   <string name="pref_use_persistent_notifications">Pidä kuvake aina työkalupalkissa, kun Orbot on yhdistetty</string>
   <string name="pref_use_persistent_notifications_title">Ilmoitukset aina käytössä</string>
   <string name="pref_use_expanded_notifications">Näytä laajennettu ilmoitus (Torin ulostulon maa ja IP)</string>
@@ -122,8 +121,7 @@
     <string name="activate">Ota käyttöön</string>
   <string name="send_email">Lähetä sähköpostia</string>
   <string name="hidden_services">Piilopalvelut</string>
-  <string name="title_activity_hidden_services">Piilopalvelut</string>
-  <string name="menu_hidden_services">Piilopalvelut</string>
+    <string name="menu_hidden_services">Piilopalvelut</string>
   <string name="save">Tallenna</string>
   <string name="name">Nimi</string>
   <string name="done">Valmis!</string>
diff --git a/app-mini/src/main/res/values-fr-rFR/strings.xml b/app-mini/src/main/res/values-fr-rFR/strings.xml
index 7fcf32b8..6f1ebb4a 100644
--- a/app-mini/src/main/res/values-fr-rFR/strings.xml
+++ b/app-mini/src/main/res/values-fr-rFR/strings.xml
@@ -91,8 +91,7 @@
   <string name="libevent_version">LibEvent v2.0.21 : http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">un processus existant de Tor a été trouvé...</string>
   <string name="something_bad_happened">Quelque chose n’a pas été. Vérifiez le journal</string>
-    <string name="unable_to_read_hidden_service_name">impossible de lire le nom du service caché</string>
-  <string name="unable_to_start_tor">Impossible de démarrer Tor :</string>
+    <string name="unable_to_start_tor">Impossible de démarrer Tor :</string>
     <string name="pref_use_persistent_notifications">Toujours conserver l’icône dans la barre des tâches quand Orbot est connecté.</string>
   <string name="pref_use_persistent_notifications_title">Notifications toujours actives</string>
   <string name="pref_use_expanded_notifications">Montrer des notifications étendues avec le pays de sortie de Tor et l’IP</string>
diff --git a/app-mini/src/main/res/values-fr/strings.xml b/app-mini/src/main/res/values-fr/strings.xml
index 36a5526f..2ded4be7 100644
--- a/app-mini/src/main/res/values-fr/strings.xml
+++ b/app-mini/src/main/res/values-fr/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Une appli veut ouvrir le port %1$d du serveur caché au réseau Tor. Cela est sécuritaire si vous faites confiance à l’appli.</string>
   <string name="found_existing_tor_process">un processus existant de Tor a été trouvé...</string>
   <string name="something_bad_happened">Quelque chose n’a pas été. Vérifiez le journal</string>
-    <string name="unable_to_read_hidden_service_name">impossible de lire le nom du service caché</string>
-  <string name="unable_to_start_tor">Impossible de démarrer Tor :</string>
+    <string name="unable_to_start_tor">Impossible de démarrer Tor :</string>
     <string name="pref_use_persistent_notifications">Toujours conserver l’icône dans la barre des tâches quand Orbot est connecté.</string>
   <string name="pref_use_persistent_notifications_title">Notifications toujours actives</string>
   <string name="pref_use_expanded_notifications">Montrer des notifications étendues avec le pays de sortie de Tor et l’IP</string>
@@ -130,7 +129,6 @@
     <string name="send_email">Envoyer un courriel</string>
   <string name="vpn_default_world">Mondial (Auto)</string>
   <string name="hidden_services">Services cachés</string>
-  <string name="title_activity_hidden_services">Services cachés</string>
   <string name="menu_hidden_services">Services cachés</string>
   <string name="save">Enregistrer</string>
     <string name="local_port">Port local</string>
@@ -138,7 +136,6 @@
   <string name="name">Nom</string>
   <string name="done">Fait !</string>
     <string name="copy_address_to_clipboard">Copier l’adresse vers le presse-papiers</string>
-  <string name="show_auth_cookie">Afficher le témoin auth</string>
   <string name="backup_service">Service de sauvegarde</string>
   <string name="delete_service">Supprimer le service</string>
   <string name="backup_saved_at_external_storage">La sauvegarde a été enregistrée sur une mémoire externe</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Recliquer pour sauvegarder</string>
   <string name="service_type">Type de service</string>
   <string name="auth_cookie">Témoin auth</string>
-  <string name="copy_cookie_to_clipboard">Copier le témoin vers le presse-papiers</string>
-  <string name="auth_cookie_was_not_configured">Le témoin auth n’est pas configuré</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Veuillez redémarrer Orbot pour activer les changements</string>
-  <string name="client_cookies">Témoins du client</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Lire d’un code QR</string>
-  <string name="backup_cookie">Sauvegarder le témoin</string>
-  <string name="delete_cookie">Supprimer le témoin</string>
-  <string name="confirm_cookie_deletion">Confirmer la suppression du témoin</string>
-  <string name="hosted_services">Services hébergés</string>
   <string name="share_as_qr">Partager comme code QR</string>
   <string name="disable">Désactiver</string>
   <string name="enable">Activer</string>
diff --git a/app-mini/src/main/res/values-gl/strings.xml b/app-mini/src/main/res/values-gl/strings.xml
index 9597d09c..91dd5df1 100644
--- a/app-mini/src/main/res/values-gl/strings.xml
+++ b/app-mini/src/main/res/values-gl/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Unha aplicación quere abrir o porto oculto de servidor %1$d a rede Tor. Esto é seguro se vostede confía na app.</string>
   <string name="found_existing_tor_process">atopado proceso Tor existente...</string>
   <string name="something_bad_happened">Algo malo pasou. Comprobe o rexistro</string>
-    <string name="unable_to_read_hidden_service_name">imposible ler nome de servizo oculto</string>
-  <string name="unable_to_start_tor">Incapaz de arrancar Tor</string>
+    <string name="unable_to_start_tor">Incapaz de arrancar Tor</string>
     <string name="pref_use_persistent_notifications">Mostrar sempre a icona na barra de ferramentas cando Orbot estea conectado</string>
   <string name="pref_use_persistent_notifications_title">Notificacións Sempre Acesas</string>
   <string name="pref_use_expanded_notifications">Mostar notificación extendida co país de saída de Tor e IP</string>
@@ -130,7 +129,6 @@
     <string name="send_email">Enviar correo</string>
   <string name="vpn_default_world">Global (Auto)</string>
   <string name="hidden_services">Servizos agochados</string>
-  <string name="title_activity_hidden_services">Servizos agochados</string>
   <string name="menu_hidden_services">Servizos agochados</string>
   <string name="save">Gardar</string>
     <string name="local_port">Porto local</string>
@@ -138,7 +136,6 @@
   <string name="name">Nome</string>
   <string name="done">Feito!</string>
     <string name="copy_address_to_clipboard">Copiar enderezo ao portapapeis</string>
-  <string name="show_auth_cookie">Mostar testemuño de autorización</string>
   <string name="backup_service">Servizo de respaldo</string>
   <string name="delete_service">Eliminar servizo</string>
   <string name="backup_saved_at_external_storage">Respaldo gardado en almacenamento externo</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Pulse de novo para respaldar</string>
   <string name="service_type">Tipo de servizo</string>
   <string name="auth_cookie">Testemuño de autorización</string>
-  <string name="copy_cookie_to_clipboard">Copie o testemuño ao portapapeis</string>
-  <string name="auth_cookie_was_not_configured">Non estableceu un testemuño de autorización</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Por favor, reinicie Orbot para activar os cambios</string>
-  <string name="client_cookies">Testemuños do cliente</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Ler desde QR</string>
-  <string name="backup_cookie">Testemuño de respaldo</string>
-  <string name="delete_cookie">Eliminar testemuño</string>
-  <string name="confirm_cookie_deletion">Confirme a eliminación do testemuño</string>
-  <string name="hosted_services">Servizos hospedados</string>
   <string name="share_as_qr">Compartir como QR</string>
   <string name="disable">Inhabilitar</string>
   <string name="enable">Activar</string>
diff --git a/app-mini/src/main/res/values-hi/strings.xml b/app-mini/src/main/res/values-hi/strings.xml
index 919048e2..6a884aea 100644
--- a/app-mini/src/main/res/values-hi/strings.xml
+++ b/app-mini/src/main/res/values-hi/strings.xml
@@ -97,8 +97,7 @@
   <string name="hidden_service_request">एक ऐप Tor नेटवर्क पर %1$dछिपा सर्वर पोर्ट खोलना चाहता है। यदि आप ऐप पर विश्वास करते हैं, तो यह सुरक्षित है</string>
   <string name="found_existing_tor_process">मौजूदा तोर प्रक्रिया पाया ...</string>
   <string name="something_bad_happened">कुछ बुरा हो गया। लॉग की जांच करें</string>
-    <string name="unable_to_read_hidden_service_name">छिपी हुई सेवा का नाम पढ़ने में असमर्थ</string>
-  <string name="unable_to_start_tor">टो शुरू करने में असमर्थ:</string>
+    <string name="unable_to_start_tor">टो शुरू करने में असमर्थ:</string>
     <string name="pref_use_persistent_notifications">ऑरबोट कनेक्ट होने पर टूलबार में हमेशा आइकन रखें</string>
   <string name="pref_use_persistent_notifications_title">हमेशा की सूचनाएं</string>
   <string name="pref_use_expanded_notifications">तोर एग्जिट देश और आईपी के साथ विस्तारित सूचना दिखाएं</string>
@@ -131,7 +130,6 @@
     <string name="send_email">ईमेल भेजें</string>
   <string name="vpn_default_world">ग्लोबल (ऑटो)</string>
   <string name="hidden_services">हिडन सेवाएं</string>
-  <string name="title_activity_hidden_services">हिडन सेवाएं</string>
   <string name="menu_hidden_services">हिडन सेवाएं</string>
   <string name="save">बचाना</string>
     <string name="local_port">स्थानीय पोर्ट</string>
@@ -139,7 +137,6 @@
   <string name="name">नाम</string>
   <string name="done">किया हुआ!</string>
     <string name="copy_address_to_clipboard">क्लिपबोर्ड को पता कॉपी करें</string>
-  <string name="show_auth_cookie">Auth कुकी दिखाएं</string>
   <string name="backup_service">बैकअप सेवा</string>
   <string name="delete_service">सेवा हटाएँ</string>
   <string name="backup_saved_at_external_storage">बाह्य संग्रहण में बैकअप सहेजा गया</string>
@@ -150,16 +147,8 @@
   <string name="click_again_for_backup">बैकअप के लिए फिर से क्लिक करें</string>
   <string name="service_type">सेवा प्रकार</string>
   <string name="auth_cookie">Auth कुकी</string>
-  <string name="copy_cookie_to_clipboard">क्लिपबोर्ड पर कुकी कॉपी करें</string>
-  <string name="auth_cookie_was_not_configured">Auth कुकी कॉन्फ़िगर नहीं की गई थी</string>
   <string name="please_restart_Orbot_to_enable_the_changes">परिवर्तन सक्षम करने के लिए Orbot पुनः प्रारंभ करें</string>
-  <string name="client_cookies">क्लाइंट कुकीज़</string>
   <string name="onion">.अनियन </string>
-  <string name="cookie_from_QR">QR से पढ़ें</string>
-  <string name="backup_cookie">बैकअप कुकी</string>
-  <string name="delete_cookie">कुकी हटाएं</string>
-  <string name="confirm_cookie_deletion">कुकी हटाने की पुष्टि करें</string>
-  <string name="hosted_services">होस्टेड सर्विसेस</string>
   <string name="share_as_qr">QR के रूप में शेयर करें</string>
   <string name="disable">अक्षम</string>
   <string name="enable">सक्षम करें</string>
diff --git a/app-mini/src/main/res/values-hr/strings.xml b/app-mini/src/main/res/values-hr/strings.xml
index 62a2945c..1d8f9fe5 100644
--- a/app-mini/src/main/res/values-hr/strings.xml
+++ b/app-mini/src/main/res/values-hr/strings.xml
@@ -91,8 +91,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">pronađeni postojeći Tor procesi...</string>
   <string name="something_bad_happened">Nešto loše se dogodilo. Provjerite dnevnik</string>
-  <string name="unable_to_read_hidden_service_name">nije moguće pročitati ime skrivene usluge</string>
-  <string name="unable_to_start_tor">Nije moguće pokrenuti Tor:</string>
+    <string name="unable_to_start_tor">Nije moguće pokrenuti Tor:</string>
   <string name="pref_use_persistent_notifications">Uvjek drži ikonu na alatnoj traci kad je Orbot spojen</string>
   <string name="pref_use_persistent_notifications_title">Obavijesti o stalnoj pokrenutosti</string>
   <string name="pref_use_expanded_notifications">Prikaži proširene obavijesti s Tor izlaznom državom i IP-em</string>
diff --git a/app-mini/src/main/res/values-hu/strings.xml b/app-mini/src/main/res/values-hu/strings.xml
index 33932aa1..6df55d32 100644
--- a/app-mini/src/main/res/values-hu/strings.xml
+++ b/app-mini/src/main/res/values-hu/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Egy app egy rejtett szerver portot %1$d nyitna a Tor hálózatra. Ez biztonságos, ha megbízik az appban.</string>
   <string name="found_existing_tor_process">létező Tor folyamat találva...</string>
   <string name="something_bad_happened">Valami rossz történt. Nézd meg a naplót.</string>
-    <string name="unable_to_read_hidden_service_name">nem olvasható a rejtett szolgáltatás neve</string>
-  <string name="unable_to_start_tor">A Tor indítása sikertelen:</string>
+    <string name="unable_to_start_tor">A Tor indítása sikertelen:</string>
     <string name="pref_use_persistent_notifications">Mindig tartsa az ikont az eszköztáron, ha az Orbot csatlakoztatva van.</string>
   <string name="pref_use_persistent_notifications_title">Mindig-bekapcsolt értesítések</string>
   <string name="pref_use_expanded_notifications">Mutassa a bővített értesítést a Tor kilépő országgal és IP-vel</string>
@@ -130,7 +129,6 @@
     <string name="send_email">Email küldése</string>
   <string name="vpn_default_world">Globális (Auto)</string>
   <string name="hidden_services">Rejtett szolgáltatások</string>
-  <string name="title_activity_hidden_services">Rejtett szolgáltatások</string>
   <string name="menu_hidden_services">Rejtett szolgáltatások</string>
   <string name="save">Mentés</string>
     <string name="local_port">Helyi Port</string>
@@ -138,7 +136,6 @@
   <string name="name">Név</string>
   <string name="done">Kész!</string>
     <string name="copy_address_to_clipboard">Cím másolása vágólapra</string>
-  <string name="show_auth_cookie">Azonosító süti megjelenítése</string>
   <string name="backup_service">Mentő szolgáltatás</string>
   <string name="delete_service">Szolgáltatás Törlése</string>
   <string name="backup_saved_at_external_storage">Külső tárhelyre mentve</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Kattintson még egyszer a mentéshez</string>
   <string name="service_type">Szolgáltatás típus</string>
   <string name="auth_cookie">Azonosító süti</string>
-  <string name="copy_cookie_to_clipboard">Süti másolása vágólapra</string>
-  <string name="auth_cookie_was_not_configured">Azonosító süti nem konfigurált</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Kérlek indítsd újra az Orbot-ot a változások engedélyezéséhez</string>
-  <string name="client_cookies">Kliens sütik</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Olvasás QR-ból</string>
-  <string name="backup_cookie">Süti mentése</string>
-  <string name="delete_cookie">Süti törlése</string>
-  <string name="confirm_cookie_deletion">Süti törlés jóváhagyása</string>
-  <string name="hosted_services">Futtatott szolgáltatások</string>
   <string name="share_as_qr">Megosztás QR-ként</string>
   <string name="disable">Kikapcsol</string>
   <string name="enable">Engedélyezés</string>
diff --git a/app-mini/src/main/res/values-in/strings.xml b/app-mini/src/main/res/values-in/strings.xml
index d9906e11..e12fa86a 100644
--- a/app-mini/src/main/res/values-in/strings.xml
+++ b/app-mini/src/main/res/values-in/strings.xml
@@ -91,8 +91,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">menemukan proses Tor yang ada...</string>
   <string name="something_bad_happened">Sesuatu yang buruk terjadi. Periksa log</string>
-    <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama layanan tersembunyi</string>
-  <string name="unable_to_start_tor">Tidak dapat memulai Tor:</string>
+    <string name="unable_to_start_tor">Tidak dapat memulai Tor:</string>
     <string name="pref_use_persistent_notifications">Selalu pelihara icon dalam toolbar ketika Orbot terhubung</string>
   <string name="pref_use_persistent_notifications_title">Pemberitahuan Selalu-Hidup</string>
   <string name="pref_use_expanded_notifications">Tampilkan notifikasi melebar dengan negara dan IP keluar Tor</string>
diff --git a/app-mini/src/main/res/values-is/strings.xml b/app-mini/src/main/res/values-is/strings.xml
index 0de01a5a..542f5545 100644
--- a/app-mini/src/main/res/values-is/strings.xml
+++ b/app-mini/src/main/res/values-is/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Forrit vill opna földu vefgáttina %1$d inn á Tor-netið. Þetta er öruggt ef þú treystir forritinu.</string>
   <string name="found_existing_tor_process">fann annað Tor-ferli...</string>
   <string name="something_bad_happened">Eitthvað slæmt gerðist. Athugaðu atvikakráninguna</string>
-    <string name="unable_to_read_hidden_service_name">get ekki lesið heiti földu þjónustunnar</string>
-  <string name="unable_to_start_tor">Get ekki ræst Tor:</string>
+    <string name="unable_to_start_tor">Get ekki ræst Tor:</string>
     <string name="pref_use_persistent_notifications">Alltaf hafa táknmynd í verkfærastiku þegar Orbot er tengt</string>
   <string name="pref_use_persistent_notifications_title">Alltaf-á tilkynningar</string>
   <string name="pref_use_expanded_notifications">Birta útflettar tilkynningar varðandi Tor-útgangsland og IP-vistfang</string>
@@ -130,7 +129,6 @@
     <string name="send_email">Senda tölvupóst</string>
   <string name="vpn_default_world">Víðvært (sjálfvirkt)</string>
   <string name="hidden_services">Faldar þjónustur</string>
-  <string name="title_activity_hidden_services">Faldar þjónustur</string>
   <string name="menu_hidden_services">Faldar þjónustur</string>
   <string name="save">Vista</string>
     <string name="local_port">Staðvær gátt</string>
@@ -138,7 +136,6 @@
   <string name="name">Heiti</string>
   <string name="done">Lokið!</string>
     <string name="copy_address_to_clipboard">Afrita vistfang yfir á klippispjald</string>
-  <string name="show_auth_cookie">Birta auðkenningar-vefköku</string>
   <string name="backup_service">Öryggisafritunarþjónusta</string>
   <string name="delete_service">Eyða þjónustu</string>
   <string name="backup_saved_at_external_storage">Öryggisafrit var vistað í ytri gagnageymslu</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Smelltu aftur fyrir öryggisafrit</string>
   <string name="service_type">Tegund þjónustu</string>
   <string name="auth_cookie">Auðkenningar-vefkaka</string>
-  <string name="copy_cookie_to_clipboard">Afrita vefköku á klippispjald</string>
-  <string name="auth_cookie_was_not_configured">Auðkenningar-vefkaka var ekki stillt</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Endurræstu Orbot til að breytingarnar taki gildi</string>
-  <string name="client_cookies">Vefkökur forritsins</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Lesa úr QR-kóða</string>
-  <string name="backup_cookie">Öryggisafrit af vefköku</string>
-  <string name="delete_cookie">Eyða vefköku</string>
-  <string name="confirm_cookie_deletion">Staðfestu eyðingu vefköku</string>
-  <string name="hosted_services">Hýstar þjónustur</string>
   <string name="share_as_qr">Deila sem QR-kóða</string>
   <string name="disable">Gera óvirkt</string>
   <string name="enable">Virkja</string>
diff --git a/app-mini/src/main/res/values-it/strings.xml b/app-mini/src/main/res/values-it/strings.xml
index f8509416..96f07e7c 100644
--- a/app-mini/src/main/res/values-it/strings.xml
+++ b/app-mini/src/main/res/values-it/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Un\'app vuole aprire la porta %1$d del server nascosto alla rete Tor. È un\'azione sicura se ti fidi dell\'app.</string>
   <string name="found_existing_tor_process">trovato un processo Tor esistente...</string>
   <string name="something_bad_happened">E\' accaduto un evento indesiderato. Controllare i log.</string>
-    <string name="unable_to_read_hidden_service_name">Impossibile leggere il nome del servizio nascosto.</string>
-  <string name="unable_to_start_tor">Impossibile avviare Tor:</string>
+    <string name="unable_to_start_tor">Impossibile avviare Tor:</string>
     <string name="pref_use_persistent_notifications">Mantieni sempre l\'icona nella barra degli strumenti quando Orbot è connesso.</string>
   <string name="pref_use_persistent_notifications_title">Notifiche sempre attive</string>
   <string name="pref_use_expanded_notifications">Visualizza notifica espansa con nazione e ip dell\'nodo d\'uscita Tor</string>
@@ -130,7 +129,6 @@
     <string name="send_email">Invia email</string>
   <string name="vpn_default_world">Globale (Auto)</string>
   <string name="hidden_services">Servizi nascosti</string>
-  <string name="title_activity_hidden_services">Servizi nascosti</string>
   <string name="menu_hidden_services">Servizi nascosti</string>
   <string name="save">Salva</string>
     <string name="local_port">Porta locale</string>
@@ -138,7 +136,6 @@
   <string name="name">Nome</string>
   <string name="done">Fatto!</string>
     <string name="copy_address_to_clipboard">Copia l\'indirizzo negli appunti</string>
-  <string name="show_auth_cookie">Mostra cookie di autenticazione</string>
   <string name="backup_service">Servizio di backup</string>
   <string name="delete_service">Elimina il servizio</string>
   <string name="backup_saved_at_external_storage">Backup salvato nell\'archiviazione esterna</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Clicca ancora per eseguire il backup</string>
   <string name="service_type">Tipo di servizio</string>
   <string name="auth_cookie">Cookie autenticazione</string>
-  <string name="copy_cookie_to_clipboard">Copia cookie negli appunti</string>
-  <string name="auth_cookie_was_not_configured">Cookie di autenticazione non configurato</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Per favore riavvia Orbot per rendere effettive le modifiche</string>
-  <string name="client_cookies">Cookie del client</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Leggi da QR</string>
-  <string name="backup_cookie">Backup cookie</string>
-  <string name="delete_cookie">Elimina cookie</string>
-  <string name="confirm_cookie_deletion">Conferma eliminazione cookie</string>
-  <string name="hosted_services">Servizi ospitati</string>
   <string name="share_as_qr">Condividi come QR</string>
   <string name="disable">Disabilita</string>
   <string name="enable">Abilità </string>
diff --git a/app-mini/src/main/res/values-iw/strings.xml b/app-mini/src/main/res/values-iw/strings.xml
index 26b18ee7..67b62dbb 100644
--- a/app-mini/src/main/res/values-iw/strings.xml
+++ b/app-mini/src/main/res/values-iw/strings.xml
@@ -81,8 +81,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
     <string name="found_existing_tor_process">× ×ž×¦× תהליך Tor קיים…</string>
   <string name="something_bad_happened">משהו רע התרחש. בדוק את היומן</string>
-    <string name="unable_to_read_hidden_service_name">לא מסוגל לקרוא שם שירות × ×¡×ª×¨</string>
-  <string name="unable_to_start_tor">לא מסוגל להתחיל את Tor:</string>
+    <string name="unable_to_start_tor">לא מסוגל להתחיל את Tor:</string>
     <string name="pref_use_persistent_notifications">לשמור תמיד את האיקון בסרגל כלים כשאורבוט מחובר</string>
     <string name="set_locale_title">שפה</string>
   <string name="pref_disable_network_summary">כבה את Tor כאשר אין חיבור ×œ××™× ×˜×¨× ×˜</string>
diff --git a/app-mini/src/main/res/values-ja/strings.xml b/app-mini/src/main/res/values-ja/strings.xml
index c6440930..ec092fbc 100644
--- a/app-mini/src/main/res/values-ja/strings.xml
+++ b/app-mini/src/main/res/values-ja/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">アプリが非公開サーバーポート %1$d ã‚’Torãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«é–‹æ”¾ã—ã‚ˆã†ã¨ã—ã¦ã„ã¾ã™ã€‚ä¿¡é ¼ã§ãã‚‹ã‚¢ãƒ—ãƒªã§ã‚ã‚Œã°ã“ã‚Œã¯å®‰å…¨ã§ã™ã€‚</string>
   <string name="found_existing_tor_process">Torプロセスを発見</string>
   <string name="something_bad_happened">何かが起こりました。ログを確認してください。</string>
-    <string name="unable_to_read_hidden_service_name">hidden serviceの名前読込不能</string>
-  <string name="unable_to_start_tor">Torを実行できませんでした</string>
+    <string name="unable_to_start_tor">Torを実行できませんでした</string>
     <string name="pref_use_persistent_notifications">Orbotが接続中はアイコンを常にツールバーに表示</string>
   <string name="pref_use_persistent_notifications_title">通知を常に有効化</string>
   <string name="pref_use_expanded_notifications">拡張通知で、Torの出口の国とIPを表示します</string>
@@ -130,7 +129,6 @@
     <string name="send_email">メール送信</string>
   <string name="vpn_default_world">世界中 (自動)</string>
   <string name="hidden_services">Hidden Services</string>
-  <string name="title_activity_hidden_services">Hidden Services</string>
   <string name="menu_hidden_services">Hidden Services</string>
   <string name="save">保存</string>
     <string name="local_port">ローカルポート</string>
@@ -138,7 +136,6 @@
   <string name="name">名前</string>
   <string name="done">完了</string>
     <string name="copy_address_to_clipboard">アドレスをクリップボードにコピー</string>
-  <string name="show_auth_cookie">Cookie 認証を非表示</string>
   <string name="backup_service">バックアップサービス</string>
   <string name="delete_service">サービスを削除</string>
   <string name="backup_saved_at_external_storage">バックアップは外部記憶装置に保存されました</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">バックアップ作成に再クリック</string>
   <string name="service_type">サービスタイプ</string>
   <string name="auth_cookie">Cookie 認証</string>
-  <string name="copy_cookie_to_clipboard">Cookie をクリップボードにコピー</string>
-  <string name="auth_cookie_was_not_configured">Authクッキーは設定されませんでした</string>
   <string name="please_restart_Orbot_to_enable_the_changes">変更を有効にするにはOrbotを再起動してください</string>
-  <string name="client_cookies">クライアント Cookie</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">QRコードから読み取り</string>
-  <string name="backup_cookie">Cookie をバックアップ</string>
-  <string name="delete_cookie">Cookie を削除</string>
-  <string name="confirm_cookie_deletion">クッキー削除を確認</string>
-  <string name="hosted_services">ホスト型サービス</string>
   <string name="share_as_qr">QR でシェア</string>
   <string name="disable">無効</string>
   <string name="enable">有効</string>
diff --git a/app-mini/src/main/res/values-ko/strings.xml b/app-mini/src/main/res/values-ko/strings.xml
index bec5cc06..a8083685 100644
--- a/app-mini/src/main/res/values-ko/strings.xml
+++ b/app-mini/src/main/res/values-ko/strings.xml
@@ -91,8 +91,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">ì¡´ìž¬í•˜ê³  있는 Tor 프로세스 발견</string>
   <string name="something_bad_happened">어떤 나쁜 것이 발생. 로그 확인하세요.</string>
-    <string name="unable_to_read_hidden_service_name">ížˆë“  서비스 이름을 읽을 수 없음</string>
-  <string name="unable_to_start_tor">Tor 시작 불가능</string>
+    <string name="unable_to_start_tor">Tor 시작 불가능</string>
     <string name="pref_use_persistent_notifications">Orbot이 연결되었을 때 툴바에 아이콘 보이기</string>
   <string name="pref_use_persistent_notifications_title">항상 켜진 알림</string>
   <string name="pref_use_expanded_notifications">출구 및 IP ì •ë³´ì•Œë¦¼ 보이기</string>
diff --git a/app-mini/src/main/res/values-lv/strings.xml b/app-mini/src/main/res/values-lv/strings.xml
index 51f936ad..8ecc351f 100644
--- a/app-mini/src/main/res/values-lv/strings.xml
+++ b/app-mini/src/main/res/values-lv/strings.xml
@@ -91,8 +91,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">Atrada esošu Tor procesu...</string>
   <string name="something_bad_happened">Nav labi. Pārbaudiet žurnālu</string>
-    <string name="unable_to_read_hidden_service_name">Nespēj lasīt slēpta pakalpojuma nosaukumu</string>
-  <string name="unable_to_start_tor">Nevar startēt Tor:</string>
+    <string name="unable_to_start_tor">Nevar startēt Tor:</string>
     <string name="pref_use_persistent_notifications">Vienmēr paturēt ikonu rīkjoslā, kad Orbot ir savienots</string>
   <string name="pref_use_persistent_notifications_title">Vienmēr ieslēgtie paziņojumi</string>
   <string name="pref_use_expanded_notifications">Rādīt paplašinātus paziņojumus, kur norādīts IP un Tor izejas valsts</string>
@@ -122,8 +121,7 @@
     <string name="activate">Aktivizēt</string>
   <string name="send_email">Nosūtīt e-pastu</string>
   <string name="hidden_services">Slēptie pakalpojumi</string>
-  <string name="title_activity_hidden_services">Slēptie pakalpojumi</string>
-  <string name="menu_hidden_services">Slēptie pakalpojumi</string>
+    <string name="menu_hidden_services">Slēptie pakalpojumi</string>
   <string name="save">Saglabāt</string>
   <string name="name">Vārds</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Lūdzu pārstartējiet Orbot, lai iespējotu izmaiņas</string>
diff --git a/app-mini/src/main/res/values-mk/strings.xml b/app-mini/src/main/res/values-mk/strings.xml
index c8015664..ecf2e8c9 100644
--- a/app-mini/src/main/res/values-mk/strings.xml
+++ b/app-mini/src/main/res/values-mk/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Апликација сака да отвори сокриена серверска порта %1$d кон Tor мрежата. Ова е безбедно доколку и верувате на апликацијата.</string>
   <string name="found_existing_tor_process">Пронајден постоечки Tor-процес ...</string>
   <string name="something_bad_happened">Се случи грешка. Проверете го дневникот</string>
-  <string name="unable_to_read_hidden_service_name">не може да се прочита името на скриениот сервис</string>
-  <string name="unable_to_start_tor">Tor не може да се стартува:</string>
+    <string name="unable_to_start_tor">Tor не може да се стартува:</string>
   <string name="pref_use_persistent_notifications">Секогаш чувајте ја иконата во лентата со алатки кога Orbot е поврзан</string>
   <string name="pref_use_persistent_notifications_title">Известувања секогаш вклучени</string>
   <string name="pref_use_expanded_notifications">Прикажи проширено известување со излезната држава и IP на Tor</string>
@@ -130,7 +129,6 @@
   <string name="send_email">Испратете е-пошта</string>
   <string name="vpn_default_world">Глобално (Автоматски)</string>
   <string name="hidden_services">Скриени сервиси</string>
-  <string name="title_activity_hidden_services">Скриени сервиси</string>
   <string name="menu_hidden_services">Скриени сервиси</string>
   <string name="save">Зачувај</string>
   <string name="local_port">Локална порта</string>
@@ -138,7 +136,6 @@
   <string name="name">Име</string>
   <string name="done">Завршено!</string>
     <string name="copy_address_to_clipboard">Копирај ја адресата за залепување</string>
-  <string name="show_auth_cookie">Покажи автентично колаче</string>
   <string name="backup_service">Резервна копија</string>
   <string name="delete_service">Избриши услуга</string>
   <string name="backup_saved_at_external_storage">Резервната копија е снимена на надворешна меморија</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Кликни повторно за резервна копија</string>
   <string name="service_type">Тип на услуга</string>
   <string name="auth_cookie">Автентично колаче</string>
-  <string name="copy_cookie_to_clipboard">Копирај колаче за залепување</string>
-  <string name="auth_cookie_was_not_configured">Автентичното колаче не е прилагодено</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Ве молиме стартувајте го повторно Orbot за да се овозможат промените</string>
-  <string name="client_cookies">Клиентски колачиња</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Прочитај од QR</string>
-  <string name="backup_cookie">Направи резервна копија на колаче</string>
-  <string name="delete_cookie">Избриши колаче</string>
-  <string name="confirm_cookie_deletion">Потврди бришење на колаче</string>
-  <string name="hosted_services">Хостирани услуги</string>
   <string name="share_as_qr">Сподели како QR</string>
   <string name="disable">Оневозможи</string>
   <string name="enable">Овозможи</string>
diff --git a/app-mini/src/main/res/values-ms-rMY/strings.xml b/app-mini/src/main/res/values-ms-rMY/strings.xml
index 071423e6..92e4c0c8 100644
--- a/app-mini/src/main/res/values-ms-rMY/strings.xml
+++ b/app-mini/src/main/res/values-ms-rMY/strings.xml
@@ -82,14 +82,12 @@
     <string name="third_party_software">3rd-Party-Software: </string>
   <string name="found_existing_tor_process">Proses Tor sedia ada ditemui..</string>
   <string name="something_bad_happened">Sesuatu yang buruk berlaku. Semak log.</string>
-    <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama servis tersembunyi</string>
-  <string name="unable_to_start_tor">Tidak dapat memulakan Tor:</string>
+    <string name="unable_to_start_tor">Tidak dapat memulakan Tor:</string>
     <string name="pref_use_persistent_notifications">Sentiasa biar ikon pada toolbar apabila Orbot bersambung</string>
   <string name="pref_use_persistent_notifications_title">Sentiasa On Notifikasi</string>
     <string name="set_locale_title">Bahasa</string>
     <string name="hidden_services">Perkhidmatan tersembunyi</string>
-  <string name="title_activity_hidden_services">Perkhidmatan tersembunyi</string>
-  <string name="menu_hidden_services">Perkhidmatan tersembunyi</string>
+    <string name="menu_hidden_services">Perkhidmatan tersembunyi</string>
   <string name="save">Simpan</string>
   <string name="name">Nama</string>
 </resources>
diff --git a/app-mini/src/main/res/values-ms/strings.xml b/app-mini/src/main/res/values-ms/strings.xml
index c72da21c..92d56d8a 100644
--- a/app-mini/src/main/res/values-ms/strings.xml
+++ b/app-mini/src/main/res/values-ms/strings.xml
@@ -75,8 +75,7 @@
     <string name="third_party_software">3rd-Party-Software: </string>
   <string name="found_existing_tor_process">Proses Tor sedia ada ditemui..</string>
   <string name="something_bad_happened">Sesuatu yang buruk berlaku. Semak log.</string>
-    <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama servis tersembunyi</string>
-  <string name="unable_to_start_tor">Tidak dapat memulakan Tor:</string>
+    <string name="unable_to_start_tor">Tidak dapat memulakan Tor:</string>
     <string name="pref_use_persistent_notifications">Sentiasa biar ikon pada toolbar apabila Orbot bersambung</string>
   <string name="pref_use_persistent_notifications_title">Sentiasa On Notifikasi</string>
     <string name="set_locale_title">Tetapan Tempatan</string>
diff --git a/app-mini/src/main/res/values-my/strings.xml b/app-mini/src/main/res/values-my/strings.xml
index f307da9f..12e4d2b7 100644
--- a/app-mini/src/main/res/values-my/strings.xml
+++ b/app-mini/src/main/res/values-my/strings.xml
@@ -23,8 +23,7 @@
   <string name="get_bridges_email">အီးေမးလ္</string>
   <string name="activate">Activate</string>
   <string name="hidden_services">Hidden Services</string>
-  <string name="title_activity_hidden_services">Hidden Services</string>
-  <string name="menu_hidden_services">Hidden Services</string>
+    <string name="menu_hidden_services">Hidden Services</string>
   <string name="save">သိမ္းဆည္းပါ</string>
   <string name="name">အမည်</string>
 </resources>
diff --git a/app-mini/src/main/res/values-nb/strings.xml b/app-mini/src/main/res/values-nb/strings.xml
index 1a281b9c..f83f0a71 100644
--- a/app-mini/src/main/res/values-nb/strings.xml
+++ b/app-mini/src/main/res/values-nb/strings.xml
@@ -93,8 +93,7 @@
   <string name="openssl_version">OpenSSL v1.0.2j: https://www.openssl.org</string>
   <string name="found_existing_tor_process">fant eksisterende Tor-prosess…</string>
   <string name="something_bad_happened">Noe alvorlig skjedde. Sjekk loggen.</string>
-    <string name="unable_to_read_hidden_service_name">klarte ikke å lese skjult tjenestenavn</string>
-  <string name="unable_to_start_tor">Klarte ikke å starte Tor:</string>
+    <string name="unable_to_start_tor">Klarte ikke å starte Tor:</string>
     <string name="pref_use_persistent_notifications">Alltid behold ikonet i verktøyslinjen når Orbot er tilkoblet</string>
   <string name="pref_use_persistent_notifications_title">Alltid-PÃ¥ -varslinger</string>
   <string name="pref_use_expanded_notifications">Vis utvidede merknader med land og IP for utgangstrafikk fra Tor</string>
@@ -125,7 +124,6 @@
   <string name="apps_mode">VPN-modus</string>
   <string name="send_email">Send e-post</string>
   <string name="hidden_services">Hidden Services</string>
-  <string name="title_activity_hidden_services">Hidden Services</string>
   <string name="menu_hidden_services">Hidden Services</string>
   <string name="save">Lagre</string>
     <string name="local_port">Lokalt port</string>
@@ -141,15 +139,8 @@
   <string name="confirm_service_deletion">Bekreft sletting av tjeneste</string>
   <string name="click_again_for_backup">Klikk igjen for å sikkerhetskopiere</string>
   <string name="service_type">Tjenestetype</string>
-  <string name="copy_cookie_to_clipboard">Kopier kake til utklippstavle</string>
-  <string name="please_restart_Orbot_to_enable_the_changes">Gjør omstart av Orbot før endringer trer i kraft</string>
-  <string name="client_cookies">Klientinformasjonskapsler</string>
+    <string name="please_restart_Orbot_to_enable_the_changes">Gjør omstart av Orbot før endringer trer i kraft</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Les fra QR</string>
-  <string name="backup_cookie">Sikkerhetskopier informasjonskapsel</string>
-  <string name="delete_cookie">Slett informasjonskapsel</string>
-  <string name="confirm_cookie_deletion">Bekreft sletting av informasjonskapsel</string>
-  <string name="hosted_services">Vertstjenester</string>
   <string name="share_as_qr">Del som QR</string>
   <string name="disable">Skru av</string>
   <string name="enable">Slå på</string>
diff --git a/app-mini/src/main/res/values-nl/strings.xml b/app-mini/src/main/res/values-nl/strings.xml
index ad6fa2d5..6e2eab34 100644
--- a/app-mini/src/main/res/values-nl/strings.xml
+++ b/app-mini/src/main/res/values-nl/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Een app wil de verborgenserverpoort %1$d tot het Tor-netwerk openen. Dit is veilig als je de app vertrouwt.</string>
   <string name="found_existing_tor_process">bestaand Tor-proces gevonden…</string>
   <string name="something_bad_happened">Er is een fout opgetreden. Controleer de log</string>
-    <string name="unable_to_read_hidden_service_name">Kan verborgen dienst-naam niet lezen</string>
-  <string name="unable_to_start_tor">Kan Tor niet starten:</string>
+    <string name="unable_to_start_tor">Kan Tor niet starten:</string>
     <string name="pref_use_persistent_notifications">Houd icoon in taakbalk zolang Orbot verbonden is</string>
   <string name="pref_use_persistent_notifications_title">Meldingen altijd aan</string>
   <string name="pref_use_expanded_notifications">Toon uitgebreide melding met Tor-exitland en IP</string>
@@ -130,7 +129,6 @@
     <string name="send_email">E-mail versturen</string>
   <string name="vpn_default_world">Algemeen (automatisch)</string>
   <string name="hidden_services">Verborgen diensten</string>
-  <string name="title_activity_hidden_services">Verborgen diensten</string>
   <string name="menu_hidden_services">Verborgen diensten</string>
   <string name="save">Opslaan</string>
     <string name="local_port">Lokale poort</string>
@@ -138,7 +136,6 @@
   <string name="name">Naam</string>
   <string name="done">Klaar!</string>
     <string name="copy_address_to_clipboard">Adres kopiëren naar klembord</string>
-  <string name="show_auth_cookie">Authenticatiecookie tonen</string>
   <string name="backup_service">Back-updienst</string>
   <string name="delete_service">Dienst verwijderen</string>
   <string name="backup_saved_at_external_storage">Back-up opgeslagen op externe opslag</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Klik opnieuw voor back-up</string>
   <string name="service_type">Diensttype</string>
   <string name="auth_cookie">Authenticatiecookie</string>
-  <string name="copy_cookie_to_clipboard">Cookie kopiëren naar klembord</string>
-  <string name="auth_cookie_was_not_configured">Authenticatiecookie is niet ingesteld</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Herstart Orbot om de wijzigingen in te schakelen</string>
-  <string name="client_cookies">Cliëntcookies</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Lezen van QR-code</string>
-  <string name="backup_cookie">Back-up maken van cookie</string>
-  <string name="delete_cookie">Cookie verwijderen</string>
-  <string name="confirm_cookie_deletion">Bevestig verwijderen van cookie</string>
-  <string name="hosted_services">Gehoste diensten</string>
   <string name="share_as_qr">Delen als QR-code</string>
   <string name="disable">Uitschakelen</string>
   <string name="enable">Inschakelen</string>
diff --git a/app-mini/src/main/res/values-pl/strings.xml b/app-mini/src/main/res/values-pl/strings.xml
index 65a9d051..3f58662a 100644
--- a/app-mini/src/main/res/values-pl/strings.xml
+++ b/app-mini/src/main/res/values-pl/strings.xml
@@ -91,8 +91,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">znaleziono istniejÄ…cy proces Tora...</string>
   <string name="something_bad_happened">Coś nie poszło nie tak. Sprawdź logi</string>
-    <string name="unable_to_read_hidden_service_name">uniemożliw czytanie nazw ukrytych serwisów</string>
-  <string name="unable_to_start_tor">Nie można wystartować aplikacji Tor:</string>
+    <string name="unable_to_start_tor">Nie można wystartować aplikacji Tor:</string>
     <string name="pref_use_persistent_notifications">Zawsze trzymaj ikonę w pasku powiadomień gdy Orbot jest połączony</string>
   <string name="pref_use_persistent_notifications_title">Powiadomienia zawsze aktywne</string>
   <string name="pref_use_expanded_notifications">Pokaż rozszerzone powiadomienie z krajem Tor exit node oraz jego IP</string>
@@ -123,8 +122,7 @@
   <string name="apps_mode">Tryb VPN</string>
   <string name="send_email">Wyślij Email</string>
   <string name="hidden_services">Ukryte Usługi</string>
-  <string name="title_activity_hidden_services">Ukryte Usługi</string>
-  <string name="menu_hidden_services">Ukryte Usługi</string>
+    <string name="menu_hidden_services">Ukryte Usługi</string>
   <string name="save">Zapisz</string>
     <string name="local_port">Lokalne Porty</string>
   <string name="name">Nazwa</string>
diff --git a/app-mini/src/main/res/values-pt-rBR/strings.xml b/app-mini/src/main/res/values-pt-rBR/strings.xml
index f8924539..3073310b 100644
--- a/app-mini/src/main/res/values-pt-rBR/strings.xml
+++ b/app-mini/src/main/res/values-pt-rBR/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Um aplicativo precisa abrir uma porta tipo servidor escondida %1$dpara a Rede Tor. Isso é seguro se você confiar nesta aplicação.</string>
   <string name="found_existing_tor_process">procurando processos Tor existentes...</string>
   <string name="something_bad_happened">Algo ruim aconteceu. Cheque o lo</string>
-    <string name="unable_to_read_hidden_service_name">habilitar ler o nome do serviço oculto</string>
-  <string name="unable_to_start_tor">Habilitar iniciar o Tor:</string>
+    <string name="unable_to_start_tor">Habilitar iniciar o Tor:</string>
     <string name="pref_use_persistent_notifications">Sempre manter o ícone na barra de tarefas quando o Orbot está conectado</string>
   <string name="pref_use_persistent_notifications_title">Notificações Sempre Ligadas</string>
   <string name="pref_use_expanded_notifications">Mostrar notificação expandida com Tor país de saída e IP</string>
@@ -130,7 +129,6 @@
   <string name="send_email">Enviar Email</string>
   <string name="vpn_default_world">Global (Automático)</string>
   <string name="hidden_services">Serviços Ocultos</string>
-  <string name="title_activity_hidden_services">Serviços Ocultos</string>
   <string name="menu_hidden_services">Serviços Ocultos</string>
   <string name="save">Salvar</string>
     <string name="local_port">Porta Local</string>
@@ -138,8 +136,7 @@
   <string name="name">Nome</string>
   <string name="done">Feito!</string>
     <string name="copy_address_to_clipboard">Copiar para a area de transferência </string>
-  <string name="show_auth_cookie">Mostre cookie de autenticação</string>
-  <string name="backup_service">Serviço de Backup</string>
+    <string name="backup_service">Serviço de Backup</string>
   <string name="delete_service">Remover Serviço</string>
   <string name="backup_saved_at_external_storage">Backup salvo em mídia externa</string>
   <string name="backup_restored">Backup Restaurado</string>
@@ -148,7 +145,6 @@
   <string name="click_again_for_backup">Clique novamente para backup</string>
   <string name="service_type">Tipo do Serviço</string>
   <string name="auth_cookie">Cookie de autenticação</string>
-  <string name="copy_cookie_to_clipboard">Copiar cookie para a area de transferência</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Por favor reinicie Orbot para habilitar as mundanças</string>
   <string name="share_as_qr">Compartilhar como QR</string>
   <string name="disable">Desabilitar</string>
diff --git a/app-mini/src/main/res/values-pt/strings.xml b/app-mini/src/main/res/values-pt/strings.xml
index 53f6d956..ecbd6c12 100644
--- a/app-mini/src/main/res/values-pt/strings.xml
+++ b/app-mini/src/main/res/values-pt/strings.xml
@@ -60,8 +60,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">encontrado o processo Tor existente...</string>
   <string name="something_bad_happened">Aconteceu algo de mau. Verifique o registo de eventos.</string>
-    <string name="unable_to_read_hidden_service_name">não é possível ler o nome do serviço ocultado</string>
-  <string name="unable_to_start_tor">Não é possível iniciar o Tor:</string>
+    <string name="unable_to_start_tor">Não é possível iniciar o Tor:</string>
     <string name="pref_use_persistent_notifications_title">Notificações Sempre Ativadas</string>
   <string name="pref_use_expanded_notifications_title">Notificações Estendidas</string>
     <string name="set_locale_title">Idioma</string>
@@ -76,8 +75,7 @@
     <string name="activate">Ativar</string>
   <string name="send_email">Enviar Mensagem</string>
     <string name="hidden_services">Serviços ocultos</string>
-  <string name="title_activity_hidden_services">Serviços ocultos</string>
-  <string name="menu_hidden_services">Serviços ocultos</string>
+    <string name="menu_hidden_services">Serviços ocultos</string>
   <string name="save">Guardar</string>
   <string name="name">Nome</string>
   <string name="done">Concluído!</string>
diff --git a/app-mini/src/main/res/values-ro/strings.xml b/app-mini/src/main/res/values-ro/strings.xml
index b1a1e322..71277596 100644
--- a/app-mini/src/main/res/values-ro/strings.xml
+++ b/app-mini/src/main/res/values-ro/strings.xml
@@ -91,8 +91,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">găsit proces Tor existent...</string>
   <string name="something_bad_happened">Ceva rău s-a întâmplat. Verifică log-ul</string>
-    <string name="unable_to_read_hidden_service_name">nu am putut citi numele serviciului ascuns</string>
-  <string name="unable_to_start_tor">Nu am reuşit să pornesc Tor:</string>
+    <string name="unable_to_start_tor">Nu am reuşit să pornesc Tor:</string>
     <string name="pref_use_persistent_notifications">Arată tot timpul icoana în bară când Orbot este conectat</string>
   <string name="pref_use_persistent_notifications_title">Notificări active tot timpul</string>
   <string name="pref_use_expanded_notifications">Arată notificări extinse cu Tor exit country şi IP</string>
@@ -122,8 +121,7 @@
     <string name="activate">Activează</string>
   <string name="send_email">Trimite email</string>
   <string name="hidden_services">Servicii ascunse</string>
-  <string name="title_activity_hidden_services">Servicii ascunse</string>
-  <string name="menu_hidden_services">Servicii ascunse</string>
+    <string name="menu_hidden_services">Servicii ascunse</string>
   <string name="save">Salvează</string>
   <string name="name">Nume</string>
   <string name="done">Gata!</string>
diff --git a/app-mini/src/main/res/values-ru/strings.xml b/app-mini/src/main/res/values-ru/strings.xml
index 9f9d7e35..be053801 100644
--- a/app-mini/src/main/res/values-ru/strings.xml
+++ b/app-mini/src/main/res/values-ru/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Приложение хочет открыть скрытый порт сервера %1$d сети Tor. Это безопасно, если вы доверяете данному приложению.</string>
   <string name="found_existing_tor_process">найден существующий процесс Tor...</string>
   <string name="something_bad_happened">Произошла какая-то ошибка. Проверьте журнал.</string>
-    <string name="unable_to_read_hidden_service_name">невозможно прочитать имя скрытой службы</string>
-  <string name="unable_to_start_tor">Невозможно запустить Tor:</string>
+    <string name="unable_to_start_tor">Невозможно запустить Tor:</string>
     <string name="pref_use_persistent_notifications">Всегда отображать иконку в панели задач когда Orbot подключён</string>
   <string name="pref_use_persistent_notifications_title">Постоянное уведомление о работе</string>
   <string name="pref_use_expanded_notifications">Показать расширенное уведомление Tor со страной выхода и IP</string>
@@ -130,7 +129,6 @@
     <string name="send_email">Отправить письмо</string>
   <string name="vpn_default_world">Мир (авто)</string>
   <string name="hidden_services">Скрытые службы</string>
-  <string name="title_activity_hidden_services">Скрытые службы</string>
   <string name="menu_hidden_services">Скрытые службы</string>
   <string name="save">Сохранить</string>
     <string name="local_port">Локальный порт</string>
@@ -138,7 +136,6 @@
   <string name="name">Имя</string>
   <string name="done">Готово!</string>
     <string name="copy_address_to_clipboard">Скопировать адрес в буфер обмена</string>
-  <string name="show_auth_cookie">Показать авторизирующие cookie</string>
   <string name="backup_service">Резервировать службу</string>
   <string name="delete_service">Удалить службу</string>
   <string name="backup_saved_at_external_storage">Резервная копия сохранена на внешнем хранилище</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Нажмите ещё раз для резервирования</string>
   <string name="service_type">Тип службы</string>
   <string name="auth_cookie">Авторизирующие cookie</string>
-  <string name="copy_cookie_to_clipboard">Копировать cookie в буфер обмена</string>
-  <string name="auth_cookie_was_not_configured">Авторизирующие cookie не настроены</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Пожалуйста, перезапустите Orbot для вступления изменения в силу</string>
-  <string name="client_cookies">Cookies клиента</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Прочитать из QR-кода</string>
-  <string name="backup_cookie">Резервировать cookie</string>
-  <string name="delete_cookie">Удалить cookies</string>
-  <string name="confirm_cookie_deletion">Подтвердите удаление cookie</string>
-  <string name="hosted_services">Размещённые службы</string>
   <string name="share_as_qr">Поделиться через QR-код</string>
   <string name="disable">Отключить</string>
   <string name="enable">Включить</string>
diff --git a/app-mini/src/main/res/values-si-rLK/strings.xml b/app-mini/src/main/res/values-si-rLK/strings.xml
index c8a02b23..9f80bb48 100644
--- a/app-mini/src/main/res/values-si-rLK/strings.xml
+++ b/app-mini/src/main/res/values-si-rLK/strings.xml
@@ -77,8 +77,7 @@
     <string name="third_party_software">3 වන පාර්ශව මෘදුකාංග</string>
   <string name="found_existing_tor_process">පවතින Tor ක්‍රියාවලි හමුවිය...</string>
   <string name="something_bad_happened">යම් නොමනා දෙයක් සිදුවිය. ලොගය පරික්ෂා කර බලන්න </string>
-    <string name="unable_to_read_hidden_service_name">සැගවුණු සේවා නාමය කියවීමට නොහැකිය </string>
-  <string name="unable_to_start_tor">Tor ආරම්භ කිරීමට නොහැකිය:</string>
+    <string name="unable_to_start_tor">Tor ආරම්භ කිරීමට නොහැකිය:</string>
     <string name="pref_use_persistent_notifications">Orbot සම්බන්ධ වී ඇති සැමවිටම විට මෙවලම් තීරුවේ නිරූපකය තබාගන්න</string>
   <string name="pref_use_persistent_notifications_title">නිවේදන ලැබීමට සලස්වන්න </string>
     <string name="set_locale_title">භාෂාව</string>
@@ -86,8 +85,7 @@
   <string name="mb">MB</string>
   <string name="activate">ක්‍රියාකරවන්න</string>
   <string name="hidden_services">සැගවුණු සේවා </string>
-  <string name="title_activity_hidden_services">සැගවුණු සේවා </string>
-  <string name="menu_hidden_services">සැගවුණු සේවා </string>
+    <string name="menu_hidden_services">සැගවුණු සේවා </string>
   <string name="save">සුරකින්න</string>
   <string name="name">නම</string>
 </resources>
diff --git a/app-mini/src/main/res/values-sk/strings.xml b/app-mini/src/main/res/values-sk/strings.xml
index e3f4a6bb..23e393db 100644
--- a/app-mini/src/main/res/values-sk/strings.xml
+++ b/app-mini/src/main/res/values-sk/strings.xml
@@ -91,8 +91,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">nájdený iný proces Tor...</string>
   <string name="something_bad_happened">Deje sa niečo zlé. Skontrolujte podrobnosti.</string>
-    <string name="unable_to_read_hidden_service_name">nemožné prečítať názov skrytej služby</string>
-  <string name="unable_to_start_tor">Nemožné spustiť Tor:</string>
+    <string name="unable_to_start_tor">Nemožné spustiť Tor:</string>
     <string name="pref_use_persistent_notifications">Vždy ponechať ikonu v stavovom riadku, keď je Orbot pripojený</string>
   <string name="pref_use_persistent_notifications_title">Vždy zapnuté upozornenia</string>
   <string name="pref_use_expanded_notifications">Zobraziť rozšírené upozornenie s výstupnou krajinou a IP adresou siete Tor</string>
diff --git a/app-mini/src/main/res/values-sr/strings.xml b/app-mini/src/main/res/values-sr/strings.xml
index b0d47010..c4b3c1ec 100644
--- a/app-mini/src/main/res/values-sr/strings.xml
+++ b/app-mini/src/main/res/values-sr/strings.xml
@@ -94,8 +94,7 @@
   <string name="hidden_service_request">Апликација жели да отвори сакривен порт%1$d на серверу за Тор мрежу. Ово је сигуран потез уколико верујете апликацији.</string>
   <string name="found_existing_tor_process">нађен покренути Тор процес...</string>
   <string name="something_bad_happened">Нешто лоше се догодило. Прегледајте логове</string>
-    <string name="unable_to_read_hidden_service_name">нисам у могућности да прочитам име сакривеног сервиса</string>
-  <string name="unable_to_start_tor">Тор није у могућности да се покрене:</string>
+    <string name="unable_to_start_tor">Тор није у могућности да се покрене:</string>
     <string name="pref_use_persistent_notifications">Увек прикажи икону у тулбару када је Орбот конектован</string>
   <string name="pref_use_persistent_notifications_title">Стално укључене нотификације</string>
   <string name="pref_use_expanded_notifications">Прикажи опширно обавештење Тор излаза државе и IP-ја</string>
@@ -128,7 +127,6 @@
     <string name="send_email">Пошаљи Е-пошту</string>
   <string name="vpn_default_world">Глобално (Аутоматски)</string>
   <string name="hidden_services">Скривени Сервиси</string>
-  <string name="title_activity_hidden_services">Скривени Сервиси</string>
   <string name="menu_hidden_services">Скривени Сервиси</string>
   <string name="save">Сачувај</string>
     <string name="local_port">Локални Порт</string>
@@ -136,8 +134,7 @@
   <string name="name">Име</string>
   <string name="done">Готово !</string>
     <string name="copy_address_to_clipboard">Копирај адреса у clipboard</string>
-  <string name="show_auth_cookie">Покажите ауторизовани колачић</string>
-  <string name="backup_service">Услуга за резервне копије</string>
+    <string name="backup_service">Услуга за резервне копије</string>
   <string name="delete_service">Обриши Услугу</string>
   <string name="backup_saved_at_external_storage">Резербна копија је сачувана на спољној меморији</string>
   <string name="backup_restored">Резервна копија је обновљена</string>
@@ -147,13 +144,7 @@
   <string name="click_again_for_backup">Кликните поново за резервну копију</string>
   <string name="service_type">Тип Услуге</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Молимо покрените поново Орбот ради примењивања промена</string>
-  <string name="client_cookies">Колачићи клијента</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Прочитај са QR кода</string>
-  <string name="backup_cookie">Резервна копија колачића</string>
-  <string name="delete_cookie">Избриши колачић</string>
-  <string name="confirm_cookie_deletion">Потрврди брисање колачића</string>
-  <string name="hosted_services">Хостоване Услуге</string>
   <string name="share_as_qr">Дели као QR код</string>
   <string name="disable">Онемогући</string>
   <string name="enable">Омогући</string>
diff --git a/app-mini/src/main/res/values-sv/strings.xml b/app-mini/src/main/res/values-sv/strings.xml
index 588238d4..2ed932e5 100644
--- a/app-mini/src/main/res/values-sv/strings.xml
+++ b/app-mini/src/main/res/values-sv/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">En app vill öppna dold serverport %1$d till Tor-nätverket. Det här är säkert om du litar på appen.</string>
   <string name="found_existing_tor_process">hittade existerande Tor process...</string>
   <string name="something_bad_happened">Något dåligt hände. Kolla loggen.</string>
-    <string name="unable_to_read_hidden_service_name">kan inte läsa gömda tjänstens namn</string>
-  <string name="unable_to_start_tor">Kan inte starta Tor:</string>
+    <string name="unable_to_start_tor">Kan inte starta Tor:</string>
     <string name="pref_use_persistent_notifications">Behåll alltid ikonen i verktygsfältet när Orbot är ansluten</string>
   <string name="pref_use_persistent_notifications_title">Alltid-PÃ¥ Notifikationer</string>
   <string name="pref_use_expanded_notifications">Visa utökad notis med Tors utgångsland och IP</string>
@@ -130,7 +129,6 @@
     <string name="send_email">Skicka e-post</string>
   <string name="vpn_default_world">Global (automatisk)</string>
   <string name="hidden_services">Hidden Services</string>
-  <string name="title_activity_hidden_services">Hidden Services</string>
   <string name="menu_hidden_services">Hidden Services</string>
   <string name="save">Spara</string>
     <string name="local_port">Lokal port</string>
@@ -138,7 +136,6 @@
   <string name="name">Namn</string>
   <string name="done">Klart!</string>
     <string name="copy_address_to_clipboard">Kopiera adress till urklipp</string>
-  <string name="show_auth_cookie">Visa auth kaka</string>
   <string name="backup_service">Säkerhetskopiera tjänst</string>
   <string name="delete_service">Ta bort tjänst</string>
   <string name="backup_saved_at_external_storage">Säkerhetskopiering sparad i externt lagringsutrymme</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Klicka igen för säkerhetskopiering</string>
   <string name="service_type">Typ av tjänst</string>
   <string name="auth_cookie">Auth kaka</string>
-  <string name="copy_cookie_to_clipboard">Kopiera kaka till urklipp</string>
-  <string name="auth_cookie_was_not_configured">Auth kaka var inte konfigurerad</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Vänligen starta om Orbot för att aktivera ändringarna</string>
-  <string name="client_cookies">Klientkakor</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Läs från QR</string>
-  <string name="backup_cookie">Säkerhetskopiera kaka</string>
-  <string name="delete_cookie">Ta bort kaka</string>
-  <string name="confirm_cookie_deletion">Bekräfta borttagning av kaka</string>
-  <string name="hosted_services">Värdtjänster</string>
   <string name="share_as_qr">Dela som QR</string>
   <string name="disable">Inaktivera</string>
   <string name="enable">Aktivera</string>
diff --git a/app-mini/src/main/res/values-ta/strings.xml b/app-mini/src/main/res/values-ta/strings.xml
index fb6d59d4..e5946e82 100644
--- a/app-mini/src/main/res/values-ta/strings.xml
+++ b/app-mini/src/main/res/values-ta/strings.xml
@@ -37,11 +37,7 @@
   <string name="save">சேமி</string>
   <string name="name">பெயர்</string>
   <string name="service_type">சேவை வகை</string>
-  <string name="backup_cookie">நினைவிகளை காப்புப்பிரதிகலெடு</string>
-  <string name="delete_cookie">நினைவிகளை ஆழி</string>
-  <string name="confirm_cookie_deletion">நினைவிகளின் நீக்கத்தை உறுதிப்படுத்து</string>
-  <string name="hosted_services">வழங்கப்பட்ட சேவைகள்</string>
-  <string name="share_as_qr">QR ஆக பகிர்</string>
+    <string name="share_as_qr">QR ஆக பகிர்</string>
   <string name="disable">முடக்கு</string>
   <string name="enable">செயல்படுத்து</string>
   <string name="trouble_connecting">இணைப்பதில் சிக்கலா ?</string>
diff --git a/app-mini/src/main/res/values-th/strings.xml b/app-mini/src/main/res/values-th/strings.xml
index a7288a46..273d0893 100644
--- a/app-mini/src/main/res/values-th/strings.xml
+++ b/app-mini/src/main/res/values-th/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">โปรแกรมต้องการเปิดพอร์ต %1$d ที่ซ่อนอยู่ของเซิร์ฟเวอร์ให้เชื่อมกับเครือข่าย Tor การกระทำนี้ปลอดภัยถ้าคุณเชื่อถือโปรแกรมนั้น</string>
   <string name="found_existing_tor_process">พบกระบวนการ Tor ที่มีอยู่แล้ว...</string>
   <string name="something_bad_happened">เกิดอะไรไม่ดีสักอย่าง ให้ตรวจดูจากบันทึก</string>
-    <string name="unable_to_read_hidden_service_name">ไม่สามารถอ่านชื่อของบริการที่ซ่อน</string>
-  <string name="unable_to_start_tor">ไม่สามารถเริ่ม Tor:</string>
+    <string name="unable_to_start_tor">ไม่สามารถเริ่ม Tor:</string>
     <string name="pref_use_persistent_notifications">แสดงไอคอนในทูลบาร์เสมอเมื่อ Orbot เชื่อมต่ออยู่</string>
   <string name="pref_use_persistent_notifications_title">การแจ้งเตือนแบบตลอดเวลา</string>
   <string name="pref_use_expanded_notifications">แสดงการแจ้งเตือนแบบขยายที่ระบุประเทศปลายทางและ IP ของ Tor</string>
@@ -130,7 +129,6 @@
     <string name="send_email">ส่งอีเมล</string>
   <string name="vpn_default_world">ส่วนรวม (อัตโนมัติ)</string>
   <string name="hidden_services">บริการที่ซ่อน</string>
-  <string name="title_activity_hidden_services">บริการที่ซ่อน</string>
   <string name="menu_hidden_services">บริการที่ซ่อน</string>
   <string name="save">บันทึก</string>
     <string name="local_port">พอร์ตในเครื่อง</string>
@@ -138,7 +136,6 @@
   <string name="name">ชื่อเอกสาร</string>
   <string name="done">เสร็จสิ้น!</string>
     <string name="copy_address_to_clipboard">คัดลอกที่อยู่ลงในคลิปบอร์ด</string>
-  <string name="show_auth_cookie">แสดงคุกกี้ที่ได้รับอนุญาต</string>
   <string name="backup_service">บริการสำรองข้อมูล</string>
   <string name="delete_service">บริการลบ</string>
   <string name="backup_saved_at_external_storage">ข้อมูลสำรองบันทึกที่ที่เก็บข้อมูลภายนอก</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">กดอีกครั้งเพื่อเรียกข้อมูลสำรอง</string>
   <string name="service_type">ประเภทของบริการ</string>
   <string name="auth_cookie">คุกกี้ที่ได้รับอนุญาต</string>
-  <string name="copy_cookie_to_clipboard">คัดลอกคุกกี้ลงในคลิปบอร์ด</string>
-  <string name="auth_cookie_was_not_configured">ยังไม่ได้กำหนดค่าคุกกี้ที่ได้รับอนุญาต</string>
   <string name="please_restart_Orbot_to_enable_the_changes">กรุณาเริ่ม Orbot ใหม่เพื่อให้การเปลี่ยนแปลงใช้งานได้</string>
-  <string name="client_cookies">คุกกี้ของไคลเอ็นต์</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">อ่านจากคิวอาร์</string>
-  <string name="backup_cookie">สำรองข้อมูลคุกกี้</string>
-  <string name="delete_cookie">ลบคุกกี้</string>
-  <string name="confirm_cookie_deletion">ยืนยันการลบคุกกี้</string>
-  <string name="hosted_services">บริการโฮสต์</string>
   <string name="share_as_qr">แชร์ในรูปแบบคิวอาร์</string>
   <string name="disable">ปิดการใช้งาน</string>
   <string name="enable">เปิดใช้งาน</string>
diff --git a/app-mini/src/main/res/values-tl/strings.xml b/app-mini/src/main/res/values-tl/strings.xml
index ca666b02..8abd8b0e 100644
--- a/app-mini/src/main/res/values-tl/strings.xml
+++ b/app-mini/src/main/res/values-tl/strings.xml
@@ -89,8 +89,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process"> nakakita ng umiiral na Tor process...</string>
   <string name="something_bad_happened">May nangyaring masama. Tingnan ang log</string>
-    <string name="unable_to_read_hidden_service_name">hindi mabasa ang pangalan ng tagong serbisyo</string>
-  <string name="unable_to_start_tor">Hindi masimulan ang Tor:</string>
+    <string name="unable_to_start_tor">Hindi masimulan ang Tor:</string>
     <string name="pref_use_persistent_notifications">Palaging panatilihin ang icon sa toolbar kapag ang Orbot ay naka-connect</string>
   <string name="pref_use_persistent_notifications_title">Palaging i-On ang Notifications</string>
   <string name="pref_use_expanded_notifications">Ipakita ang pinalaking notification kasama ng Tor exit country at IP</string>
diff --git a/app-mini/src/main/res/values-tr/strings.xml b/app-mini/src/main/res/values-tr/strings.xml
index 4ecd64b5..e514dad8 100644
--- a/app-mini/src/main/res/values-tr/strings.xml
+++ b/app-mini/src/main/res/values-tr/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Bir uygulama Tor ağına %1$d gizli sunucu kapısını açmak istiyor. Uygulamaya güveniyorsanız bu işlem güvenlidir.</string>
   <string name="found_existing_tor_process">varolan bir Tor iÅŸlemi bulundu...</string>
   <string name="something_bad_happened">Bir şeyler ters gitti. Günlük kayıtlarına bakın</string>
-  <string name="unable_to_read_hidden_service_name">gizli hizmet adı okunamadı</string>
-  <string name="unable_to_start_tor">Tor başlatılamadı:</string>
+    <string name="unable_to_start_tor">Tor başlatılamadı:</string>
   <string name="pref_use_persistent_notifications">Orbot bağlı olduğu sürece simge araç çubuğunda görüntülensin</string>
   <string name="pref_use_persistent_notifications_title">Bildirimler Her Zaman Açık</string>
   <string name="pref_use_expanded_notifications">Tor çıkış ülkesi ve IP adresi ile ilgili ayrıntılı bildirim görüntülensin</string>
@@ -130,7 +129,6 @@
   <string name="send_email">E-posta Gönder</string>
   <string name="vpn_default_world">Genel (Otomatik)</string>
   <string name="hidden_services">Gizli Hizmetler</string>
-  <string name="title_activity_hidden_services">Gizli Hizmetler</string>
   <string name="menu_hidden_services">Gizli Hizmetler</string>
   <string name="save">Kaydet</string>
   <string name="local_port">Yerel Kapı</string>
@@ -138,7 +136,6 @@
   <string name="name">Ad</string>
   <string name="done">Tamam!</string>
     <string name="copy_address_to_clipboard">Adresi panoya kopyala</string>
-  <string name="show_auth_cookie">Kimlik doğrulama çerezini görüntüle</string>
   <string name="backup_service">Hizmeti Yedekle</string>
   <string name="delete_service">Hizmeti Sil</string>
   <string name="backup_saved_at_external_storage">Yedek dış depolamaya kaydedildi</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Yedeklemek için yeniden tıklayın</string>
   <string name="service_type">Hizmet Türü</string>
   <string name="auth_cookie">Kimlik Doğrulama Çerezi</string>
-  <string name="copy_cookie_to_clipboard">Çerezi panoya kopyala</string>
-  <string name="auth_cookie_was_not_configured">Kimlik doğrulama çerezi yapılandırılmamış</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Değişiklikleri etkinleştirmek için Orbot uygulamasını yeniden başlatın</string>
-  <string name="client_cookies">İstemci çerezleri</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">QR kodundan oku</string>
-  <string name="backup_cookie">Çerezi yedekle</string>
-  <string name="delete_cookie">Çerezi sil</string>
-  <string name="confirm_cookie_deletion">Çerezi silmeyi onayla</string>
-  <string name="hosted_services">Barındırılan Hizmetler</string>
   <string name="share_as_qr">QR Olarak PaylaÅŸ</string>
   <string name="disable">Devre Dışı Bırak</string>
   <string name="enable">EtkinleÅŸtir</string>
diff --git a/app-mini/src/main/res/values-uk/strings.xml b/app-mini/src/main/res/values-uk/strings.xml
index 997d01aa..1da8521b 100644
--- a/app-mini/src/main/res/values-uk/strings.xml
+++ b/app-mini/src/main/res/values-uk/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Програма хоче відкрити прихований серверний порт %1$d у мережу Tor. Це безпечно, якщо ви довіряєте застосунку.</string>
   <string name="found_existing_tor_process">знайдено існуючий процес Tor...</string>
   <string name="something_bad_happened">Виникла якась помилка. Перевірте лог</string>
-    <string name="unable_to_read_hidden_service_name">неможливо прочитати ім\'я прихованої служби</string>
-  <string name="unable_to_start_tor">Неможливо запустити Tor:</string>
+    <string name="unable_to_start_tor">Неможливо запустити Tor:</string>
     <string name="pref_use_persistent_notifications">Завжди показувати іконку в панелі завдань коли Orbot підключений</string>
   <string name="pref_use_persistent_notifications_title">Сповіщення про постійну роботу</string>
   <string name="pref_use_expanded_notifications">Показати розширене сповіщення з країною виходу Tor та IP</string>
@@ -130,7 +129,6 @@
     <string name="send_email">Надіслати листа</string>
   <string name="vpn_default_world">Глобальний (автоматичний)</string>
   <string name="hidden_services">Приховані Послуги</string>
-  <string name="title_activity_hidden_services">Приховані Послуги</string>
   <string name="menu_hidden_services">Приховані Послуги</string>
   <string name="save">Зберегти</string>
     <string name="local_port">Місцевий Порт</string>
@@ -138,7 +136,6 @@
   <string name="name">Ім\'я</string>
   <string name="done">Зроблено!</string>
     <string name="copy_address_to_clipboard">Скопіювати адресу в буфер обміну</string>
-  <string name="show_auth_cookie">Показати авторизацію реп\'яшків</string>
   <string name="backup_service">Резервне копіювання</string>
   <string name="delete_service">Вилучити Сервіс</string>
   <string name="backup_saved_at_external_storage">Резервна копія збережена на зовнішній пам\'яті</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Ще раз натисніть щоби копіювати в резерв</string>
   <string name="service_type">Тип сервісу</string>
   <string name="auth_cookie">Авторизація реп\'яшків </string>
-  <string name="copy_cookie_to_clipboard">Копіювати реп\'яшки в буфер обміну</string>
-  <string name="auth_cookie_was_not_configured">Авторизація реп\'яшків не налаштована</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Будь ласка, перезапустіть Orbot, щоб зміни ввійшли в силу</string>
-  <string name="client_cookies">Клієнтські реп\'яшки</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Зчитати з QR-коду</string>
-  <string name="backup_cookie">Резервне копіювання реп\'яшків</string>
-  <string name="delete_cookie">Вилучити реп\'яшки</string>
-  <string name="confirm_cookie_deletion">Підтвердити вилучення реп\'яшків</string>
-  <string name="hosted_services">Розміщені Сервіси</string>
   <string name="share_as_qr">Поділитися у виді QR-коду</string>
   <string name="disable">Вимкнути</string>
   <string name="enable">Увімкнути</string>
diff --git a/app-mini/src/main/res/values-vi/strings.xml b/app-mini/src/main/res/values-vi/strings.xml
index 4b4f9ce6..29be90ed 100644
--- a/app-mini/src/main/res/values-vi/strings.xml
+++ b/app-mini/src/main/res/values-vi/strings.xml
@@ -91,8 +91,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">tìm ra tiến trình hiện hà nh của Tor...</string>
   <string name="something_bad_happened">Có gì đó không ổn. Xin xem lại nhật ký</string>
-    <string name="unable_to_read_hidden_service_name">không thể đọc được tên dịch vụ ẩn</string>
-  <string name="unable_to_start_tor">Không thể khởi động Tor được: </string>
+    <string name="unable_to_start_tor">Không thể khởi động Tor được: </string>
     <string name="pref_use_persistent_notifications">Luôn giữ thông báo trong thanh trạng thái khi Orbot được kết nối</string>
   <string name="pref_use_persistent_notifications_title">Thông báo thường trực</string>
   <string name="pref_use_expanded_notifications">Hiển thị thông báo mở rộng với IP và quốc gia của nút cuối (Tor exit-node)</string>
diff --git a/app-mini/src/main/res/values-zh-rCN/strings.xml b/app-mini/src/main/res/values-zh-rCN/strings.xml
index 0b23feef..04ea52f4 100644
--- a/app-mini/src/main/res/values-zh-rCN/strings.xml
+++ b/app-mini/src/main/res/values-zh-rCN/strings.xml
@@ -91,8 +91,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">发现当前已存在 Tor 进程...</string>
   <string name="something_bad_happened">发生错误，请检查日志</string>
-    <string name="unable_to_read_hidden_service_name">æ— æ³•è¯»å–éšè—æœåŠ¡åç§°</string>
-  <string name="unable_to_start_tor">æ— æ³•å¯åŠ¨ Tor：</string>
+    <string name="unable_to_start_tor">æ— æ³•å¯åŠ¨ Tor：</string>
     <string name="pref_use_persistent_notifications">Orbot è¿žæŽ¥åŽå§‹ç»ˆåœ¨é€šçŸ¥æ æ˜¾ç¤ºå›¾æ ‡</string>
   <string name="pref_use_persistent_notifications_title">始终显示通知</string>
   <string name="pref_use_expanded_notifications">显示扩展的通知，有关 Tor 出口的国家和 IP</string>
diff --git a/app-mini/src/main/res/values-zh-rTW/strings.xml b/app-mini/src/main/res/values-zh-rTW/strings.xml
index d8e73560..6edaa889 100644
--- a/app-mini/src/main/res/values-zh-rTW/strings.xml
+++ b/app-mini/src/main/res/values-zh-rTW/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">有一個應用要開啟隱藏的伺服器端口 %1$d 到 Tor 網路,如果信得過此應用才進行此操作</string>
   <string name="found_existing_tor_process">發現已有 Tor 程序運行中 ...</string>
   <string name="something_bad_happened">發生錯誤。檢視日誌檔</string>
-    <string name="unable_to_read_hidden_service_name">無法讀取隱藏服務的名稱</string>
-  <string name="unable_to_start_tor">無法啟動 Tor：</string>
+    <string name="unable_to_start_tor">無法啟動 Tor：</string>
     <string name="pref_use_persistent_notifications">當 Orbot 連線成功時，總是在工具列顯示它的圖示</string>
   <string name="pref_use_persistent_notifications_title">總是顯示連線通知</string>
   <string name="pref_use_expanded_notifications">在通知中顯示 Tor 出口點的國家和 IP</string>
@@ -130,7 +129,6 @@
     <string name="send_email">寄送電子信件</string>
   <string name="vpn_default_world">全域(自動)</string>
   <string name="hidden_services">隱藏服務</string>
-  <string name="title_activity_hidden_services">隱藏服務</string>
   <string name="menu_hidden_services">隱藏服務</string>
   <string name="save">儲存</string>
     <string name="local_port">本地端口</string>
@@ -138,7 +136,6 @@
   <string name="name">名稱</string>
   <string name="done">已完成!</string>
     <string name="copy_address_to_clipboard">複製地址到剪貼簿</string>
-  <string name="show_auth_cookie">顯示 auth cookie</string>
   <string name="backup_service">備份服務</string>
   <string name="delete_service">刪除服務</string>
   <string name="backup_saved_at_external_storage">備份檔儲存在外部儲存器</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">再次點選以進行備份</string>
   <string name="service_type">服務類型</string>
   <string name="auth_cookie">Auth cookie</string>
-  <string name="copy_cookie_to_clipboard">複製 Cookie 到剪貼簿</string>
-  <string name="auth_cookie_was_not_configured">Auth cookie 未設定</string>
   <string name="please_restart_Orbot_to_enable_the_changes">請重新啟動 Orbot 來讓設定生效。</string>
-  <string name="client_cookies">客戶 cookies</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">由 QR 碼讀取</string>
-  <string name="backup_cookie">備分 cookie</string>
-  <string name="delete_cookie">刪除 cookie</string>
-  <string name="confirm_cookie_deletion">確認刪除  cookie</string>
-  <string name="hosted_services">主機的服務</string>
   <string name="share_as_qr">利用 QR 碼分享</string>
   <string name="disable">關閉</string>
   <string name="enable">啟用</string>
diff --git a/app-mini/src/main/res/values/strings.xml b/app-mini/src/main/res/values/strings.xml
index cd5a414a..9cb11a08 100644
--- a/app-mini/src/main/res/values/strings.xml
+++ b/app-mini/src/main/res/values/strings.xml
@@ -104,7 +104,6 @@
     <string name="hidden_service_request">An app wants to open onion server port %1$d to the Tor network. This is safe if you trust the app.</string>
     <string name="found_existing_tor_process">found existing Tor process…</string>
     <string name="something_bad_happened">Something bad happened. Check the log</string>
-    <string name="unable_to_read_hidden_service_name">unable to read onion service name</string>
     <string name="unable_to_start_tor">Unable to start Tor:</string>
 
     <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string>
@@ -166,7 +165,6 @@
 
     <string name="vpn_default_world">Global (Auto)</string>
     <string name="hidden_services">Onion Services</string>
-    <string name="title_activity_hidden_services">Onion Services</string>
     <string name="menu_hidden_services">Onion Services</string>
     <string name="save">Save</string>
     <string name="local_port">Local Port</string>
@@ -174,7 +172,6 @@
     <string name="name">Name</string>
     <string name="done">Done!</string>
     <string name="copy_address_to_clipboard">Copy address to clipboard</string>
-    <string name="show_auth_cookie">Show auth cookie</string>
     <string name="backup_service">Backup Service</string>
     <string name="delete_service">Delete Service</string>
     <string name="backup_saved_at_external_storage">Backup saved at external storage</string>
@@ -185,16 +182,8 @@
     <string name="click_again_for_backup">Click again for backup</string>
     <string name="service_type">Service type</string>
     <string name="auth_cookie">Auth cookie</string>
-    <string name="copy_cookie_to_clipboard">Copy cookie to clipboard</string>
-    <string name="auth_cookie_was_not_configured">Auth cookie was not configured</string>
     <string name="please_restart_Orbot_to_enable_the_changes">Please restart Orbot to enable the changes</string>
-    <string name="client_cookies">Client cookies</string>
     <string name="onion">.onion</string>
-    <string name="cookie_from_QR">Read from QR</string>
-    <string name="backup_cookie">Backup cookie</string>
-    <string name="delete_cookie">Delete cookie</string>
-    <string name="confirm_cookie_deletion">Confirm cookie deletion</string>
-    <string name="hosted_services">Hosted Services</string>
     <string name="share_as_qr">Share as QR</string>
     <string name="disable">Disable</string>
     <string name="enable">Enable</string>
diff --git a/app-tv/src/main/res/values-ar/strings.xml b/app-tv/src/main/res/values-ar/strings.xml
index 9f65f0ac..5f78ed25 100644
--- a/app-tv/src/main/res/values-ar/strings.xml
+++ b/app-tv/src/main/res/values-ar/strings.xml
@@ -92,8 +92,7 @@
   <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
   <string name="found_existing_tor_process">عُثر علي عملية تور سابقة تعمل...</string>
   <string name="something_bad_happened">حصل خطأ ما. افحص السجل</string>
-  <string name="unable_to_read_hidden_service_name">غير قادر على قراءة اسم الخدمة المخفية</string>
-  <string name="unable_to_start_tor">غير قادر على بدء تور:</string>
+    <string name="unable_to_start_tor">غير قادر على بدء تور:</string>
   <string name="pref_use_persistent_notifications">دائما ضع الأيقونة في شريط الأدوات عندما يكون اوربوت متصلاً</string>
   <string name="pref_use_persistent_notifications_title">تنبيهات دائمة</string>
   <string name="pref_use_expanded_notifications">قم بأظهار التنبيه بشكل موسع بأستخدام تور. أخرج من البلد ورقم الآي بي رقم العنوان على الشبكة</string>
@@ -125,7 +124,6 @@
   <string name="send_email">أرسل بريد الكتروني</string>
   <string name="vpn_default_world">شامل (تلقائي)</string>
   <string name="hidden_services">خدمات خفية</string>
-  <string name="title_activity_hidden_services">خدمات خفية</string>
   <string name="menu_hidden_services">خدمات خفية</string>
   <string name="save">حفظ</string>
   <string name="local_port">المنفذ المحلي</string>
@@ -133,7 +131,6 @@
   <string name="name">الاسم</string>
   <string name="done">تم !</string>
     <string name="copy_address_to_clipboard">نسخ العنوان إلى الحافظة</string>
-  <string name="show_auth_cookie">عرض كعكة المصادقة</string>
   <string name="backup_service">النسخ الإحتياطي للخدمة</string>
   <string name="delete_service">حذف الخدمة</string>
   <string name="backup_saved_at_external_storage">تمت عملية حفظ النسخة الإحتياطية في ذاكرة التخزين الخارجية</string>
@@ -144,16 +141,8 @@
   <string name="click_again_for_backup">قم بالنقر ثانية للقيام بالنسخ الإحتياطي</string>
   <string name="service_type">نوع الخدمة</string>
   <string name="auth_cookie">كعكة المصادقة</string>
-  <string name="copy_cookie_to_clipboard">نسخ الكعكة إلى الحافظة</string>
-  <string name="auth_cookie_was_not_configured">لم يتم إعداد كعكة المصادقة</string>
   <string name="please_restart_Orbot_to_enable_the_changes">الرجاء إعادة تشغيل أوربوت لتفعيل التعديلات</string>
-  <string name="client_cookies">كعكات العميل</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">القراءة مِن رمز الكيو آر</string>
-  <string name="backup_cookie">النسخ الإحتياطي للكعكة</string>
-  <string name="delete_cookie">حذف الكعكة</string>
-  <string name="confirm_cookie_deletion">تأكيد إزالة الكعكة</string>
-  <string name="hosted_services">الخدمات المستضافة</string>
   <string name="share_as_qr">شارك كرمز كيو آر</string>
   <string name="disable">إلغاء</string>
   <string name="enable">تمكين</string>
diff --git a/app-tv/src/main/res/values-ay/strings.xml b/app-tv/src/main/res/values-ay/strings.xml
index e4ab9f4c..ecfb9328 100644
--- a/app-tv/src/main/res/values-ay/strings.xml
+++ b/app-tv/src/main/res/values-ay/strings.xml
@@ -95,8 +95,7 @@
   <string name="hidden_service_request">Imantat apayañ thakhinak Tor llikar mä wakichäwiw jist\'arañ muni %1$d. Wakichawitix uñt\'atachixa, iyaw sama.</string>
   <string name="found_existing_tor_process">Utjir Toraw jikxatata...</string>
   <string name="something_bad_happened">Mä jan walt\'äwiw utji. Qillqantayasit uñakipam</string>
-  <string name="unable_to_read_hidden_service_name">Janiw imantat yanapirin sutiman ullarañjamakänti</string>
-  <string name="unable_to_start_tor">Janiw Torax aqtayañjamäkiti:</string>
+    <string name="unable_to_start_tor">Janiw Torax aqtayañjamäkiti:</string>
   <string name="pref_use_persistent_notifications">Orbot aqtatäki ukjax chimpup uñstayañapuni</string>
   <string name="pref_use_persistent_notifications_title">Yatiyäwinakax purinipuniniwa</string>
   <string name="pref_use_expanded_notifications">Kawkja markans IP ukamp Toramp  uñstani uka yatiyäw juk\'amp uñacht\'ayaña</string>
@@ -129,7 +128,6 @@
   <string name="send_email">Qillqat apayaña</string>
   <string name="vpn_default_world">Uraqpacha (justupaki)</string>
   <string name="hidden_services">Imantat lurañanaka</string>
-  <string name="title_activity_hidden_services">Imantat lurañanaka</string>
   <string name="menu_hidden_services">Imantat lurañanaka</string>
   <string name="save">Imaña</string>
   <string name="local_port">Akankïr apayañ thakhi</string>
@@ -137,7 +135,6 @@
   <string name="name">Suti</string>
   <string name="done">¡Tukuyata!</string>
     <string name="copy_address_to_clipboard">Utjirinak waruqañawjar imam</string>
-  <string name="show_auth_cookie"> Uñt\'ayktam uka cookie uñstayam</string>
   <string name="backup_service">Yanapirit imat luratanakam waruqam</string>
   <string name="delete_service">Lurañanak pichsuña</string>
   <string name="backup_saved_at_external_storage">Imat luratanakamax yaqha yänakar imataxiwa</string>
@@ -148,16 +145,8 @@
   <string name="click_again_for_backup">Imat luratanak utjañapatak mayamp limt\'am</string>
   <string name="service_type">Kunayman lurañanaka</string>
   <string name="auth_cookie">Chiqat k\'arich uk katjir cookie</string>
-  <string name="copy_cookie_to_clipboard">Cookie waruqañawjar imam</string>
-  <string name="auth_cookie_was_not_configured">Chiqat k\'arich uk katjir cookiex janiw mayjt\'ayatäkiti</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Mayjt\'ayatanak aqtayañatak Orbot mayamp qhant\'ayam, amp suma</string>
-  <string name="client_cookies">Apnaqirin Cookiepa</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">QR ukamp ullaraña</string>
-  <string name="backup_cookie">Cookien imat luratanakapa</string>
-  <string name="delete_cookie">Cookie pichsum</string>
-  <string name="confirm_cookie_deletion">Cookie pichsut mayamp uñxatam</string>
-  <string name="hosted_services">Qurpachat lurañanaka</string>
   <string name="share_as_qr">QRjam ch\'iqiyaña</string>
   <string name="disable">Jiwt\'ayaña</string>
   <string name="enable">Aqtayaña</string>
diff --git a/app-tv/src/main/res/values-az/strings.xml b/app-tv/src/main/res/values-az/strings.xml
index 4fcd73c3..76b784b6 100644
--- a/app-tv/src/main/res/values-az/strings.xml
+++ b/app-tv/src/main/res/values-az/strings.xml
@@ -92,8 +92,7 @@ Tor: https://www.torproject.org</string>
 LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">mövcud Tor prosesi tapıldı...</string>
   <string name="something_bad_happened">NÉ™ isÉ™ pis bir ÅŸey oldu. GiriÅŸi yoxla</string>
-    <string name="unable_to_read_hidden_service_name">gizli xidmət adını oxumağı deaktivləşdir</string>
-  <string name="unable_to_start_tor">Tor-un başlanmasını dayandır:</string>
+    <string name="unable_to_start_tor">Tor-un başlanmasını dayandır:</string>
     <string name="pref_use_persistent_notifications">Həmişə Orbot qoşulduğu hallarda nişanı alətlət panelində saxla</string>
   <string name="pref_use_persistent_notifications_title">Həmişə Açıq Xəbərdarlıqlar</string>
   <string name="pref_use_expanded_notifications">Torla birlikdə ətraflı bildirişi göstərib ölkə və IP-dən çıxın. </string>
diff --git a/app-tv/src/main/res/values-be/strings.xml b/app-tv/src/main/res/values-be/strings.xml
index c1dfd166..0f231700 100644
--- a/app-tv/src/main/res/values-be/strings.xml
+++ b/app-tv/src/main/res/values-be/strings.xml
@@ -95,8 +95,7 @@
   <string name="hidden_service_request">Дадатак хоча адкрыць схаваны порт сервера %1$d сеткі Tor. Гэта бяспечна, калі вы давяраеце дадзенаму дадатку.</string>
   <string name="found_existing_tor_process">знойдзены існавалы працэс Tor...</string>
   <string name="something_bad_happened">Адбылася нейкая памылка. Праверце журнал.</string>
-  <string name="unable_to_read_hidden_service_name">немагчыма прачытаць імя схаванай службы</string>
-  <string name="unable_to_start_tor">Немагчыма запусціць Tor:</string>
+    <string name="unable_to_start_tor">Немагчыма запусціць Tor:</string>
   <string name="pref_use_persistent_notifications">Заўсёды адлюстроўваць іконку у панэлі заданняў калі Orbot падключаны</string>
   <string name="pref_use_persistent_notifications_title">Нязменнае апавяшчэнне пра працу</string>
   <string name="pref_use_expanded_notifications">Паказаць пашыранае апавяшчэнне Tor з краінай выхаду і IP</string>
@@ -129,7 +128,6 @@
   <string name="send_email">Адправіць ліст</string>
   <string name="vpn_default_world">Свет (аўта)</string>
   <string name="hidden_services">Схаваныя службы</string>
-  <string name="title_activity_hidden_services">Схаваныя службы</string>
   <string name="menu_hidden_services">Схаваныя службы</string>
   <string name="save">Захаваць</string>
   <string name="local_port">Лакальны порт</string>
@@ -137,7 +135,6 @@
   <string name="name">Імя</string>
   <string name="done">Гатова!</string>
     <string name="copy_address_to_clipboard">Скапіяваць адрас у буфер памену</string>
-  <string name="show_auth_cookie">Паказаць аўтарызуючыя cookie</string>
   <string name="backup_service">Рэзерваваць службу</string>
   <string name="delete_service">Выдаліць службу</string>
   <string name="backup_saved_at_external_storage">Рэзервовая копія захавана на вонкавым сховішчы</string>
@@ -148,16 +145,8 @@
   <string name="click_again_for_backup">Націсніце яшчэ раз для рэзервавання</string>
   <string name="service_type">Тып службы</string>
   <string name="auth_cookie">Аўтарызучыя cookie</string>
-  <string name="copy_cookie_to_clipboard">Капіяваць cookie у буфер памену</string>
-  <string name="auth_cookie_was_not_configured">Аўтарызучыя cookie не наладжаны</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Калі ласка, перазапусціце Orbot для ўступу змены ў сілу</string>
-  <string name="client_cookies">Cookies кліента</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Прачытаць з QR-кода</string>
-  <string name="backup_cookie">Рэзерваваць cookie</string>
-  <string name="delete_cookie">Выдаліць cookies</string>
-  <string name="confirm_cookie_deletion">Пацвердзіце выдаленне cookie</string>
-  <string name="hosted_services">Размешчаныя службы</string>
   <string name="share_as_qr">Падзяліцца праз QR-код</string>
   <string name="disable">Адключыць</string>
   <string name="enable">Уключыць</string>
diff --git a/app-tv/src/main/res/values-bg/strings.xml b/app-tv/src/main/res/values-bg/strings.xml
index 9452b2ab..667ec542 100644
--- a/app-tv/src/main/res/values-bg/strings.xml
+++ b/app-tv/src/main/res/values-bg/strings.xml
@@ -91,8 +91,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">намерил си съвместим Tor проект...</string>
   <string name="something_bad_happened">Нещо лошо се случи. Проверете лога</string>
-    <string name="unable_to_read_hidden_service_name">не може да прочете име на скрита услуга</string>
-  <string name="unable_to_start_tor">Не може да стартира Тор:</string>
+    <string name="unable_to_start_tor">Не може да стартира Тор:</string>
     <string name="pref_use_persistent_notifications">Винаги показвай икона в тулбара когато Орбот е свързан</string>
   <string name="pref_use_persistent_notifications_title">Уведомления винаги включени</string>
   <string name="pref_use_expanded_notifications">Покажи разширена информация за Tor изходната държава и IP в лентата за известия</string>
@@ -122,8 +121,7 @@
     <string name="activate">Активирай</string>
   <string name="send_email">Изпрати имейл</string>
   <string name="hidden_services">Скрити услуги</string>
-  <string name="title_activity_hidden_services">Скрити услуги</string>
-  <string name="menu_hidden_services">Скрити услуги</string>
+    <string name="menu_hidden_services">Скрити услуги</string>
   <string name="save">Запази</string>
   <string name="name">Име</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Моля, рестартирай Orbot, за да влязат в действие промените</string>
diff --git a/app-tv/src/main/res/values-ca/strings.xml b/app-tv/src/main/res/values-ca/strings.xml
index b7de95f9..ba0c0bd4 100644
--- a/app-tv/src/main/res/values-ca/strings.xml
+++ b/app-tv/src/main/res/values-ca/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Una aplicació vol obrir el port de servidor ocults%1$d a la xarxa Tor. Això és segur si confieu en l\'aplicació</string>
   <string name="found_existing_tor_process">s\'ha trobat un procés Tor existent...</string>
   <string name="something_bad_happened">Ha fallat alguna cosa. Comproveu el registre</string>
-    <string name="unable_to_read_hidden_service_name">ha estat impossible llegir el nom del servei ocult</string>
-  <string name="unable_to_start_tor">Ha estat impossible iniciar Tor:</string>
+    <string name="unable_to_start_tor">Ha estat impossible iniciar Tor:</string>
     <string name="pref_use_persistent_notifications">Manté la icona sempre a la barra d\'eines mentre l\'Orbot està connectat</string>
   <string name="pref_use_persistent_notifications_title">Notificacions sempre activades</string>
   <string name="pref_use_expanded_notifications">Mostra la informació de sortida addicional del Tor amb  el país i la IP</string>
@@ -130,7 +129,6 @@
     <string name="send_email">Envia correu-e</string>
   <string name="vpn_default_world">Global (auto)</string>
   <string name="hidden_services">Serveis ocults</string>
-  <string name="title_activity_hidden_services">Serveis ocults</string>
   <string name="menu_hidden_services">Serveis ocults</string>
   <string name="save">Desa</string>
     <string name="local_port">Port local</string>
@@ -138,7 +136,6 @@
   <string name="name">Nom</string>
   <string name="done">Fet!</string>
     <string name="copy_address_to_clipboard">Copia adreça al portapapers</string>
-  <string name="show_auth_cookie">Mostrar galetes d\'autentificació</string>
   <string name="backup_service">Servei de còpia de seguretat</string>
   <string name="delete_service">Esborrar servei</string>
   <string name="backup_saved_at_external_storage">Còpia de seguretat desada a emmagatzematge extern</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Feu clic novament per fer còpia de seguretat</string>
   <string name="service_type">Tipus de servei</string>
   <string name="auth_cookie">Auth cookie</string>
-  <string name="copy_cookie_to_clipboard">Copieu les galetes al porta-retalls</string>
-  <string name="auth_cookie_was_not_configured">No s\'ha configurat l\'Auth cookie</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Reinicieu l\'Orbot per aplicar els canvis</string>
-  <string name="client_cookies">Client cookies</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Llegir de QR</string>
-  <string name="backup_cookie">Backup cookie</string>
-  <string name="delete_cookie">Elimina la galeta</string>
-  <string name="confirm_cookie_deletion">Confirma la supressió de les galetes</string>
-  <string name="hosted_services">Serveis allotjats</string>
   <string name="share_as_qr">Comparteix com a QR</string>
   <string name="disable">Deshabilitar </string>
   <string name="enable">Habilitar</string>
diff --git a/app-tv/src/main/res/values-cs-rCZ/strings.xml b/app-tv/src/main/res/values-cs-rCZ/strings.xml
index 04544c89..641a4eed 100644
--- a/app-tv/src/main/res/values-cs-rCZ/strings.xml
+++ b/app-tv/src/main/res/values-cs-rCZ/strings.xml
@@ -90,8 +90,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">nalezev existující Tor proces…</string>
   <string name="something_bad_happened">Stalo se něco špatného. Zkontrolujte log</string>
-    <string name="unable_to_read_hidden_service_name">nelze číst název skryté služby</string>
-  <string name="unable_to_start_tor">Nelze spustit Tor:</string>
+    <string name="unable_to_start_tor">Nelze spustit Tor:</string>
     <string name="pref_use_persistent_notifications">Vždy zobrazit ikonu ve stavovém řádku, pokud je Orbot připojen.</string>
   <string name="pref_use_persistent_notifications_title">Notifikace vždy zapnuté</string>
   <string name="pref_use_expanded_notifications">Zobrazit rozšířené oznánemí s Tor výstupní zemí a IP</string>
diff --git a/app-tv/src/main/res/values-cs/strings.xml b/app-tv/src/main/res/values-cs/strings.xml
index 17b7fb4f..373d8467 100644
--- a/app-tv/src/main/res/values-cs/strings.xml
+++ b/app-tv/src/main/res/values-cs/strings.xml
@@ -35,8 +35,7 @@
     <string name="get_bridges_email">Email</string>
   <string name="activate">Aktivovat</string>
   <string name="hidden_services">Skryté Služby</string>
-  <string name="title_activity_hidden_services">Skryté Služby</string>
-  <string name="menu_hidden_services">Skryté Služby</string>
+    <string name="menu_hidden_services">Skryté Služby</string>
   <string name="save">Uložit</string>
   <string name="name">Jméno</string>
   <string name="done">Hotovo!</string>
diff --git a/app-tv/src/main/res/values-cy/strings.xml b/app-tv/src/main/res/values-cy/strings.xml
index a1c168d6..e91f2549 100644
--- a/app-tv/src/main/res/values-cy/strings.xml
+++ b/app-tv/src/main/res/values-cy/strings.xml
@@ -36,8 +36,7 @@
     <string name="set_locale_title">Iaith</string>
     <string name="activate">Ysgogi</string>
   <string name="hidden_services">Gwasanaethau Cudd</string>
-  <string name="title_activity_hidden_services">Gwasanaethau Cudd</string>
-  <string name="menu_hidden_services">Gwasanaethau Cudd</string>
+    <string name="menu_hidden_services">Gwasanaethau Cudd</string>
   <string name="save">Cadw</string>
   <string name="name">Enw</string>
 </resources>
diff --git a/app-tv/src/main/res/values-da/strings.xml b/app-tv/src/main/res/values-da/strings.xml
index cd08b493..43d49f7c 100644
--- a/app-tv/src/main/res/values-da/strings.xml
+++ b/app-tv/src/main/res/values-da/strings.xml
@@ -88,8 +88,7 @@
   <string name="tor_version">Tor: https://www.torproject.org</string>
   <string name="found_existing_tor_process">fandt eksisterende Tor process...</string>
   <string name="something_bad_happened">Noget slemt er sket. Check loggen</string>
-    <string name="unable_to_read_hidden_service_name">ikke i stand til at læse navnet på den skjulte service</string>
-  <string name="unable_to_start_tor">Kunne ikke starte Tor:</string>
+    <string name="unable_to_start_tor">Kunne ikke starte Tor:</string>
     <string name="pref_use_persistent_notifications">Vis altid ikonet i statuslinien når Orbot er forbundet til netværket</string>
   <string name="pref_use_persistent_notifications_title">Vis altid notifikationer</string>
     <string name="set_locale_title">Sprog</string>
@@ -98,8 +97,7 @@
   <string name="get_bridges_email">Mail</string>
   <string name="activate">Aktiver</string>
   <string name="hidden_services">Skjulte tjenester</string>
-  <string name="title_activity_hidden_services">Skjulte tjenester</string>
-  <string name="menu_hidden_services">Skjulte tjenester</string>
+    <string name="menu_hidden_services">Skjulte tjenester</string>
   <string name="save">Gem</string>
   <string name="name">Navn</string>
   <string name="disable">Deaktivere</string>
diff --git a/app-tv/src/main/res/values-de/strings.xml b/app-tv/src/main/res/values-de/strings.xml
index 0e7867c1..c8fde947 100644
--- a/app-tv/src/main/res/values-de/strings.xml
+++ b/app-tv/src/main/res/values-de/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Eine Anwendung möchte den Versteckten Server-Anschluss %1$d zum Tor-Netz öffnen. Dies ist sicher, wenn Sie der Anwendung vertrauen.</string>
   <string name="found_existing_tor_process">bestehenden Tor-Prozess gefunden …</string>
   <string name="something_bad_happened">Etwas ist schief gelaufen. Bitte Protokoll überprüfen</string>
-    <string name="unable_to_read_hidden_service_name">Name des versteckten Dienstes kann nicht gelesen werden</string>
-  <string name="unable_to_start_tor">Tor kann nicht gestartet werden:</string>
+    <string name="unable_to_start_tor">Tor kann nicht gestartet werden:</string>
     <string name="pref_use_persistent_notifications">Behalte immer das Symbol in der Symbolleiste, wenn Orbot verbunden ist</string>
   <string name="pref_use_persistent_notifications_title">Aktivitätsanzeige</string>
   <string name="pref_use_expanded_notifications">Zeige erweiterte Benachrichtigung mit Tor-Ausgangsland und IP an</string>
@@ -130,7 +129,6 @@
     <string name="send_email">E-Mail senden</string>
   <string name="vpn_default_world">Global (Automatisch)</string>
   <string name="hidden_services">Versteckte Dienste</string>
-  <string name="title_activity_hidden_services">Versteckte Dienste</string>
   <string name="menu_hidden_services">Versteckte Dienste</string>
   <string name="save">Speichern</string>
     <string name="local_port">Lokaler Anschluss</string>
@@ -138,7 +136,6 @@
   <string name="name">Name</string>
   <string name="done">Fertig!</string>
     <string name="copy_address_to_clipboard">Adresse in die Zwischenablage kopieren</string>
-  <string name="show_auth_cookie">Authentifikationscookie anzeigen</string>
   <string name="backup_service">Sicherungsdienst</string>
   <string name="delete_service">Dienst löschen</string>
   <string name="backup_saved_at_external_storage">Sicherung auf externem Speicher gespeichert </string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Zum Sichern noch einmal klicken</string>
   <string name="service_type">Dienst-Typ</string>
   <string name="auth_cookie">Authentifikationscookie</string>
-  <string name="copy_cookie_to_clipboard">Cookie in die Zwischenablage kopieren</string>
-  <string name="auth_cookie_was_not_configured">Es wurde kein Authentifikationscookie festgelegt</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Bitte Orbot zum Aktivieren der Änderungen neustarten</string>
-  <string name="client_cookies">Client Cookies</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Lese QR-Code</string>
-  <string name="backup_cookie">Cookie sichern</string>
-  <string name="delete_cookie">Cookie löschen</string>
-  <string name="confirm_cookie_deletion">Cookie-Löschung bestätigen</string>
-  <string name="hosted_services">Gehostete Dienste</string>
   <string name="share_as_qr">Teile als QR-Code</string>
   <string name="disable">Deaktivieren</string>
   <string name="enable">Aktivieren</string>
diff --git a/app-tv/src/main/res/values-el/strings.xml b/app-tv/src/main/res/values-el/strings.xml
index d15f1026..9d9bfc92 100644
--- a/app-tv/src/main/res/values-el/strings.xml
+++ b/app-tv/src/main/res/values-el/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Κάποια εφαρμογή προσπαθεί να ανοίξει την κρυφή θύρα διακομιστή %1$dστο δίκτυο Tor. Πρόκειται για ασφαλή ενέργεια, εφόσον γνωρίζετε την εφαρμογή.</string>
   <string name="found_existing_tor_process">αναζήτηση διεργασιών Tor...</string>
   <string name="something_bad_happened">Κάτι κακό συνέβη. Ελέγξτε τις καταγραφές</string>
-    <string name="unable_to_read_hidden_service_name">αδυναμία ανάγνωσης του ονόματος της κρυφής υπηρεσίας</string>
-  <string name="unable_to_start_tor">Αδυναμία εκκίνησης του Tor:</string>
+    <string name="unable_to_start_tor">Αδυναμία εκκίνησης του Tor:</string>
     <string name="pref_use_persistent_notifications">Να διατηρείται πάντοτε το εικονίδιο στην γραμμή εργαλείων όταν το Orbot συνδέεται</string>
   <string name="pref_use_persistent_notifications_title">Ειδοποιήσεις διαρκούς σύνδεσης</string>
   <string name="pref_use_expanded_notifications">Εμφάνιση εκτεταμένης ειδοποίησης με τη χώρα εξόδου του Tor και τη διεύθυνση IP</string>
@@ -130,7 +129,6 @@
     <string name="send_email">Στείλτε Email</string>
   <string name="vpn_default_world">Παγκόσμια (Auto)</string>
   <string name="hidden_services">Αποκρυφες υπηρεσιες</string>
-  <string name="title_activity_hidden_services">Αποκρυφες υπηρεσιες</string>
   <string name="menu_hidden_services">Αποκρυφες υπηρεσιες</string>
   <string name="save">Αποθήκευση</string>
     <string name="local_port">Τοπική θύρα</string>
@@ -138,7 +136,6 @@
   <string name="name">Όνομα</string>
   <string name="done">Έγινε!</string>
     <string name="copy_address_to_clipboard">Αντιγραφή διέυθυνσης στο πρόχειρο</string>
-  <string name="show_auth_cookie">Εμφάνιση αναγνωριστικού cookie</string>
   <string name="backup_service">Υπηρεσία δημιουργίας αντιγράφου ασφαλείας</string>
   <string name="delete_service">Διαγραφή υπηρεσίας</string>
   <string name="backup_saved_at_external_storage">Το αντίγράφο ασφαλείας αποθηκεύθηκε σε εξωτερικό μέσο αποθήκευσης</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Πατήστε ξανά για το αντίγραφο ασφαλείας</string>
   <string name="service_type">Τύπος υπηρεσίας</string>
   <string name="auth_cookie">Αναγνωριστικό cookie</string>
-  <string name="copy_cookie_to_clipboard">Αντιγραφή τού cookie στο πρόχειρο</string>
-  <string name="auth_cookie_was_not_configured">Το αναγνωριστικό cookie δεν διαμορφώθηκε</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Παρακαλούμε επανεκκινήστε το Orbot για να ενεργοποιήσετε τις αλλαγές</string>
-  <string name="client_cookies">Cookies πελατών</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Ανάγνωση από QR</string>
-  <string name="backup_cookie">Cookie αντίγραφου ασφαλείας </string>
-  <string name="delete_cookie">Αφαίρεση Cookie</string>
-  <string name="confirm_cookie_deletion">Επιβεβαίωση διαγραφής τού cookie </string>
-  <string name="hosted_services">Φιλοξενημένες υπηρεσίες</string>
   <string name="share_as_qr">Κοινοποίηση ως QR</string>
   <string name="disable">Απενεργοποίηση</string>
   <string name="enable">Ενεργοποίηση</string>
diff --git a/app-tv/src/main/res/values-eo/strings.xml b/app-tv/src/main/res/values-eo/strings.xml
index 488fdda3..6210d740 100644
--- a/app-tv/src/main/res/values-eo/strings.xml
+++ b/app-tv/src/main/res/values-eo/strings.xml
@@ -67,8 +67,7 @@
   <string name="enter_ports">Entajpu pordojn</string>
     <string name="project_home">Retpaĝaro(j) de la Projekto:</string>
     <string name="found_existing_tor_process">trovi ekzistantan Tor-procedon...</string>
-    <string name="unable_to_read_hidden_service_name">ne eblas legi nomon de la kaŝita servo</string>
-  <string name="unable_to_start_tor">Ne eblas startigi Tor:</string>
+    <string name="unable_to_start_tor">Ne eblas startigi Tor:</string>
     <string name="set_locale_title">Lingvo</string>
     <string name="activate">Aktivi</string>
   <string name="save">Konservi</string>
diff --git a/app-tv/src/main/res/values-es/strings.xml b/app-tv/src/main/res/values-es/strings.xml
index 39e20868..05214259 100644
--- a/app-tv/src/main/res/values-es/strings.xml
+++ b/app-tv/src/main/res/values-es/strings.xml
@@ -97,8 +97,7 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
   <string name="hidden_service_request">Una aplicación quiere abrir el puerto %1$d de servidor oculto a la red Tor. Esto es seguro si confía en la aplicación.</string>
   <string name="found_existing_tor_process">Se encontró un proceso de Tor ya existente...</string>
   <string name="something_bad_happened">Hubo algún tipo de problema. Compruebe el registro (log)</string>
-    <string name="unable_to_read_hidden_service_name">No fue posible leer el nombre del servicio oculto</string>
-  <string name="unable_to_start_tor">No fue posible iniciar Tor: </string>
+    <string name="unable_to_start_tor">No fue posible iniciar Tor: </string>
     <string name="pref_use_persistent_notifications">Mantener siempre el icono de Orbot en la barra de tareas cuando esté conectado</string>
   <string name="pref_use_persistent_notifications_title">Notificaciones siempre activadas</string>
   <string name="pref_use_expanded_notifications">Mostrar notificación expandida con el país de salida de Tor y la IP</string>
@@ -131,7 +130,6 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
     <string name="send_email">Enviar correo</string>
   <string name="vpn_default_world">Global (Automático)</string>
   <string name="hidden_services">Servicios ocultos</string>
-  <string name="title_activity_hidden_services">Servicios ocultos</string>
   <string name="menu_hidden_services">Servicios ocultos</string>
   <string name="save">Guardar</string>
     <string name="local_port">Puerto local</string>
@@ -139,7 +137,6 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
   <string name="name">Nombre</string>
   <string name="done">¡Hecho!</string>
     <string name="copy_address_to_clipboard">Copiar dirección al portapapeles</string>
-  <string name="show_auth_cookie">Mostrar cookie de autentificación</string>
   <string name="backup_service">Hacer copia de seguridad del servicio</string>
   <string name="delete_service">Borrar servicio</string>
   <string name="backup_saved_at_external_storage">Copia de seguridad guardada en un almacenamiento externo</string>
@@ -150,16 +147,8 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
   <string name="click_again_for_backup">Pulse de nuevo para realizar copia de seguridad</string>
   <string name="service_type">Tipo de servicio</string>
   <string name="auth_cookie">Cookie de autentificación</string>
-  <string name="copy_cookie_to_clipboard">Copiar cookie al portapapeles</string>
-  <string name="auth_cookie_was_not_configured">La cookie de autentificación no fue configurada</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Por favor, reinicie Orbot para habilitar los cambios</string>
-  <string name="client_cookies">Cookies de cliente</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Leer desde QR</string>
-  <string name="backup_cookie">Realizar copia de seguridad de cookie</string>
-  <string name="delete_cookie">Borrar cookie</string>
-  <string name="confirm_cookie_deletion">Confirmar borrado de cookie</string>
-  <string name="hosted_services">Servicios alojados</string>
   <string name="share_as_qr">Compartir como QR</string>
   <string name="disable">Deshabilitar</string>
   <string name="enable">Habilitar</string>
diff --git a/app-tv/src/main/res/values-et/strings.xml b/app-tv/src/main/res/values-et/strings.xml
index a3c8da10..286e76e5 100644
--- a/app-tv/src/main/res/values-et/strings.xml
+++ b/app-tv/src/main/res/values-et/strings.xml
@@ -84,8 +84,7 @@
     <string name="third_party_software">Kolmanda osapoole tarkvara:</string>
   <string name="found_existing_tor_process">leidus töötav Tor protsess...</string>
   <string name="something_bad_happened">Juhtus midagi halba. Kontrollige logi</string>
-    <string name="unable_to_read_hidden_service_name">ei õnnestu lugeda varjatud teenuse nime</string>
-  <string name="unable_to_start_tor">Tor käivitamine ebaõnnestus:</string>
+    <string name="unable_to_start_tor">Tor käivitamine ebaõnnestus:</string>
     <string name="pref_use_persistent_notifications">Ühendatud Orbot korral näidata katkematult ikoonide tööriistariba</string>
   <string name="pref_use_persistent_notifications_title">Pidevalt kuvatavad teated</string>
     <string name="pref_disable_network_title">Pole võrgu auto-und</string>
diff --git a/app-tv/src/main/res/values-eu/strings.xml b/app-tv/src/main/res/values-eu/strings.xml
index 8850ac3c..40f2c73a 100644
--- a/app-tv/src/main/res/values-eu/strings.xml
+++ b/app-tv/src/main/res/values-eu/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Aplikazio batek ezkutuko zerbitzariko %1$d ataka ireki nau du Tor sarera. Segurua da aplikazioaz fidatzen bazara.</string>
   <string name="found_existing_tor_process">aurreko Tor prozesu bat aurkitu da...</string>
   <string name="something_bad_happened">Zerbait txarra gertatu da. Begiratu egunkarian</string>
-    <string name="unable_to_read_hidden_service_name">ezin izan da ezkutuko zerbitzuaren izena irakurri</string>
-  <string name="unable_to_start_tor">Ezin izan da Tor hasi:</string>
+    <string name="unable_to_start_tor">Ezin izan da Tor hasi:</string>
     <string name="pref_use_persistent_notifications">Mantendu ikonoa tresna barran Orbot konektatuta dagoenean</string>
   <string name="pref_use_persistent_notifications_title">Beti piztutako jakinarazpenak</string>
   <string name="pref_use_expanded_notifications">Erakutsi hedatutako jakinarazpenak Tor irteera herrialde eta IP-arekin</string>
@@ -130,7 +129,6 @@
     <string name="send_email">Bidali E-maila</string>
   <string name="vpn_default_world">Orokorra (Automatikoa)</string>
   <string name="hidden_services">Ezkutuko zerbitzuak</string>
-  <string name="title_activity_hidden_services">Ezkutuko zerbitzuak</string>
   <string name="menu_hidden_services">Ezkutuko zerbitzuak</string>
   <string name="save">Gorde</string>
     <string name="local_port">Ataka lokala</string>
@@ -138,7 +136,6 @@
   <string name="name">Izena</string>
   <string name="done">Egina!</string>
     <string name="copy_address_to_clipboard">Kopiatu helbidea arbelera</string>
-  <string name="show_auth_cookie">Erakutsi autentifikazio cookie-a</string>
   <string name="backup_service">Egin zerbitzuaren babeskopia</string>
   <string name="delete_service">Ezabatu zerbitzua</string>
   <string name="backup_saved_at_external_storage">Babeskopia kanpo biltegiratzean gorde da</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Egin klik berriro babeskopiarako</string>
   <string name="service_type">Zerbitzu mota</string>
   <string name="auth_cookie">Autentifikazio cookie-a</string>
-  <string name="copy_cookie_to_clipboard">Kopiatu cookie-a arbelera</string>
-  <string name="auth_cookie_was_not_configured">Ez da autentifikazio cookie-a konfiguratu</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Mesedez berrabiarazi Orbot aldaketak aktibatzeko</string>
-  <string name="client_cookies">Bezero-cookie-ak</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Irakurri QR-tik</string>
-  <string name="backup_cookie">Egin cookie-aren babeskopia</string>
-  <string name="delete_cookie">Ezabatu cookie-a</string>
-  <string name="confirm_cookie_deletion">Berretsi cookie-a ezabatzea</string>
-  <string name="hosted_services">Ostatatutako zerbitzuak</string>
   <string name="share_as_qr">Partekatu QR gisa</string>
   <string name="disable">Desgaitu</string>
   <string name="enable">Gaitu</string>
diff --git a/app-tv/src/main/res/values-fa/strings.xml b/app-tv/src/main/res/values-fa/strings.xml
index cb822f0b..1e6f1e8d 100644
--- a/app-tv/src/main/res/values-fa/strings.xml
+++ b/app-tv/src/main/res/values-fa/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">اپلیکیشنی می‌خواهد پورت سرور %1$d را به شبکه تور بگشاید. در صورتی که به این برنامه اطمینان دارید، چنین کاری امن است.</string>
   <string name="found_existing_tor_process">یک تور درحال اجرا پیدا شد...</string>
   <string name="something_bad_happened">اتفاق بدی افتاد. وقایع ثبت شده را چک کنید</string>
-    <string name="unable_to_read_hidden_service_name">ناتوان در خواندن نام سرویس مخفی</string>
-  <string name="unable_to_start_tor">ناتوان در راه اندازی تور:</string>
+    <string name="unable_to_start_tor">ناتوان در راه اندازی تور:</string>
     <string name="pref_use_persistent_notifications">وقتی ربات پیازی متصل است، همیشه آیکون مربوط را در نوار ابزار نگه دار.</string>
   <string name="pref_use_persistent_notifications_title">آگاهسازی همیشه روشن</string>
   <string name="pref_use_expanded_notifications">نمایش اطلاع رسانی گسترده با کشور خروجی Tor و IP</string>
@@ -130,7 +129,6 @@
     <string name="send_email">ایمیل بفرست</string>
   <string name="vpn_default_world">جهانی (خودکار)</string>
   <string name="hidden_services">سرویس‌های مخفی</string>
-  <string name="title_activity_hidden_services">سرویس‌های مخفی</string>
   <string name="menu_hidden_services">سرویس‌های مخفی</string>
   <string name="save">ذخيره</string>
     <string name="local_port">درگاه محلی</string>
@@ -138,7 +136,6 @@
   <string name="name">نام</string>
   <string name="done">انجام شد!</string>
     <string name="copy_address_to_clipboard">رونوشت نشانی‌ها در حافظه موقت</string>
-  <string name="show_auth_cookie">نمایش کوکی احراز هویت</string>
   <string name="backup_service">سرویس بک‌آپ</string>
   <string name="delete_service">حذف سرویس</string>
   <string name="backup_saved_at_external_storage">بک‌آپ در انباره خارجی ذخیره شد</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">برای بک‌آپ، دوباره کلیک کنید</string>
   <string name="service_type">نوع سرویس</string>
   <string name="auth_cookie">کوکی Auth</string>
-  <string name="copy_cookie_to_clipboard">کپی کردن کوکی به کلیپ بورد</string>
-  <string name="auth_cookie_was_not_configured">کوکی احراز هویت پیکربندی نشده بود</string>
   <string name="please_restart_Orbot_to_enable_the_changes">برای دیدن تغییرات، اوربات  را دوباره راه اندازی کنید</string>
-  <string name="client_cookies">کوکی‌های Client</string>
   <string name="onion">onion.</string>
-  <string name="cookie_from_QR">از QR بخوان</string>
-  <string name="backup_cookie">بک‌آپ از کوکی</string>
-  <string name="delete_cookie">حذف کوکی</string>
-  <string name="confirm_cookie_deletion">تایید حذف کوکی</string>
-  <string name="hosted_services">سرویس‌های میزبانی‌شده</string>
   <string name="share_as_qr">هم‌رسانی با QR</string>
   <string name="disable">غیرفعال کن</string>
   <string name="enable">فعال کن</string>
diff --git a/app-tv/src/main/res/values-fi/strings.xml b/app-tv/src/main/res/values-fi/strings.xml
index 46b634ba..76f31184 100644
--- a/app-tv/src/main/res/values-fi/strings.xml
+++ b/app-tv/src/main/res/values-fi/strings.xml
@@ -91,8 +91,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">löytyi olemassaoleva Tor-prosessi...</string>
   <string name="something_bad_happened">Jotain pahaa tapahtui. Tarkista loki</string>
-  <string name="unable_to_read_hidden_service_name">piilopalvelunimen lukeminen epäonnistui</string>
-  <string name="unable_to_start_tor">Torin käynnistys epäonnistui:</string>
+    <string name="unable_to_start_tor">Torin käynnistys epäonnistui:</string>
   <string name="pref_use_persistent_notifications">Pidä kuvake aina työkalupalkissa, kun Orbot on yhdistetty</string>
   <string name="pref_use_persistent_notifications_title">Ilmoitukset aina käytössä</string>
   <string name="pref_use_expanded_notifications">Näytä laajennettu ilmoitus (Torin ulostulon maa ja IP)</string>
@@ -122,8 +121,7 @@
     <string name="activate">Ota käyttöön</string>
   <string name="send_email">Lähetä sähköpostia</string>
   <string name="hidden_services">Piilopalvelut</string>
-  <string name="title_activity_hidden_services">Piilopalvelut</string>
-  <string name="menu_hidden_services">Piilopalvelut</string>
+    <string name="menu_hidden_services">Piilopalvelut</string>
   <string name="save">Tallenna</string>
   <string name="name">Nimi</string>
   <string name="done">Valmis!</string>
diff --git a/app-tv/src/main/res/values-fr-rFR/strings.xml b/app-tv/src/main/res/values-fr-rFR/strings.xml
index 7fcf32b8..6f1ebb4a 100644
--- a/app-tv/src/main/res/values-fr-rFR/strings.xml
+++ b/app-tv/src/main/res/values-fr-rFR/strings.xml
@@ -91,8 +91,7 @@
   <string name="libevent_version">LibEvent v2.0.21 : http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">un processus existant de Tor a été trouvé...</string>
   <string name="something_bad_happened">Quelque chose n’a pas été. Vérifiez le journal</string>
-    <string name="unable_to_read_hidden_service_name">impossible de lire le nom du service caché</string>
-  <string name="unable_to_start_tor">Impossible de démarrer Tor :</string>
+    <string name="unable_to_start_tor">Impossible de démarrer Tor :</string>
     <string name="pref_use_persistent_notifications">Toujours conserver l’icône dans la barre des tâches quand Orbot est connecté.</string>
   <string name="pref_use_persistent_notifications_title">Notifications toujours actives</string>
   <string name="pref_use_expanded_notifications">Montrer des notifications étendues avec le pays de sortie de Tor et l’IP</string>
diff --git a/app-tv/src/main/res/values-fr/strings.xml b/app-tv/src/main/res/values-fr/strings.xml
index 36a5526f..2ded4be7 100644
--- a/app-tv/src/main/res/values-fr/strings.xml
+++ b/app-tv/src/main/res/values-fr/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Une appli veut ouvrir le port %1$d du serveur caché au réseau Tor. Cela est sécuritaire si vous faites confiance à l’appli.</string>
   <string name="found_existing_tor_process">un processus existant de Tor a été trouvé...</string>
   <string name="something_bad_happened">Quelque chose n’a pas été. Vérifiez le journal</string>
-    <string name="unable_to_read_hidden_service_name">impossible de lire le nom du service caché</string>
-  <string name="unable_to_start_tor">Impossible de démarrer Tor :</string>
+    <string name="unable_to_start_tor">Impossible de démarrer Tor :</string>
     <string name="pref_use_persistent_notifications">Toujours conserver l’icône dans la barre des tâches quand Orbot est connecté.</string>
   <string name="pref_use_persistent_notifications_title">Notifications toujours actives</string>
   <string name="pref_use_expanded_notifications">Montrer des notifications étendues avec le pays de sortie de Tor et l’IP</string>
@@ -130,7 +129,6 @@
     <string name="send_email">Envoyer un courriel</string>
   <string name="vpn_default_world">Mondial (Auto)</string>
   <string name="hidden_services">Services cachés</string>
-  <string name="title_activity_hidden_services">Services cachés</string>
   <string name="menu_hidden_services">Services cachés</string>
   <string name="save">Enregistrer</string>
     <string name="local_port">Port local</string>
@@ -138,7 +136,6 @@
   <string name="name">Nom</string>
   <string name="done">Fait !</string>
     <string name="copy_address_to_clipboard">Copier l’adresse vers le presse-papiers</string>
-  <string name="show_auth_cookie">Afficher le témoin auth</string>
   <string name="backup_service">Service de sauvegarde</string>
   <string name="delete_service">Supprimer le service</string>
   <string name="backup_saved_at_external_storage">La sauvegarde a été enregistrée sur une mémoire externe</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Recliquer pour sauvegarder</string>
   <string name="service_type">Type de service</string>
   <string name="auth_cookie">Témoin auth</string>
-  <string name="copy_cookie_to_clipboard">Copier le témoin vers le presse-papiers</string>
-  <string name="auth_cookie_was_not_configured">Le témoin auth n’est pas configuré</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Veuillez redémarrer Orbot pour activer les changements</string>
-  <string name="client_cookies">Témoins du client</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Lire d’un code QR</string>
-  <string name="backup_cookie">Sauvegarder le témoin</string>
-  <string name="delete_cookie">Supprimer le témoin</string>
-  <string name="confirm_cookie_deletion">Confirmer la suppression du témoin</string>
-  <string name="hosted_services">Services hébergés</string>
   <string name="share_as_qr">Partager comme code QR</string>
   <string name="disable">Désactiver</string>
   <string name="enable">Activer</string>
diff --git a/app-tv/src/main/res/values-gl/strings.xml b/app-tv/src/main/res/values-gl/strings.xml
index 9597d09c..91dd5df1 100644
--- a/app-tv/src/main/res/values-gl/strings.xml
+++ b/app-tv/src/main/res/values-gl/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Unha aplicación quere abrir o porto oculto de servidor %1$d a rede Tor. Esto é seguro se vostede confía na app.</string>
   <string name="found_existing_tor_process">atopado proceso Tor existente...</string>
   <string name="something_bad_happened">Algo malo pasou. Comprobe o rexistro</string>
-    <string name="unable_to_read_hidden_service_name">imposible ler nome de servizo oculto</string>
-  <string name="unable_to_start_tor">Incapaz de arrancar Tor</string>
+    <string name="unable_to_start_tor">Incapaz de arrancar Tor</string>
     <string name="pref_use_persistent_notifications">Mostrar sempre a icona na barra de ferramentas cando Orbot estea conectado</string>
   <string name="pref_use_persistent_notifications_title">Notificacións Sempre Acesas</string>
   <string name="pref_use_expanded_notifications">Mostar notificación extendida co país de saída de Tor e IP</string>
@@ -130,7 +129,6 @@
     <string name="send_email">Enviar correo</string>
   <string name="vpn_default_world">Global (Auto)</string>
   <string name="hidden_services">Servizos agochados</string>
-  <string name="title_activity_hidden_services">Servizos agochados</string>
   <string name="menu_hidden_services">Servizos agochados</string>
   <string name="save">Gardar</string>
     <string name="local_port">Porto local</string>
@@ -138,7 +136,6 @@
   <string name="name">Nome</string>
   <string name="done">Feito!</string>
     <string name="copy_address_to_clipboard">Copiar enderezo ao portapapeis</string>
-  <string name="show_auth_cookie">Mostar testemuño de autorización</string>
   <string name="backup_service">Servizo de respaldo</string>
   <string name="delete_service">Eliminar servizo</string>
   <string name="backup_saved_at_external_storage">Respaldo gardado en almacenamento externo</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Pulse de novo para respaldar</string>
   <string name="service_type">Tipo de servizo</string>
   <string name="auth_cookie">Testemuño de autorización</string>
-  <string name="copy_cookie_to_clipboard">Copie o testemuño ao portapapeis</string>
-  <string name="auth_cookie_was_not_configured">Non estableceu un testemuño de autorización</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Por favor, reinicie Orbot para activar os cambios</string>
-  <string name="client_cookies">Testemuños do cliente</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Ler desde QR</string>
-  <string name="backup_cookie">Testemuño de respaldo</string>
-  <string name="delete_cookie">Eliminar testemuño</string>
-  <string name="confirm_cookie_deletion">Confirme a eliminación do testemuño</string>
-  <string name="hosted_services">Servizos hospedados</string>
   <string name="share_as_qr">Compartir como QR</string>
   <string name="disable">Inhabilitar</string>
   <string name="enable">Activar</string>
diff --git a/app-tv/src/main/res/values-hi/strings.xml b/app-tv/src/main/res/values-hi/strings.xml
index 919048e2..6a884aea 100644
--- a/app-tv/src/main/res/values-hi/strings.xml
+++ b/app-tv/src/main/res/values-hi/strings.xml
@@ -97,8 +97,7 @@
   <string name="hidden_service_request">एक ऐप Tor नेटवर्क पर %1$dछिपा सर्वर पोर्ट खोलना चाहता है। यदि आप ऐप पर विश्वास करते हैं, तो यह सुरक्षित है</string>
   <string name="found_existing_tor_process">मौजूदा तोर प्रक्रिया पाया ...</string>
   <string name="something_bad_happened">कुछ बुरा हो गया। लॉग की जांच करें</string>
-    <string name="unable_to_read_hidden_service_name">छिपी हुई सेवा का नाम पढ़ने में असमर्थ</string>
-  <string name="unable_to_start_tor">टो शुरू करने में असमर्थ:</string>
+    <string name="unable_to_start_tor">टो शुरू करने में असमर्थ:</string>
     <string name="pref_use_persistent_notifications">ऑरबोट कनेक्ट होने पर टूलबार में हमेशा आइकन रखें</string>
   <string name="pref_use_persistent_notifications_title">हमेशा की सूचनाएं</string>
   <string name="pref_use_expanded_notifications">तोर एग्जिट देश और आईपी के साथ विस्तारित सूचना दिखाएं</string>
@@ -131,7 +130,6 @@
     <string name="send_email">ईमेल भेजें</string>
   <string name="vpn_default_world">ग्लोबल (ऑटो)</string>
   <string name="hidden_services">हिडन सेवाएं</string>
-  <string name="title_activity_hidden_services">हिडन सेवाएं</string>
   <string name="menu_hidden_services">हिडन सेवाएं</string>
   <string name="save">बचाना</string>
     <string name="local_port">स्थानीय पोर्ट</string>
@@ -139,7 +137,6 @@
   <string name="name">नाम</string>
   <string name="done">किया हुआ!</string>
     <string name="copy_address_to_clipboard">क्लिपबोर्ड को पता कॉपी करें</string>
-  <string name="show_auth_cookie">Auth कुकी दिखाएं</string>
   <string name="backup_service">बैकअप सेवा</string>
   <string name="delete_service">सेवा हटाएँ</string>
   <string name="backup_saved_at_external_storage">बाह्य संग्रहण में बैकअप सहेजा गया</string>
@@ -150,16 +147,8 @@
   <string name="click_again_for_backup">बैकअप के लिए फिर से क्लिक करें</string>
   <string name="service_type">सेवा प्रकार</string>
   <string name="auth_cookie">Auth कुकी</string>
-  <string name="copy_cookie_to_clipboard">क्लिपबोर्ड पर कुकी कॉपी करें</string>
-  <string name="auth_cookie_was_not_configured">Auth कुकी कॉन्फ़िगर नहीं की गई थी</string>
   <string name="please_restart_Orbot_to_enable_the_changes">परिवर्तन सक्षम करने के लिए Orbot पुनः प्रारंभ करें</string>
-  <string name="client_cookies">क्लाइंट कुकीज़</string>
   <string name="onion">.अनियन </string>
-  <string name="cookie_from_QR">QR से पढ़ें</string>
-  <string name="backup_cookie">बैकअप कुकी</string>
-  <string name="delete_cookie">कुकी हटाएं</string>
-  <string name="confirm_cookie_deletion">कुकी हटाने की पुष्टि करें</string>
-  <string name="hosted_services">होस्टेड सर्विसेस</string>
   <string name="share_as_qr">QR के रूप में शेयर करें</string>
   <string name="disable">अक्षम</string>
   <string name="enable">सक्षम करें</string>
diff --git a/app-tv/src/main/res/values-hr/strings.xml b/app-tv/src/main/res/values-hr/strings.xml
index 62a2945c..1d8f9fe5 100644
--- a/app-tv/src/main/res/values-hr/strings.xml
+++ b/app-tv/src/main/res/values-hr/strings.xml
@@ -91,8 +91,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">pronađeni postojeći Tor procesi...</string>
   <string name="something_bad_happened">Nešto loše se dogodilo. Provjerite dnevnik</string>
-  <string name="unable_to_read_hidden_service_name">nije moguće pročitati ime skrivene usluge</string>
-  <string name="unable_to_start_tor">Nije moguće pokrenuti Tor:</string>
+    <string name="unable_to_start_tor">Nije moguće pokrenuti Tor:</string>
   <string name="pref_use_persistent_notifications">Uvjek drži ikonu na alatnoj traci kad je Orbot spojen</string>
   <string name="pref_use_persistent_notifications_title">Obavijesti o stalnoj pokrenutosti</string>
   <string name="pref_use_expanded_notifications">Prikaži proširene obavijesti s Tor izlaznom državom i IP-em</string>
diff --git a/app-tv/src/main/res/values-hu/strings.xml b/app-tv/src/main/res/values-hu/strings.xml
index 33932aa1..6df55d32 100644
--- a/app-tv/src/main/res/values-hu/strings.xml
+++ b/app-tv/src/main/res/values-hu/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Egy app egy rejtett szerver portot %1$d nyitna a Tor hálózatra. Ez biztonságos, ha megbízik az appban.</string>
   <string name="found_existing_tor_process">létező Tor folyamat találva...</string>
   <string name="something_bad_happened">Valami rossz történt. Nézd meg a naplót.</string>
-    <string name="unable_to_read_hidden_service_name">nem olvasható a rejtett szolgáltatás neve</string>
-  <string name="unable_to_start_tor">A Tor indítása sikertelen:</string>
+    <string name="unable_to_start_tor">A Tor indítása sikertelen:</string>
     <string name="pref_use_persistent_notifications">Mindig tartsa az ikont az eszköztáron, ha az Orbot csatlakoztatva van.</string>
   <string name="pref_use_persistent_notifications_title">Mindig-bekapcsolt értesítések</string>
   <string name="pref_use_expanded_notifications">Mutassa a bővített értesítést a Tor kilépő országgal és IP-vel</string>
@@ -130,7 +129,6 @@
     <string name="send_email">Email küldése</string>
   <string name="vpn_default_world">Globális (Auto)</string>
   <string name="hidden_services">Rejtett szolgáltatások</string>
-  <string name="title_activity_hidden_services">Rejtett szolgáltatások</string>
   <string name="menu_hidden_services">Rejtett szolgáltatások</string>
   <string name="save">Mentés</string>
     <string name="local_port">Helyi Port</string>
@@ -138,7 +136,6 @@
   <string name="name">Név</string>
   <string name="done">Kész!</string>
     <string name="copy_address_to_clipboard">Cím másolása vágólapra</string>
-  <string name="show_auth_cookie">Azonosító süti megjelenítése</string>
   <string name="backup_service">Mentő szolgáltatás</string>
   <string name="delete_service">Szolgáltatás Törlése</string>
   <string name="backup_saved_at_external_storage">Külső tárhelyre mentve</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Kattintson még egyszer a mentéshez</string>
   <string name="service_type">Szolgáltatás típus</string>
   <string name="auth_cookie">Azonosító süti</string>
-  <string name="copy_cookie_to_clipboard">Süti másolása vágólapra</string>
-  <string name="auth_cookie_was_not_configured">Azonosító süti nem konfigurált</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Kérlek indítsd újra az Orbot-ot a változások engedélyezéséhez</string>
-  <string name="client_cookies">Kliens sütik</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Olvasás QR-ból</string>
-  <string name="backup_cookie">Süti mentése</string>
-  <string name="delete_cookie">Süti törlése</string>
-  <string name="confirm_cookie_deletion">Süti törlés jóváhagyása</string>
-  <string name="hosted_services">Futtatott szolgáltatások</string>
   <string name="share_as_qr">Megosztás QR-ként</string>
   <string name="disable">Kikapcsol</string>
   <string name="enable">Engedélyezés</string>
diff --git a/app-tv/src/main/res/values-in/strings.xml b/app-tv/src/main/res/values-in/strings.xml
index d9906e11..e12fa86a 100644
--- a/app-tv/src/main/res/values-in/strings.xml
+++ b/app-tv/src/main/res/values-in/strings.xml
@@ -91,8 +91,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">menemukan proses Tor yang ada...</string>
   <string name="something_bad_happened">Sesuatu yang buruk terjadi. Periksa log</string>
-    <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama layanan tersembunyi</string>
-  <string name="unable_to_start_tor">Tidak dapat memulai Tor:</string>
+    <string name="unable_to_start_tor">Tidak dapat memulai Tor:</string>
     <string name="pref_use_persistent_notifications">Selalu pelihara icon dalam toolbar ketika Orbot terhubung</string>
   <string name="pref_use_persistent_notifications_title">Pemberitahuan Selalu-Hidup</string>
   <string name="pref_use_expanded_notifications">Tampilkan notifikasi melebar dengan negara dan IP keluar Tor</string>
diff --git a/app-tv/src/main/res/values-is/strings.xml b/app-tv/src/main/res/values-is/strings.xml
index 0de01a5a..542f5545 100644
--- a/app-tv/src/main/res/values-is/strings.xml
+++ b/app-tv/src/main/res/values-is/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Forrit vill opna földu vefgáttina %1$d inn á Tor-netið. Þetta er öruggt ef þú treystir forritinu.</string>
   <string name="found_existing_tor_process">fann annað Tor-ferli...</string>
   <string name="something_bad_happened">Eitthvað slæmt gerðist. Athugaðu atvikakráninguna</string>
-    <string name="unable_to_read_hidden_service_name">get ekki lesið heiti földu þjónustunnar</string>
-  <string name="unable_to_start_tor">Get ekki ræst Tor:</string>
+    <string name="unable_to_start_tor">Get ekki ræst Tor:</string>
     <string name="pref_use_persistent_notifications">Alltaf hafa táknmynd í verkfærastiku þegar Orbot er tengt</string>
   <string name="pref_use_persistent_notifications_title">Alltaf-á tilkynningar</string>
   <string name="pref_use_expanded_notifications">Birta útflettar tilkynningar varðandi Tor-útgangsland og IP-vistfang</string>
@@ -130,7 +129,6 @@
     <string name="send_email">Senda tölvupóst</string>
   <string name="vpn_default_world">Víðvært (sjálfvirkt)</string>
   <string name="hidden_services">Faldar þjónustur</string>
-  <string name="title_activity_hidden_services">Faldar þjónustur</string>
   <string name="menu_hidden_services">Faldar þjónustur</string>
   <string name="save">Vista</string>
     <string name="local_port">Staðvær gátt</string>
@@ -138,7 +136,6 @@
   <string name="name">Heiti</string>
   <string name="done">Lokið!</string>
     <string name="copy_address_to_clipboard">Afrita vistfang yfir á klippispjald</string>
-  <string name="show_auth_cookie">Birta auðkenningar-vefköku</string>
   <string name="backup_service">Öryggisafritunarþjónusta</string>
   <string name="delete_service">Eyða þjónustu</string>
   <string name="backup_saved_at_external_storage">Öryggisafrit var vistað í ytri gagnageymslu</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Smelltu aftur fyrir öryggisafrit</string>
   <string name="service_type">Tegund þjónustu</string>
   <string name="auth_cookie">Auðkenningar-vefkaka</string>
-  <string name="copy_cookie_to_clipboard">Afrita vefköku á klippispjald</string>
-  <string name="auth_cookie_was_not_configured">Auðkenningar-vefkaka var ekki stillt</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Endurræstu Orbot til að breytingarnar taki gildi</string>
-  <string name="client_cookies">Vefkökur forritsins</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Lesa úr QR-kóða</string>
-  <string name="backup_cookie">Öryggisafrit af vefköku</string>
-  <string name="delete_cookie">Eyða vefköku</string>
-  <string name="confirm_cookie_deletion">Staðfestu eyðingu vefköku</string>
-  <string name="hosted_services">Hýstar þjónustur</string>
   <string name="share_as_qr">Deila sem QR-kóða</string>
   <string name="disable">Gera óvirkt</string>
   <string name="enable">Virkja</string>
diff --git a/app-tv/src/main/res/values-it/strings.xml b/app-tv/src/main/res/values-it/strings.xml
index f8509416..96f07e7c 100644
--- a/app-tv/src/main/res/values-it/strings.xml
+++ b/app-tv/src/main/res/values-it/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Un\'app vuole aprire la porta %1$d del server nascosto alla rete Tor. È un\'azione sicura se ti fidi dell\'app.</string>
   <string name="found_existing_tor_process">trovato un processo Tor esistente...</string>
   <string name="something_bad_happened">E\' accaduto un evento indesiderato. Controllare i log.</string>
-    <string name="unable_to_read_hidden_service_name">Impossibile leggere il nome del servizio nascosto.</string>
-  <string name="unable_to_start_tor">Impossibile avviare Tor:</string>
+    <string name="unable_to_start_tor">Impossibile avviare Tor:</string>
     <string name="pref_use_persistent_notifications">Mantieni sempre l\'icona nella barra degli strumenti quando Orbot è connesso.</string>
   <string name="pref_use_persistent_notifications_title">Notifiche sempre attive</string>
   <string name="pref_use_expanded_notifications">Visualizza notifica espansa con nazione e ip dell\'nodo d\'uscita Tor</string>
@@ -130,7 +129,6 @@
     <string name="send_email">Invia email</string>
   <string name="vpn_default_world">Globale (Auto)</string>
   <string name="hidden_services">Servizi nascosti</string>
-  <string name="title_activity_hidden_services">Servizi nascosti</string>
   <string name="menu_hidden_services">Servizi nascosti</string>
   <string name="save">Salva</string>
     <string name="local_port">Porta locale</string>
@@ -138,7 +136,6 @@
   <string name="name">Nome</string>
   <string name="done">Fatto!</string>
     <string name="copy_address_to_clipboard">Copia l\'indirizzo negli appunti</string>
-  <string name="show_auth_cookie">Mostra cookie di autenticazione</string>
   <string name="backup_service">Servizio di backup</string>
   <string name="delete_service">Elimina il servizio</string>
   <string name="backup_saved_at_external_storage">Backup salvato nell\'archiviazione esterna</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Clicca ancora per eseguire il backup</string>
   <string name="service_type">Tipo di servizio</string>
   <string name="auth_cookie">Cookie autenticazione</string>
-  <string name="copy_cookie_to_clipboard">Copia cookie negli appunti</string>
-  <string name="auth_cookie_was_not_configured">Cookie di autenticazione non configurato</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Per favore riavvia Orbot per rendere effettive le modifiche</string>
-  <string name="client_cookies">Cookie del client</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Leggi da QR</string>
-  <string name="backup_cookie">Backup cookie</string>
-  <string name="delete_cookie">Elimina cookie</string>
-  <string name="confirm_cookie_deletion">Conferma eliminazione cookie</string>
-  <string name="hosted_services">Servizi ospitati</string>
   <string name="share_as_qr">Condividi come QR</string>
   <string name="disable">Disabilita</string>
   <string name="enable">Abilità </string>
diff --git a/app-tv/src/main/res/values-iw/strings.xml b/app-tv/src/main/res/values-iw/strings.xml
index 26b18ee7..67b62dbb 100644
--- a/app-tv/src/main/res/values-iw/strings.xml
+++ b/app-tv/src/main/res/values-iw/strings.xml
@@ -81,8 +81,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
     <string name="found_existing_tor_process">× ×ž×¦× תהליך Tor קיים…</string>
   <string name="something_bad_happened">משהו רע התרחש. בדוק את היומן</string>
-    <string name="unable_to_read_hidden_service_name">לא מסוגל לקרוא שם שירות × ×¡×ª×¨</string>
-  <string name="unable_to_start_tor">לא מסוגל להתחיל את Tor:</string>
+    <string name="unable_to_start_tor">לא מסוגל להתחיל את Tor:</string>
     <string name="pref_use_persistent_notifications">לשמור תמיד את האיקון בסרגל כלים כשאורבוט מחובר</string>
     <string name="set_locale_title">שפה</string>
   <string name="pref_disable_network_summary">כבה את Tor כאשר אין חיבור ×œ××™× ×˜×¨× ×˜</string>
diff --git a/app-tv/src/main/res/values-ja/strings.xml b/app-tv/src/main/res/values-ja/strings.xml
index c6440930..ec092fbc 100644
--- a/app-tv/src/main/res/values-ja/strings.xml
+++ b/app-tv/src/main/res/values-ja/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">アプリが非公開サーバーポート %1$d ã‚’Torãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«é–‹æ”¾ã—ã‚ˆã†ã¨ã—ã¦ã„ã¾ã™ã€‚ä¿¡é ¼ã§ãã‚‹ã‚¢ãƒ—ãƒªã§ã‚ã‚Œã°ã“ã‚Œã¯å®‰å…¨ã§ã™ã€‚</string>
   <string name="found_existing_tor_process">Torプロセスを発見</string>
   <string name="something_bad_happened">何かが起こりました。ログを確認してください。</string>
-    <string name="unable_to_read_hidden_service_name">hidden serviceの名前読込不能</string>
-  <string name="unable_to_start_tor">Torを実行できませんでした</string>
+    <string name="unable_to_start_tor">Torを実行できませんでした</string>
     <string name="pref_use_persistent_notifications">Orbotが接続中はアイコンを常にツールバーに表示</string>
   <string name="pref_use_persistent_notifications_title">通知を常に有効化</string>
   <string name="pref_use_expanded_notifications">拡張通知で、Torの出口の国とIPを表示します</string>
@@ -130,7 +129,6 @@
     <string name="send_email">メール送信</string>
   <string name="vpn_default_world">世界中 (自動)</string>
   <string name="hidden_services">Hidden Services</string>
-  <string name="title_activity_hidden_services">Hidden Services</string>
   <string name="menu_hidden_services">Hidden Services</string>
   <string name="save">保存</string>
     <string name="local_port">ローカルポート</string>
@@ -138,7 +136,6 @@
   <string name="name">名前</string>
   <string name="done">完了</string>
     <string name="copy_address_to_clipboard">アドレスをクリップボードにコピー</string>
-  <string name="show_auth_cookie">Cookie 認証を非表示</string>
   <string name="backup_service">バックアップサービス</string>
   <string name="delete_service">サービスを削除</string>
   <string name="backup_saved_at_external_storage">バックアップは外部記憶装置に保存されました</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">バックアップ作成に再クリック</string>
   <string name="service_type">サービスタイプ</string>
   <string name="auth_cookie">Cookie 認証</string>
-  <string name="copy_cookie_to_clipboard">Cookie をクリップボードにコピー</string>
-  <string name="auth_cookie_was_not_configured">Authクッキーは設定されませんでした</string>
   <string name="please_restart_Orbot_to_enable_the_changes">変更を有効にするにはOrbotを再起動してください</string>
-  <string name="client_cookies">クライアント Cookie</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">QRコードから読み取り</string>
-  <string name="backup_cookie">Cookie をバックアップ</string>
-  <string name="delete_cookie">Cookie を削除</string>
-  <string name="confirm_cookie_deletion">クッキー削除を確認</string>
-  <string name="hosted_services">ホスト型サービス</string>
   <string name="share_as_qr">QR でシェア</string>
   <string name="disable">無効</string>
   <string name="enable">有効</string>
diff --git a/app-tv/src/main/res/values-ko/strings.xml b/app-tv/src/main/res/values-ko/strings.xml
index bec5cc06..a8083685 100644
--- a/app-tv/src/main/res/values-ko/strings.xml
+++ b/app-tv/src/main/res/values-ko/strings.xml
@@ -91,8 +91,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">ì¡´ìž¬í•˜ê³  있는 Tor 프로세스 발견</string>
   <string name="something_bad_happened">어떤 나쁜 것이 발생. 로그 확인하세요.</string>
-    <string name="unable_to_read_hidden_service_name">ížˆë“  서비스 이름을 읽을 수 없음</string>
-  <string name="unable_to_start_tor">Tor 시작 불가능</string>
+    <string name="unable_to_start_tor">Tor 시작 불가능</string>
     <string name="pref_use_persistent_notifications">Orbot이 연결되었을 때 툴바에 아이콘 보이기</string>
   <string name="pref_use_persistent_notifications_title">항상 켜진 알림</string>
   <string name="pref_use_expanded_notifications">출구 및 IP ì •ë³´ì•Œë¦¼ 보이기</string>
diff --git a/app-tv/src/main/res/values-lv/strings.xml b/app-tv/src/main/res/values-lv/strings.xml
index 51f936ad..8ecc351f 100644
--- a/app-tv/src/main/res/values-lv/strings.xml
+++ b/app-tv/src/main/res/values-lv/strings.xml
@@ -91,8 +91,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">Atrada esošu Tor procesu...</string>
   <string name="something_bad_happened">Nav labi. Pārbaudiet žurnālu</string>
-    <string name="unable_to_read_hidden_service_name">Nespēj lasīt slēpta pakalpojuma nosaukumu</string>
-  <string name="unable_to_start_tor">Nevar startēt Tor:</string>
+    <string name="unable_to_start_tor">Nevar startēt Tor:</string>
     <string name="pref_use_persistent_notifications">Vienmēr paturēt ikonu rīkjoslā, kad Orbot ir savienots</string>
   <string name="pref_use_persistent_notifications_title">Vienmēr ieslēgtie paziņojumi</string>
   <string name="pref_use_expanded_notifications">Rādīt paplašinātus paziņojumus, kur norādīts IP un Tor izejas valsts</string>
@@ -122,8 +121,7 @@
     <string name="activate">Aktivizēt</string>
   <string name="send_email">Nosūtīt e-pastu</string>
   <string name="hidden_services">Slēptie pakalpojumi</string>
-  <string name="title_activity_hidden_services">Slēptie pakalpojumi</string>
-  <string name="menu_hidden_services">Slēptie pakalpojumi</string>
+    <string name="menu_hidden_services">Slēptie pakalpojumi</string>
   <string name="save">Saglabāt</string>
   <string name="name">Vārds</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Lūdzu pārstartējiet Orbot, lai iespējotu izmaiņas</string>
diff --git a/app-tv/src/main/res/values-mk/strings.xml b/app-tv/src/main/res/values-mk/strings.xml
index c8015664..ecf2e8c9 100644
--- a/app-tv/src/main/res/values-mk/strings.xml
+++ b/app-tv/src/main/res/values-mk/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Апликација сака да отвори сокриена серверска порта %1$d кон Tor мрежата. Ова е безбедно доколку и верувате на апликацијата.</string>
   <string name="found_existing_tor_process">Пронајден постоечки Tor-процес ...</string>
   <string name="something_bad_happened">Се случи грешка. Проверете го дневникот</string>
-  <string name="unable_to_read_hidden_service_name">не може да се прочита името на скриениот сервис</string>
-  <string name="unable_to_start_tor">Tor не може да се стартува:</string>
+    <string name="unable_to_start_tor">Tor не може да се стартува:</string>
   <string name="pref_use_persistent_notifications">Секогаш чувајте ја иконата во лентата со алатки кога Orbot е поврзан</string>
   <string name="pref_use_persistent_notifications_title">Известувања секогаш вклучени</string>
   <string name="pref_use_expanded_notifications">Прикажи проширено известување со излезната држава и IP на Tor</string>
@@ -130,7 +129,6 @@
   <string name="send_email">Испратете е-пошта</string>
   <string name="vpn_default_world">Глобално (Автоматски)</string>
   <string name="hidden_services">Скриени сервиси</string>
-  <string name="title_activity_hidden_services">Скриени сервиси</string>
   <string name="menu_hidden_services">Скриени сервиси</string>
   <string name="save">Зачувај</string>
   <string name="local_port">Локална порта</string>
@@ -138,7 +136,6 @@
   <string name="name">Име</string>
   <string name="done">Завршено!</string>
     <string name="copy_address_to_clipboard">Копирај ја адресата за залепување</string>
-  <string name="show_auth_cookie">Покажи автентично колаче</string>
   <string name="backup_service">Резервна копија</string>
   <string name="delete_service">Избриши услуга</string>
   <string name="backup_saved_at_external_storage">Резервната копија е снимена на надворешна меморија</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Кликни повторно за резервна копија</string>
   <string name="service_type">Тип на услуга</string>
   <string name="auth_cookie">Автентично колаче</string>
-  <string name="copy_cookie_to_clipboard">Копирај колаче за залепување</string>
-  <string name="auth_cookie_was_not_configured">Автентичното колаче не е прилагодено</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Ве молиме стартувајте го повторно Orbot за да се овозможат промените</string>
-  <string name="client_cookies">Клиентски колачиња</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Прочитај од QR</string>
-  <string name="backup_cookie">Направи резервна копија на колаче</string>
-  <string name="delete_cookie">Избриши колаче</string>
-  <string name="confirm_cookie_deletion">Потврди бришење на колаче</string>
-  <string name="hosted_services">Хостирани услуги</string>
   <string name="share_as_qr">Сподели како QR</string>
   <string name="disable">Оневозможи</string>
   <string name="enable">Овозможи</string>
diff --git a/app-tv/src/main/res/values-ms-rMY/strings.xml b/app-tv/src/main/res/values-ms-rMY/strings.xml
index 071423e6..92e4c0c8 100644
--- a/app-tv/src/main/res/values-ms-rMY/strings.xml
+++ b/app-tv/src/main/res/values-ms-rMY/strings.xml
@@ -82,14 +82,12 @@
     <string name="third_party_software">3rd-Party-Software: </string>
   <string name="found_existing_tor_process">Proses Tor sedia ada ditemui..</string>
   <string name="something_bad_happened">Sesuatu yang buruk berlaku. Semak log.</string>
-    <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama servis tersembunyi</string>
-  <string name="unable_to_start_tor">Tidak dapat memulakan Tor:</string>
+    <string name="unable_to_start_tor">Tidak dapat memulakan Tor:</string>
     <string name="pref_use_persistent_notifications">Sentiasa biar ikon pada toolbar apabila Orbot bersambung</string>
   <string name="pref_use_persistent_notifications_title">Sentiasa On Notifikasi</string>
     <string name="set_locale_title">Bahasa</string>
     <string name="hidden_services">Perkhidmatan tersembunyi</string>
-  <string name="title_activity_hidden_services">Perkhidmatan tersembunyi</string>
-  <string name="menu_hidden_services">Perkhidmatan tersembunyi</string>
+    <string name="menu_hidden_services">Perkhidmatan tersembunyi</string>
   <string name="save">Simpan</string>
   <string name="name">Nama</string>
 </resources>
diff --git a/app-tv/src/main/res/values-ms/strings.xml b/app-tv/src/main/res/values-ms/strings.xml
index c72da21c..92d56d8a 100644
--- a/app-tv/src/main/res/values-ms/strings.xml
+++ b/app-tv/src/main/res/values-ms/strings.xml
@@ -75,8 +75,7 @@
     <string name="third_party_software">3rd-Party-Software: </string>
   <string name="found_existing_tor_process">Proses Tor sedia ada ditemui..</string>
   <string name="something_bad_happened">Sesuatu yang buruk berlaku. Semak log.</string>
-    <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama servis tersembunyi</string>
-  <string name="unable_to_start_tor">Tidak dapat memulakan Tor:</string>
+    <string name="unable_to_start_tor">Tidak dapat memulakan Tor:</string>
     <string name="pref_use_persistent_notifications">Sentiasa biar ikon pada toolbar apabila Orbot bersambung</string>
   <string name="pref_use_persistent_notifications_title">Sentiasa On Notifikasi</string>
     <string name="set_locale_title">Tetapan Tempatan</string>
diff --git a/app-tv/src/main/res/values-my/strings.xml b/app-tv/src/main/res/values-my/strings.xml
index f307da9f..12e4d2b7 100644
--- a/app-tv/src/main/res/values-my/strings.xml
+++ b/app-tv/src/main/res/values-my/strings.xml
@@ -23,8 +23,7 @@
   <string name="get_bridges_email">အီးေမးလ္</string>
   <string name="activate">Activate</string>
   <string name="hidden_services">Hidden Services</string>
-  <string name="title_activity_hidden_services">Hidden Services</string>
-  <string name="menu_hidden_services">Hidden Services</string>
+    <string name="menu_hidden_services">Hidden Services</string>
   <string name="save">သိမ္းဆည္းပါ</string>
   <string name="name">အမည်</string>
 </resources>
diff --git a/app-tv/src/main/res/values-nb/strings.xml b/app-tv/src/main/res/values-nb/strings.xml
index 1a281b9c..f83f0a71 100644
--- a/app-tv/src/main/res/values-nb/strings.xml
+++ b/app-tv/src/main/res/values-nb/strings.xml
@@ -93,8 +93,7 @@
   <string name="openssl_version">OpenSSL v1.0.2j: https://www.openssl.org</string>
   <string name="found_existing_tor_process">fant eksisterende Tor-prosess…</string>
   <string name="something_bad_happened">Noe alvorlig skjedde. Sjekk loggen.</string>
-    <string name="unable_to_read_hidden_service_name">klarte ikke å lese skjult tjenestenavn</string>
-  <string name="unable_to_start_tor">Klarte ikke å starte Tor:</string>
+    <string name="unable_to_start_tor">Klarte ikke å starte Tor:</string>
     <string name="pref_use_persistent_notifications">Alltid behold ikonet i verktøyslinjen når Orbot er tilkoblet</string>
   <string name="pref_use_persistent_notifications_title">Alltid-PÃ¥ -varslinger</string>
   <string name="pref_use_expanded_notifications">Vis utvidede merknader med land og IP for utgangstrafikk fra Tor</string>
@@ -125,7 +124,6 @@
   <string name="apps_mode">VPN-modus</string>
   <string name="send_email">Send e-post</string>
   <string name="hidden_services">Hidden Services</string>
-  <string name="title_activity_hidden_services">Hidden Services</string>
   <string name="menu_hidden_services">Hidden Services</string>
   <string name="save">Lagre</string>
     <string name="local_port">Lokalt port</string>
@@ -141,15 +139,8 @@
   <string name="confirm_service_deletion">Bekreft sletting av tjeneste</string>
   <string name="click_again_for_backup">Klikk igjen for å sikkerhetskopiere</string>
   <string name="service_type">Tjenestetype</string>
-  <string name="copy_cookie_to_clipboard">Kopier kake til utklippstavle</string>
-  <string name="please_restart_Orbot_to_enable_the_changes">Gjør omstart av Orbot før endringer trer i kraft</string>
-  <string name="client_cookies">Klientinformasjonskapsler</string>
+    <string name="please_restart_Orbot_to_enable_the_changes">Gjør omstart av Orbot før endringer trer i kraft</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Les fra QR</string>
-  <string name="backup_cookie">Sikkerhetskopier informasjonskapsel</string>
-  <string name="delete_cookie">Slett informasjonskapsel</string>
-  <string name="confirm_cookie_deletion">Bekreft sletting av informasjonskapsel</string>
-  <string name="hosted_services">Vertstjenester</string>
   <string name="share_as_qr">Del som QR</string>
   <string name="disable">Skru av</string>
   <string name="enable">Slå på</string>
diff --git a/app-tv/src/main/res/values-nl/strings.xml b/app-tv/src/main/res/values-nl/strings.xml
index ad6fa2d5..6e2eab34 100644
--- a/app-tv/src/main/res/values-nl/strings.xml
+++ b/app-tv/src/main/res/values-nl/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Een app wil de verborgenserverpoort %1$d tot het Tor-netwerk openen. Dit is veilig als je de app vertrouwt.</string>
   <string name="found_existing_tor_process">bestaand Tor-proces gevonden…</string>
   <string name="something_bad_happened">Er is een fout opgetreden. Controleer de log</string>
-    <string name="unable_to_read_hidden_service_name">Kan verborgen dienst-naam niet lezen</string>
-  <string name="unable_to_start_tor">Kan Tor niet starten:</string>
+    <string name="unable_to_start_tor">Kan Tor niet starten:</string>
     <string name="pref_use_persistent_notifications">Houd icoon in taakbalk zolang Orbot verbonden is</string>
   <string name="pref_use_persistent_notifications_title">Meldingen altijd aan</string>
   <string name="pref_use_expanded_notifications">Toon uitgebreide melding met Tor-exitland en IP</string>
@@ -130,7 +129,6 @@
     <string name="send_email">E-mail versturen</string>
   <string name="vpn_default_world">Algemeen (automatisch)</string>
   <string name="hidden_services">Verborgen diensten</string>
-  <string name="title_activity_hidden_services">Verborgen diensten</string>
   <string name="menu_hidden_services">Verborgen diensten</string>
   <string name="save">Opslaan</string>
     <string name="local_port">Lokale poort</string>
@@ -138,7 +136,6 @@
   <string name="name">Naam</string>
   <string name="done">Klaar!</string>
     <string name="copy_address_to_clipboard">Adres kopiëren naar klembord</string>
-  <string name="show_auth_cookie">Authenticatiecookie tonen</string>
   <string name="backup_service">Back-updienst</string>
   <string name="delete_service">Dienst verwijderen</string>
   <string name="backup_saved_at_external_storage">Back-up opgeslagen op externe opslag</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Klik opnieuw voor back-up</string>
   <string name="service_type">Diensttype</string>
   <string name="auth_cookie">Authenticatiecookie</string>
-  <string name="copy_cookie_to_clipboard">Cookie kopiëren naar klembord</string>
-  <string name="auth_cookie_was_not_configured">Authenticatiecookie is niet ingesteld</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Herstart Orbot om de wijzigingen in te schakelen</string>
-  <string name="client_cookies">Cliëntcookies</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Lezen van QR-code</string>
-  <string name="backup_cookie">Back-up maken van cookie</string>
-  <string name="delete_cookie">Cookie verwijderen</string>
-  <string name="confirm_cookie_deletion">Bevestig verwijderen van cookie</string>
-  <string name="hosted_services">Gehoste diensten</string>
   <string name="share_as_qr">Delen als QR-code</string>
   <string name="disable">Uitschakelen</string>
   <string name="enable">Inschakelen</string>
diff --git a/app-tv/src/main/res/values-pl/strings.xml b/app-tv/src/main/res/values-pl/strings.xml
index 65a9d051..3f58662a 100644
--- a/app-tv/src/main/res/values-pl/strings.xml
+++ b/app-tv/src/main/res/values-pl/strings.xml
@@ -91,8 +91,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">znaleziono istniejÄ…cy proces Tora...</string>
   <string name="something_bad_happened">Coś nie poszło nie tak. Sprawdź logi</string>
-    <string name="unable_to_read_hidden_service_name">uniemożliw czytanie nazw ukrytych serwisów</string>
-  <string name="unable_to_start_tor">Nie można wystartować aplikacji Tor:</string>
+    <string name="unable_to_start_tor">Nie można wystartować aplikacji Tor:</string>
     <string name="pref_use_persistent_notifications">Zawsze trzymaj ikonę w pasku powiadomień gdy Orbot jest połączony</string>
   <string name="pref_use_persistent_notifications_title">Powiadomienia zawsze aktywne</string>
   <string name="pref_use_expanded_notifications">Pokaż rozszerzone powiadomienie z krajem Tor exit node oraz jego IP</string>
@@ -123,8 +122,7 @@
   <string name="apps_mode">Tryb VPN</string>
   <string name="send_email">Wyślij Email</string>
   <string name="hidden_services">Ukryte Usługi</string>
-  <string name="title_activity_hidden_services">Ukryte Usługi</string>
-  <string name="menu_hidden_services">Ukryte Usługi</string>
+    <string name="menu_hidden_services">Ukryte Usługi</string>
   <string name="save">Zapisz</string>
     <string name="local_port">Lokalne Porty</string>
   <string name="name">Nazwa</string>
diff --git a/app-tv/src/main/res/values-pt-rBR/strings.xml b/app-tv/src/main/res/values-pt-rBR/strings.xml
index f8924539..3073310b 100644
--- a/app-tv/src/main/res/values-pt-rBR/strings.xml
+++ b/app-tv/src/main/res/values-pt-rBR/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Um aplicativo precisa abrir uma porta tipo servidor escondida %1$dpara a Rede Tor. Isso é seguro se você confiar nesta aplicação.</string>
   <string name="found_existing_tor_process">procurando processos Tor existentes...</string>
   <string name="something_bad_happened">Algo ruim aconteceu. Cheque o lo</string>
-    <string name="unable_to_read_hidden_service_name">habilitar ler o nome do serviço oculto</string>
-  <string name="unable_to_start_tor">Habilitar iniciar o Tor:</string>
+    <string name="unable_to_start_tor">Habilitar iniciar o Tor:</string>
     <string name="pref_use_persistent_notifications">Sempre manter o ícone na barra de tarefas quando o Orbot está conectado</string>
   <string name="pref_use_persistent_notifications_title">Notificações Sempre Ligadas</string>
   <string name="pref_use_expanded_notifications">Mostrar notificação expandida com Tor país de saída e IP</string>
@@ -130,7 +129,6 @@
   <string name="send_email">Enviar Email</string>
   <string name="vpn_default_world">Global (Automático)</string>
   <string name="hidden_services">Serviços Ocultos</string>
-  <string name="title_activity_hidden_services">Serviços Ocultos</string>
   <string name="menu_hidden_services">Serviços Ocultos</string>
   <string name="save">Salvar</string>
     <string name="local_port">Porta Local</string>
@@ -138,8 +136,7 @@
   <string name="name">Nome</string>
   <string name="done">Feito!</string>
     <string name="copy_address_to_clipboard">Copiar para a area de transferência </string>
-  <string name="show_auth_cookie">Mostre cookie de autenticação</string>
-  <string name="backup_service">Serviço de Backup</string>
+    <string name="backup_service">Serviço de Backup</string>
   <string name="delete_service">Remover Serviço</string>
   <string name="backup_saved_at_external_storage">Backup salvo em mídia externa</string>
   <string name="backup_restored">Backup Restaurado</string>
@@ -148,7 +145,6 @@
   <string name="click_again_for_backup">Clique novamente para backup</string>
   <string name="service_type">Tipo do Serviço</string>
   <string name="auth_cookie">Cookie de autenticação</string>
-  <string name="copy_cookie_to_clipboard">Copiar cookie para a area de transferência</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Por favor reinicie Orbot para habilitar as mundanças</string>
   <string name="share_as_qr">Compartilhar como QR</string>
   <string name="disable">Desabilitar</string>
diff --git a/app-tv/src/main/res/values-pt/strings.xml b/app-tv/src/main/res/values-pt/strings.xml
index 53f6d956..ecbd6c12 100644
--- a/app-tv/src/main/res/values-pt/strings.xml
+++ b/app-tv/src/main/res/values-pt/strings.xml
@@ -60,8 +60,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">encontrado o processo Tor existente...</string>
   <string name="something_bad_happened">Aconteceu algo de mau. Verifique o registo de eventos.</string>
-    <string name="unable_to_read_hidden_service_name">não é possível ler o nome do serviço ocultado</string>
-  <string name="unable_to_start_tor">Não é possível iniciar o Tor:</string>
+    <string name="unable_to_start_tor">Não é possível iniciar o Tor:</string>
     <string name="pref_use_persistent_notifications_title">Notificações Sempre Ativadas</string>
   <string name="pref_use_expanded_notifications_title">Notificações Estendidas</string>
     <string name="set_locale_title">Idioma</string>
@@ -76,8 +75,7 @@
     <string name="activate">Ativar</string>
   <string name="send_email">Enviar Mensagem</string>
     <string name="hidden_services">Serviços ocultos</string>
-  <string name="title_activity_hidden_services">Serviços ocultos</string>
-  <string name="menu_hidden_services">Serviços ocultos</string>
+    <string name="menu_hidden_services">Serviços ocultos</string>
   <string name="save">Guardar</string>
   <string name="name">Nome</string>
   <string name="done">Concluído!</string>
diff --git a/app-tv/src/main/res/values-ro/strings.xml b/app-tv/src/main/res/values-ro/strings.xml
index b1a1e322..71277596 100644
--- a/app-tv/src/main/res/values-ro/strings.xml
+++ b/app-tv/src/main/res/values-ro/strings.xml
@@ -91,8 +91,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">găsit proces Tor existent...</string>
   <string name="something_bad_happened">Ceva rău s-a întâmplat. Verifică log-ul</string>
-    <string name="unable_to_read_hidden_service_name">nu am putut citi numele serviciului ascuns</string>
-  <string name="unable_to_start_tor">Nu am reuşit să pornesc Tor:</string>
+    <string name="unable_to_start_tor">Nu am reuşit să pornesc Tor:</string>
     <string name="pref_use_persistent_notifications">Arată tot timpul icoana în bară când Orbot este conectat</string>
   <string name="pref_use_persistent_notifications_title">Notificări active tot timpul</string>
   <string name="pref_use_expanded_notifications">Arată notificări extinse cu Tor exit country şi IP</string>
@@ -122,8 +121,7 @@
     <string name="activate">Activează</string>
   <string name="send_email">Trimite email</string>
   <string name="hidden_services">Servicii ascunse</string>
-  <string name="title_activity_hidden_services">Servicii ascunse</string>
-  <string name="menu_hidden_services">Servicii ascunse</string>
+    <string name="menu_hidden_services">Servicii ascunse</string>
   <string name="save">Salvează</string>
   <string name="name">Nume</string>
   <string name="done">Gata!</string>
diff --git a/app-tv/src/main/res/values-ru/strings.xml b/app-tv/src/main/res/values-ru/strings.xml
index 9f9d7e35..be053801 100644
--- a/app-tv/src/main/res/values-ru/strings.xml
+++ b/app-tv/src/main/res/values-ru/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Приложение хочет открыть скрытый порт сервера %1$d сети Tor. Это безопасно, если вы доверяете данному приложению.</string>
   <string name="found_existing_tor_process">найден существующий процесс Tor...</string>
   <string name="something_bad_happened">Произошла какая-то ошибка. Проверьте журнал.</string>
-    <string name="unable_to_read_hidden_service_name">невозможно прочитать имя скрытой службы</string>
-  <string name="unable_to_start_tor">Невозможно запустить Tor:</string>
+    <string name="unable_to_start_tor">Невозможно запустить Tor:</string>
     <string name="pref_use_persistent_notifications">Всегда отображать иконку в панели задач когда Orbot подключён</string>
   <string name="pref_use_persistent_notifications_title">Постоянное уведомление о работе</string>
   <string name="pref_use_expanded_notifications">Показать расширенное уведомление Tor со страной выхода и IP</string>
@@ -130,7 +129,6 @@
     <string name="send_email">Отправить письмо</string>
   <string name="vpn_default_world">Мир (авто)</string>
   <string name="hidden_services">Скрытые службы</string>
-  <string name="title_activity_hidden_services">Скрытые службы</string>
   <string name="menu_hidden_services">Скрытые службы</string>
   <string name="save">Сохранить</string>
     <string name="local_port">Локальный порт</string>
@@ -138,7 +136,6 @@
   <string name="name">Имя</string>
   <string name="done">Готово!</string>
     <string name="copy_address_to_clipboard">Скопировать адрес в буфер обмена</string>
-  <string name="show_auth_cookie">Показать авторизирующие cookie</string>
   <string name="backup_service">Резервировать службу</string>
   <string name="delete_service">Удалить службу</string>
   <string name="backup_saved_at_external_storage">Резервная копия сохранена на внешнем хранилище</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Нажмите ещё раз для резервирования</string>
   <string name="service_type">Тип службы</string>
   <string name="auth_cookie">Авторизирующие cookie</string>
-  <string name="copy_cookie_to_clipboard">Копировать cookie в буфер обмена</string>
-  <string name="auth_cookie_was_not_configured">Авторизирующие cookie не настроены</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Пожалуйста, перезапустите Orbot для вступления изменения в силу</string>
-  <string name="client_cookies">Cookies клиента</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Прочитать из QR-кода</string>
-  <string name="backup_cookie">Резервировать cookie</string>
-  <string name="delete_cookie">Удалить cookies</string>
-  <string name="confirm_cookie_deletion">Подтвердите удаление cookie</string>
-  <string name="hosted_services">Размещённые службы</string>
   <string name="share_as_qr">Поделиться через QR-код</string>
   <string name="disable">Отключить</string>
   <string name="enable">Включить</string>
diff --git a/app-tv/src/main/res/values-si-rLK/strings.xml b/app-tv/src/main/res/values-si-rLK/strings.xml
index c8a02b23..9f80bb48 100644
--- a/app-tv/src/main/res/values-si-rLK/strings.xml
+++ b/app-tv/src/main/res/values-si-rLK/strings.xml
@@ -77,8 +77,7 @@
     <string name="third_party_software">3 වන පාර්ශව මෘදුකාංග</string>
   <string name="found_existing_tor_process">පවතින Tor ක්‍රියාවලි හමුවිය...</string>
   <string name="something_bad_happened">යම් නොමනා දෙයක් සිදුවිය. ලොගය පරික්ෂා කර බලන්න </string>
-    <string name="unable_to_read_hidden_service_name">සැගවුණු සේවා නාමය කියවීමට නොහැකිය </string>
-  <string name="unable_to_start_tor">Tor ආරම්භ කිරීමට නොහැකිය:</string>
+    <string name="unable_to_start_tor">Tor ආරම්භ කිරීමට නොහැකිය:</string>
     <string name="pref_use_persistent_notifications">Orbot සම්බන්ධ වී ඇති සැමවිටම විට මෙවලම් තීරුවේ නිරූපකය තබාගන්න</string>
   <string name="pref_use_persistent_notifications_title">නිවේදන ලැබීමට සලස්වන්න </string>
     <string name="set_locale_title">භාෂාව</string>
@@ -86,8 +85,7 @@
   <string name="mb">MB</string>
   <string name="activate">ක්‍රියාකරවන්න</string>
   <string name="hidden_services">සැගවුණු සේවා </string>
-  <string name="title_activity_hidden_services">සැගවුණු සේවා </string>
-  <string name="menu_hidden_services">සැගවුණු සේවා </string>
+    <string name="menu_hidden_services">සැගවුණු සේවා </string>
   <string name="save">සුරකින්න</string>
   <string name="name">නම</string>
 </resources>
diff --git a/app-tv/src/main/res/values-sk/strings.xml b/app-tv/src/main/res/values-sk/strings.xml
index e3f4a6bb..23e393db 100644
--- a/app-tv/src/main/res/values-sk/strings.xml
+++ b/app-tv/src/main/res/values-sk/strings.xml
@@ -91,8 +91,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">nájdený iný proces Tor...</string>
   <string name="something_bad_happened">Deje sa niečo zlé. Skontrolujte podrobnosti.</string>
-    <string name="unable_to_read_hidden_service_name">nemožné prečítať názov skrytej služby</string>
-  <string name="unable_to_start_tor">Nemožné spustiť Tor:</string>
+    <string name="unable_to_start_tor">Nemožné spustiť Tor:</string>
     <string name="pref_use_persistent_notifications">Vždy ponechať ikonu v stavovom riadku, keď je Orbot pripojený</string>
   <string name="pref_use_persistent_notifications_title">Vždy zapnuté upozornenia</string>
   <string name="pref_use_expanded_notifications">Zobraziť rozšírené upozornenie s výstupnou krajinou a IP adresou siete Tor</string>
diff --git a/app-tv/src/main/res/values-sr/strings.xml b/app-tv/src/main/res/values-sr/strings.xml
index b0d47010..c4b3c1ec 100644
--- a/app-tv/src/main/res/values-sr/strings.xml
+++ b/app-tv/src/main/res/values-sr/strings.xml
@@ -94,8 +94,7 @@
   <string name="hidden_service_request">Апликација жели да отвори сакривен порт%1$d на серверу за Тор мрежу. Ово је сигуран потез уколико верујете апликацији.</string>
   <string name="found_existing_tor_process">нађен покренути Тор процес...</string>
   <string name="something_bad_happened">Нешто лоше се догодило. Прегледајте логове</string>
-    <string name="unable_to_read_hidden_service_name">нисам у могућности да прочитам име сакривеног сервиса</string>
-  <string name="unable_to_start_tor">Тор није у могућности да се покрене:</string>
+    <string name="unable_to_start_tor">Тор није у могућности да се покрене:</string>
     <string name="pref_use_persistent_notifications">Увек прикажи икону у тулбару када је Орбот конектован</string>
   <string name="pref_use_persistent_notifications_title">Стално укључене нотификације</string>
   <string name="pref_use_expanded_notifications">Прикажи опширно обавештење Тор излаза државе и IP-ја</string>
@@ -128,7 +127,6 @@
     <string name="send_email">Пошаљи Е-пошту</string>
   <string name="vpn_default_world">Глобално (Аутоматски)</string>
   <string name="hidden_services">Скривени Сервиси</string>
-  <string name="title_activity_hidden_services">Скривени Сервиси</string>
   <string name="menu_hidden_services">Скривени Сервиси</string>
   <string name="save">Сачувај</string>
     <string name="local_port">Локални Порт</string>
@@ -136,8 +134,7 @@
   <string name="name">Име</string>
   <string name="done">Готово !</string>
     <string name="copy_address_to_clipboard">Копирај адреса у clipboard</string>
-  <string name="show_auth_cookie">Покажите ауторизовани колачић</string>
-  <string name="backup_service">Услуга за резервне копије</string>
+    <string name="backup_service">Услуга за резервне копије</string>
   <string name="delete_service">Обриши Услугу</string>
   <string name="backup_saved_at_external_storage">Резербна копија је сачувана на спољној меморији</string>
   <string name="backup_restored">Резервна копија је обновљена</string>
@@ -147,13 +144,7 @@
   <string name="click_again_for_backup">Кликните поново за резервну копију</string>
   <string name="service_type">Тип Услуге</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Молимо покрените поново Орбот ради примењивања промена</string>
-  <string name="client_cookies">Колачићи клијента</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Прочитај са QR кода</string>
-  <string name="backup_cookie">Резервна копија колачића</string>
-  <string name="delete_cookie">Избриши колачић</string>
-  <string name="confirm_cookie_deletion">Потрврди брисање колачића</string>
-  <string name="hosted_services">Хостоване Услуге</string>
   <string name="share_as_qr">Дели као QR код</string>
   <string name="disable">Онемогући</string>
   <string name="enable">Омогући</string>
diff --git a/app-tv/src/main/res/values-sv/strings.xml b/app-tv/src/main/res/values-sv/strings.xml
index 588238d4..2ed932e5 100644
--- a/app-tv/src/main/res/values-sv/strings.xml
+++ b/app-tv/src/main/res/values-sv/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">En app vill öppna dold serverport %1$d till Tor-nätverket. Det här är säkert om du litar på appen.</string>
   <string name="found_existing_tor_process">hittade existerande Tor process...</string>
   <string name="something_bad_happened">Något dåligt hände. Kolla loggen.</string>
-    <string name="unable_to_read_hidden_service_name">kan inte läsa gömda tjänstens namn</string>
-  <string name="unable_to_start_tor">Kan inte starta Tor:</string>
+    <string name="unable_to_start_tor">Kan inte starta Tor:</string>
     <string name="pref_use_persistent_notifications">Behåll alltid ikonen i verktygsfältet när Orbot är ansluten</string>
   <string name="pref_use_persistent_notifications_title">Alltid-PÃ¥ Notifikationer</string>
   <string name="pref_use_expanded_notifications">Visa utökad notis med Tors utgångsland och IP</string>
@@ -130,7 +129,6 @@
     <string name="send_email">Skicka e-post</string>
   <string name="vpn_default_world">Global (automatisk)</string>
   <string name="hidden_services">Hidden Services</string>
-  <string name="title_activity_hidden_services">Hidden Services</string>
   <string name="menu_hidden_services">Hidden Services</string>
   <string name="save">Spara</string>
     <string name="local_port">Lokal port</string>
@@ -138,7 +136,6 @@
   <string name="name">Namn</string>
   <string name="done">Klart!</string>
     <string name="copy_address_to_clipboard">Kopiera adress till urklipp</string>
-  <string name="show_auth_cookie">Visa auth kaka</string>
   <string name="backup_service">Säkerhetskopiera tjänst</string>
   <string name="delete_service">Ta bort tjänst</string>
   <string name="backup_saved_at_external_storage">Säkerhetskopiering sparad i externt lagringsutrymme</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Klicka igen för säkerhetskopiering</string>
   <string name="service_type">Typ av tjänst</string>
   <string name="auth_cookie">Auth kaka</string>
-  <string name="copy_cookie_to_clipboard">Kopiera kaka till urklipp</string>
-  <string name="auth_cookie_was_not_configured">Auth kaka var inte konfigurerad</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Vänligen starta om Orbot för att aktivera ändringarna</string>
-  <string name="client_cookies">Klientkakor</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Läs från QR</string>
-  <string name="backup_cookie">Säkerhetskopiera kaka</string>
-  <string name="delete_cookie">Ta bort kaka</string>
-  <string name="confirm_cookie_deletion">Bekräfta borttagning av kaka</string>
-  <string name="hosted_services">Värdtjänster</string>
   <string name="share_as_qr">Dela som QR</string>
   <string name="disable">Inaktivera</string>
   <string name="enable">Aktivera</string>
diff --git a/app-tv/src/main/res/values-ta/strings.xml b/app-tv/src/main/res/values-ta/strings.xml
index fb6d59d4..e5946e82 100644
--- a/app-tv/src/main/res/values-ta/strings.xml
+++ b/app-tv/src/main/res/values-ta/strings.xml
@@ -37,11 +37,7 @@
   <string name="save">சேமி</string>
   <string name="name">பெயர்</string>
   <string name="service_type">சேவை வகை</string>
-  <string name="backup_cookie">நினைவிகளை காப்புப்பிரதிகலெடு</string>
-  <string name="delete_cookie">நினைவிகளை ஆழி</string>
-  <string name="confirm_cookie_deletion">நினைவிகளின் நீக்கத்தை உறுதிப்படுத்து</string>
-  <string name="hosted_services">வழங்கப்பட்ட சேவைகள்</string>
-  <string name="share_as_qr">QR ஆக பகிர்</string>
+    <string name="share_as_qr">QR ஆக பகிர்</string>
   <string name="disable">முடக்கு</string>
   <string name="enable">செயல்படுத்து</string>
   <string name="trouble_connecting">இணைப்பதில் சிக்கலா ?</string>
diff --git a/app-tv/src/main/res/values-th/strings.xml b/app-tv/src/main/res/values-th/strings.xml
index a7288a46..273d0893 100644
--- a/app-tv/src/main/res/values-th/strings.xml
+++ b/app-tv/src/main/res/values-th/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">โปรแกรมต้องการเปิดพอร์ต %1$d ที่ซ่อนอยู่ของเซิร์ฟเวอร์ให้เชื่อมกับเครือข่าย Tor การกระทำนี้ปลอดภัยถ้าคุณเชื่อถือโปรแกรมนั้น</string>
   <string name="found_existing_tor_process">พบกระบวนการ Tor ที่มีอยู่แล้ว...</string>
   <string name="something_bad_happened">เกิดอะไรไม่ดีสักอย่าง ให้ตรวจดูจากบันทึก</string>
-    <string name="unable_to_read_hidden_service_name">ไม่สามารถอ่านชื่อของบริการที่ซ่อน</string>
-  <string name="unable_to_start_tor">ไม่สามารถเริ่ม Tor:</string>
+    <string name="unable_to_start_tor">ไม่สามารถเริ่ม Tor:</string>
     <string name="pref_use_persistent_notifications">แสดงไอคอนในทูลบาร์เสมอเมื่อ Orbot เชื่อมต่ออยู่</string>
   <string name="pref_use_persistent_notifications_title">การแจ้งเตือนแบบตลอดเวลา</string>
   <string name="pref_use_expanded_notifications">แสดงการแจ้งเตือนแบบขยายที่ระบุประเทศปลายทางและ IP ของ Tor</string>
@@ -130,7 +129,6 @@
     <string name="send_email">ส่งอีเมล</string>
   <string name="vpn_default_world">ส่วนรวม (อัตโนมัติ)</string>
   <string name="hidden_services">บริการที่ซ่อน</string>
-  <string name="title_activity_hidden_services">บริการที่ซ่อน</string>
   <string name="menu_hidden_services">บริการที่ซ่อน</string>
   <string name="save">บันทึก</string>
     <string name="local_port">พอร์ตในเครื่อง</string>
@@ -138,7 +136,6 @@
   <string name="name">ชื่อเอกสาร</string>
   <string name="done">เสร็จสิ้น!</string>
     <string name="copy_address_to_clipboard">คัดลอกที่อยู่ลงในคลิปบอร์ด</string>
-  <string name="show_auth_cookie">แสดงคุกกี้ที่ได้รับอนุญาต</string>
   <string name="backup_service">บริการสำรองข้อมูล</string>
   <string name="delete_service">บริการลบ</string>
   <string name="backup_saved_at_external_storage">ข้อมูลสำรองบันทึกที่ที่เก็บข้อมูลภายนอก</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">กดอีกครั้งเพื่อเรียกข้อมูลสำรอง</string>
   <string name="service_type">ประเภทของบริการ</string>
   <string name="auth_cookie">คุกกี้ที่ได้รับอนุญาต</string>
-  <string name="copy_cookie_to_clipboard">คัดลอกคุกกี้ลงในคลิปบอร์ด</string>
-  <string name="auth_cookie_was_not_configured">ยังไม่ได้กำหนดค่าคุกกี้ที่ได้รับอนุญาต</string>
   <string name="please_restart_Orbot_to_enable_the_changes">กรุณาเริ่ม Orbot ใหม่เพื่อให้การเปลี่ยนแปลงใช้งานได้</string>
-  <string name="client_cookies">คุกกี้ของไคลเอ็นต์</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">อ่านจากคิวอาร์</string>
-  <string name="backup_cookie">สำรองข้อมูลคุกกี้</string>
-  <string name="delete_cookie">ลบคุกกี้</string>
-  <string name="confirm_cookie_deletion">ยืนยันการลบคุกกี้</string>
-  <string name="hosted_services">บริการโฮสต์</string>
   <string name="share_as_qr">แชร์ในรูปแบบคิวอาร์</string>
   <string name="disable">ปิดการใช้งาน</string>
   <string name="enable">เปิดใช้งาน</string>
diff --git a/app-tv/src/main/res/values-tl/strings.xml b/app-tv/src/main/res/values-tl/strings.xml
index ca666b02..8abd8b0e 100644
--- a/app-tv/src/main/res/values-tl/strings.xml
+++ b/app-tv/src/main/res/values-tl/strings.xml
@@ -89,8 +89,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process"> nakakita ng umiiral na Tor process...</string>
   <string name="something_bad_happened">May nangyaring masama. Tingnan ang log</string>
-    <string name="unable_to_read_hidden_service_name">hindi mabasa ang pangalan ng tagong serbisyo</string>
-  <string name="unable_to_start_tor">Hindi masimulan ang Tor:</string>
+    <string name="unable_to_start_tor">Hindi masimulan ang Tor:</string>
     <string name="pref_use_persistent_notifications">Palaging panatilihin ang icon sa toolbar kapag ang Orbot ay naka-connect</string>
   <string name="pref_use_persistent_notifications_title">Palaging i-On ang Notifications</string>
   <string name="pref_use_expanded_notifications">Ipakita ang pinalaking notification kasama ng Tor exit country at IP</string>
diff --git a/app-tv/src/main/res/values-tr/strings.xml b/app-tv/src/main/res/values-tr/strings.xml
index 4ecd64b5..e514dad8 100644
--- a/app-tv/src/main/res/values-tr/strings.xml
+++ b/app-tv/src/main/res/values-tr/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Bir uygulama Tor ağına %1$d gizli sunucu kapısını açmak istiyor. Uygulamaya güveniyorsanız bu işlem güvenlidir.</string>
   <string name="found_existing_tor_process">varolan bir Tor iÅŸlemi bulundu...</string>
   <string name="something_bad_happened">Bir şeyler ters gitti. Günlük kayıtlarına bakın</string>
-  <string name="unable_to_read_hidden_service_name">gizli hizmet adı okunamadı</string>
-  <string name="unable_to_start_tor">Tor başlatılamadı:</string>
+    <string name="unable_to_start_tor">Tor başlatılamadı:</string>
   <string name="pref_use_persistent_notifications">Orbot bağlı olduğu sürece simge araç çubuğunda görüntülensin</string>
   <string name="pref_use_persistent_notifications_title">Bildirimler Her Zaman Açık</string>
   <string name="pref_use_expanded_notifications">Tor çıkış ülkesi ve IP adresi ile ilgili ayrıntılı bildirim görüntülensin</string>
@@ -130,7 +129,6 @@
   <string name="send_email">E-posta Gönder</string>
   <string name="vpn_default_world">Genel (Otomatik)</string>
   <string name="hidden_services">Gizli Hizmetler</string>
-  <string name="title_activity_hidden_services">Gizli Hizmetler</string>
   <string name="menu_hidden_services">Gizli Hizmetler</string>
   <string name="save">Kaydet</string>
   <string name="local_port">Yerel Kapı</string>
@@ -138,7 +136,6 @@
   <string name="name">Ad</string>
   <string name="done">Tamam!</string>
     <string name="copy_address_to_clipboard">Adresi panoya kopyala</string>
-  <string name="show_auth_cookie">Kimlik doğrulama çerezini görüntüle</string>
   <string name="backup_service">Hizmeti Yedekle</string>
   <string name="delete_service">Hizmeti Sil</string>
   <string name="backup_saved_at_external_storage">Yedek dış depolamaya kaydedildi</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Yedeklemek için yeniden tıklayın</string>
   <string name="service_type">Hizmet Türü</string>
   <string name="auth_cookie">Kimlik Doğrulama Çerezi</string>
-  <string name="copy_cookie_to_clipboard">Çerezi panoya kopyala</string>
-  <string name="auth_cookie_was_not_configured">Kimlik doğrulama çerezi yapılandırılmamış</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Değişiklikleri etkinleştirmek için Orbot uygulamasını yeniden başlatın</string>
-  <string name="client_cookies">İstemci çerezleri</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">QR kodundan oku</string>
-  <string name="backup_cookie">Çerezi yedekle</string>
-  <string name="delete_cookie">Çerezi sil</string>
-  <string name="confirm_cookie_deletion">Çerezi silmeyi onayla</string>
-  <string name="hosted_services">Barındırılan Hizmetler</string>
   <string name="share_as_qr">QR Olarak PaylaÅŸ</string>
   <string name="disable">Devre Dışı Bırak</string>
   <string name="enable">EtkinleÅŸtir</string>
diff --git a/app-tv/src/main/res/values-uk/strings.xml b/app-tv/src/main/res/values-uk/strings.xml
index 997d01aa..1da8521b 100644
--- a/app-tv/src/main/res/values-uk/strings.xml
+++ b/app-tv/src/main/res/values-uk/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">Програма хоче відкрити прихований серверний порт %1$d у мережу Tor. Це безпечно, якщо ви довіряєте застосунку.</string>
   <string name="found_existing_tor_process">знайдено існуючий процес Tor...</string>
   <string name="something_bad_happened">Виникла якась помилка. Перевірте лог</string>
-    <string name="unable_to_read_hidden_service_name">неможливо прочитати ім\'я прихованої служби</string>
-  <string name="unable_to_start_tor">Неможливо запустити Tor:</string>
+    <string name="unable_to_start_tor">Неможливо запустити Tor:</string>
     <string name="pref_use_persistent_notifications">Завжди показувати іконку в панелі завдань коли Orbot підключений</string>
   <string name="pref_use_persistent_notifications_title">Сповіщення про постійну роботу</string>
   <string name="pref_use_expanded_notifications">Показати розширене сповіщення з країною виходу Tor та IP</string>
@@ -130,7 +129,6 @@
     <string name="send_email">Надіслати листа</string>
   <string name="vpn_default_world">Глобальний (автоматичний)</string>
   <string name="hidden_services">Приховані Послуги</string>
-  <string name="title_activity_hidden_services">Приховані Послуги</string>
   <string name="menu_hidden_services">Приховані Послуги</string>
   <string name="save">Зберегти</string>
     <string name="local_port">Місцевий Порт</string>
@@ -138,7 +136,6 @@
   <string name="name">Ім\'я</string>
   <string name="done">Зроблено!</string>
     <string name="copy_address_to_clipboard">Скопіювати адресу в буфер обміну</string>
-  <string name="show_auth_cookie">Показати авторизацію реп\'яшків</string>
   <string name="backup_service">Резервне копіювання</string>
   <string name="delete_service">Вилучити Сервіс</string>
   <string name="backup_saved_at_external_storage">Резервна копія збережена на зовнішній пам\'яті</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">Ще раз натисніть щоби копіювати в резерв</string>
   <string name="service_type">Тип сервісу</string>
   <string name="auth_cookie">Авторизація реп\'яшків </string>
-  <string name="copy_cookie_to_clipboard">Копіювати реп\'яшки в буфер обміну</string>
-  <string name="auth_cookie_was_not_configured">Авторизація реп\'яшків не налаштована</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Будь ласка, перезапустіть Orbot, щоб зміни ввійшли в силу</string>
-  <string name="client_cookies">Клієнтські реп\'яшки</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Зчитати з QR-коду</string>
-  <string name="backup_cookie">Резервне копіювання реп\'яшків</string>
-  <string name="delete_cookie">Вилучити реп\'яшки</string>
-  <string name="confirm_cookie_deletion">Підтвердити вилучення реп\'яшків</string>
-  <string name="hosted_services">Розміщені Сервіси</string>
   <string name="share_as_qr">Поділитися у виді QR-коду</string>
   <string name="disable">Вимкнути</string>
   <string name="enable">Увімкнути</string>
diff --git a/app-tv/src/main/res/values-vi/strings.xml b/app-tv/src/main/res/values-vi/strings.xml
index 4b4f9ce6..29be90ed 100644
--- a/app-tv/src/main/res/values-vi/strings.xml
+++ b/app-tv/src/main/res/values-vi/strings.xml
@@ -91,8 +91,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">tìm ra tiến trình hiện hà nh của Tor...</string>
   <string name="something_bad_happened">Có gì đó không ổn. Xin xem lại nhật ký</string>
-    <string name="unable_to_read_hidden_service_name">không thể đọc được tên dịch vụ ẩn</string>
-  <string name="unable_to_start_tor">Không thể khởi động Tor được: </string>
+    <string name="unable_to_start_tor">Không thể khởi động Tor được: </string>
     <string name="pref_use_persistent_notifications">Luôn giữ thông báo trong thanh trạng thái khi Orbot được kết nối</string>
   <string name="pref_use_persistent_notifications_title">Thông báo thường trực</string>
   <string name="pref_use_expanded_notifications">Hiển thị thông báo mở rộng với IP và quốc gia của nút cuối (Tor exit-node)</string>
diff --git a/app-tv/src/main/res/values-zh-rCN/strings.xml b/app-tv/src/main/res/values-zh-rCN/strings.xml
index 0b23feef..04ea52f4 100644
--- a/app-tv/src/main/res/values-zh-rCN/strings.xml
+++ b/app-tv/src/main/res/values-zh-rCN/strings.xml
@@ -91,8 +91,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="found_existing_tor_process">发现当前已存在 Tor 进程...</string>
   <string name="something_bad_happened">发生错误，请检查日志</string>
-    <string name="unable_to_read_hidden_service_name">æ— æ³•è¯»å–éšè—æœåŠ¡åç§°</string>
-  <string name="unable_to_start_tor">æ— æ³•å¯åŠ¨ Tor：</string>
+    <string name="unable_to_start_tor">æ— æ³•å¯åŠ¨ Tor：</string>
     <string name="pref_use_persistent_notifications">Orbot è¿žæŽ¥åŽå§‹ç»ˆåœ¨é€šçŸ¥æ æ˜¾ç¤ºå›¾æ ‡</string>
   <string name="pref_use_persistent_notifications_title">始终显示通知</string>
   <string name="pref_use_expanded_notifications">显示扩展的通知，有关 Tor 出口的国家和 IP</string>
diff --git a/app-tv/src/main/res/values-zh-rTW/strings.xml b/app-tv/src/main/res/values-zh-rTW/strings.xml
index d8e73560..6edaa889 100644
--- a/app-tv/src/main/res/values-zh-rTW/strings.xml
+++ b/app-tv/src/main/res/values-zh-rTW/strings.xml
@@ -96,8 +96,7 @@
   <string name="hidden_service_request">有一個應用要開啟隱藏的伺服器端口 %1$d 到 Tor 網路,如果信得過此應用才進行此操作</string>
   <string name="found_existing_tor_process">發現已有 Tor 程序運行中 ...</string>
   <string name="something_bad_happened">發生錯誤。檢視日誌檔</string>
-    <string name="unable_to_read_hidden_service_name">無法讀取隱藏服務的名稱</string>
-  <string name="unable_to_start_tor">無法啟動 Tor：</string>
+    <string name="unable_to_start_tor">無法啟動 Tor：</string>
     <string name="pref_use_persistent_notifications">當 Orbot 連線成功時，總是在工具列顯示它的圖示</string>
   <string name="pref_use_persistent_notifications_title">總是顯示連線通知</string>
   <string name="pref_use_expanded_notifications">在通知中顯示 Tor 出口點的國家和 IP</string>
@@ -130,7 +129,6 @@
     <string name="send_email">寄送電子信件</string>
   <string name="vpn_default_world">全域(自動)</string>
   <string name="hidden_services">隱藏服務</string>
-  <string name="title_activity_hidden_services">隱藏服務</string>
   <string name="menu_hidden_services">隱藏服務</string>
   <string name="save">儲存</string>
     <string name="local_port">本地端口</string>
@@ -138,7 +136,6 @@
   <string name="name">名稱</string>
   <string name="done">已完成!</string>
     <string name="copy_address_to_clipboard">複製地址到剪貼簿</string>
-  <string name="show_auth_cookie">顯示 auth cookie</string>
   <string name="backup_service">備份服務</string>
   <string name="delete_service">刪除服務</string>
   <string name="backup_saved_at_external_storage">備份檔儲存在外部儲存器</string>
@@ -149,16 +146,8 @@
   <string name="click_again_for_backup">再次點選以進行備份</string>
   <string name="service_type">服務類型</string>
   <string name="auth_cookie">Auth cookie</string>
-  <string name="copy_cookie_to_clipboard">複製 Cookie 到剪貼簿</string>
-  <string name="auth_cookie_was_not_configured">Auth cookie 未設定</string>
   <string name="please_restart_Orbot_to_enable_the_changes">請重新啟動 Orbot 來讓設定生效。</string>
-  <string name="client_cookies">客戶 cookies</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">由 QR 碼讀取</string>
-  <string name="backup_cookie">備分 cookie</string>
-  <string name="delete_cookie">刪除 cookie</string>
-  <string name="confirm_cookie_deletion">確認刪除  cookie</string>
-  <string name="hosted_services">主機的服務</string>
   <string name="share_as_qr">利用 QR 碼分享</string>
   <string name="disable">關閉</string>
   <string name="enable">啟用</string>
diff --git a/app-tv/src/main/res/values/strings.xml b/app-tv/src/main/res/values/strings.xml
index f4b1ffdb..e0586400 100644
--- a/app-tv/src/main/res/values/strings.xml
+++ b/app-tv/src/main/res/values/strings.xml
@@ -104,7 +104,6 @@
     <string name="hidden_service_request">An app wants to open onion server port %1$d to the Tor network. This is safe if you trust the app.</string>
     <string name="found_existing_tor_process">found existing Tor process…</string>
     <string name="something_bad_happened">Something bad happened. Check the log</string>
-    <string name="unable_to_read_hidden_service_name">unable to read onion service name</string>
     <string name="unable_to_start_tor">Unable to start Tor:</string>
 
     <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string>
@@ -166,7 +165,6 @@
 
     <string name="vpn_default_world">Global (Auto)</string>
     <string name="hidden_services">Onion Services</string>
-    <string name="title_activity_hidden_services">Onion Services</string>
     <string name="menu_hidden_services">Onion Services</string>
     <string name="save">Save</string>
     <string name="local_port">Local Port</string>
@@ -174,7 +172,6 @@
     <string name="name">Name</string>
     <string name="done">Done!</string>
     <string name="copy_address_to_clipboard">Copy address to clipboard</string>
-    <string name="show_auth_cookie">Show auth cookie</string>
     <string name="backup_service">Backup Service</string>
     <string name="delete_service">Delete Service</string>
     <string name="backup_saved_at_external_storage">Backup saved at external storage</string>
@@ -185,16 +182,8 @@
     <string name="click_again_for_backup">Click again for backup</string>
     <string name="service_type">Service type</string>
     <string name="auth_cookie">Auth cookie</string>
-    <string name="copy_cookie_to_clipboard">Copy cookie to clipboard</string>
-    <string name="auth_cookie_was_not_configured">Auth cookie was not configured</string>
     <string name="please_restart_Orbot_to_enable_the_changes">Please restart Orbot to enable the changes</string>
-    <string name="client_cookies">Client cookies</string>
     <string name="onion">.onion</string>
-    <string name="cookie_from_QR">Read from QR</string>
-    <string name="backup_cookie">Backup cookie</string>
-    <string name="delete_cookie">Delete cookie</string>
-    <string name="confirm_cookie_deletion">Confirm cookie deletion</string>
-    <string name="hosted_services">Hosted Services</string>
     <string name="share_as_qr">Share as QR</string>
     <string name="disable">Disable</string>
     <string name="enable">Enable</string>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2a98ad6f..3779e386 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -93,15 +93,6 @@
             android:label="@string/apps_mode"
             android:theme="@style/Theme.AppCompat" />
 
-        <activity
-            android:name=".ui.hiddenservices.HiddenServicesActivity"
-            android:label="@string/title_activity_hidden_services"
-            android:theme="@style/DefaultTheme">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".OrbotMainActivity" />
-        </activity>
-
         <activity
             android:name=".ui.v3onionservice.OnionServiceActivity"
             android:label="@string/hidden_services"
@@ -119,15 +110,6 @@
                 android:value=".OrbotMainActivity"/>
         </activity>
 
-        <activity
-            android:name=".ui.hiddenservices.ClientCookiesActivity"
-            android:label="@string/client_cookies"
-            android:theme="@style/DefaultTheme">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".OrbotMainActivity" />
-        </activity>
-
         <activity
             android:name=".ui.onboarding.OnboardingActivity"
             android:configChanges="orientation|screenSize|screenLayout" />
@@ -145,11 +127,6 @@
             android:name=".ui.onboarding.CustomBridgesActivity"
             android:label="@string/use_custom_bridges" />
 
-        <provider
-            android:name=".ui.hiddenservices.providers.HSContentProvider"
-            android:authorities="org.torproject.android.ui.hiddenservices.providers"
-            android:exported="false" />
-
         <provider
             android:name=".ui.v3onionservice.OnionServiceContentProvider"
             android:authorities="org.torproject.android.ui.v3onionservice"
@@ -170,11 +147,6 @@
                 android:resource="@xml/hidden_services_paths" />
         </provider>
 
-        <provider
-            android:name=".ui.hiddenservices.providers.CookieContentProvider"
-            android:authorities="org.torproject.android.ui.hiddenservices.providers.cookie"
-            android:exported="false" />
-
         <receiver
             android:name=".service.StartTorReceiver"
             android:exported="true"
diff --git a/app/src/main/java/org/torproject/android/OrbotApp.java b/app/src/main/java/org/torproject/android/OrbotApp.java
index ca6459d0..d02638de 100644
--- a/app/src/main/java/org/torproject/android/OrbotApp.java
+++ b/app/src/main/java/org/torproject/android/OrbotApp.java
@@ -21,6 +21,9 @@ public class OrbotApp extends Application implements OrbotConstants {
         if (!Prefs.getDefaultLocale().equals(Locale.getDefault().getLanguage())) {
             Languages.setLanguage(this, Prefs.getDefaultLocale(), true);
         }
+
+        deleteDatabase("hidden_services"); // if exists remove v2 onion service data
+
     }
 
     @Override
diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index a54cbe0f..3853f957 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -15,9 +15,7 @@ import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.database.Cursor;
 import android.net.Uri;
 import android.net.VpnService;
 import android.os.Build;
@@ -39,7 +37,6 @@ import android.widget.Button;
 import android.widget.HorizontalScrollView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.ScrollView;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -49,7 +46,6 @@ import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.SwitchCompat;
 import androidx.appcompat.widget.Toolbar;
-import androidx.core.content.res.ResourcesCompat;
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@@ -65,15 +61,10 @@ import org.torproject.android.service.OrbotService;
 import org.torproject.android.service.TorServiceConstants;
 import org.torproject.android.service.util.Prefs;
 import org.torproject.android.service.util.Utils;
-import org.torproject.android.service.vpn.TorifiedApp;
 import org.torproject.android.service.vpn.VpnPrefs;
 import org.torproject.android.ui.AppManagerActivity;
 import org.torproject.android.ui.dialog.AboutDialogFragment;
-import org.torproject.android.ui.hiddenservices.ClientCookiesActivity;
-import org.torproject.android.ui.hiddenservices.HiddenServicesActivity;
-import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
-import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
-import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
+import org.torproject.android.ui.v3onionservice.PermissionManager;
 import org.torproject.android.ui.onboarding.BridgeWizardActivity;
 import org.torproject.android.ui.onboarding.OnboardingActivity;
 import org.torproject.android.ui.v3onionservice.OnionServiceContentProvider;
@@ -87,17 +78,12 @@ import java.net.URLDecoder;
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.StringTokenizer;
 import java.util.TreeMap;
-import java.util.stream.Collectors;
 
 import pl.bclogic.pulsator4droid.library.PulsatorLayout;
 
-import static androidx.core.content.FileProvider.getUriForFile;
 import static org.torproject.android.service.TorServiceConstants.ACTION_START;
 import static org.torproject.android.service.TorServiceConstants.ACTION_START_VPN;
 import static org.torproject.android.service.TorServiceConstants.ACTION_STOP;
@@ -111,7 +97,6 @@ import static org.torproject.android.service.vpn.VpnPrefs.PREFS_KEY_TORIFIED;
 
 public class OrbotMainActivity extends AppCompatActivity implements OrbotConstants {
 
-    private static final String INTENT_ACTION_REQUEST_HIDDEN_SERVICE = "org.torproject.android.REQUEST_HS_PORT";
     private static final String INTENT_ACTION_REQUEST_V3_ONION_SERVICE = "org.torproject.android.REQUEST_V3_ONION_SERVICE";
     private static final String INTENT_ACTION_REQUEST_START_TOR = "org.torproject.android.START_TOR";
     private static final int REQUEST_VPN = 8888;
@@ -217,26 +202,6 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan
     private SharedPreferences mPrefs = null;
     private boolean autoStartFromIntent = false;
 
-    private void migratePreferences() {
-        String hsPortString = mPrefs.getString("pref_hs_ports", "");
-        if (hsPortString.length() > 0) {
-            StringTokenizer st = new StringTokenizer(hsPortString, ",");
-            ContentResolver cr = getContentResolver();
-            while (st.hasMoreTokens()) {
-                int hsPort = Integer.parseInt(st.nextToken().split(" ")[0]);
-                ContentValues fields = new ContentValues();
-                fields.put("name", hsPort);
-                fields.put("port", hsPort);
-                fields.put("onion_port", hsPort);
-                cr.insert(HSContentProvider.CONTENT_URI, fields);
-            }
-
-            Editor pEdit = mPrefs.edit();
-            pEdit.remove("pref_hs_ports");
-            pEdit.apply();
-        }
-    }
-
     /**
      * Called when the activity is first created.
      */
@@ -245,8 +210,6 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan
 
         mPrefs = Prefs.getSharedPrefs(getApplicationContext());
 
-        migratePreferences(); // Migrate old preferences
-
         /* Create the widgets before registering for broadcasts to guarantee
          * that the widgets exist when the status updates try to update them */
         doLayout();
@@ -468,10 +431,6 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan
             startActivity(new Intent(this, OnionServiceActivity.class));
         } else if (item.getItemId() == R.id.menu_v3_onion_client_auth) {
             startActivity(new Intent(this, ClientAuthActivity.class));
-        } else if (item.getItemId() == R.id.menu_hidden_services) {
-            startActivity(new Intent(this, HiddenServicesActivity.class));
-        } else if (item.getItemId() == R.id.menu_client_cookies) {
-            startActivity(new Intent(this, ClientCookiesActivity.class));
         }
 
         return super.onOptionsItemSelected(item);
@@ -556,125 +515,6 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan
             stopTor();
             Toast.makeText(this, R.string.start_tor_again_for_finish_the_process, Toast.LENGTH_LONG).show();
         }
-
-
-
-    }
-
-    private void enableHiddenServicePortV2(String hsName, final int hsPort, int hsRemotePort,
-                                           final String backupToPackage, final Uri hsKeyPath, final Boolean authCookie) {
-        String onionHostname = null;
-
-        if (hsName == null)
-            hsName = "hs" + hsPort;
-
-        if (hsRemotePort == -1)
-            hsRemotePort = hsPort;
-
-        ContentValues fields = new ContentValues();
-        fields.put(HSContentProvider.HiddenService.NAME, hsName);
-        fields.put(HSContentProvider.HiddenService.PORT, hsPort);
-        fields.put(HSContentProvider.HiddenService.ONION_PORT, hsRemotePort);
-        fields.put(HSContentProvider.HiddenService.AUTH_COOKIE, authCookie);
-
-        ContentResolver cr = getContentResolver();
-
-        Cursor row = cr.query(
-                HSContentProvider.CONTENT_URI,
-                HSContentProvider.PROJECTION,
-                HSContentProvider.HiddenService.ONION_PORT + "=" + hsPort,
-                null,
-                null
-        );
-
-        if (row == null || row.getCount() < 1) {
-            cr.insert(HSContentProvider.CONTENT_URI, fields);
-        } else if (row.moveToFirst()) {
-            onionHostname = row.getString(row.getColumnIndex(HSContentProvider.HiddenService.DOMAIN));
-            row.close();
-        }
-
-        if (onionHostname == null || onionHostname.length() < 1) {
-
-            if (hsKeyPath != null) {
-                BackupUtils hsutils = new BackupUtils(getApplicationContext());
-                hsutils.restoreKeyBackup(hsPort, hsKeyPath);
-            }
-
-            if (torStatus.equals(TorServiceConstants.STATUS_OFF)) {
-                startTor();
-            } else {
-                stopTor();
-                Toast.makeText(this, R.string.start_tor_again_for_finish_the_process, Toast.LENGTH_LONG).show();
-            }
-
-            new Thread() {
-
-                public void run() {
-                    String hostname = null;
-                    Intent nResult = new Intent();
-
-                    while (hostname == null) {
-                        try {
-                            Thread.sleep(3000); //wait three seconds
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-
-                        Cursor onion = getContentResolver().query(
-                                HSContentProvider.CONTENT_URI,
-                                HSContentProvider.PROJECTION,
-                                HSContentProvider.HiddenService.ONION_PORT + "=" + hsPort,
-                                null,
-                                null
-                        );
-
-                        if (onion != null && onion.getCount() > 0) {
-                            onion.moveToNext();
-                            hostname = onion.getString(onion.getColumnIndex(HSContentProvider.HiddenService.DOMAIN));
-
-                            if (hostname == null || hostname.length() < 1)
-                                continue;
-
-                            nResult.putExtra("hs_host", hostname);
-
-                            if (authCookie) {
-                                nResult.putExtra(
-                                        "hs_auth_cookie",
-                                        onion.getString(onion.getColumnIndex(HSContentProvider.HiddenService.AUTH_COOKIE_VALUE))
-                                );
-                            }
-
-                            if (backupToPackage != null && backupToPackage.length() > 0) {
-                                String servicePath = getFilesDir() + "/" + TorServiceConstants.HIDDEN_SERVICES_DIR + "/hs" + hsPort;
-                                File hidden_service_key = new File(servicePath, "private_key");
-                                Context context = getApplicationContext();
-
-                                Uri contentUri = getUriForFile(
-                                        context,
-                                        "org.torproject.android.ui.hiddenservices.storage",
-                                        hidden_service_key
-                                );
-
-                                context.grantUriPermission(backupToPackage, contentUri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
-                                nResult.setData(contentUri);
-                                nResult.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-                            }
-
-                            onion.close();
-                            setResult(RESULT_OK, nResult);
-                            finish();
-                        }
-                    }
-                }
-            }.start();
-
-        } else {
-            Intent nResult = new Intent();
-            nResult.putExtra("hs_host", onionHostname);
-            setResult(RESULT_OK, nResult);
-            finish();
-        }
     }
 
     private synchronized void handleIntents() {
@@ -702,23 +542,6 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan
                         .show();
                 return;
 
-            case INTENT_ACTION_REQUEST_HIDDEN_SERVICE:
-                final int v2hiddenServicePort = intent.getIntExtra("hs_port", -1);
-                final int v2hiddenServiceRemotePort = intent.getIntExtra("hs_onion_port", -1);
-                final String v2hiddenServiceName = intent.getStringExtra("hs_name");
-                final String v2backupToPackage = intent.getStringExtra("hs_backup_to_package");
-                final Boolean v2authCookie = intent.getBooleanExtra("hs_auth_cookie", false);
-                final Uri v2KeyUri = intent.getData();
-
-                String v2RequestMsg = getString(R.string.hidden_service_request, v2hiddenServicePort);
-                new AlertDialog.Builder(this).setMessage(v2RequestMsg)
-                        .setPositiveButton(R.string.allow, (dialog, which) -> enableHiddenServicePortV2(
-                                v2hiddenServiceName, v2hiddenServicePort,
-                                v2hiddenServiceRemotePort, v2backupToPackage,
-                                v2KeyUri, v2authCookie))
-                        .setNegativeButton(R.string.deny, (d, w) -> d.dismiss()).show();
-                return; //don't null the setIntent() as we need it later
-
             case INTENT_ACTION_REQUEST_START_TOR:
                 autoStartFromIntent = true;
                 startTor();
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java
deleted file mode 100644
index 3e1b60a3..00000000
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package org.torproject.android.ui.hiddenservices;
-
-import android.app.AlertDialog;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.database.ContentObserver;
-import android.database.Cursor;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.ListView;
-import android.widget.Toast;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import com.google.zxing.integration.android.IntentIntegrator;
-import com.google.zxing.integration.android.IntentResult;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.torproject.android.R;
-import org.torproject.android.core.DiskUtils;
-import org.torproject.android.core.LocaleHelper;
-import org.torproject.android.ui.hiddenservices.adapters.ClientCookiesAdapter;
-import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
-import org.torproject.android.ui.hiddenservices.dialogs.AddCookieDialog;
-import org.torproject.android.ui.hiddenservices.dialogs.CookieActionsDialog;
-import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
-
-import java.io.File;
-import java.util.Locale;
-
-public class ClientCookiesActivity extends AppCompatActivity {
-    public static final String BUNDLE_KEY_ID = "_id",
-            BUNDLE_KEY_DOMAIN = "domain",
-            BUNDLE_KEY_COOKIE = "auth_cookie_value",
-            BUNDLE_KEY_ENABLED = "enabled";
-    private static final int REQUEST_CODE_READ_COOKIE = 54;
-    private ContentResolver mResolver;
-    private ClientCookiesAdapter mAdapter;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.layout_activity_client_cookies);
-
-        setSupportActionBar(findViewById(R.id.toolbar));
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-        mResolver = getContentResolver();
-
-        findViewById(R.id.fab).setOnClickListener(view ->
-            new AddCookieDialog().show(getSupportFragmentManager(), AddCookieDialog.class.getSimpleName()));
-
-        mAdapter = new ClientCookiesAdapter(this, mResolver.query(CookieContentProvider.CONTENT_URI, CookieContentProvider.PROJECTION, null, null, null), 0);
-
-        mResolver.registerContentObserver(CookieContentProvider.CONTENT_URI, true, new HSObserver(new Handler()));
-
-        ListView cookies = findViewById(R.id.clien_cookies_list);
-        cookies.setAdapter(mAdapter);
-
-        cookies.setOnItemClickListener((parent, view, position, id) -> {
-            Cursor item = (Cursor) parent.getItemAtPosition(position);
-
-            Bundle arguments = new Bundle();
-            arguments.putInt(BUNDLE_KEY_ID, item.getInt(item.getColumnIndex(CookieContentProvider.ClientCookie._ID)));
-            arguments.putString(BUNDLE_KEY_DOMAIN, item.getString(item.getColumnIndex(CookieContentProvider.ClientCookie.DOMAIN)));
-            arguments.putString(BUNDLE_KEY_COOKIE, item.getString(item.getColumnIndex(CookieContentProvider.ClientCookie.AUTH_COOKIE_VALUE)));
-            arguments.putInt(BUNDLE_KEY_ENABLED, item.getInt(item.getColumnIndex(CookieContentProvider.ClientCookie.ENABLED)));
-
-            CookieActionsDialog dialog = new CookieActionsDialog();
-            dialog.setArguments(arguments);
-            dialog.show(getSupportFragmentManager(), CookieActionsDialog.class.getSimpleName());
-        });
-    }
-
-    @Override
-    protected void attachBaseContext(Context base) {
-        super.attachBaseContext(LocaleHelper.onAttach(base));
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.cookie_menu, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int id = item.getItemId();
-
-        if (id == R.id.cookie_restore_backup) {
-            if (DiskUtils.supportsStorageAccessFramework()) {
-                Intent readCookieIntent = DiskUtils.createReadFileIntent("application/json");
-                startActivityForResult(readCookieIntent, REQUEST_CODE_READ_COOKIE);
-            } else { // api 16,17,18
-                restoreBackupLegacy();
-            }
-
-        } else if (id == R.id.cookie_from_qr) {
-            IntentIntegrator integrator = new IntentIntegrator(ClientCookiesActivity.this);
-            integrator.initiateScan();
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    private void restoreBackupLegacy() {
-        File backupDir = DiskUtils.getOrCreateLegacyBackupDir(getString(R.string.app_name));
-
-        try {
-            File[] files = backupDir.listFiles((dir, name) -> name.toLowerCase(Locale.ENGLISH).endsWith(".json"));
-            if (files != null) {
-                if (files.length == 0) {
-                    Toast.makeText(this, R.string.create_a_backup_first, Toast.LENGTH_LONG).show();
-                    return;
-                }
-
-                CharSequence[] fileNames = new CharSequence[files.length];
-                for (int i = 0; i < files.length; i++) fileNames[i] = files[i].getName();
-
-                new AlertDialog.Builder(this)
-                        .setItems(fileNames, (dialog, which) -> {
-                            String text = DiskUtils.readFile(mResolver, files[which]);
-                            new BackupUtils(this).restoreCookieBackup(text);
-                        })
-                        .setTitle(R.string.restore_backup)
-                        .show();
-            }
-        } catch (Exception e) {
-            Toast.makeText(this, R.string.error, Toast.LENGTH_LONG).show();
-        }
-    }
-
-    @Override
-    protected void onActivityResult(int request, int response, Intent data) {
-        super.onActivityResult(request, response, data);
-        if (request == REQUEST_CODE_READ_COOKIE && response == RESULT_OK) {
-            String cookieStr = DiskUtils.readFileFromInputStream(mResolver, data.getData());
-            new BackupUtils(this).restoreCookieBackup(cookieStr);
-        } else {
-            IntentResult scanResult = IntentIntegrator.parseActivityResult(request, response, data);
-            if (scanResult == null) return;
-
-            String results = scanResult.getContents();
-            if (results == null || results.length() < 1) return;
-            try {
-                JSONObject savedValues = new JSONObject(results);
-                ContentValues fields = new ContentValues();
-                fields.put(CookieContentProvider.ClientCookie.DOMAIN, savedValues.getString(CookieContentProvider.ClientCookie.DOMAIN));
-                fields.put(CookieContentProvider.ClientCookie.AUTH_COOKIE_VALUE, savedValues.getString(CookieContentProvider.ClientCookie.AUTH_COOKIE_VALUE));
-                mResolver.insert(CookieContentProvider.CONTENT_URI, fields);
-            } catch (JSONException e) {
-                e.printStackTrace();
-                Toast.makeText(this, R.string.error, Toast.LENGTH_LONG).show();
-            }
-        }
-    }
-
-    class HSObserver extends ContentObserver {
-        HSObserver(Handler handler) {
-            super(handler);
-        }
-
-        @Override
-        public void onChange(boolean selfChange) {
-            mAdapter.changeCursor(mResolver.query(
-                    CookieContentProvider.CONTENT_URI, CookieContentProvider.PROJECTION, null, null, null
-            ));
-        }
-    }
-}
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java
deleted file mode 100644
index 147c4e7e..00000000
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package org.torproject.android.ui.hiddenservices;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.database.ContentObserver;
-import android.database.Cursor;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.ListView;
-import android.widget.RadioButton;
-import android.widget.Toast;
-
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-
-import org.torproject.android.R;
-import org.torproject.android.core.DiskUtils;
-import org.torproject.android.core.LocaleHelper;
-import org.torproject.android.ui.hiddenservices.adapters.OnionListAdapter;
-import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
-import org.torproject.android.ui.hiddenservices.backup.ZipUtilities;
-import org.torproject.android.ui.hiddenservices.dialogs.HSActionsDialog;
-import org.torproject.android.ui.hiddenservices.dialogs.HSDataDialog;
-import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
-import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
-
-import java.io.File;
-import java.util.Locale;
-
-public class HiddenServicesActivity extends AppCompatActivity {
-    public static final String BUNDLE_KEY_ID = "_id",
-            BUNDLE_KEY_PORT = "port",
-            BUNDLE_KEY_ONION = "onion",
-            BUNDLE_KEY_AUTH_COOKIE = "auth_cookie",
-            BUNDLE_KEY_AUTH_COOKIE_VALUE = "auth_cookie_value",
-            BUNDLE_KEY_PATH = "path";
-    private static final int REQUEST_CODE_READ_ZIP_BACKUP = 125;
-    private static final String BUNDLE_KEY_SHOW_USER_SERVICES = "show_user_services";
-    private ContentResolver mResolver;
-    private OnionListAdapter mAdapter;
-    private RadioButton radioShowUserServices;
-    private FloatingActionButton fab;
-    private String mWhere = HSContentProvider.HiddenService.CREATED_BY_USER + "=1";
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.layout_hs_list_view);
-        radioShowUserServices = findViewById(R.id.radioUserServices);
-        RadioButton radioShowAppServices = findViewById(R.id.radioAppServices);
-
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-        mResolver = getContentResolver();
-
-        fab = findViewById(R.id.fab);
-        fab.setOnClickListener(view -> new HSDataDialog().show(getSupportFragmentManager(), HSDataDialog.class.getSimpleName()));
-
-        mAdapter = new OnionListAdapter(this, mResolver.query(HSContentProvider.CONTENT_URI, HSContentProvider.PROJECTION, mWhere, null, null), 0);
-        mResolver.registerContentObserver(HSContentProvider.CONTENT_URI, true, new HSObserver(new Handler()));
-
-        ListView onion_list = findViewById(R.id.onion_list);
-        boolean selectUserServices = savedInstanceState == null || savedInstanceState.getBoolean(BUNDLE_KEY_SHOW_USER_SERVICES);
-        if (selectUserServices) radioShowUserServices.setChecked(true);
-        else radioShowAppServices.setChecked(true);
-        filterServices(selectUserServices);
-        onion_list.setAdapter(mAdapter);
-
-        onion_list.setOnItemClickListener((parent, view, position, id) -> {
-            Cursor item = (Cursor) parent.getItemAtPosition(position);
-
-            Bundle arguments = new Bundle();
-            arguments.putInt(BUNDLE_KEY_ID, item.getInt(item.getColumnIndex(HSContentProvider.HiddenService._ID)));
-            arguments.putString(BUNDLE_KEY_PORT, item.getString(item.getColumnIndex(HSContentProvider.HiddenService.PORT)));
-            arguments.putString(BUNDLE_KEY_ONION, item.getString(item.getColumnIndex(HSContentProvider.HiddenService.DOMAIN)));
-            arguments.putInt(BUNDLE_KEY_AUTH_COOKIE, item.getInt(item.getColumnIndex(HSContentProvider.HiddenService.AUTH_COOKIE)));
-            arguments.putString(BUNDLE_KEY_AUTH_COOKIE_VALUE, item.getString(item.getColumnIndex(HSContentProvider.HiddenService.AUTH_COOKIE_VALUE)));
-            arguments.putString(BUNDLE_KEY_PATH, item.getString(item.getColumnIndex(HSContentProvider.HiddenService.PATH)));
-
-            HSActionsDialog dialog = new HSActionsDialog();
-            dialog.setArguments(arguments);
-            dialog.show(getSupportFragmentManager(), HSActionsDialog.class.getSimpleName());
-        });
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle icicle) {
-        super.onSaveInstanceState(icicle);
-        icicle.putBoolean(BUNDLE_KEY_SHOW_USER_SERVICES, radioShowUserServices.isChecked());
-    }
-
-    @Override
-    protected void attachBaseContext(Context base) {
-        super.attachBaseContext(LocaleHelper.onAttach(base));
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.hs_menu, menu);
-        return true;
-    }
-
-    private void doRestoreLegacy() { // API 16, 17, 18
-        File backupDir = DiskUtils.getOrCreateLegacyBackupDir(getString(R.string.app_name));
-        File[] files = backupDir.listFiles(ZipUtilities.FILTER_ZIP_FILES);
-        if (files != null) {
-            if (files.length == 0) {
-                Toast.makeText(this, R.string.create_a_backup_first, Toast.LENGTH_LONG).show();
-                return;
-            }
-
-            CharSequence[] fileNames = new CharSequence[files.length];
-            for (int i = 0; i < files.length; i++) fileNames[i] = files[i].getName();
-
-            new AlertDialog.Builder(this)
-                    .setTitle(R.string.restore_backup)
-                    .setItems(fileNames, (dialog, which) -> new BackupUtils(this).restoreZipBackupV2Legacy(files[which]))
-                    .show();
-
-        }
-    }
-
-    @Override
-    protected void onActivityResult(int request, int response, Intent data) {
-        super.onActivityResult(request, response, data);
-        if (request == REQUEST_CODE_READ_ZIP_BACKUP) {
-            if (response != RESULT_OK) return;
-            BackupUtils backupUtils = new BackupUtils(this);
-            backupUtils.restoreZipBackupV2(data.getData());
-        }
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.menu_restore_backup) {
-            if (DiskUtils.supportsStorageAccessFramework()) {
-                Intent readFile = DiskUtils.createReadFileIntent(ZipUtilities.ZIP_MIME_TYPE);
-                startActivityForResult(readFile, REQUEST_CODE_READ_ZIP_BACKUP);
-            } else { // API 16, 17, 18
-                doRestoreLegacy();
-            }
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    private void filterServices(boolean showUserServices) {
-        if (showUserServices) {
-            mWhere = HSContentProvider.HiddenService.CREATED_BY_USER + "=1";
-            fab.show();
-        } else {
-            mWhere = HSContentProvider.HiddenService.CREATED_BY_USER + "=0";
-            fab.hide();
-        }
-        mAdapter.changeCursor(mResolver.query(HSContentProvider.CONTENT_URI, HSContentProvider.PROJECTION, mWhere, null, null));
-    }
-
-    public void onRadioButtonClick(View view) {
-        if (view.getId() == R.id.radioUserServices) {
-            filterServices(true);
-        } else if (view.getId() == R.id.radioAppServices) {
-            filterServices(false);
-        }
-    }
-
-    class HSObserver extends ContentObserver {
-        HSObserver(Handler handler) {
-            super(handler);
-        }
-
-        @Override
-        public void onChange(boolean selfChange) {
-            mAdapter.changeCursor(mResolver.query(HSContentProvider.CONTENT_URI, HSContentProvider.PROJECTION, mWhere, null, null));
-            if (!PermissionManager.isLollipopOrHigher()) return;
-            Cursor active = mResolver.query(HSContentProvider.CONTENT_URI, HSContentProvider.PROJECTION, HSContentProvider.HiddenService.ENABLED + "=1", null, null);
-            if (active == null) return;
-            if (active.getCount() > 0) // Call only if there running services
-                PermissionManager.requestBatteryPermissions(HiddenServicesActivity.this, getApplicationContext());
-            else // Drop whe not needed
-                PermissionManager.requestDropBatteryPermissions(HiddenServicesActivity.this, getApplicationContext());
-
-            active.close();
-        }
-    }
-}
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/ClientCookiesAdapter.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/ClientCookiesAdapter.java
deleted file mode 100644
index d40fa34d..00000000
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/ClientCookiesAdapter.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.torproject.android.ui.hiddenservices.adapters;
-
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-
-import androidx.appcompat.widget.SwitchCompat;
-import androidx.cursoradapter.widget.CursorAdapter;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import android.widget.Toast;
-import org.torproject.android.R;
-import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
-
-public class ClientCookiesAdapter extends CursorAdapter {
-    private LayoutInflater cursorInflater;
-
-    public ClientCookiesAdapter(Context context, Cursor c, int flags) {
-        super(context, c, flags);
-        cursorInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-    }
-
-    @Override
-    public void bindView(View view, Context context, Cursor cursor) {
-        final Context mContext = context;
-        int id = cursor.getInt(cursor.getColumnIndex(CookieContentProvider.ClientCookie._ID));
-        final String where = CookieContentProvider.ClientCookie._ID + "=" + id;
-
-        TextView domain = view.findViewById(R.id.cookie_onion);
-        domain.setText(cursor.getString(cursor.getColumnIndex(CookieContentProvider.ClientCookie.DOMAIN)));
-
-        SwitchCompat enabled = view.findViewById(R.id.cookie_switch);
-        enabled.setChecked(cursor.getInt(cursor.getColumnIndex(CookieContentProvider.ClientCookie.ENABLED)) == 1);
-
-        enabled.setOnCheckedChangeListener((buttonView, isChecked) -> {
-            ContentResolver resolver = mContext.getContentResolver();
-            ContentValues fields = new ContentValues();
-            fields.put(CookieContentProvider.ClientCookie.ENABLED, isChecked);
-            resolver.update(CookieContentProvider.CONTENT_URI, fields, where, null);
-
-            Toast.makeText(mContext, R.string.please_restart_Orbot_to_enable_the_changes, Toast.LENGTH_LONG).show();
-        });
-    }
-
-    @Override
-    public View newView(Context context, Cursor cursor, ViewGroup parent) {
-        return cursorInflater.inflate(R.layout.layout_client_cookie_list_item, parent, false);
-    }
-}
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/OnionListAdapter.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/OnionListAdapter.java
deleted file mode 100644
index c925fb20..00000000
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/OnionListAdapter.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.torproject.android.ui.hiddenservices.adapters;
-
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.appcompat.widget.SwitchCompat;
-import androidx.cursoradapter.widget.CursorAdapter;
-
-import org.torproject.android.R;
-import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
-
-public class OnionListAdapter extends CursorAdapter {
-    private LayoutInflater cursorInflater;
-
-    public OnionListAdapter(Context context, Cursor c, int flags) {
-        super(context, c, flags);
-        cursorInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-    }
-
-    @Override
-    public void bindView(View view, final Context context, Cursor cursor) {
-        int id = cursor.getInt(cursor.getColumnIndex(HSContentProvider.HiddenService._ID));
-        final String where = HSContentProvider.HiddenService._ID + "=" + id;
-
-        TextView port = view.findViewById(R.id.hs_port);
-        port.setText(String.format("%s\n%s", context.getString(R.string.local_port),
-                cursor.getString(cursor.getColumnIndex(HSContentProvider.HiddenService.PORT))));
-        TextView onionPort = view.findViewById(R.id.onion_port);
-        onionPort.setText(String.format("%s\n%s", context.getString(R.string.onion_port),
-                cursor.getString(cursor.getColumnIndex(HSContentProvider.HiddenService.ONION_PORT))));
-        TextView name = view.findViewById(R.id.hs_name);
-        name.setText(cursor.getString(cursor.getColumnIndex(HSContentProvider.HiddenService.NAME)));
-        TextView domain = view.findViewById(R.id.hs_onion);
-        domain.setText(cursor.getString(cursor.getColumnIndex(HSContentProvider.HiddenService.DOMAIN)));
-
-        SwitchCompat enabled = view.findViewById(R.id.hs_switch);
-        enabled.setChecked(cursor.getInt(cursor.getColumnIndex(HSContentProvider.HiddenService.ENABLED)) == 1);
-        enabled.setOnCheckedChangeListener((buttonView, isChecked) -> {
-            ContentResolver resolver = context.getContentResolver();
-            ContentValues fields = new ContentValues();
-            fields.put(HSContentProvider.HiddenService.ENABLED, isChecked);
-            resolver.update(HSContentProvider.CONTENT_URI, fields, where, null);
-
-            Toast.makeText(context, R.string.please_restart_Orbot_to_enable_the_changes, Toast.LENGTH_LONG).show();
-        });
-    }
-
-    @Override
-    public View newView(Context context, Cursor cursor, ViewGroup parent) {
-        return cursorInflater.inflate(R.layout.layout_hs_list_item, parent, false);
-    }
-}
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java
deleted file mode 100644
index 64ca1e8d..00000000
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java
+++ /dev/null
@@ -1,388 +0,0 @@
-package org.torproject.android.ui.hiddenservices.backup;
-
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.ParcelFileDescriptor;
-import android.provider.OpenableColumns;
-import android.widget.Toast;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.torproject.android.R;
-import org.torproject.android.service.OrbotService;
-import org.torproject.android.service.TorServiceConstants;
-import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
-import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
-import org.torproject.android.ui.v3onionservice.OnionServiceContentProvider;
-import org.torproject.android.ui.v3onionservice.clientauth.ClientAuthContentProvider;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.MappedByteBuffer;
-import java.nio.channels.FileChannel;
-import java.nio.charset.Charset;
-
-public class BackupUtils {
-    private static final String configFileName = "config.json";
-    private final Context mContext;
-    private final ContentResolver mResolver;
-
-    public BackupUtils(Context context) {
-        mContext = context;
-        mResolver = mContext.getContentResolver();
-    }
-
-    public String createV3ZipBackup(String port, String relativePath, Uri zipFile) {
-        String[] files = createFilesForZippingV3(relativePath);
-        ZipUtilities zip = new ZipUtilities(files, zipFile, mResolver);
-        if (!zip.zip()) return null;
-        return zipFile.getPath();
-    }
-
-    public String createV3AuthBackup(String domain, String keyHash, Uri backupFile) {
-        String fileText = OrbotService.buildV3ClientAuthFile(domain, keyHash);
-        try {
-            ParcelFileDescriptor pfd = mContext.getContentResolver().openFileDescriptor(backupFile, "w");
-            FileOutputStream fos = new FileOutputStream(pfd.getFileDescriptor());
-            fos.write(fileText.getBytes());
-            fos.close();
-            pfd.close();
-        } catch (IOException ioe) {
-            return null;
-        }
-        return backupFile.getPath();
-    }
-
-    public String createV2ZipBackup(int port, String relativePath, Uri zipFile) {
-        String[] files = createFilesForZippingV2(relativePath);
-        ZipUtilities zip = new ZipUtilities(files, zipFile, mResolver);
-
-        if (!zip.zip())
-            return null;
-
-        return zipFile.getPath();
-    }
-
-    // todo this doesn't export data for onions that orbot hosts which have authentication (not supported yet...)
-    private String[] createFilesForZippingV3(String relativePath) {
-        final String v3BasePath = getV3BasePath() + "/" + relativePath + "/";
-        final String hostnamePath = v3BasePath + "hostname",
-                configFilePath = v3BasePath + configFileName,
-                privKeyPath = v3BasePath + "hs_ed25519_secret_key",
-                pubKeyPath = v3BasePath + "hs_ed25519_public_key";
-
-        Cursor portData = mResolver.query(OnionServiceContentProvider.CONTENT_URI, OnionServiceContentProvider.PROJECTION,
-                OnionServiceContentProvider.OnionService.PATH + "=\"" + relativePath + "\"", null, null);
-
-        JSONObject config = new JSONObject();
-        try {
-            if (portData == null || portData.getCount() != 1)
-                return null;
-            portData.moveToNext();
-
-
-            config.put(OnionServiceContentProvider.OnionService.NAME, portData.getString(portData.getColumnIndex(OnionServiceContentProvider.OnionService.NAME)));
-            config.put(OnionServiceContentProvider.OnionService.PORT, portData.getString(portData.getColumnIndex(OnionServiceContentProvider.OnionService.PORT)));
-            config.put(OnionServiceContentProvider.OnionService.ONION_PORT, portData.getString(portData.getColumnIndex(OnionServiceContentProvider.OnionService.ONION_PORT)));
-            config.put(OnionServiceContentProvider.OnionService.DOMAIN, portData.getString(portData.getColumnIndex(OnionServiceContentProvider.OnionService.DOMAIN)));
-            config.put(OnionServiceContentProvider.OnionService.CREATED_BY_USER, portData.getString(portData.getColumnIndex(OnionServiceContentProvider.OnionService.CREATED_BY_USER)));
-            config.put(OnionServiceContentProvider.OnionService.ENABLED, portData.getString(portData.getColumnIndex(OnionServiceContentProvider.OnionService.ENABLED)));
-
-            portData.close();
-
-            FileWriter fileWriter = new FileWriter(configFilePath);
-            fileWriter.write(config.toString());
-            fileWriter.close();
-        } catch (JSONException | IOException ioe) {
-            ioe.printStackTrace();
-            return null;
-        }
-
-        return new String[]{hostnamePath, configFilePath, privKeyPath, pubKeyPath};
-    }
-
-    private String[] createFilesForZippingV2(String relativePath) {
-        final String hsBasePath = getHSBasePath() + "/" + relativePath + "/";
-        String configFilePath = hsBasePath + configFileName;
-        String hostnameFilePath = hsBasePath + "hostname";
-        String keyFilePath = hsBasePath + "private_key";
-
-        Cursor portData = mResolver.query(
-                HSContentProvider.CONTENT_URI,
-                HSContentProvider.PROJECTION,
-                HSContentProvider.HiddenService.PATH + "=\"" + relativePath + "\"",
-                null,
-                null
-        );
-
-        JSONObject config = new JSONObject();
-        try {
-            if (portData == null || portData.getCount() != 1)
-                return null;
-
-            portData.moveToNext();
-
-            config.put(HSContentProvider.HiddenService.NAME, portData.getString(portData.getColumnIndex(HSContentProvider.HiddenService.NAME)));
-            config.put(HSContentProvider.HiddenService.PORT, portData.getInt(portData.getColumnIndex(HSContentProvider.HiddenService.PORT)));
-            config.put(HSContentProvider.HiddenService.ONION_PORT, portData.getInt(portData.getColumnIndex(HSContentProvider.HiddenService.ONION_PORT)));
-            config.put(HSContentProvider.HiddenService.DOMAIN, portData.getString(portData.getColumnIndex(HSContentProvider.HiddenService.DOMAIN)));
-            config.put(HSContentProvider.HiddenService.AUTH_COOKIE, portData.getInt(portData.getColumnIndex(HSContentProvider.HiddenService.AUTH_COOKIE)));
-            config.put(HSContentProvider.HiddenService.AUTH_COOKIE_VALUE, portData.getString(portData.getColumnIndex(HSContentProvider.HiddenService.AUTH_COOKIE_VALUE)));
-            config.put(HSContentProvider.HiddenService.CREATED_BY_USER, portData.getInt(portData.getColumnIndex(HSContentProvider.HiddenService.CREATED_BY_USER)));
-            config.put(HSContentProvider.HiddenService.ENABLED, portData.getInt(portData.getColumnIndex(HSContentProvider.HiddenService.ENABLED)));
-        } catch (JSONException | NullPointerException e) {
-            e.printStackTrace();
-            return null;
-        }
-
-        portData.close();
-
-        try {
-            FileWriter file = new FileWriter(configFilePath);
-            file.write(config.toString());
-            file.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-            return null;
-        }
-        return new String[]{hostnameFilePath, keyFilePath, configFilePath};
-    }
-
-    private void extractConfigFromUnzippedBackupV3(String backupName) {
-        File v3BasePath = getV3BasePath();
-        String v3Dir = backupName.substring(0, backupName.lastIndexOf('.'));
-        String configFilePath = v3BasePath + "/" + v3Dir + "/" + configFileName;
-        File v3Path = new File(v3BasePath.getAbsolutePath(), v3Dir);
-        if (!v3Path.isDirectory()) v3Path.mkdirs();
-
-        File configFile = new File(configFilePath);
-        try {
-            FileInputStream fis = new FileInputStream(configFile);
-            FileChannel fc = fis.getChannel();
-            MappedByteBuffer bb = fc.map(FileChannel.MapMode.READ_ONLY, 0, fc.size());
-            String jsonString = Charset.defaultCharset().decode(bb).toString();
-            JSONObject savedValues = new JSONObject(jsonString);
-            ContentValues fields = new ContentValues();
-
-            int port = savedValues.getInt(OnionServiceContentProvider.OnionService.PORT);
-            fields.put(OnionServiceContentProvider.OnionService.PORT, port);
-            fields.put(OnionServiceContentProvider.OnionService.NAME, savedValues.getString(OnionServiceContentProvider.OnionService.NAME));
-            fields.put(OnionServiceContentProvider.OnionService.ONION_PORT, savedValues.getInt(OnionServiceContentProvider.OnionService.ONION_PORT));
-            fields.put(OnionServiceContentProvider.OnionService.DOMAIN, savedValues.getString(OnionServiceContentProvider.OnionService.DOMAIN));
-            fields.put(OnionServiceContentProvider.OnionService.CREATED_BY_USER, savedValues.getInt(OnionServiceContentProvider.OnionService.CREATED_BY_USER));
-            fields.put(OnionServiceContentProvider.OnionService.ENABLED, savedValues.getInt(OnionServiceContentProvider.OnionService.ENABLED));
-
-            Cursor dbService = mResolver.query(OnionServiceContentProvider.CONTENT_URI, OnionServiceContentProvider.PROJECTION,
-                    OnionServiceContentProvider.OnionService.PORT + "=" + port, null, null);
-            if (dbService == null || dbService.getCount() == 0)
-                mResolver.insert(OnionServiceContentProvider.CONTENT_URI, fields);
-            else
-                mResolver.update(OnionServiceContentProvider.CONTENT_URI, fields, OnionServiceContentProvider.OnionService.PORT + "=" + port, null);
-            dbService.close();
-
-            configFile.delete();
-            if (v3Path.renameTo(new File(v3BasePath, "/v3" + port))) {
-                Toast.makeText(mContext, R.string.backup_restored, Toast.LENGTH_LONG).show();
-            } else {
-                // collision, clean up files
-                for (File file : v3Path.listFiles())
-                    file.delete();
-                v3Path.delete();
-                Toast.makeText(mContext, mContext.getString(R.string.backup_port_exist, port), Toast.LENGTH_LONG).show();
-            }
-        } catch (IOException | JSONException e) {
-            e.printStackTrace();
-            Toast.makeText(mContext, R.string.error, Toast.LENGTH_LONG).show();
-        }
-    }
-
-    private void extractConfigFromUnzippedBackupV2(String backupName) {
-        File mHSBasePath = getHSBasePath();
-        int port;
-        String hsDir = backupName.substring(0, backupName.lastIndexOf('.'));
-        String configFilePath = mHSBasePath + "/" + hsDir + "/" + configFileName;
-        String jString;
-
-        File hsPath = new File(mHSBasePath.getAbsolutePath(), hsDir);
-        if (!hsPath.isDirectory())
-            hsPath.mkdirs();
-
-        File config = new File(configFilePath);
-        FileInputStream stream;
-
-        try {
-            stream = new FileInputStream(config);
-            FileChannel fc = stream.getChannel();
-            MappedByteBuffer bb = fc.map(FileChannel.MapMode.READ_ONLY, 0, fc.size());
-            jString = Charset.defaultCharset().decode(bb).toString();
-            stream.close();
-
-            JSONObject savedValues = new JSONObject(jString);
-            ContentValues fields = new ContentValues();
-
-            fields.put(HSContentProvider.HiddenService.NAME, savedValues.getString(HSContentProvider.HiddenService.NAME));
-            fields.put(HSContentProvider.HiddenService.ONION_PORT, savedValues.getInt(HSContentProvider.HiddenService.ONION_PORT));
-            fields.put(HSContentProvider.HiddenService.DOMAIN, savedValues.getString(HSContentProvider.HiddenService.DOMAIN));
-            fields.put(HSContentProvider.HiddenService.AUTH_COOKIE, savedValues.getInt(HSContentProvider.HiddenService.AUTH_COOKIE));
-            fields.put(HSContentProvider.HiddenService.CREATED_BY_USER, savedValues.getInt(HSContentProvider.HiddenService.CREATED_BY_USER));
-            fields.put(HSContentProvider.HiddenService.ENABLED, savedValues.getInt(HSContentProvider.HiddenService.ENABLED));
-
-            port = savedValues.getInt(HSContentProvider.HiddenService.PORT);
-            fields.put(HSContentProvider.HiddenService.PORT, port);
-
-            Cursor service = mResolver.query(
-                    HSContentProvider.CONTENT_URI,
-                    HSContentProvider.PROJECTION,
-                    HSContentProvider.HiddenService.PORT + "=" + port,
-                    null,
-                    null
-            );
-
-            if (service == null || service.getCount() == 0) {
-                mResolver.insert(HSContentProvider.CONTENT_URI, fields);
-            } else {
-                mResolver.update(
-                        HSContentProvider.CONTENT_URI,
-                        fields,
-                        HSContentProvider.HiddenService.PORT + "=" + port,
-                        null
-                );
-
-                service.close();
-            }
-            Toast.makeText(mContext, R.string.backup_restored, Toast.LENGTH_LONG).show();
-        } catch (IOException | JSONException e) {
-            e.printStackTrace();
-            Toast.makeText(mContext, R.string.error, Toast.LENGTH_LONG).show();
-        }
-    }
-
-    private File getHSBasePath() {
-        return new File(mContext.getFilesDir().getAbsolutePath(), TorServiceConstants.HIDDEN_SERVICES_DIR);
-    }
-
-    private File getV3BasePath() {
-        return new File(mContext.getFilesDir().getAbsolutePath(), TorServiceConstants.ONION_SERVICES_DIR);
-    }
-
-    public void restoreZipBackupV2Legacy(File zipFile) {
-        String backupName = zipFile.getName();
-        ZipUtilities zip = new ZipUtilities(null, null, mResolver);
-        String hsDir = backupName.substring(0, backupName.lastIndexOf('.'));
-        File hsPath = new File(getHSBasePath().getAbsolutePath(), hsDir);
-        if (zip.unzipLegacy(hsPath.getAbsolutePath(), zipFile))
-            extractConfigFromUnzippedBackupV2(backupName);
-        else
-            Toast.makeText(mContext, R.string.error, Toast.LENGTH_LONG).show();
-    }
-
-    public void restoreZipBackupV3Legacy(File zipFile) {
-        String backupName = zipFile.getName();
-        ZipUtilities zip = new ZipUtilities(null, null, mResolver);
-        String v3Dir = backupName.substring(0, backupName.lastIndexOf('.'));
-        File v3Path = new File(getV3BasePath().getAbsolutePath(), v3Dir);
-        if (zip.unzipLegacy(v3Path.getAbsolutePath(), zipFile))
-            extractConfigFromUnzippedBackupV3(backupName);
-        else
-            Toast.makeText(mContext, R.string.error, Toast.LENGTH_LONG).show();
-    }
-
-
-    public void restoreZipBackupV2(Uri zipUri) {
-        Cursor returnCursor = mResolver.query(zipUri, null, null, null, null);
-        int nameIndex = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
-        returnCursor.moveToFirst();
-        String backupName = returnCursor.getString(nameIndex);
-        returnCursor.close();
-
-        String hsDir = backupName.substring(0, backupName.lastIndexOf('.'));
-        File hsPath = new File(getHSBasePath().getAbsolutePath(), hsDir);
-        if (new ZipUtilities(null, zipUri, mResolver).unzip(hsPath.getAbsolutePath()))
-            extractConfigFromUnzippedBackupV2(backupName);
-        else
-            Toast.makeText(mContext, R.string.error, Toast.LENGTH_LONG).show();
-    }
-
-    public void restoreZipBackupV3(Uri zipUri) {
-        Cursor returnCursor = mResolver.query(zipUri, null, null, null, null);
-        int nameIndex = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
-        returnCursor.moveToFirst();
-        String backupName = returnCursor.getString(nameIndex);
-        returnCursor.close();
-
-        String v3Dir = backupName.substring(0, backupName.lastIndexOf('.'));
-        File v3Path = new File(getV3BasePath().getAbsolutePath(), v3Dir);
-        if (new ZipUtilities(null, zipUri, mResolver).unzip(v3Path.getAbsolutePath()))
-            extractConfigFromUnzippedBackupV3(backupName);
-        else
-            Toast.makeText(mContext, R.string.error, Toast.LENGTH_LONG).show();
-    }
-
-    public void restoreKeyBackup(int hsPort, Uri hsKeyPath) {
-        File mHSBasePath = new File(
-                mContext.getFilesDir().getAbsolutePath(),
-                TorServiceConstants.HIDDEN_SERVICES_DIR
-        );
-
-        File serviceDir = new File(mHSBasePath, "hs" + hsPort);
-
-        if (!serviceDir.isDirectory())
-            serviceDir.mkdirs();
-
-        try {
-            ParcelFileDescriptor mInputPFD = mContext.getContentResolver().openFileDescriptor(hsKeyPath, "r");
-            InputStream fileStream = new FileInputStream(mInputPFD.getFileDescriptor());
-            OutputStream file = new FileOutputStream(serviceDir.getAbsolutePath() + "/private_key");
-
-            byte[] buffer = new byte[1024];
-            int length;
-            while ((length = fileStream.read(buffer)) > 0) {
-                file.write(buffer, 0, length);
-            }
-            file.close();
-
-        } catch (IOException | NullPointerException e) {
-            e.printStackTrace();
-        }
-    }
-
-
-    public void restoreClientAuthBackup(String authFileContents) {
-        ContentValues fields = new ContentValues();
-        String[] split = authFileContents.split(":");
-        if (split.length != 4) {
-            Toast.makeText(mContext, R.string.error, Toast.LENGTH_LONG).show();
-            return;
-        }
-        fields.put(ClientAuthContentProvider.V3ClientAuth.DOMAIN, split[0]);
-        fields.put(ClientAuthContentProvider.V3ClientAuth.HASH, split[3]);
-        mResolver.insert(ClientAuthContentProvider.CONTENT_URI, fields);
-        Toast.makeText(mContext, R.string.backup_restored, Toast.LENGTH_LONG).show();
-    }
-
-    public void restoreCookieBackup(String jString) {
-        try {
-            JSONObject savedValues = new JSONObject(jString);
-            ContentValues fields = new ContentValues();
-
-            fields.put(CookieContentProvider.ClientCookie.DOMAIN, savedValues.getString(CookieContentProvider.ClientCookie.DOMAIN));
-            fields.put(CookieContentProvider.ClientCookie.AUTH_COOKIE_VALUE, savedValues.getString(CookieContentProvider.ClientCookie.AUTH_COOKIE_VALUE));
-            fields.put(CookieContentProvider.ClientCookie.ENABLED, savedValues.getInt(CookieContentProvider.ClientCookie.ENABLED));
-
-            mResolver.insert(CookieContentProvider.CONTENT_URI, fields);
-            Toast.makeText(mContext, R.string.backup_restored, Toast.LENGTH_LONG).show();
-
-        } catch (JSONException e) {
-            e.printStackTrace();
-            Toast.makeText(mContext, R.string.error, Toast.LENGTH_LONG).show();
-        }
-    }
-}
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/database/HSDatabase.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/database/HSDatabase.java
deleted file mode 100644
index d9a398bd..00000000
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/database/HSDatabase.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.torproject.android.ui.hiddenservices.database;
-
-
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-
-public class HSDatabase extends SQLiteOpenHelper {
-
-    public static final String HS_DATA_TABLE_NAME = "hs_data";
-    public static final String HS_CLIENT_COOKIE_TABLE_NAME = "hs_client_cookie";
-    private static final int DATABASE_VERSION = 4;
-    private static final String DATABASE_NAME = "hidden_services";
-    private static final String HS_DATA_TABLE_CREATE =
-            "CREATE TABLE " + HS_DATA_TABLE_NAME + " (" +
-                    "_id INTEGER PRIMARY KEY AUTOINCREMENT, " +
-                    "name TEXT, " +
-                    "domain TEXT, " +
-                    "onion_port INTEGER, " +
-                    "auth_cookie INTEGER DEFAULT 0, " +
-                    "auth_cookie_value TEXT, " +
-                    "created_by_user INTEGER DEFAULT 0, " +
-                    "enabled INTEGER DEFAULT 1, " +
-                    "port INTEGER, " +
-                    "filepath TEXT);";
-
-    private static final String HS_CLIENT_COOKIE_TABLE_CREATE =
-            "CREATE TABLE " + HS_CLIENT_COOKIE_TABLE_NAME + " (" +
-                    "_id INTEGER PRIMARY KEY AUTOINCREMENT, " +
-                    "domain TEXT, " +
-                    "auth_cookie_value TEXT, " +
-                    "enabled INTEGER DEFAULT 1);";
-
-    public HSDatabase(Context context) {
-        super(context, DATABASE_NAME, null, DATABASE_VERSION);
-    }
-
-    @Override
-    public void onCreate(SQLiteDatabase db) {
-        db.execSQL(HS_DATA_TABLE_CREATE);
-        db.execSQL(HS_CLIENT_COOKIE_TABLE_CREATE);
-    }
-
-    @Override
-    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        if (newVersion > oldVersion) {
-            db.execSQL("ALTER TABLE " + HS_DATA_TABLE_NAME + " ADD COLUMN filepath TEXT");
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java
deleted file mode 100644
index 1da1d1e4..00000000
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.torproject.android.ui.hiddenservices.dialogs;
-
-import android.app.Dialog;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextUtils;
-import android.text.TextWatcher;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.DialogFragment;
-
-import org.torproject.android.R;
-import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
-import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
-
-public class AddCookieDialog extends DialogFragment {
-
-    private EditText etOnion, etCookie;
-    private TextWatcher inputValidator;
-
-    @NonNull
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        final View dialogView = getActivity().getLayoutInflater().inflate(R.layout.layout_add_client_cookie_dialog, null);
-        final AlertDialog ad = new AlertDialog.Builder(getActivity())
-                .setView(dialogView)
-                .setTitle(R.string.client_cookies)
-                .setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.dismiss())
-                .setPositiveButton(R.string.save, (dialog, which) -> doSave(getContext()))
-                .create();
-
-        etOnion = dialogView.findViewById(R.id.cookie_onion);
-        etCookie = dialogView.findViewById(R.id.cookie_value);
-
-        inputValidator = new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                ad.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(checkInput());
-            }
-        };
-
-        etOnion.addTextChangedListener(inputValidator);
-        etCookie.addTextChangedListener(inputValidator);
-
-        return ad;
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        inputValidator.afterTextChanged(null); // set positive button to be initially disabled
-    }
-    private void doSave(Context context) {
-        saveData(etOnion.getText().toString(), etCookie.getText().toString());
-        Toast.makeText(context, R.string.please_restart_Orbot_to_enable_the_changes, Toast.LENGTH_LONG).show();
-    }
-
-    private boolean checkInput() {
-        String onion = etOnion.getText().toString();
-        String cookie = etCookie.getText().toString();
-        if (TextUtils.isEmpty(onion.trim()) || TextUtils.isEmpty(cookie.trim())) return false;
-        return isV2OnionAddressValid(onion);
-    }
-
-    private static boolean isV2OnionAddressValid(String onionToTest) {
-        return onionToTest.matches("([a-z0-9]{16}).onion");
-    }
-
-    private void saveData(String domain, String cookie) {
-        ContentValues fields = new ContentValues();
-        fields.put(CookieContentProvider.ClientCookie.DOMAIN, domain);
-        fields.put(CookieContentProvider.ClientCookie.AUTH_COOKIE_VALUE, cookie);
-
-        ContentResolver cr = getContext().getContentResolver();
-
-        cr.insert(CookieContentProvider.CONTENT_URI, fields);
-    }
-}
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieActionsDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieActionsDialog.java
deleted file mode 100644
index d3286ab1..00000000
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieActionsDialog.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package org.torproject.android.ui.hiddenservices.dialogs;
-
-import android.app.Activity;
-import android.app.Dialog;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.ParcelFileDescriptor;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.DialogFragment;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.torproject.android.R;
-import org.torproject.android.core.DiskUtils;
-import org.torproject.android.ui.hiddenservices.ClientCookiesActivity;
-import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-
-public class CookieActionsDialog extends DialogFragment {
-    private static final int REQUEST_CODE_WRITE_FILE = 123;
-    private String domain;
-    private String cookie;
-    private int enabled;
-
-    @NonNull
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        final Bundle arguments = getArguments();
-        domain = arguments.getString(ClientCookiesActivity.BUNDLE_KEY_DOMAIN);
-        cookie = arguments.getString(ClientCookiesActivity.BUNDLE_KEY_COOKIE);
-        enabled = arguments.getInt(ClientCookiesActivity.BUNDLE_KEY_ENABLED);
-
-        AlertDialog ad = new AlertDialog.Builder(getActivity())
-                .setTitle(R.string.client_cookies)
-                .setItems(new CharSequence[]{
-                        getString(R.string.backup_cookie),
-                        getString(R.string.delete_cookie)
-                }, null)
-                .setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.dismiss())
-                .create();
-
-        ad.getListView().setOnItemClickListener((parent, view, position, id) -> {
-            if (position == 0) doBackup();
-            else {
-                doDelete(arguments);
-                ad.dismiss();
-            }
-        });
-
-        return ad;
-    }
-
-    private void doDelete(Bundle arguments) {
-        CookieDeleteDialog dialog = new CookieDeleteDialog();
-        dialog.setArguments(arguments);
-        dialog.show(getFragmentManager(), "CookieDeleteDialog");
-        dismiss();
-    }
-
-    private void doBackup() {
-        String filename = domain.replace(".onion", ".json");
-        if (DiskUtils.supportsStorageAccessFramework()) {
-            Intent createFile = DiskUtils.createWriteFileIntent(filename, "application/json");
-            startActivityForResult(createFile, REQUEST_CODE_WRITE_FILE);
-        } else { // API 16, 17, and 18
-            int msg = R.string.backup_saved_at_external_storage;
-            try {
-                File externalStorage = DiskUtils.getOrCreateLegacyBackupDir(getString(R.string.app_name));
-                String backupFile = externalStorage.getAbsolutePath() + "/" + filename;
-                String data = createBackupData();
-                FileWriter writer = new FileWriter(backupFile);
-                writer.write(data);
-                writer.close();
-            } catch (JSONException | IOException e) {
-                msg = R.string.error;
-            }
-            Toast.makeText(getContext(), msg, Toast.LENGTH_LONG).show();
-            dismiss();
-        }
-    }
-
-    private String createBackupData() throws JSONException {
-        JSONObject backup = new JSONObject();
-        backup.put(CookieContentProvider.ClientCookie.DOMAIN, domain);
-        backup.put(CookieContentProvider.ClientCookie.AUTH_COOKIE_VALUE, cookie);
-        backup.put(CookieContentProvider.ClientCookie.ENABLED, enabled);
-        return backup.toString();
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == REQUEST_CODE_WRITE_FILE && resultCode == Activity.RESULT_OK) {
-            if (data != null) {
-                int msg = R.string.backup_saved_at_external_storage;
-                Uri file = data.getData();
-                try {
-                    ParcelFileDescriptor pfd = getActivity().getContentResolver().openFileDescriptor(file, "w");
-                    FileOutputStream fileOutputStream = new FileOutputStream(pfd.getFileDescriptor());
-                    fileOutputStream.write(createBackupData().getBytes());
-                    fileOutputStream.close(); // Let the document provider know you're done by closing the stream
-                    pfd.close();
-                } catch (JSONException | IOException e) {
-                    e.printStackTrace();
-                    msg = R.string.error;
-                }
-                dismiss();
-                Toast.makeText(getContext(), msg, Toast.LENGTH_LONG).show();
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieDeleteDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieDeleteDialog.java
deleted file mode 100644
index fd596578..00000000
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieDeleteDialog.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.torproject.android.ui.hiddenservices.dialogs;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.DialogFragment;
-
-import org.torproject.android.R;
-import org.torproject.android.ui.hiddenservices.ClientCookiesActivity;
-import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
-
-public class CookieDeleteDialog extends DialogFragment {
-
-    @NonNull
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        final Bundle arguments = getArguments();
-        final Context context = getContext();
-
-        return new AlertDialog.Builder(context)
-                .setTitle(R.string.confirm_cookie_deletion)
-                .setPositiveButton(android.R.string.ok, (dialog, which) -> doDelete(arguments, context))
-                .setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.cancel())
-                .create();
-    }
-
-    private void doDelete(Bundle arguments, Context context) {
-        context.getContentResolver().delete( // delete from db
-                CookieContentProvider.CONTENT_URI,
-                CookieContentProvider.ClientCookie._ID + "=" + arguments.getInt(ClientCookiesActivity.BUNDLE_KEY_ID),
-                null
-        );
-    }
-}
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSActionsDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSActionsDialog.java
deleted file mode 100644
index 8d319324..00000000
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSActionsDialog.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package org.torproject.android.ui.hiddenservices.dialogs;
-
-import android.app.Activity;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.text.Html;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.DialogFragment;
-
-import org.torproject.android.R;
-import org.torproject.android.core.ClipboardUtils;
-import org.torproject.android.core.DiskUtils;
-import org.torproject.android.ui.hiddenservices.HiddenServicesActivity;
-import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
-
-import java.io.File;
-
-public class HSActionsDialog extends DialogFragment {
-    private static final int REQUEST_CODE_WRITE_FILE = 123;
-    private int port;
-
-    @NonNull
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        final Bundle arguments = getArguments();
-        port = Integer.parseInt(arguments.getString(HiddenServicesActivity.BUNDLE_KEY_PORT));
-        AlertDialog ad = new AlertDialog.Builder(getActivity())
-                .setItems(new CharSequence[]{
-                        getString(R.string.copy_address_to_clipboard),
-                        getString(R.string.show_auth_cookie),
-                        Html.fromHtml(getString(R.string.backup_service)),
-                        getString(R.string.delete_service)}, null)
-                .setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.dismiss())
-                .setTitle(R.string.hidden_services)
-                .create();
-
-        // done this way so we can startActivityForResult on backup without the dialog vanishing
-        ad.getListView().setOnItemClickListener((parent, view, position, id) -> {
-            if (position == 0) doCopy(arguments, getContext());
-            else if (position == 1) doShowAuthCookie(arguments, getContext());
-            else if (position == 2) doBackup(arguments, getContext());
-            else if (position == 3) doDelete(arguments);
-            if (position != 2) dismiss();
-        });
-
-        return ad;
-    }
-
-    private void doDelete(Bundle arguments) {
-        HSDeleteDialog dialog = new HSDeleteDialog();
-        dialog.setArguments(arguments);
-        dialog.show(getFragmentManager(), "HSDeleteDialog");
-    }
-
-    private void doShowAuthCookie(Bundle arguments, Context context) {
-        String auth_cookie_value = arguments.getString(HiddenServicesActivity.BUNDLE_KEY_AUTH_COOKIE_VALUE);
-
-        if (arguments.getInt(HiddenServicesActivity.BUNDLE_KEY_AUTH_COOKIE) == 1) {
-            if (auth_cookie_value == null || auth_cookie_value.length() < 1) {
-                Toast.makeText(context, R.string.please_restart_Orbot_to_enable_the_changes, Toast.LENGTH_LONG).show();
-            } else {
-                HSCookieDialog dialog = new HSCookieDialog();
-                dialog.setArguments(arguments);
-                dialog.show(getFragmentManager(), "HSCookieDialog");
-            }
-        } else {
-            Toast.makeText(context, R.string.auth_cookie_was_not_configured, Toast.LENGTH_LONG).show();
-        }
-    }
-
-    private void doCopy(Bundle arguments, Context context) {
-        String onion = arguments.getString(HiddenServicesActivity.BUNDLE_KEY_ONION);
-        if (onion == null)
-            Toast.makeText(context, R.string.please_restart_Orbot_to_enable_the_changes, Toast.LENGTH_LONG).show();
-        else
-            ClipboardUtils.copyToClipboard("onion", onion, getString(R.string.done), context);
-    }
-
-    private void doBackup(Bundle arguments, Context context) {
-        String filename = "hs" + port + ".zip";
-        String onion = arguments.getString(HiddenServicesActivity.BUNDLE_KEY_ONION);
-        if (onion == null) {
-            Toast.makeText(context, R.string.please_restart_Orbot_to_enable_the_changes, Toast.LENGTH_LONG).show();
-            return;
-        }
-        if (DiskUtils.supportsStorageAccessFramework()) {
-            Intent createFile = DiskUtils.createWriteFileIntent(filename, "application/zip");
-            startActivityForResult(createFile, REQUEST_CODE_WRITE_FILE);
-        } else { // API 16, 17, 18
-            attemptToWriteBackup(Uri.fromFile(new File(DiskUtils.getOrCreateLegacyBackupDir(getString(R.string.app_name)), filename)));
-        }
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == REQUEST_CODE_WRITE_FILE && resultCode == Activity.RESULT_OK) {
-            if (data != null) {
-                attemptToWriteBackup(data.getData());
-            }
-        }
-    }
-
-    private void attemptToWriteBackup(Uri outputFile) {
-        String path = getArguments().getString(HiddenServicesActivity.BUNDLE_KEY_PATH);
-        BackupUtils backupUtils = new BackupUtils(getContext());
-        String backup = backupUtils.createV2ZipBackup(port, path, outputFile);
-        Toast.makeText(getContext(), backup != null ? R.string.backup_saved_at_external_storage : R.string.error, Toast.LENGTH_LONG).show();
-        dismiss();
-    }
-
-}
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSCookieDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSCookieDialog.java
deleted file mode 100644
index 2bc29e59..00000000
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSCookieDialog.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.torproject.android.ui.hiddenservices.dialogs;
-
-import android.app.Dialog;
-import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.DialogFragment;
-
-import com.google.zxing.integration.android.IntentIntegrator;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.torproject.android.R;
-import org.torproject.android.core.ClipboardUtils;
-import org.torproject.android.ui.hiddenservices.HiddenServicesActivity;
-import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
-
-public class HSCookieDialog extends DialogFragment {
-    private String authCookieValue, onion;
-
-    @NonNull
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        final Bundle arguments = getArguments();
-        authCookieValue = arguments.getString(HiddenServicesActivity.BUNDLE_KEY_AUTH_COOKIE_VALUE);
-        onion = arguments.getString(HiddenServicesActivity.BUNDLE_KEY_ONION);
-        return new AlertDialog.Builder(getActivity())
-                .setTitle(authCookieValue)
-                .setItems(new CharSequence[]{
-                        getString(R.string.copy_cookie_to_clipboard),
-                        getString(R.string.share_as_qr)
-                }, (dialog, which) -> {
-                    if (which == 0) doCopy();
-                    else if (which == 1) doShareQr();
-                })
-                .setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.dismiss())
-                .create();
-    }
-
-    private void doShareQr() {
-        try {
-            JSONObject backup = new JSONObject();
-            backup.put(CookieContentProvider.ClientCookie.DOMAIN, onion);
-            backup.put(CookieContentProvider.ClientCookie.AUTH_COOKIE_VALUE, authCookieValue);
-            new IntentIntegrator(getActivity()).shareText(backup.toString());
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void doCopy() {
-        if (authCookieValue != null)
-            ClipboardUtils.copyToClipboard("cookie", authCookieValue, getString(R.string.done), getContext());
-    }
-
-}
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java
deleted file mode 100644
index fdd513c8..00000000
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.torproject.android.ui.hiddenservices.dialogs;
-
-import android.app.Dialog;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextUtils;
-import android.text.TextWatcher;
-import android.view.View;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.EditText;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.DialogFragment;
-
-import org.torproject.android.R;
-import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
-
-public class HSDataDialog extends DialogFragment {
-
-    private EditText etServer, etLocalPort, etOnionPort;
-    private TextWatcher inputValidator;
-
-    @NonNull
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        final View dialogView = getActivity().getLayoutInflater().inflate(R.layout.layout_hs_data_dialog, null);
-        etServer = dialogView.findViewById(R.id.hsName);
-        etLocalPort = dialogView.findViewById(R.id.hsLocalPort);
-        etOnionPort = dialogView.findViewById(R.id.hsOnionPort);
-        AlertDialog ad = new AlertDialog.Builder(getActivity())
-                .setTitle(R.string.hidden_services)
-                .setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.cancel())
-                .setPositiveButton(R.string.save, (dialog, which) -> doSave(dialogView, getContext()))
-                .setView(dialogView)
-                .create();
-
-        inputValidator = new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                Button btn = ad.getButton(AlertDialog.BUTTON_POSITIVE);
-                try {
-                    int localPort = Integer.parseInt(etLocalPort.getText().toString());
-                    int onionPort = Integer.parseInt(etOnionPort.getText().toString());
-                    btn.setEnabled(checkInput(localPort, onionPort));
-                } catch (NumberFormatException nfe) {
-                    btn.setEnabled(false);
-                }
-            }
-        };
-
-        etOnionPort.addTextChangedListener(inputValidator);
-        etLocalPort.addTextChangedListener(inputValidator);
-        etServer.addTextChangedListener(inputValidator);
-
-        return ad;
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        inputValidator.afterTextChanged(null); // initially disable positive button
-    }
-
-    private void doSave(View dialogView, Context context) {
-        String serverName = etServer.getText().toString().trim();
-        int localPort = Integer.parseInt(etLocalPort.getText().toString());
-        int onionPort = Integer.parseInt(etOnionPort.getText().toString());
-        boolean authCookie = ((CheckBox) dialogView.findViewById(R.id.hsAuth)).isChecked();
-        saveData(serverName, localPort, onionPort, authCookie);
-        Toast.makeText(context, R.string.please_restart_Orbot_to_enable_the_changes, Toast.LENGTH_LONG).show();
-    }
-
-    private boolean checkInput(int local, int remote) {
-        if ((local < 1 || local > 65535) || (remote < 1 || remote > 65535)) return false;
-        return !TextUtils.isEmpty(etServer.getText().toString().trim());
-    }
-
-    private void saveData(String name, int local, int remote, boolean authCookie) {
-        ContentValues fields = new ContentValues();
-        fields.put(HSContentProvider.HiddenService.NAME, name);
-        fields.put(HSContentProvider.HiddenService.PORT, local);
-        fields.put(HSContentProvider.HiddenService.ONION_PORT, remote);
-        fields.put(HSContentProvider.HiddenService.AUTH_COOKIE, authCookie);
-        fields.put(HSContentProvider.HiddenService.CREATED_BY_USER, 1);
-
-        ContentResolver cr = getContext().getContentResolver();
-
-        cr.insert(HSContentProvider.CONTENT_URI, fields);
-    }
-}
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java
deleted file mode 100644
index 065f68e3..00000000
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.torproject.android.ui.hiddenservices.dialogs;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.DialogFragment;
-
-import org.torproject.android.R;
-import org.torproject.android.service.TorServiceConstants;
-import org.torproject.android.ui.hiddenservices.HiddenServicesActivity;
-import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
-
-import java.io.File;
-
-public class HSDeleteDialog extends DialogFragment {
-
-    @NonNull
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        return new AlertDialog.Builder(getContext())
-                .setTitle(R.string.confirm_service_deletion)
-                .setPositiveButton(android.R.string.ok, (dialog, which) -> doDelete(getArguments(), getContext()))
-                .setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.cancel())
-                .create();
-    }
-
-    private void doDelete(Bundle arguments, Context context) {
-        context.getContentResolver().delete(HSContentProvider.CONTENT_URI,
-                HSContentProvider.HiddenService._ID + "=" + arguments.getInt(HiddenServicesActivity.BUNDLE_KEY_ID), null);
-
-        // Delete from internal storage
-        String base = context.getFilesDir().getAbsolutePath() + "/" + TorServiceConstants.HIDDEN_SERVICES_DIR;
-        File dir = new File(base, arguments.getString(HiddenServicesActivity.BUNDLE_KEY_PATH));
-
-        if (dir.isDirectory()) {
-            String[] children = dir.list();
-            for (String aChildren : children) {
-                new File(dir, aChildren).delete();
-            }
-            dir.delete();
-        }
-    }
-}
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/CookieContentProvider.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/CookieContentProvider.java
deleted file mode 100644
index 26a6d9d6..00000000
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/CookieContentProvider.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package org.torproject.android.ui.hiddenservices.providers;
-
-import android.content.ContentProvider;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.UriMatcher;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.net.Uri;
-import android.provider.BaseColumns;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import org.torproject.android.ui.hiddenservices.database.HSDatabase;
-
-
-public class CookieContentProvider extends ContentProvider {
-    public static final String[] PROJECTION = new String[]{
-            ClientCookie._ID,
-            ClientCookie.DOMAIN,
-            ClientCookie.AUTH_COOKIE_VALUE,
-            ClientCookie.ENABLED
-    };
-    private static final String AUTH = "org.torproject.android.ui.hiddenservices.providers.cookie";
-    public static final Uri CONTENT_URI =
-            Uri.parse("content://" + AUTH + "/cookie");
-    //UriMatcher
-    private static final int COOKIES = 1;
-    private static final int COOKIE_ID = 2;
-
-    private static final UriMatcher uriMatcher;
-
-    static {
-        uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
-        uriMatcher.addURI(AUTH, "hs", COOKIES);
-        uriMatcher.addURI(AUTH, "hs/#", COOKIE_ID);
-    }
-
-    private HSDatabase mServervices;
-    private Context mContext;
-
-    @Override
-    public boolean onCreate() {
-        mContext = getContext();
-        mServervices = new HSDatabase(mContext);
-        return true;
-    }
-
-    @Nullable
-    @Override
-    public Cursor query(@NonNull Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
-        String where = selection;
-        if (uriMatcher.match(uri) == COOKIE_ID) {
-            where = "_id=" + uri.getLastPathSegment();
-        }
-
-        SQLiteDatabase db = mServervices.getReadableDatabase();
-
-        return db.query(HSDatabase.HS_CLIENT_COOKIE_TABLE_NAME, projection, where,
-                selectionArgs, null, null, sortOrder);
-    }
-
-    @Nullable
-    @Override
-    public String getType(@NonNull Uri uri) {
-        int match = uriMatcher.match(uri);
-
-        switch (match) {
-            case COOKIES:
-                return "vnd.android.cursor.dir/vnd.torproject.cookies";
-            case COOKIE_ID:
-                return "vnd.android.cursor.item/vnd.torproject.cookie";
-            default:
-                return null;
-        }
-    }
-
-    @Nullable
-    @Override
-    public Uri insert(@NonNull Uri uri, ContentValues values) {
-        long regId;
-
-        SQLiteDatabase db = mServervices.getWritableDatabase();
-
-        regId = db.insert(HSDatabase.HS_CLIENT_COOKIE_TABLE_NAME, null, values);
-
-        mContext.getContentResolver().notifyChange(CONTENT_URI, null);
-
-        return ContentUris.withAppendedId(CONTENT_URI, regId);
-    }
-
-    @Override
-    public int delete(@NonNull Uri uri, String selection, String[] selectionArgs) {
-
-        String where = selection;
-        if (uriMatcher.match(uri) == COOKIE_ID) {
-            where = "_id=" + uri.getLastPathSegment();
-        }
-
-        SQLiteDatabase db = mServervices.getWritableDatabase();
-
-        int rows = db.delete(HSDatabase.HS_CLIENT_COOKIE_TABLE_NAME, where, selectionArgs);
-
-        mContext.getContentResolver().notifyChange(CONTENT_URI, null);
-
-        return rows;
-
-    }
-
-    @Override
-    public int update(@NonNull Uri uri, ContentValues values, String selection, String[] selectionArgs) {
-        SQLiteDatabase db = mServervices.getWritableDatabase();
-
-        String where = selection;
-        if (uriMatcher.match(uri) == COOKIE_ID) {
-            where = "_id=" + uri.getLastPathSegment();
-        }
-
-        int rows = db.update(HSDatabase.HS_CLIENT_COOKIE_TABLE_NAME, values, where, null);
-        mContext.getContentResolver().notifyChange(CONTENT_URI, null);
-
-        return rows;
-    }
-
-    public static final class ClientCookie implements BaseColumns {
-        public static final String DOMAIN = "domain";
-        public static final String AUTH_COOKIE_VALUE = "auth_cookie_value";
-        public static final String ENABLED = "enabled";
-
-        private ClientCookie() {
-        }
-    }
-}
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java
deleted file mode 100644
index bc4e16b1..00000000
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package org.torproject.android.ui.hiddenservices.providers;
-
-import android.content.ContentProvider;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.UriMatcher;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.net.Uri;
-import android.provider.BaseColumns;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import org.torproject.android.ui.hiddenservices.database.HSDatabase;
-
-
-public class HSContentProvider extends ContentProvider {
-    public static final String[] PROJECTION = new String[]{
-            HiddenService._ID,
-            HiddenService.NAME,
-            HiddenService.PORT,
-            HiddenService.DOMAIN,
-            HiddenService.ONION_PORT,
-            HiddenService.AUTH_COOKIE,
-            HiddenService.AUTH_COOKIE_VALUE,
-            HiddenService.CREATED_BY_USER,
-            HiddenService.ENABLED,
-            HiddenService.PATH
-    };
-    private static final String AUTH = "org.torproject.android.ui.hiddenservices.providers";
-    public static final Uri CONTENT_URI = Uri.parse("content://" + AUTH + "/hs");
-    //UriMatcher
-    private static final int ONIONS = 1;
-    private static final int ONION_ID = 2;
-
-    private static final UriMatcher uriMatcher;
-
-    static {
-        uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
-        uriMatcher.addURI(AUTH, "hs", ONIONS);
-        uriMatcher.addURI(AUTH, "hs/#", ONION_ID);
-    }
-
-    private HSDatabase mServervices;
-    private Context mContext;
-
-    @Override
-    public boolean onCreate() {
-        mContext = getContext();
-        mServervices = new HSDatabase(mContext);
-        return true;
-    }
-
-    @Nullable
-    @Override
-    public Cursor query(@NonNull Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
-        String where = selection;
-        if (uriMatcher.match(uri) == ONION_ID) {
-            where = "_id=" + uri.getLastPathSegment();
-        }
-
-        SQLiteDatabase db = mServervices.getReadableDatabase();
-
-        return db.query(HSDatabase.HS_DATA_TABLE_NAME, projection, where, selectionArgs, null, null, sortOrder);
-    }
-
-    @Nullable
-    @Override
-    public String getType(@NonNull Uri uri) {
-        int match = uriMatcher.match(uri);
-
-        switch (match) {
-            case ONIONS:
-                return "vnd.android.cursor.dir/vnd.torproject.onions";
-            case ONION_ID:
-                return "vnd.android.cursor.item/vnd.torproject.onion";
-            default:
-                return null;
-        }
-    }
-
-    @Nullable
-    @Override
-    public Uri insert(@NonNull Uri uri, ContentValues values) {
-        long regId;
-
-        SQLiteDatabase db = mServervices.getWritableDatabase();
-
-        regId = db.insert(HSDatabase.HS_DATA_TABLE_NAME, null, values);
-
-        mContext.getContentResolver().notifyChange(CONTENT_URI, null);
-
-        return ContentUris.withAppendedId(CONTENT_URI, regId);
-    }
-
-    @Override
-    public int delete(@NonNull Uri uri, String selection, String[] selectionArgs) {
-
-        String where = selection;
-        if (uriMatcher.match(uri) == ONION_ID) {
-            where = "_id=" + uri.getLastPathSegment();
-        }
-
-        SQLiteDatabase db = mServervices.getWritableDatabase();
-
-        int rows = db.delete(HSDatabase.HS_DATA_TABLE_NAME, where, selectionArgs);
-
-        mContext.getContentResolver().notifyChange(CONTENT_URI, null);
-
-        return rows;
-
-    }
-
-    @Override
-    public int update(@NonNull Uri uri, ContentValues values, String selection, String[] selectionArgs) {
-        SQLiteDatabase db = mServervices.getWritableDatabase();
-
-        String where = selection;
-        if (uriMatcher.match(uri) == ONION_ID) {
-            where = "_id=" + uri.getLastPathSegment();
-        }
-
-        int rows = db.update(HSDatabase.HS_DATA_TABLE_NAME, values, where, null);
-        mContext.getContentResolver().notifyChange(CONTENT_URI, null);
-
-        return rows;
-    }
-
-    public static final class HiddenService implements BaseColumns {
-        public static final String NAME = "name";
-        public static final String PORT = "port";
-        public static final String ONION_PORT = "onion_port";
-        public static final String DOMAIN = "domain";
-        public static final String AUTH_COOKIE = "auth_cookie";
-        public static final String AUTH_COOKIE_VALUE = "auth_cookie_value";
-        public static final String CREATED_BY_USER = "created_by_user";
-        public static final String ENABLED = "enabled";
-        public static final String PATH = "filepath";
-
-        private HiddenService() {
-        }
-    }
-}
diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java
index 7868faf5..0e20ae20 100644
--- a/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java
@@ -14,7 +14,7 @@ import org.torproject.android.R;
 import org.torproject.android.core.LocaleHelper;
 import org.torproject.android.service.util.Prefs;
 import org.torproject.android.ui.AppManagerActivity;
-import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
+import org.torproject.android.ui.v3onionservice.PermissionManager;
 
 public class OnboardingActivity extends AppIntro {
 
diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceActionsDialogFragment.java b/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceActionsDialogFragment.java
index 6c1a8e95..c51612dd 100644
--- a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceActionsDialogFragment.java
+++ b/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceActionsDialogFragment.java
@@ -16,7 +16,6 @@ import androidx.fragment.app.DialogFragment;
 import org.torproject.android.R;
 import org.torproject.android.core.ClipboardUtils;
 import org.torproject.android.core.DiskUtils;
-import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
 
 import java.io.File;
 
@@ -88,8 +87,8 @@ public class OnionServiceActionsDialogFragment extends DialogFragment {
     private void attemptToWriteBackup(Uri outputFile) {
         String port = getArguments().getString(OnionServiceActivity.BUNDLE_KEY_PORT);
         String relativePath = getArguments().getString(OnionServiceActivity.BUNDLE_KEY_PATH);
-        BackupUtils backupUtils = new BackupUtils(getContext());
-        String backup = backupUtils.createV3ZipBackup(port, relativePath, outputFile);
+        V3BackupUtils v3BackupUtils = new V3BackupUtils(getContext());
+        String backup = v3BackupUtils.createV3ZipBackup(port, relativePath, outputFile);
         Toast.makeText(getContext(), backup != null ? R.string.backup_saved_at_external_storage : R.string.error, Toast.LENGTH_LONG).show();
         dismiss();
     }
diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceActivity.java b/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceActivity.java
index 88f05564..2e8c99bd 100644
--- a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceActivity.java
@@ -24,9 +24,6 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import org.torproject.android.R;
 import org.torproject.android.core.DiskUtils;
 import org.torproject.android.core.LocaleHelper;
-import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
-import org.torproject.android.ui.hiddenservices.backup.ZipUtilities;
-import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
 
 import java.io.File;
 
@@ -134,7 +131,7 @@ public class OnionServiceActivity extends AppCompatActivity {
 
         new AlertDialog.Builder(this)
                 .setTitle(R.string.restore_backup)
-                .setItems(fileNames, (dialog, which) -> new BackupUtils(this).restoreZipBackupV3Legacy(files[which]))
+                .setItems(fileNames, (dialog, which) -> new V3BackupUtils(this).restoreZipBackupV3Legacy(files[which]))
                 .show();
     }
 
@@ -142,7 +139,7 @@ public class OnionServiceActivity extends AppCompatActivity {
     protected void onActivityResult(int requestCode, int result, Intent data) {
         super.onActivityResult(requestCode, result, data);
         if (requestCode == REQUEST_CODE_READ_ZIP_BACKUP && result == RESULT_OK) {
-            new BackupUtils(this).restoreZipBackupV3(data.getData());
+            new V3BackupUtils(this).restoreZipBackupV3(data.getData());
         }
     }
 
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/permissions/PermissionManager.java b/app/src/main/java/org/torproject/android/ui/v3onionservice/PermissionManager.java
similarity index 97%
rename from app/src/main/java/org/torproject/android/ui/hiddenservices/permissions/PermissionManager.java
rename to app/src/main/java/org/torproject/android/ui/v3onionservice/PermissionManager.java
index 52c5dc20..7397ef8d 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/permissions/PermissionManager.java
+++ b/app/src/main/java/org/torproject/android/ui/v3onionservice/PermissionManager.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.hiddenservices.permissions;
+package org.torproject.android.ui.v3onionservice;
 
 import android.annotation.TargetApi;
 import android.content.Context;
diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/V3BackupUtils.java b/app/src/main/java/org/torproject/android/ui/v3onionservice/V3BackupUtils.java
new file mode 100644
index 00000000..1d584db0
--- /dev/null
+++ b/app/src/main/java/org/torproject/android/ui/v3onionservice/V3BackupUtils.java
@@ -0,0 +1,188 @@
+package org.torproject.android.ui.v3onionservice;
+
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.ParcelFileDescriptor;
+import android.provider.OpenableColumns;
+import android.widget.Toast;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.torproject.android.R;
+import org.torproject.android.service.OrbotService;
+import org.torproject.android.service.TorServiceConstants;
+import org.torproject.android.ui.v3onionservice.clientauth.ClientAuthContentProvider;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.charset.Charset;
+
+public class V3BackupUtils {
+    private static final String configFileName = "config.json";
+    private final Context mContext;
+    private final ContentResolver mResolver;
+
+    public V3BackupUtils(Context context) {
+        mContext = context;
+        mResolver = mContext.getContentResolver();
+    }
+
+    public String createV3ZipBackup(String port, String relativePath, Uri zipFile) {
+        String[] files = createFilesForZippingV3(relativePath);
+        ZipUtilities zip = new ZipUtilities(files, zipFile, mResolver);
+        if (!zip.zip()) return null;
+        return zipFile.getPath();
+    }
+
+    public String createV3AuthBackup(String domain, String keyHash, Uri backupFile) {
+        String fileText = OrbotService.buildV3ClientAuthFile(domain, keyHash);
+        try {
+            ParcelFileDescriptor pfd = mContext.getContentResolver().openFileDescriptor(backupFile, "w");
+            FileOutputStream fos = new FileOutputStream(pfd.getFileDescriptor());
+            fos.write(fileText.getBytes());
+            fos.close();
+            pfd.close();
+        } catch (IOException ioe) {
+            return null;
+        }
+        return backupFile.getPath();
+    }
+
+    // todo this doesn't export data for onions that orbot hosts which have authentication (not supported yet...)
+    private String[] createFilesForZippingV3(String relativePath) {
+        final String v3BasePath = getV3BasePath() + "/" + relativePath + "/";
+        final String hostnamePath = v3BasePath + "hostname",
+                configFilePath = v3BasePath + configFileName,
+                privKeyPath = v3BasePath + "hs_ed25519_secret_key",
+                pubKeyPath = v3BasePath + "hs_ed25519_public_key";
+
+        Cursor portData = mResolver.query(OnionServiceContentProvider.CONTENT_URI, OnionServiceContentProvider.PROJECTION,
+                OnionServiceContentProvider.OnionService.PATH + "=\"" + relativePath + "\"", null, null);
+
+        JSONObject config = new JSONObject();
+        try {
+            if (portData == null || portData.getCount() != 1)
+                return null;
+            portData.moveToNext();
+
+
+            config.put(OnionServiceContentProvider.OnionService.NAME, portData.getString(portData.getColumnIndex(OnionServiceContentProvider.OnionService.NAME)));
+            config.put(OnionServiceContentProvider.OnionService.PORT, portData.getString(portData.getColumnIndex(OnionServiceContentProvider.OnionService.PORT)));
+            config.put(OnionServiceContentProvider.OnionService.ONION_PORT, portData.getString(portData.getColumnIndex(OnionServiceContentProvider.OnionService.ONION_PORT)));
+            config.put(OnionServiceContentProvider.OnionService.DOMAIN, portData.getString(portData.getColumnIndex(OnionServiceContentProvider.OnionService.DOMAIN)));
+            config.put(OnionServiceContentProvider.OnionService.CREATED_BY_USER, portData.getString(portData.getColumnIndex(OnionServiceContentProvider.OnionService.CREATED_BY_USER)));
+            config.put(OnionServiceContentProvider.OnionService.ENABLED, portData.getString(portData.getColumnIndex(OnionServiceContentProvider.OnionService.ENABLED)));
+
+            portData.close();
+
+            FileWriter fileWriter = new FileWriter(configFilePath);
+            fileWriter.write(config.toString());
+            fileWriter.close();
+        } catch (JSONException | IOException ioe) {
+            ioe.printStackTrace();
+            return null;
+        }
+
+        return new String[]{hostnamePath, configFilePath, privKeyPath, pubKeyPath};
+    }
+
+    private void extractConfigFromUnzippedBackupV3(String backupName) {
+        File v3BasePath = getV3BasePath();
+        String v3Dir = backupName.substring(0, backupName.lastIndexOf('.'));
+        String configFilePath = v3BasePath + "/" + v3Dir + "/" + configFileName;
+        File v3Path = new File(v3BasePath.getAbsolutePath(), v3Dir);
+        if (!v3Path.isDirectory()) v3Path.mkdirs();
+
+        File configFile = new File(configFilePath);
+        try {
+            FileInputStream fis = new FileInputStream(configFile);
+            FileChannel fc = fis.getChannel();
+            MappedByteBuffer bb = fc.map(FileChannel.MapMode.READ_ONLY, 0, fc.size());
+            String jsonString = Charset.defaultCharset().decode(bb).toString();
+            JSONObject savedValues = new JSONObject(jsonString);
+            ContentValues fields = new ContentValues();
+
+            int port = savedValues.getInt(OnionServiceContentProvider.OnionService.PORT);
+            fields.put(OnionServiceContentProvider.OnionService.PORT, port);
+            fields.put(OnionServiceContentProvider.OnionService.NAME, savedValues.getString(OnionServiceContentProvider.OnionService.NAME));
+            fields.put(OnionServiceContentProvider.OnionService.ONION_PORT, savedValues.getInt(OnionServiceContentProvider.OnionService.ONION_PORT));
+            fields.put(OnionServiceContentProvider.OnionService.DOMAIN, savedValues.getString(OnionServiceContentProvider.OnionService.DOMAIN));
+            fields.put(OnionServiceContentProvider.OnionService.CREATED_BY_USER, savedValues.getInt(OnionServiceContentProvider.OnionService.CREATED_BY_USER));
+            fields.put(OnionServiceContentProvider.OnionService.ENABLED, savedValues.getInt(OnionServiceContentProvider.OnionService.ENABLED));
+
+            Cursor dbService = mResolver.query(OnionServiceContentProvider.CONTENT_URI, OnionServiceContentProvider.PROJECTION,
+                    OnionServiceContentProvider.OnionService.PORT + "=" + port, null, null);
+            if (dbService == null || dbService.getCount() == 0)
+                mResolver.insert(OnionServiceContentProvider.CONTENT_URI, fields);
+            else
+                mResolver.update(OnionServiceContentProvider.CONTENT_URI, fields, OnionServiceContentProvider.OnionService.PORT + "=" + port, null);
+            dbService.close();
+
+            configFile.delete();
+            if (v3Path.renameTo(new File(v3BasePath, "/v3" + port))) {
+                Toast.makeText(mContext, R.string.backup_restored, Toast.LENGTH_LONG).show();
+            } else {
+                // collision, clean up files
+                for (File file: v3Path.listFiles())
+                    file.delete();
+                v3Path.delete();
+                Toast.makeText(mContext, mContext.getString(R.string.backup_port_exist, port), Toast.LENGTH_LONG).show();
+            }
+        } catch (IOException | JSONException e) {
+            e.printStackTrace();
+            Toast.makeText(mContext, R.string.error, Toast.LENGTH_LONG).show();
+        }
+    }
+
+    private File getV3BasePath() {
+        return new File(mContext.getFilesDir().getAbsolutePath(), TorServiceConstants.ONION_SERVICES_DIR);
+    }
+
+    public void restoreZipBackupV3Legacy(File zipFile) {
+        String backupName = zipFile.getName();
+        ZipUtilities zip = new ZipUtilities(null, null, mResolver);
+        String v3Dir = backupName.substring(0, backupName.lastIndexOf('.'));
+        File v3Path = new File(getV3BasePath().getAbsolutePath(), v3Dir);
+        if (zip.unzipLegacy(v3Path.getAbsolutePath(), zipFile))
+            extractConfigFromUnzippedBackupV3(backupName);
+        else
+            Toast.makeText(mContext, R.string.error, Toast.LENGTH_LONG).show();
+    }
+
+    public void restoreZipBackupV3(Uri zipUri) {
+        Cursor returnCursor = mResolver.query(zipUri, null, null, null, null);
+        int nameIndex = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
+        returnCursor.moveToFirst();
+        String backupName = returnCursor.getString(nameIndex);
+        returnCursor.close();
+
+        String v3Dir = backupName.substring(0, backupName.lastIndexOf('.'));
+        File v3Path = new File(getV3BasePath().getAbsolutePath(), v3Dir);
+        if (new ZipUtilities(null, zipUri, mResolver).unzip(v3Path.getAbsolutePath()))
+            extractConfigFromUnzippedBackupV3(backupName);
+        else
+            Toast.makeText(mContext, R.string.error, Toast.LENGTH_LONG).show();
+    }
+
+    public void restoreClientAuthBackup(String authFileContents) {
+        ContentValues fields = new ContentValues();
+        String[] split = authFileContents.split(":");
+        if (split.length != 4) {
+            Toast.makeText(mContext, R.string.error, Toast.LENGTH_LONG).show();
+            return;
+        }
+        fields.put(ClientAuthContentProvider.   V3ClientAuth.DOMAIN, split[0]);
+        fields.put(ClientAuthContentProvider.V3ClientAuth.HASH, split[3]);
+        mResolver.insert(ClientAuthContentProvider.CONTENT_URI, fields);
+        Toast.makeText(mContext, R.string.backup_restored, Toast.LENGTH_LONG).show();
+    }
+
+}
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/ZipUtilities.java b/app/src/main/java/org/torproject/android/ui/v3onionservice/ZipUtilities.java
similarity index 98%
rename from app/src/main/java/org/torproject/android/ui/hiddenservices/backup/ZipUtilities.java
rename to app/src/main/java/org/torproject/android/ui/v3onionservice/ZipUtilities.java
index 11fd1743..026e8eae 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/ZipUtilities.java
+++ b/app/src/main/java/org/torproject/android/ui/v3onionservice/ZipUtilities.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.hiddenservices.backup;
+package org.torproject.android.ui.v3onionservice;
 
 import android.content.ContentResolver;
 import android.net.Uri;
@@ -10,7 +10,6 @@ import androidx.annotation.Nullable;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileFilter;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.FilenameFilter;
diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthActivity.java b/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthActivity.java
index 761ce171..8ff108d1 100644
--- a/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthActivity.java
@@ -22,7 +22,7 @@ import androidx.fragment.app.Fragment;
 import org.torproject.android.R;
 import org.torproject.android.core.DiskUtils;
 import org.torproject.android.core.LocaleHelper;
-import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
+import org.torproject.android.ui.v3onionservice.V3BackupUtils;
 
 import java.io.File;
 import java.util.List;
@@ -82,7 +82,7 @@ public class ClientAuthActivity extends AppCompatActivity {
                     return;
                 }
                 String authText = DiskUtils.readFileFromInputStream(getContentResolver(), uri);
-                new BackupUtils(this).restoreClientAuthBackup(authText);
+                new V3BackupUtils(this).restoreClientAuthBackup(authText);
             }
         } else {
             super.onActivityResult(requestCode, resultCode, data);
@@ -139,7 +139,7 @@ public class ClientAuthActivity extends AppCompatActivity {
                 .setTitle(R.string.restore_backup)
                 .setItems(fileNames, (dialog, which) -> {
                     String authFileText = DiskUtils.readFile(getContentResolver(), files[which]);
-                    new BackupUtils(this).restoreClientAuthBackup(authFileText);
+                    new V3BackupUtils(this).restoreClientAuthBackup(authFileText);
                 })
                 .show();
     }
diff --git a/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthBackupDialogFragment.java b/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthBackupDialogFragment.java
index b56bc337..e6f76b3c 100644
--- a/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthBackupDialogFragment.java
+++ b/app/src/main/java/org/torproject/android/ui/v3onionservice/clientauth/ClientAuthBackupDialogFragment.java
@@ -20,7 +20,7 @@ import androidx.fragment.app.DialogFragment;
 import org.torproject.android.R;
 import org.torproject.android.core.DiskUtils;
 import org.torproject.android.core.ui.NoPersonalizedLearningEditText;
-import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
+import org.torproject.android.ui.v3onionservice.V3BackupUtils;
 
 import java.io.File;
 
@@ -119,10 +119,10 @@ public class ClientAuthBackupDialogFragment extends DialogFragment {
     }
 
     private void attemptToWriteBackup(Uri outputFile) {
-        BackupUtils backupUtils = new BackupUtils(getContext());
+        V3BackupUtils v3BackupUtils = new V3BackupUtils(getContext());
         String domain = getArguments().getString(ClientAuthActivity.BUNDLE_KEY_DOMAIN);
         String hash = getArguments().getString(ClientAuthActivity.BUNDLE_KEY_HASH);
-        String backup = backupUtils.createV3AuthBackup(domain, hash, outputFile);
+        String backup = v3BackupUtils.createV3AuthBackup(domain, hash, outputFile);
         Toast.makeText(getContext(), backup != null ? R.string.backup_saved_at_external_storage : R.string.error, Toast.LENGTH_LONG).show();
         dismiss();
     }
diff --git a/app/src/main/res/layout/layout_activity_client_cookies.xml b/app/src/main/res/layout/layout_activity_client_cookies.xml
deleted file mode 100644
index a0e66741..00000000
--- a/app/src/main/res/layout/layout_activity_client_cookies.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    tools:context="org.torproject.android.ui.hiddenservices.ClientCookiesActivity">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/DefaultTheme.AppBarOverlay">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/DefaultTheme.PopupOverlay" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <include layout="@layout/layout_content_client_cookies" />
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
-        android:tint="@android:color/black"
-        app:backgroundTint="@android:color/darker_gray"
-        app:srcCompat="@android:drawable/ic_input_add" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/layout_add_client_cookie_dialog.xml b/app/src/main/res/layout/layout_add_client_cookie_dialog.xml
deleted file mode 100644
index ec310a0c..00000000
--- a/app/src/main/res/layout/layout_add_client_cookie_dialog.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="?dialogPreferredPadding">
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/onion"
-        android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small" />
-
-    <org.torproject.android.core.ui.NoPersonalizedLearningEditText
-        android:id="@+id/cookie_onion"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:ems="10"
-        android:inputType="text" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/auth_cookie"
-        android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small" />
-
-    <org.torproject.android.core.ui.NoPersonalizedLearningEditText
-        android:id="@+id/cookie_value"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:ems="10"
-        android:inputType="text" />
-</LinearLayout>
diff --git a/app/src/main/res/layout/layout_content_client_cookies.xml b/app/src/main/res/layout/layout_content_client_cookies.xml
deleted file mode 100644
index 2517d8e1..00000000
--- a/app/src/main/res/layout/layout_content_client_cookies.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="org.torproject.android.ui.hiddenservices.ClientCookiesActivity"
-    tools:showIn="@layout/layout_activity_client_cookies">
-
-    <ListView
-        android:id="@+id/clien_cookies_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</RelativeLayout>
diff --git a/app/src/main/res/menu/cookie_menu.xml b/app/src/main/res/menu/cookie_menu.xml
deleted file mode 100644
index 3593f565..00000000
--- a/app/src/main/res/menu/cookie_menu.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/cookie_restore_backup"
-        android:title="@string/restore_backup" />
-    <item
-        android:id="@+id/cookie_from_qr"
-        android:title="@string/cookie_from_QR" />
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/orbot_main.xml b/app/src/main/res/menu/orbot_main.xml
index 1751e536..850c2ba2 100644
--- a/app/src/main/res/menu/orbot_main.xml
+++ b/app/src/main/res/menu/orbot_main.xml
@@ -30,21 +30,6 @@
                 android:title="@string/v3_client_auth"
                 yourapp:showAsAction="never" />
 
-            <item
-                android:title="@string/v2_hidden_services"
-                yourapp:showAsAction="never">
-                <menu>
-                    <item
-                        android:id="@+id/menu_hidden_services"
-                        android:title="@string/hosted_services"
-                        yourapp:showAsAction="never" />
-
-                    <item
-                        android:id="@+id/menu_client_cookies"
-                        android:title="@string/client_cookies"
-                        yourapp:showAsAction="never" />
-                </menu>
-            </item>
         </menu>
     </item>
 
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index a9904933..1cb80b23 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -90,7 +90,6 @@
     <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
     <string name="found_existing_tor_process">عُثر علي عملية تور سابقة تعمل…</string>
     <string name="something_bad_happened">حصل خطأ ما. افحص السجل</string>
-    <string name="unable_to_read_hidden_service_name">غير قادر على قراءة اسم الخدمة المخفية</string>
     <string name="unable_to_start_tor">غير قادر على بدء تور:</string>
     <string name="pref_use_persistent_notifications">دائما ضع الأيقونة في شريط الأدوات عندما يكون اوربوت متصلاً</string>
     <string name="pref_use_persistent_notifications_title">تنبيهات دائمة</string>
@@ -120,7 +119,6 @@
     <string name="send_email">أرسل بريد الكتروني</string>
     <string name="vpn_default_world">شامل (تلقائي)</string>
     <string name="hidden_services">خدمات خفية</string>
-    <string name="title_activity_hidden_services">خدمات خفية</string>
     <string name="menu_hidden_services">خدمات خفية</string>
     <string name="save">حفظ</string>
     <string name="local_port">المنفذ المحلي</string>
@@ -128,7 +126,6 @@
     <string name="name">الاسم</string>
     <string name="done">تم !</string>
     <string name="copy_address_to_clipboard">نسخ العنوان إلى الحافظة</string>
-    <string name="show_auth_cookie">عرض كعكة المصادقة</string>
     <string name="backup_service">النسخ الإحتياطي للخدمة</string>
     <string name="delete_service">حذف الخدمة</string>
     <string name="backup_saved_at_external_storage">تمت عملية حفظ النسخة الإحتياطية في ذاكرة التخزين الخارجية</string>
@@ -139,16 +136,8 @@
     <string name="confirm_service_deletion">تأكيد حذف الخدمة</string>
     <string name="service_type">نوع الخدمة</string>
     <string name="auth_cookie">كعكة المصادقة</string>
-    <string name="copy_cookie_to_clipboard">نسخ الكعكة إلى الحافظة</string>
-    <string name="auth_cookie_was_not_configured">لم يتم إعداد كعكة المصادقة</string>
     <string name="please_restart_Orbot_to_enable_the_changes">الرجاء إعادة تشغيل أوربوت لتفعيل التعديلات</string>
-    <string name="client_cookies">كعكات العميل</string>
     <string name="onion">.onion</string>
-    <string name="cookie_from_QR">القراءة مِن رمز الكيو آر</string>
-    <string name="backup_cookie">النسخ الإحتياطي للكعكة</string>
-    <string name="delete_cookie">حذف الكعكة</string>
-    <string name="confirm_cookie_deletion">تأكيد إزالة الكعكة</string>
-    <string name="hosted_services">الخدمات المستضافة</string>
     <string name="share_as_qr">شارك كرمز كيو آر</string>
     <string name="disable">إلغاء</string>
     <string name="enable">تمكين</string>
diff --git a/app/src/main/res/values-ay/strings.xml b/app/src/main/res/values-ay/strings.xml
index 9910db38..1fe09e38 100644
--- a/app/src/main/res/values-ay/strings.xml
+++ b/app/src/main/res/values-ay/strings.xml
@@ -92,8 +92,7 @@
   <string name="hidden_service_request">Imantat apayañ thakhinak Tor llikar mä wakichäwiw jist\'arañ muni %1$d. Wakichawitix uñt\'atachixa, iyaw sama.</string>
   <string name="found_existing_tor_process">Utjir Toraw jikxatata…</string>
   <string name="something_bad_happened">Mä jan walt\'äwiw utji. Qillqantayasit uñakipam</string>
-  <string name="unable_to_read_hidden_service_name">Janiw imantat yanapirin sutiman ullarañjamakänti</string>
-  <string name="unable_to_start_tor">Janiw Torax aqtayañjamäkiti:</string>
+    <string name="unable_to_start_tor">Janiw Torax aqtayañjamäkiti:</string>
   <string name="pref_use_persistent_notifications">Orbot aqtatäki ukjax chimpup uñstayañapuni</string>
   <string name="pref_use_persistent_notifications_title">Yatiyäwinakax purinipuniniwa</string>
   <string name="pref_use_expanded_notifications">Kawkja markans IP ukamp Toramp  uñstani uka yatiyäw juk\'amp uñacht\'ayaña</string>
@@ -123,7 +122,6 @@
   <string name="send_email">Qillqat apayaña</string>
   <string name="vpn_default_world">Uraqpacha (justupaki)</string>
   <string name="hidden_services">Imantat lurañanaka</string>
-  <string name="title_activity_hidden_services">Imantat lurañanaka</string>
   <string name="menu_hidden_services">Imantat lurañanaka</string>
   <string name="save">Imaña</string>
   <string name="local_port">Akankïr apayañ thakhi</string>
@@ -131,7 +129,6 @@
   <string name="name">Suti</string>
   <string name="done">¡Tukuyata!</string>
     <string name="copy_address_to_clipboard">Utjirinak waruqañawjar imam</string>
-  <string name="show_auth_cookie"> Uñt\'ayktam uka cookie uñstayam</string>
   <string name="backup_service">Yanapirit imat luratanakam waruqam</string>
   <string name="delete_service">Lurañanak pichsuña</string>
   <string name="backup_saved_at_external_storage">Imat luratanakamax yaqha yänakar imataxiwa</string>
@@ -142,16 +139,8 @@
   <string name="confirm_service_deletion">Lurañanakax pichsutäniwa</string>
     <string name="service_type">Kunayman lurañanaka</string>
   <string name="auth_cookie">Chiqat k\'arich uk katjir cookie</string>
-  <string name="copy_cookie_to_clipboard">Cookie waruqañawjar imam</string>
-  <string name="auth_cookie_was_not_configured">Chiqat k\'arich uk katjir cookiex janiw mayjt\'ayatäkiti</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Mayjt\'ayatanak aqtayañatak Orbot mayamp qhant\'ayam, amp suma</string>
-  <string name="client_cookies">Apnaqirin Cookiepa</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">QR ukamp ullaraña</string>
-  <string name="backup_cookie">Cookien imat luratanakapa</string>
-  <string name="delete_cookie">Cookie pichsum</string>
-  <string name="confirm_cookie_deletion">Cookie pichsut mayamp uñxatam</string>
-  <string name="hosted_services">Qurpachat lurañanaka</string>
   <string name="share_as_qr">QRjam ch\'iqiyaña</string>
   <string name="disable">Jiwt\'ayaña</string>
   <string name="enable">Aqtayaña</string>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index 516b26ea..95d6653e 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -90,8 +90,7 @@ Tor: https://www.torproject.org</string>
 LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
     <string name="found_existing_tor_process">mövcud Tor prosesi tapıldı…</string>
   <string name="something_bad_happened">NÉ™ isÉ™ pis bir ÅŸey oldu. GiriÅŸi yoxla</string>
-    <string name="unable_to_read_hidden_service_name">gizli xidmət adını oxumağı deaktivləşdir</string>
-  <string name="unable_to_start_tor">Tor-un başlanmasını dayandır:</string>
+    <string name="unable_to_start_tor">Tor-un başlanmasını dayandır:</string>
     <string name="pref_use_persistent_notifications">Həmişə Orbot qoşulduğu hallarda nişanı alətlət panelində saxla</string>
   <string name="pref_use_persistent_notifications_title">Həmişə Açıq Xəbərdarlıqlar</string>
   <string name="pref_use_expanded_notifications">Torla birlikdə ətraflı bildirişi göstərib ölkə və IP-dən çıxın. </string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index acfddbfa..21727a41 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -92,8 +92,7 @@
   <string name="hidden_service_request">Дадатак хоча адкрыць схаваны порт сервера %1$d сеткі Tor. Гэта бяспечна, калі вы давяраеце дадзенаму дадатку.</string>
   <string name="found_existing_tor_process">знойдзены існавалы працэс Tor…</string>
   <string name="something_bad_happened">Адбылася нейкая памылка. Праверце журнал.</string>
-  <string name="unable_to_read_hidden_service_name">немагчыма прачытаць імя схаванай службы</string>
-  <string name="unable_to_start_tor">Немагчыма запусціць Tor:</string>
+    <string name="unable_to_start_tor">Немагчыма запусціць Tor:</string>
   <string name="pref_use_persistent_notifications">Заўсёды адлюстроўваць іконку у панэлі заданняў калі Orbot падключаны</string>
   <string name="pref_use_persistent_notifications_title">Нязменнае апавяшчэнне пра працу</string>
   <string name="pref_use_expanded_notifications">Паказаць пашыранае апавяшчэнне Tor з краінай выхаду і IP</string>
@@ -123,7 +122,6 @@
   <string name="send_email">Адправіць ліст</string>
   <string name="vpn_default_world">Свет (аўта)</string>
   <string name="hidden_services">Схаваныя службы</string>
-  <string name="title_activity_hidden_services">Схаваныя службы</string>
   <string name="menu_hidden_services">Схаваныя службы</string>
   <string name="save">Захаваць</string>
   <string name="local_port">Лакальны порт</string>
@@ -131,7 +129,6 @@
   <string name="name">Імя</string>
   <string name="done">Гатова!</string>
   <string name="copy_address_to_clipboard">Скапіяваць адрас у буфер памену</string>
-  <string name="show_auth_cookie">Паказаць аўтарызуючыя cookie</string>
   <string name="backup_service">Рэзерваваць службу</string>
   <string name="delete_service">Выдаліць службу</string>
   <string name="backup_saved_at_external_storage">Рэзервовая копія захавана на вонкавым сховішчы</string>
@@ -142,16 +139,8 @@
   <string name="confirm_service_deletion">Пацверджанне выдалення службы</string>
     <string name="service_type">Тып службы</string>
   <string name="auth_cookie">Аўтарызучыя cookie</string>
-  <string name="copy_cookie_to_clipboard">Капіяваць cookie у буфер памену</string>
-  <string name="auth_cookie_was_not_configured">Аўтарызучыя cookie не наладжаны</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Калі ласка, перазапусціце Orbot для ўступу змены ў сілу</string>
-  <string name="client_cookies">Cookies кліента</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Прачытаць з QR-кода</string>
-  <string name="backup_cookie">Рэзерваваць cookie</string>
-  <string name="delete_cookie">Выдаліць cookies</string>
-  <string name="confirm_cookie_deletion">Пацвердзіце выдаленне cookie</string>
-  <string name="hosted_services">Размешчаныя службы</string>
   <string name="share_as_qr">Падзяліцца праз QR-код</string>
   <string name="disable">Адключыць</string>
   <string name="enable">Уключыць</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index a01815a8..5377f78f 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -88,8 +88,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
     <string name="found_existing_tor_process">намерил си съвместим Tor проект…</string>
   <string name="something_bad_happened">Нещо лошо се случи. Проверете лога</string>
-    <string name="unable_to_read_hidden_service_name">не може да прочете име на скрита услуга</string>
-  <string name="unable_to_start_tor">Не може да стартира Тор:</string>
+    <string name="unable_to_start_tor">Не може да стартира Тор:</string>
     <string name="pref_use_persistent_notifications">Винаги показвай икона в тулбара когато Орбот е свързан</string>
   <string name="pref_use_persistent_notifications_title">Уведомления винаги включени</string>
   <string name="pref_use_expanded_notifications">Покажи разширена информация за Tor изходната държава и IP в лентата за известия</string>
@@ -116,8 +115,7 @@
     <string name="get_bridges_email">Имейл</string>
   <string name="send_email">Изпрати имейл</string>
   <string name="hidden_services">Скрити услуги</string>
-  <string name="title_activity_hidden_services">Скрити услуги</string>
-  <string name="menu_hidden_services">Скрити услуги</string>
+    <string name="menu_hidden_services">Скрити услуги</string>
   <string name="save">Запази</string>
   <string name="name">Име</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Моля, рестартирай Orbot, за да влязат в действие промените</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 99724463..94ae2c59 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -92,7 +92,6 @@
     <string name="hidden_service_request">Una aplicació vol obrir el port de servidor ocults%1$d a la xarxa Tor. Això és segur si confieu en l\'aplicació.</string>
     <string name="found_existing_tor_process">s\'ha trobat un procés Tor existent…</string>
     <string name="something_bad_happened">Ha fallat alguna cosa. Comproveu el registre</string>
-    <string name="unable_to_read_hidden_service_name">ha estat impossible llegir el nom del servei ocult</string>
     <string name="unable_to_start_tor">Ha estat impossible iniciar Tor:</string>
     <string name="pref_use_persistent_notifications">Manté la icona sempre a la barra d\'eines mentre l\'Orbot està connectat</string>
     <string name="pref_use_persistent_notifications_title">Notificacions sempre activades</string>
@@ -123,7 +122,6 @@
     <string name="send_email">Envia correu-e</string>
     <string name="vpn_default_world">Global (auto)</string>
     <string name="hidden_services">Serveis ocults</string>
-    <string name="title_activity_hidden_services">Serveis ocults</string>
     <string name="menu_hidden_services">Serveis ocults</string>
     <string name="save">Desa</string>
     <string name="local_port">Port local</string>
@@ -131,7 +129,6 @@
     <string name="name">Nom</string>
     <string name="done">Fet!</string>
     <string name="copy_address_to_clipboard">Copia adreça al portapapers</string>
-    <string name="show_auth_cookie">Mostrar galetes d\'autentificació</string>
     <string name="backup_service">Servei de còpia de seguretat</string>
     <string name="delete_service">Esborrar servei</string>
     <string name="backup_saved_at_external_storage">Còpia de seguretat desada a emmagatzematge extern</string>
@@ -142,16 +139,8 @@
     <string name="confirm_service_deletion">Confirma la supressió del servei</string>
     <string name="service_type">Tipus de servei</string>
     <string name="auth_cookie">Auth cookie</string>
-    <string name="copy_cookie_to_clipboard">Copieu les galetes al porta-retalls</string>
-    <string name="auth_cookie_was_not_configured">No s\'ha configurat l\'Auth cookie</string>
     <string name="please_restart_Orbot_to_enable_the_changes">Reinicieu l\'Orbot per aplicar els canvis</string>
-    <string name="client_cookies">Client cookies</string>
     <string name="onion">.onion</string>
-    <string name="cookie_from_QR">Llegir de QR</string>
-    <string name="backup_cookie">Backup cookie</string>
-    <string name="delete_cookie">Elimina la galeta</string>
-    <string name="confirm_cookie_deletion">Confirma la supressió de les galetes</string>
-    <string name="hosted_services">Serveis allotjats</string>
     <string name="share_as_qr">Comparteix com a QR</string>
     <string name="disable">Deshabilitar </string>
     <string name="enable">Habilitar</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index a3232ae8..328eb65c 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -87,7 +87,6 @@
     <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
     <string name="found_existing_tor_process">nalezev existující Tor proces…</string>
     <string name="something_bad_happened">Stalo se něco špatného. Zkontrolujte log</string>
-    <string name="unable_to_read_hidden_service_name">nelze číst název skryté služby</string>
     <string name="unable_to_start_tor">Nelze spustit Tor:</string>
     <string name="pref_use_persistent_notifications">Vždy zobrazit ikonu ve stavovém řádku, pokud je Orbot připojen.</string>
     <string name="pref_use_persistent_notifications_title">Notifikace vždy zapnuté</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 092ff884..b064e0c9 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -34,8 +34,7 @@
     <string name="set_locale_title">Jazyk</string>
     <string name="get_bridges_email">Email</string>
   <string name="hidden_services">Skryté Služby</string>
-  <string name="title_activity_hidden_services">Skryté Služby</string>
-  <string name="menu_hidden_services">Skryté Služby</string>
+    <string name="menu_hidden_services">Skryté Služby</string>
   <string name="save">Uložit</string>
   <string name="name">Jméno</string>
   <string name="done">Hotovo!</string>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index a2b24ffb..ef85ec01 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -34,8 +34,7 @@
     <string name="third_party_software">Meddalwedd 3ydd-parti</string>
     <string name="set_locale_title">Iaith</string>
   <string name="hidden_services">Gwasanaethau Cudd</string>
-  <string name="title_activity_hidden_services">Gwasanaethau Cudd</string>
-  <string name="menu_hidden_services">Gwasanaethau Cudd</string>
+    <string name="menu_hidden_services">Gwasanaethau Cudd</string>
   <string name="save">Cadw</string>
   <string name="name">Enw</string>
 </resources>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 3d77ae62..c41936a2 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -85,15 +85,13 @@
   <string name="tor_version">Tor: https://www.torproject.org</string>
   <string name="found_existing_tor_process">fandt eksisterende Tor process…</string>
   <string name="something_bad_happened">Noget slemt er sket. Check loggen</string>
-    <string name="unable_to_read_hidden_service_name">ikke i stand til at læse navnet på den skjulte service</string>
-  <string name="unable_to_start_tor">Kunne ikke starte Tor:</string>
+    <string name="unable_to_start_tor">Kunne ikke starte Tor:</string>
     <string name="pref_use_persistent_notifications">Vis altid ikonet i statuslinien når Orbot er forbundet til netværket</string>
   <string name="pref_use_persistent_notifications_title">Vis altid notifikationer</string>
     <string name="set_locale_title">Sprog</string>
   <string name="get_bridges_email">Mail</string>
   <string name="hidden_services">Skjulte tjenester</string>
-  <string name="title_activity_hidden_services">Skjulte tjenester</string>
-  <string name="menu_hidden_services">Skjulte tjenester</string>
+    <string name="menu_hidden_services">Skjulte tjenester</string>
   <string name="save">Gem</string>
   <string name="name">Navn</string>
   <string name="disable">Deaktivere</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 27fabb26..6bd8ef68 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -92,7 +92,6 @@
     <string name="hidden_service_request">Eine Anwendung möchte den Onion Server auf Port %1$s zum Tor-Netzwerk öffnen. Dies ist sicher, wenn Sie der Anwendung vertrauen.</string>
     <string name="found_existing_tor_process">bestehenden Tor-Prozess gefunden …</string>
     <string name="something_bad_happened">Etwas ist schief gelaufen. Bitte Protokoll überprüfen</string>
-    <string name="unable_to_read_hidden_service_name">Name des versteckten Dienstes kann nicht gelesen werden</string>
     <string name="unable_to_start_tor">Tor kann nicht gestartet werden:</string>
     <string name="pref_use_persistent_notifications">Symbol immer in der Statusleiste lassen, wenn Orbot verbunden ist</string>
     <string name="pref_use_persistent_notifications_title">Aktivitätsanzeige</string>
@@ -123,7 +122,6 @@
     <string name="send_email">E-Mail senden</string>
     <string name="vpn_default_world">Global (Automatisch)</string>
     <string name="hidden_services">Onion Dienste</string>
-    <string name="title_activity_hidden_services">Onion-Dienste</string>
     <string name="menu_hidden_services">Onion-Dienste</string>
     <string name="save">Speichern</string>
     <string name="local_port">Lokaler Port</string>
@@ -131,7 +129,6 @@
     <string name="name">Name</string>
     <string name="done">Fertig!</string>
     <string name="copy_address_to_clipboard">Adresse in die Zwischenablage kopieren</string>
-    <string name="show_auth_cookie">Authentifikationscookie anzeigen</string>
     <string name="backup_service">Backup Service <i>(Warnung: Dadurch könnte Ihre Service Konfiguration anderen Apps zugänglich gemacht werden)</i></string>
     <string name="delete_service">Dienst löschen</string>
     <string name="backup_saved_at_external_storage">Sicherung auf externem Speicher abgelegt</string>
@@ -142,16 +139,8 @@
     <string name="confirm_service_deletion">Löschen des Dienstes bestätigen</string>
     <string name="service_type">Dienst-Typ</string>
     <string name="auth_cookie">Authentifikationscookie</string>
-    <string name="copy_cookie_to_clipboard">Cookie in die Zwischenablage kopieren</string>
-    <string name="auth_cookie_was_not_configured">Es wurde kein Authentifikationscookie festgelegt</string>
     <string name="please_restart_Orbot_to_enable_the_changes">Bitte Orbot zum Aktivieren der Änderungen neustarten</string>
-    <string name="client_cookies">Client-Cookies</string>
     <string name="onion">.onion</string>
-    <string name="cookie_from_QR">QR-Code einlesen</string>
-    <string name="backup_cookie">Cookie sichern</string>
-    <string name="delete_cookie">Cookie löschen</string>
-    <string name="confirm_cookie_deletion">Cookie-Löschung bestätigen</string>
-    <string name="hosted_services">Gehostete Dienste</string>
     <string name="share_as_qr">Als QR-Code teilen</string>
     <string name="disable">Deaktivieren</string>
     <string name="enable">Aktivieren</string>
@@ -207,7 +196,6 @@
     <string name="v3_backup_name_hint">Sicherungsdateiname …</string>
     <string name="v3_delete_client_authorization_confirm">Entferne Client Authorisierung</string>
     <string name="v3_client_auth">v3 Onion Dienst Client Authorisierung</string>
-    <string name="v2_hidden_services">v2 Onion Dienste (veraltet)</string>
     <string name="v3_hosted_services">Gehostete v3 Onion Dienste</string>
     <string name="v3_delete_client_authorization">Entferne Client Authorisierungs-Schlüssel</string>
     <string name="v3_backup_key_warning">Warnung: Dadurch könnten Ihre Schlüssel anderen Apps zugänglich gemacht werden</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 15b75da6..3cab2df2 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -92,7 +92,6 @@
     <string name="hidden_service_request">Κάποια εφαρμογή προσπαθεί να ανοίξει την κρυφή θύρα διακομιστή %1$dστο δίκτυο Tor. Πρόκειται για ασφαλή ενέργεια, εφόσον γνωρίζετε την εφαρμογή.</string>
     <string name="found_existing_tor_process">αναζήτηση διεργασιών Tor…</string>
     <string name="something_bad_happened">Κάτι κακό συνέβη. Ελέγξτε τις καταγραφές</string>
-    <string name="unable_to_read_hidden_service_name">αδυναμία ανάγνωσης του ονόματος της κρυφής υπηρεσίας</string>
     <string name="unable_to_start_tor">Αδυναμία εκκίνησης του Tor:</string>
     <string name="pref_use_persistent_notifications">Να διατηρείται πάντοτε το εικονίδιο στην γραμμή εργαλείων όταν το Orbot συνδέεται</string>
     <string name="pref_use_persistent_notifications_title">Ειδοποιήσεις διαρκούς σύνδεσης</string>
@@ -123,7 +122,6 @@
     <string name="send_email">Στείλτε Email</string>
     <string name="vpn_default_world">Παγκόσμια (Auto)</string>
     <string name="hidden_services">Αποκρυφες υπηρεσιες</string>
-    <string name="title_activity_hidden_services">Αποκρυφες υπηρεσιες</string>
     <string name="menu_hidden_services">Αποκρυφες υπηρεσιες</string>
     <string name="save">Αποθήκευση</string>
     <string name="local_port">Τοπική θύρα</string>
@@ -131,7 +129,6 @@
     <string name="name">Όνομα</string>
     <string name="done">Έγινε!</string>
     <string name="copy_address_to_clipboard">Αντιγραφή διέυθυνσης στο πρόχειρο</string>
-    <string name="show_auth_cookie">Εμφάνιση αναγνωριστικού cookie</string>
     <string name="backup_service">Υπηρεσία δημιουργίας αντιγράφου ασφαλείας</string>
     <string name="delete_service">Διαγραφή υπηρεσίας</string>
     <string name="backup_saved_at_external_storage">Το αντίγράφο ασφαλείας αποθηκεύθηκε σε εξωτερικό μέσο αποθήκευσης</string>
@@ -142,16 +139,8 @@
     <string name="confirm_service_deletion">Επιβεβαίωση διαγραφής υπηρεσίας</string>
     <string name="service_type">Τύπος υπηρεσίας</string>
     <string name="auth_cookie">Αναγνωριστικό cookie</string>
-    <string name="copy_cookie_to_clipboard">Αντιγραφή τού cookie στο πρόχειρο</string>
-    <string name="auth_cookie_was_not_configured">Το αναγνωριστικό cookie δεν διαμορφώθηκε</string>
     <string name="please_restart_Orbot_to_enable_the_changes">Παρακαλούμε επανεκκινήστε το Orbot για να ενεργοποιήσετε τις αλλαγές</string>
-    <string name="client_cookies">Cookies πελατών</string>
     <string name="onion">.onion</string>
-    <string name="cookie_from_QR">Ανάγνωση από QR</string>
-    <string name="backup_cookie">Cookie αντίγραφου ασφαλείας </string>
-    <string name="delete_cookie">Αφαίρεση Cookie</string>
-    <string name="confirm_cookie_deletion">Επιβεβαίωση διαγραφής τού cookie </string>
-    <string name="hosted_services">Φιλοξενημένες υπηρεσίες</string>
     <string name="share_as_qr">Κοινοποίηση ως QR</string>
     <string name="disable">Απενεργοποίηση</string>
     <string name="enable">Ενεργοποίηση</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index c543030c..db021c1f 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -66,8 +66,7 @@
   <string name="enter_ports">Entajpu pordojn</string>
     <string name="project_home">Retpaĝaro(j) de la Projekto:</string>
     <string name="found_existing_tor_process">trovi ekzistantan Tor-procedon…</string>
-    <string name="unable_to_read_hidden_service_name">ne eblas legi nomon de la kaŝita servo</string>
-  <string name="unable_to_start_tor">Ne eblas startigi Tor:</string>
+    <string name="unable_to_start_tor">Ne eblas startigi Tor:</string>
     <string name="set_locale_title">Lingvo</string>
   <string name="save">Konservi</string>
   <string name="name">Nomo</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 85ae1a5c..7884cfbb 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -92,7 +92,6 @@
     <string name="hidden_service_request">Una aplicación quiere abrir el puerto %1$d de servidor oculto a la red Tor. Esto es seguro si confía en la aplicación.</string>
     <string name="found_existing_tor_process">Se encontró un proceso de Tor ya existente…</string>
     <string name="something_bad_happened">Hubo algún tipo de problema. Compruebe el registro (log)</string>
-    <string name="unable_to_read_hidden_service_name">No fue posible leer el nombre del servicio oculto</string>
     <string name="unable_to_start_tor">No fue posible iniciar Tor: </string>
     <string name="pref_use_persistent_notifications">Mantener siempre el icono de Orbot en la barra de tareas cuando esté conectado</string>
     <string name="pref_use_persistent_notifications_title">Notificaciones siempre activadas</string>
@@ -123,7 +122,6 @@
     <string name="send_email">Enviar correo</string>
     <string name="vpn_default_world">Global (Automático)</string>
     <string name="hidden_services">Servicios ocultos</string>
-    <string name="title_activity_hidden_services">Servicios ocultos</string>
     <string name="menu_hidden_services">Servicios ocultos</string>
     <string name="save">Guardar</string>
     <string name="local_port">Puerto local</string>
@@ -131,7 +129,6 @@
     <string name="name">Nombre</string>
     <string name="done">¡Hecho!</string>
     <string name="copy_address_to_clipboard">Copiar dirección al portapapeles</string>
-    <string name="show_auth_cookie">Mostrar cookie de autentificación</string>
     <string name="backup_service">Hacer copia de seguridad del servicio</string>
     <string name="delete_service">Borrar servicio</string>
     <string name="backup_saved_at_external_storage">Copia de seguridad guardada en un almacenamiento externo</string>
@@ -142,16 +139,8 @@
     <string name="confirm_service_deletion">Confirme el borrado del servicio</string>
     <string name="service_type">Tipo de servicio</string>
     <string name="auth_cookie">Cookie de autentificación</string>
-    <string name="copy_cookie_to_clipboard">Copiar cookie al portapapeles</string>
-    <string name="auth_cookie_was_not_configured">La cookie de autentificación no fue configurada</string>
     <string name="please_restart_Orbot_to_enable_the_changes">Por favor, reinicie Orbot para habilitar los cambios</string>
-    <string name="client_cookies">Cookies de cliente</string>
     <string name="onion">.onion</string>
-    <string name="cookie_from_QR">Leer desde QR</string>
-    <string name="backup_cookie">Realizar copia de seguridad de cookie</string>
-    <string name="delete_cookie">Borrar cookie</string>
-    <string name="confirm_cookie_deletion">Confirmar borrado de cookie</string>
-    <string name="hosted_services">Servicios alojados</string>
     <string name="share_as_qr">Compartir como QR</string>
     <string name="disable">Deshabilitar</string>
     <string name="enable">Habilitar</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index a718a5a1..844b61c9 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -81,8 +81,7 @@
     <string name="third_party_software">Kolmanda osapoole tarkvara:</string>
   <string name="found_existing_tor_process">leidus töötav Tor protsess…</string>
   <string name="something_bad_happened">Juhtus midagi halba. Kontrollige logi</string>
-    <string name="unable_to_read_hidden_service_name">ei õnnestu lugeda varjatud teenuse nime</string>
-  <string name="unable_to_start_tor">Tor käivitamine ebaõnnestus:</string>
+    <string name="unable_to_start_tor">Tor käivitamine ebaõnnestus:</string>
     <string name="pref_use_persistent_notifications">Ühendatud Orbot korral näidata katkematult ikoonide tööriistariba</string>
   <string name="pref_use_persistent_notifications_title">Pidevalt kuvatavad teated</string>
     <string name="pref_disable_network_title">Pole võrgu auto-und</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 23791307..e782d963 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -92,7 +92,6 @@
     <string name="hidden_service_request">Aplikazio batek ezkutuko zerbitzariko %1$d ataka ireki nau du Tor sarera. Segurua da aplikazioaz fidatzen bazara.</string>
     <string name="found_existing_tor_process">aurreko Tor prozesu bat aurkitu da…</string>
     <string name="something_bad_happened">Zerbait txarra gertatu da. Begiratu egunkarian</string>
-    <string name="unable_to_read_hidden_service_name">ezin izan da ezkutuko zerbitzuaren izena irakurri</string>
     <string name="unable_to_start_tor">Ezin izan da Tor hasi:</string>
     <string name="pref_use_persistent_notifications">Mantendu ikonoa tresna barran Orbot konektatuta dagoenean</string>
     <string name="pref_use_persistent_notifications_title">Beti piztutako jakinarazpenak</string>
@@ -123,7 +122,6 @@
     <string name="send_email">Bidali E-maila</string>
     <string name="vpn_default_world">Orokorra (Automatikoa)</string>
     <string name="hidden_services">Ezkutuko zerbitzuak</string>
-    <string name="title_activity_hidden_services">Ezkutuko zerbitzuak</string>
     <string name="menu_hidden_services">Ezkutuko zerbitzuak</string>
     <string name="save">Gorde</string>
     <string name="local_port">Ataka lokala</string>
@@ -131,7 +129,6 @@
     <string name="name">Izena</string>
     <string name="done">Egina!</string>
     <string name="copy_address_to_clipboard">Kopiatu helbidea arbelera</string>
-    <string name="show_auth_cookie">Erakutsi autentifikazio cookie-a</string>
     <string name="backup_service">Egin zerbitzuaren babeskopia</string>
     <string name="delete_service">Ezabatu zerbitzua</string>
     <string name="backup_saved_at_external_storage">Babeskopia kanpo biltegiratzean gorde da</string>
@@ -142,16 +139,8 @@
     <string name="confirm_service_deletion">Berretsi zerbitzua ezabatzea</string>
     <string name="service_type">Zerbitzu mota</string>
     <string name="auth_cookie">Autentifikazio cookie-a</string>
-    <string name="copy_cookie_to_clipboard">Kopiatu cookie-a arbelera</string>
-    <string name="auth_cookie_was_not_configured">Ez da autentifikazio cookie-a konfiguratu</string>
     <string name="please_restart_Orbot_to_enable_the_changes">Mesedez berrabiarazi Orbot aldaketak aktibatzeko</string>
-    <string name="client_cookies">Bezero-cookie-ak</string>
     <string name="onion">.onion</string>
-    <string name="cookie_from_QR">Irakurri QR-tik</string>
-    <string name="backup_cookie">Egin cookie-aren babeskopia</string>
-    <string name="delete_cookie">Ezabatu cookie-a</string>
-    <string name="confirm_cookie_deletion">Berretsi cookie-a ezabatzea</string>
-    <string name="hosted_services">Ostatatutako zerbitzuak</string>
     <string name="share_as_qr">Partekatu QR gisa</string>
     <string name="disable">Desgaitu</string>
     <string name="enable">Gaitu</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 3ecbbf57..7acbd5f6 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -92,7 +92,6 @@
     <string name="hidden_service_request">اپلیکیشنی می‌خواهد پورت سرور %1$d را به شبکه تور بگشاید. در صورتی که به این برنامه اطمینان دارید، چنین کاری امن است.</string>
     <string name="found_existing_tor_process">یک تور درحال اجرا پیدا شد…</string>
     <string name="something_bad_happened">اتفاق بدی افتاد. وقایع ثبت شده را چک کنید</string>
-    <string name="unable_to_read_hidden_service_name">ناتوان در خواندن نام سرویس مخفی</string>
     <string name="unable_to_start_tor">ناتوان در راه اندازی تور:</string>
     <string name="pref_use_persistent_notifications">وقتی ربات پیازی متصل است، همیشه آیکون مربوط را در نوار ابزار نگه دار.</string>
     <string name="pref_use_persistent_notifications_title">آگاهسازی همیشه روشن</string>
@@ -123,7 +122,6 @@
     <string name="send_email">ایمیل بفرست</string>
     <string name="vpn_default_world">جهانی (خودکار)</string>
     <string name="hidden_services">سرویس‌های مخفی</string>
-    <string name="title_activity_hidden_services">سرویس‌های مخفی</string>
     <string name="menu_hidden_services">سرویس‌های مخفی</string>
     <string name="save">ذخيره</string>
     <string name="local_port">درگاه محلی</string>
@@ -131,7 +129,6 @@
     <string name="name">نام</string>
     <string name="done">انجام شد!</string>
     <string name="copy_address_to_clipboard">رونوشت نشانی‌ها در حافظه موقت</string>
-    <string name="show_auth_cookie">نمایش کوکی احراز هویت</string>
     <string name="backup_service">سرویس بک‌آپ</string>
     <string name="delete_service">حذف سرویس</string>
     <string name="backup_saved_at_external_storage">بک‌آپ در انباره خارجی ذخیره شد</string>
@@ -142,16 +139,8 @@
     <string name="confirm_service_deletion">حذف سرویس را تایید کنید</string>
     <string name="service_type">نوع سرویس</string>
     <string name="auth_cookie">کوکی Auth</string>
-    <string name="copy_cookie_to_clipboard">کپی کردن کوکی به کلیپ بورد</string>
-    <string name="auth_cookie_was_not_configured">کوکی احراز هویت پیکربندی نشده بود</string>
     <string name="please_restart_Orbot_to_enable_the_changes">برای دیدن تغییرات، اوربات  را دوباره راه اندازی کنید</string>
-    <string name="client_cookies">کوکی‌های Client</string>
     <string name="onion">onion.</string>
-    <string name="cookie_from_QR">از QR بخوان</string>
-    <string name="backup_cookie">بک‌آپ از کوکی</string>
-    <string name="delete_cookie">حذف کوکی</string>
-    <string name="confirm_cookie_deletion">تایید حذف کوکی</string>
-    <string name="hosted_services">سرویس‌های میزبانی‌شده</string>
     <string name="share_as_qr">هم‌رسانی با QR</string>
     <string name="disable">غیرفعال کن</string>
     <string name="enable">فعال کن</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 606da9bb..fd9b3136 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -88,7 +88,6 @@
     <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
     <string name="found_existing_tor_process">löytyi olemassaoleva Tor-prosessi…</string>
     <string name="something_bad_happened">Jotain pahaa tapahtui. Tarkista loki</string>
-    <string name="unable_to_read_hidden_service_name">piilopalvelunimen lukeminen epäonnistui</string>
     <string name="unable_to_start_tor">Torin käynnistys epäonnistui:</string>
     <string name="pref_use_persistent_notifications">Pidä kuvake aina työkalupalkissa, kun Orbot on yhdistetty</string>
     <string name="pref_use_persistent_notifications_title">Ilmoitukset aina käytössä</string>
@@ -116,7 +115,6 @@
     <string name="get_bridges_email">Sähköposti</string>
     <string name="send_email">Lähetä sähköpostia</string>
     <string name="hidden_services">Piilopalvelut</string>
-    <string name="title_activity_hidden_services">Piilopalvelut</string>
     <string name="menu_hidden_services">Piilopalvelut</string>
     <string name="save">Tallenna</string>
     <string name="name">Nimi</string>
@@ -137,7 +135,6 @@
     <string name="local_port">Paikallinen portti</string>
     <string name="onion_port">Sipuliportti</string>
     <string name="copy_address_to_clipboard">Kopioi osoite leikepöydälle</string>
-    <string name="show_auth_cookie">Näytä autenttinen eväste</string>
     <string name="delete_service">Poista palvelu</string>
     <string name="backup_saved_at_external_storage">Varmuuskopio tallennettu ulkoiseen tallennustilaan</string>
     <string name="backup_restored">Varmuuskopio palautettu</string>
@@ -146,8 +143,6 @@
     <string name="start_tor_again_for_finish_the_process">Käynnistä Tor uudelleen prosessin viimeistelemiseksi</string>
     <string name="confirm_service_deletion">Vahvista palvelun poisto</string>
     <string name="service_type">Palvelun tyyppi</string>
-    <string name="copy_cookie_to_clipboard">Kopioi eväste leikepöydälle</string>
-    <string name="client_cookies">Asiakasohjelman evästeet</string>
     <string name="onion">.onion</string>
     <string name="use_qr_code">Käytä QR-koodia</string>
     <string name="confirm">Vahvista</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 158ac414..818d7194 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -88,7 +88,6 @@
     <string name="libevent_version">LibEvent v2.0.21 : http://www.monkey.org/~provos/libevent/</string>
     <string name="found_existing_tor_process">un processus Tor existant a été trouvé…</string>
     <string name="something_bad_happened">Une problème est survenu. Consultez le journal</string>
-    <string name="unable_to_read_hidden_service_name">impossible de lire le nom du service onion</string>
     <string name="unable_to_start_tor">Impossible de démarrer Tor :</string>
     <string name="pref_use_persistent_notifications">Toujours conserver l’icône dans la barre d’outils quand Orbot est connecté</string>
     <string name="pref_use_persistent_notifications_title">Notifications toujours actives</string>
@@ -131,13 +130,11 @@
     <string name="apps_mode">Mode RPV</string>
     <string name="vpn_default_world">Global (automatique)</string>
     <string name="hidden_services">Services onion</string>
-    <string name="title_activity_hidden_services">Services onion</string>
     <string name="menu_hidden_services">Services onion</string>
     <string name="local_port">Port local</string>
     <string name="onion_port">Port onion</string>
     <string name="done">Terminé</string>
     <string name="copy_address_to_clipboard">Copier l’adresse dans le presse-papiers</string>
-    <string name="show_auth_cookie">Afficher le témoin d’authentification</string>
     <string name="backup_service">Sauvegarder le service <i>(Avertissement : La configuration de votre service pourrait être exposée à d’autres applis)</i></string>
     <string name="delete_service">Supprimer le service</string>
     <string name="backup_saved_at_external_storage">La sauvegarde a été enregistrée sur la mémoire externe</string>
@@ -148,15 +145,7 @@
     <string name="confirm_service_deletion">Confirmez la suppression du service</string>
     <string name="service_type">Type de service</string>
     <string name="auth_cookie">Témoin d’authentification</string>
-    <string name="copy_cookie_to_clipboard">Copier le témoin dans le presse-papiers</string>
-    <string name="auth_cookie_was_not_configured">Le témoin d’authentification n’a pas été configuré</string>
-    <string name="client_cookies">Témoins des clients</string>
     <string name="onion">.onion</string>
-    <string name="cookie_from_QR">Balayer un code QR</string>
-    <string name="backup_cookie">Sauvegarder le témoin</string>
-    <string name="delete_cookie">Supprimer le témoin</string>
-    <string name="confirm_cookie_deletion">Confirmer la suppression du témoin</string>
-    <string name="hosted_services">Services hébergés</string>
     <string name="share_as_qr">Partager en tant que code QR</string>
     <string name="disable">Désactiver</string>
     <string name="enable">Activer</string>
@@ -221,7 +210,6 @@
     <string name="v3_client_auth_activity_title">Autorisation client v3</string>
     <string name="v3_client_auth">Autorisation client Onion Service v3</string>
     <string name="v3_hosted_services">Services Onion v3 hébergés</string>
-    <string name="v2_hidden_services">Services Onion v2 (déconseillés)</string>
     <string name="deny">Refuser</string>
     <string name="allow">Autoriser</string>
     <string name="backup_port_exist">Erreur : Un service onion utilise déjà le port %s</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index ae748ad3..7acca81d 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -92,8 +92,7 @@
   <string name="hidden_service_request">Une appli veut ouvrir le port %1$d du serveur caché au réseau Tor. Cela est sécuritaire si vous faites confiance à l’appli.</string>
   <string name="found_existing_tor_process">un processus existant de Tor a été trouvé…</string>
   <string name="something_bad_happened">Quelque chose n’a pas été. Vérifiez le journal</string>
-    <string name="unable_to_read_hidden_service_name">impossible de lire le nom du service caché</string>
-  <string name="unable_to_start_tor">Impossible de démarrer Tor :</string>
+    <string name="unable_to_start_tor">Impossible de démarrer Tor :</string>
     <string name="pref_use_persistent_notifications">Toujours conserver l’icône dans la barre des tâches quand Orbot est connecté.</string>
   <string name="pref_use_persistent_notifications_title">Notifications toujours actives</string>
   <string name="pref_use_expanded_notifications">Montrer des notifications étendues avec le pays de sortie de Tor et l’IP</string>
@@ -123,7 +122,6 @@
     <string name="send_email">Envoyer un courriel</string>
   <string name="vpn_default_world">Mondial (Auto)</string>
   <string name="hidden_services">Services cachés</string>
-  <string name="title_activity_hidden_services">Services cachés</string>
   <string name="menu_hidden_services">Services cachés</string>
   <string name="save">Enregistrer</string>
     <string name="local_port">Port local</string>
@@ -131,7 +129,6 @@
   <string name="name">Nom</string>
   <string name="done">Fait !</string>
     <string name="copy_address_to_clipboard">Copier l’adresse vers le presse-papiers</string>
-  <string name="show_auth_cookie">Afficher le témoin auth</string>
   <string name="backup_service">Service de sauvegarde</string>
   <string name="delete_service">Supprimer le service</string>
   <string name="backup_saved_at_external_storage">La sauvegarde a été enregistrée sur une mémoire externe</string>
@@ -142,16 +139,8 @@
   <string name="confirm_service_deletion">Confirmer la suppression du service</string>
     <string name="service_type">Type de service</string>
   <string name="auth_cookie">Témoin auth</string>
-  <string name="copy_cookie_to_clipboard">Copier le témoin vers le presse-papiers</string>
-  <string name="auth_cookie_was_not_configured">Le témoin auth n’est pas configuré</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Veuillez redémarrer Orbot pour activer les changements</string>
-  <string name="client_cookies">Témoins du client</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Lire d’un code QR</string>
-  <string name="backup_cookie">Sauvegarder le témoin</string>
-  <string name="delete_cookie">Supprimer le témoin</string>
-  <string name="confirm_cookie_deletion">Confirmer la suppression du témoin</string>
-  <string name="hosted_services">Services hébergés</string>
   <string name="share_as_qr">Partager comme code QR</string>
   <string name="disable">Désactiver</string>
   <string name="enable">Activer</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 5e3862f3..fe428b35 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -92,7 +92,6 @@
     <string name="hidden_service_request">Unha aplicación quere abrir o porto oculto de servidor %1$d a rede Tor. Esto é seguro se vostede confía na app.</string>
     <string name="found_existing_tor_process">atopado proceso Tor existente…</string>
     <string name="something_bad_happened">Algo malo pasou. Comprobe o rexistro</string>
-    <string name="unable_to_read_hidden_service_name">imposible ler nome de servizo oculto</string>
     <string name="unable_to_start_tor">Incapaz de arrancar Tor</string>
     <string name="pref_use_persistent_notifications">Mostrar sempre a icona na barra de ferramentas cando Orbot estea conectado</string>
     <string name="pref_use_persistent_notifications_title">Notificacións Sempre Acesas</string>
@@ -123,7 +122,6 @@
     <string name="send_email">Enviar correo</string>
     <string name="vpn_default_world">Global (Auto)</string>
     <string name="hidden_services">Servizos agochados</string>
-    <string name="title_activity_hidden_services">Servizos agochados</string>
     <string name="menu_hidden_services">Servizos agochados</string>
     <string name="save">Gardar</string>
     <string name="local_port">Porto local</string>
@@ -131,7 +129,6 @@
     <string name="name">Nome</string>
     <string name="done">Feito!</string>
     <string name="copy_address_to_clipboard">Copiar enderezo ao portapapeis</string>
-    <string name="show_auth_cookie">Mostar testemuño de autorización</string>
     <string name="backup_service">Servizo de respaldo</string>
     <string name="delete_service">Eliminar servizo</string>
     <string name="backup_saved_at_external_storage">Respaldo gardado en almacenamento externo</string>
@@ -142,16 +139,8 @@
     <string name="confirm_service_deletion">Confirme a eliminación do servizo</string>
     <string name="service_type">Tipo de servizo</string>
     <string name="auth_cookie">Testemuño de autorización</string>
-    <string name="copy_cookie_to_clipboard">Copie o testemuño ao portapapeis</string>
-    <string name="auth_cookie_was_not_configured">Non estableceu un testemuño de autorización</string>
     <string name="please_restart_Orbot_to_enable_the_changes">Por favor, reinicie Orbot para activar os cambios</string>
-    <string name="client_cookies">Testemuños do cliente</string>
     <string name="onion">.onion</string>
-    <string name="cookie_from_QR">Ler desde QR</string>
-    <string name="backup_cookie">Testemuño de respaldo</string>
-    <string name="delete_cookie">Eliminar testemuño</string>
-    <string name="confirm_cookie_deletion">Confirme a eliminación do testemuño</string>
-    <string name="hosted_services">Servizos hospedados</string>
     <string name="share_as_qr">Compartir como QR</string>
     <string name="disable">Inhabilitar</string>
     <string name="enable">Activar</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 84e33502..a6217880 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -93,7 +93,6 @@
     <string name="hidden_service_request">एक ऐप Tor नेटवर्क पर %1$dछिपा सर्वर पोर्ट खोलना चाहता है। यदि आप ऐप पर विश्वास करते हैं, तो यह सुरक्षित है</string>
     <string name="found_existing_tor_process">मौजूदा तोर प्रक्रिया पाया …</string>
     <string name="something_bad_happened">कुछ बुरा हो गया। लॉग की जांच करें</string>
-    <string name="unable_to_read_hidden_service_name">छिपी हुई सेवा का नाम पढ़ने में असमर्थ</string>
     <string name="unable_to_start_tor">टो शुरू करने में असमर्थ:</string>
     <string name="pref_use_persistent_notifications">ऑरबोट कनेक्ट होने पर टूलबार में हमेशा आइकन रखें</string>
     <string name="pref_use_persistent_notifications_title">हमेशा की सूचनाएं</string>
@@ -124,7 +123,6 @@
     <string name="send_email">ईमेल भेजें</string>
     <string name="vpn_default_world">ग्लोबल (ऑटो)</string>
     <string name="hidden_services">हिडन सेवाएं</string>
-    <string name="title_activity_hidden_services">हिडन सेवाएं</string>
     <string name="menu_hidden_services">हिडन सेवाएं</string>
     <string name="save">बचाना</string>
     <string name="local_port">स्थानीय पोर्ट</string>
@@ -132,7 +130,6 @@
     <string name="name">नाम</string>
     <string name="done">किया हुआ!</string>
     <string name="copy_address_to_clipboard">क्लिपबोर्ड को पता कॉपी करें</string>
-    <string name="show_auth_cookie">Auth कुकी दिखाएं</string>
     <string name="backup_service">बैकअप सेवा</string>
     <string name="delete_service">सेवा हटाएँ</string>
     <string name="backup_saved_at_external_storage">बाह्य संग्रहण में बैकअप सहेजा गया</string>
@@ -143,16 +140,8 @@
     <string name="confirm_service_deletion">सेवा हटाने की पुष्टि करें</string>
     <string name="service_type">सेवा प्रकार</string>
     <string name="auth_cookie">Auth कुकी</string>
-    <string name="copy_cookie_to_clipboard">क्लिपबोर्ड पर कुकी कॉपी करें</string>
-    <string name="auth_cookie_was_not_configured">Auth कुकी कॉन्फ़िगर नहीं की गई थी</string>
     <string name="please_restart_Orbot_to_enable_the_changes">परिवर्तन सक्षम करने के लिए Orbot पुनः प्रारंभ करें</string>
-    <string name="client_cookies">क्लाइंट कुकीज़</string>
     <string name="onion">.अनियन </string>
-    <string name="cookie_from_QR">QR से पढ़ें</string>
-    <string name="backup_cookie">बैकअप कुकी</string>
-    <string name="delete_cookie">कुकी हटाएं</string>
-    <string name="confirm_cookie_deletion">कुकी हटाने की पुष्टि करें</string>
-    <string name="hosted_services">होस्टेड सर्विसेस</string>
     <string name="share_as_qr">QR के रूप में शेयर करें</string>
     <string name="disable">अक्षम</string>
     <string name="enable">सक्षम करें</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index d61ec60b..9f1e0162 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -88,8 +88,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
     <string name="found_existing_tor_process">pronađeni postojeći Tor procesi…</string>
   <string name="something_bad_happened">Nešto loše se dogodilo. Provjerite dnevnik</string>
-  <string name="unable_to_read_hidden_service_name">nije moguće pročitati ime skrivene usluge</string>
-  <string name="unable_to_start_tor">Nije moguće pokrenuti Tor:</string>
+    <string name="unable_to_start_tor">Nije moguće pokrenuti Tor:</string>
   <string name="pref_use_persistent_notifications">Uvjek drži ikonu na alatnoj traci kad je Orbot spojen</string>
   <string name="pref_use_persistent_notifications_title">Obavijesti o stalnoj pokrenutosti</string>
   <string name="pref_use_expanded_notifications">Prikaži proširene obavijesti s Tor izlaznom državom i IP-em</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index f0ef09eb..6ac2622d 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -92,7 +92,6 @@
     <string name="hidden_service_request">Egy app egy rejtett szerver portot %1$d nyitna a Tor hálózatra. Ez biztonságos, ha megbízik az appban.</string>
     <string name="found_existing_tor_process">létező Tor folyamat találva…</string>
     <string name="something_bad_happened">Valami rossz történt. Nézd meg a naplót.</string>
-    <string name="unable_to_read_hidden_service_name">nem olvasható a rejtett szolgáltatás neve</string>
     <string name="unable_to_start_tor">A Tor indítása sikertelen:</string>
     <string name="pref_use_persistent_notifications">Mindig tartsa az ikont az eszköztáron, ha az Orbot csatlakoztatva van.</string>
     <string name="pref_use_persistent_notifications_title">Mindig-bekapcsolt értesítések</string>
@@ -123,7 +122,6 @@
     <string name="send_email">Email küldése</string>
     <string name="vpn_default_world">Globális (Auto)</string>
     <string name="hidden_services">Rejtett szolgáltatások</string>
-    <string name="title_activity_hidden_services">Rejtett szolgáltatások</string>
     <string name="menu_hidden_services">Rejtett szolgáltatások</string>
     <string name="save">Mentés</string>
     <string name="local_port">Helyi Port</string>
@@ -131,7 +129,6 @@
     <string name="name">Név</string>
     <string name="done">Kész!</string>
     <string name="copy_address_to_clipboard">Cím másolása vágólapra</string>
-    <string name="show_auth_cookie">Azonosító süti megjelenítése</string>
     <string name="backup_service">Mentő szolgáltatás</string>
     <string name="delete_service">Szolgáltatás Törlése</string>
     <string name="backup_saved_at_external_storage">Külső tárhelyre mentve</string>
@@ -142,16 +139,8 @@
     <string name="confirm_service_deletion">Szolgáltatás törlés jóváhagyása</string>
     <string name="service_type">Szolgáltatás típus</string>
     <string name="auth_cookie">Azonosító süti</string>
-    <string name="copy_cookie_to_clipboard">Süti másolása vágólapra</string>
-    <string name="auth_cookie_was_not_configured">Azonosító süti nem konfigurált</string>
     <string name="please_restart_Orbot_to_enable_the_changes">Kérlek indítsd újra az Orbot-ot a változások engedélyezéséhez</string>
-    <string name="client_cookies">Kliens sütik</string>
     <string name="onion">.onion</string>
-    <string name="cookie_from_QR">Olvasás QR-ból</string>
-    <string name="backup_cookie">Süti mentése</string>
-    <string name="delete_cookie">Süti törlése</string>
-    <string name="confirm_cookie_deletion">Süti törlés jóváhagyása</string>
-    <string name="hosted_services">Futtatott szolgáltatások</string>
     <string name="share_as_qr">Megosztás QR-ként</string>
     <string name="disable">Kikapcsol</string>
     <string name="enable">Engedélyezés</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 672bd7a6..cae38518 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -88,7 +88,6 @@
     <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
     <string name="found_existing_tor_process">menemukan proses Tor yang ada…</string>
     <string name="something_bad_happened">Sesuatu yang buruk terjadi. Periksa log</string>
-    <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama layanan tersembunyi</string>
     <string name="unable_to_start_tor">Tidak dapat memulai Tor:</string>
     <string name="pref_use_persistent_notifications">Selalu pelihara icon dalam toolbar ketika Orbot terhubung</string>
     <string name="pref_use_persistent_notifications_title">Pemberitahuan Selalu-Hidup</string>
@@ -120,7 +119,6 @@
     <string name="done">Beres!</string>
     <string name="name">Nama</string>
     <string name="menu_hidden_services">Perkhidmatan Onion</string>
-    <string name="title_activity_hidden_services">Perkhidmatan Onion</string>
     <string name="apps_mode">Mode VPN</string>
     <string name="mebibyte">MiB</string>
     <string name="kibibyte">KiB</string>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index f3b43b3e..9b23f2fe 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -92,7 +92,6 @@
     <string name="hidden_service_request">Forrit vill opna onion-netþjón á gáttinni %1$s inn á Tor-netið. Þetta er öruggt ef þú treystir forritinu.</string>
     <string name="found_existing_tor_process">fann annað Tor-ferli…</string>
     <string name="something_bad_happened">Eitthvað slæmt gerðist. Athugaðu atvikakráninguna</string>
-    <string name="unable_to_read_hidden_service_name">get ekki lesið heiti földu þjónustunnar</string>
     <string name="unable_to_start_tor">Get ekki ræst Tor:</string>
     <string name="pref_use_persistent_notifications">Alltaf hafa táknmynd í verkfærastiku þegar Orbot er tengt</string>
     <string name="pref_use_persistent_notifications_title">Alltaf-á tilkynningar</string>
@@ -123,7 +122,6 @@
     <string name="send_email">Senda tölvupóst</string>
     <string name="vpn_default_world">Víðvært (sjálfvirkt)</string>
     <string name="hidden_services">Faldar þjónustur</string>
-    <string name="title_activity_hidden_services">Faldar þjónustur</string>
     <string name="menu_hidden_services">Faldar þjónustur</string>
     <string name="save">Vista</string>
     <string name="local_port">Staðvær gátt</string>
@@ -131,7 +129,6 @@
     <string name="name">Heiti</string>
     <string name="done">Lokið!</string>
     <string name="copy_address_to_clipboard">Afrita vistfang yfir á klippispjald</string>
-    <string name="show_auth_cookie">Birta auðkenningar-vefköku</string>
     <string name="backup_service">Öryggisafritunarþjónusta <i>(Aðvörun: Þetta gæti gert uppsetningu þjónustunnar þinnar sýnilega öðrum forritum)</i></string>
     <string name="delete_service">Eyða þjónustu</string>
     <string name="backup_saved_at_external_storage">Öryggisafrit var vistað í ytri gagnageymslu</string>
@@ -142,16 +139,8 @@
     <string name="confirm_service_deletion">Staðfestu eyðingu á þjónustu</string>
     <string name="service_type">Tegund þjónustu</string>
     <string name="auth_cookie">Auðkenningar-vefkaka</string>
-    <string name="copy_cookie_to_clipboard">Afrita vefköku á klippispjald</string>
-    <string name="auth_cookie_was_not_configured">Auðkenningar-vefkaka var ekki stillt</string>
     <string name="please_restart_Orbot_to_enable_the_changes">Endurræstu Orbot til að breytingarnar taki gildi</string>
-    <string name="client_cookies">Vefkökur forritsins</string>
     <string name="onion">.onion</string>
-    <string name="cookie_from_QR">Lesa úr QR-kóða</string>
-    <string name="backup_cookie">Öryggisafrit af vefköku</string>
-    <string name="delete_cookie">Eyða vefköku</string>
-    <string name="confirm_cookie_deletion">Staðfestu eyðingu vefköku</string>
-    <string name="hosted_services">Hýstar þjónustur</string>
     <string name="share_as_qr">Deila sem QR-kóða</string>
     <string name="disable">Gera óvirkt</string>
     <string name="enable">Virkja</string>
@@ -224,7 +213,6 @@
     <string name="v3_client_auth_activity_title">v3 auðkenning biðlara</string>
     <string name="v3_client_auth">Auðkenning biðlara á v3 onion-þjónustum</string>
     <string name="v3_hosted_services">Hýstar v3 onion-þjónustur</string>
-    <string name="v2_hidden_services">v2 onion-þjónustur (úrelt)</string>
     <string name="deny">Hafna</string>
     <string name="allow">Leyfa</string>
     <string name="snowflake_proxy_enabled">SNOWFLAKE-MILLIÞJÓNSHAMUR VIRKUR</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index a5148006..19f07d70 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -92,7 +92,6 @@
     <string name="hidden_service_request">Un\'app vuole aprire unserver nascosto sulla porta %1$s verso la rete Tor. È un\'azione sicura se ti fidi dell\'app.</string>
     <string name="found_existing_tor_process">trovato un processo Tor esistente…</string>
     <string name="something_bad_happened">E\' accaduto un evento indesiderato. Controllare i log</string>
-    <string name="unable_to_read_hidden_service_name">Impossibile leggere il nome del servizio onion</string>
     <string name="unable_to_start_tor">Impossibile avviare Tor:</string>
     <string name="pref_use_persistent_notifications">Mantieni sempre l\'icona nella barra degli strumenti quando Orbot è connesso</string>
     <string name="pref_use_persistent_notifications_title">Notifiche sempre attive</string>
@@ -123,7 +122,6 @@
     <string name="send_email">Invia email</string>
     <string name="vpn_default_world">Globale (Auto)</string>
     <string name="hidden_services">Servizi nascosti</string>
-    <string name="title_activity_hidden_services">Servizi nascosti</string>
     <string name="menu_hidden_services">Servizi nascosti</string>
     <string name="save">Salva</string>
     <string name="local_port">Porta locale</string>
@@ -131,7 +129,6 @@
     <string name="name">Nome</string>
     <string name="done">Fatto!</string>
     <string name="copy_address_to_clipboard">Copia l\'indirizzo negli appunti</string>
-    <string name="show_auth_cookie">Mostra cookie di autenticazione</string>
     <string name="backup_service">Servizio di backup <i>(Attenzione: ciò può esporre la configurazione del tuo servizio ad altre app)</i></string>
     <string name="delete_service">Elimina il servizio</string>
     <string name="backup_saved_at_external_storage">Backup salvato nell\'archiviazione esterna</string>
@@ -142,16 +139,8 @@
     <string name="confirm_service_deletion">Conferma l\'eliminazione del servizio</string>
     <string name="service_type">Tipo di servizio</string>
     <string name="auth_cookie">Cookie autenticazione</string>
-    <string name="copy_cookie_to_clipboard">Copia cookie negli appunti</string>
-    <string name="auth_cookie_was_not_configured">Cookie di autenticazione non configurato</string>
     <string name="please_restart_Orbot_to_enable_the_changes">Per favore riavvia Orbot per rendere effettive le modifiche</string>
-    <string name="client_cookies">Cookie del client</string>
     <string name="onion">.onion</string>
-    <string name="cookie_from_QR">Leggi da QR</string>
-    <string name="backup_cookie">Backup cookie</string>
-    <string name="delete_cookie">Elimina cookie</string>
-    <string name="confirm_cookie_deletion">Conferma eliminazione cookie</string>
-    <string name="hosted_services">Servizi ospitati</string>
     <string name="share_as_qr">Condividi come QR</string>
     <string name="disable">Disabilita</string>
     <string name="enable">Abilita</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 609fc7f8..6609092c 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -78,7 +78,6 @@
     <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
     <string name="found_existing_tor_process">× ×ž×¦× תהליך Tor קיים…</string>
     <string name="something_bad_happened">משהו רע התרחש. בדוק את היומן</string>
-    <string name="unable_to_read_hidden_service_name">לא מסוגל לקרוא שם שירות × ×¡×ª×¨</string>
     <string name="unable_to_start_tor">לא מסוגל להתחיל את Tor:</string>
     <string name="pref_use_persistent_notifications">לשמור תמיד את האיקון בסרגל כלים כשאורבוט מחובר</string>
     <string name="set_locale_title">שפה</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index d9f963fc..18c10e0a 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -92,7 +92,6 @@
     <string name="hidden_service_request">アプリが非公開サーバーポート %1$d ã‚’Torãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«é–‹æ”¾ã—ã‚ˆã†ã¨ã—ã¦ã„ã¾ã™ã€‚ä¿¡é ¼ã§ãã‚‹ã‚¢ãƒ—ãƒªã§ã‚ã‚Œã°ã“ã‚Œã¯å®‰å…¨ã§ã™ã€‚</string>
     <string name="found_existing_tor_process">Torプロセスを発見</string>
     <string name="something_bad_happened">何かが起こりました。ログを確認してください。</string>
-    <string name="unable_to_read_hidden_service_name">hidden serviceの名前読込不能</string>
     <string name="unable_to_start_tor">Torを実行できませんでした</string>
     <string name="pref_use_persistent_notifications">Orbotが接続中はアイコンを常にツールバーに表示</string>
     <string name="pref_use_persistent_notifications_title">通知を常に有効化</string>
@@ -123,7 +122,6 @@
     <string name="send_email">メール送信</string>
     <string name="vpn_default_world">世界中 (自動)</string>
     <string name="hidden_services">Hidden Services</string>
-    <string name="title_activity_hidden_services">Hidden Services</string>
     <string name="menu_hidden_services">Hidden Services</string>
     <string name="save">保存</string>
     <string name="local_port">ローカルポート</string>
@@ -131,7 +129,6 @@
     <string name="name">名前</string>
     <string name="done">完了</string>
     <string name="copy_address_to_clipboard">アドレスをクリップボードにコピー</string>
-    <string name="show_auth_cookie">Cookie 認証を非表示</string>
     <string name="backup_service">バックアップサービス</string>
     <string name="delete_service">サービスを削除</string>
     <string name="backup_saved_at_external_storage">バックアップは外部記憶装置に保存されました</string>
@@ -142,16 +139,8 @@
     <string name="confirm_service_deletion">サービス削除を確認</string>
     <string name="service_type">サービスタイプ</string>
     <string name="auth_cookie">Cookie 認証</string>
-    <string name="copy_cookie_to_clipboard">Cookie をクリップボードにコピー</string>
-    <string name="auth_cookie_was_not_configured">Authクッキーは設定されませんでした</string>
     <string name="please_restart_Orbot_to_enable_the_changes">変更を有効にするにはOrbotを再起動してください</string>
-    <string name="client_cookies">クライアント Cookie</string>
     <string name="onion">.onion</string>
-    <string name="cookie_from_QR">QRコードから読み取り</string>
-    <string name="backup_cookie">Cookie をバックアップ</string>
-    <string name="delete_cookie">Cookie を削除</string>
-    <string name="confirm_cookie_deletion">クッキー削除を確認</string>
-    <string name="hosted_services">ホスト型サービス</string>
     <string name="share_as_qr">QR でシェア</string>
     <string name="disable">無効</string>
     <string name="enable">有効</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index cfd5a59b..e0d6a39f 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -88,8 +88,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
     <string name="found_existing_tor_process">ì¡´ìž¬í•˜ê³  있는 Tor 프로세스 발견</string>
   <string name="something_bad_happened">어떤 나쁜 것이 발생. 로그 확인하세요.</string>
-    <string name="unable_to_read_hidden_service_name">ížˆë“  서비스 이름을 읽을 수 없음</string>
-  <string name="unable_to_start_tor">Tor 시작 불가능</string>
+    <string name="unable_to_start_tor">Tor 시작 불가능</string>
     <string name="pref_use_persistent_notifications">Orbot이 연결되었을 때 툴바에 아이콘 보이기</string>
   <string name="pref_use_persistent_notifications_title">항상 켜진 알림</string>
   <string name="pref_use_expanded_notifications">출구 및 IP ì •ë³´ì•Œë¦¼ 보이기</string>
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index f56b9f76..84f4a16c 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -20,7 +20,6 @@
     <string name="pref_reduced_circuit_padding_summary">Norėdami sumažinti duomenų ir akumuliatoriaus naudojimą, naudokite žemesnius užpildymo algoritmus</string>
     <string name="pref_circuit_padding_summary">Įgalinti grandinės užpildymą, kad būtų galima apsisaugoti nuo kai kurių srauto analizės formų</string>
     <string name="pref_isolate_dest_summary">Kiekvienam paskirties adresui naudoti skirtingÄ… grandinÄ™</string>
-    <string name="hosted_services">Patalpintos paslaugos</string>
     <string name="backup_port_exist">Klaida: „Onion Service“ jau naudoja prievadą %s</string>
     <string name="name">Pavadinimas</string>
     <string name="v3_hosted_services">„v3 Onion Services“ priegloba</string>
@@ -38,7 +37,6 @@
     <string name="v3_key_hash">x25519 privatus raktas 32 bazÄ—je</string>
     <string name="bridge_snowflake">Prisijungti per kitus „Tor“ sujungimus (eksperimentinis)</string>
     <string name="solve_captcha_instruction">Išspręskite CAPTCHA, kad galėtumėte prašyti tiltų.</string>
-    <string name="unable_to_read_hidden_service_name">nepavyksta perskaityti onion paslaugos pavadinimo</string>
     <string name="ports_reachable_behind_a_restrictive_firewall">Prievadai, pasiekiami už ribojančiosios ugniasienės</string>
     <string name="listening_port_for_your_tor_relay">„Tor“ relės klausymo prievadas</string>
     <string name="v3_client_auth">v3 „Onion Service“ kliento autorizavimas</string>
@@ -46,7 +44,6 @@
     <string name="bridge_direct_connect">Prisijungti tiesiogiai prie „Tor“ (geriausia)</string>
     <string name="testing_bridges_success">Sėkmė. Tilto konfigūracija gera!</string>
     <string name="testing_bridges">Tikrinamas tilto prijungimas prie „Tor“….</string>
-    <string name="auth_cookie_was_not_configured">Auth slapukas nebuvo sukonfigūruotas</string>
     <string name="backup_saved_at_external_storage">Atsarginė kopija išsaugota išorinėje saugykloje</string>
     <string name="updating_settings_in_tor_service">atnaujinami „Tor“ paslaugos nustatymai</string>
     <string name="pref_open_proxy_on_all_interfaces_title">Atidaryti įgaliotąjį serverį visose sąsajose</string>
@@ -54,7 +51,6 @@
     <string name="use_only_these_specified_nodes">Naudoti *tik* Å¡iuos nurodytus mazgus</string>
     <string name="v3_delete_client_authorization">IÅ¡trinti kliento autorizavimo raktÄ…</string>
     <string name="v3_backup_key">Padaryti kliento autorizavimo rakto atsarginÄ™ kopijÄ…</string>
-    <string name="v2_hidden_services">v2 „Onion Services“ (nebenaudojama)</string>
     <string name="request_bridges_from_torproject">Prašyti tiltų iš torproject.org</string>
     <string name="enter_characters_from_image">Įveskite simbolius iš vaizdo</string>
     <string name="testing_tor_direct">Bandomas ryšys su „Tor“…</string>
@@ -65,7 +61,6 @@
     <string name="testing_bridges_fail">NEPAVYKO. Išbandykite kitą parinktį</string>
     <string name="consider_enable_battery_optimizations">Apsvarstykite galimybę įjungti baterijos optimizavimą</string>
     <string name="consider_disable_battery_optimizations">Apsvarstykite galimybę išjungti baterijos optimizavimą</string>
-    <string name="copy_cookie_to_clipboard">Kopijuoti slapuką į iškarpinę</string>
     <string name="create_a_backup_first">Pirmiausia sukurkite atsarginÄ™ kopijÄ…</string>
     <string name="copy_address_to_clipboard">Kopijuoti adresą į iškarpinę</string>
     <string name="unable_to_start_tor">Nepavyko paleisti „Tor“:</string>
@@ -89,10 +84,7 @@
     <string name="pref_reduced_connection_padding">Sumažintas ryšio užpildymas</string>
     <string name="pref_isolate_dest">IÅ¡skirti paskirties adresus</string>
     <string name="share_as_qr">Bendrinti kaip QR</string>
-    <string name="confirm_cookie_deletion">Patvirtinti slapuko ištrynimą</string>
-    <string name="cookie_from_QR">Skaityti iš QR</string>
     <string name="confirm_service_deletion">Patvirtinti paslaugos ištrynimą</string>
-    <string name="show_auth_cookie">Rodyti auth slapukÄ…</string>
     <string name="pref_torrc_title">„Torrc“ pasirinktinė konfigūracija</string>
     <string name="pref_dnsport_dialog">DNS prievado konfigūracija</string>
     <string name="pref_dnsport_title">„Tor“ DNS prievadas</string>
@@ -133,9 +125,6 @@
     <string name="trouble_connecting">Nepavyksta prisijungti\?</string>
     <string name="app_shortcuts">„Tor“ įgalintos programos</string>
     <string name="pref_connection_padding">Ryšio užpildymas</string>
-    <string name="delete_cookie">IÅ¡trinti slapukÄ…</string>
-    <string name="backup_cookie">AtsarginÄ—s kopijos slapukas</string>
-    <string name="client_cookies">Kliento slapukai</string>
     <string name="auth_cookie">Auth slapukas</string>
     <string name="service_type">Paslaugos tipas</string>
     <string name="restore_backup">Atkurti atsarginÄ™ kopijÄ…</string>
@@ -144,7 +133,6 @@
     <string name="onion_port">Onion prievadas</string>
     <string name="local_port">Vietinis prievadas</string>
     <string name="menu_hidden_services">Onion paslaugos</string>
-    <string name="title_activity_hidden_services">Onion paslaugos</string>
     <string name="hidden_services">Onion paslaugos</string>
     <string name="vpn_default_world">Visuotinis (automatinis)</string>
     <string name="send_email">Siųsti el. laišką</string>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index fb007f45..b5e41698 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -88,8 +88,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
     <string name="found_existing_tor_process">Atrada esošu Tor procesu…</string>
   <string name="something_bad_happened">Nav labi. Pārbaudiet žurnālu</string>
-    <string name="unable_to_read_hidden_service_name">Nespēj lasīt slēpta pakalpojuma nosaukumu</string>
-  <string name="unable_to_start_tor">Nevar startēt Tor:</string>
+    <string name="unable_to_start_tor">Nevar startēt Tor:</string>
     <string name="pref_use_persistent_notifications">Vienmēr paturēt ikonu rīkjoslā, kad Orbot ir savienots</string>
   <string name="pref_use_persistent_notifications_title">Vienmēr ieslēgtie paziņojumi</string>
   <string name="pref_use_expanded_notifications">Rādīt paplašinātus paziņojumus, kur norādīts IP un Tor izejas valsts</string>
@@ -116,8 +115,7 @@
     <string name="get_bridges_email">E-pasts</string>
   <string name="send_email">Nosūtīt e-pastu</string>
   <string name="hidden_services">Slēptie pakalpojumi</string>
-  <string name="title_activity_hidden_services">Slēptie pakalpojumi</string>
-  <string name="menu_hidden_services">Slēptie pakalpojumi</string>
+    <string name="menu_hidden_services">Slēptie pakalpojumi</string>
   <string name="save">Saglabāt</string>
   <string name="name">Vārds</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Lūdzu pārstartējiet Orbot, lai iespējotu izmaiņas</string>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index 58a2637a..d464ec58 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -92,7 +92,6 @@
     <string name="hidden_service_request">Апликација сака да отвори сокриена серверска порта %1$d кон Tor мрежата. Ова е безбедно доколку и верувате на апликацијата.</string>
     <string name="found_existing_tor_process">Пронајден постоечки Tor-процес …</string>
     <string name="something_bad_happened">Се случи грешка. Проверете го дневникот</string>
-    <string name="unable_to_read_hidden_service_name">не може да се прочита името на скриениот сервис</string>
     <string name="unable_to_start_tor">Tor не може да се стартува:</string>
     <string name="pref_use_persistent_notifications">Секогаш чувајте ја иконата во лентата со алатки кога Orbot е поврзан</string>
     <string name="pref_use_persistent_notifications_title">Известувања секогаш вклучени</string>
@@ -123,7 +122,6 @@
     <string name="send_email">Испратете е-пошта</string>
     <string name="vpn_default_world">Глобално (Автоматски)</string>
     <string name="hidden_services">Скриени сервиси</string>
-    <string name="title_activity_hidden_services">Скриени сервиси</string>
     <string name="menu_hidden_services">Скриени сервиси</string>
     <string name="save">Зачувај</string>
     <string name="local_port">Локална порта</string>
@@ -131,7 +129,6 @@
     <string name="name">Име</string>
     <string name="done">Завршено!</string>
     <string name="copy_address_to_clipboard">Копирај ја адресата за залепување</string>
-    <string name="show_auth_cookie">Покажи автентично колаче</string>
     <string name="backup_service">Резервна копија</string>
     <string name="delete_service">Избриши услуга</string>
     <string name="backup_saved_at_external_storage">Резервната копија е снимена на надворешна меморија</string>
@@ -142,16 +139,8 @@
     <string name="confirm_service_deletion">Потврди бришење на услугата</string>
     <string name="service_type">Тип на услуга</string>
     <string name="auth_cookie">Автентично колаче</string>
-    <string name="copy_cookie_to_clipboard">Копирај колаче за залепување</string>
-    <string name="auth_cookie_was_not_configured">Автентичното колаче не е прилагодено</string>
     <string name="please_restart_Orbot_to_enable_the_changes">Ве молиме стартувајте го повторно Orbot за да се овозможат промените</string>
-    <string name="client_cookies">Клиентски колачиња</string>
     <string name="onion">.onion</string>
-    <string name="cookie_from_QR">Прочитај од QR</string>
-    <string name="backup_cookie">Направи резервна копија на колаче</string>
-    <string name="delete_cookie">Избриши колаче</string>
-    <string name="confirm_cookie_deletion">Потврди бришење на колаче</string>
-    <string name="hosted_services">Хостирани услуги</string>
     <string name="share_as_qr">Сподели како QR</string>
     <string name="disable">Оневозможи</string>
     <string name="enable">Овозможи</string>
diff --git a/app/src/main/res/values-ms-rMY/strings.xml b/app/src/main/res/values-ms-rMY/strings.xml
index f35b7910..bfd5f44c 100644
--- a/app/src/main/res/values-ms-rMY/strings.xml
+++ b/app/src/main/res/values-ms-rMY/strings.xml
@@ -79,13 +79,11 @@
     <string name="third_party_software">3rd-Party-Software: </string>
     <string name="found_existing_tor_process">Proses Tor sedia ada ditemui..</string>
     <string name="something_bad_happened">Sesuatu yang buruk berlaku. Semak log.</string>
-    <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama servis tersembunyi</string>
     <string name="unable_to_start_tor">Tidak dapat memulakan Tor:</string>
     <string name="pref_use_persistent_notifications">Sentiasa biar ikon pada toolbar apabila Orbot bersambung</string>
     <string name="pref_use_persistent_notifications_title">Sentiasa On Notifikasi</string>
     <string name="set_locale_title">Bahasa</string>
     <string name="hidden_services">Perkhidmatan tersembunyi</string>
-    <string name="title_activity_hidden_services">Perkhidmatan tersembunyi</string>
     <string name="menu_hidden_services">Perkhidmatan tersembunyi</string>
     <string name="save">Simpan</string>
     <string name="name">Nama</string>
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index 01d411b4..c3acfb10 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -72,8 +72,7 @@
     <string name="third_party_software">3rd-Party-Software: </string>
   <string name="found_existing_tor_process">Proses Tor sedia ada ditemui..</string>
   <string name="something_bad_happened">Sesuatu yang buruk berlaku. Semak log.</string>
-    <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama servis tersembunyi</string>
-  <string name="unable_to_start_tor">Tidak dapat memulakan Tor:</string>
+    <string name="unable_to_start_tor">Tidak dapat memulakan Tor:</string>
     <string name="pref_use_persistent_notifications">Sentiasa biar ikon pada toolbar apabila Orbot bersambung</string>
   <string name="pref_use_persistent_notifications_title">Sentiasa On Notifikasi</string>
     <string name="set_locale_title">Tetapan Tempatan</string>
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
index c2a6e7bd..d63dceec 100644
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@@ -20,8 +20,7 @@
     <string name="set_locale_title">ဘာသာစကား</string>
   <string name="get_bridges_email">အီးေမးလ္</string>
   <string name="hidden_services">Hidden Services</string>
-  <string name="title_activity_hidden_services">Hidden Services</string>
-  <string name="menu_hidden_services">Hidden Services</string>
+    <string name="menu_hidden_services">Hidden Services</string>
   <string name="save">သိမ္းဆည္းပါ</string>
   <string name="name">အမည်</string>
 </resources>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 0b7203ef..bb64e597 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -90,7 +90,6 @@
     <string name="openssl_version">OpenSSL v1.0.2j: https://www.openssl.org</string>
     <string name="found_existing_tor_process">fant eksisterende Tor-prosess…</string>
     <string name="something_bad_happened">Noe alvorlig skjedde. Sjekk loggen.</string>
-    <string name="unable_to_read_hidden_service_name">klarte ikke å lese skjult tjenestenavn</string>
     <string name="unable_to_start_tor">Klarte ikke å starte Tor:</string>
     <string name="pref_use_persistent_notifications">Alltid behold ikonet i verktøyslinjen når Orbot er tilkoblet</string>
     <string name="pref_use_persistent_notifications_title">Alltid-PÃ¥ -varslinger</string>
@@ -119,7 +118,6 @@
     <string name="apps_mode">VPN-modus</string>
     <string name="send_email">Send e-post</string>
     <string name="hidden_services">Hidden Services</string>
-    <string name="title_activity_hidden_services">Hidden Services</string>
     <string name="menu_hidden_services">Hidden Services</string>
     <string name="save">Lagre</string>
     <string name="local_port">Lokalt port</string>
@@ -135,15 +133,8 @@
     <string name="start_tor_again_for_finish_the_process">Start Tor igjen for å fullføre prosessen</string>
     <string name="confirm_service_deletion">Bekreft sletting av tjeneste</string>
     <string name="service_type">Tjenestetype</string>
-    <string name="copy_cookie_to_clipboard">Kopier kake til utklippstavle</string>
     <string name="please_restart_Orbot_to_enable_the_changes">Gjør omstart av Orbot før endringer trer i kraft</string>
-    <string name="client_cookies">Klientinformasjonskapsler</string>
     <string name="onion">.onion</string>
-    <string name="cookie_from_QR">Les fra QR</string>
-    <string name="backup_cookie">Sikkerhetskopier informasjonskapsel</string>
-    <string name="delete_cookie">Slett informasjonskapsel</string>
-    <string name="confirm_cookie_deletion">Bekreft sletting av informasjonskapsel</string>
-    <string name="hosted_services">Vertstjenester</string>
     <string name="share_as_qr">Del som QR</string>
     <string name="disable">Skru av</string>
     <string name="enable">Slå på</string>
@@ -161,7 +152,6 @@
     <string name="default_socks_http">SOCKS: - HTTP: -</string>
     <string name="pref_http_dialog">HTTP-portoppsett</string>
     <string name="auth_cookie">Identitetsbekreftelseskake</string>
-    <string name="auth_cookie_was_not_configured">Identitetsbekreftelseskake ikke satt opp</string>
     <string name="consider_disable_battery_optimizations">Overvei å skru av batterioptimalisering</string>
     <string name="consider_enable_battery_optimizations">Overvei å skru på batterioptimalisering</string>
     <string name="pref_isolate_dest">Isoler måladresser</string>
@@ -178,7 +168,6 @@
     <string name="pref_reduced_connection_padding">Redusert tilknytningsutfylling</string>
     <string name="pref_connection_padding_summary">Tillat tilknytningsutfylling for å beskytte mot noen typer trafikkanalyse. Forvalg: auto</string>
     <string name="pref_connection_padding">Tilkoblingsutfylling</string>
-    <string name="show_auth_cookie">Vis identitetsbekreftelseskake</string>
     <string name="pref_open_proxy_on_all_interfaces_summary">Tillat Wi-Fi-likemenn, tjudrede enheter, og alle som kan koble til din IP; tilgang til Tor</string>
     <string name="app_shortcuts">Programmer som kan bruke Tor</string>
     <string name="testing_bridges_success">Brooppsettet fungerer.</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index b690a5ab..9140435c 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -92,7 +92,6 @@
     <string name="hidden_service_request">Een app wil de verborgenserverpoort %1$d tot het Tor-netwerk openen. Dit is veilig als je de app vertrouwt.</string>
     <string name="found_existing_tor_process">bestaand Tor-proces gevonden…</string>
     <string name="something_bad_happened">Er is een fout opgetreden. Controleer de log</string>
-    <string name="unable_to_read_hidden_service_name">Kan verborgen dienst-naam niet lezen</string>
     <string name="unable_to_start_tor">Kan Tor niet starten:</string>
     <string name="pref_use_persistent_notifications">Houd icoon in taakbalk zolang Orbot verbonden is</string>
     <string name="pref_use_persistent_notifications_title">Meldingen altijd aan</string>
@@ -123,7 +122,6 @@
     <string name="send_email">E-mail versturen</string>
     <string name="vpn_default_world">Algemeen (automatisch)</string>
     <string name="hidden_services">Verborgen diensten</string>
-    <string name="title_activity_hidden_services">Verborgen diensten</string>
     <string name="menu_hidden_services">Verborgen diensten</string>
     <string name="save">Opslaan</string>
     <string name="local_port">Lokale poort</string>
@@ -131,7 +129,6 @@
     <string name="name">Naam</string>
     <string name="done">Klaar!</string>
     <string name="copy_address_to_clipboard">Adres kopiëren naar klembord</string>
-    <string name="show_auth_cookie">Authenticatiecookie tonen</string>
     <string name="backup_service">Back-updienst</string>
     <string name="delete_service">Dienst verwijderen</string>
     <string name="backup_saved_at_external_storage">Back-up opgeslagen op externe opslag</string>
@@ -142,16 +139,8 @@
     <string name="confirm_service_deletion">Bevestig verwijderen van dienst</string>
     <string name="service_type">Diensttype</string>
     <string name="auth_cookie">Authenticatiecookie</string>
-    <string name="copy_cookie_to_clipboard">Cookie kopiëren naar klembord</string>
-    <string name="auth_cookie_was_not_configured">Authenticatiecookie is niet ingesteld</string>
     <string name="please_restart_Orbot_to_enable_the_changes">Herstart Orbot om de wijzigingen in te schakelen</string>
-    <string name="client_cookies">Cliëntcookies</string>
     <string name="onion">.onion</string>
-    <string name="cookie_from_QR">Lezen van QR-code</string>
-    <string name="backup_cookie">Back-up maken van cookie</string>
-    <string name="delete_cookie">Cookie verwijderen</string>
-    <string name="confirm_cookie_deletion">Bevestig verwijderen van cookie</string>
-    <string name="hosted_services">Gehoste diensten</string>
     <string name="share_as_qr">Delen als QR-code</string>
     <string name="disable">Uitschakelen</string>
     <string name="enable">Inschakelen</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index d41d70ae..8498ab0d 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -88,7 +88,6 @@
     <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
     <string name="found_existing_tor_process">znaleziono istniejący proces Tora…</string>
     <string name="something_bad_happened">Coś nie poszło nie tak. Sprawdź logi</string>
-    <string name="unable_to_read_hidden_service_name">uniemożliw czytanie nazw ukrytych serwisów</string>
     <string name="unable_to_start_tor">Nie można wystartować aplikacji Tor:</string>
     <string name="pref_use_persistent_notifications">Zawsze trzymaj ikonę w pasku powiadomień gdy Orbot jest połączony</string>
     <string name="pref_use_persistent_notifications_title">Powiadomienia zawsze aktywne</string>
@@ -117,7 +116,6 @@
     <string name="apps_mode">Tryb VPN</string>
     <string name="send_email">Wyślij Email</string>
     <string name="hidden_services">Ukryte Usługi</string>
-    <string name="title_activity_hidden_services">Ukryte Usługi</string>
     <string name="menu_hidden_services">Ukryte Usługi</string>
     <string name="save">Zapisz</string>
     <string name="local_port">Lokalne Porty</string>
@@ -138,12 +136,7 @@
     <string name="obfsproxy_version">Obfs4proxy: https://github.com/Yawning/obfs4</string>
     <string name="consider_disable_battery_optimizations">Rozważ wyłączenie optymalizacji baterii</string>
     <string name="share_as_qr">Udostępnij jako QR</string>
-    <string name="confirm_cookie_deletion">Potwierdź usunięcie pliku cookie</string>
-    <string name="delete_cookie">Usuń plik cookie</string>
-    <string name="backup_cookie">Kopia zapasowa pliku cookie</string>
-    <string name="cookie_from_QR">Czytaj z QR</string>
     <string name="onion">.onion</string>
-    <string name="copy_cookie_to_clipboard">Skopiuj plik cookie do schowka</string>
     <string name="service_type">Typ usługi</string>
     <string name="confirm_service_deletion">Potwierdź usunięcie usługi</string>
     <string name="start_tor_again_for_finish_the_process">Uruchom Tor ponownie, aby zakończyć proces</string>
@@ -153,10 +146,7 @@
     <string name="backup_saved_at_external_storage">Kopia zapasowa zapisywana w pamięci zewnętrznej</string>
     <string name="backup_service">Usługa tworzenia kopii zapasowych</string>
     <string name="hidden_service_request">Aplikacja chce otworzyć port serwera cebulowego %1$d do sieci Tor. Jest to bezpieczne, jeśli zaufasz aplikacji.</string>
-    <string name="client_cookies">Klient cookies</string>
     <string name="auth_cookie">Autoryzacja cookie</string>
-    <string name="show_auth_cookie">Pokaż autoryzację cookie</string>
-    <string name="auth_cookie_was_not_configured">Autoryzowany plik cookie nie został skonfigurowany</string>
     <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Jeśli twoja sieć komórkowa aktywnie blokuje Tor, możesz użyć „Serwer mostkowy” jako alternatywnego sposobu wejścia. Wybierz jedną z opcji, aby skonfigurować i przetestować …</string>
     <string name="wizard_details_msg">Orbot to aplikacja typu open source, która zawiera Tor, Obfs4Proxy, BadVPN, Tun2Socks i LibEvent. Zapewnia lokalny serwer proxy HTTP (8118) i serwer proxy SOCKS (9050) do sieci Tor. Orbot ma również możliwość, na zrootowanym urządzeniu, wysyłania całego ruchu internetowego przez Tor.</string>
     <string name="refresh_apps">Odśwież aplikacje</string>
@@ -180,7 +170,6 @@
     <string name="pref_isolate_dest_summary">Użyj innego obwodu dla każdego adresu docelowego</string>
     <string name="pref_isolate_dest">Izoluj adresy docelowe</string>
     <string name="consider_enable_battery_optimizations">Rozważ wyłączenie optymalizacji baterii</string>
-    <string name="hosted_services">Usługi Hostingowe</string>
     <string name="pref_connection_padding">Wypełnienie połączenia</string>
     <string name="pref_connection_padding_summary">Zawsze włącza wypełnienie połączenia, aby chronić się przed niektórymi formami analizy ruchu. Domyślnie: auto</string>
     <string name="default_socks_http">SOCKS: - HTTP: -</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index bd62525f..192fdb6c 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -92,7 +92,6 @@
     <string name="hidden_service_request">Um aplicativo quer abrir uma porta no servidor onion %1$s para a rede Tor. É seguro caso você confie neste aplicativo.</string>
     <string name="found_existing_tor_process">processos Tor existentes foram encontrados…</string>
     <string name="something_bad_happened">Algo ruim aconteceu. Verifique o registro de log</string>
-    <string name="unable_to_read_hidden_service_name">incapaz de ler o nome do serviço onion</string>
     <string name="unable_to_start_tor">Não é possível iniciar o Tor:</string>
     <string name="pref_use_persistent_notifications">Mantenha sempre um ícone na barra de ferramentas quando o Orbot estiver conectado</string>
     <string name="pref_use_persistent_notifications_title">Notificações Sempre Ligadas</string>
@@ -123,7 +122,6 @@
     <string name="send_email">Enviar Email</string>
     <string name="vpn_default_world">Global (Automático)</string>
     <string name="hidden_services">Serviços Ocultos</string>
-    <string name="title_activity_hidden_services">Serviços Ocultos</string>
     <string name="menu_hidden_services">Serviços Ocultos</string>
     <string name="save">Salve</string>
     <string name="local_port">Porta Local</string>
@@ -131,7 +129,6 @@
     <string name="name">Nome</string>
     <string name="done">Feito!</string>
     <string name="copy_address_to_clipboard">Copiar para a area de transferência </string>
-    <string name="show_auth_cookie">Mostre cookie de autenticação</string>
     <string name="backup_service">Serviço de Backup <i>(Aviso: Isso pode expor a sua configuração de serviço para os outros aplicativos)</i></string>
     <string name="delete_service">Remover Serviço</string>
     <string name="backup_saved_at_external_storage">Backup salvo em mídia externa</string>
@@ -141,7 +138,6 @@
     <string name="confirm_service_deletion">Confirmar a remoção do serviço</string>
     <string name="service_type">Tipo do Serviço</string>
     <string name="auth_cookie">Cookie de autenticação</string>
-    <string name="copy_cookie_to_clipboard">Copiar cookie para a area de transferência</string>
     <string name="please_restart_Orbot_to_enable_the_changes">Por favor reinicie Orbot para habilitar as mundanças</string>
     <string name="share_as_qr">Compartilhar como QR</string>
     <string name="disable">Desabilitar</string>
@@ -173,14 +169,7 @@
     <string name="pref_isolate_dest">Isole os endereços do destino</string>
     <string name="consider_enable_battery_optimizations">Considere ativar as otimizações da bateria</string>
     <string name="consider_disable_battery_optimizations">Considere a desativação das otimizações da bateria</string>
-    <string name="hosted_services">Serviços Hospedados</string>
-    <string name="confirm_cookie_deletion">Confirmar a exclusão do cookie</string>
-    <string name="delete_cookie">Excluir o cookie</string>
-    <string name="backup_cookie">Cópia de segurança do cookie</string>
-    <string name="cookie_from_QR">Ler a partir do QR</string>
     <string name="onion">.onion</string>
-    <string name="client_cookies">Cookie dos Clientes</string>
-    <string name="auth_cookie_was_not_configured">O cookie de Autenticação não foi configurado</string>
     <string name="start_tor_again_for_finish_the_process">Inicie o Tor novamente para encerrar o processo</string>
     <string name="pref_http_dialog">Configuração da Porta HTTP</string>
     <string name="pref_http_summary">Porta HTTP onde o proxy do Tor está escutando (a predefinição é: 8118 ou 0 para desativar)</string>
@@ -223,7 +212,6 @@
     <string name="v3_client_auth_activity_title">Autorização v3 do cliente</string>
     <string name="v3_client_auth">Autorização do cliente do serviço Onion v3</string>
     <string name="v3_hosted_services">Serviços Onion v3 hospedados</string>
-    <string name="v2_hidden_services">v2 Onion Services (Descontinuado)</string>
     <string name="deny">Negue</string>
     <string name="allow">Permita</string>
     <string name="backup_port_exist">Erro: Um serviço Onion já está usando a porta %s</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index d3c9255f..02490a92 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -62,11 +62,9 @@
     <string name="pref_isolate_dest_summary">Usar um circuito diferente para cada endereço de destino</string>
     <string name="pref_open_proxy_on_all_interfaces_summary">Permita que pares Wi-Fi, aparelhos conectados e outros que se possam conectar ao seu IP, acessem o Tor</string>
     <string name="user_services">Serviços ao utilizador</string>
-    <string name="backup_cookie">Cookie de backup</string>
     <string name="menu_new_identity">Nova Identidade</string>
     <string name="vpn_disabled">VPN Desativado</string>
     <string name="consider_enable_battery_optimizations">Considere a possibilidade de ativar otimizações de bateria</string>
-    <string name="auth_cookie_was_not_configured">O cookie de autenticação não foi configurado</string>
     <string name="pref_connection_padding_summary">Sempre ativa o preenchimento de conexão para se defender de algumas formas de análise de tráfego. Predefinição: auto</string>
     <string name="pref_isolate_dest">Isolar os endereços de destino</string>
     <string name="pref_disable_ipv4_summary">Diz às saídas para não se conectarem a endereços IPv4</string>
@@ -74,7 +72,6 @@
     <string name="app_services">Serviços de app</string>
     <string name="pref_reduced_connection_padding">Preenchimento de conexão reduzido</string>
     <string name="start_tor_again_for_finish_the_process">Reiniciar o Tor para terminar o processo</string>
-    <string name="delete_cookie">Eliminar cookie</string>
     <string name="default_socks_http">SOCKS: - HTTP: -</string>
     <string name="pref_reduced_connection_padding_summary">Fecha conexões de relé mais cedo e envia menos pacotes de preenchimento para reduzir dados e uso de bateria</string>
     <string name="refresh_apps">Atualizar apps</string>
@@ -85,21 +82,15 @@
     <string name="pref_prefer_ipv6">Preferir conexões IPv6</string>
     <string name="something_bad_happened">Aconteceu algo de mau. Verifique o registo de eventos</string>
     <string name="pref_http_summary">Porta em que o Tor oferece o seu proxy HTTP (predefinição: 8118 ou 0 para desativar)</string>
-    <string name="confirm_cookie_deletion">Confirmar eliminação de cookies</string>
-    <string name="client_cookies">Cookie dos Clientes</string>
     <string name="pref_connection_padding">Preenchimento de conexão</string>
     <string name="pref_open_proxy_on_all_interfaces_title">Abrir o Proxy em Todas as Interfaces</string>
     <string name="pref_http_dialog">Configuração da Porta HTTP</string>
-    <string name="cookie_from_QR">Ler do QR</string>
     <string name="consider_disable_battery_optimizations">Considere a possibilidade de desativar otimizações de bateria</string>
-    <string name="hosted_services">Serviços Hospedados</string>
-    <string name="unable_to_read_hidden_service_name">não é possível ler o nome do serviço ocultado</string>
     <string name="pref_proxy_port_title">Porta Proxy de Saída</string>
     <string name="ports_reachable_behind_a_restrictive_firewall">Portas alcançáveis por detrás de uma Firewal restritiva</string>
     <string name="pref_proxy_username_title">Nome do Utilizador do Proxy de Saída</string>
     <string name="pref_proxy_host_summary">Nome do Hospedeiro do Servidor Proxy</string>
     <string name="updating_settings_in_tor_service">a atualizar as definições no serviço Tor</string>
-    <string name="title_activity_hidden_services">Serviços ocultos</string>
     <string name="menu_hidden_services">Serviços ocultos</string>
     <string name="pref_proxy_type_summary">Protocolo para usar para o servidor proxy: HTTP, HTTPS, Socks4, Socks5</string>
     <string name="pref_proxy_port_summary">Porta do Servidor Proxy</string>
@@ -131,7 +122,6 @@
     <string name="app_shortcuts">Aplicações ativadas para o Tor</string>
     <string name="share_as_qr">Compartilhar como QR</string>
     <string name="please_restart_Orbot_to_enable_the_changes">Por favor reinicie Orbot para ativar as mundanças</string>
-    <string name="copy_cookie_to_clipboard">Copiar cookie para a area de transferência</string>
     <string name="auth_cookie">Cookie de autenticação</string>
     <string name="service_type">Tipo do Serviço</string>
     <string name="confirm_service_deletion">Confirmar a remoção do serviço</string>
@@ -141,7 +131,6 @@
     <string name="backup_saved_at_external_storage">Backup gravado em mídia externa</string>
     <string name="delete_service">Remover Serviço</string>
     <string name="backup_service">Serviço de Backup <i>(Aviso: Isso pode expor a sua configuração de serviço para as outras apps)</i></string>
-    <string name="show_auth_cookie">Mostre cookie de autenticação</string>
     <string name="copy_address_to_clipboard">Copiar para a area de transferência</string>
     <string name="onion_port">Porta Onion</string>
     <string name="local_port">Porta Local</string>
@@ -221,7 +210,6 @@
     <string name="v3_client_auth_activity_title">Autorização v3 do cliente</string>
     <string name="v3_client_auth">Autorização do cliente do serviço Onion v3</string>
     <string name="v3_hosted_services">Serviços Onion v3 hospedados</string>
-    <string name="v2_hidden_services">v2 Onion Services (Descontinuado)</string>
     <string name="get_bridges_email_request">Solicite Pontes através do E-mail</string>
     <string name="mebibyte">MiB</string>
     <string name="kibibyte">KiB</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index b8eca00c..31728d34 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -58,7 +58,6 @@
     <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
     <string name="found_existing_tor_process">processo Tor existente foi encontrado…</string>
     <string name="something_bad_happened">Aconteceu algo de mau. Verifique o registo de eventos</string>
-    <string name="unable_to_read_hidden_service_name">não é possível ler o nome do serviço ocultado</string>
     <string name="unable_to_start_tor">Não é possível iniciar o Tor:</string>
     <string name="pref_use_persistent_notifications_title">Notificações Sempre Ativadas</string>
     <string name="pref_use_expanded_notifications_title">Notificações Estendidas</string>
@@ -71,7 +70,6 @@
     <string name="get_bridges_email">Correio Eletrônico</string>
     <string name="send_email">Enviar Mensagem</string>
     <string name="hidden_services">Serviços ocultos</string>
-    <string name="title_activity_hidden_services">Serviços ocultos</string>
     <string name="menu_hidden_services">Serviços ocultos</string>
     <string name="save">Guardar</string>
     <string name="name">Nome</string>
@@ -96,14 +94,7 @@
     <string name="pref_isolate_dest">Isolar os endereços de destino</string>
     <string name="consider_enable_battery_optimizations">Considere a possibilidade de ativar otimizações de bateria</string>
     <string name="consider_disable_battery_optimizations">Considere a possibilidade de desativar otimizações de bateria</string>
-    <string name="hosted_services">Serviços Hospedados</string>
-    <string name="confirm_cookie_deletion">Confirmar eliminação de cookies</string>
-    <string name="delete_cookie">Eliminar cookie</string>
-    <string name="backup_cookie">Cookie de backup</string>
-    <string name="cookie_from_QR">Ler do QR</string>
     <string name="onion">.onion</string>
-    <string name="client_cookies">Cookie dos Clientes</string>
-    <string name="auth_cookie_was_not_configured">O cookie de autenticação não foi configurado</string>
     <string name="start_tor_again_for_finish_the_process">Reiniciar o Tor para terminar o processo</string>
     <string name="pref_http_dialog">Configuração da Porta HTTP</string>
     <string name="pref_http_summary">Porta em que o Tor oferece o seu proxy HTTP (predefinição: 8118 ou 0 para desativar)</string>
@@ -121,7 +112,6 @@
     <string name="app_shortcuts">Aplicações ativadas para o Tor</string>
     <string name="share_as_qr">Compartilhar como QR</string>
     <string name="please_restart_Orbot_to_enable_the_changes">Por favor reinicie Orbot para ativar as mundanças</string>
-    <string name="copy_cookie_to_clipboard">Copiar cookie para a area de transferência</string>
     <string name="auth_cookie">Cookie de autenticação</string>
     <string name="service_type">Tipo do Serviço</string>
     <string name="confirm_service_deletion">Confirmar a remoção do serviço</string>
@@ -131,7 +121,6 @@
     <string name="backup_saved_at_external_storage">Backup gravado em mídia externa</string>
     <string name="delete_service">Remover Serviço</string>
     <string name="backup_service">Serviço de Backup <i>(Aviso: Isso pode expor a sua configuração de serviço para as outras apps)</i></string>
-    <string name="show_auth_cookie">Mostre cookie de autenticação</string>
     <string name="copy_address_to_clipboard">Copiar para a area de transferência</string>
     <string name="onion_port">Porta Onion</string>
     <string name="local_port">Porta Local</string>
@@ -221,7 +210,6 @@
     <string name="v3_client_auth_activity_title">Autorização v3 do cliente</string>
     <string name="v3_client_auth">Autorização do cliente do serviço Onion v3</string>
     <string name="v3_hosted_services">Serviços Onion v3 hospedados</string>
-    <string name="v2_hidden_services">v2 Onion Services (Descontinuado)</string>
     <string name="get_bridges_email_request">Solicite Pontes através do E-mail</string>
     <string name="mebibyte">MiB</string>
     <string name="kibibyte">KiB</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index c67ef3f4..7c95af48 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -95,16 +95,8 @@
     <string name="enable">Activați</string>
     <string name="disable">Dezactivați</string>
     <string name="share_as_qr">Partajați ca QR</string>
-    <string name="hosted_services">Servicii găzduite</string>
-    <string name="confirm_cookie_deletion">Confirmați ștergerea cookie-urilor</string>
-    <string name="delete_cookie">Ștergeți cookie-ul</string>
-    <string name="backup_cookie">Cookie de rezervă</string>
-    <string name="cookie_from_QR">Citiți din QR</string>
     <string name="onion">.onion</string>
-    <string name="client_cookies">Cookie-uri pentru clienți</string>
     <string name="please_restart_Orbot_to_enable_the_changes">Vă rugăm să reporniți Orbot pentru a activa modificările</string>
-    <string name="auth_cookie_was_not_configured">Cookie-ul de autentificare nu a fost configurat</string>
-    <string name="copy_cookie_to_clipboard">Copiați cookie-ul în clipboard</string>
     <string name="auth_cookie">Cookie de autentificare</string>
     <string name="service_type">Tipul de serviciu</string>
     <string name="confirm_service_deletion">Confirmați ștergerea serviciului</string>
@@ -116,7 +108,6 @@
     <string name="backup_saved_at_external_storage">Copie de rezervă salvată la o unitate de stocare externă</string>
     <string name="delete_service">Ștergeți serviciul</string>
     <string name="backup_service">Serviciul de backup <i>(Atenție: Acest lucru ar putea expune configurația serviciului dvs. altor aplicații)</i></string>
-    <string name="show_auth_cookie">Arată cookie-ul de autentificare</string>
     <string name="copy_address_to_clipboard">Copiați adresa în clipboard</string>
     <string name="done">Realizat!</string>
     <string name="name">Nume</string>
@@ -124,7 +115,6 @@
     <string name="local_port">Port local</string>
     <string name="save">Salvați</string>
     <string name="menu_hidden_services">Onion Servicii</string>
-    <string name="title_activity_hidden_services">Onion Servicii</string>
     <string name="confirm">Confirmați</string>
     <string name="v3_import_auth_private">Importați .auth_private</string>
     <string name="v3_backup_name_hint">Nume fișier de rezervă…</string>
@@ -137,7 +127,6 @@
     <string name="v3_client_auth_activity_title">Autorizare client v3</string>
     <string name="v3_client_auth">v3 Onion Service Autorizare client</string>
     <string name="v3_hosted_services">Servicii găzduite v3 Onion</string>
-    <string name="v2_hidden_services">v2 Onion Servicii (Depreciat)</string>
     <string name="hidden_services">Onion Servicii</string>
     <string name="vpn_default_world">Nivel global (Auto)</string>
     <string name="send_email">Trimiteți un e-mail</string>
@@ -176,7 +165,6 @@
     <string name="pref_use_persistent_notifications_title">Notificări Always-On</string>
     <string name="pref_use_persistent_notifications">Păstrați întotdeauna pictograma în bara de instrumente atunci când Orbot este conectat</string>
     <string name="unable_to_start_tor">Nu se poate porni Tor:</string>
-    <string name="unable_to_read_hidden_service_name">nu se poate citi numele serviciului onion</string>
     <string name="something_bad_happened">S-a întâmplat ceva rău. Verifică jurnalul</string>
     <string name="found_existing_tor_process">a găsit procesul Tor existent…</string>
     <string name="deny">Refuzați</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 8ca87116..60e863f1 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -88,8 +88,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
     <string name="found_existing_tor_process">găsit proces Tor existent…</string>
   <string name="something_bad_happened">Ceva rău s-a întâmplat. Verifică log-ul</string>
-    <string name="unable_to_read_hidden_service_name">nu am putut citi numele serviciului ascuns</string>
-  <string name="unable_to_start_tor">Nu am reuşit să pornesc Tor:</string>
+    <string name="unable_to_start_tor">Nu am reuşit să pornesc Tor:</string>
     <string name="pref_use_persistent_notifications">Arată tot timpul icoana în bară când Orbot este conectat</string>
   <string name="pref_use_persistent_notifications_title">Notificări active tot timpul</string>
   <string name="pref_use_expanded_notifications">Arată notificări extinse cu Tor exit country şi IP</string>
@@ -116,8 +115,7 @@
     <string name="get_bridges_email">Email</string>
   <string name="send_email">Trimite email</string>
   <string name="hidden_services">Servicii ascunse</string>
-  <string name="title_activity_hidden_services">Servicii ascunse</string>
-  <string name="menu_hidden_services">Servicii ascunse</string>
+    <string name="menu_hidden_services">Servicii ascunse</string>
   <string name="save">Salvează</string>
   <string name="name">Nume</string>
   <string name="done">Gata!</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index fd97674d..fff53662 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -92,7 +92,6 @@
     <string name="hidden_service_request">Приложение хочет открыть onion-сервер на порту %1$s в сети Tor. Это безопасно, если вы доверяете приложению.</string>
     <string name="found_existing_tor_process">найден существующий процесс Tor…</string>
     <string name="something_bad_happened">Произошло что-то плохое. Проверьте журнал</string>
-    <string name="unable_to_read_hidden_service_name">невозможно прочитать имя скрытой службы</string>
     <string name="unable_to_start_tor">Невозможно запустить Tor:</string>
     <string name="pref_use_persistent_notifications">Всегда отображать иконку в панели задач когда Orbot подключён</string>
     <string name="pref_use_persistent_notifications_title">Постоянное уведомление о работе</string>
@@ -123,7 +122,6 @@
     <string name="send_email">Отправить письмо</string>
     <string name="vpn_default_world">Мир (авто)</string>
     <string name="hidden_services">Скрытые службы</string>
-    <string name="title_activity_hidden_services">Скрытые службы</string>
     <string name="menu_hidden_services">Скрытые службы</string>
     <string name="save">Сохранить</string>
     <string name="local_port">Локальный порт</string>
@@ -131,7 +129,6 @@
     <string name="name">Имя</string>
     <string name="done">Готово!</string>
     <string name="copy_address_to_clipboard">Скопировать адрес в буфер обмена</string>
-    <string name="show_auth_cookie">Показать авторизирующие cookie</string>
     <string name="backup_service">Резервное копирование службы <i>(Внимание: это может раскрыть конфигурацию вашей службы другим приложениям)</i></string>
     <string name="delete_service">Удалить службу</string>
     <string name="backup_saved_at_external_storage">Резервная копия сохранена на внешнем хранилище</string>
@@ -142,16 +139,8 @@
     <string name="confirm_service_deletion">Подтверждение удаления службы</string>
     <string name="service_type">Тип службы</string>
     <string name="auth_cookie">Авторизирующие cookie</string>
-    <string name="copy_cookie_to_clipboard">Копировать cookie в буфер обмена</string>
-    <string name="auth_cookie_was_not_configured">Авторизирующие cookie не настроены</string>
     <string name="please_restart_Orbot_to_enable_the_changes">Пожалуйста, перезапустите Orbot для вступления изменения в силу</string>
-    <string name="client_cookies">Cookies для клиентов</string>
     <string name="onion">.onion</string>
-    <string name="cookie_from_QR">Прочитать из QR-кода</string>
-    <string name="backup_cookie">Резервировать cookie</string>
-    <string name="delete_cookie">Удалить cookies</string>
-    <string name="confirm_cookie_deletion">Подтвердите удаление cookie</string>
-    <string name="hosted_services">Размещённые службы</string>
     <string name="share_as_qr">Поделиться через QR-код</string>
     <string name="disable">Отключить</string>
     <string name="enable">Включить</string>
@@ -223,7 +212,6 @@
     <string name="v3_client_auth_activity_title">v3 Авторизация клиента</string>
     <string name="v3_client_auth">v3 Onion Service Авторизация Клиента</string>
     <string name="v3_hosted_services">Хостинг v3 Onion Services</string>
-    <string name="v2_hidden_services">v2 Onion Services (Устаревшие)</string>
     <string name="get_bridges_email_request">Запросить мосты по электронной почте</string>
     <string name="mebibyte">MiB</string>
     <string name="kibibyte">KiB</string>
diff --git a/app/src/main/res/values-si-rLK/strings.xml b/app/src/main/res/values-si-rLK/strings.xml
index 2a490c83..d969e0c3 100644
--- a/app/src/main/res/values-si-rLK/strings.xml
+++ b/app/src/main/res/values-si-rLK/strings.xml
@@ -74,13 +74,11 @@
     <string name="third_party_software">3 වන පාර්ශව මෘදුකාංග</string>
     <string name="found_existing_tor_process">පවතින Tor ක්‍රියාවලි හමුවිය…</string>
     <string name="something_bad_happened">යම් නොමනා දෙයක් සිදුවිය. ලොගය පරික්ෂා කර බලන්න </string>
-    <string name="unable_to_read_hidden_service_name">සැගවුණු සේවා නාමය කියවීමට නොහැකිය </string>
     <string name="unable_to_start_tor">Tor ආරම්භ කිරීමට නොහැකිය:</string>
     <string name="pref_use_persistent_notifications">Orbot සම්බන්ධ වී ඇති සැමවිටම විට මෙවලම් තීරුවේ නිරූපකය තබාගන්න</string>
     <string name="pref_use_persistent_notifications_title">නිවේදන ලැබීමට සලස්වන්න </string>
     <string name="set_locale_title">භාෂාව</string>
     <string name="hidden_services">සැගවුණු සේවා </string>
-    <string name="title_activity_hidden_services">සැගවුණු සේවා </string>
     <string name="menu_hidden_services">සැගවුණු සේවා </string>
     <string name="save">සුරකින්න</string>
     <string name="name">නම</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index e99fcfad..e9f5f779 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -88,8 +88,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
     <string name="found_existing_tor_process">nájdený iný proces Tor…</string>
   <string name="something_bad_happened">Deje sa niečo zlé. Skontrolujte podrobnosti.</string>
-    <string name="unable_to_read_hidden_service_name">nemožné prečítať názov skrytej služby</string>
-  <string name="unable_to_start_tor">Nemožné spustiť Tor:</string>
+    <string name="unable_to_start_tor">Nemožné spustiť Tor:</string>
     <string name="pref_use_persistent_notifications">Vždy ponechať ikonu v stavovom riadku, keď je Orbot pripojený</string>
   <string name="pref_use_persistent_notifications_title">Vždy zapnuté upozornenia</string>
   <string name="pref_use_expanded_notifications">Zobraziť rozšírené upozornenie s výstupnou krajinou a IP adresou siete Tor</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index fd39aaba..23ed463d 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -90,8 +90,7 @@
     <string name="hidden_service_request">Апликација жели да отвори сакривен порт%1$d на серверу за Тор мрежу. Ово је сигуран потез уколико верујете апликацији.</string>
   <string name="found_existing_tor_process">нађен покренути Тор процес…</string>
   <string name="something_bad_happened">Нешто лоше се догодило. Прегледајте логове</string>
-    <string name="unable_to_read_hidden_service_name">нисам у могућности да прочитам име сакривеног сервиса</string>
-  <string name="unable_to_start_tor">Тор није у могућности да се покрене:</string>
+    <string name="unable_to_start_tor">Тор није у могућности да се покрене:</string>
     <string name="pref_use_persistent_notifications">Увек прикажи икону у тулбару када је Орбот конектован</string>
   <string name="pref_use_persistent_notifications_title">Стално укључене нотификације</string>
   <string name="pref_use_expanded_notifications">Прикажи опширно обавештење Тор излаза државе и IP-ја</string>
@@ -121,7 +120,6 @@
     <string name="send_email">Пошаљи Е-пошту</string>
   <string name="vpn_default_world">Глобално (Аутоматски)</string>
   <string name="hidden_services">Скривени Сервиси</string>
-  <string name="title_activity_hidden_services">Скривени Сервиси</string>
   <string name="menu_hidden_services">Скривени Сервиси</string>
   <string name="save">Сачувај</string>
     <string name="local_port">Локални Порт</string>
@@ -129,8 +127,7 @@
   <string name="name">Име</string>
   <string name="done">Готово !</string>
     <string name="copy_address_to_clipboard">Копирај адреса у clipboard</string>
-  <string name="show_auth_cookie">Покажите ауторизовани колачић</string>
-  <string name="backup_service">Услуга за резервне копије</string>
+    <string name="backup_service">Услуга за резервне копије</string>
   <string name="delete_service">Обриши Услугу</string>
   <string name="backup_saved_at_external_storage">Резербна копија је сачувана на спољној меморији</string>
   <string name="backup_restored">Резервна копија је обновљена</string>
@@ -140,13 +137,7 @@
   <string name="confirm_service_deletion">Потрврди брисанје услуге</string>
     <string name="service_type">Тип Услуге</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Молимо покрените поново Орбот ради примењивања промена</string>
-  <string name="client_cookies">Колачићи клијента</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">Прочитај са QR кода</string>
-  <string name="backup_cookie">Резервна копија колачића</string>
-  <string name="delete_cookie">Избриши колачић</string>
-  <string name="confirm_cookie_deletion">Потрврди брисање колачића</string>
-  <string name="hosted_services">Хостоване Услуге</string>
   <string name="share_as_qr">Дели као QR код</string>
   <string name="disable">Онемогући</string>
   <string name="enable">Омогући</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index da853339..2dc2eaeb 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -92,7 +92,6 @@
     <string name="hidden_service_request">En app vill öppna dold serverport %1$d till Tor-nätverket. Det här är säkert om du litar på appen.</string>
     <string name="found_existing_tor_process">hittade existerande Tor process…</string>
     <string name="something_bad_happened">Något dåligt hände. Kolla loggen</string>
-    <string name="unable_to_read_hidden_service_name">kan inte läsa gömda tjänstens namn</string>
     <string name="unable_to_start_tor">Kan inte starta Tor:</string>
     <string name="pref_use_persistent_notifications">Behåll alltid ikonen i verktygsfältet när Orbot är ansluten</string>
     <string name="pref_use_persistent_notifications_title">Alltid-PÃ¥ Notifikationer</string>
@@ -123,7 +122,6 @@
     <string name="send_email">Skicka e-post</string>
     <string name="vpn_default_world">Global (automatisk)</string>
     <string name="hidden_services">Hidden Services</string>
-    <string name="title_activity_hidden_services">Hidden Services</string>
     <string name="menu_hidden_services">Hidden Services</string>
     <string name="save">Spara</string>
     <string name="local_port">Lokal port</string>
@@ -131,7 +129,6 @@
     <string name="name">Namn</string>
     <string name="done">Klart!</string>
     <string name="copy_address_to_clipboard">Kopiera adress till urklipp</string>
-    <string name="show_auth_cookie">Visa auth kaka</string>
     <string name="backup_service">Säkerhetskopiera tjänst</string>
     <string name="delete_service">Ta bort tjänst</string>
     <string name="backup_saved_at_external_storage">Säkerhetskopiering sparad i externt lagringsutrymme</string>
@@ -142,16 +139,8 @@
     <string name="confirm_service_deletion">Bekräfta tjänst borttagning</string>
     <string name="service_type">Typ av tjänst</string>
     <string name="auth_cookie">Auth kaka</string>
-    <string name="copy_cookie_to_clipboard">Kopiera kaka till urklipp</string>
-    <string name="auth_cookie_was_not_configured">Auth kaka var inte konfigurerad</string>
     <string name="please_restart_Orbot_to_enable_the_changes">Vänligen starta om Orbot för att aktivera ändringarna</string>
-    <string name="client_cookies">Klientkakor</string>
     <string name="onion">.onion</string>
-    <string name="cookie_from_QR">Läs från QR</string>
-    <string name="backup_cookie">Säkerhetskopiera kaka</string>
-    <string name="delete_cookie">Ta bort kaka</string>
-    <string name="confirm_cookie_deletion">Bekräfta borttagning av kaka</string>
-    <string name="hosted_services">Värdtjänster</string>
     <string name="share_as_qr">Dela som QR</string>
     <string name="disable">Inaktivera</string>
     <string name="enable">Aktivera</string>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index ae302dc0..1971ddc2 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -35,11 +35,7 @@
   <string name="save">சேமி</string>
   <string name="name">பெயர்</string>
   <string name="service_type">சேவை வகை</string>
-  <string name="backup_cookie">நினைவிகளை காப்புப்பிரதிகலெடு</string>
-  <string name="delete_cookie">நினைவிகளை ஆழி</string>
-  <string name="confirm_cookie_deletion">நினைவிகளின் நீக்கத்தை உறுதிப்படுத்து</string>
-  <string name="hosted_services">வழங்கப்பட்ட சேவைகள்</string>
-  <string name="share_as_qr">QR ஆக பகிர்</string>
+    <string name="share_as_qr">QR ஆக பகிர்</string>
   <string name="disable">முடக்கு</string>
   <string name="enable">செயல்படுத்து</string>
   <string name="trouble_connecting">இணைப்பதில் சிக்கலா ?</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 63695c38..52f7d9fa 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -92,7 +92,6 @@
     <string name="hidden_service_request">โปรแกรมต้องการเปิดพอร์ต %1$d ที่ซ่อนอยู่ของเซิร์ฟเวอร์ให้เชื่อมกับเครือข่าย Tor การกระทำนี้ปลอดภัยถ้าคุณเชื่อถือโปรแกรมนั้น</string>
     <string name="found_existing_tor_process">พบกระบวนการ Tor ที่มีอยู่แล้ว…</string>
     <string name="something_bad_happened">เกิดอะไรไม่ดีสักอย่าง ให้ตรวจดูจากบันทึก</string>
-    <string name="unable_to_read_hidden_service_name">ไม่สามารถอ่านชื่อของบริการที่ซ่อน</string>
     <string name="unable_to_start_tor">ไม่สามารถเริ่ม Tor:</string>
     <string name="pref_use_persistent_notifications">แสดงไอคอนในทูลบาร์เสมอเมื่อ Orbot เชื่อมต่ออยู่</string>
     <string name="pref_use_persistent_notifications_title">การแจ้งเตือนแบบตลอดเวลา</string>
@@ -123,7 +122,6 @@
     <string name="send_email">ส่งอีเมล</string>
     <string name="vpn_default_world">ทั่วโลก (อัตโนมัติ)</string>
     <string name="hidden_services">บริการที่ซ่อน</string>
-    <string name="title_activity_hidden_services">บริการที่ซ่อน</string>
     <string name="menu_hidden_services">บริการที่ซ่อน</string>
     <string name="save">บันทึก</string>
     <string name="local_port">พอร์ตในเครื่อง</string>
@@ -131,7 +129,6 @@
     <string name="name">ชื่อเอกสาร</string>
     <string name="done">เสร็จสิ้น!</string>
     <string name="copy_address_to_clipboard">คัดลอกที่อยู่ลงในคลิปบอร์ด</string>
-    <string name="show_auth_cookie">แสดงคุกกี้ที่ได้รับอนุญาต</string>
     <string name="backup_service">บริการสำรองข้อมูล</string>
     <string name="delete_service">บริการลบ</string>
     <string name="backup_saved_at_external_storage">ข้อมูลสำรองบันทึกที่ที่เก็บข้อมูลภายนอก</string>
@@ -142,16 +139,8 @@
     <string name="confirm_service_deletion">ยืนยันการลบบริการ</string>
     <string name="service_type">ประเภทของบริการ</string>
     <string name="auth_cookie">คุกกี้ที่ได้รับอนุญาต</string>
-    <string name="copy_cookie_to_clipboard">คัดลอกคุกกี้ลงในคลิปบอร์ด</string>
-    <string name="auth_cookie_was_not_configured">ยังไม่ได้กำหนดค่าคุกกี้ที่ได้รับอนุญาต</string>
     <string name="please_restart_Orbot_to_enable_the_changes">กรุณาเริ่ม Orbot ใหม่เพื่อให้การเปลี่ยนแปลงใช้งานได้</string>
-    <string name="client_cookies">คุกกี้ของไคลเอ็นต์</string>
     <string name="onion">.onion</string>
-    <string name="cookie_from_QR">อ่านจากคิวอาร์</string>
-    <string name="backup_cookie">สำรองข้อมูลคุกกี้</string>
-    <string name="delete_cookie">ลบคุกกี้</string>
-    <string name="confirm_cookie_deletion">ยืนยันการลบคุกกี้</string>
-    <string name="hosted_services">บริการโฮสต์</string>
     <string name="share_as_qr">แชร์ในรูปแบบคิวอาร์</string>
     <string name="disable">ปิดการใช้งาน</string>
     <string name="enable">เปิดใช้งาน</string>
diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml
index 13709dba..26bf6601 100644
--- a/app/src/main/res/values-tl/strings.xml
+++ b/app/src/main/res/values-tl/strings.xml
@@ -86,8 +86,7 @@
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
     <string name="found_existing_tor_process"> nakakita ng umiiral na Tor process…</string>
   <string name="something_bad_happened">May nangyaring masama. Tingnan ang log</string>
-    <string name="unable_to_read_hidden_service_name">hindi mabasa ang pangalan ng tagong serbisyo</string>
-  <string name="unable_to_start_tor">Hindi masimulan ang Tor:</string>
+    <string name="unable_to_start_tor">Hindi masimulan ang Tor:</string>
     <string name="pref_use_persistent_notifications">Palaging panatilihin ang icon sa toolbar kapag ang Orbot ay naka-connect</string>
   <string name="pref_use_persistent_notifications_title">Palaging i-On ang Notifications</string>
   <string name="pref_use_expanded_notifications">Ipakita ang pinalaking notification kasama ng Tor exit country at IP</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 63a7cdd2..81a13a47 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -92,7 +92,6 @@
     <string name="hidden_service_request">Bir uygulama %1$s numaralı bağlantı noktasındaki onion sunucusunu Tor ağına açmak istiyor. Uygulamaya güveniyorsanız bu güvenlidir.</string>
     <string name="found_existing_tor_process">varolan bir Tor işlemi bulundu…</string>
     <string name="something_bad_happened">Bir şeyler ters gitti. Günlük kayıtlarına bakın</string>
-    <string name="unable_to_read_hidden_service_name">gizli hizmet adı okunamadı</string>
     <string name="unable_to_start_tor">Tor başlatılamadı:</string>
     <string name="pref_use_persistent_notifications">Orbot bağlı olduğu sürece simge araç çubuğunda görüntülensin</string>
     <string name="pref_use_persistent_notifications_title">Bildirimler Her Zaman Açık</string>
@@ -123,7 +122,6 @@
     <string name="send_email">E-posta Gönder</string>
     <string name="vpn_default_world">Genel (Otomatik)</string>
     <string name="hidden_services">Gizli Hizmetler</string>
-    <string name="title_activity_hidden_services">Gizli Hizmetler</string>
     <string name="menu_hidden_services">Gizli Hizmetler</string>
     <string name="save">Kaydet</string>
     <string name="local_port">Yerel Bağlantı Noktası</string>
@@ -131,7 +129,6 @@
     <string name="name">Ad</string>
     <string name="done">Tamam!</string>
     <string name="copy_address_to_clipboard">Adresi panoya kopyala</string>
-    <string name="show_auth_cookie">Kimlik doğrulama çerezini görüntüle</string>
     <string name="backup_service">Hizmeti Yedekle <i>(Uyarı: Bu, Diğer Uygulamaların Hizmet Yapılandırmanıza Erişebilmesine Neden Olabilir)</i></string>
     <string name="delete_service">Hizmeti Sil</string>
     <string name="backup_saved_at_external_storage">Yedek dış depolamaya kaydedildi</string>
@@ -142,16 +139,8 @@
     <string name="confirm_service_deletion">Hizmeti Silmeyi Onayla</string>
     <string name="service_type">Hizmet Türü</string>
     <string name="auth_cookie">Kimlik Doğrulama Çerezi</string>
-    <string name="copy_cookie_to_clipboard">Çerezi panoya kopyala</string>
-    <string name="auth_cookie_was_not_configured">Kimlik doğrulama çerezi yapılandırılmamış</string>
     <string name="please_restart_Orbot_to_enable_the_changes">Değişiklikleri etkinleştirmek için Orbot uygulamasını yeniden başlatın</string>
-    <string name="client_cookies">İstemci Çerezleri</string>
     <string name="onion">.onion</string>
-    <string name="cookie_from_QR">QR kodundan oku</string>
-    <string name="backup_cookie">Çerezi yedekle</string>
-    <string name="delete_cookie">Çerezi sil</string>
-    <string name="confirm_cookie_deletion">Çerezi silmeyi onayla</string>
-    <string name="hosted_services">Barındırılan Hizmetler</string>
     <string name="share_as_qr">QR Olarak PaylaÅŸ</string>
     <string name="disable">Devre Dışı Bırak</string>
     <string name="enable">EtkinleÅŸtir</string>
@@ -223,7 +212,6 @@
     <string name="v3_client_auth_activity_title">v3 Ä°stemci Yetkilendirmesi</string>
     <string name="v3_client_auth">v3 Onion Hizmeti Ä°stemci Yetkilendirmesi</string>
     <string name="v3_hosted_services">Barındırılan v3 Onion Hizmetleri</string>
-    <string name="v2_hidden_services">v2 Onion Hizmetleri (Kullanımdan Kaldırıldı)</string>
     <string name="deny">Reddet</string>
     <string name="allow">Ä°zin ver</string>
     <string name="backup_port_exist">Hata: Bir Onion Hizmeti Zaten %s Bağlantı Noktasını Kullanıyor</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index fa5ad41b..2cb12888 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -92,7 +92,6 @@
     <string name="hidden_service_request">Застосунок хоче відкрити сервер onion на порту %1$s до мережі Tor. Це безпечно, якщо ви довіряєте застосунку.</string>
     <string name="found_existing_tor_process">знайдено наявний процес Tor…</string>
     <string name="something_bad_happened">Виникла якась помилка. Перевірте лог</string>
-    <string name="unable_to_read_hidden_service_name">неможливо прочитати ім\'я прихованої служби</string>
     <string name="unable_to_start_tor">Неможливо запустити Tor:</string>
     <string name="pref_use_persistent_notifications">Завжди показувати іконку в панелі завдань коли Orbot підключений</string>
     <string name="pref_use_persistent_notifications_title">Сповіщення про постійну роботу</string>
@@ -123,7 +122,6 @@
     <string name="send_email">Надіслати листа</string>
     <string name="vpn_default_world">Глобальний (автоматичний)</string>
     <string name="hidden_services">Приховані Послуги</string>
-    <string name="title_activity_hidden_services">Приховані Послуги</string>
     <string name="menu_hidden_services">Приховані Послуги</string>
     <string name="save">Зберегти</string>
     <string name="local_port">Місцевий Порт</string>
@@ -131,7 +129,6 @@
     <string name="name">Ім\'я</string>
     <string name="done">Зроблено!</string>
     <string name="copy_address_to_clipboard">Скопіювати адресу в буфер обміну</string>
-    <string name="show_auth_cookie">Показати авторизацію реп\'яшків</string>
     <string name="backup_service">Резервне копіювання <i>(Попередження: це може надати конфігурацію вашої служби іншим програмам)</i></string>
     <string name="delete_service">Вилучити Сервіс</string>
     <string name="backup_saved_at_external_storage">Резервна копія збережена на зовнішній пам\'яті</string>
@@ -142,16 +139,8 @@
     <string name="confirm_service_deletion">Підтвердьте видалення сервісу</string>
     <string name="service_type">Тип сервісу</string>
     <string name="auth_cookie">Авторизація реп\'яшків </string>
-    <string name="copy_cookie_to_clipboard">Копіювати реп\'яшки в буфер обміну</string>
-    <string name="auth_cookie_was_not_configured">Авторизація реп\'яшків не налаштована</string>
     <string name="please_restart_Orbot_to_enable_the_changes">Будь ласка, перезапустіть Orbot, щоб зміни ввійшли в силу</string>
-    <string name="client_cookies">Клієнтські Cookie</string>
     <string name="onion">.onion</string>
-    <string name="cookie_from_QR">Зчитати з QR-коду</string>
-    <string name="backup_cookie">Резервне копіювання реп\'яшків</string>
-    <string name="delete_cookie">Вилучити реп\'яшки</string>
-    <string name="confirm_cookie_deletion">Підтвердити вилучення реп\'яшків</string>
-    <string name="hosted_services">Розміщені Сервіси</string>
     <string name="share_as_qr">Поділитися у виді QR-коду</string>
     <string name="disable">Вимкнути</string>
     <string name="enable">Увімкнути</string>
@@ -223,7 +212,6 @@
     <string name="v3_client_auth_activity_title">Авторизація клієнта v3</string>
     <string name="v3_client_auth">Авторизація клієнта служби Onion v3</string>
     <string name="v3_hosted_services">Хостинг служб Onion v3</string>
-    <string name="v2_hidden_services">Служби Onion v2 (застарілі)</string>
     <string name="deny">Заборонити</string>
     <string name="allow">Длзволити</string>
     <string name="backup_port_exist">Помилка: служба Onion вже використовує порт %s</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 73d36ced..6d2436c2 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -88,7 +88,6 @@
     <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
     <string name="found_existing_tor_process">tìm ra tiến trình hiện hà nh của Tor…</string>
     <string name="something_bad_happened">Có gì đó không ổn. Xin xem lại nhật ký</string>
-    <string name="unable_to_read_hidden_service_name">không thể đọc được tên dịch vụ ẩn</string>
     <string name="unable_to_start_tor">Không thể khởi động Tor được: </string>
     <string name="pref_use_persistent_notifications">Luôn giữ thông báo trong thanh trạng thái khi Orbot được kết nối</string>
     <string name="pref_use_persistent_notifications_title">Thông báo thường trực</string>
@@ -162,15 +161,7 @@
     <string name="consider_enable_battery_optimizations">Hãy cân nhắc việc bật tối ưu hoá pin</string>
     <string name="consider_disable_battery_optimizations">Hãy cân nhắc việc tắt tối ưu hoá pin</string>
     <string name="share_as_qr">Chia sẻ dưới dạng QR</string>
-    <string name="hosted_services">Dịch vụ được lưu trữ</string>
-    <string name="confirm_cookie_deletion">Xác nhận xoá cookie</string>
-    <string name="delete_cookie">Xoá cookie</string>
-    <string name="backup_cookie">Sao lÆ°u cookie</string>
-    <string name="cookie_from_QR">Đọc từ QR</string>
     <string name="onion">.onion</string>
-    <string name="client_cookies">Cookie khách</string>
-    <string name="auth_cookie_was_not_configured">Cookie xác thực không được thiết lập</string>
-    <string name="copy_cookie_to_clipboard">Sao chép cookie và o bộ nhớ tạm</string>
     <string name="auth_cookie">Cookie xác thực</string>
     <string name="service_type">Loại dịch vụ</string>
     <string name="confirm_service_deletion">Xác nhận xoá dịch vụ</string>
@@ -182,13 +173,11 @@
     <string name="backup_saved_at_external_storage">Đã lưu bản sao lưu ở bộ nhớ ngoà i</string>
     <string name="delete_service">Xoá dịch vụ</string>
     <string name="backup_service">Sao lưu dịch vụ <i>(Cảnh báo: Việc nà y có thể sẽ là m lộ thiết lập dịch vụ của bạn cho các ứng dụng khác)</i></string>
-    <string name="show_auth_cookie">Hiện cookie xác thực</string>
     <string name="copy_address_to_clipboard">Sao chép địa chỉ và o bộ nhớ tạm</string>
     <string name="done">Xong!</string>
     <string name="onion_port">Cổng Onion</string>
     <string name="local_port">Cổng cục bộ</string>
     <string name="menu_hidden_services">Dịch vụ Onion</string>
-    <string name="title_activity_hidden_services">Dịch vụ Onion</string>
     <string name="confirm">Xác nhận</string>
     <string name="v3_import_auth_private">Nhập .auth_private</string>
     <string name="v3_backup_name_hint">Tên tệp sao lưu…</string>
@@ -201,7 +190,6 @@
     <string name="v3_client_auth_activity_title">Uỷ quyền khách v3</string>
     <string name="v3_client_auth">Uỷ quyền khách cho dịch vụ Onion v3</string>
     <string name="v3_hosted_services">Dịch vụ Onion v3 được lưu trữ</string>
-    <string name="v2_hidden_services">Dịch vụ Onion v2 (Không được hỗ trợ nữa)</string>
     <string name="mebibyte">MiB</string>
     <string name="kibibyte">KiB</string>
     <string name="refresh_apps">Là m mới các ứng dụng</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index c6f652b0..2c035a47 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -88,7 +88,6 @@
     <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
     <string name="found_existing_tor_process">发现现有的Tor进程…</string>
     <string name="something_bad_happened">发生错误，请检查日志</string>
-    <string name="unable_to_read_hidden_service_name">æ— æ³•è¯»å–éšè—æœåŠ¡åç§°</string>
     <string name="unable_to_start_tor">æ— æ³•å¯åŠ¨ Tor：</string>
     <string name="pref_use_persistent_notifications">Orbot è¿žæŽ¥åŽå§‹ç»ˆåœ¨é€šçŸ¥æ æ˜¾ç¤ºå›¾æ ‡</string>
     <string name="pref_use_persistent_notifications_title">始终显示通知</string>
@@ -140,7 +139,6 @@
     <string name="start_tor_again_for_finish_the_process">再次启动 Tor 以完成该过程</string>
     <string name="confirm_service_deletion">ç¡®è®¤æœåŠ¡åˆ é™¤</string>
     <string name="service_type">服务类型</string>
-    <string name="cookie_from_QR">ä»ŽäºŒç»´ç è¯»å–</string>
     <string name="share_as_qr">以 QR ç å½¢å¼åˆ†äº«</string>
     <string name="disable">禁用</string>
     <string name="enable">启用</string>
@@ -158,10 +156,6 @@
     <string name="full_device_vpn">全设备 VPN</string>
     <string name="vpn_disabled">VPN 已禁用</string>
     <string name="default_socks_http">SOCKS: - HTTP: -</string>
-    <string name="copy_cookie_to_clipboard">复制 cookie 到剪贴板</string>
-    <string name="backup_cookie">备份 cookie</string>
-    <string name="delete_cookie">åˆ é™¤ cookie</string>
-    <string name="confirm_cookie_deletion">确认 cookie åˆ é™¤</string>
     <string name="pref_isolate_dest_summary">å¯¹æ¯ä¸ªç›®æ ‡åœ°å€ä½¿ç”¨ä¸åŒçš„å›žè·¯</string>
     <string name="refresh_apps">刷新应用程序</string>
     <string name="app_services">应用服务</string>
@@ -176,17 +170,12 @@
     <string name="pref_isolate_dest">éš”ç¦»ç›®æ ‡åœ°å€</string>
     <string name="auth_cookie">认证 cookie</string>
     <string name="create_a_backup_first">先建立一个备份</string>
-    <string name="show_auth_cookie">显示 auth cookie</string>
     <string name="onion_port">洋葱端口</string>
     <string name="menu_hidden_services">洋葱服务</string>
-    <string name="title_activity_hidden_services">洋葱服务</string>
     <string name="hidden_services">洋葱服务</string>
     <string name="hidden_service_request">一个应用程序想要在端口 %1$s上打开到 Tor ç½‘ç»œçš„æ´‹è‘±æœåŠ¡å™¨ã€‚å¦‚æžœä½ ä¿¡ä»»è¿™ä¸ªåº”ç”¨ç¨‹åºï¼Œè¿™æ˜¯å®‰å…¨çš„ã€‚</string>
     <string name="pref_connection_padding">连接填充</string>
-    <string name="hosted_services">托管的服务</string>
     <string name="onion">.onion 地址</string>
-    <string name="client_cookies">客户端 Cookies</string>
-    <string name="auth_cookie_was_not_configured">未配置 Auth cookie</string>
     <string name="bridge_snowflake">通过其他 Tor 对等端连接 (实验性)</string>
     <string name="use_qr_code">ä½¿ç”¨äºŒç»´ç </string>
     <string name="paste_bridges">粘贴网桥</string>
@@ -223,7 +212,6 @@
     <string name="v3_client_auth_activity_title">v3 客户端授权</string>
     <string name="v3_client_auth">v3 Onion 服务客户端授权</string>
     <string name="v3_hosted_services">托管的 v3 Onion 服务</string>
-    <string name="v2_hidden_services">v2 Onion 服务 (已废弃)</string>
     <string name="deny">拒绝</string>
     <string name="allow">允许</string>
     <string name="backup_port_exist">错误：一个 Onion 服务已经在使用端口 %s</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index d84a766c..3896c742 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -92,8 +92,7 @@
   <string name="hidden_service_request">有一個應用要開啟隱藏的伺服器端口 %1$d 到 Tor 網路,如果信得過此應用才進行此操作</string>
   <string name="found_existing_tor_process">發現已有 Tor 程序運行中 …</string>
   <string name="something_bad_happened">發生錯誤。檢視日誌檔</string>
-    <string name="unable_to_read_hidden_service_name">無法讀取隱藏服務的名稱</string>
-  <string name="unable_to_start_tor">無法啟動 Tor：</string>
+    <string name="unable_to_start_tor">無法啟動 Tor：</string>
     <string name="pref_use_persistent_notifications">當 Orbot 連線成功時，總是在工具列顯示它的圖示</string>
   <string name="pref_use_persistent_notifications_title">總是顯示連線通知</string>
   <string name="pref_use_expanded_notifications">在通知中顯示 Tor 出口點的國家和 IP</string>
@@ -123,7 +122,6 @@
     <string name="send_email">寄送電子信件</string>
   <string name="vpn_default_world">全域(自動)</string>
   <string name="hidden_services">隱藏服務</string>
-  <string name="title_activity_hidden_services">隱藏服務</string>
   <string name="menu_hidden_services">隱藏服務</string>
   <string name="save">儲存</string>
     <string name="local_port">本地端口</string>
@@ -131,7 +129,6 @@
   <string name="name">名稱</string>
   <string name="done">已完成!</string>
     <string name="copy_address_to_clipboard">複製地址到剪貼簿</string>
-  <string name="show_auth_cookie">顯示 auth cookie</string>
   <string name="backup_service">備份服務</string>
   <string name="delete_service">刪除服務</string>
   <string name="backup_saved_at_external_storage">備份檔儲存在外部儲存器</string>
@@ -142,16 +139,8 @@
   <string name="confirm_service_deletion">確認服務刪除</string>
     <string name="service_type">服務類型</string>
   <string name="auth_cookie">Auth cookie</string>
-  <string name="copy_cookie_to_clipboard">複製 Cookie 到剪貼簿</string>
-  <string name="auth_cookie_was_not_configured">Auth cookie 未設定</string>
   <string name="please_restart_Orbot_to_enable_the_changes">請重新啟動 Orbot 來讓設定生效。</string>
-  <string name="client_cookies">客戶 cookies</string>
   <string name="onion">.onion</string>
-  <string name="cookie_from_QR">由 QR 碼讀取</string>
-  <string name="backup_cookie">備分 cookie</string>
-  <string name="delete_cookie">刪除 cookie</string>
-  <string name="confirm_cookie_deletion">確認刪除  cookie</string>
-  <string name="hosted_services">主機的服務</string>
   <string name="share_as_qr">利用 QR 碼分享</string>
   <string name="disable">關閉</string>
   <string name="enable">啟用</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 98fc6c82..7936af5b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -102,7 +102,6 @@
     <string name="deny">Deny</string>
     <string name="found_existing_tor_process">found existing Tor process…</string>
     <string name="something_bad_happened">Something bad happened. Check the log</string>
-    <string name="unable_to_read_hidden_service_name">unable to read onion service name</string>
     <string name="unable_to_start_tor">Unable to start Tor:</string>
 
     <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string>
@@ -162,7 +161,6 @@
 
     <string name="vpn_default_world">Global (Auto)</string>
     <string name="hidden_services">Onion Services</string>
-    <string name="v2_hidden_services">v2 Onion Services (Deprecated)</string>
     <string name="v3_hosted_services">Hosted v3 Onion Services</string>
     <string name="v3_client_auth">v3 Onion Service Client Authorization</string>
     <string name="v3_client_auth_activity_title">v3 Client Authorization</string>
@@ -175,7 +173,6 @@
     <string name="v3_backup_name_hint">Backup filename…</string>
     <string name="v3_import_auth_private">Import .auth_private</string>
     <string name="confirm">Confirm</string>
-    <string name="title_activity_hidden_services">Onion Services</string>
     <string name="menu_hidden_services">Onion Services</string>
     <string name="save">Save</string>
     <string name="local_port">Local Port</string>
@@ -183,7 +180,6 @@
     <string name="name">Name</string>
     <string name="done">Done!</string>
     <string name="copy_address_to_clipboard">Copy address to clipboard</string>
-    <string name="show_auth_cookie">Show auth cookie</string>
     <string name="backup_service">Backup Service <i>(Warning: This Could Expose Your Service Configuration to Other Apps)</i></string>
     <string name="delete_service">Delete Service</string>
     <string name="backup_saved_at_external_storage">Backup saved at external storage</string>
@@ -195,16 +191,8 @@
     <string name="confirm_service_deletion">Confirm service deletion</string>
     <string name="service_type">Service type</string>
     <string name="auth_cookie">Auth cookie</string>
-    <string name="copy_cookie_to_clipboard">Copy cookie to clipboard</string>
-    <string name="auth_cookie_was_not_configured">Auth cookie was not configured</string>
     <string name="please_restart_Orbot_to_enable_the_changes">Please restart Orbot to enable the changes</string>
-    <string name="client_cookies">Client Cookies</string>
     <string name="onion">.onion</string>
-    <string name="cookie_from_QR">Read from QR</string>
-    <string name="backup_cookie">Backup cookie</string>
-    <string name="delete_cookie">Delete cookie</string>
-    <string name="confirm_cookie_deletion">Confirm cookie deletion</string>
-    <string name="hosted_services">Hosted Services</string>
     <string name="share_as_qr">Share as QR</string>
     <string name="disable">Disable</string>
     <string name="enable">Enable</string>
diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
index 70ccf17e..e90be3f3 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@ -53,7 +53,6 @@ import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -85,22 +84,9 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
 
     static final int NOTIFY_ID = 1;
     private static final int ERROR_NOTIFY_ID = 3;
-    private static final int HS_NOTIFY_ID = 4;
-    private static final Uri V2_HS_CONTENT_URI = Uri.parse("content://org.torproject.android.ui.hiddenservices.providers/hs");
     private static final Uri V3_ONION_SERVICES_CONTENT_URI = Uri.parse("content://org.torproject.android.ui.v3onionservice/v3");
-    private static final Uri COOKIE_CONTENT_URI = Uri.parse("content://org.torproject.android.ui.hiddenservices.providers.cookie/cookie");
     private static final Uri V3_CLIENT_AUTH_URI = Uri.parse("content://org.torproject.android.ui.v3onionservice.clientauth/v3auth");
     private final static String NOTIFICATION_CHANNEL_ID = "orbot_channel_1";
-    private static final String[] LEGACY_V2_ONION_SERVICE_PROJECTION = new String[]{
-            OnionService._ID,
-            OnionService.NAME,
-            OnionService.DOMAIN,
-            OnionService.PORT,
-            OnionService.AUTH_COOKIE,
-            OnionService.AUTH_COOKIE_VALUE,
-            OnionService.ONION_PORT,
-            OnionService.ENABLED,
-            OnionService.PATH};
     private static final String[] V3_ONION_SERVICE_PROJECTION = new String[]{
             OnionService._ID,
             OnionService.NAME,
@@ -110,11 +96,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
             OnionService.ENABLED,
             OnionService.PATH
     };
-    private static final String[] LEGACY_COOKIE_PROJECTION = new String[]{
-            ClientCookie._ID,
-            ClientCookie.DOMAIN,
-            ClientCookie.AUTH_COOKIE_VALUE,
-            ClientCookie.ENABLED};
     private static final String[] V3_CLIENT_AUTH_PROJECTION = new String[]{
             V3ClientAuth._ID,
             V3ClientAuth.DOMAIN,
@@ -144,7 +125,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
     private NotificationManager mNotificationManager = null;
     private NotificationCompat.Builder mNotifyBuilder;
     private boolean mNotificationShowing = false;
-    private File mHSBasePath, mV3OnionBasePath, mV3AuthBasePath;
+    private File mV3OnionBasePath, mV3AuthBasePath;
     private ArrayList<Bridge> alBridges = null;
 
     /**
@@ -464,10 +445,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
             if (!appCacheHome.exists())
                 appCacheHome.mkdirs();
 
-            mHSBasePath = new File(getFilesDir().getAbsolutePath(), TorServiceConstants.HIDDEN_SERVICES_DIR);
-            if (!mHSBasePath.isDirectory())
-                mHSBasePath.mkdirs();
-
             mV3OnionBasePath = new File(getFilesDir().getAbsolutePath(), TorServiceConstants.ONION_SERVICES_DIR);
             if (!mV3OnionBasePath.isDirectory())
                 mV3OnionBasePath.mkdirs();
@@ -717,11 +694,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
             startTorService();
 
             if (Prefs.hostOnionServicesEnabled()) {
-                try {
-                    updateLegacyV2OnionNames();
-                } catch (SecurityException se) {
-                    logNotice("unable to upload legacy v2 onion names");
-                }
                 try {
                     updateV3OnionNames();
                 } catch (SecurityException se) {
@@ -763,54 +735,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
         }
     }
 
-    private void updateLegacyV2OnionNames() throws SecurityException {
-        // Tor is running, update new .onion names at db
-        ContentResolver mCR = getApplicationContext().getContentResolver();
-        Cursor hidden_services = mCR.query(V2_HS_CONTENT_URI, LEGACY_V2_ONION_SERVICE_PROJECTION, null, null, null);
-        if (hidden_services != null) {
-            try {
-                while (hidden_services.moveToNext()) {
-                    String HSDomain = hidden_services.getString(hidden_services.getColumnIndex(OnionService.DOMAIN));
-                    int HSAuthCookie = hidden_services.getInt(hidden_services.getColumnIndex(OnionService.AUTH_COOKIE));
-                    String HSAuthCookieValue = hidden_services.getString(hidden_services.getColumnIndex(OnionService.AUTH_COOKIE_VALUE));
-                    // Update only new domains or restored from backup with auth cookie
-                    if ((HSDomain == null || HSDomain.length() < 1) || (HSAuthCookie == 1 && (HSAuthCookieValue == null || HSAuthCookieValue.length() < 1))) {
-                        String hsDirPath = new File(mHSBasePath.getAbsolutePath(), hidden_services.getString(hidden_services.getColumnIndex(OnionService.PATH))).getCanonicalPath();
-                        File file = new File(hsDirPath, "hostname");
-
-                        if (file.exists()) {
-                            ContentValues fields = new ContentValues();
-
-                            try {
-                                int id = hidden_services.getInt(hidden_services.getColumnIndex(OnionService._ID));
-                                String onionHostname = Utils.readString(new FileInputStream(file)).trim();
-                                if (HSAuthCookie == 1) {
-                                    String[] aux = onionHostname.split(" ");
-                                    onionHostname = aux[0];
-                                    fields.put(OnionService.AUTH_COOKIE_VALUE, aux[1]);
-                                }
-                                fields.put(OnionService.DOMAIN, onionHostname);
-                                mCR.update(V2_HS_CONTENT_URI, fields, OnionService._ID + "=" + id, null);
-                            } catch (FileNotFoundException e) {
-                                logException("unable to read onion hostname file", e);
-                                showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), HS_NOTIFY_ID, R.drawable.ic_stat_notifyerr);
-                            }
-                        } else {
-                            showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), HS_NOTIFY_ID, R.drawable.ic_stat_notifyerr);
-                        }
-                    }
-                }
-
-            } catch (NumberFormatException e) {
-                Log.e(OrbotConstants.TAG, "error parsing hsport", e);
-            } catch (Exception e) {
-                Log.e(OrbotConstants.TAG, "error starting share server", e);
-            }
-
-            hidden_services.close();
-        }
-    }
-
     private synchronized void startTorService() throws Exception {
         updateTorConfigCustom(TorService.getDefaultsTorrc(this),
                 "DNSPort 0\n" +
@@ -1200,8 +1124,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
             ContentResolver contentResolver = getApplicationContext().getContentResolver();
             addV3OnionServicesToTorrc(extraLines, contentResolver);
             addV3ClientAuthToTorrc(extraLines, contentResolver);
-            addV2HiddenServicesToTorrc(extraLines, contentResolver);
-            addV2ClientCookiesToTorrc(extraLines, contentResolver);
         }
 
         return extraLines;
@@ -1249,58 +1171,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
         }
     }
 
-    private void addV2HiddenServicesToTorrc(StringBuffer torrc, ContentResolver contentResolver) {
-        try {
-            Cursor hidden_services = contentResolver.query(V2_HS_CONTENT_URI, LEGACY_V2_ONION_SERVICE_PROJECTION, OnionService.ENABLED + "=1", null, null);
-            if (hidden_services != null) {
-                try {
-                    while (hidden_services.moveToNext()) {
-                        int id = hidden_services.getInt(hidden_services.getColumnIndex(OnionService._ID));
-                        String HSname = hidden_services.getString(hidden_services.getColumnIndex(OnionService.NAME));
-                        String domain = hidden_services.getString(hidden_services.getColumnIndex(OnionService.DOMAIN));
-                        int HSLocalPort = hidden_services.getInt(hidden_services.getColumnIndex(OnionService.PORT));
-                        int HSOnionPort = hidden_services.getInt(hidden_services.getColumnIndex(OnionService.ONION_PORT));
-                        int HSAuthCookie = hidden_services.getInt(hidden_services.getColumnIndex(OnionService.AUTH_COOKIE));
-                        String path = hidden_services.getString(hidden_services.getColumnIndex(OnionService.PATH));
-
-                        // logic to fix bug where you can't have 2+ hidden services on same local port without breaking services that were configured before the bug fix
-                        if (path == null) {
-                            String newPath = "hs";
-                            if (domain == null)
-                                newPath +=UUID.randomUUID().toString();
-                            else
-                                newPath += HSLocalPort;
-
-                            ContentValues cv = new ContentValues();
-                            cv.put(OnionService.PATH, newPath);
-                            contentResolver.update(V2_HS_CONTENT_URI, cv, OnionService._ID + "=" + id, null);
-                            path = newPath;
-                        }
-
-                        String hsDirPath = new File(mHSBasePath.getAbsolutePath(), path).getCanonicalPath();
-
-
-                        debug("Adding hidden service on port: " + HSLocalPort);
-
-                        torrc.append("HiddenServiceDir" + ' ' + hsDirPath).append('\n');
-                        torrc.append("HiddenServiceVersion 2").append('\n');
-                        torrc.append("HiddenServicePort" + ' ' + HSOnionPort + " 127.0.0.1:" + HSLocalPort).append('\n');
-
-                        if (HSAuthCookie == 1)
-                            torrc.append("HiddenServiceAuthorizeClient stealth " + HSname).append('\n');
-                    }
-                } catch (NumberFormatException e) {
-                    Log.e(OrbotConstants.TAG, "error parsing hsport", e);
-                } catch (Exception e) {
-                    Log.e(OrbotConstants.TAG, "error starting share server", e);
-                }
-
-                hidden_services.close();
-            }
-        } catch (SecurityException se) {
-        }
-    }
-
     public static String buildV3ClientAuthFile(String domain, String keyHash) {
         return domain + ":descriptor:x25519:" + keyHash;
     }
@@ -1330,25 +1200,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
         }
     }
 
-    private void addV2ClientCookiesToTorrc(StringBuffer torrc, ContentResolver contentResolver) {
-        try {
-            Cursor client_cookies = contentResolver.query(COOKIE_CONTENT_URI, LEGACY_COOKIE_PROJECTION, ClientCookie.ENABLED + "=1", null, null);
-            if (client_cookies != null) {
-                try {
-                    while (client_cookies.moveToNext()) {
-                        String domain = client_cookies.getString(client_cookies.getColumnIndex(ClientCookie.DOMAIN));
-                        String cookie = client_cookies.getString(client_cookies.getColumnIndex(ClientCookie.AUTH_COOKIE_VALUE));
-                        torrc.append("HidServAuth" + ' ' + domain + ' ' + cookie).append('\n');
-                    }
-                } catch (Exception e) {
-                    Log.e(OrbotConstants.TAG, "error starting share server", e);
-                }
-                client_cookies.close();
-            }
-        } catch (SecurityException se) {
-        }
-    }
-
     //using Google DNS for now as the public DNS server
     private String writeDNSFile() throws IOException {
         File file = new File(appBinHome, "resolv.conf");
@@ -1516,8 +1367,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
         public static final String PORT = "port";
         public static final String ONION_PORT = "onion_port";
         public static final String DOMAIN = "domain";
-        public static final String AUTH_COOKIE = "auth_cookie";
-        public static final String AUTH_COOKIE_VALUE = "auth_cookie_value";
         public static final String ENABLED = "enabled";
         public static final String PATH = "filepath";
     }
@@ -1528,11 +1377,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
         public static final String ENABLED = "enabled";
     }
 
-    public static final class ClientCookie implements BaseColumns {
-        public static final String DOMAIN = "domain";
-        public static final String AUTH_COOKIE_VALUE = "auth_cookie_value";
-        public static final String ENABLED = "enabled";
-    }
 
     // for bridge loading from the assets default bridges.txt file
     static class Bridge {
diff --git a/orbotservice/src/main/res/values-ar/strings.xml b/orbotservice/src/main/res/values-ar/strings.xml
index a131e2e3..cdf47d6a 100644
--- a/orbotservice/src/main/res/values-ar/strings.xml
+++ b/orbotservice/src/main/res/values-ar/strings.xml
@@ -19,8 +19,7 @@
   <string name="your_relay_settings_caused_an_exception_">إعدادات المرحلات لديك تسببت بخطأ!</string>
     <string name="found_existing_tor_process">عُثر علي عملية تور سابقة تعمل...</string>
   <string name="something_bad_happened">حصل خطأ ما. افحص السجل</string>
-    <string name="unable_to_read_hidden_service_name">غير قادر على قراءة اسم الخدمة المخفية</string>
-  <string name="unable_to_start_tor">غير قادر على بدء تور:</string>
+    <string name="unable_to_start_tor">غير قادر على بدء تور:</string>
     <string name="newnym">لقد تحولت الى هوية تور جديدة</string>
     <string name="updating_settings_in_tor_service">تحديث الاعدادات في خدمات تور</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-az/strings.xml b/orbotservice/src/main/res/values-az/strings.xml
index a0da0477..da3bc381 100644
--- a/orbotservice/src/main/res/values-az/strings.xml
+++ b/orbotservice/src/main/res/values-az/strings.xml
@@ -19,8 +19,7 @@
   <string name="your_relay_settings_caused_an_exception_">Sənin keçid seçimlərin istisnaya səbəb oldu!</string>
     <string name="found_existing_tor_process">mövcud Tor prosesi tapıldı...</string>
   <string name="something_bad_happened">NÉ™ isÉ™ pis bir ÅŸey oldu. GiriÅŸi yoxla</string>
-    <string name="unable_to_read_hidden_service_name">gizli xidmət adını oxumağı deaktivləşdir</string>
-  <string name="unable_to_start_tor">Tor-un başlanmasını dayandır:</string>
+    <string name="unable_to_start_tor">Tor-un başlanmasını dayandır:</string>
   <string name="newnym">Yeni Tor oxşarına qoşuldun!</string>
   <string name="updating_settings_in_tor_service">Tor xidmətində quraşdırmalar yüklənir</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-bg/strings.xml b/orbotservice/src/main/res/values-bg/strings.xml
index 43d541bf..ec4af47b 100644
--- a/orbotservice/src/main/res/values-bg/strings.xml
+++ b/orbotservice/src/main/res/values-bg/strings.xml
@@ -19,8 +19,7 @@
   <string name="your_relay_settings_caused_an_exception_">Твоите настройки за препращане предизвикаха изключение!</string>
     <string name="found_existing_tor_process">намерил си съвместим Tor проект...</string>
   <string name="something_bad_happened">Нещо лошо се случи. Проверете лога</string>
-    <string name="unable_to_read_hidden_service_name">не може да прочете име на скрита услуга</string>
-  <string name="unable_to_start_tor">Не може да стартира Тор:</string>
+    <string name="unable_to_start_tor">Не може да стартира Тор:</string>
     <string name="newnym">Сменихте своята Тор идентичност!</string>
     <string name="updating_settings_in_tor_service">обновяване на настройките в Tor услугата</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-ca/strings.xml b/orbotservice/src/main/res/values-ca/strings.xml
index 60195126..f6f5ba61 100644
--- a/orbotservice/src/main/res/values-ca/strings.xml
+++ b/orbotservice/src/main/res/values-ca/strings.xml
@@ -17,7 +17,6 @@
   <string name="your_relay_settings_caused_an_exception_">Els parà metres de reemissió han causat una excepció.</string>
     <string name="found_existing_tor_process">s\'ha trobat un procés Tor existent...</string>
   <string name="something_bad_happened">Ha fallat alguna cosa. Comproveu el registre</string>
-    <string name="unable_to_read_hidden_service_name">ha estat impossible llegir el nom del servei ocult</string>
-  <string name="unable_to_start_tor">Ha estat impossible iniciar Tor:</string>
+    <string name="unable_to_start_tor">Ha estat impossible iniciar Tor:</string>
     <string name="newnym">Heu canviat a una nova identitat Tor.</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-cs-rCZ/strings.xml b/orbotservice/src/main/res/values-cs-rCZ/strings.xml
index c997196e..a6adb5dc 100644
--- a/orbotservice/src/main/res/values-cs-rCZ/strings.xml
+++ b/orbotservice/src/main/res/values-cs-rCZ/strings.xml
@@ -17,7 +17,6 @@
   <string name="your_relay_settings_caused_an_exception_">Vaše nastavení relace způsobilo výjimku!</string>
     <string name="found_existing_tor_process">nalezev existující Tor proces…</string>
   <string name="something_bad_happened">Stalo se něco špatného. Zkontrolujte log</string>
-    <string name="unable_to_read_hidden_service_name">nelze číst název skryté služby</string>
-  <string name="unable_to_start_tor">Nelze spustit Tor:</string>
+    <string name="unable_to_start_tor">Nelze spustit Tor:</string>
     <string name="newnym">Vaše identita na Toru byla změněna!</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-da/strings.xml b/orbotservice/src/main/res/values-da/strings.xml
index 7abda071..118015a9 100644
--- a/orbotservice/src/main/res/values-da/strings.xml
+++ b/orbotservice/src/main/res/values-da/strings.xml
@@ -18,6 +18,5 @@
   <string name="your_relay_settings_caused_an_exception_">Dine relæindstillinger forårsagede en fejl!</string>
     <string name="found_existing_tor_process">fandt eksisterende Tor process...</string>
   <string name="something_bad_happened">Noget slemt er sket. Check loggen</string>
-    <string name="unable_to_read_hidden_service_name">ikke i stand til at læse navnet på den skjulte service</string>
-  <string name="unable_to_start_tor">Kunne ikke starte Tor:</string>
+    <string name="unable_to_start_tor">Kunne ikke starte Tor:</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-de/strings.xml b/orbotservice/src/main/res/values-de/strings.xml
index 821e9dcd..2ad6f0e1 100644
--- a/orbotservice/src/main/res/values-de/strings.xml
+++ b/orbotservice/src/main/res/values-de/strings.xml
@@ -19,8 +19,7 @@
   <string name="your_relay_settings_caused_an_exception_">Ihre Relaiseinstellungen haben einen Ausnahmefehler verursacht!</string>
     <string name="found_existing_tor_process">bestehender Tor-Prozess gefunden …</string>
   <string name="something_bad_happened">Etwas ist schief gelaufen. Bitte Protokoll prüfen</string>
-    <string name="unable_to_read_hidden_service_name">Name des versteckten Dienstes kann nicht gelesen werden</string>
-  <string name="unable_to_start_tor">Tor kann nicht gestartet werden:</string>
+    <string name="unable_to_start_tor">Tor kann nicht gestartet werden:</string>
     <string name="newnym">Sie haben zu einer neuen Tor-Identität gewechselt!</string>
     <string name="updating_settings_in_tor_service">Einstellungen im Tor-Dienst werden aktualisiert</string>
   <string name="mebibyte_per_second">MiB/s</string>
diff --git a/orbotservice/src/main/res/values-el/strings.xml b/orbotservice/src/main/res/values-el/strings.xml
index 1241bdf9..5833649b 100644
--- a/orbotservice/src/main/res/values-el/strings.xml
+++ b/orbotservice/src/main/res/values-el/strings.xml
@@ -17,7 +17,6 @@
   <string name="your_relay_settings_caused_an_exception_">Οι ρυθμίσεις αναμεταδότη σας προκάλεσαν μια εξαίρεση!</string>
     <string name="found_existing_tor_process">αναζήτηση διεργασιών Tor...</string>
   <string name="something_bad_happened">Κάτι κακό συνέβη. Ελέγξτε τις καταγραφές</string>
-    <string name="unable_to_read_hidden_service_name">αδυναμία ανάγνωσης του ονόματος της κρυφής υπηρεσίας</string>
-  <string name="unable_to_start_tor">Αδυναμία εκκίνησης του Tor:</string>
+    <string name="unable_to_start_tor">Αδυναμία εκκίνησης του Tor:</string>
     <string name="newnym">Έχετε αλλάξει επιτυχώς την ταυτότητα σας στο Tor! </string>
 </resources>
diff --git a/orbotservice/src/main/res/values-eo/strings.xml b/orbotservice/src/main/res/values-eo/strings.xml
index b3e4bf94..5f492fcb 100644
--- a/orbotservice/src/main/res/values-eo/strings.xml
+++ b/orbotservice/src/main/res/values-eo/strings.xml
@@ -15,6 +15,5 @@
     <string name="couldn_t_start_tor_process_">Tor-procedo ne sukcesis stariĝi:</string>
     <string name="your_relay_settings_caused_an_exception_">Via agordo de relajso kaÅ­zis escepton!</string>
     <string name="found_existing_tor_process">trovi ekzistantan Tor-procedon...</string>
-    <string name="unable_to_read_hidden_service_name">ne eblas legi nomon de la kaŝita servo</string>
-  <string name="unable_to_start_tor">Ne eblas startigi Tor:</string>
+    <string name="unable_to_start_tor">Ne eblas startigi Tor:</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-es/strings.xml b/orbotservice/src/main/res/values-es/strings.xml
index 981f39c6..24667d37 100644
--- a/orbotservice/src/main/res/values-es/strings.xml
+++ b/orbotservice/src/main/res/values-es/strings.xml
@@ -19,8 +19,7 @@
   <string name="your_relay_settings_caused_an_exception_">¡La configuración de su repetidor ha producido una excepción!</string>
     <string name="found_existing_tor_process">Se encontró un proceso de Tor ya existente...</string>
   <string name="something_bad_happened">Hubo algún tipo de problema. Compruebe el registro (log)</string>
-    <string name="unable_to_read_hidden_service_name">No fue posible leer el nombre del servicio oculto</string>
-  <string name="unable_to_start_tor">No fue posible iniciar Tor: </string>
+    <string name="unable_to_start_tor">No fue posible iniciar Tor: </string>
     <string name="newnym">¡Ha cambiado a una nueva identidad de Tor!</string>
     <string name="updating_settings_in_tor_service">actualizando la configuración en el servicio Tor</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-et/strings.xml b/orbotservice/src/main/res/values-et/strings.xml
index 1843e29f..035fbb40 100644
--- a/orbotservice/src/main/res/values-et/strings.xml
+++ b/orbotservice/src/main/res/values-et/strings.xml
@@ -17,7 +17,6 @@
   <string name="your_relay_settings_caused_an_exception_">Teie releeseadistus põhjustas ekse!</string>
     <string name="found_existing_tor_process">leidus töötav Tor protsess...</string>
   <string name="something_bad_happened">Juhtus midagi halba. Kontrollige logi</string>
-    <string name="unable_to_read_hidden_service_name">ei õnnestu lugeda varjatud teenuse nime</string>
-  <string name="unable_to_start_tor">Tor käivitamine ebaõnnestus:</string>
+    <string name="unable_to_start_tor">Tor käivitamine ebaõnnestus:</string>
     <string name="newnym">Lülitusite uuele Tor identiteedile!</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-eu/strings.xml b/orbotservice/src/main/res/values-eu/strings.xml
index e1e0bed2..6e7792de 100644
--- a/orbotservice/src/main/res/values-eu/strings.xml
+++ b/orbotservice/src/main/res/values-eu/strings.xml
@@ -17,7 +17,6 @@
   <string name="your_relay_settings_caused_an_exception_">Zure errele ezarpenak salbuespena sortu dute!</string>
     <string name="found_existing_tor_process">Aurreko Tor prozesua topatuta...</string>
   <string name="something_bad_happened">Zerbait txarra gertatu da. Begiratu logetan</string>
-    <string name="unable_to_read_hidden_service_name">ezkutuko zerbitzuare izena ezin da irakurri</string>
-  <string name="unable_to_start_tor">Ezin izan da Tor hasi:</string>
+    <string name="unable_to_start_tor">Ezin izan da Tor hasi:</string>
     <string name="newnym">ChatSecure - Andriodentzako berehalako mezulari bezero ziurra</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-fa/strings.xml b/orbotservice/src/main/res/values-fa/strings.xml
index fad3a175..b8afd7c3 100644
--- a/orbotservice/src/main/res/values-fa/strings.xml
+++ b/orbotservice/src/main/res/values-fa/strings.xml
@@ -19,8 +19,7 @@
   <string name="your_relay_settings_caused_an_exception_">تنظیمات رله شما موجب خطا شده اند</string>
     <string name="found_existing_tor_process">یک تور درحال اجرا پیدا شد...</string>
   <string name="something_bad_happened">اتفاق بدی افتاد. وقایع ثبت شده را چک کنید</string>
-    <string name="unable_to_read_hidden_service_name">ناتوان در خواندن نام سرویس مخفی</string>
-  <string name="unable_to_start_tor">ناتوان در راه اندازی تور:</string>
+    <string name="unable_to_start_tor">ناتوان در راه اندازی تور:</string>
     <string name="newnym">شما به شناسه جدید تور منتقل شدید</string>
     <string name="updating_settings_in_tor_service">به روز رسانی تنظیمات در سرویس Tor</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-fi/strings.xml b/orbotservice/src/main/res/values-fi/strings.xml
index ba45a7b9..952d37d1 100644
--- a/orbotservice/src/main/res/values-fi/strings.xml
+++ b/orbotservice/src/main/res/values-fi/strings.xml
@@ -18,8 +18,7 @@
   <string name="your_relay_settings_caused_an_exception_">Releasetuksesi aiheuttivat virheen!</string>
     <string name="found_existing_tor_process">löytyi olemassaoleva Tor-prosessi...</string>
   <string name="something_bad_happened">Jotain pahaa tapahtui. Tarkista loki</string>
-    <string name="unable_to_read_hidden_service_name">piilopalvelunimen lukeminen epäonnistui</string>
-  <string name="unable_to_start_tor">Torin käynnistys epäonnistui:</string>
+    <string name="unable_to_start_tor">Torin käynnistys epäonnistui:</string>
     <string name="newnym">Vaihdoit Tor-identiteettisi uuteen!</string>
     <string name="updating_settings_in_tor_service">päivitetään Tor-palvelun asetuksia</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-fr-rFR/strings.xml b/orbotservice/src/main/res/values-fr-rFR/strings.xml
index 8d98d8d8..3a83744f 100644
--- a/orbotservice/src/main/res/values-fr-rFR/strings.xml
+++ b/orbotservice/src/main/res/values-fr-rFR/strings.xml
@@ -19,8 +19,7 @@
   <string name="your_relay_settings_caused_an_exception_">Vos paramètres de relais ont causé une exception !</string>
     <string name="found_existing_tor_process">un processus existant de Tor a été trouvé...</string>
   <string name="something_bad_happened">Quelque chose n\'a pas été. Vérifiez le journal</string>
-    <string name="unable_to_read_hidden_service_name">impossible de lire le nom du service caché</string>
-  <string name="unable_to_start_tor">Impossible de démarrer Tor :</string>
+    <string name="unable_to_start_tor">Impossible de démarrer Tor :</string>
     <string name="newnym">Vous avez basculé vers une nouvelle identité Tor !</string>
     <string name="updating_settings_in_tor_service">mise à jour des paramètres dans le service Tor</string>
   <string name="mebibyte_per_second">Mio/s</string>
diff --git a/orbotservice/src/main/res/values-gl/strings.xml b/orbotservice/src/main/res/values-gl/strings.xml
index e43495be..a8c51b9b 100644
--- a/orbotservice/src/main/res/values-gl/strings.xml
+++ b/orbotservice/src/main/res/values-gl/strings.xml
@@ -18,7 +18,6 @@
   <string name="your_relay_settings_caused_an_exception_">Os seus axustes de relay causou unha excepción!</string>
     <string name="found_existing_tor_process">atopado proceso Tor existente...</string>
   <string name="something_bad_happened">Algo malo pasou. Comprobe o rexistro</string>
-    <string name="unable_to_read_hidden_service_name">imposible ler nome de servizo oculto</string>
-  <string name="unable_to_start_tor">Incapaz de arrancar Tor</string>
+    <string name="unable_to_start_tor">Incapaz de arrancar Tor</string>
     <string name="newnym">Cambiou a unha nova identidade Tor!</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-hr/strings.xml b/orbotservice/src/main/res/values-hr/strings.xml
index 1e9d6f57..a81a72db 100644
--- a/orbotservice/src/main/res/values-hr/strings.xml
+++ b/orbotservice/src/main/res/values-hr/strings.xml
@@ -19,8 +19,7 @@
   <string name="your_relay_settings_caused_an_exception_">Vaše postavke releja su uzrokovale iznimku!</string>
     <string name="found_existing_tor_process">pronađeni postojeći Tor procesi...</string>
   <string name="something_bad_happened">Nešto loše se dogodilo. Provjerite dnevnik</string>
-    <string name="unable_to_read_hidden_service_name">nije moguće pročitati ime skrivene usluge</string>
-  <string name="unable_to_start_tor">Nije moguće pokrenuti Tor:</string>
+    <string name="unable_to_start_tor">Nije moguće pokrenuti Tor:</string>
     <string name="newnym">Prebacili ste se na nov Tor identitet!</string>
     <string name="updating_settings_in_tor_service">ažuriram postavke u Tor usluzi</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-hu/strings.xml b/orbotservice/src/main/res/values-hu/strings.xml
index 440f4022..649c5efa 100644
--- a/orbotservice/src/main/res/values-hu/strings.xml
+++ b/orbotservice/src/main/res/values-hu/strings.xml
@@ -19,8 +19,7 @@
   <string name="your_relay_settings_caused_an_exception_">Az átjátszód beállításai kivételt okoztak!</string>
     <string name="found_existing_tor_process">létező Tor folyamat találva...</string>
   <string name="something_bad_happened">Valami rossz történt. Nézd meg a naplót.</string>
-    <string name="unable_to_read_hidden_service_name">nem olvasható a rejtett szolgáltatás neve</string>
-  <string name="unable_to_start_tor">A Tor indítása sikertelen:</string>
+    <string name="unable_to_start_tor">A Tor indítása sikertelen:</string>
     <string name="newnym">Új Tor identitásra váltottál!</string>
     <string name="updating_settings_in_tor_service">a Tor szolgáltatás beállításainak frissítése</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-in/strings.xml b/orbotservice/src/main/res/values-in/strings.xml
index 61f38f07..bc956123 100644
--- a/orbotservice/src/main/res/values-in/strings.xml
+++ b/orbotservice/src/main/res/values-in/strings.xml
@@ -19,8 +19,7 @@
   <string name="your_relay_settings_caused_an_exception_">Pengaturan relay anda menyebabkan kesalahan!</string>
     <string name="found_existing_tor_process">menemukan proses Tor yang ada...</string>
   <string name="something_bad_happened">Sesuatu yang buruk terjadi. Periksa log</string>
-    <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama layanan tersembunyi</string>
-  <string name="unable_to_start_tor">Tidak dapat memulai Tor:</string>
+    <string name="unable_to_start_tor">Tidak dapat memulai Tor:</string>
     <string name="newnym">Anda telah beralih ke identitas Tor baru!</string>
     <string name="updating_settings_in_tor_service">memperbarui setting pada layanan Tor</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-is/strings.xml b/orbotservice/src/main/res/values-is/strings.xml
index 742dffa4..e1c31a2c 100644
--- a/orbotservice/src/main/res/values-is/strings.xml
+++ b/orbotservice/src/main/res/values-is/strings.xml
@@ -18,8 +18,7 @@
   <string name="your_relay_settings_caused_an_exception_">Endurvarp stillingar þínar ollu undanþágu!</string>
     <string name="found_existing_tor_process">fann annan Tor þráð...</string>
   <string name="something_bad_happened">Eitthvað slæmt gerðist. Athugaðu skráninguna</string>
-    <string name="unable_to_read_hidden_service_name">get ekki lesið nafn földu þjónustunnar</string>
-  <string name="unable_to_start_tor">Get ekki kveikt á Tor:</string>
+    <string name="unable_to_start_tor">Get ekki kveikt á Tor:</string>
     <string name="newnym">Þú ert komin með nýtt Tor auðkenni!</string>
     <string name="updating_settings_in_tor_service">uppfæri stillingar í Tor þjónustu</string>
 
diff --git a/orbotservice/src/main/res/values-it/strings.xml b/orbotservice/src/main/res/values-it/strings.xml
index 734e80b7..a1ab523d 100644
--- a/orbotservice/src/main/res/values-it/strings.xml
+++ b/orbotservice/src/main/res/values-it/strings.xml
@@ -19,8 +19,7 @@
   <string name="your_relay_settings_caused_an_exception_">La configurazione del tuo relay ha causato un\'eccezione!</string>
     <string name="found_existing_tor_process">trovato un processo Tor esistente...</string>
   <string name="something_bad_happened">E\' accaduto un evento indesiderato. Controllare i log.</string>
-    <string name="unable_to_read_hidden_service_name">Impossibile leggere il nome del servizio nascosto.</string>
-  <string name="unable_to_start_tor">Impossibile avviare Tor:</string>
+    <string name="unable_to_start_tor">Impossibile avviare Tor:</string>
     <string name="newnym">Sei passato a una nuova identità Tor!</string>
     <string name="updating_settings_in_tor_service">aggiornamento impostazioni nel servizio Tor</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-iw/strings.xml b/orbotservice/src/main/res/values-iw/strings.xml
index aa7e87ea..4d04faf7 100644
--- a/orbotservice/src/main/res/values-iw/strings.xml
+++ b/orbotservice/src/main/res/values-iw/strings.xml
@@ -16,8 +16,7 @@
     <string name="couldn_t_start_tor_process_">אין אפשרות להתחיל תהליך Tor:</string>
     <string name="found_existing_tor_process">× ×ž×¦× תהליך Tor קיים…</string>
   <string name="something_bad_happened">משהו רע התרחש. בדוק את היומן</string>
-    <string name="unable_to_read_hidden_service_name">לא מסוגל לקרוא שם שירות × ×¡×ª×¨</string>
-  <string name="unable_to_start_tor">לא מסוגל להתחיל את Tor:</string>
+    <string name="unable_to_start_tor">לא מסוגל להתחיל את Tor:</string>
     <string name="newnym">החלפת אל זהות Tor חדשה!</string>
     <string name="updating_settings_in_tor_service">מעדכן הגדרות Tor במכשיר</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-ja/strings.xml b/orbotservice/src/main/res/values-ja/strings.xml
index 4a536bc0..1db39f3d 100644
--- a/orbotservice/src/main/res/values-ja/strings.xml
+++ b/orbotservice/src/main/res/values-ja/strings.xml
@@ -19,8 +19,7 @@
   <string name="your_relay_settings_caused_an_exception_">あなたのリレー設定により例外が発生しました!</string>
     <string name="found_existing_tor_process">Torプロセスを発見</string>
   <string name="something_bad_happened">何かが起こりました。ログを確認してください。</string>
-    <string name="unable_to_read_hidden_service_name">hidden serviceの名前読込不能</string>
-  <string name="unable_to_start_tor">Torを実行できませんでした</string>
+    <string name="unable_to_start_tor">Torを実行できませんでした</string>
     <string name="newnym">新たな Tor の身元に切り替えました。</string>
     <string name="updating_settings_in_tor_service">Torサービスの設定を更新中</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-ko/strings.xml b/orbotservice/src/main/res/values-ko/strings.xml
index 0e420193..08f33580 100644
--- a/orbotservice/src/main/res/values-ko/strings.xml
+++ b/orbotservice/src/main/res/values-ko/strings.xml
@@ -17,7 +17,6 @@
   <string name="your_relay_settings_caused_an_exception_">귀하의 중계서버 ì„¤ì •ì€ 예외를 발생시켰습니다!</string>
     <string name="found_existing_tor_process">ì¡´ìž¬í•˜ê³  있는 Tor 프로세스 발견</string>
   <string name="something_bad_happened">어떤 나쁜 것이 발생. 로그 확인하세요.</string>
-    <string name="unable_to_read_hidden_service_name">ížˆë“  서비스 이름을 읽을 수 없음</string>
-  <string name="unable_to_start_tor">Tor 시작 불가능</string>
+    <string name="unable_to_start_tor">Tor 시작 불가능</string>
     <string name="newnym">새로운 Tor ì‹ ì›ìœ¼ë¡œ ì „í™˜ë˜ì—ˆìŠµë‹ˆë‹¤!</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-lv/strings.xml b/orbotservice/src/main/res/values-lv/strings.xml
index abf085b5..35203a30 100644
--- a/orbotservice/src/main/res/values-lv/strings.xml
+++ b/orbotservice/src/main/res/values-lv/strings.xml
@@ -18,8 +18,7 @@
   <string name="your_relay_settings_caused_an_exception_">Jūsu retranslatora iestatījumi izraisīja izņēmuma situāciju!</string>
     <string name="found_existing_tor_process">Atrada esošu Tor procesu...</string>
   <string name="something_bad_happened">Nav labi. Pārbaudiet žurnālu</string>
-    <string name="unable_to_read_hidden_service_name">Nespēj lasīt slēpta pakalpojuma nosaukumu</string>
-  <string name="unable_to_start_tor">Nevar startēt Tor:</string>
+    <string name="unable_to_start_tor">Nevar startēt Tor:</string>
     <string name="newnym">Jūs pārslēdzāties uz jaunu Tor\'a identitāti!</string>
     <string name="updating_settings_in_tor_service">atjaunina Tor pakalpojuma iestatījumus </string>
 </resources>
diff --git a/orbotservice/src/main/res/values-mk/strings.xml b/orbotservice/src/main/res/values-mk/strings.xml
index dfc09fe3..ca87d243 100644
--- a/orbotservice/src/main/res/values-mk/strings.xml
+++ b/orbotservice/src/main/res/values-mk/strings.xml
@@ -18,8 +18,7 @@
   <string name="your_relay_settings_caused_an_exception_">Вашите поставки за реле предизвикаа грешка!</string>
     <string name="found_existing_tor_process">Пронајден постоечки Tor-процес ...</string>
   <string name="something_bad_happened">Настана грешка. Проверете во дневникот</string>
-    <string name="unable_to_read_hidden_service_name">не може да се прочита името на скриениот сервис</string>
-  <string name="unable_to_start_tor">Tor не може да се стартува:</string>
+    <string name="unable_to_start_tor">Tor не може да се стартува:</string>
     <string name="newnym">Се префрливте на нов идентитет на Tor!</string>
     <string name="updating_settings_in_tor_service">ажурирање на поставките во сервисот Tor </string>
 </resources>
diff --git a/orbotservice/src/main/res/values-ms-rMY/strings.xml b/orbotservice/src/main/res/values-ms-rMY/strings.xml
index 4ca71d26..f491595b 100644
--- a/orbotservice/src/main/res/values-ms-rMY/strings.xml
+++ b/orbotservice/src/main/res/values-ms-rMY/strings.xml
@@ -17,6 +17,5 @@
   <string name="your_relay_settings_caused_an_exception_">Tetapan relay anda menyebabkan pengecualian!</string>
     <string name="found_existing_tor_process">Proses Tor sedia ada ditemui..</string>
   <string name="something_bad_happened">Sesuatu yang buruk berlaku. Semak log.</string>
-    <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama servis tersembunyi</string>
-  <string name="unable_to_start_tor">Tidak dapat memulakan Tor:</string>
+    <string name="unable_to_start_tor">Tidak dapat memulakan Tor:</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-ms/strings.xml b/orbotservice/src/main/res/values-ms/strings.xml
index badbaf86..74ec832a 100644
--- a/orbotservice/src/main/res/values-ms/strings.xml
+++ b/orbotservice/src/main/res/values-ms/strings.xml
@@ -18,6 +18,5 @@
   <string name="your_relay_settings_caused_an_exception_">Tetapan relay anda menyebabkan pengecualian!</string>
     <string name="found_existing_tor_process">Proses Tor sedia ada ditemui..</string>
   <string name="something_bad_happened">Sesuatu yang buruk berlaku. Semak log.</string>
-    <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama servis tersembunyi</string>
-  <string name="unable_to_start_tor">Tidak dapat memulakan Tor:</string>
+    <string name="unable_to_start_tor">Tidak dapat memulakan Tor:</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-nb/strings.xml b/orbotservice/src/main/res/values-nb/strings.xml
index 584a7ba8..49a91a22 100644
--- a/orbotservice/src/main/res/values-nb/strings.xml
+++ b/orbotservice/src/main/res/values-nb/strings.xml
@@ -18,8 +18,7 @@
   <string name="your_relay_settings_caused_an_exception_">Dine relé-innstillinger forårsaket et unntak!</string>
     <string name="found_existing_tor_process">fant eksisterende Tor-prosess...</string>
   <string name="something_bad_happened">Noe alvorlig skjedde. Sjekk loggen.</string>
-    <string name="unable_to_read_hidden_service_name">klarte ikke å lese skjult tjenestenavn</string>
-  <string name="unable_to_start_tor">Klarte ikke å starte Tor:</string>
+    <string name="unable_to_start_tor">Klarte ikke å starte Tor:</string>
     <string name="newnym">Du har byttet til en ny Tor-identitet!</string>
     <string name="updating_settings_in_tor_service">Oppdaterer innstillinger i Tor service</string>
   <string name="mebibyte_per_second">MiB/s</string>
diff --git a/orbotservice/src/main/res/values-nl/strings.xml b/orbotservice/src/main/res/values-nl/strings.xml
index 795b7ff9..189f5950 100644
--- a/orbotservice/src/main/res/values-nl/strings.xml
+++ b/orbotservice/src/main/res/values-nl/strings.xml
@@ -19,8 +19,7 @@
   <string name="your_relay_settings_caused_an_exception_">Je relay-instellingen veroorzaakten een fout!</string>
     <string name="found_existing_tor_process">bestaand Tor-proces gevonden…</string>
   <string name="something_bad_happened">Er is een fout opgetreden. Controleer de log</string>
-    <string name="unable_to_read_hidden_service_name">Kan verborgen dienst-naam niet lezen</string>
-  <string name="unable_to_start_tor">Kan Tor niet starten:</string>
+    <string name="unable_to_start_tor">Kan Tor niet starten:</string>
     <string name="newnym">Je bent naar een nieuwe Tor identiteit gewisseld!</string>
     <string name="updating_settings_in_tor_service">instellingen in Tor-dienst worden bijgewerkt</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-pl/strings.xml b/orbotservice/src/main/res/values-pl/strings.xml
index 6ea25936..eec5fc49 100644
--- a/orbotservice/src/main/res/values-pl/strings.xml
+++ b/orbotservice/src/main/res/values-pl/strings.xml
@@ -19,8 +19,7 @@
   <string name="your_relay_settings_caused_an_exception_">Ustawienia Twojego przekaźnika spowodowały wyjątek!</string>
     <string name="found_existing_tor_process">znaleziono istniejÄ…cy proces Tora...</string>
   <string name="something_bad_happened">Coś nie poszło nie tak. Sprawdź logi</string>
-    <string name="unable_to_read_hidden_service_name">uniemożliw czytanie nazw ukrytych serwisów</string>
-  <string name="unable_to_start_tor">Nie można wystartować aplikacji Tor:</string>
+    <string name="unable_to_start_tor">Nie można wystartować aplikacji Tor:</string>
     <string name="newnym">Nowa tożsamość Tor\'a została zmieniona!</string>
     <string name="updating_settings_in_tor_service">aktualizowanie ustawień w serwisie Tor</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-pt-rBR/strings.xml b/orbotservice/src/main/res/values-pt-rBR/strings.xml
index f62530aa..04aea4ac 100644
--- a/orbotservice/src/main/res/values-pt-rBR/strings.xml
+++ b/orbotservice/src/main/res/values-pt-rBR/strings.xml
@@ -19,8 +19,7 @@
   <string name="your_relay_settings_caused_an_exception_">Suas configurações de retransmissão causaram uma exceção!</string>
     <string name="found_existing_tor_process">procurando processos Tor existentes...</string>
   <string name="something_bad_happened">Algo ruim aconteceu. Cheque o lo</string>
-    <string name="unable_to_read_hidden_service_name">habilitar ler o nome do serviço oculto</string>
-  <string name="unable_to_start_tor">Habilitar iniciar o Tor:</string>
+    <string name="unable_to_start_tor">Habilitar iniciar o Tor:</string>
     <string name="newnym">Você trocou para uma nova identidade Tor!</string>
     <string name="updating_settings_in_tor_service">atualizando configurações no serviço Tor</string>
   <string name="mebibyte_per_second">MiB/s</string>
diff --git a/orbotservice/src/main/res/values-pt/strings.xml b/orbotservice/src/main/res/values-pt/strings.xml
index f73e0c7d..f41be416 100644
--- a/orbotservice/src/main/res/values-pt/strings.xml
+++ b/orbotservice/src/main/res/values-pt/strings.xml
@@ -15,8 +15,7 @@
     <string name="couldn_t_start_tor_process_">Não foi possível iniciar o processo Tor: </string>
     <string name="found_existing_tor_process">encontrado o processo Tor existente...</string>
   <string name="something_bad_happened">Aconteceu algo de mau. Verifique o registo de eventos.</string>
-    <string name="unable_to_read_hidden_service_name">não é possível ler o nome do serviço ocultado</string>
-  <string name="unable_to_start_tor">Não é possível iniciar o Tor:</string>
+    <string name="unable_to_start_tor">Não é possível iniciar o Tor:</string>
     <string name="newnym">Mudou para uma nova identidade do Tor!</string>
     <string name="updating_settings_in_tor_service">a atualizar as definições no serviço Tor</string>
   <string name="mebibyte_per_second">MiB/s</string>
diff --git a/orbotservice/src/main/res/values-ro/strings.xml b/orbotservice/src/main/res/values-ro/strings.xml
index 5b5d08c2..a7243777 100644
--- a/orbotservice/src/main/res/values-ro/strings.xml
+++ b/orbotservice/src/main/res/values-ro/strings.xml
@@ -17,8 +17,7 @@
   <string name="your_relay_settings_caused_an_exception_">Setarile tale de relay au cauzat o exceptie!</string>
     <string name="found_existing_tor_process">gasit proces Tor existent...</string>
   <string name="something_bad_happened">Ceva rau s-a intamplat. Verifica log-ul</string>
-    <string name="unable_to_read_hidden_service_name">nu am putut citi numele serviciului ascuns</string>
-  <string name="unable_to_start_tor">Nu am reusit sa pornesc Tor:</string>
+    <string name="unable_to_start_tor">Nu am reusit sa pornesc Tor:</string>
     <string name="newnym">Ați comutat la o nouă identitate Tor!</string>
     <string name="updating_settings_in_tor_service">se actualizează configurările în serviciul Tor</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-ru/strings.xml b/orbotservice/src/main/res/values-ru/strings.xml
index 2b0cca3f..ac01e282 100644
--- a/orbotservice/src/main/res/values-ru/strings.xml
+++ b/orbotservice/src/main/res/values-ru/strings.xml
@@ -19,8 +19,7 @@
   <string name="your_relay_settings_caused_an_exception_">Настройки вашего ретранслятора вызвали исключение!</string>
     <string name="found_existing_tor_process">найден существующий процесс Tor...</string>
   <string name="something_bad_happened">Произошла какая-то ошибка. Проверьте журнал.</string>
-    <string name="unable_to_read_hidden_service_name">невозможно прочитать имя скрытой службы</string>
-  <string name="unable_to_start_tor">Невозможно запустить Tor:</string>
+    <string name="unable_to_start_tor">Невозможно запустить Tor:</string>
     <string name="newnym">Вы переключились на новый идентификатор Tor!</string>
     <string name="updating_settings_in_tor_service">обновление настроек в сервисе Tor</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-si-rLK/strings.xml b/orbotservice/src/main/res/values-si-rLK/strings.xml
index 51c9389a..ed2140e0 100644
--- a/orbotservice/src/main/res/values-si-rLK/strings.xml
+++ b/orbotservice/src/main/res/values-si-rLK/strings.xml
@@ -17,6 +17,5 @@
   <string name="your_relay_settings_caused_an_exception_">ඔබේ ප්‍රතියෝජක සිටුවම්වල ව්‍යතිරේකයක් හටගෙන ඇත!</string>
     <string name="found_existing_tor_process">පවතින Tor ක්‍රියාවලි හමුවිය...</string>
   <string name="something_bad_happened">යම් නොමනා දෙයක් සිදුවිය. ලොගය පරික්ෂා කර බලන්න </string>
-    <string name="unable_to_read_hidden_service_name">සැගවුණු සේවා නාමය කියවීමට නොහැකිය </string>
-  <string name="unable_to_start_tor">Tor ආරම්භ කිරීමට නොහැකිය:</string>
+    <string name="unable_to_start_tor">Tor ආරම්භ කිරීමට නොහැකිය:</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-sr/strings.xml b/orbotservice/src/main/res/values-sr/strings.xml
index ab08b3ec..9bd0e631 100644
--- a/orbotservice/src/main/res/values-sr/strings.xml
+++ b/orbotservice/src/main/res/values-sr/strings.xml
@@ -18,6 +18,5 @@
   <string name="your_relay_settings_caused_an_exception_">Ваше поставке релеја су изазвале изузетак!</string>
     <string name="found_existing_tor_process">нађен покренути Тор процес...</string>
   <string name="something_bad_happened">Нешто лоше се догодило. Прегледајте логове</string>
-    <string name="unable_to_read_hidden_service_name">нисам у могућности да прочитам име сакривеног сервиса</string>
-  <string name="unable_to_start_tor">Тор није у могућности да се покрене:</string>
+    <string name="unable_to_start_tor">Тор није у могућности да се покрене:</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-sv/strings.xml b/orbotservice/src/main/res/values-sv/strings.xml
index e0a93631..7e28840b 100644
--- a/orbotservice/src/main/res/values-sv/strings.xml
+++ b/orbotservice/src/main/res/values-sv/strings.xml
@@ -19,8 +19,7 @@
   <string name="your_relay_settings_caused_an_exception_">Din relä inställning orsakade ett undantag!</string>
     <string name="found_existing_tor_process">hittade existerande Tor process...</string>
   <string name="something_bad_happened">Något dåligt hände. Kolla loggen.</string>
-    <string name="unable_to_read_hidden_service_name">kan inte läsa gömda tjänstens namn</string>
-  <string name="unable_to_start_tor">Kan inte starta Tor:</string>
+    <string name="unable_to_start_tor">Kan inte starta Tor:</string>
     <string name="newnym">Du har bytt till en ny Tor identitet!</string>
     <string name="updating_settings_in_tor_service">uppdaterar inställningar i Tor-tjänsten</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-th/strings.xml b/orbotservice/src/main/res/values-th/strings.xml
index 00c8b4a2..9754a202 100644
--- a/orbotservice/src/main/res/values-th/strings.xml
+++ b/orbotservice/src/main/res/values-th/strings.xml
@@ -14,6 +14,5 @@
     <string name="your_reachableaddresses_settings_caused_an_exception_">การตั้งค่า ReachableAddresses ของคุณทำให้เกิดข้อผิดพลาด</string>
   <string name="your_relay_settings_caused_an_exception_">การตั้งค่ารีเลย์ของคุณทำให้เกิดข้อผิดพลาด</string>
     <string name="something_bad_happened">เกิดอะไรไม่ดีสักอย่าง ให้ตรวจดูจากปูม</string>
-    <string name="unable_to_read_hidden_service_name">ไม่สามารถอ่านชื่อของบริการไม่เปิดเผย</string>
-  <string name="unable_to_start_tor">ไม่สามารถเริ่ม Tor</string>
+    <string name="unable_to_start_tor">ไม่สามารถเริ่ม Tor</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-tl/strings.xml b/orbotservice/src/main/res/values-tl/strings.xml
index cdc446fc..d49f44e1 100644
--- a/orbotservice/src/main/res/values-tl/strings.xml
+++ b/orbotservice/src/main/res/values-tl/strings.xml
@@ -17,7 +17,6 @@
   <string name="your_relay_settings_caused_an_exception_">Ang iyong relay settings ay nag sanhi ng exception!</string>
     <string name="found_existing_tor_process"> nakakita ng umiiral na Tor process...</string>
   <string name="something_bad_happened">May nangyaring masama. Tingnan ang log</string>
-    <string name="unable_to_read_hidden_service_name">hindi mabasa ang pangalan ng tagong serbisyo</string>
-  <string name="unable_to_start_tor">Hindi masimulan ang Tor:</string>
+    <string name="unable_to_start_tor">Hindi masimulan ang Tor:</string>
     <string name="newnym">Ikaw ay nagpalit ng bagong pagkakakilanlan sa Tor!</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-tr/strings.xml b/orbotservice/src/main/res/values-tr/strings.xml
index 249b42d5..6c300f6e 100644
--- a/orbotservice/src/main/res/values-tr/strings.xml
+++ b/orbotservice/src/main/res/values-tr/strings.xml
@@ -19,8 +19,7 @@
   <string name="your_relay_settings_caused_an_exception_">Tor aktarıcı ayarlarınız bir istisnaya yol açtı!</string>
     <string name="found_existing_tor_process">varolan bir Tor iÅŸlemi bulundu...</string>
   <string name="something_bad_happened">Kötü bir şey oldu. Kayıtlara bakınız</string>
-    <string name="unable_to_read_hidden_service_name">gizli hizmet adı okunamıyor</string>
-  <string name="unable_to_start_tor">Tor başlatılamadı:</string>
+    <string name="unable_to_start_tor">Tor başlatılamadı:</string>
     <string name="newnym">Yeni bir Tor kimliğine geçiş yaptınız!</string>
     <string name="updating_settings_in_tor_service">Tor hizmet ayarları güncellemesi</string>
   <string name="mebibyte_per_second">MiB/s</string>
diff --git a/orbotservice/src/main/res/values-uk/strings.xml b/orbotservice/src/main/res/values-uk/strings.xml
index 34860e4c..28fd020d 100644
--- a/orbotservice/src/main/res/values-uk/strings.xml
+++ b/orbotservice/src/main/res/values-uk/strings.xml
@@ -18,8 +18,7 @@
   <string name="your_relay_settings_caused_an_exception_">Налаштування вашого ретранслятора викликали виключення!</string>
     <string name="found_existing_tor_process">знайдено існуючий процес Tor...</string>
   <string name="something_bad_happened">Виникла якась помилка. Перевірте лог</string>
-    <string name="unable_to_read_hidden_service_name">неможливо прочитати ім\'я прихованої служби</string>
-  <string name="unable_to_start_tor">Неможливо запустити Tor:</string>
+    <string name="unable_to_start_tor">Неможливо запустити Tor:</string>
     <string name="newnym">Ви перемкнулись на новий ідентифікатор Tor!</string>
     <string name="updating_settings_in_tor_service">оновлення налаштувань у сервісі Tor</string>
   <string name="mebibyte_per_second">МіБ/с</string>
diff --git a/orbotservice/src/main/res/values-vi/strings.xml b/orbotservice/src/main/res/values-vi/strings.xml
index aee8a4f2..9a284b5a 100644
--- a/orbotservice/src/main/res/values-vi/strings.xml
+++ b/orbotservice/src/main/res/values-vi/strings.xml
@@ -19,8 +19,7 @@
   <string name="your_relay_settings_caused_an_exception_">Thiết lập relay của bạn đã gây ra một vấn đề!</string>
     <string name="found_existing_tor_process">tìm ra tiến trình hiện hà nh của Tor...</string>
   <string name="something_bad_happened">Có gì đó không ổn. Xin xem lại nhật ký</string>
-    <string name="unable_to_read_hidden_service_name">không thể đọc được tên dịch vụ ẩn</string>
-  <string name="unable_to_start_tor">Không thể khởi động Tor được: </string>
+    <string name="unable_to_start_tor">Không thể khởi động Tor được: </string>
     <string name="newnym">Bạn đã chuyển sang một mạch Tor mới!</string>
     <string name="updating_settings_in_tor_service">đang cập nhật cà i đặt dịch vụ Tor</string>
   <string name="mebibyte_per_second">MiB/s</string>
diff --git a/orbotservice/src/main/res/values-zh-rCN/strings.xml b/orbotservice/src/main/res/values-zh-rCN/strings.xml
index a79da66f..5048ab70 100644
--- a/orbotservice/src/main/res/values-zh-rCN/strings.xml
+++ b/orbotservice/src/main/res/values-zh-rCN/strings.xml
@@ -19,8 +19,7 @@
   <string name="your_relay_settings_caused_an_exception_">中继设置导致异常！</string>
     <string name="found_existing_tor_process">发现当前已存在 Tor 进程...</string>
   <string name="something_bad_happened">发生错误，请检查日志</string>
-    <string name="unable_to_read_hidden_service_name">æ— æ³•è¯»å–éšè—æœåŠ¡åç§°</string>
-  <string name="unable_to_start_tor">æ— æ³•å¯åŠ¨ Tor：</string>
+    <string name="unable_to_start_tor">æ— æ³•å¯åŠ¨ Tor：</string>
     <string name="newnym">已切换为新的 Tor æ ‡è¯†ï¼</string>
     <string name="updating_settings_in_tor_service">正在更新 Tor 服务中的设置</string>
   <string name="mebibyte_per_second">MiB/秒</string>
diff --git a/orbotservice/src/main/res/values/strings.xml b/orbotservice/src/main/res/values/strings.xml
index ed3464ac..80f80ca3 100644
--- a/orbotservice/src/main/res/values/strings.xml
+++ b/orbotservice/src/main/res/values/strings.xml
@@ -12,7 +12,6 @@
     <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string>
     <string name="found_existing_tor_process">found existing Tor process…</string>
     <string name="something_bad_happened">Something bad happened. Check the log</string>
-    <string name="unable_to_read_hidden_service_name">unable to read onion service name</string>
     <string name="unable_to_start_tor">Unable to start Tor:</string>
 
     <string name="newnym">You\'ve switched to a new Tor identity!</string>