[tor-commits] [orbot/master] UI Validation on Dialogs:

[n8fr8 at torproject.org]

commit 1439356d9cc5be4fbd22f4ee421205056f6fc937
Author: bim <dsnake at protonmail.com>
Date:   Tue Sep 29 17:13:28 2020 -0400

    UI Validation on Dialogs:
            - UI is ready for v3 client cookies (just uncomment one line of code)
            - when text input is incorrect, the submit button will be disabled rather dismissing the dialog and showing the user a vague Toast + erasing all their input
---
 app-mini/src/main/res/values-ar/strings.xml        |  6 +-
 app-mini/src/main/res/values-ay/strings.xml        |  6 +-
 app-mini/src/main/res/values-be/strings.xml        |  6 +-
 app-mini/src/main/res/values-ca/strings.xml        |  6 +-
 app-mini/src/main/res/values-de/strings.xml        |  6 +-
 app-mini/src/main/res/values-el/strings.xml        |  6 +-
 app-mini/src/main/res/values-es/strings.xml        |  6 +-
 app-mini/src/main/res/values-eu/strings.xml        |  6 +-
 app-mini/src/main/res/values-fa/strings.xml        |  6 +-
 app-mini/src/main/res/values-fr/strings.xml        |  6 +-
 app-mini/src/main/res/values-gl/strings.xml        |  6 +-
 app-mini/src/main/res/values-he/strings.xml        |  6 +-
 app-mini/src/main/res/values-hi/strings.xml        |  6 +-
 app-mini/src/main/res/values-hu/strings.xml        |  6 +-
 app-mini/src/main/res/values-is/strings.xml        |  6 +-
 app-mini/src/main/res/values-it/strings.xml        |  6 +-
 app-mini/src/main/res/values-ja/strings.xml        |  6 +-
 app-mini/src/main/res/values-mk/strings.xml        |  6 +-
 app-mini/src/main/res/values-nb/strings.xml        |  6 +-
 app-mini/src/main/res/values-nl/strings.xml        |  6 +-
 app-mini/src/main/res/values-pl/strings.xml        |  3 +-
 app-mini/src/main/res/values-pt-rBR/strings.xml    |  5 +-
 app-mini/src/main/res/values-ru/strings.xml        |  6 +-
 app-mini/src/main/res/values-sr/strings.xml        |  6 +-
 app-mini/src/main/res/values-sv/strings.xml        |  6 +-
 app-mini/src/main/res/values-th/strings.xml        |  6 +-
 app-mini/src/main/res/values-tr/strings.xml        |  6 +-
 app-mini/src/main/res/values-uk/strings.xml        |  6 +-
 app-mini/src/main/res/values-zh-rTW/strings.xml    |  6 +-
 app-mini/src/main/res/values/strings.xml           |  4 -
 .../ui/hiddenservices/backup/BackupUtils.java      |  5 ++
 .../ui/hiddenservices/dialogs/AddCookieDialog.java | 81 ++++++++++++-------
 .../ui/hiddenservices/dialogs/HSDataDialog.java    | 93 +++++++++++++---------
 .../ui/hiddenservices/dialogs/HSDeleteDialog.java  |  1 -
 app/src/main/res/layout/layout_hs_data_dialog.xml  |  8 +-
 app/src/main/res/values-ar/strings.xml             |  6 +-
 app/src/main/res/values-ay/strings.xml             |  6 +-
 app/src/main/res/values-be/strings.xml             |  4 -
 app/src/main/res/values-ca/strings.xml             |  6 +-
 app/src/main/res/values-de/strings.xml             |  6 +-
 app/src/main/res/values-el/strings.xml             |  6 +-
 app/src/main/res/values-es/strings.xml             |  6 +-
 app/src/main/res/values-eu/strings.xml             |  6 +-
 app/src/main/res/values-fa/strings.xml             |  6 +-
 app/src/main/res/values-fr/strings.xml             |  6 +-
 app/src/main/res/values-gl/strings.xml             |  6 +-
 app/src/main/res/values-he/strings.xml             |  6 +-
 app/src/main/res/values-hi/strings.xml             |  6 +-
 app/src/main/res/values-hu/strings.xml             |  6 +-
 app/src/main/res/values-is/strings.xml             |  6 +-
 app/src/main/res/values-it/strings.xml             |  6 +-
 app/src/main/res/values-ja/strings.xml             |  6 +-
 app/src/main/res/values-mk/strings.xml             |  6 +-
 app/src/main/res/values-nb/strings.xml             |  6 +-
 app/src/main/res/values-nl/strings.xml             |  6 +-
 app/src/main/res/values-pl/strings.xml             |  3 +-
 app/src/main/res/values-pt-rBR/strings.xml         |  5 +-
 app/src/main/res/values-ru/strings.xml             |  6 +-
 app/src/main/res/values-sr/strings.xml             |  6 +-
 app/src/main/res/values-sv/strings.xml             |  6 +-
 app/src/main/res/values-th/strings.xml             |  6 +-
 app/src/main/res/values-tr/strings.xml             |  6 +-
 app/src/main/res/values-uk/strings.xml             |  6 +-
 app/src/main/res/values-zh-rTW/strings.xml         |  6 +-
 app/src/main/res/values/strings.xml                |  4 -
 65 files changed, 178 insertions(+), 356 deletions(-)

diff --git a/app-mini/src/main/res/values-ar/strings.xml b/app-mini/src/main/res/values-ar/strings.xml
index be647b88..d7fd30eb 100644
--- a/app-mini/src/main/res/values-ar/strings.xml
+++ b/app-mini/src/main/res/values-ar/strings.xml
@@ -136,16 +136,13 @@
   <string name="onion_port">منفذ الـ Onion</string>
   <string name="name">الاسم</string>
   <string name="done">تم !</string>
-  <string name="invalid_port">المنفذ غير صالح</string>
-  <string name="copy_address_to_clipboard">نسخ العنوان إلى الحافظة</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>
   <string name="backup_restored">تمت استعادة النسخة الإحتياطية</string>
   <string name="restore_backup">إسترجاع نسخة احتياطية</string>
-    <string name="name_can_t_be_empty">لا يمكن ترك الإسم فارغا</string>
-  <string name="fields_can_t_be_empty">لا يمكن ترك الحقول فارغة</string>
   <string name="start_tor_again_for_finish_the_process">قم بتشغيل تور ثانيةً لإنهاء العملية</string>
   <string name="confirm_service_deletion">تأكيد حذف الخدمة</string>
   <string name="click_again_for_backup">قم بالنقر ثانية للقيام بالنسخ الإحتياطي</string>
@@ -156,7 +153,6 @@
   <string name="please_restart_Orbot_to_enable_the_changes">الرجاء إعادة تشغيل أوربوت لتفعيل التعديلات</string>
   <string name="client_cookies">كعكات العميل</string>
   <string name="onion">.onion</string>
-  <string name="invalid_onion_address">عنوان الـ .onion غير صالح</string>
   <string name="cookie_from_QR">القراءة مِن رمز الكيو آر</string>
   <string name="backup_cookie">النسخ الإحتياطي للكعكة</string>
   <string name="delete_cookie">حذف الكعكة</string>
diff --git a/app-mini/src/main/res/values-ay/strings.xml b/app-mini/src/main/res/values-ay/strings.xml
index 55ad3641..aeeedd59 100644
--- a/app-mini/src/main/res/values-ay/strings.xml
+++ b/app-mini/src/main/res/values-ay/strings.xml
@@ -140,16 +140,13 @@
   <string name="onion_port">Onion apayañ thakhi</string>
   <string name="name">Suti</string>
   <string name="done">¡Tukuyata!</string>
-  <string name="invalid_port">Jan apaykay thakhi</string>
-  <string name="copy_address_to_clipboard">Utjirinak waruqañawjar imam</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>
   <string name="backup_restored">Imat luratanakamax mayamp apnaqatäxiwa</string>
     <string name="restore_backup">Imat luratanak mayamp aqtayam</string>
-    <string name="name_can_t_be_empty">Sutix qillqantatäñapapuniwa</string>
-  <string name="fields_can_t_be_empty">Janiw kunas ch\'usäñapakiti</string>
   <string name="start_tor_again_for_finish_the_process">Tukuyañatakix Tor mayamp naktayam</string>
   <string name="confirm_service_deletion">Lurañanakax pichsutäniwa</string>
   <string name="click_again_for_backup">Imat luratanak utjañapatak mayamp limt\'am</string>
@@ -160,7 +157,6 @@
   <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="invalid_onion_address">Jan wali Onion ukan chiqawjanakapa</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>
diff --git a/app-mini/src/main/res/values-be/strings.xml b/app-mini/src/main/res/values-be/strings.xml
index 600128ec..9533e9c9 100644
--- a/app-mini/src/main/res/values-be/strings.xml
+++ b/app-mini/src/main/res/values-be/strings.xml
@@ -140,16 +140,13 @@
   <string name="onion_port">Onion-порт</string>
   <string name="name">Імя</string>
   <string name="done">Гатова!</string>
-  <string name="invalid_port">Некарэктны порт</string>
-  <string name="copy_address_to_clipboard">Скапіяваць адрас у буфер памену</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>
   <string name="backup_restored">Адноўлена з рэзервовай копіі</string>
     <string name="restore_backup">Аднавіць з копіі</string>
-    <string name="name_can_t_be_empty">Імя не можа быць пустым</string>
-  <string name="fields_can_t_be_empty">Палі не могуць быць пустымі</string>
   <string name="start_tor_again_for_finish_the_process">Запусціце Tor ізноў для завяршэння працэсу</string>
   <string name="confirm_service_deletion">Пацверджанне выдалення службы</string>
   <string name="click_again_for_backup">Націсніце яшчэ раз для рэзервавання</string>
@@ -160,7 +157,6 @@
   <string name="please_restart_Orbot_to_enable_the_changes">Калі ласка, перазапусціце Orbot для ўступу змены ў сілу</string>
   <string name="client_cookies">Cookies кліента</string>
   <string name="onion">.onion</string>
-  <string name="invalid_onion_address">Несапраўдны .onion-адрас</string>
   <string name="cookie_from_QR">Прачытаць з QR-кода</string>
   <string name="backup_cookie">Рэзерваваць cookie</string>
   <string name="delete_cookie">Выдаліць cookies</string>
diff --git a/app-mini/src/main/res/values-ca/strings.xml b/app-mini/src/main/res/values-ca/strings.xml
index c73e46f8..1cea27f3 100644
--- a/app-mini/src/main/res/values-ca/strings.xml
+++ b/app-mini/src/main/res/values-ca/strings.xml
@@ -141,16 +141,13 @@
   <string name="onion_port">Port ceba</string>
   <string name="name">Nom</string>
   <string name="done">Fet!</string>
-  <string name="invalid_port">Port invà lid</string>
-  <string name="copy_address_to_clipboard">Copia adreça al portapapers</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>
   <string name="backup_restored">Còpia de seguretat restaurada</string>
     <string name="restore_backup">Restaurar còpia de seguretat</string>
-    <string name="name_can_t_be_empty">El nom no pot estar buit</string>
-  <string name="fields_can_t_be_empty">Els camps no poden estar buits</string>
   <string name="start_tor_again_for_finish_the_process">Torna a iniciar Tor per acabar el procés</string>
   <string name="confirm_service_deletion">Confirma la supressió del servei</string>
   <string name="click_again_for_backup">Feu clic novament per fer còpia de seguretat</string>
@@ -161,7 +158,6 @@
   <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="invalid_onion_address">L\'adreça .onion no és và lida</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>
diff --git a/app-mini/src/main/res/values-de/strings.xml b/app-mini/src/main/res/values-de/strings.xml
index 8bc5e311..e6ffbf36 100644
--- a/app-mini/src/main/res/values-de/strings.xml
+++ b/app-mini/src/main/res/values-de/strings.xml
@@ -141,16 +141,13 @@
   <string name="onion_port">Onion Anschluss</string>
   <string name="name">Name</string>
   <string name="done">Fertig!</string>
-  <string name="invalid_port">Ungültiger Anschluss</string>
-  <string name="copy_address_to_clipboard">Adresse in die Zwischenablage kopieren</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>
   <string name="backup_restored">Sicherung wiederhergestellt</string>
     <string name="restore_backup">Sicherung wiederherstellen</string>
