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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [orbot/master] Removes V2 Onion Services From Orbot
From: n8fr8@xxxxxxxxxxxxxx
Date: Wed, 22 Dec 2021 21:55:10 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Wed, 22 Dec 2021 17:08:03 -0500
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: bim <dsnake@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit cb98e7febd379268c3f15eb0f884197a57e17928
Author: bim <dsnake@xxxxxxxxxxxxxx>
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&#8230;</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&#8230;</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&#8230;</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 &lt;i&gt;(Warning: This Could Expose Your Service Configuration to Other Apps)&lt;/i&gt;</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&#8230;</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>

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

Prev by Author: [tor-commits] [orbot/master] Merge pull request #466 from syphyr/main
Next by Author: [tor-commits] [orbot/master] fix 448: hosted v3 onions would generate a new address on backup/restore, files from backup weren't being read in OrbotService but were in Orbot
Previous by thread: [tor-commits] [orbot/master] switch to tor 0.4.6.7
Next by thread: [tor-commits] [orbot/master] Add geoip library to libs.versions.toml
Index(es):
- Author
- Thread