-    <string name="name_can_t_be_empty">Name darf nicht leer sein</string>
-  <string name="fields_can_t_be_empty">Felder dürfen nicht leer sein</string>
   <string name="start_tor_again_for_finish_the_process">Tor neu starten, um den Vorgang abzuschließen</string>
   <string name="confirm_service_deletion">Löschen des Dienst bestätigen</string>
   <string name="click_again_for_backup">Zum Sichern noch einmal klicken</string>
@@ -161,7 +158,6 @@
   <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="invalid_onion_address">Ungültige .onion-Adresse</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>
diff --git a/app-mini/src/main/res/values-el/strings.xml b/app-mini/src/main/res/values-el/strings.xml
index c3ae2c1a..f1b85e4f 100644
--- a/app-mini/src/main/res/values-el/strings.xml
+++ b/app-mini/src/main/res/values-el/strings.xml
@@ -141,16 +141,13 @@
   <string name="onion_port">Θύρα Κρεμμυδιού</string>
   <string name="name">Όνομα</string>
   <string name="done">Έγινε!</string>
-  <string name="invalid_port">Άκυρη θύρα</string>
-  <string name="copy_address_to_clipboard">Αντιγραφή διέυθυνσης στο πρόχειρο</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>
   <string name="backup_restored">Το αντίγραφο ασφαλείας επαναφέρθηκε</string>
     <string name="restore_backup">Επαναφορά αντιγράφου ασφαλείας</string>
-    <string name="name_can_t_be_empty">Το όνομα δεν γίνεται να είναι κενό</string>
-  <string name="fields_can_t_be_empty">Τα πεδία δεν μπορεί να είναι κενά</string>
   <string name="start_tor_again_for_finish_the_process">Έναρξη ξανά τού Tor για τον τερματισμό της ενέργειας</string>
   <string name="confirm_service_deletion">Επιβεβαίωση διαγραφής υπηρεσίας</string>
   <string name="click_again_for_backup">Πατήστε ξανά για το αντίγραφο ασφαλείας</string>
@@ -161,7 +158,6 @@
   <string name="please_restart_Orbot_to_enable_the_changes">Παρακαλούμε επανεκκινήστε το Orbot για να ενεργοποιήσετε τις αλλαγές</string>
   <string name="client_cookies">Cookies πελατών</string>
   <string name="onion">.onion</string>
-  <string name="invalid_onion_address">Άκυρη .onion διεύθυνση</string>
   <string name="cookie_from_QR">Ανάγνωση από QR</string>
   <string name="backup_cookie">Cookie αντίγραφου ασφαλείας </string>
   <string name="delete_cookie">Αφαίρεση Cookie</string>
diff --git a/app-mini/src/main/res/values-es/strings.xml b/app-mini/src/main/res/values-es/strings.xml
index 6b6a268d..f63c64e7 100644
--- a/app-mini/src/main/res/values-es/strings.xml
+++ b/app-mini/src/main/res/values-es/strings.xml
@@ -142,16 +142,13 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
   <string name="onion_port">Puerto onion</string>
   <string name="name">Nombre</string>
   <string name="done">¡Hecho!</string>
-  <string name="invalid_port">Puerto no válido</string>
-  <string name="copy_address_to_clipboard">Copiar dirección al portapapeles</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>
   <string name="backup_restored">Copia de seguridad restaurada</string>
     <string name="restore_backup">Restaurar copia de seguridad</string>
-    <string name="name_can_t_be_empty">El nombre no puede estar vacío</string>
-  <string name="fields_can_t_be_empty">Los campos no pueden estar vacíos</string>
   <string name="start_tor_again_for_finish_the_process">Inicie Tor de nuevo para finalizar el proceso</string>
   <string name="confirm_service_deletion">Confirme el borrado del servicio</string>
   <string name="click_again_for_backup">Pulse de nuevo para realizar copia de seguridad</string>
@@ -162,7 +159,6 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
   <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="invalid_onion_address">Dirección .onion no válida</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>
diff --git a/app-mini/src/main/res/values-eu/strings.xml b/app-mini/src/main/res/values-eu/strings.xml
index cb3c4a2d..6b952c70 100644
--- a/app-mini/src/main/res/values-eu/strings.xml
+++ b/app-mini/src/main/res/values-eu/strings.xml
@@ -141,16 +141,13 @@
   <string name="onion_port">Onion ataka</string>
   <string name="name">Izena</string>
   <string name="done">Egina!</string>
-  <string name="invalid_port">Ataka baliogabea</string>
-  <string name="copy_address_to_clipboard">Kopiatu helbidea arbelera</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>
   <string name="backup_restored">Babeskopia berrezarri da</string>
     <string name="restore_backup">Berrezarri babeskopia</string>
-    <string name="name_can_t_be_empty">Izena ezin da hutsik egon</string>
-  <string name="fields_can_t_be_empty">Eremuak ezin dira hutsik egon</string>
   <string name="start_tor_again_for_finish_the_process">Hasi Tor berriro prozesua amaitzeko</string>
   <string name="confirm_service_deletion">Berretsi zerbitzua ezabatzea</string>
   <string name="click_again_for_backup">Egin klik berriro babeskopiarako</string>
@@ -161,7 +158,6 @@
   <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="invalid_onion_address">.onion helbide baliogabea</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>
diff --git a/app-mini/src/main/res/values-fa/strings.xml b/app-mini/src/main/res/values-fa/strings.xml
index 5d2c9083..de9cf07b 100644
--- a/app-mini/src/main/res/values-fa/strings.xml
+++ b/app-mini/src/main/res/values-fa/strings.xml
@@ -141,16 +141,13 @@
   <string name="onion_port">درگاه پیازی</string>
   <string name="name">نام</string>
   <string name="done">انجام شد!</string>
-  <string name="invalid_port">درگاه نامعتبر</string>
-  <string name="copy_address_to_clipboard">رونوشت نشانی‌ها در حافظه موقت</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>
   <string name="backup_restored">بک‌آپ بازگردانده شد</string>
     <string name="restore_backup">برگرداندن بک‌آپ</string>
-    <string name="name_can_t_be_empty">نام نباید خالی باشد</string>
-  <string name="fields_can_t_be_empty">زمینه‌ها نباید خالی باشند</string>
   <string name="start_tor_again_for_finish_the_process">برای پایان روند کار ، دوباره تور را آغاز کنید</string>
   <string name="confirm_service_deletion">حذف سرویس را تایید کنید</string>
   <string name="click_again_for_backup">برای بک‌آپ، دوباره کلیک کنید</string>
@@ -161,7 +158,6 @@
   <string name="please_restart_Orbot_to_enable_the_changes">برای دیدن تغییرات، اوربات  را دوباره راه اندازی کنید</string>
   <string name="client_cookies">کوکی‌های Client</string>
   <string name="onion">onion.</string>
-  <string name="invalid_onion_address">نشانی نامعتبر onion. </string>
   <string name="cookie_from_QR">از QR بخوان</string>
   <string name="backup_cookie">بک‌آپ از کوکی</string>
   <string name="delete_cookie">حذف کوکی</string>
diff --git a/app-mini/src/main/res/values-fr/strings.xml b/app-mini/src/main/res/values-fr/strings.xml
index 13fa4c32..9b909234 100644
--- a/app-mini/src/main/res/values-fr/strings.xml
+++ b/app-mini/src/main/res/values-fr/strings.xml
@@ -141,16 +141,13 @@
   <string name="onion_port">Port oignon</string>
   <string name="name">Nom</string>
   <string name="done">Fait !</string>
-  <string name="invalid_port">Port invalide</string>
-  <string name="copy_address_to_clipboard">Copier l’adresse vers le presse-papiers</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>
   <string name="backup_restored">La sauvegarde a été restaurée</string>
     <string name="restore_backup">Restaurer la sauvegarde</string>
-    <string name="name_can_t_be_empty">Le nom ne peut pas être vide</string>
-  <string name="fields_can_t_be_empty">Les champs ne peuvent pas être vides</string>
   <string name="start_tor_again_for_finish_the_process">Redémarrer Tor pour terminer le processus</string>
   <string name="confirm_service_deletion">Confirmer la suppression du service</string>
   <string name="click_again_for_backup">Recliquer pour sauvegarder</string>
@@ -161,7 +158,6 @@
   <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="invalid_onion_address">Adresse .onion invalide</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>
diff --git a/app-mini/src/main/res/values-gl/strings.xml b/app-mini/src/main/res/values-gl/strings.xml
index 7c1fa842..88ef572a 100644
--- a/app-mini/src/main/res/values-gl/strings.xml
+++ b/app-mini/src/main/res/values-gl/strings.xml
@@ -141,16 +141,13 @@
   <string name="onion_port">Porto Onion</string>
   <string name="name">Nome</string>
   <string name="done">Feito!</string>
-  <string name="invalid_port">Porto non válido</string>
-  <string name="copy_address_to_clipboard">Copiar enderezo ao portapapeis</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>
   <string name="backup_restored">Respaldo restaurado</string>
     <string name="restore_backup">Restaurar respaldo</string>
-    <string name="name_can_t_be_empty">O nome non pode quedar baldeiro</string>
-  <string name="fields_can_t_be_empty">Os campos non poden estar baldeiros</string>
   <string name="start_tor_again_for_finish_the_process">Inicie Tor de novo para rematar o proceso</string>
   <string name="confirm_service_deletion">Confirme a eliminación do servizo</string>
   <string name="click_again_for_backup">Pulse de novo para respaldar</string>
@@ -161,7 +158,6 @@
   <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="invalid_onion_address">Enderezo .onion non válido</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>
diff --git a/app-mini/src/main/res/values-he/strings.xml b/app-mini/src/main/res/values-he/strings.xml
index 648cf7dd..6573befe 100644
--- a/app-mini/src/main/res/values-he/strings.xml
+++ b/app-mini/src/main/res/values-he/strings.xml
@@ -141,16 +141,13 @@
   <string name="onion_port">פתחת בצל</string>
   <string name="name">שם</string>
   <string name="done">הסתיים!</string>
-  <string name="invalid_port">פתחה לא תקפה</string>
-  <string name="copy_address_to_clipboard">העתק כתובת ללוח עריכה</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>
   <string name="backup_restored">גיבוי שוחזר</string>
     <string name="restore_backup">שחזר גיבוי</string>
-    <string name="name_can_t_be_empty">שם ××™× ×• יכול להיות ריק</string>
-  <string name="fields_can_t_be_empty">שדות ××™× × יכולים להיות ריקים</string>
   <string name="start_tor_again_for_finish_the_process">הפעל את Tor שוב כדי לסיים את התהליך</string>
   <string name="confirm_service_deletion">אשר מחיקת שירות</string>
   <string name="click_again_for_backup">לחץ שוב לגיבוי</string>
@@ -161,7 +158,6 @@
   <string name="please_restart_Orbot_to_enable_the_changes">×× × הפעל מחדש את Orbot כדי לאפשר את ×”×©×™× ×•×™×™×</string>
   <string name="client_cookies">עוגיות לקוח</string>
   <string name="onion">.onion</string>
-  <string name="invalid_onion_address">כתובת .onion לא תקפה</string>
   <string name="cookie_from_QR">קרא מתוך QR</string>
   <string name="backup_cookie">גבה עוגייה</string>
   <string name="delete_cookie">מחק עוגייה</string>
diff --git a/app-mini/src/main/res/values-hi/strings.xml b/app-mini/src/main/res/values-hi/strings.xml
index 8e9088ab..d9fef9c8 100644
--- a/app-mini/src/main/res/values-hi/strings.xml
+++ b/app-mini/src/main/res/values-hi/strings.xml
@@ -142,16 +142,13 @@
   <string name="onion_port">अनियन पोर्ट</string>
   <string name="name">नाम</string>
   <string name="done">किया हुआ!</string>
-  <string name="invalid_port">अमान्य पोर्ट</string>
-  <string name="copy_address_to_clipboard">क्लिपबोर्ड को पता कॉपी करें</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>
   <string name="backup_restored">बैकअप को पुनर्स्थापित किया गया</string>
     <string name="restore_backup">बैकअप बहाल</string>
-    <string name="name_can_t_be_empty">नाम रिक्त नहीं हो सकता</string>
-  <string name="fields_can_t_be_empty">फ़ील्ड रिक्त नहीं हो सकते</string>
   <string name="start_tor_again_for_finish_the_process">प्रक्रिया को खत्म करने के लिए Tor पुन: प्रारंभ करें</string>
   <string name="confirm_service_deletion">सेवा हटाने की पुष्टि करें</string>
   <string name="click_again_for_backup">बैकअप के लिए फिर से क्लिक करें</string>
@@ -162,7 +159,6 @@
   <string name="please_restart_Orbot_to_enable_the_changes">परिवर्तन सक्षम करने के लिए Orbot पुनः प्रारंभ करें</string>
   <string name="client_cookies">क्लाइंट कुकीज़</string>
   <string name="onion">.अनियन </string>
-  <string name="invalid_onion_address">अमान्य .अमान्य  पतापता</string>
   <string name="cookie_from_QR">QR से पढ़ें</string>
   <string name="backup_cookie">बैकअप कुकी</string>
   <string name="delete_cookie">कुकी हटाएं</string>
diff --git a/app-mini/src/main/res/values-hu/strings.xml b/app-mini/src/main/res/values-hu/strings.xml
index 246f581f..a96cedd1 100644
--- a/app-mini/src/main/res/values-hu/strings.xml
+++ b/app-mini/src/main/res/values-hu/strings.xml
@@ -141,16 +141,13 @@
   <string name="onion_port">Onion Port</string>
   <string name="name">Név</string>
   <string name="done">Kész!</string>
-  <string name="invalid_port">Érvénytelen Port</string>
-  <string name="copy_address_to_clipboard">Cím másolása vágólapra</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>
   <string name="backup_restored">Mentés visszaállítva</string>
     <string name="restore_backup">Mentés visszaállítása</string>
-    <string name="name_can_t_be_empty">A név nem lehet üres</string>
-  <string name="fields_can_t_be_empty">A mezők nem lehetnek üresek</string>
   <string name="start_tor_again_for_finish_the_process">Indítsa el a Tor-t még egyszer a befejezéshez</string>
   <string name="confirm_service_deletion">Szolgáltatás törlés jóváhagyása</string>
   <string name="click_again_for_backup">Kattintson még egyszer a mentéshez</string>
@@ -161,7 +158,6 @@
   <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="invalid_onion_address">Érvénytelen .onion cím</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>
diff --git a/app-mini/src/main/res/values-is/strings.xml b/app-mini/src/main/res/values-is/strings.xml
index e130a256..1fdf58ab 100644
--- a/app-mini/src/main/res/values-is/strings.xml
+++ b/app-mini/src/main/res/values-is/strings.xml
@@ -141,16 +141,13 @@
   <string name="onion_port">Onion-gátt</string>
   <string name="name">Heiti</string>
   <string name="done">Lokið!</string>
-  <string name="invalid_port">Ógild gátt</string>
-  <string name="copy_address_to_clipboard">Afrita vistfang yfir á klippispjald</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>
   <string name="backup_restored">Öryggisafrit var endurheimt</string>
     <string name="restore_backup">Endurheimta úr öryggisafriti</string>
-    <string name="name_can_t_be_empty">Nafnið má ekki vera autt</string>
-  <string name="fields_can_t_be_empty">Gagnasvið mega ekki vera auð</string>
   <string name="start_tor_again_for_finish_the_process">Ræstu Tor aftur til að ljúka ferlinu</string>
   <string name="confirm_service_deletion">Staðfestu eyðingu á þjónustu</string>
   <string name="click_again_for_backup">Smelltu aftur fyrir öryggisafrit</string>
@@ -161,7 +158,6 @@
   <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="invalid_onion_address">Ógilt .onion vistfang</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>
diff --git a/app-mini/src/main/res/values-it/strings.xml b/app-mini/src/main/res/values-it/strings.xml
index 8ba73822..2606154c 100644
--- a/app-mini/src/main/res/values-it/strings.xml
+++ b/app-mini/src/main/res/values-it/strings.xml
@@ -141,16 +141,13 @@
   <string name="onion_port">Porta onion</string>
   <string name="name">Nome</string>
   <string name="done">Fatto!</string>
-  <string name="invalid_port">Porta non valida</string>
-  <string name="copy_address_to_clipboard">Copia l\'indirizzo negli appunti</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>
   <string name="backup_restored">Backup ripristinato</string>
     <string name="restore_backup">Ripristina backup</string>
-    <string name="name_can_t_be_empty">Il nome non può essere vuoto</string>
-  <string name="fields_can_t_be_empty">I campi non possono essere vuoti</string>
   <string name="start_tor_again_for_finish_the_process">Riavvia Tor per finire il processo</string>
   <string name="confirm_service_deletion">Conferma l\'eliminazione del servizio</string>
   <string name="click_again_for_backup">Clicca ancora per eseguire il backup</string>
@@ -161,7 +158,6 @@
   <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="invalid_onion_address">Indirizzo .onion non valido</string>
   <string name="cookie_from_QR">Leggi da QR</string>
   <string name="backup_cookie">Backup cookie</string>
   <string name="delete_cookie">Elimina cookie</string>
diff --git a/app-mini/src/main/res/values-ja/strings.xml b/app-mini/src/main/res/values-ja/strings.xml
index acfb1770..a6f82937 100644
--- a/app-mini/src/main/res/values-ja/strings.xml
+++ b/app-mini/src/main/res/values-ja/strings.xml
@@ -141,16 +141,13 @@
   <string name="onion_port">Onion ポート</string>
   <string name="name">名前</string>
   <string name="done">完了</string>
-  <string name="invalid_port">無効なポート</string>
-  <string name="copy_address_to_clipboard">アドレスをクリップボードにコピー</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>
   <string name="backup_restored">バックアップから復元</string>
     <string name="restore_backup">バックアップの復旧</string>
-    <string name="name_can_t_be_empty">名前はブランクのままにできません</string>
-  <string name="fields_can_t_be_empty">フィールドを空にしておくことはできません</string>
   <string name="start_tor_again_for_finish_the_process">プロセスを完了するには、Torを再起動して下さい。</string>
   <string name="confirm_service_deletion">サービス削除を確認</string>
   <string name="click_again_for_backup">バックアップ作成に再クリック</string>
@@ -161,7 +158,6 @@
   <string name="please_restart_Orbot_to_enable_the_changes">変更を有効にするにはOrbotを再起動してください</string>
   <string name="client_cookies">クライアント Cookie</string>
   <string name="onion">.onion</string>
-  <string name="invalid_onion_address">無効な .onion アドレス</string>
   <string name="cookie_from_QR">QRコードから読み取り</string>
   <string name="backup_cookie">Cookie をバックアップ</string>
   <string name="delete_cookie">Cookie を削除</string>
diff --git a/app-mini/src/main/res/values-mk/strings.xml b/app-mini/src/main/res/values-mk/strings.xml
index cbb7af41..112f8c27 100644
--- a/app-mini/src/main/res/values-mk/strings.xml
+++ b/app-mini/src/main/res/values-mk/strings.xml
@@ -141,16 +141,13 @@
   <string name="onion_port">Onion порта</string>
   <string name="name">Име</string>
   <string name="done">Завршено!</string>
-  <string name="invalid_port">Невалидна порта</string>
-  <string name="copy_address_to_clipboard">Копирај ја адресата за залепување</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>
   <string name="backup_restored">Вратено од резервна копија</string>
     <string name="restore_backup">Врати резервна копија</string>
-    <string name="name_can_t_be_empty">Името не може да биде празно</string>
-  <string name="fields_can_t_be_empty">Полињата не можат да бидат празни</string>
   <string name="start_tor_again_for_finish_the_process">Стартувај го Tor повторно да го заврши процесот</string>
   <string name="confirm_service_deletion">Потврди бришење на услугата</string>
   <string name="click_again_for_backup">Кликни повторно за резервна копија</string>
@@ -161,7 +158,6 @@
   <string name="please_restart_Orbot_to_enable_the_changes">Ве молиме стартувајте го повторно Orbot за да се овозможат промените</string>
   <string name="client_cookies">Клиентски колачиња</string>
   <string name="onion">.onion</string>
-  <string name="invalid_onion_address">Невалидна .onion адреса</string>
   <string name="cookie_from_QR">Прочитај од QR</string>
   <string name="backup_cookie">Направи резервна копија на колаче</string>
   <string name="delete_cookie">Избриши колаче</string>
diff --git a/app-mini/src/main/res/values-nb/strings.xml b/app-mini/src/main/res/values-nb/strings.xml
index c5692a6d..1e96243d 100644
--- a/app-mini/src/main/res/values-nb/strings.xml
+++ b/app-mini/src/main/res/values-nb/strings.xml
@@ -136,14 +136,11 @@
   <string name="onion_port">Løk-port</string>
   <string name="name">Navn</string>
   <string name="done">Ferdig!</string>
-  <string name="invalid_port">Ugyldig port</string>
-  <string name="copy_address_to_clipboard">Kopier adresse til utklippstavle</string>
+    <string name="copy_address_to_clipboard">Kopier adresse til utklippstavle</string>
   <string name="backup_service">Sikkerhetskopieringstjeneste</string>
   <string name="delete_service">Slett tjeneste</string>
   <string name="backup_restored">Sikkerhetskopi gjenopprettet</string>
     <string name="restore_backup">Gjenopprett sikkerhetskopi</string>
-    <string name="name_can_t_be_empty">Navnet kan ikke være tomt</string>
-  <string name="fields_can_t_be_empty">Felter kan ikke stå tomme</string>
   <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="click_again_for_backup">Klikk igjen for å sikkerhetskopiere</string>
@@ -152,7 +149,6 @@
   <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="invalid_onion_address">Ugyldig .onion-adresse</string>
   <string name="cookie_from_QR">Les fra QR</string>
   <string name="backup_cookie">Sikkerhetskopier informasjonskapsel</string>
   <string name="delete_cookie">Slett informasjonskapsel</string>
diff --git a/app-mini/src/main/res/values-nl/strings.xml b/app-mini/src/main/res/values-nl/strings.xml
index 6eaf424b..0384bba0 100644
--- a/app-mini/src/main/res/values-nl/strings.xml
+++ b/app-mini/src/main/res/values-nl/strings.xml
@@ -141,16 +141,13 @@
   <string name="onion_port">Onion-poort</string>
   <string name="name">Naam</string>
   <string name="done">Klaar!</string>
-  <string name="invalid_port">Ongeldige poort</string>
-  <string name="copy_address_to_clipboard">Adres kopiëren naar klembord</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>
   <string name="backup_restored">Back-up hersteld</string>
     <string name="restore_backup">Back-up herstellen</string>
-    <string name="name_can_t_be_empty">Naam kan niet leeg zijn</string>
-  <string name="fields_can_t_be_empty">Velden kunnen niet leeg zijn</string>
   <string name="start_tor_again_for_finish_the_process">Start Tor opnieuw om het proces te voltooien</string>
   <string name="confirm_service_deletion">Bevestig verwijderen van dienst</string>
   <string name="click_again_for_backup">Klik opnieuw voor back-up</string>
@@ -161,7 +158,6 @@
   <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="invalid_onion_address">Ongeldig .onion-adres</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>
diff --git a/app-mini/src/main/res/values-pl/strings.xml b/app-mini/src/main/res/values-pl/strings.xml
index f2ce933a..537cb01e 100644
--- a/app-mini/src/main/res/values-pl/strings.xml
+++ b/app-mini/src/main/res/values-pl/strings.xml
@@ -133,8 +133,7 @@
     <string name="local_port">Lokalne Porty</string>
   <string name="name">Nazwa</string>
   <string name="done">Zrobiono!</string>
-  <string name="invalid_port">Nieprawidłowy Port</string>
-  <string name="copy_address_to_clipboard">Skopiuj adres do schowka</string>
+    <string name="copy_address_to_clipboard">Skopiuj adres do schowka</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Proszę zrestartować Orbot, aby zmiany mogły wejść w życie</string>
   <string name="disable">Wyłącz</string>
   <string name="enable">WÅ‚Ä…cz</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 b84193b8..fe77e9bb 100644
--- a/app-mini/src/main/res/values-pt-rBR/strings.xml
+++ b/app-mini/src/main/res/values-pt-rBR/strings.xml
@@ -141,16 +141,13 @@
   <string name="onion_port">Porta Onion</string>
   <string name="name">Nome</string>
   <string name="done">Feito!</string>
-  <string name="invalid_port">Porta Invalida</string>
-  <string name="copy_address_to_clipboard">Copiar para a area de transferência </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="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>
     <string name="restore_backup">Restaurar Backup</string>
-    <string name="name_can_t_be_empty">O campo Nome não pode ser vazio</string>
-  <string name="fields_can_t_be_empty">Campos não podem ser vazios</string>
   <string name="confirm_service_deletion">Confirmar a remoção do serviço</string>
   <string name="click_again_for_backup">Clique novamente para backup</string>
   <string name="service_type">Tipo do Serviço</string>
diff --git a/app-mini/src/main/res/values-ru/strings.xml b/app-mini/src/main/res/values-ru/strings.xml
index 10dc0103..a96d664b 100644
--- a/app-mini/src/main/res/values-ru/strings.xml
+++ b/app-mini/src/main/res/values-ru/strings.xml
@@ -141,16 +141,13 @@
   <string name="onion_port">Onion-порт</string>
   <string name="name">Имя</string>
   <string name="done">Готово!</string>
-  <string name="invalid_port">Некорректный порт</string>
-  <string name="copy_address_to_clipboard">Скопировать адрес в буфер обмена</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>
   <string name="backup_restored">Восстановлено из резервной копии</string>
     <string name="restore_backup">Восстановить из копии</string>
-    <string name="name_can_t_be_empty">Имя не может быть пустым</string>
-  <string name="fields_can_t_be_empty">Поля не могут быть пустыми</string>
   <string name="start_tor_again_for_finish_the_process">Запустите Tor снова для завершения процесса</string>
   <string name="confirm_service_deletion">Подтверждение удаления службы</string>
   <string name="click_again_for_backup">Нажмите ещё раз для резервирования</string>
@@ -161,7 +158,6 @@
   <string name="please_restart_Orbot_to_enable_the_changes">Пожалуйста, перезапустите Orbot для вступления изменения в силу</string>
   <string name="client_cookies">Cookies клиента</string>
   <string name="onion">.onion</string>
-  <string name="invalid_onion_address">Недействительный .onion-адрес</string>
   <string name="cookie_from_QR">Прочитать из QR-кода</string>
   <string name="backup_cookie">Резервировать cookie</string>
   <string name="delete_cookie">Удалить cookies</string>
diff --git a/app-mini/src/main/res/values-sr/strings.xml b/app-mini/src/main/res/values-sr/strings.xml
index fc31f59e..67ca4867 100644
--- a/app-mini/src/main/res/values-sr/strings.xml
+++ b/app-mini/src/main/res/values-sr/strings.xml
@@ -139,16 +139,13 @@
   <string name="onion_port">Onion Порт</string>
   <string name="name">Име</string>
   <string name="done">Готово !</string>
-  <string name="invalid_port">Неисправан Порт</string>
-  <string name="copy_address_to_clipboard">Копирај адреса у clipboard</string>
+    <string name="copy_address_to_clipboard">Копирај адреса у 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>
   <string name="backup_restored">Резервна копија је обновљена</string>
     <string name="restore_backup">Обнови резервну копију</string>
-    <string name="name_can_t_be_empty">Име не може бити празно</string>
-  <string name="fields_can_t_be_empty">Поља не могу бити празна</string>
   <string name="start_tor_again_for_finish_the_process">Поново покрените Тор да бисте довршили процес</string>
   <string name="confirm_service_deletion">Потрврди брисанје услуге</string>
   <string name="click_again_for_backup">Кликните поново за резервну копију</string>
@@ -156,7 +153,6 @@
   <string name="please_restart_Orbot_to_enable_the_changes">Молимо покрените поново Орбот ради примењивања промена</string>
   <string name="client_cookies">Колачићи клијента</string>
   <string name="onion">.onion</string>
-  <string name="invalid_onion_address">Неважећа .onion адреса</string>
   <string name="cookie_from_QR">Прочитај са QR кода</string>
   <string name="backup_cookie">Резервна копија колачића</string>
   <string name="delete_cookie">Избриши колачић</string>
diff --git a/app-mini/src/main/res/values-sv/strings.xml b/app-mini/src/main/res/values-sv/strings.xml
index dec83ffe..1605d2b2 100644
--- a/app-mini/src/main/res/values-sv/strings.xml
+++ b/app-mini/src/main/res/values-sv/strings.xml
@@ -141,16 +141,13 @@
   <string name="onion_port">Onion port</string>
   <string name="name">Namn</string>
   <string name="done">Klart!</string>
-  <string name="invalid_port">Ogiltig port</string>
-  <string name="copy_address_to_clipboard">Kopiera adress till urklipp</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>
   <string name="backup_restored">Backup återställd</string>
     <string name="restore_backup">Återställa säkerhetskopia</string>
-    <string name="name_can_t_be_empty">Namnet kan inte vara tomt</string>
-  <string name="fields_can_t_be_empty">Fält kan inte vara tomma</string>
   <string name="start_tor_again_for_finish_the_process">Starta Tor igen för att avsluta processen</string>
   <string name="confirm_service_deletion">Bekräfta tjänst borttagning</string>
   <string name="click_again_for_backup">Klicka igen för säkerhetskopiering</string>
@@ -161,7 +158,6 @@
   <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="invalid_onion_address">Ogiltig .onion-adress</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>
diff --git a/app-mini/src/main/res/values-th/strings.xml b/app-mini/src/main/res/values-th/strings.xml
index 451e3e52..cc076900 100644
--- a/app-mini/src/main/res/values-th/strings.xml
+++ b/app-mini/src/main/res/values-th/strings.xml
@@ -141,16 +141,13 @@
   <string name="onion_port">พอร์ต Onion</string>
   <string name="name">ชื่อเอกสาร</string>
   <string name="done">เสร็จสิ้น!</string>
-  <string name="invalid_port">พอร์ตไม่ถูกต้อง</string>
-  <string name="copy_address_to_clipboard">คัดลอกที่อยู่ลงในคลิปบอร์ด</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>
   <string name="backup_restored">คืนค่าข้อมูลสำรอง</string>
     <string name="restore_backup">คืนค่าข้อมูลสำรอง</string>
-    <string name="name_can_t_be_empty">ปล่อยชื่อให้ว่างไม่ได้</string>
-  <string name="fields_can_t_be_empty">ปล่อยเขตข้อมูลให้ว่างไม่ได้</string>
   <string name="start_tor_again_for_finish_the_process">เริ่มทำงาน Tor อีกครั้งเพื่อจบกระบวนการ</string>
   <string name="confirm_service_deletion">ยืนยันการลบบริการ</string>
   <string name="click_again_for_backup">กดอีกครั้งเพื่อเรียกข้อมูลสำรอง</string>
@@ -161,7 +158,6 @@
   <string name="please_restart_Orbot_to_enable_the_changes">กรุณาเริ่ม Orbot ใหม่เพื่อให้การเปลี่ยนแปลงใช้งานได้</string>
   <string name="client_cookies">คุกกี้ของไคลเอ็นต์</string>
   <string name="onion">.onion</string>
-  <string name="invalid_onion_address">ที่อยู่ .onion ไม่ถูกต้อง</string>
   <string name="cookie_from_QR">อ่านจากคิวอาร์</string>
   <string name="backup_cookie">สำรองข้อมูลคุกกี้</string>
   <string name="delete_cookie">ลบคุกกี้</string>
diff --git a/app-mini/src/main/res/values-tr/strings.xml b/app-mini/src/main/res/values-tr/strings.xml
index 37830272..139c1b01 100644
--- a/app-mini/src/main/res/values-tr/strings.xml
+++ b/app-mini/src/main/res/values-tr/strings.xml
@@ -141,16 +141,13 @@
   <string name="onion_port">Onion Kapısı</string>
   <string name="name">Ad</string>
   <string name="done">Tamam!</string>
-  <string name="invalid_port">Kapı Geçersiz</string>
-  <string name="copy_address_to_clipboard">Adresi panoya kopyala</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>
   <string name="backup_restored">Yedek geri yüklendi</string>
     <string name="restore_backup">Yedeği Geri Yükle</string>
-    <string name="name_can_t_be_empty">Ad boş bırakılamaz</string>
-  <string name="fields_can_t_be_empty">Alanlar boş bırakılamaz</string>
   <string name="start_tor_again_for_finish_the_process">İşlemi tamamlamak için Tor uygulamasını yeniden başlatın</string>
   <string name="confirm_service_deletion">Hizmeti Silmeyi Onayla</string>
   <string name="click_again_for_backup">Yedeklemek için yeniden tıklayın</string>
@@ -161,7 +158,6 @@
   <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="invalid_onion_address">.onion adresi geçersiz</string>
   <string name="cookie_from_QR">QR kodundan oku</string>
   <string name="backup_cookie">Çerezi yedekle</string>
   <string name="delete_cookie">Çerezi sil</string>
diff --git a/app-mini/src/main/res/values-uk/strings.xml b/app-mini/src/main/res/values-uk/strings.xml
index 5eee9760..be4e0c6b 100644
--- a/app-mini/src/main/res/values-uk/strings.xml
+++ b/app-mini/src/main/res/values-uk/strings.xml
@@ -141,16 +141,13 @@
   <string name="onion_port">Порт Onion</string>
   <string name="name">Ім\'я</string>
   <string name="done">Зроблено!</string>
-  <string name="invalid_port">Неробочий Порт</string>
-  <string name="copy_address_to_clipboard">Скопіювати адресу в буфер обміну</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>
   <string name="backup_restored">Резервне копіювання відновлено</string>
     <string name="restore_backup">Відновити резервну копію</string>
-    <string name="name_can_t_be_empty">Назва не може бути порожньою</string>
-  <string name="fields_can_t_be_empty">Поля не можуть бути порожніми</string>
   <string name="start_tor_again_for_finish_the_process">Запустіть Tor знову для завершення процесу</string>
   <string name="confirm_service_deletion">Підтвердьте видалення сервісу</string>
   <string name="click_again_for_backup">Ще раз натисніть щоби копіювати в резерв</string>
@@ -161,7 +158,6 @@
   <string name="please_restart_Orbot_to_enable_the_changes">Будь ласка, перезапустіть Orbot, щоб зміни ввійшли в силу</string>
   <string name="client_cookies">Клієнтські реп\'яшки</string>
   <string name="onion">.onion</string>
-  <string name="invalid_onion_address">Недійсна .onion адреса</string>
   <string name="cookie_from_QR">Зчитати з QR-коду</string>
   <string name="backup_cookie">Резервне копіювання реп\'яшків</string>
   <string name="delete_cookie">Вилучити реп\'яшки</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 0f0dac44..9422f6b4 100644
--- a/app-mini/src/main/res/values-zh-rTW/strings.xml
+++ b/app-mini/src/main/res/values-zh-rTW/strings.xml
@@ -141,16 +141,13 @@
   <string name="onion_port">洋蔥端口</string>
   <string name="name">名稱</string>
   <string name="done">已完成!</string>
-  <string name="invalid_port">ç„¡æ•ˆåŸ </string>
-  <string name="copy_address_to_clipboard">複製地址到剪貼簿</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>
   <string name="backup_restored">備份已還原</string>
     <string name="restore_backup">還原備份</string>
-    <string name="name_can_t_be_empty">名稱不可空白</string>
-  <string name="fields_can_t_be_empty">欄位不可空白</string>
   <string name="start_tor_again_for_finish_the_process">再次開啟 Tor  以完成此過程</string>
   <string name="confirm_service_deletion">確認服務刪除</string>
   <string name="click_again_for_backup">再次點選以進行備份</string>
@@ -161,7 +158,6 @@
   <string name="please_restart_Orbot_to_enable_the_changes">請重新啟動 Orbot 來讓設定生效。</string>
   <string name="client_cookies">客戶 cookies</string>
   <string name="onion">.onion</string>
-  <string name="invalid_onion_address">無效的 .onion 地址</string>
   <string name="cookie_from_QR">由 QR 碼讀取</string>
   <string name="backup_cookie">備分 cookie</string>
   <string name="delete_cookie">刪除 cookie</string>
diff --git a/app-mini/src/main/res/values/strings.xml b/app-mini/src/main/res/values/strings.xml
index 087af9ba..919b2126 100644
--- a/app-mini/src/main/res/values/strings.xml
+++ b/app-mini/src/main/res/values/strings.xml
@@ -180,7 +180,6 @@
     <string name="onion_port">Onion Port</string>
     <string name="name">Name</string>
     <string name="done">Done!</string>
-    <string name="invalid_port">Invalid Port</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>
@@ -188,8 +187,6 @@
     <string name="backup_saved_at_external_storage">Backup saved at external storage</string>
     <string name="backup_restored">Backup restored</string>
     <string name="restore_backup">Restore Backup</string>
-    <string name="name_can_t_be_empty">Name can\'t be empty</string>
-    <string name="fields_can_t_be_empty">Fields can\'t be empty</string>
     <string name="start_tor_again_for_finish_the_process">Start Tor again for finish the process</string>
     <string name="confirm_service_deletion">Confirm service deletion</string>
     <string name="click_again_for_backup">Click again for backup</string>
@@ -200,7 +197,6 @@
     <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="invalid_onion_address">Invalid .onion address</string>
     <string name="cookie_from_QR">Read from QR</string>
     <string name="backup_cookie">Backup cookie</string>
     <string name="delete_cookie">Delete cookie</string>
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
index efa73c9a..e67a8113 100644
--- 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
@@ -47,6 +47,11 @@ public class BackupUtils {
         return zipFile.getPath();
     }
 
+    // returns true if domain is v2 onion address or v3 onion address
+    public static boolean isOnionAddressValid(String onionToTest) {
+        if (onionToTest.matches("([a-z0-9]{16}).onion")) return true;
+        return onionToTest.matches("([a-z0-9]{56}).onion");
+    }
 
     private String[] createFilesForZipping(int port) {
         File hsBasePath = getHSBasePath();
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
index badb04fc..b00c29db 100644
--- 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
@@ -1,57 +1,82 @@
 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 androidx.annotation.NonNull;
-import androidx.fragment.app.DialogFragment;
-import androidx.appcompat.app.AlertDialog;
+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 dialog_view = getActivity().getLayoutInflater().inflate(R.layout.layout_add_client_cookie_dialog, null);
-        return new AlertDialog.Builder(getActivity())
-                .setView(dialog_view)
+        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(dialog_view, getContext()))
+                .setPositiveButton(R.string.save, (dialog, which) -> doSave(getContext()))
                 .create();
-    }
 
-    private void doSave(View dialogView, Context context) {
-        String onion = ((EditText) dialogView.findViewById(R.id.cookie_onion)).getText().toString();
-        String cookie = ((EditText) dialogView.findViewById(R.id.cookie_value)).getText().toString();
+        etOnion = dialogView.findViewById(R.id.cookie_onion);
+        etCookie = dialogView.findViewById(R.id.cookie_value);
 
-        if (checkInput(onion, cookie)) {
-            saveData(onion, cookie);
-            Toast.makeText(context, R.string.please_restart_Orbot_to_enable_the_changes, Toast.LENGTH_LONG).show();
-        }
-    }
+        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());
+            }
+        };
 
-    private boolean checkInput(String onion, String cookie) {
-        boolean is_set = ((onion != null && onion.length() > 0) && (cookie != null && cookie.length() > 0));
-        if (!is_set) {
-            Toast.makeText(getContext(), R.string.fields_can_t_be_empty, Toast.LENGTH_SHORT).show();
-            return false;
-        }
+        etOnion.addTextChangedListener(inputValidator);
+        etCookie.addTextChangedListener(inputValidator);
 
-        if (!onion.matches("([a-z0-9]{16})\\.onion")) {
-            Toast.makeText(getContext(), R.string.invalid_onion_address, Toast.LENGTH_SHORT).show();
-            return false;
-        }
+        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();
+    }
 
-        return true;
+    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 BackupUtils.isOnionAddressValid(onion);
     }
 
     private void saveData(String domain, String cookie) {
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
index 7d381921..fdd513c8 100644
--- 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
@@ -5,7 +5,11 @@ 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;
@@ -19,55 +23,72 @@ 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 dialog_view = getActivity().getLayoutInflater().inflate(R.layout.layout_hs_data_dialog, null);
-        return new AlertDialog.Builder(getActivity())
+        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(dialog_view, getContext()))
-                .setView(dialog_view)
+                .setPositiveButton(R.string.save, (dialog, which) -> doSave(dialogView, getContext()))
+                .setView(dialogView)
                 .create();
-    }
 
-    private void doSave(View dialogView, Context context) {
-        String serverName = ((EditText) dialogView.findViewById(R.id.hsName)).getText().toString();
-        int localPort, onionPort;
-        try {
-            localPort = Integer.parseInt(((EditText) dialogView.findViewById(R.id.hsLocalPort)).getText().toString());
-            onionPort = Integer.parseInt(((EditText) dialogView.findViewById(R.id.hsOnionPort)).getText().toString());
-        } catch (NumberFormatException nfe) {
-            Toast.makeText(context, R.string.fields_can_t_be_empty, Toast.LENGTH_LONG).show();
-            return;
-        }
-        boolean authCookie = ((CheckBox) dialogView.findViewById(R.id.hsAuth)).isChecked();
+        inputValidator = new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
 
-        if (checkInput(serverName, localPort, onionPort)) {
-            saveData(serverName, localPort, onionPort, authCookie);
-            Toast.makeText(context, R.string.please_restart_Orbot_to_enable_the_changes, Toast.LENGTH_LONG).show();
-        }
-    }
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+            }
 
-    private boolean checkInput(String serverName, int local, int remote) {
-        boolean is_ok = true;
-        int error_msg = 0;
+            @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);
+                }
+            }
+        };
 
-        if ((local < 1 || local > 65535) || (remote < 1 || remote > 65535)) {
-            error_msg = R.string.invalid_port;
-            is_ok = false;
-        }
+        etOnionPort.addTextChangedListener(inputValidator);
+        etLocalPort.addTextChangedListener(inputValidator);
+        etServer.addTextChangedListener(inputValidator);
 
-        if (serverName == null || serverName.length() < 1) {
-            error_msg = R.string.name_can_t_be_empty;
-            is_ok = false;
-        }
+        return ad;
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        inputValidator.afterTextChanged(null); // initially disable positive button
+    }
 
-        if (!is_ok) {
-            Toast.makeText(getContext(), error_msg, Toast.LENGTH_SHORT).show();
-        }
+    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();
+    }
 
-        return is_ok;
+    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) {
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
index eb921d38..9182f9c4 100644
--- 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
@@ -46,5 +46,4 @@ public class HSDeleteDialog extends DialogFragment {
             dir.delete();
         }
     }
-
 }
diff --git a/app/src/main/res/layout/layout_hs_data_dialog.xml b/app/src/main/res/layout/layout_hs_data_dialog.xml
index 0d86fbb7..6dcc8b03 100644
--- a/app/src/main/res/layout/layout_hs_data_dialog.xml
+++ b/app/src/main/res/layout/layout_hs_data_dialog.xml
@@ -28,8 +28,10 @@
         android:id="@+id/hsLocalPort"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:digits="0123456789"
         android:ems="10"
-        android:inputType="number" />
+        android:inputType="number"
+        android:maxLength="5" />
 
     <TextView
         android:layout_width="match_parent"
@@ -41,8 +43,10 @@
         android:id="@+id/hsOnionPort"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:digits="0123456789"
         android:ems="10"
-        android:inputType="number" />
+        android:inputType="number"
+        android:maxLength="5" />
 
     <CheckBox
         android:id="@+id/hsAuth"
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index ab6cb4ff..54636f35 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -134,8 +134,7 @@
   <string name="onion_port">منفذ الـ Onion</string>
   <string name="name">الاسم</string>
   <string name="done">تم !</string>
-  <string name="invalid_port">المنفذ غير صالح</string>
-  <string name="copy_address_to_clipboard">نسخ العنوان إلى الحافظة</string>
+    <string name="copy_address_to_clipboard">نسخ العنوان إلى الحافظة</string>
   <string name="show_auth_cookie">عرض كعكة المصادقة</string>
   <string name="backup_service">النسخ الإحتياطي للخدمة</string>
   <string name="delete_service">حذف الخدمة</string>
@@ -143,8 +142,6 @@
   <string name="backup_restored">تمت استعادة النسخة الإحتياطية</string>
   <string name="restore_backup">إسترجاع نسخة احتياطية</string>
   <string name="create_a_backup_first">قم أولاً بإنشاء نسخة إحتياطية</string>
-  <string name="name_can_t_be_empty">لا يمكن ترك الإسم فارغا</string>
-  <string name="fields_can_t_be_empty">لا يمكن ترك الحقول فارغة</string>
   <string name="start_tor_again_for_finish_the_process">قم بتشغيل تور ثانيةً لإنهاء العملية</string>
   <string name="confirm_service_deletion">تأكيد حذف الخدمة</string>
     <string name="service_type">نوع الخدمة</string>
@@ -154,7 +151,6 @@
   <string name="please_restart_Orbot_to_enable_the_changes">الرجاء إعادة تشغيل أوربوت لتفعيل التعديلات</string>
   <string name="client_cookies">كعكات العميل</string>
   <string name="onion">.onion</string>
-  <string name="invalid_onion_address">عنوان الـ .onion غير صالح</string>
   <string name="cookie_from_QR">القراءة مِن رمز الكيو آر</string>
   <string name="backup_cookie">النسخ الإحتياطي للكعكة</string>
   <string name="delete_cookie">حذف الكعكة</string>
diff --git a/app/src/main/res/values-ay/strings.xml b/app/src/main/res/values-ay/strings.xml
index 8a0582c9..f5da93b7 100644
--- a/app/src/main/res/values-ay/strings.xml
+++ b/app/src/main/res/values-ay/strings.xml
@@ -138,8 +138,7 @@
   <string name="onion_port">Onion apayañ thakhi</string>
   <string name="name">Suti</string>
   <string name="done">¡Tukuyata!</string>
-  <string name="invalid_port">Jan apaykay thakhi</string>
-  <string name="copy_address_to_clipboard">Utjirinak waruqañawjar imam</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>
@@ -147,8 +146,6 @@
   <string name="backup_restored">Imat luratanakamax mayamp apnaqatäxiwa</string>
     <string name="restore_backup">Imat luratanak mayamp aqtayam</string>
   <string name="create_a_backup_first"> Imat luratanak nayraqat uñstayam</string>
-  <string name="name_can_t_be_empty">Sutix qillqantatäñapapuniwa</string>
-  <string name="fields_can_t_be_empty">Janiw kunas ch\'usäñapakiti</string>
   <string name="start_tor_again_for_finish_the_process">Tukuyañatakix Tor mayamp naktayam</string>
   <string name="confirm_service_deletion">Lurañanakax pichsutäniwa</string>
     <string name="service_type">Kunayman lurañanaka</string>
@@ -158,7 +155,6 @@
   <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="invalid_onion_address">Jan wali Onion ukan chiqawjanakapa</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>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 1f189531..7d3f2907 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -138,7 +138,6 @@
   <string name="onion_port">Onion-порт</string>
   <string name="name">Імя</string>
   <string name="done">Гатова!</string>
-  <string name="invalid_port">Некарэктны порт</string>
   <string name="copy_address_to_clipboard">Скапіяваць адрас у буфер памену</string>
   <string name="show_auth_cookie">Паказаць аўтарызуючыя cookie</string>
   <string name="backup_service">Рэзерваваць службу</string>
@@ -147,8 +146,6 @@
   <string name="backup_restored">Адноўлена з рэзервовай копіі</string>
     <string name="restore_backup">Аднавіць з копіі</string>
   <string name="create_a_backup_first">Спачатку стварыце рэзервовую копію</string>
-  <string name="name_can_t_be_empty">Імя не можа быць пустым</string>
-  <string name="fields_can_t_be_empty">Палі не могуць быць пустымі</string>
   <string name="start_tor_again_for_finish_the_process">Запусціце Tor ізноў для завяршэння працэсу</string>
   <string name="confirm_service_deletion">Пацверджанне выдалення службы</string>
     <string name="service_type">Тып службы</string>
@@ -158,7 +155,6 @@
   <string name="please_restart_Orbot_to_enable_the_changes">Калі ласка, перазапусціце Orbot для ўступу змены ў сілу</string>
   <string name="client_cookies">Cookies кліента</string>
   <string name="onion">.onion</string>
-  <string name="invalid_onion_address">Несапраўдны .onion-адрас</string>
   <string name="cookie_from_QR">Прачытаць з QR-кода</string>
   <string name="backup_cookie">Рэзерваваць cookie</string>
   <string name="delete_cookie">Выдаліць cookies</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index a090964d..0f353372 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -138,8 +138,7 @@
   <string name="onion_port">Port ceba</string>
   <string name="name">Nom</string>
   <string name="done">Fet!</string>
-  <string name="invalid_port">Port invà lid</string>
-  <string name="copy_address_to_clipboard">Copia adreça al portapapers</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>
@@ -147,8 +146,6 @@
   <string name="backup_restored">Còpia de seguretat restaurada</string>
     <string name="restore_backup">Restaurar còpia de seguretat</string>
   <string name="create_a_backup_first">Crea una còpia de seguretat primer</string>
-  <string name="name_can_t_be_empty">El nom no pot estar buit</string>
-  <string name="fields_can_t_be_empty">Els camps no poden estar buits</string>
   <string name="start_tor_again_for_finish_the_process">Torna a iniciar Tor per acabar el procés</string>
   <string name="confirm_service_deletion">Confirma la supressió del servei</string>
     <string name="service_type">Tipus de servei</string>
@@ -158,7 +155,6 @@
   <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="invalid_onion_address">L\'adreça .onion no és và lida</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>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 8bbadf91..993a9266 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -138,8 +138,7 @@
   <string name="onion_port">Onion Anschluss</string>
   <string name="name">Name</string>
   <string name="done">Fertig!</string>
-  <string name="invalid_port">Ungültiger Anschluss</string>
-  <string name="copy_address_to_clipboard">Adresse in die Zwischenablage kopieren</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>
@@ -147,8 +146,6 @@
   <string name="backup_restored">Sicherung wiederhergestellt</string>
     <string name="restore_backup">Sicherung wiederherstellen</string>
   <string name="create_a_backup_first">Erstellen Sie zuerst eine Sicherung</string>
-  <string name="name_can_t_be_empty">Name darf nicht leer sein</string>
-  <string name="fields_can_t_be_empty">Felder dürfen nicht leer sein</string>
   <string name="start_tor_again_for_finish_the_process">Tor neu starten, um den Vorgang abzuschließen</string>
   <string name="confirm_service_deletion">Löschen des Dienst bestätigen</string>
     <string name="service_type">Dienst-Typ</string>
@@ -158,7 +155,6 @@
   <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="invalid_onion_address">Ungültige .onion-Adresse</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>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index d9ce51a4..c900d1c0 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -138,8 +138,7 @@
   <string name="onion_port">Θύρα Κρεμμυδιού</string>
   <string name="name">Όνομα</string>
   <string name="done">Έγινε!</string>
-  <string name="invalid_port">Άκυρη θύρα</string>
-  <string name="copy_address_to_clipboard">Αντιγραφή διέυθυνσης στο πρόχειρο</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>
@@ -147,8 +146,6 @@
   <string name="backup_restored">Το αντίγραφο ασφαλείας επαναφέρθηκε</string>
     <string name="restore_backup">Επαναφορά αντιγράφου ασφαλείας</string>
   <string name="create_a_backup_first">Δημιουργήστε πρώτα ένα αντίγραφο ασφαλείας </string>
-  <string name="name_can_t_be_empty">Το όνομα δεν γίνεται να είναι κενό</string>
-  <string name="fields_can_t_be_empty">Τα πεδία δεν μπορεί να είναι κενά</string>
   <string name="start_tor_again_for_finish_the_process">Έναρξη ξανά τού Tor για τον τερματισμό της ενέργειας</string>
   <string name="confirm_service_deletion">Επιβεβαίωση διαγραφής υπηρεσίας</string>
     <string name="service_type">Τύπος υπηρεσίας</string>
@@ -158,7 +155,6 @@
   <string name="please_restart_Orbot_to_enable_the_changes">Παρακαλούμε επανεκκινήστε το Orbot για να ενεργοποιήσετε τις αλλαγές</string>
   <string name="client_cookies">Cookies πελατών</string>
   <string name="onion">.onion</string>
-  <string name="invalid_onion_address">Άκυρη .onion διεύθυνση</string>
   <string name="cookie_from_QR">Ανάγνωση από QR</string>
   <string name="backup_cookie">Cookie αντίγραφου ασφαλείας </string>
   <string name="delete_cookie">Αφαίρεση Cookie</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 47cb05e8..132dc1ac 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -139,8 +139,7 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
   <string name="onion_port">Puerto onion</string>
   <string name="name">Nombre</string>
   <string name="done">¡Hecho!</string>
-  <string name="invalid_port">Puerto no válido</string>
-  <string name="copy_address_to_clipboard">Copiar dirección al portapapeles</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>
@@ -148,8 +147,6 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
   <string name="backup_restored">Copia de seguridad restaurada</string>
     <string name="restore_backup">Restaurar copia de seguridad</string>
   <string name="create_a_backup_first">Primero cree una copia de seguridad</string>
-  <string name="name_can_t_be_empty">El nombre no puede estar vacío</string>
-  <string name="fields_can_t_be_empty">Los campos no pueden estar vacíos</string>
   <string name="start_tor_again_for_finish_the_process">Inicie Tor de nuevo para finalizar el proceso</string>
   <string name="confirm_service_deletion">Confirme el borrado del servicio</string>
     <string name="service_type">Tipo de servicio</string>
@@ -159,7 +156,6 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
   <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="invalid_onion_address">Dirección .onion no válida</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>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index c1a7436f..5923d4ee 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -138,8 +138,7 @@
   <string name="onion_port">Onion ataka</string>
   <string name="name">Izena</string>
   <string name="done">Egina!</string>
-  <string name="invalid_port">Ataka baliogabea</string>
-  <string name="copy_address_to_clipboard">Kopiatu helbidea arbelera</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>
@@ -147,8 +146,6 @@
   <string name="backup_restored">Babeskopia berrezarri da</string>
     <string name="restore_backup">Berrezarri babeskopia</string>
   <string name="create_a_backup_first">Sortu babeskopia aurretik</string>
-  <string name="name_can_t_be_empty">Izena ezin da hutsik egon</string>
-  <string name="fields_can_t_be_empty">Eremuak ezin dira hutsik egon</string>
   <string name="start_tor_again_for_finish_the_process">Hasi Tor berriro prozesua amaitzeko</string>
   <string name="confirm_service_deletion">Berretsi zerbitzua ezabatzea</string>
     <string name="service_type">Zerbitzu mota</string>
@@ -158,7 +155,6 @@
   <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="invalid_onion_address">.onion helbide baliogabea</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>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index b3c910fc..5122b88d 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -138,8 +138,7 @@
   <string name="onion_port">درگاه پیازی</string>
   <string name="name">نام</string>
   <string name="done">انجام شد!</string>
-  <string name="invalid_port">درگاه نامعتبر</string>
-  <string name="copy_address_to_clipboard">رونوشت نشانی‌ها در حافظه موقت</string>
+    <string name="copy_address_to_clipboard">رونوشت نشانی‌ها در حافظه موقت</string>
   <string name="show_auth_cookie">نمایش کوکی احراز هویت</string>
   <string name="backup_service">سرویس بک‌آپ</string>
   <string name="delete_service">حذف سرویس</string>
@@ -147,8 +146,6 @@
   <string name="backup_restored">بک‌آپ بازگردانده شد</string>
   <string name="restore_backup">برگرداندن بک‌آپ</string>
   <string name="create_a_backup_first">اول یک نسخه بک‌آپ درست کنید</string>
-  <string name="name_can_t_be_empty">نام نباید خالی باشد</string>
-  <string name="fields_can_t_be_empty">زمینه‌ها نباید خالی باشند</string>
   <string name="start_tor_again_for_finish_the_process">برای پایان روند کار ، دوباره تور را آغاز کنید</string>
   <string name="confirm_service_deletion">حذف سرویس را تایید کنید</string>
     <string name="service_type">نوع سرویس</string>
@@ -158,7 +155,6 @@
   <string name="please_restart_Orbot_to_enable_the_changes">برای دیدن تغییرات، اوربات  را دوباره راه اندازی کنید</string>
   <string name="client_cookies">کوکی‌های Client</string>
   <string name="onion">onion.</string>
-  <string name="invalid_onion_address">نشانی نامعتبر onion. </string>
   <string name="cookie_from_QR">از QR بخوان</string>
   <string name="backup_cookie">بک‌آپ از کوکی</string>
   <string name="delete_cookie">حذف کوکی</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 42e35d4a..005b1b45 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -138,8 +138,7 @@
   <string name="onion_port">Port oignon</string>
   <string name="name">Nom</string>
   <string name="done">Fait !</string>
-  <string name="invalid_port">Port invalide</string>
-  <string name="copy_address_to_clipboard">Copier l’adresse vers le presse-papiers</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>
@@ -147,8 +146,6 @@
   <string name="backup_restored">La sauvegarde a été restaurée</string>
     <string name="restore_backup">Restaurer la sauvegarde</string>
   <string name="create_a_backup_first">Créer d’abord une sauvegarde</string>
-  <string name="name_can_t_be_empty">Le nom ne peut pas être vide</string>
-  <string name="fields_can_t_be_empty">Les champs ne peuvent pas être vides</string>
   <string name="start_tor_again_for_finish_the_process">Redémarrer Tor pour terminer le processus</string>
   <string name="confirm_service_deletion">Confirmer la suppression du service</string>
     <string name="service_type">Type de service</string>
@@ -158,7 +155,6 @@
   <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="invalid_onion_address">Adresse .onion invalide</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>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index c0c8808f..5f7bb235 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -138,8 +138,7 @@
   <string name="onion_port">Porto Onion</string>
   <string name="name">Nome</string>
   <string name="done">Feito!</string>
-  <string name="invalid_port">Porto non válido</string>
-  <string name="copy_address_to_clipboard">Copiar enderezo ao portapapeis</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>
@@ -147,8 +146,6 @@
   <string name="backup_restored">Respaldo restaurado</string>
     <string name="restore_backup">Restaurar respaldo</string>
   <string name="create_a_backup_first">Cree un respaldo primeiro</string>
-  <string name="name_can_t_be_empty">O nome non pode quedar baldeiro</string>
-  <string name="fields_can_t_be_empty">Os campos non poden estar baldeiros</string>
   <string name="start_tor_again_for_finish_the_process">Inicie Tor de novo para rematar o proceso</string>
   <string name="confirm_service_deletion">Confirme a eliminación do servizo</string>
     <string name="service_type">Tipo de servizo</string>
@@ -158,7 +155,6 @@
   <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="invalid_onion_address">Enderezo .onion non válido</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>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 5e3a99b8..d0d918d7 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -138,8 +138,7 @@
   <string name="onion_port">פתחת בצל</string>
   <string name="name">שם</string>
   <string name="done">הסתיים!</string>
-  <string name="invalid_port">פתחה לא תקפה</string>
-  <string name="copy_address_to_clipboard">העתק כתובת ללוח עריכה</string>
+    <string name="copy_address_to_clipboard">העתק כתובת ללוח עריכה</string>
   <string name="show_auth_cookie">הראה עוגיית אימות</string>
   <string name="backup_service">גבה שירות</string>
   <string name="delete_service">מחק שירות</string>
@@ -147,8 +146,6 @@
   <string name="backup_restored">גיבוי שוחזר</string>
   <string name="restore_backup">שחזר גיבוי</string>
   <string name="create_a_backup_first">צור גיבוי תחילה</string>
-  <string name="name_can_t_be_empty">שם ××™× ×• יכול להיות ריק</string>
-  <string name="fields_can_t_be_empty">שדות ××™× × יכולים להיות ריקים</string>
   <string name="start_tor_again_for_finish_the_process">הפעל את Tor שוב כדי לסיים את התהליך</string>
   <string name="confirm_service_deletion">אשר מחיקת שירות</string>
     <string name="service_type">סוג שירות</string>
@@ -158,7 +155,6 @@
   <string name="please_restart_Orbot_to_enable_the_changes">×× × הפעל מחדש את Orbot כדי לאפשר את ×”×©×™× ×•×™×™×</string>
   <string name="client_cookies">עוגיות לקוח</string>
   <string name="onion">.onion</string>
-  <string name="invalid_onion_address">כתובת .onion לא תקפה</string>
   <string name="cookie_from_QR">קרא מתוך QR</string>
   <string name="backup_cookie">גבה עוגייה</string>
   <string name="delete_cookie">מחק עוגייה</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 32fe7b49..7425c540 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -139,8 +139,7 @@
   <string name="onion_port">अनियन पोर्ट</string>
   <string name="name">नाम</string>
   <string name="done">किया हुआ!</string>
-  <string name="invalid_port">अमान्य पोर्ट</string>
-  <string name="copy_address_to_clipboard">क्लिपबोर्ड को पता कॉपी करें</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>
@@ -148,8 +147,6 @@
   <string name="backup_restored">बैकअप को पुनर्स्थापित किया गया</string>
     <string name="restore_backup">बैकअप बहाल</string>
   <string name="create_a_backup_first">पहले बैकअप बनाएं</string>
-  <string name="name_can_t_be_empty">नाम रिक्त नहीं हो सकता</string>
-  <string name="fields_can_t_be_empty">फ़ील्ड रिक्त नहीं हो सकते</string>
   <string name="start_tor_again_for_finish_the_process">प्रक्रिया को खत्म करने के लिए Tor पुन: प्रारंभ करें</string>
   <string name="confirm_service_deletion">सेवा हटाने की पुष्टि करें</string>
     <string name="service_type">सेवा प्रकार</string>
@@ -159,7 +156,6 @@
   <string name="please_restart_Orbot_to_enable_the_changes">परिवर्तन सक्षम करने के लिए Orbot पुनः प्रारंभ करें</string>
   <string name="client_cookies">क्लाइंट कुकीज़</string>
   <string name="onion">.अनियन </string>
-  <string name="invalid_onion_address">अमान्य .अमान्य  पतापता</string>
   <string name="cookie_from_QR">QR से पढ़ें</string>
   <string name="backup_cookie">बैकअप कुकी</string>
   <string name="delete_cookie">कुकी हटाएं</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 77a0687f..23a13203 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -138,8 +138,7 @@
   <string name="onion_port">Onion Port</string>
   <string name="name">Név</string>
   <string name="done">Kész!</string>
-  <string name="invalid_port">Érvénytelen Port</string>
-  <string name="copy_address_to_clipboard">Cím másolása vágólapra</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>
@@ -147,8 +146,6 @@
   <string name="backup_restored">Mentés visszaállítva</string>
     <string name="restore_backup">Mentés visszaállítása</string>
   <string name="create_a_backup_first">Készítsen előbb egy mentést</string>
-  <string name="name_can_t_be_empty">A név nem lehet üres</string>
-  <string name="fields_can_t_be_empty">A mezők nem lehetnek üresek</string>
   <string name="start_tor_again_for_finish_the_process">Indítsa el a Tor-t még egyszer a befejezéshez</string>
   <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>
@@ -158,7 +155,6 @@
   <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="invalid_onion_address">Érvénytelen .onion cím</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>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index aa03098e..cae63586 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -138,8 +138,7 @@
   <string name="onion_port">Onion-gátt</string>
   <string name="name">Heiti</string>
   <string name="done">Lokið!</string>
-  <string name="invalid_port">Ógild gátt</string>
-  <string name="copy_address_to_clipboard">Afrita vistfang yfir á klippispjald</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>
@@ -147,8 +146,6 @@
   <string name="backup_restored">Öryggisafrit var endurheimt</string>
     <string name="restore_backup">Endurheimta úr öryggisafriti</string>
   <string name="create_a_backup_first">Gerðu fyrst öryggisafrit</string>
-  <string name="name_can_t_be_empty">Nafnið má ekki vera autt</string>
-  <string name="fields_can_t_be_empty">Gagnasvið mega ekki vera auð</string>
   <string name="start_tor_again_for_finish_the_process">Ræstu Tor aftur til að ljúka ferlinu</string>
   <string name="confirm_service_deletion">Staðfestu eyðingu á þjónustu</string>
     <string name="service_type">Tegund þjónustu</string>
@@ -158,7 +155,6 @@
   <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="invalid_onion_address">Ógilt .onion vistfang</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>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 9bc6e48d..aedee7b2 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -138,8 +138,7 @@
   <string name="onion_port">Porta onion</string>
   <string name="name">Nome</string>
   <string name="done">Fatto!</string>
-  <string name="invalid_port">Porta non valida</string>
-  <string name="copy_address_to_clipboard">Copia l\'indirizzo negli appunti</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>
@@ -147,8 +146,6 @@
   <string name="backup_restored">Backup ripristinato</string>
     <string name="restore_backup">Ripristina backup</string>
   <string name="create_a_backup_first">Prima crea un backup</string>
-  <string name="name_can_t_be_empty">Il nome non può essere vuoto</string>
-  <string name="fields_can_t_be_empty">I campi non possono essere vuoti</string>
   <string name="start_tor_again_for_finish_the_process">Riavvia Tor per finire il processo</string>
   <string name="confirm_service_deletion">Conferma l\'eliminazione del servizio</string>
     <string name="service_type">Tipo di servizio</string>
@@ -158,7 +155,6 @@
   <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="invalid_onion_address">Indirizzo .onion non valido</string>
   <string name="cookie_from_QR">Leggi da QR</string>
   <string name="backup_cookie">Backup cookie</string>
   <string name="delete_cookie">Elimina cookie</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 728c775d..9f48da09 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -138,8 +138,7 @@
   <string name="onion_port">Onion ポート</string>
   <string name="name">名前</string>
   <string name="done">完了</string>
-  <string name="invalid_port">無効なポート</string>
-  <string name="copy_address_to_clipboard">アドレスをクリップボードにコピー</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>
@@ -147,8 +146,6 @@
   <string name="backup_restored">バックアップから復元</string>
     <string name="restore_backup">バックアップの復旧</string>
   <string name="create_a_backup_first">最初に、バックアップを作成して下さい</string>
-  <string name="name_can_t_be_empty">名前はブランクのままにできません</string>
-  <string name="fields_can_t_be_empty">フィールドを空にしておくことはできません</string>
   <string name="start_tor_again_for_finish_the_process">プロセスを完了するには、Torを再起動して下さい。</string>
   <string name="confirm_service_deletion">サービス削除を確認</string>
     <string name="service_type">サービスタイプ</string>
@@ -158,7 +155,6 @@
   <string name="please_restart_Orbot_to_enable_the_changes">変更を有効にするにはOrbotを再起動してください</string>
   <string name="client_cookies">クライアント Cookie</string>
   <string name="onion">.onion</string>
-  <string name="invalid_onion_address">無効な .onion アドレス</string>
   <string name="cookie_from_QR">QRコードから読み取り</string>
   <string name="backup_cookie">Cookie をバックアップ</string>
   <string name="delete_cookie">Cookie を削除</string>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index 2cda7ec3..e3cf7015 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -138,8 +138,7 @@
   <string name="onion_port">Onion порта</string>
   <string name="name">Име</string>
   <string name="done">Завршено!</string>
-  <string name="invalid_port">Невалидна порта</string>
-  <string name="copy_address_to_clipboard">Копирај ја адресата за залепување</string>
+    <string name="copy_address_to_clipboard">Копирај ја адресата за залепување</string>
   <string name="show_auth_cookie">Покажи автентично колаче</string>
   <string name="backup_service">Резервна копија</string>
   <string name="delete_service">Избриши услуга</string>
@@ -147,8 +146,6 @@
   <string name="backup_restored">Вратено од резервна копија</string>
     <string name="restore_backup">Врати резервна копија</string>
   <string name="create_a_backup_first">Создади резервна копија</string>
-  <string name="name_can_t_be_empty">Името не може да биде празно</string>
-  <string name="fields_can_t_be_empty">Полињата не можат да бидат празни</string>
   <string name="start_tor_again_for_finish_the_process">Стартувај го Tor повторно да го заврши процесот</string>
   <string name="confirm_service_deletion">Потврди бришење на услугата</string>
     <string name="service_type">Тип на услуга</string>
@@ -158,7 +155,6 @@
   <string name="please_restart_Orbot_to_enable_the_changes">Ве молиме стартувајте го повторно Orbot за да се овозможат промените</string>
   <string name="client_cookies">Клиентски колачиња</string>
   <string name="onion">.onion</string>
-  <string name="invalid_onion_address">Невалидна .onion адреса</string>
   <string name="cookie_from_QR">Прочитај од QR</string>
   <string name="backup_cookie">Направи резервна копија на колаче</string>
   <string name="delete_cookie">Избриши колаче</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 910a4079..847f8a37 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -133,15 +133,12 @@
   <string name="onion_port">Løk-port</string>
   <string name="name">Navn</string>
   <string name="done">Ferdig!</string>
-  <string name="invalid_port">Ugyldig port</string>
-  <string name="copy_address_to_clipboard">Kopier adresse til utklippstavle</string>
+    <string name="copy_address_to_clipboard">Kopier adresse til utklippstavle</string>
   <string name="backup_service">Sikkerhetskopieringstjeneste</string>
   <string name="delete_service">Slett tjeneste</string>
   <string name="backup_restored">Sikkerhetskopi gjenopprettet</string>
     <string name="restore_backup">Gjenopprett sikkerhetskopi</string>
   <string name="create_a_backup_first">Opprett en sikkerhetskopi først</string>
-  <string name="name_can_t_be_empty">Navnet kan ikke være tomt</string>
-  <string name="fields_can_t_be_empty">Felter kan ikke stå tomme</string>
   <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>
@@ -149,7 +146,6 @@
   <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="invalid_onion_address">Ugyldig .onion-adresse</string>
   <string name="cookie_from_QR">Les fra QR</string>
   <string name="backup_cookie">Sikkerhetskopier informasjonskapsel</string>
   <string name="delete_cookie">Slett informasjonskapsel</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 57838dcc..45fae346 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -138,8 +138,7 @@
   <string name="onion_port">Onion-poort</string>
   <string name="name">Naam</string>
   <string name="done">Klaar!</string>
-  <string name="invalid_port">Ongeldige poort</string>
-  <string name="copy_address_to_clipboard">Adres kopiëren naar klembord</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>
@@ -147,8 +146,6 @@
   <string name="backup_restored">Back-up hersteld</string>
     <string name="restore_backup">Back-up herstellen</string>
   <string name="create_a_backup_first">Maak eerst een back-up aan</string>
-  <string name="name_can_t_be_empty">Naam kan niet leeg zijn</string>
-  <string name="fields_can_t_be_empty">Velden kunnen niet leeg zijn</string>
   <string name="start_tor_again_for_finish_the_process">Start Tor opnieuw om het proces te voltooien</string>
   <string name="confirm_service_deletion">Bevestig verwijderen van dienst</string>
     <string name="service_type">Diensttype</string>
@@ -158,7 +155,6 @@
   <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="invalid_onion_address">Ongeldig .onion-adres</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>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 60443b1b..0f2cb6fe 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -130,8 +130,7 @@
     <string name="local_port">Lokalne Porty</string>
   <string name="name">Nazwa</string>
   <string name="done">Zrobiono!</string>
-  <string name="invalid_port">Nieprawidłowy Port</string>
-  <string name="copy_address_to_clipboard">Skopiuj adres do schowka</string>
+    <string name="copy_address_to_clipboard">Skopiuj adres do schowka</string>
   <string name="please_restart_Orbot_to_enable_the_changes">Proszę zrestartować Orbot, aby zmiany mogły wejść w życie</string>
   <string name="disable">Wyłącz</string>
   <string name="enable">WÅ‚Ä…cz</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 5987d5c9..7214addd 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -138,8 +138,7 @@
   <string name="onion_port">Porta Onion</string>
   <string name="name">Nome</string>
   <string name="done">Feito!</string>
-  <string name="invalid_port">Porta Invalida</string>
-  <string name="copy_address_to_clipboard">Copiar para a area de transferência </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="delete_service">Remover Serviço</string>
@@ -147,8 +146,6 @@
   <string name="backup_restored">Backup Restaurado</string>
     <string name="restore_backup">Restaurar Backup</string>
   <string name="create_a_backup_first">Criar primeiro backup</string>
-  <string name="name_can_t_be_empty">O campo Nome não pode ser vazio</string>
-  <string name="fields_can_t_be_empty">Campos não podem ser vazios</string>
   <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>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 320d69bc..2371b913 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -138,8 +138,7 @@
   <string name="onion_port">Onion-порт</string>
   <string name="name">Имя</string>
   <string name="done">Готово!</string>
-  <string name="invalid_port">Некорректный порт</string>
-  <string name="copy_address_to_clipboard">Скопировать адрес в буфер обмена</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>
@@ -147,8 +146,6 @@
   <string name="backup_restored">Восстановлено из резервной копии</string>
     <string name="restore_backup">Восстановить из копии</string>
   <string name="create_a_backup_first">Сначала создайте резервную копию</string>
-  <string name="name_can_t_be_empty">Имя не может быть пустым</string>
-  <string name="fields_can_t_be_empty">Поля не могут быть пустыми</string>
   <string name="start_tor_again_for_finish_the_process">Запустите Tor снова для завершения процесса</string>
   <string name="confirm_service_deletion">Подтверждение удаления службы</string>
     <string name="service_type">Тип службы</string>
@@ -158,7 +155,6 @@
   <string name="please_restart_Orbot_to_enable_the_changes">Пожалуйста, перезапустите Orbot для вступления изменения в силу</string>
   <string name="client_cookies">Cookies клиента</string>
   <string name="onion">.onion</string>
-  <string name="invalid_onion_address">Недействительный .onion-адрес</string>
   <string name="cookie_from_QR">Прочитать из QR-кода</string>
   <string name="backup_cookie">Резервировать cookie</string>
   <string name="delete_cookie">Удалить cookies</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 124076e3..e4dacc88 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -136,8 +136,7 @@
   <string name="onion_port">Onion Порт</string>
   <string name="name">Име</string>
   <string name="done">Готово !</string>
-  <string name="invalid_port">Неисправан Порт</string>
-  <string name="copy_address_to_clipboard">Копирај адреса у clipboard</string>
+    <string name="copy_address_to_clipboard">Копирај адреса у clipboard</string>
   <string name="show_auth_cookie">Покажите ауторизовани колачић</string>
   <string name="backup_service">Услуга за резервне копије</string>
   <string name="delete_service">Обриши Услугу</string>
@@ -145,15 +144,12 @@
   <string name="backup_restored">Резервна копија је обновљена</string>
     <string name="restore_backup">Обнови резервну копију</string>
   <string name="create_a_backup_first">Направи резервну копију прво</string>
-  <string name="name_can_t_be_empty">Име не може бити празно</string>
-  <string name="fields_can_t_be_empty">Поља не могу бити празна</string>
   <string name="start_tor_again_for_finish_the_process">Поново покрените Тор да бисте довршили процес</string>
   <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="invalid_onion_address">Неважећа .onion адреса</string>
   <string name="cookie_from_QR">Прочитај са QR кода</string>
   <string name="backup_cookie">Резервна копија колачића</string>
   <string name="delete_cookie">Избриши колачић</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index d64eb5fb..0080cdc1 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -138,8 +138,7 @@
   <string name="onion_port">Onion port</string>
   <string name="name">Namn</string>
   <string name="done">Klart!</string>
-  <string name="invalid_port">Ogiltig port</string>
-  <string name="copy_address_to_clipboard">Kopiera adress till urklipp</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>
@@ -147,8 +146,6 @@
   <string name="backup_restored">Backup återställd</string>
     <string name="restore_backup">Återställa säkerhetskopia</string>
   <string name="create_a_backup_first">Skapa en säkerhetskopia först</string>
-  <string name="name_can_t_be_empty">Namnet kan inte vara tomt</string>
-  <string name="fields_can_t_be_empty">Fält kan inte vara tomma</string>
   <string name="start_tor_again_for_finish_the_process">Starta Tor igen för att avsluta processen</string>
   <string name="confirm_service_deletion">Bekräfta tjänst borttagning</string>
     <string name="service_type">Typ av tjänst</string>
@@ -158,7 +155,6 @@
   <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="invalid_onion_address">Ogiltig .onion-adress</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>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index d27760e4..63ce987c 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -138,8 +138,7 @@
   <string name="onion_port">พอร์ต Onion</string>
   <string name="name">ชื่อเอกสาร</string>
   <string name="done">เสร็จสิ้น!</string>
-  <string name="invalid_port">พอร์ตไม่ถูกต้อง</string>
-  <string name="copy_address_to_clipboard">คัดลอกที่อยู่ลงในคลิปบอร์ด</string>
+    <string name="copy_address_to_clipboard">คัดลอกที่อยู่ลงในคลิปบอร์ด</string>
   <string name="show_auth_cookie">แสดงคุกกี้ที่ได้รับอนุญาต</string>
   <string name="backup_service">บริการสำรองข้อมูล</string>
   <string name="delete_service">บริการลบ</string>
@@ -147,8 +146,6 @@
   <string name="backup_restored">คืนค่าข้อมูลสำรอง</string>
     <string name="restore_backup">คืนค่าข้อมูลสำรอง</string>
   <string name="create_a_backup_first">สร้างข้อมูลสำรองก่อน</string>
-  <string name="name_can_t_be_empty">ปล่อยชื่อให้ว่างไม่ได้</string>
-  <string name="fields_can_t_be_empty">ปล่อยเขตข้อมูลให้ว่างไม่ได้</string>
   <string name="start_tor_again_for_finish_the_process">เริ่มทำงาน Tor อีกครั้งเพื่อจบกระบวนการ</string>
   <string name="confirm_service_deletion">ยืนยันการลบบริการ</string>
     <string name="service_type">ประเภทของบริการ</string>
@@ -158,7 +155,6 @@
   <string name="please_restart_Orbot_to_enable_the_changes">กรุณาเริ่ม Orbot ใหม่เพื่อให้การเปลี่ยนแปลงใช้งานได้</string>
   <string name="client_cookies">คุกกี้ของไคลเอ็นต์</string>
   <string name="onion">.onion</string>
-  <string name="invalid_onion_address">ที่อยู่ .onion ไม่ถูกต้อง</string>
   <string name="cookie_from_QR">อ่านจากคิวอาร์</string>
   <string name="backup_cookie">สำรองข้อมูลคุกกี้</string>
   <string name="delete_cookie">ลบคุกกี้</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 0d284492..6dd2dd88 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -138,8 +138,7 @@
   <string name="onion_port">Onion Kapısı</string>
   <string name="name">Ad</string>
   <string name="done">Tamam!</string>
-  <string name="invalid_port">Kapı Geçersiz</string>
-  <string name="copy_address_to_clipboard">Adresi panoya kopyala</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>
@@ -147,8 +146,6 @@
   <string name="backup_restored">Yedek geri yüklendi</string>
     <string name="restore_backup">Yedeği Geri Yükle</string>
   <string name="create_a_backup_first">Önce bir yedek oluşturun</string>
-  <string name="name_can_t_be_empty">Ad boş bırakılamaz</string>
-  <string name="fields_can_t_be_empty">Alanlar boş bırakılamaz</string>
   <string name="start_tor_again_for_finish_the_process">İşlemi tamamlamak için Tor uygulamasını yeniden başlatın</string>
   <string name="confirm_service_deletion">Hizmeti Silmeyi Onayla</string>
     <string name="service_type">Hizmet Türü</string>
@@ -158,7 +155,6 @@
   <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="invalid_onion_address">.onion adresi geçersiz</string>
   <string name="cookie_from_QR">QR kodundan oku</string>
   <string name="backup_cookie">Çerezi yedekle</string>
   <string name="delete_cookie">Çerezi sil</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index bd527861..cc69b3dd 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -138,8 +138,7 @@
   <string name="onion_port">Порт Onion</string>
   <string name="name">Ім\'я</string>
   <string name="done">Зроблено!</string>
-  <string name="invalid_port">Неробочий Порт</string>
-  <string name="copy_address_to_clipboard">Скопіювати адресу в буфер обміну</string>
+    <string name="copy_address_to_clipboard">Скопіювати адресу в буфер обміну</string>
   <string name="show_auth_cookie">Показати авторизацію реп\'яшків</string>
   <string name="backup_service">Резервне копіювання</string>
   <string name="delete_service">Вилучити Сервіс</string>
@@ -147,8 +146,6 @@
   <string name="backup_restored">Резервне копіювання відновлено</string>
     <string name="restore_backup">Відновити резервну копію</string>
   <string name="create_a_backup_first">Спершу створити резервну копію</string>
-  <string name="name_can_t_be_empty">Назва не може бути порожньою</string>
-  <string name="fields_can_t_be_empty">Поля не можуть бути порожніми</string>
   <string name="start_tor_again_for_finish_the_process">Запустіть Tor знову для завершення процесу</string>
   <string name="confirm_service_deletion">Підтвердьте видалення сервісу</string>
     <string name="service_type">Тип сервісу</string>
@@ -158,7 +155,6 @@
   <string name="please_restart_Orbot_to_enable_the_changes">Будь ласка, перезапустіть Orbot, щоб зміни ввійшли в силу</string>
   <string name="client_cookies">Клієнтські реп\'яшки</string>
   <string name="onion">.onion</string>
-  <string name="invalid_onion_address">Недійсна .onion адреса</string>
   <string name="cookie_from_QR">Зчитати з QR-коду</string>
   <string name="backup_cookie">Резервне копіювання реп\'яшків</string>
   <string name="delete_cookie">Вилучити реп\'яшки</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 83b1c846..3420d5dd 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -138,8 +138,7 @@
   <string name="onion_port">洋蔥端口</string>
   <string name="name">名稱</string>
   <string name="done">已完成!</string>
-  <string name="invalid_port">ç„¡æ•ˆåŸ </string>
-  <string name="copy_address_to_clipboard">複製地址到剪貼簿</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>
@@ -147,8 +146,6 @@
   <string name="backup_restored">備份已還原</string>
     <string name="restore_backup">還原備份</string>
   <string name="create_a_backup_first">先創立備份</string>
-  <string name="name_can_t_be_empty">名稱不可空白</string>
-  <string name="fields_can_t_be_empty">欄位不可空白</string>
   <string name="start_tor_again_for_finish_the_process">再次開啟 Tor  以完成此過程</string>
   <string name="confirm_service_deletion">確認服務刪除</string>
     <string name="service_type">服務類型</string>
@@ -158,7 +155,6 @@
   <string name="please_restart_Orbot_to_enable_the_changes">請重新啟動 Orbot 來讓設定生效。</string>
   <string name="client_cookies">客戶 cookies</string>
   <string name="onion">.onion</string>
-  <string name="invalid_onion_address">無效的 .onion 地址</string>
   <string name="cookie_from_QR">由 QR 碼讀取</string>
   <string name="backup_cookie">備分 cookie</string>
   <string name="delete_cookie">刪除 cookie</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c0868b5c..857f649c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -177,7 +177,6 @@
     <string name="onion_port">Onion Port</string>
     <string name="name">Name</string>
     <string name="done">Done!</string>
-    <string name="invalid_port">Invalid Port</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>
@@ -186,8 +185,6 @@
     <string name="backup_restored">Backup restored</string>
     <string name="restore_backup">Restore Backup</string>
     <string name="create_a_backup_first">Create a backup first</string>
-    <string name="name_can_t_be_empty">Name can\'t be empty</string>
-    <string name="fields_can_t_be_empty">Fields can\'t be empty</string>
     <string name="start_tor_again_for_finish_the_process">Start Tor again for finish the process</string>
     <string name="confirm_service_deletion">Confirm service deletion</string>
     <string name="service_type">Service type</string>
@@ -197,7 +194,6 @@
     <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="invalid_onion_address">Invalid .onion address</string>
     <string name="cookie_from_QR">Read from QR</string>
     <string name="backup_cookie">Backup cookie</string>
     <string name="delete_cookie">Delete cookie</string>