[tor-commits] [orbot/master] Used Storage Access Framework for cookie backup/restore and onion
n8fr8 at torproject.org
n8fr8 at torproject.org
Wed Oct 7 12:37:35 UTC 2020
commit 62ff81c23e6aee6f0eb8160eda69682ea4a3a188
Author: bim <dsnake at protonmail.com>
Date: Wed Sep 16 01:55:44 2020 -0400
Used Storage Access Framework for cookie backup/restore and onion
service backup/restore.
Deleted many resources that are no longer needed
---
app-mini/src/main/res/values-ar/strings.xml | 7 +-
app-mini/src/main/res/values-ay/strings.xml | 7 +-
app-mini/src/main/res/values-az/strings.xml | 3 +-
app-mini/src/main/res/values-be/strings.xml | 7 +-
app-mini/src/main/res/values-bg/strings.xml | 3 +-
app-mini/src/main/res/values-bn-rBD/strings.xml | 3 +-
app-mini/src/main/res/values-bn-rIN/strings.xml | 3 +-
app-mini/src/main/res/values-bn/strings.xml | 3 +-
app-mini/src/main/res/values-brx/strings.xml | 3 +-
app-mini/src/main/res/values-bs/strings.xml | 3 +-
app-mini/src/main/res/values-ca/strings.xml | 7 +-
app-mini/src/main/res/values-cs-rCZ/strings.xml | 3 +-
app-mini/src/main/res/values-cs/strings.xml | 3 +-
app-mini/src/main/res/values-cy/strings.xml | 3 +-
app-mini/src/main/res/values-da/strings.xml | 3 +-
app-mini/src/main/res/values-de/strings.xml | 7 +-
app-mini/src/main/res/values-el/strings.xml | 7 +-
app-mini/src/main/res/values-en-rGB/strings.xml | 3 +-
app-mini/src/main/res/values-eo/strings.xml | 3 +-
app-mini/src/main/res/values-es-rAR/strings.xml | 3 +-
app-mini/src/main/res/values-es/strings.xml | 7 +-
app-mini/src/main/res/values-et/strings.xml | 3 +-
app-mini/src/main/res/values-eu/strings.xml | 7 +-
app-mini/src/main/res/values-fa/strings.xml | 7 +-
app-mini/src/main/res/values-fi/strings.xml | 3 +-
app-mini/src/main/res/values-fr-rFR/strings.xml | 3 +-
app-mini/src/main/res/values-fr/strings.xml | 7 +-
app-mini/src/main/res/values-gl/strings.xml | 7 +-
app-mini/src/main/res/values-gu-rIN/strings.xml | 3 +-
app-mini/src/main/res/values-gu/strings.xml | 3 +-
app-mini/src/main/res/values-he/strings.xml | 7 +-
app-mini/src/main/res/values-hi/strings.xml | 7 +-
app-mini/src/main/res/values-hr-rHR/strings.xml | 3 +-
app-mini/src/main/res/values-hr/strings.xml | 3 +-
app-mini/src/main/res/values-hu/strings.xml | 7 +-
app-mini/src/main/res/values-hy-rAM/strings.xml | 3 +-
app-mini/src/main/res/values-ia/strings.xml | 3 +-
app-mini/src/main/res/values-id/strings.xml | 3 +-
app-mini/src/main/res/values-in-rID/strings.xml | 3 +-
app-mini/src/main/res/values-in/strings.xml | 3 +-
app-mini/src/main/res/values-is/strings.xml | 7 +-
app-mini/src/main/res/values-it/strings.xml | 7 +-
app-mini/src/main/res/values-iw/strings.xml | 3 +-
app-mini/src/main/res/values-ja/strings.xml | 7 +-
app-mini/src/main/res/values-kn/strings.xml | 3 +-
app-mini/src/main/res/values-ko/strings.xml | 3 +-
app-mini/src/main/res/values-ky/strings.xml | 3 +-
app-mini/src/main/res/values-lt/strings.xml | 3 +-
app-mini/src/main/res/values-lv/strings.xml | 3 +-
app-mini/src/main/res/values-mk/strings.xml | 7 +-
app-mini/src/main/res/values-ml/strings.xml | 3 +-
app-mini/src/main/res/values-mn/strings.xml | 3 +-
app-mini/src/main/res/values-ms-rMY/strings.xml | 3 +-
app-mini/src/main/res/values-ms/strings.xml | 3 +-
app-mini/src/main/res/values-my/strings.xml | 3 +-
app-mini/src/main/res/values-nb/strings.xml | 6 +-
app-mini/src/main/res/values-nl/strings.xml | 7 +-
app-mini/src/main/res/values-pa/strings.xml | 3 +-
app-mini/src/main/res/values-pl/strings.xml | 3 +-
app-mini/src/main/res/values-ps/strings.xml | 3 +-
app-mini/src/main/res/values-pt-rBR/strings.xml | 7 +-
app-mini/src/main/res/values-pt-rPT/strings.xml | 3 +-
app-mini/src/main/res/values-pt/strings.xml | 3 +-
app-mini/src/main/res/values-ro-rRO/strings.xml | 3 +-
app-mini/src/main/res/values-ro/strings.xml | 3 +-
app-mini/src/main/res/values-rs-rAR/strings.xml | 3 +-
app-mini/src/main/res/values-ru/strings.xml | 7 +-
app-mini/src/main/res/values-si-rLK/strings.xml | 3 +-
app-mini/src/main/res/values-sk/strings.xml | 3 +-
app-mini/src/main/res/values-sl/strings.xml | 3 +-
app-mini/src/main/res/values-sn/strings.xml | 3 +-
app-mini/src/main/res/values-sq/strings.xml | 3 +-
app-mini/src/main/res/values-sr/strings.xml | 7 +-
app-mini/src/main/res/values-sv/strings.xml | 7 +-
app-mini/src/main/res/values-ta/strings.xml | 3 +-
app-mini/src/main/res/values-th/strings.xml | 7 +-
app-mini/src/main/res/values-tl/strings.xml | 3 +-
app-mini/src/main/res/values-tr/strings.xml | 7 +-
app-mini/src/main/res/values-uk/strings.xml | 7 +-
app-mini/src/main/res/values-ur/strings.xml | 3 +-
app-mini/src/main/res/values-uz/strings.xml | 3 +-
app-mini/src/main/res/values-vi/strings.xml | 3 +-
app-mini/src/main/res/values-zh-rCN/strings.xml | 3 +-
app-mini/src/main/res/values-zh-rTW/strings.xml | 7 +-
app-mini/src/main/res/values/strings.xml | 3 -
.../org/torproject/android/OrbotMainActivity.java | 2 +-
.../android/ui/dialog/MoatErrorDialogFragment.java | 2 +-
.../ui/hiddenservices/ClientCookiesActivity.java | 60 ++++++-------
.../ui/hiddenservices/HiddenServicesActivity.java | 99 +++++++++-------------
.../ui/hiddenservices/adapters/BackupAdapter.java | 44 ----------
.../ui/hiddenservices/backup/BackupUtils.java | 67 ++++-----------
.../android/ui/hiddenservices/backup/ZipIt.java | 48 ++++++-----
.../dialogs/CookieActionsDialog.java | 99 +++++++++++-----------
.../hiddenservices/dialogs/CookieDeleteDialog.java | 5 +-
.../ui/hiddenservices/dialogs/HSActionsDialog.java | 49 +++++------
.../ui/hiddenservices/dialogs/HSDeleteDialog.java | 7 +-
.../dialogs/SelectCookieBackupDialog.java | 64 --------------
.../dialogs/SelectHSBackupDialog.java | 64 --------------
.../res/layout/layout_add_client_cookie_dialog.xml | 36 ++++----
app/src/main/res/layout/layout_cookie_actions.xml | 19 +++--
app/src/main/res/layout/layout_hs_actions.xml | 2 +-
app/src/main/res/layout/layout_hs_backups_list.xml | 11 ---
.../res/layout/layout_hs_backups_list_item.xml | 24 ------
app/src/main/res/layout/layout_hs_cookie.xml | 23 ++---
app/src/main/res/layout/layout_hs_data_dialog.xml | 50 +++++------
app/src/main/res/values-ar/strings.xml | 6 +-
app/src/main/res/values-ay/strings.xml | 6 +-
app/src/main/res/values-az/strings.xml | 2 -
app/src/main/res/values-be/strings.xml | 6 +-
app/src/main/res/values-bg/strings.xml | 2 -
app/src/main/res/values-bn-rBD/strings.xml | 2 -
app/src/main/res/values-bn-rIN/strings.xml | 3 +-
app/src/main/res/values-bn/strings.xml | 1 -
app/src/main/res/values-brx/strings.xml | 1 -
app/src/main/res/values-bs/strings.xml | 1 -
app/src/main/res/values-ca/strings.xml | 6 +-
app/src/main/res/values-cs-rCZ/strings.xml | 2 -
app/src/main/res/values-cs/strings.xml | 1 -
app/src/main/res/values-cy/strings.xml | 2 -
app/src/main/res/values-da/strings.xml | 2 -
app/src/main/res/values-de/strings.xml | 6 +-
app/src/main/res/values-el/strings.xml | 6 +-
app/src/main/res/values-en-rGB/strings.xml | 2 -
app/src/main/res/values-eo/strings.xml | 1 -
app/src/main/res/values-es-rAR/strings.xml | 2 -
app/src/main/res/values-es/strings.xml | 6 +-
app/src/main/res/values-et/strings.xml | 2 -
app/src/main/res/values-eu/strings.xml | 6 +-
app/src/main/res/values-fa/strings.xml | 6 +-
app/src/main/res/values-fi/strings.xml | 2 -
app/src/main/res/values-fr-rFR/strings.xml | 2 -
app/src/main/res/values-fr/strings.xml | 6 +-
app/src/main/res/values-gl/strings.xml | 6 +-
app/src/main/res/values-gu-rIN/strings.xml | 3 +-
app/src/main/res/values-gu/strings.xml | 2 -
app/src/main/res/values-he/strings.xml | 6 +-
app/src/main/res/values-hi/strings.xml | 6 +-
app/src/main/res/values-hr-rHR/strings.xml | 3 +-
app/src/main/res/values-hr/strings.xml | 2 -
app/src/main/res/values-hu/strings.xml | 6 +-
app/src/main/res/values-hy-rAM/strings.xml | 1 -
app/src/main/res/values-ia/strings.xml | 3 +-
app/src/main/res/values-id/strings.xml | 2 -
app/src/main/res/values-in-rID/strings.xml | 2 -
app/src/main/res/values-in/strings.xml | 1 -
app/src/main/res/values-is/strings.xml | 6 +-
app/src/main/res/values-it/strings.xml | 6 +-
app/src/main/res/values-iw/strings.xml | 2 -
app/src/main/res/values-ja/strings.xml | 6 +-
app/src/main/res/values-kn/strings.xml | 1 -
app/src/main/res/values-ko/strings.xml | 2 -
app/src/main/res/values-ky/strings.xml | 3 +-
app/src/main/res/values-lt/strings.xml | 2 -
app/src/main/res/values-lv/strings.xml | 2 -
app/src/main/res/values-mk/strings.xml | 6 +-
app/src/main/res/values-ml/strings.xml | 1 -
app/src/main/res/values-mn/strings.xml | 3 +-
app/src/main/res/values-ms-rMY/strings.xml | 2 -
app/src/main/res/values-ms/strings.xml | 2 -
app/src/main/res/values-my/strings.xml | 1 -
app/src/main/res/values-nb/strings.xml | 5 +-
app/src/main/res/values-nl/strings.xml | 6 +-
app/src/main/res/values-pa/strings.xml | 3 +-
app/src/main/res/values-pl/strings.xml | 2 -
app/src/main/res/values-ps/strings.xml | 3 +-
app/src/main/res/values-pt-rBR/strings.xml | 6 +-
app/src/main/res/values-pt-rPT/strings.xml | 2 -
app/src/main/res/values-pt/strings.xml | 2 -
app/src/main/res/values-ro-rRO/strings.xml | 3 +-
app/src/main/res/values-ro/strings.xml | 2 -
app/src/main/res/values-ru/strings.xml | 6 +-
app/src/main/res/values-si-rLK/strings.xml | 2 -
app/src/main/res/values-sk/strings.xml | 2 -
app/src/main/res/values-sl/strings.xml | 2 -
app/src/main/res/values-sn/strings.xml | 1 -
app/src/main/res/values-sq/strings.xml | 2 -
app/src/main/res/values-sr/strings.xml | 6 +-
app/src/main/res/values-sv/strings.xml | 6 +-
app/src/main/res/values-ta/strings.xml | 2 -
app/src/main/res/values-th/strings.xml | 6 +-
app/src/main/res/values-tl/strings.xml | 2 -
app/src/main/res/values-tr/strings.xml | 6 +-
app/src/main/res/values-uk/strings.xml | 6 +-
app/src/main/res/values-ur/strings.xml | 1 -
app/src/main/res/values-uz/strings.xml | 1 -
app/src/main/res/values-vi/strings.xml | 2 -
app/src/main/res/values-zh-rCN/strings.xml | 2 -
app/src/main/res/values-zh-rTW/strings.xml | 6 +-
app/src/main/res/values/strings.xml | 4 -
.../java/org/torproject/android/core/DiskUtils.kt | 39 +++++++++
.../org/torproject/android/core/ExternalStorage.kt | 15 ----
191 files changed, 445 insertions(+), 1027 deletions(-)
diff --git a/app-mini/src/main/res/values-ar/strings.xml b/app-mini/src/main/res/values-ar/strings.xml
index b8039520..be647b88 100644
--- a/app-mini/src/main/res/values-ar/strings.xml
+++ b/app-mini/src/main/res/values-ar/strings.xml
@@ -17,8 +17,7 @@
<string name="menu_scan">ÙØص QR الجسر</string>
<string name="menu_share_bridge">مشاركة QR الجسر</string>
<string name="btn_okay">مواÙÙ‚</string>
- <string name="btn_cancel">إلغاء</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">بعض التÙاصيل عن اوربوت</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">عام</string>
@@ -144,10 +143,8 @@
<string name="delete_service">Øذ٠الخدمة</string>
<string name="backup_saved_at_external_storage">تمت عملية ØÙظ النسخة الإØتياطية ÙÙŠ ذاكرة التخزين الخارجية</string>
<string name="backup_restored">تمت استعادة النسخة الإØتياطية</string>
- <string name="filemanager_not_available">تعذر العثور على مدير الملÙات</string>
<string name="restore_backup">إسترجاع نسخة اØتياطية</string>
- <string name="create_a_backup_first">قم أولاً بإنشاء نسخة Ø¥Øتياطية</string>
- <string name="name_can_t_be_empty">لا يمكن ترك الإسم Ùارغا</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>
diff --git a/app-mini/src/main/res/values-ay/strings.xml b/app-mini/src/main/res/values-ay/strings.xml
index a7efa644..7d1da038 100644
--- a/app-mini/src/main/res/values-ay/strings.xml
+++ b/app-mini/src/main/res/values-ay/strings.xml
@@ -17,8 +17,7 @@
<string name="menu_scan">Jalakipañ QR waruqaña</string>
<string name="menu_share_bridge">Jalakipañ QR ch\'iqiyaña</string>
<string name="btn_okay">Iyaw saña</string>
- <string name="btn_cancel">Janiw saña</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Orbotxat juk\'amp yatiñataki</string>
<string name="wizard_details_msg">Orbot wakichawix inakiwa ukatx Tor ukaniwa, Obfs4Proxy, BadVPN Tun2Socks, LibEvent ukhamarak Polipo. Proxy HTTP (8118) ukhamarak mä proxy SOCKS (9050) Tor taypin utjayi. Mä rooteat atamirinx Orbotax Tor tuqiw taqpach llika yatiyäwinak apayarakispawa.</string>
<!--END Welcome Wizard strings (DJH)-->
@@ -148,11 +147,9 @@
<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="filemanager_not_available">Imatanak apnaqirix janiw uñjañjamäkiti</string>
<string name="please_grant_permissions_for_external_storage">Yaqha yänakar imañatak iyaw sam, amp suma</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="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>
diff --git a/app-mini/src/main/res/values-az/strings.xml b/app-mini/src/main/res/values-az/strings.xml
index 84f63aeb..d67dc076 100644
--- a/app-mini/src/main/res/values-az/strings.xml
+++ b/app-mini/src/main/res/values-az/strings.xml
@@ -17,8 +17,7 @@
<string name="menu_scan">KörpüQR kodu skan edin</string>
<string name="menu_share_bridge">KörpüQR kodu paylaşın</string>
<string name="btn_okay">Okey</string>
- <string name="btn_cancel">Ləğv et</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Bəzi Orbot Detalları</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Æsas</string>
diff --git a/app-mini/src/main/res/values-be/strings.xml b/app-mini/src/main/res/values-be/strings.xml
index fa707642..cefedc3d 100644
--- a/app-mini/src/main/res/values-be/strings.xml
+++ b/app-mini/src/main/res/values-be/strings.xml
@@ -17,8 +17,7 @@
<string name="menu_scan">Сканаваць QR-код моÑта</string>
<string name="menu_share_bridge">Ðпублікаваць QR-код моÑта</string>
<string name="btn_okay">OK</string>
- <string name="btn_cancel">СкаÑаваць</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">ÐÐµÐºÐ°Ñ‚Ð¾Ñ€Ñ‹Ñ Ð·Ð²ÐµÑткі пра праграму Orbot</string>
<string name="wizard_details_msg">Orbot — гÑта праграма з адкрытым зыходным кодам, ÑÐºÐ°Ñ ÑžÑ‚Ñ€Ñ‹Ð¼Ð¾ÑžÐ²Ð°Ðµ Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent Ñ– Polipo. Яно прапануе лакальны HTTP- (8118) Ñ– SOCKS-прокÑÑ– (9050) у Ñетку Tor. Orbot такÑама дазвалÑе на прыладах з правамі root пераÑылаць увеÑÑŒ інтÑрнÑÑ‚-трафік праз Tor.</string>
<!--END Welcome Wizard strings (DJH)-->
@@ -148,11 +147,9 @@
<string name="delete_service">Выдаліць Ñлужбу</string>
<string name="backup_saved_at_external_storage">Ð ÑÐ·ÐµÑ€Ð²Ð¾Ð²Ð°Ñ ÐºÐ¾Ð¿Ñ–Ñ Ð·Ð°Ñ…Ð°Ð²Ð°Ð½Ð° на вонкавым Ñховішчы</string>
<string name="backup_restored">Ðдноўлена з Ñ€Ñзервовай копіі</string>
- <string name="filemanager_not_available">Файлавы менеджар недаÑтупны</string>
<string name="please_grant_permissions_for_external_storage">Дайце дазвол Ð´Ð»Ñ Ð´Ð¾Ñтупу да вонкавага Ñховішча</string>
<string name="restore_backup">Ðднавіць з копіі</string>
- <string name="create_a_backup_first">Спачатку Ñтварыце Ñ€Ñзервовую копію</string>
- <string name="name_can_t_be_empty">Ð†Ð¼Ñ Ð½Ðµ можа быць пуÑтым</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>
diff --git a/app-mini/src/main/res/values-bg/strings.xml b/app-mini/src/main/res/values-bg/strings.xml
index fd346abb..9166a944 100644
--- a/app-mini/src/main/res/values-bg/strings.xml
+++ b/app-mini/src/main/res/values-bg/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Сканирай BridgeQR</string>
<string name="menu_share_bridge">Сподели BridgeQR</string>
<string name="btn_okay">ОК</string>
- <string name="btn_cancel">Откажи</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">ÐÑкои Орбот детайли</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Главни</string>
diff --git a/app-mini/src/main/res/values-bn-rBD/strings.xml b/app-mini/src/main/res/values-bn-rBD/strings.xml
index a511f6d3..af00ed89 100644
--- a/app-mini/src/main/res/values-bn-rBD/strings.xml
+++ b/app-mini/src/main/res/values-bn-rBD/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">বà§à¦°à¦¿à¦œà¦•à¦¿à¦‰à¦†à¦° চেক করà§à¦¨</string>
<string name="menu_share_bridge">বà§à¦°à¦¿à¦œà¦•à¦¿à¦‰à¦†à¦° শেয়ার করà§à¦¨</string>
<string name="btn_okay">ঠিক আছে</string>
- <string name="btn_cancel">বাদ</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">সাধারণ</string>
<!--New Wizard Strings-->
diff --git a/app-mini/src/main/res/values-bn-rIN/strings.xml b/app-mini/src/main/res/values-bn-rIN/strings.xml
index e832af24..12fa5a98 100644
--- a/app-mini/src/main/res/values-bn-rIN/strings.xml
+++ b/app-mini/src/main/res/values-bn-rIN/strings.xml
@@ -1,7 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="btn_cancel">Cancel</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<!--New Wizard Strings-->
<!--Title Screen-->
diff --git a/app-mini/src/main/res/values-bn/strings.xml b/app-mini/src/main/res/values-bn/strings.xml
index 288474fd..c79aaf61 100644
--- a/app-mini/src/main/res/values-bn/strings.xml
+++ b/app-mini/src/main/res/values-bn/strings.xml
@@ -8,8 +8,7 @@
<string name="main_layout_download">ডাউনলোড</string>
<string name="button_about">সমà§à¦¬à¦¨à§à¦§à§‡</string>
<string name="menu_exit">বনà§à¦§</string>
- <string name="btn_cancel">বাতিল</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">সাধারণ</string>
<!--New Wizard Strings-->
diff --git a/app-mini/src/main/res/values-brx/strings.xml b/app-mini/src/main/res/values-brx/strings.xml
index 806663f3..a8ca57e7 100644
--- a/app-mini/src/main/res/values-brx/strings.xml
+++ b/app-mini/src/main/res/values-brx/strings.xml
@@ -2,8 +2,7 @@
<resources>
<string name="menu_settings">सेटिंगà¥à¤¸</string>
<string name="menu_exit">अोंखारलां</string>
- <string name="btn_cancel">नेवसि</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<!--New Wizard Strings-->
<!--Title Screen-->
diff --git a/app-mini/src/main/res/values-bs/strings.xml b/app-mini/src/main/res/values-bs/strings.xml
index 85fe87e3..3553c10a 100644
--- a/app-mini/src/main/res/values-bs/strings.xml
+++ b/app-mini/src/main/res/values-bs/strings.xml
@@ -1,8 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<string name="menu_settings">Postavke</string>
- <string name="btn_cancel">Otkaži</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Osnovno</string>
<!--New Wizard Strings-->
diff --git a/app-mini/src/main/res/values-ca/strings.xml b/app-mini/src/main/res/values-ca/strings.xml
index 94c2d610..87933a11 100644
--- a/app-mini/src/main/res/values-ca/strings.xml
+++ b/app-mini/src/main/res/values-ca/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Escaneja el BridgeQR</string>
<string name="menu_share_bridge">Comparteix el BridgeQR</string>
<string name="btn_okay">D\'acord</string>
- <string name="btn_cancel">Cancel·la</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Alguns detalls de l\'Orbot...</string>
<string name="wizard_details_msg">Orbot és una aplicació de codi obert que conté Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent i Polipo. Proporciona un proxy HTTP local (8118) i un proxy SOCKS (9050) a la xarxa Tor. En dispositius root Orbot també té la capacitat d\'enviar tot el trà nsit d\'Internet a través de Tor</string>
<!--END Welcome Wizard strings (DJH)-->
@@ -149,11 +148,9 @@
<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="filemanager_not_available">Gestor d\'arxius no disponible</string>
<string name="please_grant_permissions_for_external_storage">Si us plau concedeix permisos per emmagatzematge extern</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="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>
diff --git a/app-mini/src/main/res/values-cs-rCZ/strings.xml b/app-mini/src/main/res/values-cs-rCZ/strings.xml
index d5586b62..4b308812 100644
--- a/app-mini/src/main/res/values-cs-rCZ/strings.xml
+++ b/app-mini/src/main/res/values-cs-rCZ/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Skenovat BridgeQR</string>
<string name="menu_share_bridge">SdÃlet BridgeQR</string>
<string name="btn_okay">Budiž</string>
- <string name="btn_cancel">Zrušit</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Pár detailů o Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Obecné</string>
diff --git a/app-mini/src/main/res/values-cs/strings.xml b/app-mini/src/main/res/values-cs/strings.xml
index fbccc329..17b7fb4f 100644
--- a/app-mini/src/main/res/values-cs/strings.xml
+++ b/app-mini/src/main/res/values-cs/strings.xml
@@ -17,8 +17,7 @@
<string name="menu_exit">Konec</string>
<string name="menu_scan">Skenovat QR kód bridge</string>
<string name="menu_share_bridge">SdÃlet QR kód bridge</string>
- <string name="btn_cancel">Zrušit</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Detaily o Orbotu</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">HlavnÃ</string>
diff --git a/app-mini/src/main/res/values-cy/strings.xml b/app-mini/src/main/res/values-cy/strings.xml
index a2495b99..a1c168d6 100644
--- a/app-mini/src/main/res/values-cy/strings.xml
+++ b/app-mini/src/main/res/values-cy/strings.xml
@@ -13,8 +13,7 @@
<string name="button_about">Amdanom ni</string>
<string name="menu_exit">Gadael</string>
<string name="btn_okay">Iawn</string>
- <string name="btn_cancel">Diddymu</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Rhai manylion am Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Cyffredinol</string>
diff --git a/app-mini/src/main/res/values-da/strings.xml b/app-mini/src/main/res/values-da/strings.xml
index fee2ae48..cd08b493 100644
--- a/app-mini/src/main/res/values-da/strings.xml
+++ b/app-mini/src/main/res/values-da/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Skan BridgeQR</string>
<string name="menu_share_bridge">Del BridgeQR</string>
<string name="btn_okay">Okay</string>
- <string name="btn_cancel">Fortryd</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Nogle Orbot detaljer</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Generelt</string>
diff --git a/app-mini/src/main/res/values-de/strings.xml b/app-mini/src/main/res/values-de/strings.xml
index 38f67706..839ce6d8 100644
--- a/app-mini/src/main/res/values-de/strings.xml
+++ b/app-mini/src/main/res/values-de/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">BrückenQR scannen</string>
<string name="menu_share_bridge">BrückenQR-Code teilen</string>
<string name="btn_okay">Okay</string>
- <string name="btn_cancel">Abbrechen</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Nähere Informationen zu Orbot</string>
<string name="wizard_details_msg">Orbot ist eine quelloffene Anwendung, die Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent und Polipo enthält. Sie stellt einen lokalen HTTP-Proxy (Port: 8118) und einen SOCKS-Proxy (Port: 9050) in das Tor-Netzwerk bereit. Auf gerooteten Geräten kann Orbot auch sämtliche Internetverbindungen durch Tor leiten.</string>
<!--END Welcome Wizard strings (DJH)-->
@@ -149,11 +148,9 @@
<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="filemanager_not_available">Dateimanager nicht verfügbar</string>
<string name="please_grant_permissions_for_external_storage">Bitte Zugriffsrechte auf externen Speicher gewähren</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="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>
diff --git a/app-mini/src/main/res/values-el/strings.xml b/app-mini/src/main/res/values-el/strings.xml
index 2c14872d..236827f3 100644
--- a/app-mini/src/main/res/values-el/strings.xml
+++ b/app-mini/src/main/res/values-el/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">ΣάÏωση BridgeQR</string>
<string name="menu_share_bridge">Κοινή χÏήση BridgeQR</string>
<string name="btn_okay">Okay</string>
- <string name="btn_cancel">ΆκυÏο</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">ΜεÏικÎÏ‚ λεπτομÎÏειες για το Orbot</string>
<string name="wizard_details_msg">Το Orbot είναι μια εφαÏμογή Î±Î½Î¿Î¹ÎºÏ„Î¿Ï Î»Î¿Î³Î¹ÏƒÎ¼Î¹ÎºÎ¿Ï Ï€Î¿Ï… πεÏιÎχει τα Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent καί Polipo. ΔιαθÎτει τοπικοÏÏ‚ πληÏεξοÏσιους διακομιστÎÏ‚ HTTP (8118) και SOCKS (9050) για το δίκτυο Tor. Σε συσκευÎÏ‚ που Îχουν διαμοÏφωθεί για Ïιζική χÏήση, το Orbot μποÏεί να μεταδίδει όλη την διαδυκτιακή κυκλοφοÏία μÎσω Tor.</string>
<!--END Welcome Wizard strings (DJH)-->
@@ -149,11 +148,9 @@
<string name="delete_service">ΔιαγÏαφή υπηÏεσίας</string>
<string name="backup_saved_at_external_storage">Το αντίγÏάφο ασφαλείας αποθηκεÏθηκε σε εξωτεÏικό μÎσο αποθήκευσης</string>
<string name="backup_restored">Το αντίγÏαφο ασφαλείας επαναφÎÏθηκε</string>
- <string name="filemanager_not_available">Ο διαχειÏιστής αÏχείων δεν είναι διαθÎσιμος.</string>
<string name="please_grant_permissions_for_external_storage">ΠαÏακαλοÏμε να παÏαχωÏήσετε δικαιώματα για εξωτεÏική αποθήκευση</string>
<string name="restore_backup">ΕπαναφοÏά αντιγÏάφου ασφαλείας</string>
- <string name="create_a_backup_first">ΔημιουÏγήστε Ï€Ïώτα Îνα αντίγÏαφο ασφαλείας </string>
- <string name="name_can_t_be_empty">Το όνομα δεν γίνεται να είναι κενό</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>
diff --git a/app-mini/src/main/res/values-en-rGB/strings.xml b/app-mini/src/main/res/values-en-rGB/strings.xml
index 93491249..e3cd2e29 100644
--- a/app-mini/src/main/res/values-en-rGB/strings.xml
+++ b/app-mini/src/main/res/values-en-rGB/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Scan BridgeQR</string>
<string name="menu_share_bridge">Share BridgeQR</string>
<string name="btn_okay">Okay</string>
- <string name="btn_cancel">Cancel</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Some Orbot Details</string>
<string name="wizard_details_msg">Orbot is an open-source application that contains Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent and Polipo. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app-mini/src/main/res/values-eo/strings.xml b/app-mini/src/main/res/values-eo/strings.xml
index 431e87e9..488fdda3 100644
--- a/app-mini/src/main/res/values-eo/strings.xml
+++ b/app-mini/src/main/res/values-eo/strings.xml
@@ -13,8 +13,7 @@
<string name="main_layout_upload">AlÅutado</string>
<string name="button_about">Pri</string>
<string name="menu_exit">Eliri</string>
- <string name="btn_cancel">Rezigni</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Kelkaj Detaloj pri Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Äœenerala</string>
diff --git a/app-mini/src/main/res/values-es-rAR/strings.xml b/app-mini/src/main/res/values-es-rAR/strings.xml
index be7922cc..709fa574 100644
--- a/app-mini/src/main/res/values-es-rAR/strings.xml
+++ b/app-mini/src/main/res/values-es-rAR/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Escanea código QR</string>
<string name="menu_share_bridge">Compartir el código QR</string>
<string name="btn_okay">Ok</string>
- <string name="btn_cancel">Cancelar</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Algunos detalles de Orbot</string>
<string name="wizard_details_msg">Orbot es una aplicación de código abierto que contiene Tor, Obfs4Proxy, BadVPN, Tun2Socks, LibEvent y Polipo. Proporciona un proxy local HTTP (8118) y un proxy SOCKS (9050) adentro de la red de Tor. Orbot también tiene la habilidad, en dispositivos ruteados, de enviar todo el trafico de Internet a través de Tor</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app-mini/src/main/res/values-es/strings.xml b/app-mini/src/main/res/values-es/strings.xml
index 37818dd5..e983e86b 100644
--- a/app-mini/src/main/res/values-es/strings.xml
+++ b/app-mini/src/main/res/values-es/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Escanear QR de bridge</string>
<string name="menu_share_bridge">Compartir QR de bridge</string>
<string name="btn_okay">Aceptar</string>
- <string name="btn_cancel">Cancelar</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Algunos detalles de Orbot</string>
<string name="wizard_details_msg">Orbot es una aplicación de código abierto que contiene Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent y Polipo. Proporciona un proxy HTTP (8118) y un proxy SOCKS (9050) hacia el interior de la red Tor. En una maquina rooteada, Orbot también tiene la capacidad de enviar todo el tráfico de Internet a través de Tor.</string>
<!--END Welcome Wizard strings (DJH)-->
@@ -150,11 +149,9 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
<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="filemanager_not_available">Administrador de ficheros no disponible</string>
<string name="please_grant_permissions_for_external_storage">Por favor, conceda permisos para almacenamiento externo</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="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>
diff --git a/app-mini/src/main/res/values-et/strings.xml b/app-mini/src/main/res/values-et/strings.xml
index cb35e1b9..a3c8da10 100644
--- a/app-mini/src/main/res/values-et/strings.xml
+++ b/app-mini/src/main/res/values-et/strings.xml
@@ -16,8 +16,7 @@
<string name="button_about">Lähemalt</string>
<string name="menu_exit">Välja</string>
<string name="btn_okay">Hea küll</string>
- <string name="btn_cancel">Katkesta</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Mõned Orbot\'i detailid</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Ãœldist</string>
diff --git a/app-mini/src/main/res/values-eu/strings.xml b/app-mini/src/main/res/values-eu/strings.xml
index a0426fa2..7e96ed03 100644
--- a/app-mini/src/main/res/values-eu/strings.xml
+++ b/app-mini/src/main/res/values-eu/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Eskaneatu BridgeQR</string>
<string name="menu_share_bridge">Partekatu BridgeQR</string>
<string name="btn_okay">Ados</string>
- <string name="btn_cancel">Utzi</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Orbot xehetasun batzuk</string>
<string name="wizard_details_msg">Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent eta Polipo dituen kode irekiko aplikazio bat da Orbot. Tor sarera sartzeko HTTP proxya (8118) eta SOCKS proxya (9050) eskaintzen ditu. Rooteatutako gailuetan Orbot-ek interneteko trafiko guztia Tor bidez bidali dezake baita ere.</string>
<!--END Welcome Wizard strings (DJH)-->
@@ -149,11 +148,9 @@
<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="filemanager_not_available">Fitxategi kudeatzailea ez dago eskuragarri</string>
<string name="please_grant_permissions_for_external_storage">Eman kanpo biltegiratzerako baimena</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="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>
diff --git a/app-mini/src/main/res/values-fa/strings.xml b/app-mini/src/main/res/values-fa/strings.xml
index 44a68302..aeec4bc9 100644
--- a/app-mini/src/main/res/values-fa/strings.xml
+++ b/app-mini/src/main/res/values-fa/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">اسکن BridgeQR</string>
<string name="menu_share_bridge">اشتراک BridgeQR</string>
<string name="btn_okay">قبول</string>
- <string name="btn_cancel">لغو</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">برخی جزییات درباره اوربوت</string>
<string name="wizard_details_msg">اوربات نرم‌اÙزاری آزاد است Ú©Ù‡ شامل تور، Obfs4ProxyØŒ BadVPN Tun2SocksØŒ LibEvent Ùˆ پولیپو می‌شود. این نرم‌اÙزار یک اچ‌تی‌تی‌پی پراکسی (8118) Ùˆ ساکس (9050) Ù…ØÙ„ÛŒ روی شبکه تور Ùراهم می‌کند. همچنین اوربات می‌تواند روی دستگاه‌های روت شده، تمام تراÙیک اینترنت را ار تور عبور دهد.</string>
<!--END Welcome Wizard strings (DJH)-->
@@ -149,11 +148,9 @@
<string name="delete_service">Øذ٠سرویس</string>
<string name="backup_saved_at_external_storage">بک‌آپ در انباره خارجی ذخیره شد</string>
<string name="backup_restored">بک‌آپ بازگردانده شد</string>
- <string name="filemanager_not_available">Filemanager موجود نیست</string>
<string name="please_grant_permissions_for_external_storage">لطÙا به انباره خارجی اجازه دسترسی بدهید</string>
<string name="restore_backup">برگرداندن بک‌آپ</string>
- <string name="create_a_backup_first">اول یک نسخه بک‌آپ درست کنید</string>
- <string name="name_can_t_be_empty">نام نباید خالی باشد</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>
diff --git a/app-mini/src/main/res/values-fi/strings.xml b/app-mini/src/main/res/values-fi/strings.xml
index 9c0e1ce7..f0b183c5 100644
--- a/app-mini/src/main/res/values-fi/strings.xml
+++ b/app-mini/src/main/res/values-fi/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Skannaa sillan QR-koodi</string>
<string name="menu_share_bridge">Jaa sillan QR-koodi</string>
<string name="btn_okay">Selvä</string>
- <string name="btn_cancel">Peru</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Joitakin Orbotin lisätietoja</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Yleiset</string>
diff --git a/app-mini/src/main/res/values-fr-rFR/strings.xml b/app-mini/src/main/res/values-fr-rFR/strings.xml
index 66266b7e..ad7f5413 100644
--- a/app-mini/src/main/res/values-fr-rFR/strings.xml
+++ b/app-mini/src/main/res/values-fr-rFR/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Balayer un code QR de pont</string>
<string name="menu_share_bridge">Partager un code QR de pont</string>
<string name="btn_okay">OK</string>
- <string name="btn_cancel">Annuler</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Quelques détails sur Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Général</string>
diff --git a/app-mini/src/main/res/values-fr/strings.xml b/app-mini/src/main/res/values-fr/strings.xml
index 1dc1661c..e9297469 100644
--- a/app-mini/src/main/res/values-fr/strings.xml
+++ b/app-mini/src/main/res/values-fr/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Balayer un code QR de pont</string>
<string name="menu_share_bridge">Partager un code QR de pont</string>
<string name="btn_okay">OK</string>
- <string name="btn_cancel">Annuler</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Quelques détails sur Orbot</string>
<string name="wizard_details_msg">Orbot est une application à code source ouvert incluant Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent et Polipo. Elle fournit un mandataire local HTTP (8118) et un mandataire SOCKS (9050) vers le réseau Tor. Orbot a aussi la capacité, sur un appareil débridé, d’envoyer tout le trafic Internet par Tor.</string>
<!--END Welcome Wizard strings (DJH)-->
@@ -149,11 +148,9 @@
<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="filemanager_not_available">Le gestionnaire de fichiers n’est pas disponible</string>
<string name="please_grant_permissions_for_external_storage">Veuillez accorder les droits vers la mémoire externe</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="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>
diff --git a/app-mini/src/main/res/values-gl/strings.xml b/app-mini/src/main/res/values-gl/strings.xml
index 141d9222..e864f280 100644
--- a/app-mini/src/main/res/values-gl/strings.xml
+++ b/app-mini/src/main/res/values-gl/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Escanear BridgeQR</string>
<string name="menu_share_bridge">Compartir BridgeQR</string>
<string name="btn_okay">Aceptar</string>
- <string name="btn_cancel">Cancelar</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Algúns detalles sobre Orbot</string>
<string name="wizard_details_msg">Orbot é unha aplicación de código-aberto que contén a Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent e Polipo. Proporciona un proxy HTTP (8118) e un proxy SOCKS (9050) na rede Tor. Orbot tamén pode, nun dispositivo con acceso root, enviar todo o tráfico de internet a través de Tor.</string>
<!--END Welcome Wizard strings (DJH)-->
@@ -149,11 +148,9 @@
<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="filemanager_not_available">Xestor de ficheiros non dispoñible</string>
<string name="please_grant_permissions_for_external_storage">Por favor, conceda permiso para o almacenamento externo</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="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>
diff --git a/app-mini/src/main/res/values-gu-rIN/strings.xml b/app-mini/src/main/res/values-gu-rIN/strings.xml
index 67ff81c9..0fe1e9e1 100644
--- a/app-mini/src/main/res/values-gu-rIN/strings.xml
+++ b/app-mini/src/main/res/values-gu-rIN/strings.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string name="btn_cancel">રદ કરો</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<!--New Wizard Strings-->
<!--Title Screen-->
diff --git a/app-mini/src/main/res/values-gu/strings.xml b/app-mini/src/main/res/values-gu/strings.xml
index f04f4533..66c75961 100644
--- a/app-mini/src/main/res/values-gu/strings.xml
+++ b/app-mini/src/main/res/values-gu/strings.xml
@@ -3,8 +3,7 @@
<string name="menu_settings">સેટિંગà«àª¸</string>
<string name="menu_log">નોંધણી</string>
<string name="btn_okay">બરાબર</string>
- <string name="btn_cancel">રદૠકરો</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<!--New Wizard Strings-->
<!--Title Screen-->
diff --git a/app-mini/src/main/res/values-he/strings.xml b/app-mini/src/main/res/values-he/strings.xml
index b85080a1..61047bd7 100644
--- a/app-mini/src/main/res/values-he/strings.xml
+++ b/app-mini/src/main/res/values-he/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">סרוק BridgeQR</string>
<string name="menu_share_bridge">שתף BridgeQR</string>
<string name="btn_okay">×ישור</string>
- <string name="btn_cancel">ביטול</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">×¤×¨×˜×™× ×ž×¡×•×™×ž×™× ×©×œ Orbot </string>
<string name="wizard_details_msg">Orbot ×”×•× ×™×™×©×•× ×ž×§×•×¨Ö¾×¤×ª×•×— ×שר מכיל ×ת Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent ו-Polipo. ×”×•× ×ž×¡×¤×§ יפוי־כוח מקומי של HTTP (פתחה 8118) ויפוי־כוח SOCKS (פתחה 9050) לתוך רשת Tor. ל-Orbot יש ×’× ×ת היכולת, ×‘×ž×›×©×™×¨×™× ×¢× ×”×¨×©×ת שורש, לשלוח ×ת כל תעבורת ×”××™× ×˜×¨× ×˜ ב×מצעות Tor.</string>
<!--END Welcome Wizard strings (DJH)-->
@@ -149,11 +148,9 @@
<string name="delete_service">מחק שירות</string>
<string name="backup_saved_at_external_storage">גיבוי × ×©×ž×¨ ב×חסון ×—×™×¦×•× ×™</string>
<string name="backup_restored">גיבוי שוחזר</string>
- <string name="filemanager_not_available">×ž× ×”×œ ×§×‘×¦×™× ××™× ×• זמין</string>
<string name="please_grant_permissions_for_external_storage">×× × ×”×¢× ×§ הרש×ות עבור ×חסון ×—×™×¦×•× ×™</string>
<string name="restore_backup">שחזר גיבוי</string>
- <string name="create_a_backup_first">צור גיבוי תחילה</string>
- <string name="name_can_t_be_empty">×©× ××™× ×• יכול להיות ריק</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>
diff --git a/app-mini/src/main/res/values-hi/strings.xml b/app-mini/src/main/res/values-hi/strings.xml
index 97003b17..94c08db6 100644
--- a/app-mini/src/main/res/values-hi/strings.xml
+++ b/app-mini/src/main/res/values-hi/strings.xml
@@ -19,8 +19,7 @@
<string name="menu_scan">सà¥à¤•à¥ˆà¤¨ बà¥à¤°à¤¿à¤œ कà¥à¤¯à¥‚आर</string>
<string name="menu_share_bridge">शेयर बà¥à¤°à¤¿à¤œ QR</string>
<string name="btn_okay">ठीक है</string>
- <string name="btn_cancel">रदà¥à¤¦ करें </string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">कà¥à¤› औरबोट विवरण</string>
<string name="wizard_details_msg">ऑरबोट à¤à¤• ओपन-सोरà¥à¤¸ à¤à¤ªà¥à¤²à¤¿à¤•à¥‡à¤¶à¤¨ है जिसमें टोर, ओबफà¥à¤¸ 4 पà¥à¤°à¥‹à¤•à¥à¤¸à¥€, बैड वीपीà¤à¤¨ टोन 2 à¤à¤¸à¥‰à¤•à¥à¤¸, लिबवेवेंट और पोलीपो शामिल हैं। यह टो नेट नेटवरà¥à¤• में à¤à¤• सà¥à¤¥à¤¾à¤¨à¥€à¤¯ HTTP पà¥à¤°à¥‰à¤•à¥à¤¸à¥€ (8118) और à¤à¤• सॉकà¥à¤¸ पà¥à¤°à¥‰à¤•à¥à¤¸à¥€ (9050) पà¥à¤°à¤¦à¤¾à¤¨ करता है। ऑरबोट की à¤à¥€ कà¥à¤·à¤®à¤¤à¤¾ है, रूट डिवाइस पर, टो के माधà¥à¤¯à¤® से सà¤à¥€ इंटरनेट टà¥à¤°à¥ˆà¤«à¤¿à¤• à¤à¥‡à¤œà¤¨à¥‡ के लिà¤</string>
<!--END Welcome Wizard strings (DJH)-->
@@ -150,11 +149,9 @@
<string name="delete_service">सेवा हटाà¤à¤</string>
<string name="backup_saved_at_external_storage">बाहà¥à¤¯ संगà¥à¤°à¤¹à¤£ में बैकअप सहेजा गया</string>
<string name="backup_restored">बैकअप को पà¥à¤¨à¤°à¥à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ किया गया</string>
- <string name="filemanager_not_available">फाइलमैनेजर उपलबà¥à¤§ नहीं है</string>
<string name="please_grant_permissions_for_external_storage">कृपया बाहरी संगà¥à¤°à¤¹à¤£ के लिठअनà¥à¤®à¤¤à¤¿ दें</string>
<string name="restore_backup">बैकअप बहाल</string>
- <string name="create_a_backup_first">पहले बैकअप बनाà¤à¤‚</string>
- <string name="name_can_t_be_empty">नाम रिकà¥à¤¤ नहीं हो सकता</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>
diff --git a/app-mini/src/main/res/values-hr-rHR/strings.xml b/app-mini/src/main/res/values-hr-rHR/strings.xml
index ab067581..9ae7b133 100644
--- a/app-mini/src/main/res/values-hr-rHR/strings.xml
+++ b/app-mini/src/main/res/values-hr-rHR/strings.xml
@@ -4,8 +4,7 @@
<string name="menu_about">O</string>
<string name="button_about">O</string>
<string name="menu_exit">Izlaz</string>
- <string name="btn_cancel">Odustani</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Općenito</string>
<!--New Wizard Strings-->
diff --git a/app-mini/src/main/res/values-hr/strings.xml b/app-mini/src/main/res/values-hr/strings.xml
index 716bf82d..8d7d64a7 100644
--- a/app-mini/src/main/res/values-hr/strings.xml
+++ b/app-mini/src/main/res/values-hr/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Skeniraj BridgeQR</string>
<string name="menu_share_bridge">Podijeli BridgeQR</string>
<string name="btn_okay">U redu</string>
- <string name="btn_cancel">Odustani</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Detalji o Orbot-u</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Općenito</string>
diff --git a/app-mini/src/main/res/values-hu/strings.xml b/app-mini/src/main/res/values-hu/strings.xml
index 13ae04bf..b41c415c 100644
--- a/app-mini/src/main/res/values-hu/strings.xml
+++ b/app-mini/src/main/res/values-hu/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">BridgeQR szkennelése</string>
<string name="menu_share_bridge">BridgeQR megosztása</string>
<string name="btn_okay">OK</string>
- <string name="btn_cancel">Mégsem</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Néhány Orbot adat</string>
<string name="wizard_details_msg">Az Orbot egy nyilt forráskódú alkalmazás ami Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent és Polipo alkalmazásokat tartalmaz. Helyi HTTP proxyt (8118) és SOCKS proxyt (9050) biztosÃt a Tor hálózatba. Az Orbot továbbá képes arra, hogy rootolt eszközön a teljes internet forgalmat keresztül küldje a Tor-on.</string>
<!--END Welcome Wizard strings (DJH)-->
@@ -149,11 +148,9 @@
<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="filemanager_not_available">Fájlkezelő nem elérhető</string>
<string name="please_grant_permissions_for_external_storage">Kérjük adjon jogosultságot a külső tárhelyhez</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="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>
diff --git a/app-mini/src/main/res/values-hy-rAM/strings.xml b/app-mini/src/main/res/values-hy-rAM/strings.xml
index 808f972e..cd3998d4 100644
--- a/app-mini/src/main/res/values-hy-rAM/strings.xml
+++ b/app-mini/src/main/res/values-hy-rAM/strings.xml
@@ -4,8 +4,7 @@
<string name="menu_about">Õ„Õ¡Õ½Õ«Õ¶</string>
<string name="button_about">Õ„Õ¡Õ½Õ«Õ¶</string>
<string name="menu_exit">ÔµÕ¬Ö„</string>
- <string name="btn_cancel">Õ¥Õ²Õ¡Ö€Õ¯Õ¥Õ¬</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<!--New Wizard Strings-->
<!--Title Screen-->
diff --git a/app-mini/src/main/res/values-ia/strings.xml b/app-mini/src/main/res/values-ia/strings.xml
index c8208c36..e5eae55a 100644
--- a/app-mini/src/main/res/values-ia/strings.xml
+++ b/app-mini/src/main/res/values-ia/strings.xml
@@ -4,8 +4,7 @@
<string name="menu_about">Circa</string>
<string name="button_about">Circa</string>
<string name="menu_exit">Sortir</string>
- <string name="btn_cancel">Cancellar</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">General</string>
<!--New Wizard Strings-->
diff --git a/app-mini/src/main/res/values-id/strings.xml b/app-mini/src/main/res/values-id/strings.xml
index dd856477..33770a27 100644
--- a/app-mini/src/main/res/values-id/strings.xml
+++ b/app-mini/src/main/res/values-id/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Pindai BridgeQR</string>
<string name="menu_share_bridge">Bagikan BridgeQR</string>
<string name="btn_okay">Oke</string>
- <string name="btn_cancel">Batal</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Beberapa Rincian Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Umum</string>
diff --git a/app-mini/src/main/res/values-in-rID/strings.xml b/app-mini/src/main/res/values-in-rID/strings.xml
index 2f04fd97..e1dbef8b 100644
--- a/app-mini/src/main/res/values-in-rID/strings.xml
+++ b/app-mini/src/main/res/values-in-rID/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Pindai BridgeQR</string>
<string name="menu_share_bridge">Bagikan BridgeQR</string>
<string name="btn_okay">Oke</string>
- <string name="btn_cancel">Batal</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Beberapa Rincian Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Umum</string>
diff --git a/app-mini/src/main/res/values-in/strings.xml b/app-mini/src/main/res/values-in/strings.xml
index 2026ca19..0c86a753 100644
--- a/app-mini/src/main/res/values-in/strings.xml
+++ b/app-mini/src/main/res/values-in/strings.xml
@@ -10,8 +10,7 @@
<string name="menu_about">Mengenai</string>
<string name="button_about">Mengenai</string>
<string name="menu_exit">Keluar</string>
- <string name="btn_cancel">Batal</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Umum</string>
<!--New Wizard Strings-->
diff --git a/app-mini/src/main/res/values-is/strings.xml b/app-mini/src/main/res/values-is/strings.xml
index d95a67ca..f96562a5 100644
--- a/app-mini/src/main/res/values-is/strings.xml
+++ b/app-mini/src/main/res/values-is/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Skanna BridgeQR</string>
<string name="menu_share_bridge">Deila BridgeQR</string>
<string name="btn_okay">Ã lagi</string>
- <string name="btn_cancel">Hætta við</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Fáein nánari atriði um Orbot</string>
<string name="wizard_details_msg">Orbot er opinn og frjáls hugbúnaður sem inniheldur Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent og Polipo. Það sér um að útbúa staðværan HTTP-milliþjón (8118) og SOCKS-milliþjón (9050) inn á Tor-netið. Orbot getur einnig, á tækjum með rótaraðgangi, sent alla internetumferð à gegnum Tor.</string>
<!--END Welcome Wizard strings (DJH)-->
@@ -149,11 +148,9 @@
<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="filemanager_not_available">Skráastjóri ekki tiltækur</string>
<string name="please_grant_permissions_for_external_storage">Gefðu heimild til að nota ytri gagnageymslu</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="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>
diff --git a/app-mini/src/main/res/values-it/strings.xml b/app-mini/src/main/res/values-it/strings.xml
index cc465417..34b6d8bb 100644
--- a/app-mini/src/main/res/values-it/strings.xml
+++ b/app-mini/src/main/res/values-it/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Scansiona BridgeQR</string>
<string name="menu_share_bridge">Condividi BridgeQR</string>
<string name="btn_okay">Ok</string>
- <string name="btn_cancel">Annulla</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Alcuni dettagli su Orbot</string>
<string name="wizard_details_msg">Orbot é un\'applicazione open source che contiene Tor, Obfs4proxy, BadVPN, Tun2Socks, LibEvent e Polipo. Esso fornisce un proxy HTTP locale (8118) e un proxy SOCKS (9050) per la rete Tor. Orbot permette anche, nei dispositivi rootati, di inviare tutto il traffico tramite Tor.</string>
<!--END Welcome Wizard strings (DJH)-->
@@ -149,11 +148,9 @@
<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="filemanager_not_available">Filemanager non disponibile</string>
<string name="please_grant_permissions_for_external_storage">Consenti l\'autorizzazione per l\'archiviazione esterna</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="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>
diff --git a/app-mini/src/main/res/values-iw/strings.xml b/app-mini/src/main/res/values-iw/strings.xml
index 69da2e40..e8dbb353 100644
--- a/app-mini/src/main/res/values-iw/strings.xml
+++ b/app-mini/src/main/res/values-iw/strings.xml
@@ -17,8 +17,7 @@
<string name="menu_scan">סרוק BridgeQR</string>
<string name="menu_share_bridge">שתף BridgeQR</string>
<string name="btn_okay">×ישור</string>
- <string name="btn_cancel">ביטול</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">×¤×¨×˜×™× ×ž×¡×•×™×ž×™× ×©×œ Orbot </string>
<string name="wizard_details_msg">Orbot ×”×™× ×פליקציית קוד פתוח הכוללת ×ת Tor, LibEvent ו-Polipo. ×”×™× ×ž×ª×—×‘×¨ לרשת Tor ב×מצעות שרת פרוקסי HTTP מקומי (8118) ושרת פרוקסי SOCKS (פורט 9050). Orbot יכולה ×‘× ×•×¡×£ ×¢× ×”×¨×©×ות רוט ×œ× ×ª×‘ ×ת כל תעבורת ×”××™× ×˜×¨× ×˜ של המכשיר דרך Tor כברירת מחדל.</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app-mini/src/main/res/values-ja/strings.xml b/app-mini/src/main/res/values-ja/strings.xml
index 20e2182c..2153c958 100644
--- a/app-mini/src/main/res/values-ja/strings.xml
+++ b/app-mini/src/main/res/values-ja/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">ブリッジQRをスã‚ャン</string>
<string name="menu_share_bridge">ブリッジQRを共有</string>
<string name="btn_okay">OK</string>
- <string name="btn_cancel">ã‚ャンセル</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Orbot詳細</string>
<string name="wizard_details_msg">Orbot ã¯Torã€Obfs4Proxyã€BadVPN Tun2Socksã€LibEventã€Polipoã‚’å«ã‚€ã‚ªãƒ¼ãƒ—ンソースアプリã§ã™ã€‚ãƒãƒ¼ã‚«ãƒ«HTTPプãƒã‚ã‚· (8118) 㨠SOCKSプãƒã‚ã‚· (9050) ã‚’Torãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«æŽ¥ç¶šã—ã¾ã™ã€‚root化ã•ã‚ŒãŸç«¯æœ«ã§ã¯Orbotã¯å…¨ã¦ã®é€šä¿¡ã‚’Torを通ã—ã¦è¡Œã†ã“ã¨ã‚‚ã§ãã¾ã™ã€‚</string>
<!--END Welcome Wizard strings (DJH)-->
@@ -149,11 +148,9 @@
<string name="delete_service">サービスを削除</string>
<string name="backup_saved_at_external_storage">ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã¯å¤–部記憶装置ã«ä¿å˜ã•ã‚Œã¾ã—ãŸ</string>
<string name="backup_restored">ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã‹ã‚‰å¾©å…ƒ</string>
- <string name="filemanager_not_available">該当ファイル・マãƒãƒ¼ã‚¸ãƒ£ãƒ¼ãªã—</string>
<string name="please_grant_permissions_for_external_storage">外部記憶ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹è¨±å¯ã‚’与ãˆã¦ä¸‹ã•ã„。</string>
<string name="restore_backup">ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã®å¾©æ—§</string>
- <string name="create_a_backup_first">最åˆã«ã€ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—を作æˆã—ã¦ä¸‹ã•ã„</string>
- <string name="name_can_t_be_empty">åå‰ã¯ãƒ–ランクã®ã¾ã¾ã«ã§ãã¾ã›ã‚“</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>
diff --git a/app-mini/src/main/res/values-kn/strings.xml b/app-mini/src/main/res/values-kn/strings.xml
index 5d222dbb..98f27eb6 100644
--- a/app-mini/src/main/res/values-kn/strings.xml
+++ b/app-mini/src/main/res/values-kn/strings.xml
@@ -3,8 +3,7 @@
<string name="app_name">ಆರà³à²¬à³‹à²Ÿà³</string>
<string name="menu_about">ಬಗà³à²—ೆ</string>
<string name="button_about">ಬಗà³à²—ೆ</string>
- <string name="btn_cancel">Cancel</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<!--New Wizard Strings-->
<!--Title Screen-->
diff --git a/app-mini/src/main/res/values-ko/strings.xml b/app-mini/src/main/res/values-ko/strings.xml
index ebe7da69..d064dbf0 100644
--- a/app-mini/src/main/res/values-ko/strings.xml
+++ b/app-mini/src/main/res/values-ko/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">브릿지 QR코드 스캔하기</string>
<string name="menu_share_bridge">브릿지 QR코드 ê³µìœ í•˜ê¸°</string>
<string name="btn_okay">확ì¸</string>
- <string name="btn_cancel">취소</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Orbotì— ëŒ€í•œ 몇몇 ìƒì„¸ì‚¬í•</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">ì¼ë°˜</string>
diff --git a/app-mini/src/main/res/values-ky/strings.xml b/app-mini/src/main/res/values-ky/strings.xml
index f63feabf..57a3ca97 100644
--- a/app-mini/src/main/res/values-ky/strings.xml
+++ b/app-mini/src/main/res/values-ky/strings.xml
@@ -5,8 +5,7 @@
<string name="menu_about">Программа жөнүндө</string>
<string name="button_about">Программа жөнүндө</string>
<string name="menu_exit">Чыгуу</string>
- <string name="btn_cancel">Ðйнуу</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<!--New Wizard Strings-->
<!--Title Screen-->
diff --git a/app-mini/src/main/res/values-lt/strings.xml b/app-mini/src/main/res/values-lt/strings.xml
index a411d355..a04b3659 100644
--- a/app-mini/src/main/res/values-lt/strings.xml
+++ b/app-mini/src/main/res/values-lt/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Nuskaityti tilto QR kodÄ…</string>
<string name="menu_share_bridge">Dalintis tilto QR kodu</string>
<string name="btn_okay">Gerai</string>
- <string name="btn_cancel">Atsisakyti</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Orbot detalÄ—s</string>
<string name="wizard_details_msg">Orbot yra atviro kodo programėlė, kuri susideda iš Tor, Obfs4Proxy, BadVPN, Tun2Socks, LibEvent ir Polipo. Ji leidžia jungtis prie Tor tinklo per HTTP (8118) ir SOCKS (9050) tarpinius serverius. Orbot taip pat leidžia perkelti visą tinklo srautą per Tor tinklą, jeigu turite root/supernaudotojo privilegijas.</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app-mini/src/main/res/values-lv/strings.xml b/app-mini/src/main/res/values-lv/strings.xml
index 2d33f419..c8f912f7 100644
--- a/app-mini/src/main/res/values-lv/strings.xml
+++ b/app-mini/src/main/res/values-lv/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Skenēt BridgeQR</string>
<string name="menu_share_bridge">Koplietot BridgeQR</string>
<string name="btn_okay">Labi</string>
- <string name="btn_cancel">Atcelt</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">VairÄk informÄcijas par Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">VispÄrÄ«gi</string>
diff --git a/app-mini/src/main/res/values-mk/strings.xml b/app-mini/src/main/res/values-mk/strings.xml
index 5e5a7db1..3e5f07cf 100644
--- a/app-mini/src/main/res/values-mk/strings.xml
+++ b/app-mini/src/main/res/values-mk/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Скенирај QR на моÑÑ‚</string>
<string name="menu_share_bridge">Сподели QR на моÑÑ‚</string>
<string name="btn_okay">OK</string>
- <string name="btn_cancel">Откажи</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Ðеколку детали за Orbot</string>
<string name="wizard_details_msg">Orbot e апликација Ñо отворен код која Ñодржи Tor Obfs4Proxy, BadVPN Tun2Socks, LibEvent и Polipo. Овозможува локален HTTP прокÑи (8118) и SOCKS прокÑи (9050) во Tor мрежата. Orbot иÑто така има можноÑÑ‚, на уред Ñо root приÑтап, да го иÑпраќа целиот интернет Ñообраќај преку Tor.</string>
<!--END Welcome Wizard strings (DJH)-->
@@ -149,11 +148,9 @@
<string name="delete_service">Избриши уÑлуга</string>
<string name="backup_saved_at_external_storage">Резервната копија е Ñнимена на надворешна меморија</string>
<string name="backup_restored">Вратено од резервна копија</string>
- <string name="filemanager_not_available">Менаџерот на датотеки не е доÑтапен</string>
<string name="please_grant_permissions_for_external_storage">Ве молиме дадете дозволи за надворешна меморија</string>
<string name="restore_backup">Врати резервна копија</string>
- <string name="create_a_backup_first">Создади резервна копија</string>
- <string name="name_can_t_be_empty">Името не може да биде празно</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>
diff --git a/app-mini/src/main/res/values-ml/strings.xml b/app-mini/src/main/res/values-ml/strings.xml
index 0a582739..155a8a8c 100644
--- a/app-mini/src/main/res/values-ml/strings.xml
+++ b/app-mini/src/main/res/values-ml/strings.xml
@@ -4,8 +4,7 @@
<string name="menu_stop">നിരàµâ€à´¤àµà´¤àµà´•</string>
<string name="menu_about">വിവരം</string>
<string name="button_about">വിവരം</string>
- <string name="btn_cancel">റദàµà´¦à´¾à´•àµà´•àµà´• </string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">പൊതàµà´µà´¾à´¯à´¤àµ</string>
<!--New Wizard Strings-->
diff --git a/app-mini/src/main/res/values-mn/strings.xml b/app-mini/src/main/res/values-mn/strings.xml
index 29345090..dd5db5b3 100644
--- a/app-mini/src/main/res/values-mn/strings.xml
+++ b/app-mini/src/main/res/values-mn/strings.xml
@@ -2,8 +2,7 @@
<resources>
<string name="menu_about">Тухай</string>
<string name="button_about">Тухай</string>
- <string name="btn_cancel">Cancel</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<!--New Wizard Strings-->
<!--Title Screen-->
diff --git a/app-mini/src/main/res/values-ms-rMY/strings.xml b/app-mini/src/main/res/values-ms-rMY/strings.xml
index c54e9654..071423e6 100644
--- a/app-mini/src/main/res/values-ms-rMY/strings.xml
+++ b/app-mini/src/main/res/values-ms-rMY/strings.xml
@@ -14,8 +14,7 @@
<string name="button_about">Tentang</string>
<string name="menu_exit">Keluar</string>
<string name="btn_okay">Okay</string>
- <string name="btn_cancel">Batal</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Maklumat Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Umum</string>
diff --git a/app-mini/src/main/res/values-ms/strings.xml b/app-mini/src/main/res/values-ms/strings.xml
index da8195c5..c72da21c 100644
--- a/app-mini/src/main/res/values-ms/strings.xml
+++ b/app-mini/src/main/res/values-ms/strings.xml
@@ -13,8 +13,7 @@
<string name="button_about">Tentang</string>
<string name="menu_exit">Keluar</string>
<string name="btn_okay">Okay</string>
- <string name="btn_cancel">Batal</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Maklumat Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Umum</string>
diff --git a/app-mini/src/main/res/values-my/strings.xml b/app-mini/src/main/res/values-my/strings.xml
index 6f1e25b9..f307da9f 100644
--- a/app-mini/src/main/res/values-my/strings.xml
+++ b/app-mini/src/main/res/values-my/strings.xml
@@ -7,8 +7,7 @@
<string name="main_layout_download">ဒေါင်းလုဒ်</string>
<string name="button_about">အကြောင်း</string>
<string name="menu_exit">ထွက်ရန်</string>
- <string name="btn_cancel">ဖျက်သá€á€™á€ºá€¸á€›á€”်</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">ယေဘုယျ</string>
<!--New Wizard Strings-->
diff --git a/app-mini/src/main/res/values-nb/strings.xml b/app-mini/src/main/res/values-nb/strings.xml
index af3cbc84..c5692a6d 100644
--- a/app-mini/src/main/res/values-nb/strings.xml
+++ b/app-mini/src/main/res/values-nb/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Skann BridgeQR</string>
<string name="menu_share_bridge">Del BridgeQR</string>
<string name="btn_okay">Ok</string>
- <string name="btn_cancel">Avbryt</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Noen Orbot-detaljer</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Generelt</string>
@@ -143,8 +142,7 @@
<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="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>
diff --git a/app-mini/src/main/res/values-nl/strings.xml b/app-mini/src/main/res/values-nl/strings.xml
index c2e7b130..9bc94cf5 100644
--- a/app-mini/src/main/res/values-nl/strings.xml
+++ b/app-mini/src/main/res/values-nl/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">BridgeQR scannen</string>
<string name="menu_share_bridge">BridgeQR delen</string>
<string name="btn_okay">Oké</string>
- <string name="btn_cancel">Annuleren</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Enkele Orbot-gegevens</string>
<string name="wizard_details_msg">Orbot is een openbronapplicatie die Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent en Polipo bevat. Het creëert een lokale HTTP-proxy (8118) en een SOCKS-proxy (9050) naar het Tor-netwerk. Orbot heeft ook de mogelijkheid om al het internetverkeer over het Tor-netwerk te sturen.</string>
<!--END Welcome Wizard strings (DJH)-->
@@ -149,11 +148,9 @@
<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="filemanager_not_available">Bestandsbeheerder niet beschikbaar</string>
<string name="please_grant_permissions_for_external_storage">Verleen toestemmingen voor externe opslag</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="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>
diff --git a/app-mini/src/main/res/values-pa/strings.xml b/app-mini/src/main/res/values-pa/strings.xml
index 8b163418..c8ef4e30 100644
--- a/app-mini/src/main/res/values-pa/strings.xml
+++ b/app-mini/src/main/res/values-pa/strings.xml
@@ -4,8 +4,7 @@
<string name="menu_about">ਇਸ ਬਾਰੇ</string>
<string name="button_about">ਇਸ ਬਾਰੇ</string>
<string name="menu_exit">ਬੰਦ ਕਰੋ</string>
- <string name="btn_cancel">ਰੱਦ ਕਰੋ</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<!--New Wizard Strings-->
<!--Title Screen-->
diff --git a/app-mini/src/main/res/values-pl/strings.xml b/app-mini/src/main/res/values-pl/strings.xml
index ed7be6af..f2ce933a 100644
--- a/app-mini/src/main/res/values-pl/strings.xml
+++ b/app-mini/src/main/res/values-pl/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Skanuj BridgeQR</string>
<string name="menu_share_bridge">Podziel siÄ™ BridgeQR</string>
<string name="btn_okay">OK</string>
- <string name="btn_cancel">Anuluj</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Niektóre szczegóły o Orbocie</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Ogólne</string>
diff --git a/app-mini/src/main/res/values-ps/strings.xml b/app-mini/src/main/res/values-ps/strings.xml
index e832af24..12fa5a98 100644
--- a/app-mini/src/main/res/values-ps/strings.xml
+++ b/app-mini/src/main/res/values-ps/strings.xml
@@ -1,7 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="btn_cancel">Cancel</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<!--New Wizard Strings-->
<!--Title Screen-->
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 d9d09a2d..245010a7 100644
--- a/app-mini/src/main/res/values-pt-rBR/strings.xml
+++ b/app-mini/src/main/res/values-pt-rBR/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Escanear BridgeQR</string>
<string name="menu_share_bridge">Compartilhar BridgeQR</string>
<string name="btn_okay">Okay</string>
- <string name="btn_cancel">Cancelar</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Alguns detalhes do Orbot</string>
<string name="wizard_details_msg">Orbot é um software de código aberto que contem Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent e Polipo. Ele fornece um proxy local HTTP (8118) e um proxy SOCKS (9050) como acesso a rede Tor. Orbot também tem a habilidade, em dispositivos com acesso root, de enviar todo o trafego de Internet via rede Tor.</string>
<!--END Welcome Wizard strings (DJH)-->
@@ -149,11 +148,9 @@
<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="filemanager_not_available">Gerenciador de arquivos não está disponÃvel</string>
<string name="please_grant_permissions_for_external_storage">Por favor dê permissões ao armazenamento externo</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="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>
diff --git a/app-mini/src/main/res/values-pt-rPT/strings.xml b/app-mini/src/main/res/values-pt-rPT/strings.xml
index 2c05e1bd..31b869c8 100644
--- a/app-mini/src/main/res/values-pt-rPT/strings.xml
+++ b/app-mini/src/main/res/values-pt-rPT/strings.xml
@@ -20,8 +20,7 @@
<string name="menu_scan">Digitalizar BridgeQR</string>
<string name="menu_share_bridge">Partilhar BridgeQR</string>
<string name="btn_okay">Ok</string>
- <string name="btn_cancel">Cancelar</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Alguns Detalhes do Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Geral</string>
diff --git a/app-mini/src/main/res/values-pt/strings.xml b/app-mini/src/main/res/values-pt/strings.xml
index 461673a1..f10f226e 100644
--- a/app-mini/src/main/res/values-pt/strings.xml
+++ b/app-mini/src/main/res/values-pt/strings.xml
@@ -16,8 +16,7 @@
<string name="menu_scan">Digitalizar BridgeQR</string>
<string name="menu_share_bridge">Compartilhar BridgeQR</string>
<string name="btn_okay">OK</string>
- <string name="btn_cancel">Cancelar</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Alguns Detalhes do Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Geral</string>
diff --git a/app-mini/src/main/res/values-ro-rRO/strings.xml b/app-mini/src/main/res/values-ro-rRO/strings.xml
index dc8ae0d6..ab884808 100644
--- a/app-mini/src/main/res/values-ro-rRO/strings.xml
+++ b/app-mini/src/main/res/values-ro-rRO/strings.xml
@@ -4,8 +4,7 @@
<string name="menu_about">Despre</string>
<string name="button_about">Despre</string>
<string name="menu_exit">IeÅŸire</string>
- <string name="btn_cancel">Revocare</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">General</string>
<!--New Wizard Strings-->
diff --git a/app-mini/src/main/res/values-ro/strings.xml b/app-mini/src/main/res/values-ro/strings.xml
index a716dd16..c467b1e7 100644
--- a/app-mini/src/main/res/values-ro/strings.xml
+++ b/app-mini/src/main/res/values-ro/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Scanează BridgeQR</string>
<string name="menu_share_bridge">Distribuie BridgeQR</string>
<string name="btn_okay">Ok</string>
- <string name="btn_cancel">Revocare</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Detalii Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">General</string>
diff --git a/app-mini/src/main/res/values-rs-rAR/strings.xml b/app-mini/src/main/res/values-rs-rAR/strings.xml
index 50543e66..8926b94e 100644
--- a/app-mini/src/main/res/values-rs-rAR/strings.xml
+++ b/app-mini/src/main/res/values-rs-rAR/strings.xml
@@ -12,8 +12,7 @@
<string name="menu_about">Acerca de</string>
<string name="button_about">Acerca de</string>
<string name="menu_exit">Salir</string>
- <string name="btn_cancel">Cancelar</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">General</string>
<!--New Wizard Strings-->
diff --git a/app-mini/src/main/res/values-ru/strings.xml b/app-mini/src/main/res/values-ru/strings.xml
index df439aaa..e35abff7 100644
--- a/app-mini/src/main/res/values-ru/strings.xml
+++ b/app-mini/src/main/res/values-ru/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Сканировать QR-код моÑта</string>
<string name="menu_share_bridge">Опубликовать QR-код моÑта</string>
<string name="btn_okay">OK</string>
- <string name="btn_cancel">Отмена</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Ðекоторые ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ программе Orbot</string>
<string name="wizard_details_msg">Orbot — Ñто приложение Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¼ иÑходным кодом, которое Ñодержит Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent и Polipo. Оно предоÑтавлÑет локальный HTTP- (8118) и SOCKS-прокÑи (9050) в Ñеть Tor. Orbot также позволÑет на уÑтройÑтвах Ñ Ð¿Ñ€Ð°Ð²Ð°Ð¼Ð¸ root переÑылать веÑÑŒ интернет-трафик через Tor.</string>
<!--END Welcome Wizard strings (DJH)-->
@@ -149,11 +148,9 @@
<string name="delete_service">Удалить Ñлужбу</string>
<string name="backup_saved_at_external_storage">Ð ÐµÐ·ÐµÑ€Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ Ñохранена на внешнем хранилище</string>
<string name="backup_restored">ВоÑÑтановлено из резервной копии</string>
- <string name="filemanager_not_available">Файловый менеджер недоÑтупен</string>
<string name="please_grant_permissions_for_external_storage">ПредоÑтавьте Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð´Ð¾Ñтупа к внешнему хранилищу</string>
<string name="restore_backup">ВоÑÑтановить из копии</string>
- <string name="create_a_backup_first">Сначала Ñоздайте резервную копию</string>
- <string name="name_can_t_be_empty">Ð˜Ð¼Ñ Ð½Ðµ может быть пуÑтым</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>
diff --git a/app-mini/src/main/res/values-si-rLK/strings.xml b/app-mini/src/main/res/values-si-rLK/strings.xml
index 421a7b7d..c8a02b23 100644
--- a/app-mini/src/main/res/values-si-rLK/strings.xml
+++ b/app-mini/src/main/res/values-si-rLK/strings.xml
@@ -15,8 +15,7 @@
<string name="button_about">පිළිබද</string>
<string name="menu_exit">ඉවà¶à·Š වන්න</string>
<string name="btn_okay">එකගයි</string>
- <string name="btn_cancel">අවලංගු කරන්න</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Orbot පිළිබද ඇà¶à·à¶¸à·Š විස්à¶à¶» </string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">පොදු</string>
diff --git a/app-mini/src/main/res/values-sk/strings.xml b/app-mini/src/main/res/values-sk/strings.xml
index 2d5fbb15..4e9309b1 100644
--- a/app-mini/src/main/res/values-sk/strings.xml
+++ b/app-mini/src/main/res/values-sk/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Zoskenovať BridgeQR</string>
<string name="menu_share_bridge">Zdielať BridgeQR</string>
<string name="btn_okay">OK</string>
- <string name="btn_cancel">Zrušiť</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Niekoľko detailov o Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Všeobecné</string>
diff --git a/app-mini/src/main/res/values-sl/strings.xml b/app-mini/src/main/res/values-sl/strings.xml
index 6d1bc7e3..fc7daec8 100644
--- a/app-mini/src/main/res/values-sl/strings.xml
+++ b/app-mini/src/main/res/values-sl/strings.xml
@@ -14,8 +14,7 @@
<string name="button_about">O programu</string>
<string name="menu_exit">Izhod</string>
<string name="btn_okay">Potrdi</string>
- <string name="btn_cancel">Prekini</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Nekaj podrobnosti o Orbot-u</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Splošno</string>
diff --git a/app-mini/src/main/res/values-sn/strings.xml b/app-mini/src/main/res/values-sn/strings.xml
index 247cd012..150742c9 100644
--- a/app-mini/src/main/res/values-sn/strings.xml
+++ b/app-mini/src/main/res/values-sn/strings.xml
@@ -6,8 +6,7 @@
<string name="menu_about">Maererano</string>
<string name="button_about">Maererano</string>
<string name="menu_exit">Buda</string>
- <string name="btn_cancel">Kanzura</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<!--New Wizard Strings-->
<!--Title Screen-->
diff --git a/app-mini/src/main/res/values-sq/strings.xml b/app-mini/src/main/res/values-sq/strings.xml
index a54bdc79..36b853ea 100644
--- a/app-mini/src/main/res/values-sq/strings.xml
+++ b/app-mini/src/main/res/values-sq/strings.xml
@@ -10,8 +10,7 @@
<string name="button_about">Informacione</string>
<string name="menu_exit">Dil</string>
<string name="btn_okay">Ne rregul</string>
- <string name="btn_cancel">Anullo</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Disa detaje te Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Të Përgjithshme</string>
diff --git a/app-mini/src/main/res/values-sr/strings.xml b/app-mini/src/main/res/values-sr/strings.xml
index 34a5d0ba..cf542265 100644
--- a/app-mini/src/main/res/values-sr/strings.xml
+++ b/app-mini/src/main/res/values-sr/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Скенирај BridgeQR</string>
<string name="menu_share_bridge">Подели BridgeQR</string>
<string name="btn_okay">У реду</string>
- <string name="btn_cancel">Откажи</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Детаљи о Орботу</string>
<string name="wizard_details_msg">Орбот је апликација отвореног кода која Ñадржи Тор, Obfs4Proxy, BadVPN Tun2Socks, LibEvent и Polipo. Омогућава локални HTTP proxy (8118) и SOCKS proxy (9050) у Тор мрежу. Орбот такође има могућноÑÑ‚ да на рутованом уређају шаље Ñав интернет Ñаобраћај преко Тор-а.</string>
<!--END Welcome Wizard strings (DJH)-->
@@ -147,11 +146,9 @@
<string name="delete_service">Обриши УÑлугу</string>
<string name="backup_saved_at_external_storage">Резербна копија је Ñачувана на Ñпољној меморији</string>
<string name="backup_restored">Резервна копија је обновљена</string>
- <string name="filemanager_not_available">Менаџер фајлова није доÑтупан</string>
<string name="please_grant_permissions_for_external_storage">Молимо да дате дозволе за екÑтерно Ñкладиштење</string>
<string name="restore_backup">Обнови резервну копију</string>
- <string name="create_a_backup_first">Ðаправи резервну копију прво</string>
- <string name="name_can_t_be_empty">Име не може бити празно</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>
diff --git a/app-mini/src/main/res/values-sv/strings.xml b/app-mini/src/main/res/values-sv/strings.xml
index f997bbe3..0ff7349c 100644
--- a/app-mini/src/main/res/values-sv/strings.xml
+++ b/app-mini/src/main/res/values-sv/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Skanna BridgeQR</string>
<string name="menu_share_bridge">Dela BridgeQR</string>
<string name="btn_okay">Okej</string>
- <string name="btn_cancel">Avbryt</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Orbot-information</string>
<string name="wizard_details_msg">Orbot är ett program med öppen källkod som innehåller Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent och Polipo. Den tillhandahåller en lokal HTTP-proxy (8118) och en SOCKS-proxy (9050) i Tor-nätverket. Orbot har också förmågan att, på rotad enhet, skicka all internettrafik genom Tor.</string>
<!--END Welcome Wizard strings (DJH)-->
@@ -149,11 +148,9 @@
<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="filemanager_not_available">Filhanteraren är inte tillgänglig</string>
<string name="please_grant_permissions_for_external_storage">Bevilja tillstånd för extern lagring</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="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>
diff --git a/app-mini/src/main/res/values-ta/strings.xml b/app-mini/src/main/res/values-ta/strings.xml
index 71118110..fb6d59d4 100644
--- a/app-mini/src/main/res/values-ta/strings.xml
+++ b/app-mini/src/main/res/values-ta/strings.xml
@@ -17,8 +17,7 @@
<string name="menu_scan">ஸà¯à®•à¯‡à®©à¯ BridgeQR</string>
<string name="menu_share_bridge">BridgeQR பகிரà¯à®¨à¯à®¤à®¿à®Ÿà¯</string>
<string name="btn_okay">சரி</string>
- <string name="btn_cancel">ரதà¯à®¤à¯ செயà¯</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">ஆரà¯à®ªà®¾à®Ÿà¯ பறà¯à®±à®¿à®¯ தகவலà¯</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">பொதà¯</string>
diff --git a/app-mini/src/main/res/values-th/strings.xml b/app-mini/src/main/res/values-th/strings.xml
index 92ff3078..65d55211 100644
--- a/app-mini/src/main/res/values-th/strings.xml
+++ b/app-mini/src/main/res/values-th/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">สà¹à¸à¸™ BridgeQR</string>
<string name="menu_share_bridge">à¹à¸Šà¸£à¹Œ BridgeQR</string>
<string name="btn_okay">ตà¸à¸¥à¸‡</string>
- <string name="btn_cancel">ยà¸à¹€à¸¥à¸´à¸</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">รายละเà¸à¸µà¸¢à¸”เà¸à¸µà¹ˆà¸¢à¸§à¸à¸±à¸š Orbot</string>
<string name="wizard_details_msg">Orbot เป็นà¹à¸à¸›à¸žà¸¥à¸´à¹€à¸„ชันโà¸à¹€à¸žà¹ˆà¸™à¸‹à¸à¸£à¹Œà¸ªà¸—ี่ประà¸à¸à¸šà¸”้วย Tor, Obfs4Proxy, BadVPN, Tun2Socks, LibEvent à¹à¸¥à¸° Polipo โดย Orbot จะสร้างพร็à¸à¸à¸‹à¸µ (8118) à¹à¸¥à¸°à¸žà¸£à¹‡à¸à¸à¸‹à¸µ SOCKS (9050) ในเครื่à¸à¸‡ ภายในเครืà¸à¸‚่าย Tor Orbot ยังสามารถทำà¸à¸²à¸£à¸£à¸±à¸šà¸ªà¹ˆà¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¸—ั้งหมดส่งผ่าน Tor ได้บนà¸à¸¸à¸›à¸à¸£à¸“์ที่ได้ทำà¸à¸²à¸£ root à¹à¸¥à¹‰à¸§</string>
<!--END Welcome Wizard strings (DJH)-->
@@ -149,11 +148,9 @@
<string name="delete_service">บริà¸à¸²à¸£à¸¥à¸š</string>
<string name="backup_saved_at_external_storage">ข้à¸à¸¡à¸¹à¸¥à¸ªà¸³à¸£à¸à¸‡à¸šà¸±à¸™à¸—ึà¸à¸—ี่ที่เà¸à¹‡à¸šà¸‚้à¸à¸¡à¸¹à¸¥à¸ ายนà¸à¸</string>
<string name="backup_restored">คืนค่าข้à¸à¸¡à¸¹à¸¥à¸ªà¸³à¸£à¸à¸‡</string>
- <string name="filemanager_not_available">ไม่สามารถใช้ Filemanager ได้</string>
<string name="please_grant_permissions_for_external_storage">à¸à¸£à¸¸à¸“าà¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¹€à¸‚้าถึงที่เà¸à¹‡à¸šà¸‚้à¸à¸¡à¸¹à¸¥à¸ ายนà¸à¸</string>
<string name="restore_backup">คืนค่าข้à¸à¸¡à¸¹à¸¥à¸ªà¸³à¸£à¸à¸‡</string>
- <string name="create_a_backup_first">สร้างข้à¸à¸¡à¸¹à¸¥à¸ªà¸³à¸£à¸à¸‡à¸à¹ˆà¸à¸™</string>
- <string name="name_can_t_be_empty">ปล่à¸à¸¢à¸Šà¸·à¹ˆà¸à¹ƒà¸«à¹‰à¸§à¹ˆà¸²à¸‡à¹„ม่ได้</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>
diff --git a/app-mini/src/main/res/values-tl/strings.xml b/app-mini/src/main/res/values-tl/strings.xml
index 4e6adf2b..a7f6287f 100644
--- a/app-mini/src/main/res/values-tl/strings.xml
+++ b/app-mini/src/main/res/values-tl/strings.xml
@@ -15,8 +15,7 @@
<string name="menu_exit">Labasan</string>
<string name="menu_share_bridge">Ipamahagi ang BridgeQR</string>
<string name="btn_okay">Okay</string>
- <string name="btn_cancel">Kanselahin</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Ilang detalye sa Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Pangkalahatan</string>
diff --git a/app-mini/src/main/res/values-tr/strings.xml b/app-mini/src/main/res/values-tr/strings.xml
index 9c1b5df2..00351b51 100644
--- a/app-mini/src/main/res/values-tr/strings.xml
+++ b/app-mini/src/main/res/values-tr/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">QR kodu tara</string>
<string name="menu_share_bridge">QR kodu paylaÅŸ</string>
<string name="btn_okay">Tamam</string>
- <string name="btn_cancel">Ä°ptal</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Bazı Orbot Ayrıntıları</string>
<string name="wizard_details_msg">Orbot; Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent ve Polipo yapılarını kapsayan açık kaynaklı bir uygulamadır. Tor ağına bağlanmak için bir yerel HTTP vekil sunucu (8118) ve bir SOCKS vekil sunucu (9050) sağlar. Orbot ayrıca, rootlanmış aygıtlarda tüm İnternet trafiğini Tor üzerinden gönderebilir.</string>
<!--END Welcome Wizard strings (DJH)-->
@@ -149,11 +148,9 @@
<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="filemanager_not_available">Dosya tarayıcı kullanılamıyor</string>
<string name="please_grant_permissions_for_external_storage">Lütfen dış depolama için izinleri verin</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="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>
diff --git a/app-mini/src/main/res/values-uk/strings.xml b/app-mini/src/main/res/values-uk/strings.xml
index 0753a423..a18c7ffc 100644
--- a/app-mini/src/main/res/values-uk/strings.xml
+++ b/app-mini/src/main/res/values-uk/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Сканувати BridgeQR</string>
<string name="menu_share_bridge">ПоділитиÑÑ BridgeQR</string>
<string name="btn_okay">OK</string>
- <string name="btn_cancel">Відміна</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">ДеÑкі відомоÑÑ‚Ñ– про програму Orbot</string>
<string name="wizard_details_msg">Orbot — це програма з відкритим кодом, Ñка міÑтить Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent Ñ– Polipo. Він забезпечує локальний HTTP-прокÑÑ– (8118) та прокÑÑ– SOCKS (9050) у мережу Tor. Orbot також має здатніÑÑ‚ÑŒ, на кореневому приÑтрої, відправлÑти веÑÑŒ інтернет-трафік через Tor.</string>
<!--END Welcome Wizard strings (DJH)-->
@@ -149,11 +148,9 @@
<string name="delete_service">Вилучити СервіÑ</string>
<string name="backup_saved_at_external_storage">Резервна ÐºÐ¾Ð¿Ñ–Ñ Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð° на зовнішній пам\'ÑÑ‚Ñ–</string>
<string name="backup_restored">Резервне ÐºÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ð½Ð½Ñ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾</string>
- <string name="filemanager_not_available">Менеджер файлів недоÑтупний</string>
<string name="please_grant_permissions_for_external_storage">Ðадайте дозволи на зовнішню пам\'ÑÑ‚ÑŒ</string>
<string name="restore_backup">Відновити резервну копію</string>
- <string name="create_a_backup_first">Спершу Ñтворити резервну копію</string>
- <string name="name_can_t_be_empty">Ðазва не може бути порожньою</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>
diff --git a/app-mini/src/main/res/values-ur/strings.xml b/app-mini/src/main/res/values-ur/strings.xml
index 17c15bd2..a1e3111e 100644
--- a/app-mini/src/main/res/values-ur/strings.xml
+++ b/app-mini/src/main/res/values-ur/strings.xml
@@ -5,8 +5,7 @@
<string name="menu_start">شروع کرئیں</string>
<string name="menu_about">کے بارے میں</string>
<string name="button_about">کے بارے میں</string>
- <string name="btn_cancel">تنسیخ کیجیے</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">عام </string>
<!--New Wizard Strings-->
diff --git a/app-mini/src/main/res/values-uz/strings.xml b/app-mini/src/main/res/values-uz/strings.xml
index 470ee983..6bab2922 100644
--- a/app-mini/src/main/res/values-uz/strings.xml
+++ b/app-mini/src/main/res/values-uz/strings.xml
@@ -10,8 +10,7 @@
<string name="main_layout_upload">Yuklash</string>
<string name="button_about">Dasur haqida</string>
<string name="menu_exit">Chiqish</string>
- <string name="btn_cancel">Bekor qilish</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Umumiy</string>
<!--New Wizard Strings-->
diff --git a/app-mini/src/main/res/values-vi/strings.xml b/app-mini/src/main/res/values-vi/strings.xml
index e2976b05..1922a77f 100644
--- a/app-mini/src/main/res/values-vi/strings.xml
+++ b/app-mini/src/main/res/values-vi/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">Quét mã BridgeQR</string>
<string name="menu_share_bridge">Xuất mã BridgeQR</string>
<string name="btn_okay">Äồng ý</string>
- <string name="btn_cancel">Hủy</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Và i chi tiết vỠOrbot</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Tổng quát</string>
diff --git a/app-mini/src/main/res/values-zh-rCN/strings.xml b/app-mini/src/main/res/values-zh-rCN/strings.xml
index 30555dd5..87b84171 100644
--- a/app-mini/src/main/res/values-zh-rCN/strings.xml
+++ b/app-mini/src/main/res/values-zh-rCN/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">扫æ网桥QRç </string>
<string name="menu_share_bridge">分享网桥QRç </string>
<string name="btn_okay">确定</string>
- <string name="btn_cancel">å–消</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">更多 Orbot ä¿¡æ¯</string>
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">常规</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 946859a9..063813c8 100644
--- a/app-mini/src/main/res/values-zh-rTW/strings.xml
+++ b/app-mini/src/main/res/values-zh-rTW/strings.xml
@@ -18,8 +18,7 @@
<string name="menu_scan">掃æ網橋 QR 碼</string>
<string name="menu_share_bridge">分享網橋 QR 碼</string>
<string name="btn_okay">確定</string>
- <string name="btn_cancel">å–消</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Orbot 的一些詳細資料</string>
<string name="wizard_details_msg">Orbot 是一款開æºæ‡‰ç”¨,å…¶åŒ…å« Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent 與 Polipo.它æ供了本地的 HTTP ä»£ç† (8118) 與 SOCKS ä»£ç† (9050) 到 Tor 網路ä¸. Orbot 也有能力å¯åœ¨å–得最高權é™çš„è¨å‚™ä¸Šä¾†åˆ©ç”¨ Tor 傳é€äº’è¯ç¶²æµé‡</string>
<!--END Welcome Wizard strings (DJH)-->
@@ -149,11 +148,9 @@
<string name="delete_service">刪除æœå‹™</string>
<string name="backup_saved_at_external_storage">備份檔儲å˜åœ¨å¤–部儲å˜å™¨</string>
<string name="backup_restored">備份已還原</string>
- <string name="filemanager_not_available">檔案管ç†å“¡ä¸å¯ç”¨</string>
<string name="please_grant_permissions_for_external_storage">請授權外接儲å˜å™¨ä½¿ç”¨</string>
<string name="restore_backup">還原備份</string>
- <string name="create_a_backup_first">先創立備份</string>
- <string name="name_can_t_be_empty">å稱ä¸å¯ç©ºç™½</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>
diff --git a/app-mini/src/main/res/values/strings.xml b/app-mini/src/main/res/values/strings.xml
index 382dee6f..994e4ee3 100644
--- a/app-mini/src/main/res/values/strings.xml
+++ b/app-mini/src/main/res/values/strings.xml
@@ -18,7 +18,6 @@
<string name="menu_scan">Scan BridgeQR</string>
<string name="menu_share_bridge">Share BridgeQR</string>
<string name="btn_okay">Okay</string>
- <string name="btn_cancel">Cancel</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Some Orbot Details</string>
<string name="wizard_details_msg">Orbot is an open-source application that contains Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent and Polipo. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string>
@@ -188,10 +187,8 @@
<string name="delete_service">Delete Service</string>
<string name="backup_saved_at_external_storage">Backup saved at external storage</string>
<string name="backup_restored">Backup restored</string>
- <string name="filemanager_not_available">Filemanager not available</string>
<string name="please_grant_permissions_for_external_storage">Please grant permissions for external storage</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>
diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index 8c898fce..ec4ec498 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -972,7 +972,7 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan
.setIcon(R.drawable.onion32)
.setTitle(title)
.setMessage(msg)
- .setPositiveButton(R.string.btn_okay, null)
+ .setPositiveButton(android.R.string.ok, null)
.show();
} else {
aDialog = new AlertDialog.Builder(OrbotMainActivity.this)
diff --git a/app/src/main/java/org/torproject/android/ui/dialog/MoatErrorDialogFragment.java b/app/src/main/java/org/torproject/android/ui/dialog/MoatErrorDialogFragment.java
index ad8f9477..b1addb7d 100644
--- a/app/src/main/java/org/torproject/android/ui/dialog/MoatErrorDialogFragment.java
+++ b/app/src/main/java/org/torproject/android/ui/dialog/MoatErrorDialogFragment.java
@@ -26,7 +26,7 @@ public class MoatErrorDialogFragment extends DialogFragment {
return new AlertDialog.Builder(getContext())
.setTitle(R.string.error)
.setMessage(getArguments().getString(BUNDLE_KEY_MSG))
- .setNegativeButton(R.string.btn_okay, null)
+ .setNegativeButton(android.R.string.ok, null)
.create();
}
}
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java
index eca76b70..e3fbaeab 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java
@@ -9,22 +9,26 @@ import android.database.ContentObserver;
import android.database.Cursor;
import android.os.Bundle;
import android.os.Handler;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.ListView;
import android.widget.Toast;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
import com.google.zxing.integration.android.IntentIntegrator;
import com.google.zxing.integration.android.IntentResult;
+
import org.json.JSONException;
import org.json.JSONObject;
import org.torproject.android.R;
+import org.torproject.android.core.DiskUtils;
import org.torproject.android.core.LocaleHelper;
import org.torproject.android.ui.hiddenservices.adapters.ClientCookiesAdapter;
+import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
import org.torproject.android.ui.hiddenservices.dialogs.AddCookieDialog;
import org.torproject.android.ui.hiddenservices.dialogs.CookieActionsDialog;
-import org.torproject.android.ui.hiddenservices.dialogs.SelectCookieBackupDialog;
import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
@@ -50,10 +54,8 @@ public class ClientCookiesActivity extends AppCompatActivity {
dialog.show(getSupportFragmentManager(), "AddCookieDialog");
});
- mAdapter = new ClientCookiesAdapter(
- this,
- mResolver.query(CookieContentProvider.CONTENT_URI, CookieContentProvider.PROJECTION, null, null, null)
- , 0);
+ mAdapter = new ClientCookiesAdapter(this,
+ mResolver.query(CookieContentProvider.CONTENT_URI, CookieContentProvider.PROJECTION, null, null, null), 0);
mResolver.registerContentObserver(
CookieContentProvider.CONTENT_URI, true, new HSObserver(new Handler())
@@ -66,21 +68,11 @@ public class ClientCookiesActivity extends AppCompatActivity {
Cursor item = (Cursor) parent.getItemAtPosition(position);
Bundle arguments = new Bundle();
- arguments.putInt(
- "_id", item.getInt(item.getColumnIndex(CookieContentProvider.ClientCookie._ID))
- );
-
- arguments.putString(
- "domain", item.getString(item.getColumnIndex(CookieContentProvider.ClientCookie.DOMAIN))
- );
+ arguments.putInt("_id", item.getInt(item.getColumnIndex(CookieContentProvider.ClientCookie._ID)));
- arguments.putString(
- "auth_cookie_value", item.getString(item.getColumnIndex(CookieContentProvider.ClientCookie.AUTH_COOKIE_VALUE))
- );
-
- arguments.putInt(
- "enabled", item.getInt(item.getColumnIndex(CookieContentProvider.ClientCookie.ENABLED))
- );
+ arguments.putString("domain", item.getString(item.getColumnIndex(CookieContentProvider.ClientCookie.DOMAIN)));
+ arguments.putString("auth_cookie_value", item.getString(item.getColumnIndex(CookieContentProvider.ClientCookie.AUTH_COOKIE_VALUE)));
+ arguments.putInt("enabled", item.getInt(item.getColumnIndex(CookieContentProvider.ClientCookie.ENABLED)));
CookieActionsDialog dialog = new CookieActionsDialog();
dialog.setArguments(arguments);
@@ -101,6 +93,8 @@ public class ClientCookiesActivity extends AppCompatActivity {
return true;
}
+ private static final int REQUEST_CODE_READ_COOKIE = 54;
+
@Override
public boolean onOptionsItemSelected(MenuItem item) {
int id = item.getItemId();
@@ -112,8 +106,8 @@ public class ClientCookiesActivity extends AppCompatActivity {
return true;
}
- SelectCookieBackupDialog dialog = new SelectCookieBackupDialog();
- dialog.show(getSupportFragmentManager(), "SelectCookieBackupDialog");
+ Intent readCookieIntent = DiskUtils.createReadFileIntent("application/json");
+ startActivityForResult(readCookieIntent, REQUEST_CODE_READ_COOKIE);
} else if (id == R.id.cookie_from_qr) {
IntentIntegrator integrator = new IntentIntegrator(ClientCookiesActivity.this);
@@ -124,24 +118,19 @@ public class ClientCookiesActivity extends AppCompatActivity {
}
@Override
- public void onRequestPermissionsResult(int requestCode,
- String[] permissions, int[] grantResults) {
+ public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
if (grantResults.length < 1
|| grantResults[0] != PackageManager.PERMISSION_GRANTED) {
return;
}
switch (requestCode) {
- case WRITE_EXTERNAL_STORAGE_FROM_COOKIE_ACTIONBAR: {
- SelectCookieBackupDialog dialog = new SelectCookieBackupDialog();
- dialog.show(getSupportFragmentManager(), "SelectCookieBackupDialog");
- break;
- }
case CookieActionsDialog.WRITE_EXTERNAL_STORAGE_FROM_COOKIE_ACTION_DIALOG: {
try {
CookieActionsDialog activeDialog = (CookieActionsDialog) getSupportFragmentManager().findFragmentByTag(CookieActionsDialog.class.getSimpleName());
activeDialog.doBackup();
- } catch (ClassCastException e) {}
+ } catch (ClassCastException e) {
+ }
break;
}
}
@@ -151,6 +140,14 @@ public class ClientCookiesActivity extends AppCompatActivity {
protected void onActivityResult(int request, int response, Intent data) {
super.onActivityResult(request, response, data);
+ if (request == REQUEST_CODE_READ_COOKIE) {
+ if (response != RESULT_OK) return;
+ String cookieStr = DiskUtils.readFileFromInputStream(getContentResolver(), data.getData());
+ BackupUtils backup = new BackupUtils(this);
+ backup.restoreCookieBackup(cookieStr);
+ return;
+ }
+
IntentResult scanResult = IntentIntegrator.parseActivityResult(request, response, data);
if (scanResult == null) return;
@@ -193,5 +190,4 @@ public class ClientCookiesActivity extends AppCompatActivity {
));
}
}
-
}
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java
index 13fb70bd..1a49dc0c 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java
@@ -1,20 +1,13 @@
package org.torproject.android.ui.hiddenservices;
-
import android.content.ContentResolver;
import android.content.Context;
+import android.content.Intent;
import android.content.pm.PackageManager;
import android.database.ContentObserver;
import android.database.Cursor;
import android.os.Bundle;
import android.os.Handler;
-
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-
-import androidx.core.view.MenuItemCompat;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
@@ -23,12 +16,19 @@ import android.widget.ArrayAdapter;
import android.widget.ListView;
import android.widget.Spinner;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.view.MenuItemCompat;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
import org.torproject.android.R;
+import org.torproject.android.core.DiskUtils;
import org.torproject.android.core.LocaleHelper;
import org.torproject.android.ui.hiddenservices.adapters.OnionListAdapter;
+import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
import org.torproject.android.ui.hiddenservices.dialogs.HSActionsDialog;
import org.torproject.android.ui.hiddenservices.dialogs.HSDataDialog;
-import org.torproject.android.ui.hiddenservices.dialogs.SelectHSBackupDialog;
import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
@@ -59,15 +59,10 @@ public class HiddenServicesActivity extends AppCompatActivity {
mAdapter = new OnionListAdapter(
this,
- mResolver.query(
- HSContentProvider.CONTENT_URI, HSContentProvider.PROJECTION, mWhere, null, null
- ),
- 0
- );
+ mResolver.query(HSContentProvider.CONTENT_URI, HSContentProvider.PROJECTION, mWhere, null, null),
+ 0);
- mResolver.registerContentObserver(
- HSContentProvider.CONTENT_URI, true, new HSObserver(new Handler())
- );
+ mResolver.registerContentObserver(HSContentProvider.CONTENT_URI, true, new HSObserver(new Handler()));
ListView onion_list = findViewById(R.id.onion_list);
onion_list.setAdapter(mAdapter);
@@ -76,25 +71,11 @@ public class HiddenServicesActivity extends AppCompatActivity {
Cursor item = (Cursor) parent.getItemAtPosition(position);
Bundle arguments = new Bundle();
- arguments.putInt(
- "_id", item.getInt(item.getColumnIndex(HSContentProvider.HiddenService._ID))
- );
-
- arguments.putString(
- "port", item.getString(item.getColumnIndex(HSContentProvider.HiddenService.PORT))
- );
-
- arguments.putString(
- "onion", item.getString(item.getColumnIndex(HSContentProvider.HiddenService.DOMAIN))
- );
-
- arguments.putInt(
- "auth_cookie", item.getInt(item.getColumnIndex(HSContentProvider.HiddenService.AUTH_COOKIE))
- );
-
- arguments.putString(
- "auth_cookie_value", item.getString(item.getColumnIndex(HSContentProvider.HiddenService.AUTH_COOKIE_VALUE))
- );
+ arguments.putInt("_id", item.getInt(item.getColumnIndex(HSContentProvider.HiddenService._ID)));
+ arguments.putString("port", item.getString(item.getColumnIndex(HSContentProvider.HiddenService.PORT)));
+ arguments.putString("onion", item.getString(item.getColumnIndex(HSContentProvider.HiddenService.DOMAIN)));
+ arguments.putInt("auth_cookie", item.getInt(item.getColumnIndex(HSContentProvider.HiddenService.AUTH_COOKIE)));
+ arguments.putString("auth_cookie_value", item.getString(item.getColumnIndex(HSContentProvider.HiddenService.AUTH_COOKIE_VALUE)));
HSActionsDialog dialog = new HSActionsDialog();
dialog.setArguments(arguments);
@@ -115,15 +96,11 @@ public class HiddenServicesActivity extends AppCompatActivity {
MenuItem item = menu.findItem(R.id.hs_type);
Spinner spinner = (Spinner) MenuItemCompat.getActionView(item);
- ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(
- this, R.array.array_hs_types, android.R.layout.simple_spinner_item);
+ ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this, R.array.array_hs_types, android.R.layout.simple_spinner_item);
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-
spinner.setAdapter(adapter);
-
spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-
@Override
public void onItemSelected(AdapterView<?> arg0, View v, int pos, long id) {
if (pos == 0) {
@@ -134,9 +111,7 @@ public class HiddenServicesActivity extends AppCompatActivity {
fab.hide();
}
- mAdapter.changeCursor(mResolver.query(
- HSContentProvider.CONTENT_URI, HSContentProvider.PROJECTION, mWhere, null, null
- ));
+ mAdapter.changeCursor(mResolver.query(HSContentProvider.CONTENT_URI, HSContentProvider.PROJECTION, mWhere, null, null));
}
@Override
@@ -148,6 +123,22 @@ public class HiddenServicesActivity extends AppCompatActivity {
return true;
}
+ private static final int REQUEST_CODE_READ_ZIP_BACKUP = 125;
+ private void doRestore() {
+ Intent readFile = DiskUtils.createReadFileIntent("application/zip");
+ startActivityForResult(readFile, REQUEST_CODE_READ_ZIP_BACKUP);
+ }
+
+ @Override
+ protected void onActivityResult(int request, int response, Intent data) {
+ super.onActivityResult(request, response, data);
+ if (request == REQUEST_CODE_READ_ZIP_BACKUP) {
+ if (response != RESULT_OK) return;
+ BackupUtils backupUtils = new BackupUtils(this);
+ backupUtils.restoreZipBackup(data.getData());
+ }
+ }
+
@Override
public boolean onOptionsItemSelected(MenuItem item) {
int id = item.getItemId();
@@ -159,25 +150,20 @@ public class HiddenServicesActivity extends AppCompatActivity {
return true;
}
- SelectHSBackupDialog dialog = new SelectHSBackupDialog();
- dialog.show(getSupportFragmentManager(), "SelectHSBackupDialog");
+ doRestore();
}
return super.onOptionsItemSelected(item);
}
@Override
- public void onRequestPermissionsResult(int requestCode,
- String[] permissions, int[] grantResults) {
- if (grantResults.length < 1
- || grantResults[0] != PackageManager.PERMISSION_GRANTED) {
+ public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+ if (grantResults.length < 1 || grantResults[0] != PackageManager.PERMISSION_GRANTED)
return;
- }
switch (requestCode) {
case WRITE_EXTERNAL_STORAGE_FROM_ACTIONBAR: {
- SelectHSBackupDialog dialog = new SelectHSBackupDialog();
- dialog.show(getSupportFragmentManager(), "SelectHSBackupDialog");
+ doRestore();
break;
}
case HSActionsDialog.WRITE_EXTERNAL_STORAGE_FROM_ACTION_DIALOG: {
@@ -198,14 +184,11 @@ public class HiddenServicesActivity extends AppCompatActivity {
@Override
public void onChange(boolean selfChange) {
- mAdapter.changeCursor(mResolver.query(
- HSContentProvider.CONTENT_URI, HSContentProvider.PROJECTION, mWhere, null, null
- ));
+ mAdapter.changeCursor(mResolver.query(HSContentProvider.CONTENT_URI, HSContentProvider.PROJECTION, mWhere, null, null));
if (PermissionManager.isLollipopOrHigher()) {
Cursor active = mResolver.query(
- HSContentProvider.CONTENT_URI, HSContentProvider.PROJECTION, HSContentProvider.HiddenService.ENABLED + "=1", null, null
- );
+ HSContentProvider.CONTENT_URI, HSContentProvider.PROJECTION, HSContentProvider.HiddenService.ENABLED + "=1", null, null);
if (active == null) return;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/BackupAdapter.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/BackupAdapter.java
deleted file mode 100644
index 1533f5b1..00000000
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/BackupAdapter.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.torproject.android.ui.hiddenservices.adapters;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.TextView;
-import org.torproject.android.R;
-
-import java.io.File;
-import java.util.List;
-
-public class BackupAdapter extends ArrayAdapter<File> {
- private int mResource;
-
- public BackupAdapter(Context context, int resource, List<File> zips) {
- super(context, resource, zips);
- mResource = resource;
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
-
- View v = convertView;
-
- if (v == null) {
- LayoutInflater vi;
- vi = LayoutInflater.from(getContext());
- v = vi.inflate(mResource, null);
- }
-
- File p = getItem(position);
-
- if (p != null) {
- TextView name = v.findViewById(R.id.backup_name);
-
- if (name != null)
- name.setText(p.getName());
- }
-
- return v;
- }
-}
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 45b07bf5..86fc80c6 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
@@ -6,14 +6,15 @@ import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
import android.os.ParcelFileDescriptor;
+import android.provider.OpenableColumns;
import android.widget.Toast;
+
import org.json.JSONException;
import org.json.JSONObject;
import org.torproject.android.R;
import org.torproject.android.service.TorServiceConstants;
import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
-import org.torproject.android.core.ExternalStorage;
import java.io.File;
import java.io.FileInputStream;
@@ -36,7 +37,7 @@ public class BackupUtils {
mResolver = mContext.getContentResolver();
}
- public String createZipBackup(Integer port) {
+ public String createZipBackup(int port, Uri zipFile) {
File mHSBasePath = new File(
mContext.getFilesDir().getAbsolutePath(),
TorServiceConstants.HIDDEN_SERVICES_DIR
@@ -46,11 +47,6 @@ public class BackupUtils {
String hostnameFilePath = mHSBasePath + "/hs" + port + "/hostname";
String keyFilePath = mHSBasePath + "/hs" + port + "/private_key";
- File storage_path = ExternalStorage.getOrCreateBackupDir();
-
- if (storage_path == null)
- return null;
-
Cursor portData = mResolver.query(
HSContentProvider.CONTENT_URI,
HSContentProvider.PROJECTION,
@@ -124,19 +120,16 @@ public class BackupUtils {
return null;
}
- String zip_path = storage_path.getAbsolutePath() + "/hs" + port + ".zip";
String[] files = {hostnameFilePath, keyFilePath, configFilePath};
-
- ZipIt zip = new ZipIt(files, zip_path);
+ ZipIt zip = new ZipIt(files, zipFile, mResolver);
if (!zip.zip())
return null;
- return zip_path;
+ return zipFile.getPath();
}
- public void restoreZipBackup(File backup) {
-
+ public void restoreZipBackup(Uri zipUri) {
File mHSBasePath = new File(
mContext.getFilesDir().getAbsolutePath(),
TorServiceConstants.HIDDEN_SERVICES_DIR
@@ -144,7 +137,13 @@ public class BackupUtils {
int port;
Cursor service;
- String backupName = backup.getName();
+
+ Cursor returnCursor = mResolver.query(zipUri, null, null, null, null);
+ int nameIndex = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
+ returnCursor.moveToFirst();
+ String backupName = returnCursor.getString(nameIndex);
+ returnCursor.close();
+
String hsDir = backupName.substring(0, backupName.lastIndexOf('.'));
String configFilePath = mHSBasePath + "/" + hsDir + "/" + configFileName;
String jString = null;
@@ -153,7 +152,7 @@ public class BackupUtils {
if (!hsPath.isDirectory())
hsPath.mkdirs();
- ZipIt zip = new ZipIt(null, backup.getAbsolutePath());
+ ZipIt zip = new ZipIt(null, zipUri, mResolver);
zip.unzip(hsPath.getAbsolutePath());
File config = new File(configFilePath);
@@ -266,24 +265,7 @@ public class BackupUtils {
}
}
- public void restoreCookieBackup(File p) {
- File config = new File(p.getAbsolutePath());
- FileInputStream stream;
- String jString = null;
-
- try {
- stream = new FileInputStream(config);
- FileChannel fc = stream.getChannel();
- MappedByteBuffer bb = fc.map(FileChannel.MapMode.READ_ONLY, 0, fc.size());
- jString = Charset.defaultCharset().decode(bb).toString();
- stream.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- if (jString == null)
- Toast.makeText(mContext, R.string.error, Toast.LENGTH_LONG).show();
-
+ public void restoreCookieBackup(String jString) {
try {
JSONObject savedValues = new JSONObject(jString);
ContentValues fields = new ContentValues();
@@ -313,23 +295,4 @@ public class BackupUtils {
Toast.makeText(mContext, R.string.backup_restored, Toast.LENGTH_LONG).show();
}
- public String createCookieBackup(String domain, String cookie, Integer enabled) {
- File storage_path = ExternalStorage.getOrCreateBackupDir();
- String backupFile = storage_path.getAbsolutePath() + '/' + domain.replace(".onion", ".json");
-
- JSONObject backup = new JSONObject();
- try {
- backup.put(CookieContentProvider.ClientCookie.DOMAIN, domain);
- backup.put(CookieContentProvider.ClientCookie.AUTH_COOKIE_VALUE, cookie);
- backup.put(CookieContentProvider.ClientCookie.ENABLED, enabled);
- FileWriter file = new FileWriter(backupFile);
- file.write(backup.toString());
- file.close();
- } catch (JSONException | IOException e) {
- e.printStackTrace();
- return null;
- }
-
- return backupFile;
- }
}
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/ZipIt.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/ZipIt.java
index 88f82c9e..b73833c9 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/ZipIt.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/ZipIt.java
@@ -1,5 +1,8 @@
package org.torproject.android.ui.hiddenservices.backup;
+import android.content.ContentResolver;
+import android.net.Uri;
+import android.os.ParcelFileDescriptor;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -18,27 +21,27 @@ import java.util.zip.ZipOutputStream;
public class ZipIt {
private static final int BUFFER = 2048;
- private String[] _files;
- private String _zipFile;
+ private String[] files;
+ private Uri zipFile;
+ private ContentResolver contentResolver;
- public ZipIt(@Nullable String[] files, @NonNull String zipFile) {
- _files = files;
- _zipFile = zipFile;
+ public ZipIt(@Nullable String[] files, @NonNull Uri zipFile, @NonNull ContentResolver contentResolver) {
+ this.files = files;
+ this.zipFile = zipFile;
+ this.contentResolver = contentResolver;
}
public boolean zip() {
try {
BufferedInputStream origin;
- FileOutputStream dest = new FileOutputStream(_zipFile);
-
+ ParcelFileDescriptor pdf = contentResolver.openFileDescriptor(zipFile, "w");
+ FileOutputStream dest = new FileOutputStream(pdf.getFileDescriptor());
ZipOutputStream out = new ZipOutputStream(new BufferedOutputStream(dest));
-
byte[] data = new byte[BUFFER];
-
- for (String _file : _files) {
- FileInputStream fi = new FileInputStream(_file);
+ for (String file : files) {
+ FileInputStream fi = new FileInputStream(file);
origin = new BufferedInputStream(fi, BUFFER);
- ZipEntry entry = new ZipEntry(_file.substring(_file.lastIndexOf("/") + 1));
+ ZipEntry entry = new ZipEntry(file.substring(file.lastIndexOf("/") + 1));
out.putNextEntry(entry);
int count;
while ((count = origin.read(data, 0, BUFFER)) != -1) {
@@ -46,42 +49,40 @@ public class ZipIt {
}
origin.close();
}
-
out.close();
- } catch (Exception e) {
+ dest.close();
+ pdf.close();
+ } catch (IOException e) {
+ e.printStackTrace();
return false;
}
-
return true;
}
- public boolean unzip(String output_path) {
+ public boolean unzip(String outputPath) {
InputStream is;
ZipInputStream zis;
try {
String filename;
- is = new FileInputStream(_zipFile);
+ is = contentResolver.openInputStream(zipFile);
zis = new ZipInputStream(new BufferedInputStream(is));
ZipEntry ze;
byte[] buffer = new byte[1024];
int count;
while ((ze = zis.getNextEntry()) != null) {
- // zapis do souboru
filename = ze.getName();
- // Need to create directories if not exists, or
- // it will generate an Exception...
+ // Need to create directories if not exists, or it will generate an Exception...
if (ze.isDirectory()) {
- File fmd = new File(output_path + "/" + filename);
+ File fmd = new File(outputPath + "/" + filename);
fmd.mkdirs();
continue;
}
- FileOutputStream fout = new FileOutputStream(output_path + "/" + filename);
+ FileOutputStream fout = new FileOutputStream(outputPath + "/" + filename);
- // cteni zipu a zapis
while ((count = zis.read(buffer)) != -1) {
fout.write(buffer, 0, count);
}
@@ -91,6 +92,7 @@ public class ZipIt {
}
zis.close();
+ is.close();
} catch (IOException e) {
e.printStackTrace();
return false;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieActionsDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieActionsDialog.java
index dcd00cc3..8e0ad321 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieActionsDialog.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieActionsDialog.java
@@ -1,27 +1,42 @@
package org.torproject.android.ui.hiddenservices.dialogs;
+import android.app.Activity;
import android.app.Dialog;
-import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.DialogFragment;
-import androidx.appcompat.app.AlertDialog;
+import android.os.ParcelFileDescriptor;
import android.view.View;
import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+
+import org.json.JSONException;
+import org.json.JSONObject;
import org.torproject.android.R;
-import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
-import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
+import org.torproject.android.core.DiskUtils;
+import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
public class CookieActionsDialog extends DialogFragment {
public static final int WRITE_EXTERNAL_STORAGE_FROM_COOKIE_ACTION_DIALOG = 4;
+ private static final int REQUEST_CODE_WRITE_FILE = 123;
private AlertDialog actionDialog;
+ private String domain;
+ private String cookie;
+ private int enabled;
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
final Bundle arguments = getArguments();
+ domain = arguments.getString("domain");
+ cookie = arguments.getString("auth_cookie_value");
+ enabled = arguments.getInt("enabled");
final View dialog_view = getActivity().getLayoutInflater().inflate(R.layout.layout_cookie_actions, null);
actionDialog = new AlertDialog.Builder(getActivity())
@@ -29,8 +44,8 @@ public class CookieActionsDialog extends DialogFragment {
.setTitle(R.string.client_cookies)
.create();
+ dialog_view.findViewById(R.id.btn_cookie_cancel).setOnClickListener(v -> actionDialog.dismiss());
dialog_view.findViewById(R.id.btn_cookie_backup).setOnClickListener(v -> doBackup());
-
dialog_view.findViewById(R.id.btn_cookie_delete).setOnClickListener(v -> {
CookieDeleteDialog dialog = new CookieDeleteDialog();
dialog.setArguments(arguments);
@@ -38,54 +53,38 @@ public class CookieActionsDialog extends DialogFragment {
actionDialog.dismiss();
});
- dialog_view.findViewById(R.id.btn_cookie_cancel).setOnClickListener(v -> actionDialog.dismiss());
-
return actionDialog;
}
public void doBackup() {
- Context mContext = getContext();
- Bundle arguments = getArguments();
-
- if (PermissionManager.isLollipopOrHigher()
- && !PermissionManager.hasExternalWritePermission(mContext)) {
-
- PermissionManager.requestExternalWritePermissions(
- getActivity(), WRITE_EXTERNAL_STORAGE_FROM_COOKIE_ACTION_DIALOG);
-
- return;
- }
-
- BackupUtils backup_utils = new BackupUtils(mContext);
- String backupPath;
- try {
- backupPath = backup_utils.createCookieBackup(
- arguments.getString("domain"),
- arguments.getString("auth_cookie_value"),
- arguments.getInt("enabled")
- );
- } catch (NullPointerException npe) {
- backupPath = null;
- }
-
- if (backupPath == null || backupPath.length() < 1) {
- Toast.makeText(mContext, R.string.error, Toast.LENGTH_LONG).show();
- actionDialog.dismiss();
- return;
- }
-
- Toast.makeText(mContext, R.string.backup_saved_at_external_storage, Toast.LENGTH_LONG).show();
-
- Uri selectedUri = Uri.parse(backupPath.substring(0, backupPath.lastIndexOf("/")));
- Intent intent = new Intent(Intent.ACTION_VIEW);
- intent.setDataAndType(selectedUri, "resource/folder");
+ Intent createFile = DiskUtils.createWriteFileIntent(domain.replace(".onion", ".json"), "application/json");
+ startActivityForResult(createFile, REQUEST_CODE_WRITE_FILE);
+ }
- if (intent.resolveActivityInfo(mContext.getPackageManager(), 0) != null) {
- startActivity(intent);
- } else {
- Toast.makeText(mContext, R.string.filemanager_not_available, Toast.LENGTH_LONG).show();
+ @Override
+ public void onActivityResult(int requestCode, int resultCode, Intent data) {
+ if (requestCode == REQUEST_CODE_WRITE_FILE && resultCode == Activity.RESULT_OK) {
+ if (data != null) {
+ Uri file = data.getData();
+ try {
+ ParcelFileDescriptor pfd = getActivity().getContentResolver().openFileDescriptor(file, "w");
+ FileOutputStream fileOutputStream = new FileOutputStream(pfd.getFileDescriptor());
+ JSONObject backup = new JSONObject();
+ backup.put(CookieContentProvider.ClientCookie.DOMAIN, domain);
+ backup.put(CookieContentProvider.ClientCookie.AUTH_COOKIE_VALUE, cookie);
+ backup.put(CookieContentProvider.ClientCookie.ENABLED, enabled);
+ fileOutputStream.write(backup.toString().getBytes());
+ // Let the document provider know you're done by closing the stream.
+ fileOutputStream.close();
+ pfd.close();
+ } catch (JSONException | IOException e) {
+ e.printStackTrace();
+ Toast.makeText(getContext(), R.string.error, Toast.LENGTH_LONG).show();
+ return;
+ }
+ Toast.makeText(getContext(), R.string.backup_saved_at_external_storage, Toast.LENGTH_LONG).show();
+ actionDialog.dismiss();
+ }
}
- actionDialog.dismiss();
}
-
}
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieDeleteDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieDeleteDialog.java
index f8338803..c2fade86 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieDeleteDialog.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieDeleteDialog.java
@@ -1,6 +1,5 @@
package org.torproject.android.ui.hiddenservices.dialogs;
-
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
@@ -39,8 +38,8 @@ public class CookieDeleteDialog extends DialogFragment {
return new AlertDialog.Builder(context)
.setMessage(R.string.confirm_cookie_deletion)
- .setPositiveButton(R.string.btn_okay, dialogClickListener)
- .setNegativeButton(R.string.btn_cancel, dialogClickListener)
+ .setPositiveButton(android.R.string.ok, dialogClickListener)
+ .setNegativeButton(android.R.string.cancel, dialogClickListener)
.create();
}
}
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSActionsDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSActionsDialog.java
index b250c3db..5fbe0571 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSActionsDialog.java
+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSActionsDialog.java
@@ -1,6 +1,6 @@
package org.torproject.android.ui.hiddenservices.dialogs;
-
+import android.app.Activity;
import android.app.Dialog;
import android.content.ClipData;
import android.content.ClipboardManager;
@@ -17,18 +17,20 @@ import android.view.View;
import android.widget.Toast;
import org.torproject.android.R;
+import org.torproject.android.core.DiskUtils;
import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
public class HSActionsDialog extends DialogFragment {
public static final int WRITE_EXTERNAL_STORAGE_FROM_ACTION_DIALOG = 2;
private AlertDialog actionDialog;
+ private int port;
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
final Bundle arguments = getArguments();
-
+ port = Integer.parseInt(arguments.getString("port"));
final View dialog_view = getActivity().getLayoutInflater().inflate(R.layout.layout_hs_actions, null);
actionDialog = new AlertDialog.Builder(getActivity())
.setView(dialog_view)
@@ -81,36 +83,35 @@ public class HSActionsDialog extends DialogFragment {
}
public void doBackup() {
- Context mContext = getActivity();
+ Intent createFile = DiskUtils.createWriteFileIntent("hs" + port + ".zip", "application/zip");
+ startActivityForResult(createFile, REQUEST_CODE_WRITE_FILE);
+ }
+
+ public void doBackup1() {
if (PermissionManager.isLollipopOrHigher()
&& !PermissionManager.hasExternalWritePermission(getActivity())) {
PermissionManager.requestExternalWritePermissions(
getActivity(), WRITE_EXTERNAL_STORAGE_FROM_ACTION_DIALOG);
-
- return;
- }
-
- BackupUtils hsutils = new BackupUtils(mContext);
- String backupPath = hsutils.createZipBackup(Integer.parseInt(getArguments().getString("port")));
-
- if (backupPath == null || backupPath.length() < 1) {
- Toast.makeText(mContext, R.string.error, Toast.LENGTH_LONG).show();
- actionDialog.dismiss();
- return;
}
+ }
- Toast.makeText(mContext, R.string.backup_saved_at_external_storage, Toast.LENGTH_LONG).show();
-
- Uri selectedUri = Uri.parse(backupPath.substring(0, backupPath.lastIndexOf("/")));
- Intent intent = new Intent(Intent.ACTION_VIEW);
- intent.setDataAndType(selectedUri, "resource/folder");
+ private static final int REQUEST_CODE_WRITE_FILE = 123;
- if (intent.resolveActivityInfo(mContext.getPackageManager(), 0) != null) {
- startActivity(intent);
- } else {
- Toast.makeText(mContext, R.string.filemanager_not_available, Toast.LENGTH_LONG).show();
+ @Override
+ public void onActivityResult(int requestCode, int resultCode, Intent data) {
+ if (requestCode == REQUEST_CODE_WRITE_FILE && resultCode == Activity.RESULT_OK) {
+ if (data != null) {
+ Uri file = data.getData();
+ BackupUtils backupUtils = new BackupUtils(getContext());
+ String backup = backupUtils.createZipBackup(port, file);
+ if (backup != null) {
+ Toast.makeText(getContext(), R.string.backup_saved_at_external_storage, Toast.LENGTH_LONG).show();
+ } else{
+ Toast.makeText(getContext(), R.string.error, Toast.LENGTH_LONG).show();
+ }
+ actionDialog.dismiss();
+ }
}
- actionDialog.dismiss();
}
}
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 1712d937..2d817783 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
@@ -29,8 +29,7 @@ public class HSDeleteDialog extends DialogFragment {
context.getContentResolver().delete(
HSContentProvider.CONTENT_URI,
HSContentProvider.HiddenService._ID + "=" + arguments.getInt("_id"),
- null
- );
+ null);
// Delete from internal storage
String base = context.getFilesDir().getAbsolutePath() + "/" + TorServiceConstants.HIDDEN_SERVICES_DIR;
@@ -54,8 +53,8 @@ public class HSDeleteDialog extends DialogFragment {
return new AlertDialog.Builder(context)
.setMessage(R.string.confirm_service_deletion)
- .setPositiveButton(R.string.btn_okay, dialogClickListener)
- .setNegativeButton(R.string.btn_cancel, dialogClickListener)
+ .setPositiveButton(android.R.string.ok, dialogClickListener)
+ .setNegativeButton(android.R.string.cancel, dialogClickListener)
.create();
}
}
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/SelectCookieBackupDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/SelectCookieBackupDialog.java
deleted file mode 100644
index 03f7b506..00000000
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/SelectCookieBackupDialog.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.torproject.android.ui.hiddenservices.dialogs;
-
-import android.app.Dialog;
-import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.DialogFragment;
-import androidx.appcompat.app.AlertDialog;
-import android.view.View;
-import android.widget.ListView;
-import org.torproject.android.R;
-import org.torproject.android.ui.hiddenservices.adapters.BackupAdapter;
-import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
-import org.torproject.android.core.ExternalStorage;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class SelectCookieBackupDialog extends DialogFragment {
-
- @NonNull
- @Override
- public Dialog onCreateDialog(Bundle savedInstanceState) {
- AlertDialog.Builder cookieBackupDialog = new AlertDialog.Builder(getActivity());
-
- cookieBackupDialog.setTitle(R.string.restore_backup);
-
- File backupDir = ExternalStorage.getOrCreateBackupDir();
- File[] files = null;
-
- try {
- files = backupDir.listFiles((dir, name) -> name.toLowerCase().endsWith(".json"));
- } catch (NullPointerException e) {
- // Silent block
- }
-
- if (files == null || files.length < 1) {
- cookieBackupDialog.setMessage(R.string.create_a_backup_first);
- cookieBackupDialog.setNegativeButton(R.string.btn_cancel, (dialog, id) -> dialog.dismiss());
-
- return cookieBackupDialog.create();
- }
-
- final View dialog_view = getActivity().getLayoutInflater().inflate(R.layout.layout_hs_backups_list, null);
-
- cookieBackupDialog.setView(dialog_view);
- cookieBackupDialog.setPositiveButton(R.string.btn_okay, (dialog, id) -> dialog.dismiss());
-
- ListView backups = dialog_view.findViewById(R.id.listview_hs_backups);
-
- List<File> json_backups = new ArrayList<>();
- Collections.addAll(json_backups, files);
-
- backups.setAdapter(new BackupAdapter(getContext(), R.layout.layout_hs_backups_list_item, json_backups));
- backups.setOnItemClickListener((parent, view, position, id) -> {
- BackupUtils backupUtils = new BackupUtils(view.getContext().getApplicationContext());
- File p = (File) parent.getItemAtPosition(position);
- backupUtils.restoreCookieBackup(p);
- });
-
- return cookieBackupDialog.create();
- }
-}
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/SelectHSBackupDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/SelectHSBackupDialog.java
deleted file mode 100644
index 642c5c17..00000000
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/SelectHSBackupDialog.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.torproject.android.ui.hiddenservices.dialogs;
-
-import android.app.Dialog;
-import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.DialogFragment;
-import androidx.appcompat.app.AlertDialog;
-import android.view.View;
-import android.widget.ListView;
-import org.torproject.android.R;
-import org.torproject.android.ui.hiddenservices.adapters.BackupAdapter;
-import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
-import org.torproject.android.core.ExternalStorage;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class SelectHSBackupDialog extends DialogFragment {
-
- @NonNull
- @Override
- public Dialog onCreateDialog(Bundle savedInstanceState) {
- AlertDialog.Builder backupsDialog = new AlertDialog.Builder(getActivity());
-
- backupsDialog.setTitle(R.string.restore_backup);
-
- File backupDir = ExternalStorage.getOrCreateBackupDir();
- File[] files = null;
-
- try {
- files = backupDir.listFiles((dir, name) -> name.toLowerCase().endsWith(".zip"));
- } catch (NullPointerException e) {
- // Silent block
- }
-
- if (files == null || files.length < 1) {
- backupsDialog.setMessage(R.string.create_a_backup_first);
- backupsDialog.setNegativeButton(R.string.btn_cancel, (dialog, id) -> dialog.dismiss());
-
- return backupsDialog.create();
- }
-
- final View dialog_view = getActivity().getLayoutInflater().inflate(R.layout.layout_hs_backups_list, null);
-
- backupsDialog.setView(dialog_view);
- backupsDialog.setPositiveButton(R.string.btn_okay, (dialog, id) -> dialog.dismiss());
-
- ListView backups = dialog_view.findViewById(R.id.listview_hs_backups);
-
- List<File> zips = new ArrayList<>();
- Collections.addAll(zips, files);
-
- backups.setAdapter(new BackupAdapter(getContext(), R.layout.layout_hs_backups_list_item, zips));
- backups.setOnItemClickListener((parent, view, position, id) -> {
- BackupUtils backupUtils = new BackupUtils(view.getContext().getApplicationContext());
- File p = (File) parent.getItemAtPosition(position);
- backupUtils.restoreZipBackup(p);
- });
-
- return backupsDialog.create();
- }
-}
diff --git a/app/src/main/res/layout/layout_add_client_cookie_dialog.xml b/app/src/main/res/layout/layout_add_client_cookie_dialog.xml
index c4725ff3..9dc4950b 100644
--- a/app/src/main/res/layout/layout_add_client_cookie_dialog.xml
+++ b/app/src/main/res/layout/layout_add_client_cookie_dialog.xml
@@ -1,61 +1,61 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:orientation="vertical"
android:paddingLeft="5dp"
- android:paddingRight="5dp"
android:paddingTop="5dp"
+ android:paddingRight="5dp"
android:paddingBottom="5dp">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:paddingLeft="5dp"
android:text="@string/onion"
- android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small"
- android:paddingLeft="5dp" />
+ android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small" />
<org.torproject.android.core.ui.NoPersonalizedLearningEditText
+ android:id="@+id/cookie_onion"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:inputType="text"
android:ems="10"
- android:id="@+id/cookie_onion" />
+ android:inputType="text" />
<TextView
- android:text="@string/auth_cookie"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small"
- android:paddingLeft="5dp" />
+ android:paddingLeft="5dp"
+ android:text="@string/auth_cookie"
+ android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small" />
<org.torproject.android.core.ui.NoPersonalizedLearningEditText
+ android:id="@+id/cookie_value"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
- android:id="@+id/cookie_value"
android:inputType="text" />
<LinearLayout
- android:orientation="horizontal"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:orientation="horizontal">
<Button
- android:text="@string/btn_cancel"
+ android:id="@+id/cookie_dialog_cancel"
+ style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:id="@+id/cookie_dialog_cancel"
android:layout_weight="1"
- style="@style/Widget.AppCompat.Button.Borderless.Colored" />
+ android:text="@android:string/cancel" />
<Button
- android:text="@string/save"
+ android:id="@+id/cookie_dialog_save"
+ style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:id="@+id/cookie_dialog_save"
android:layout_weight="1"
- style="@style/Widget.AppCompat.Button.Borderless.Colored" />
+ android:text="@string/save" />
</LinearLayout>
diff --git a/app/src/main/res/layout/layout_cookie_actions.xml b/app/src/main/res/layout/layout_cookie_actions.xml
index 64d8c1c6..86928029 100644
--- a/app/src/main/res/layout/layout_cookie_actions.xml
+++ b/app/src/main/res/layout/layout_cookie_actions.xml
@@ -1,24 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical" android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:paddingLeft="20dp"
+ android:paddingRight="20dp">
<Button
- android:text="@string/backup_cookie"
+ android:id="@+id/btn_cookie_backup"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:id="@+id/btn_cookie_backup" />
+ android:text="@string/backup_cookie" />
<Button
- android:text="@string/delete_cookie"
+ android:id="@+id/btn_cookie_delete"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:id="@+id/btn_cookie_delete" />
+ android:text="@string/delete_cookie" />
<Button
- android:text="@string/btn_cancel"
+ android:id="@+id/btn_cookie_cancel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:id="@+id/btn_cookie_cancel" />
+ android:text="@android:string/cancel" />
</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_hs_actions.xml b/app/src/main/res/layout/layout_hs_actions.xml
index 0e5a6680..e3cecbec 100644
--- a/app/src/main/res/layout/layout_hs_actions.xml
+++ b/app/src/main/res/layout/layout_hs_actions.xml
@@ -28,7 +28,7 @@
android:id="@+id/btn_hs_delete" />
<Button
- android:text="@string/btn_cancel"
+ android:text="@android:string/cancel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/btn_hs_cancel" />
diff --git a/app/src/main/res/layout/layout_hs_backups_list.xml b/app/src/main/res/layout/layout_hs_backups_list.xml
deleted file mode 100644
index 154195f5..00000000
--- a/app/src/main/res/layout/layout_hs_backups_list.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical" android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <ListView
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:id="@+id/listview_hs_backups"
- android:layout_marginTop="15dp" />
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_hs_backups_list_item.xml b/app/src/main/res/layout/layout_hs_backups_list_item.xml
deleted file mode 100644
index bc0b840e..00000000
--- a/app/src/main/res/layout/layout_hs_backups_list_item.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:paddingLeft="15dp"
- tools:paddingLeft="15dp"
- android:paddingRight="15dp"
- tools:paddingRight="15dp">
-
- <TextView
- android:id="@+id/backup_name"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textSize="30sp"
- android:layout_marginBottom="10dp" />
- </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_hs_cookie.xml b/app/src/main/res/layout/layout_hs_cookie.xml
index 6d1a8935..abb7d33f 100644
--- a/app/src/main/res/layout/layout_hs_cookie.xml
+++ b/app/src/main/res/layout/layout_hs_cookie.xml
@@ -1,31 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical" android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
<TextView
+ android:id="@+id/hs_cookie"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:id="@+id/hs_cookie"
- android:paddingBottom="5dp"
android:paddingLeft="5dp"
- android:paddingTop="5dp" />
+ android:paddingTop="5dp"
+ android:paddingBottom="5dp" />
<Button
- android:text="@string/copy_cookie_to_clipboard"
+ android:id="@+id/hs_cookie_to_clipboard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:id="@+id/hs_cookie_to_clipboard" />
+ android:text="@string/copy_cookie_to_clipboard" />
<Button
- android:text="@string/share_as_qr"
+ android:id="@+id/hs_cookie_to_qr"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:id="@+id/hs_cookie_to_qr" />
+ android:text="@string/share_as_qr" />
<Button
- android:text="@string/btn_cancel"
+ android:id="@+id/hs_cookie_cancel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:id="@+id/hs_cookie_cancel" />
+ android:text="@android:string/cancel" />
</LinearLayout>
\ No newline at end of file
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 cf390d31..df18718f 100644
--- a/app/src/main/res/layout/layout_hs_data_dialog.xml
+++ b/app/src/main/res/layout/layout_hs_data_dialog.xml
@@ -1,83 +1,83 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:orientation="vertical"
android:paddingLeft="5dp"
- android:paddingRight="5dp"
android:paddingTop="5dp"
+ android:paddingRight="5dp"
android:paddingBottom="5dp">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:paddingLeft="5dp"
android:text="@string/name"
- android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small"
- android:paddingLeft="5dp" />
+ android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small" />
<org.torproject.android.core.ui.NoPersonalizedLearningEditText
+ android:id="@+id/hsName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:inputType="text"
android:ems="10"
- android:id="@+id/hsName" />
+ android:inputType="text" />
<TextView
- android:text="@string/local_port"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small"
- android:paddingLeft="5dp" />
+ android:paddingLeft="5dp"
+ android:text="@string/local_port"
+ android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small" />
<org.torproject.android.core.ui.NoPersonalizedLearningEditText
+ android:id="@+id/hsLocalPort"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
- android:id="@+id/hsLocalPort"
android:inputType="number" />
<TextView
- android:text="@string/onion_port"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small"
- android:paddingLeft="5dp" />
+ android:paddingLeft="5dp"
+ android:text="@string/onion_port"
+ android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small" />
<org.torproject.android.core.ui.NoPersonalizedLearningEditText
+ android:id="@+id/hsOnionPort"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
- android:id="@+id/hsOnionPort"
android:inputType="number" />
<CheckBox
- android:text="@string/auth_cookie"
+ android:id="@+id/hsAuth"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:id="@+id/hsAuth"
android:paddingTop="5dp"
- android:paddingBottom="10dp"/>
+ android:paddingBottom="10dp"
+ android:text="@string/auth_cookie" />
<LinearLayout
- android:orientation="horizontal"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:orientation="horizontal">
<Button
- android:text="@string/btn_cancel"
+ android:id="@+id/HSDialogCancel"
+ style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:id="@+id/HSDialogCancel"
android:layout_weight="1"
- style="@style/Widget.AppCompat.Button.Borderless.Colored" />
+ android:text="@android:string/cancel" />
<Button
- android:text="@string/save"
+ android:id="@+id/HSDialogSave"
+ style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:id="@+id/HSDialogSave"
android:layout_weight="1"
- style="@style/Widget.AppCompat.Button.Borderless.Colored" />
+ android:text="@string/save" />
</LinearLayout>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index ea1b5b41..1564d1f4 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">خروج</string>
<string name="menu_scan">ÙØص QR الجسر</string>
<string name="menu_share_bridge">مشاركة QR الجسر</string>
- <string name="btn_okay">مواÙÙ‚</string>
- <string name="btn_cancel">إلغاء</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">بعض التÙاصيل عن اوربوت</string>
<!--END Welcome Wizard strings (DJH)-->
@@ -144,10 +142,8 @@
<string name="delete_service">Øذ٠الخدمة</string>
<string name="backup_saved_at_external_storage">تمت عملية ØÙظ النسخة الإØتياطية ÙÙŠ ذاكرة التخزين الخارجية</string>
<string name="backup_restored">تمت استعادة النسخة الإØتياطية</string>
- <string name="filemanager_not_available">تعذر العثور على مدير الملÙات</string>
<string name="restore_backup">إسترجاع نسخة اØتياطية</string>
- <string name="create_a_backup_first">قم أولاً بإنشاء نسخة Ø¥Øتياطية</string>
- <string name="name_can_t_be_empty">لا يمكن ترك الإسم Ùارغا</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>
diff --git a/app/src/main/res/values-ay/strings.xml b/app/src/main/res/values-ay/strings.xml
index df4f5ad4..7c1c60f1 100644
--- a/app/src/main/res/values-ay/strings.xml
+++ b/app/src/main/res/values-ay/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Mistuña</string>
<string name="menu_scan">Jalakipañ QR waruqaña</string>
<string name="menu_share_bridge">Jalakipañ QR ch\'iqiyaña</string>
- <string name="btn_okay">Iyaw saña</string>
- <string name="btn_cancel">Janiw saña</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Orbotxat juk\'amp yatiñataki</string>
<string name="wizard_details_msg">Orbot wakichawix inakiwa ukatx Tor ukaniwa, Obfs4Proxy, BadVPN Tun2Socks, LibEvent ukhamarak Polipo. Proxy HTTP (8118) ukhamarak mä proxy SOCKS (9050) Tor taypin utjayi. Mä rooteat atamirinx Orbotax Tor tuqiw taqpach llika yatiyäwinak apayarakispawa.</string>
@@ -148,11 +146,9 @@
<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="filemanager_not_available">Imatanak apnaqirix janiw uñjañjamäkiti</string>
<string name="please_grant_permissions_for_external_storage">Yaqha yänakar imañatak iyaw sam, amp suma</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="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>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index 8ca8c115..d1bab868 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Çıx</string>
<string name="menu_scan">KörpüQR kodu skan edin</string>
<string name="menu_share_bridge">KörpüQR kodu paylaşın</string>
- <string name="btn_okay">Okey</string>
- <string name="btn_cancel">Ləğv et</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Bəzi Orbot Detalları</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index aa91590e..5aecd806 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">ВыйÑце</string>
<string name="menu_scan">Сканаваць QR-код моÑта</string>
<string name="menu_share_bridge">Ðпублікаваць QR-код моÑта</string>
- <string name="btn_okay">OK</string>
- <string name="btn_cancel">СкаÑаваць</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">ÐÐµÐºÐ°Ñ‚Ð¾Ñ€Ñ‹Ñ Ð·Ð²ÐµÑткі пра праграму Orbot</string>
<string name="wizard_details_msg">Orbot — гÑта праграма з адкрытым зыходным кодам, ÑÐºÐ°Ñ ÑžÑ‚Ñ€Ñ‹Ð¼Ð¾ÑžÐ²Ð°Ðµ Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent Ñ– Polipo. Яно прапануе лакальны HTTP- (8118) Ñ– SOCKS-прокÑÑ– (9050) у Ñетку Tor. Orbot такÑама дазвалÑе на прыладах з правамі root пераÑылаць увеÑÑŒ інтÑрнÑÑ‚-трафік праз Tor.</string>
@@ -148,11 +146,9 @@
<string name="delete_service">Выдаліць Ñлужбу</string>
<string name="backup_saved_at_external_storage">Ð ÑÐ·ÐµÑ€Ð²Ð¾Ð²Ð°Ñ ÐºÐ¾Ð¿Ñ–Ñ Ð·Ð°Ñ…Ð°Ð²Ð°Ð½Ð° на вонкавым Ñховішчы</string>
<string name="backup_restored">Ðдноўлена з Ñ€Ñзервовай копіі</string>
- <string name="filemanager_not_available">Файлавы менеджар недаÑтупны</string>
<string name="please_grant_permissions_for_external_storage">Дайце дазвол Ð´Ð»Ñ Ð´Ð¾Ñтупу да вонкавага Ñховішча</string>
<string name="restore_backup">Ðднавіць з копіі</string>
- <string name="create_a_backup_first">Спачатку Ñтварыце Ñ€Ñзервовую копію</string>
- <string name="name_can_t_be_empty">Ð†Ð¼Ñ Ð½Ðµ можа быць пуÑтым</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>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index ef3ea54e..332f7479 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Изход</string>
<string name="menu_scan">Сканирай BridgeQR</string>
<string name="menu_share_bridge">Сподели BridgeQR</string>
- <string name="btn_okay">ОК</string>
- <string name="btn_cancel">Откажи</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">ÐÑкои Орбот детайли</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml
index 1da67237..58728281 100644
--- a/app/src/main/res/values-bn-rBD/strings.xml
+++ b/app/src/main/res/values-bn-rBD/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">পà§à¦°à¦¸à§à¦¥à¦¾à¦¨</string>
<string name="menu_scan">বà§à¦°à¦¿à¦œà¦•à¦¿à¦‰à¦†à¦° চেক করà§à¦¨</string>
<string name="menu_share_bridge">বà§à¦°à¦¿à¦œà¦•à¦¿à¦‰à¦†à¦° শেয়ার করà§à¦¨</string>
- <string name="btn_okay">ঠিক আছে</string>
- <string name="btn_cancel">বাদ</string>
<!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">সাধারণ</string>
diff --git a/app/src/main/res/values-bn-rIN/strings.xml b/app/src/main/res/values-bn-rIN/strings.xml
index e832af24..12fa5a98 100644
--- a/app/src/main/res/values-bn-rIN/strings.xml
+++ b/app/src/main/res/values-bn-rIN/strings.xml
@@ -1,7 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="btn_cancel">Cancel</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<!--New Wizard Strings-->
<!--Title Screen-->
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index df729d30..6d7a8dbc 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -8,7 +8,6 @@
<string name="main_layout_download">ডাউনলোড</string>
<string name="button_about">সমà§à¦¬à¦¨à§à¦§à§‡</string>
<string name="menu_exit">বনà§à¦§</string>
- <string name="btn_cancel">বাতিল</string>
<!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">সাধারণ</string>
diff --git a/app/src/main/res/values-brx/strings.xml b/app/src/main/res/values-brx/strings.xml
index 806663f3..ca3772cd 100644
--- a/app/src/main/res/values-brx/strings.xml
+++ b/app/src/main/res/values-brx/strings.xml
@@ -2,7 +2,6 @@
<resources>
<string name="menu_settings">सेटिंगà¥à¤¸</string>
<string name="menu_exit">अोंखारलां</string>
- <string name="btn_cancel">नेवसि</string>
<!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<!--New Wizard Strings-->
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index 85fe87e3..f1e5db8f 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -1,7 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<string name="menu_settings">Postavke</string>
- <string name="btn_cancel">Otkaži</string>
<!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Osnovno</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 37c4f22a..2699bcbe 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Surt</string>
<string name="menu_scan">Escaneja el BridgeQR</string>
<string name="menu_share_bridge">Comparteix el BridgeQR</string>
- <string name="btn_okay">D\'acord</string>
- <string name="btn_cancel">Cancel·la</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Alguns detalls de l\'Orbot...</string>
<string name="wizard_details_msg">Orbot és una aplicació de codi obert que conté Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent i Polipo. Proporciona un proxy HTTP local (8118) i un proxy SOCKS (9050) a la xarxa Tor. En dispositius root Orbot també té la capacitat d\'enviar tot el trà nsit d\'Internet a través de Tor</string>
@@ -148,11 +146,9 @@
<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="filemanager_not_available">Gestor d\'arxius no disponible</string>
<string name="please_grant_permissions_for_external_storage">Si us plau concedeix permisos per emmagatzematge extern</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="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>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index a753905a..d182355a 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Konec</string>
<string name="menu_scan">Skenovat BridgeQR</string>
<string name="menu_share_bridge">SdÃlet BridgeQR</string>
- <string name="btn_okay">Budiž</string>
- <string name="btn_cancel">Zrušit</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Pár detailů o Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 7f330416..8961fb78 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -17,7 +17,6 @@
<string name="menu_exit">Konec</string>
<string name="menu_scan">Skenovat QR kód bridge</string>
<string name="menu_share_bridge">SdÃlet QR kód bridge</string>
- <string name="btn_cancel">Zrušit</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Detaily o Orbotu</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index ac04320b..5a963b08 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -12,8 +12,6 @@
<string name="main_layout_upload">Llwytho i fyny</string>
<string name="button_about">Amdanom ni</string>
<string name="menu_exit">Gadael</string>
- <string name="btn_okay">Iawn</string>
- <string name="btn_cancel">Diddymu</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Rhai manylion am Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index e164bab3..32f0d624 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Afslut</string>
<string name="menu_scan">Skan BridgeQR</string>
<string name="menu_share_bridge">Del BridgeQR</string>
- <string name="btn_okay">Okay</string>
- <string name="btn_cancel">Fortryd</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Nogle Orbot detaljer</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 51c478dc..caff5d8a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Beenden</string>
<string name="menu_scan">BrückenQR scannen</string>
<string name="menu_share_bridge">BrückenQR-Code teilen</string>
- <string name="btn_okay">Okay</string>
- <string name="btn_cancel">Abbrechen</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Nähere Informationen zu Orbot</string>
<string name="wizard_details_msg">Orbot ist eine quelloffene Anwendung, die Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent und Polipo enthält. Sie stellt einen lokalen HTTP-Proxy (Port: 8118) und einen SOCKS-Proxy (Port: 9050) in das Tor-Netzwerk bereit. Auf gerooteten Geräten kann Orbot auch sämtliche Internetverbindungen durch Tor leiten.</string>
@@ -148,11 +146,9 @@
<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="filemanager_not_available">Dateimanager nicht verfügbar</string>
<string name="please_grant_permissions_for_external_storage">Bitte Zugriffsrechte auf externen Speicher gewähren</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="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>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index acb1c517..87a67ce3 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Έξοδος</string>
<string name="menu_scan">ΣάÏωση BridgeQR</string>
<string name="menu_share_bridge">Κοινή χÏήση BridgeQR</string>
- <string name="btn_okay">Okay</string>
- <string name="btn_cancel">ΆκυÏο</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">ΜεÏικÎÏ‚ λεπτομÎÏειες για το Orbot</string>
<string name="wizard_details_msg">Το Orbot είναι μια εφαÏμογή Î±Î½Î¿Î¹ÎºÏ„Î¿Ï Î»Î¿Î³Î¹ÏƒÎ¼Î¹ÎºÎ¿Ï Ï€Î¿Ï… πεÏιÎχει τα Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent καί Polipo. ΔιαθÎτει τοπικοÏÏ‚ πληÏεξοÏσιους διακομιστÎÏ‚ HTTP (8118) και SOCKS (9050) για το δίκτυο Tor. Σε συσκευÎÏ‚ που Îχουν διαμοÏφωθεί για Ïιζική χÏήση, το Orbot μποÏεί να μεταδίδει όλη την διαδυκτιακή κυκλοφοÏία μÎσω Tor.</string>
@@ -148,11 +146,9 @@
<string name="delete_service">ΔιαγÏαφή υπηÏεσίας</string>
<string name="backup_saved_at_external_storage">Το αντίγÏάφο ασφαλείας αποθηκεÏθηκε σε εξωτεÏικό μÎσο αποθήκευσης</string>
<string name="backup_restored">Το αντίγÏαφο ασφαλείας επαναφÎÏθηκε</string>
- <string name="filemanager_not_available">Ο διαχειÏιστής αÏχείων δεν είναι διαθÎσιμος.</string>
<string name="please_grant_permissions_for_external_storage">ΠαÏακαλοÏμε να παÏαχωÏήσετε δικαιώματα για εξωτεÏική αποθήκευση</string>
<string name="restore_backup">ΕπαναφοÏά αντιγÏάφου ασφαλείας</string>
- <string name="create_a_backup_first">ΔημιουÏγήστε Ï€Ïώτα Îνα αντίγÏαφο ασφαλείας </string>
- <string name="name_can_t_be_empty">Το όνομα δεν γίνεται να είναι κενό</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>
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index eca34294..1829c574 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Exit</string>
<string name="menu_scan">Scan BridgeQR</string>
<string name="menu_share_bridge">Share BridgeQR</string>
- <string name="btn_okay">Okay</string>
- <string name="btn_cancel">Cancel</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Some Orbot Details</string>
<string name="wizard_details_msg">Orbot is an open-source application that contains Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent and Polipo. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index efbdbb27..81eb0b90 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -13,7 +13,6 @@
<string name="main_layout_upload">AlÅutado</string>
<string name="button_about">Pri</string>
<string name="menu_exit">Eliri</string>
- <string name="btn_cancel">Rezigni</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Kelkaj Detaloj pri Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml
index 6d6755b3..4698804e 100644
--- a/app/src/main/res/values-es-rAR/strings.xml
+++ b/app/src/main/res/values-es-rAR/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Salir</string>
<string name="menu_scan">Escanea código QR</string>
<string name="menu_share_bridge">Compartir el código QR</string>
- <string name="btn_okay">Ok</string>
- <string name="btn_cancel">Cancelar</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Algunos detalles de Orbot</string>
<string name="wizard_details_msg">Orbot es una aplicación de código abierto que contiene Tor, Obfs4Proxy, BadVPN, Tun2Socks, LibEvent y Polipo. Proporciona un proxy local HTTP (8118) y un proxy SOCKS (9050) adentro de la red de Tor. Orbot también tiene la habilidad, en dispositivos ruteados, de enviar todo el trafico de Internet a través de Tor</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 216fcd45..e101d8d4 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Salir</string>
<string name="menu_scan">Escanear QR de bridge</string>
<string name="menu_share_bridge">Compartir QR de bridge</string>
- <string name="btn_okay">Aceptar</string>
- <string name="btn_cancel">Cancelar</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Algunos detalles de Orbot</string>
<string name="wizard_details_msg">Orbot es una aplicación de código abierto que contiene Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent y Polipo. Proporciona un proxy HTTP (8118) y un proxy SOCKS (9050) hacia el interior de la red Tor. En una maquina rooteada, Orbot también tiene la capacidad de enviar todo el tráfico de Internet a través de Tor.</string>
@@ -149,11 +147,9 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
<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="filemanager_not_available">Administrador de ficheros no disponible</string>
<string name="please_grant_permissions_for_external_storage">Por favor, conceda permisos para almacenamiento externo</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="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>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 532fca3c..0bf2723c 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -15,8 +15,6 @@
<string name="main_layout_upload">Lae üles</string>
<string name="button_about">Lähemalt</string>
<string name="menu_exit">Välja</string>
- <string name="btn_okay">Hea küll</string>
- <string name="btn_cancel">Katkesta</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Mõned Orbot\'i detailid</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 11fa9ba3..ad6337be 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Irten</string>
<string name="menu_scan">Eskaneatu BridgeQR</string>
<string name="menu_share_bridge">Partekatu BridgeQR</string>
- <string name="btn_okay">Ados</string>
- <string name="btn_cancel">Utzi</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Orbot xehetasun batzuk</string>
<string name="wizard_details_msg">Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent eta Polipo dituen kode irekiko aplikazio bat da Orbot. Tor sarera sartzeko HTTP proxya (8118) eta SOCKS proxya (9050) eskaintzen ditu. Rooteatutako gailuetan Orbot-ek interneteko trafiko guztia Tor bidez bidali dezake baita ere.</string>
@@ -148,11 +146,9 @@
<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="filemanager_not_available">Fitxategi kudeatzailea ez dago eskuragarri</string>
<string name="please_grant_permissions_for_external_storage">Eman kanpo biltegiratzerako baimena</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="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>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 1b9691ca..a4b0196d 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">خروج</string>
<string name="menu_scan">اسکن BridgeQR</string>
<string name="menu_share_bridge">اشتراک BridgeQR</string>
- <string name="btn_okay">قبول</string>
- <string name="btn_cancel">لغو</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">برخی جزییات درباره اوربوت</string>
<string name="wizard_details_msg">اوربات نرم‌اÙزاری آزاد است Ú©Ù‡ شامل تور، Obfs4ProxyØŒ BadVPN Tun2SocksØŒ LibEvent Ùˆ پولیپو می‌شود. این نرم‌اÙزار یک اچ‌تی‌تی‌پی پراکسی (8118) Ùˆ ساکس (9050) Ù…ØÙ„ÛŒ روی شبکه تور Ùراهم می‌کند. همچنین اوربات می‌تواند روی دستگاه‌های روت شده، تمام تراÙیک اینترنت را ار تور عبور دهد.</string>
@@ -148,11 +146,9 @@
<string name="delete_service">Øذ٠سرویس</string>
<string name="backup_saved_at_external_storage">بک‌آپ در انباره خارجی ذخیره شد</string>
<string name="backup_restored">بک‌آپ بازگردانده شد</string>
- <string name="filemanager_not_available">Filemanager موجود نیست</string>
<string name="please_grant_permissions_for_external_storage">لطÙا به انباره خارجی اجازه دسترسی بدهید</string>
<string name="restore_backup">برگرداندن بک‌آپ</string>
- <string name="create_a_backup_first">اول یک نسخه بک‌آپ درست کنید</string>
- <string name="name_can_t_be_empty">نام نباید خالی باشد</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>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index ec38870f..ea816426 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Lopeta</string>
<string name="menu_scan">Skannaa sillan QR-koodi</string>
<string name="menu_share_bridge">Jaa sillan QR-koodi</string>
- <string name="btn_okay">Selvä</string>
- <string name="btn_cancel">Peru</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Joitakin Orbotin lisätietoja</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 74620dff..2bd5f988 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Quitter </string>
<string name="menu_scan">Balayer un code QR de pont</string>
<string name="menu_share_bridge">Partager un code QR de pont</string>
- <string name="btn_okay">OK</string>
- <string name="btn_cancel">Annuler</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Quelques détails sur Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 7d1df0f4..43ae1a8e 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Quitter </string>
<string name="menu_scan">Balayer un code QR de pont</string>
<string name="menu_share_bridge">Partager un code QR de pont</string>
- <string name="btn_okay">OK</string>
- <string name="btn_cancel">Annuler</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Quelques détails sur Orbot</string>
<string name="wizard_details_msg">Orbot est une application à code source ouvert incluant Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent et Polipo. Elle fournit un mandataire local HTTP (8118) et un mandataire SOCKS (9050) vers le réseau Tor. Orbot a aussi la capacité, sur un appareil débridé, d’envoyer tout le trafic Internet par Tor.</string>
@@ -148,11 +146,9 @@
<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="filemanager_not_available">Le gestionnaire de fichiers n’est pas disponible</string>
<string name="please_grant_permissions_for_external_storage">Veuillez accorder les droits vers la mémoire externe</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="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>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 7c7a923b..4dc30171 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">SaÃr </string>
<string name="menu_scan">Escanear BridgeQR</string>
<string name="menu_share_bridge">Compartir BridgeQR</string>
- <string name="btn_okay">Aceptar</string>
- <string name="btn_cancel">Cancelar</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Algúns detalles sobre Orbot</string>
<string name="wizard_details_msg">Orbot é unha aplicación de código-aberto que contén a Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent e Polipo. Proporciona un proxy HTTP (8118) e un proxy SOCKS (9050) na rede Tor. Orbot tamén pode, nun dispositivo con acceso root, enviar todo o tráfico de internet a través de Tor.</string>
@@ -148,11 +146,9 @@
<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="filemanager_not_available">Xestor de ficheiros non dispoñible</string>
<string name="please_grant_permissions_for_external_storage">Por favor, conceda permiso para o almacenamento externo</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="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>
diff --git a/app/src/main/res/values-gu-rIN/strings.xml b/app/src/main/res/values-gu-rIN/strings.xml
index 67ff81c9..0fe1e9e1 100644
--- a/app/src/main/res/values-gu-rIN/strings.xml
+++ b/app/src/main/res/values-gu-rIN/strings.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string name="btn_cancel">રદ કરો</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<!--New Wizard Strings-->
<!--Title Screen-->
diff --git a/app/src/main/res/values-gu/strings.xml b/app/src/main/res/values-gu/strings.xml
index f04f4533..4fae11f7 100644
--- a/app/src/main/res/values-gu/strings.xml
+++ b/app/src/main/res/values-gu/strings.xml
@@ -2,8 +2,6 @@
<resources>
<string name="menu_settings">સેટિંગà«àª¸</string>
<string name="menu_log">નોંધણી</string>
- <string name="btn_okay">બરાબર</string>
- <string name="btn_cancel">રદૠકરો</string>
<!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<!--New Wizard Strings-->
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index a2ceeaec..9eaff697 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">יצי××”</string>
<string name="menu_scan">סרוק BridgeQR</string>
<string name="menu_share_bridge">שתף BridgeQR</string>
- <string name="btn_okay">×ישור</string>
- <string name="btn_cancel">ביטול</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">×¤×¨×˜×™× ×ž×¡×•×™×ž×™× ×©×œ Orbot </string>
<string name="wizard_details_msg">Orbot ×”×•× ×™×™×©×•× ×ž×§×•×¨Ö¾×¤×ª×•×— ×שר מכיל ×ת Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent ו-Polipo. ×”×•× ×ž×¡×¤×§ יפוי־כוח מקומי של HTTP (פתחה 8118) ויפוי־כוח SOCKS (פתחה 9050) לתוך רשת Tor. ל-Orbot יש ×’× ×ת היכולת, ×‘×ž×›×©×™×¨×™× ×¢× ×”×¨×©×ת שורש, לשלוח ×ת כל תעבורת ×”××™× ×˜×¨× ×˜ ב×מצעות Tor.</string>
@@ -148,11 +146,9 @@
<string name="delete_service">מחק שירות</string>
<string name="backup_saved_at_external_storage">גיבוי × ×©×ž×¨ ב×חסון ×—×™×¦×•× ×™</string>
<string name="backup_restored">גיבוי שוחזר</string>
- <string name="filemanager_not_available">×ž× ×”×œ ×§×‘×¦×™× ××™× ×• זמין</string>
<string name="please_grant_permissions_for_external_storage">×× × ×”×¢× ×§ הרש×ות עבור ×חסון ×—×™×¦×•× ×™</string>
<string name="restore_backup">שחזר גיבוי</string>
- <string name="create_a_backup_first">צור גיבוי תחילה</string>
- <string name="name_can_t_be_empty">×©× ××™× ×• יכול להיות ריק</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>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 66207af0..718d02eb 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -18,8 +18,6 @@
<string name="menu_exit">निकास</string>
<string name="menu_scan">सà¥à¤•à¥ˆà¤¨ बà¥à¤°à¤¿à¤œ कà¥à¤¯à¥‚आर</string>
<string name="menu_share_bridge">शेयर बà¥à¤°à¤¿à¤œ QR</string>
- <string name="btn_okay">ठीक है</string>
- <string name="btn_cancel">रदà¥à¤¦ करें </string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">कà¥à¤› औरबोट विवरण</string>
<string name="wizard_details_msg">ऑरबोट à¤à¤• ओपन-सोरà¥à¤¸ à¤à¤ªà¥à¤²à¤¿à¤•à¥‡à¤¶à¤¨ है जिसमें टोर, ओबफà¥à¤¸ 4 पà¥à¤°à¥‹à¤•à¥à¤¸à¥€, बैड वीपीà¤à¤¨ टोन 2 à¤à¤¸à¥‰à¤•à¥à¤¸, लिबवेवेंट और पोलीपो शामिल हैं। यह टो नेट नेटवरà¥à¤• में à¤à¤• सà¥à¤¥à¤¾à¤¨à¥€à¤¯ HTTP पà¥à¤°à¥‰à¤•à¥à¤¸à¥€ (8118) और à¤à¤• सॉकà¥à¤¸ पà¥à¤°à¥‰à¤•à¥à¤¸à¥€ (9050) पà¥à¤°à¤¦à¤¾à¤¨ करता है। ऑरबोट की à¤à¥€ कà¥à¤·à¤®à¤¤à¤¾ है, रूट डिवाइस पर, टो के माधà¥à¤¯à¤® से सà¤à¥€ इंटरनेट टà¥à¤°à¥ˆà¤«à¤¿à¤• à¤à¥‡à¤œà¤¨à¥‡ के लिà¤</string>
@@ -149,11 +147,9 @@
<string name="delete_service">सेवा हटाà¤à¤</string>
<string name="backup_saved_at_external_storage">बाहà¥à¤¯ संगà¥à¤°à¤¹à¤£ में बैकअप सहेजा गया</string>
<string name="backup_restored">बैकअप को पà¥à¤¨à¤°à¥à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ किया गया</string>
- <string name="filemanager_not_available">फाइलमैनेजर उपलबà¥à¤§ नहीं है</string>
<string name="please_grant_permissions_for_external_storage">कृपया बाहरी संगà¥à¤°à¤¹à¤£ के लिठअनà¥à¤®à¤¤à¤¿ दें</string>
<string name="restore_backup">बैकअप बहाल</string>
- <string name="create_a_backup_first">पहले बैकअप बनाà¤à¤‚</string>
- <string name="name_can_t_be_empty">नाम रिकà¥à¤¤ नहीं हो सकता</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>
diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml
index ab067581..9ae7b133 100644
--- a/app/src/main/res/values-hr-rHR/strings.xml
+++ b/app/src/main/res/values-hr-rHR/strings.xml
@@ -4,8 +4,7 @@
<string name="menu_about">O</string>
<string name="button_about">O</string>
<string name="menu_exit">Izlaz</string>
- <string name="btn_cancel">Odustani</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Općenito</string>
<!--New Wizard Strings-->
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 8e0fe937..18d85e5f 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Izlaz</string>
<string name="menu_scan">Skeniraj BridgeQR</string>
<string name="menu_share_bridge">Podijeli BridgeQR</string>
- <string name="btn_okay">U redu</string>
- <string name="btn_cancel">Odustani</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Detalji o Orbot-u</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 1fb51809..b25e987b 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Kilépés</string>
<string name="menu_scan">BridgeQR szkennelése</string>
<string name="menu_share_bridge">BridgeQR megosztása</string>
- <string name="btn_okay">OK</string>
- <string name="btn_cancel">Mégsem</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Néhány Orbot adat</string>
<string name="wizard_details_msg">Az Orbot egy nyilt forráskódú alkalmazás ami Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent és Polipo alkalmazásokat tartalmaz. Helyi HTTP proxyt (8118) és SOCKS proxyt (9050) biztosÃt a Tor hálózatba. Az Orbot továbbá képes arra, hogy rootolt eszközön a teljes internet forgalmat keresztül küldje a Tor-on.</string>
@@ -148,11 +146,9 @@
<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="filemanager_not_available">Fájlkezelő nem elérhető</string>
<string name="please_grant_permissions_for_external_storage">Kérjük adjon jogosultságot a külső tárhelyhez</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="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>
diff --git a/app/src/main/res/values-hy-rAM/strings.xml b/app/src/main/res/values-hy-rAM/strings.xml
index 808f972e..a59aa749 100644
--- a/app/src/main/res/values-hy-rAM/strings.xml
+++ b/app/src/main/res/values-hy-rAM/strings.xml
@@ -4,7 +4,6 @@
<string name="menu_about">Õ„Õ¡Õ½Õ«Õ¶</string>
<string name="button_about">Õ„Õ¡Õ½Õ«Õ¶</string>
<string name="menu_exit">ÔµÕ¬Ö„</string>
- <string name="btn_cancel">Õ¥Õ²Õ¡Ö€Õ¯Õ¥Õ¬</string>
<!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<!--New Wizard Strings-->
diff --git a/app/src/main/res/values-ia/strings.xml b/app/src/main/res/values-ia/strings.xml
index c8208c36..e5eae55a 100644
--- a/app/src/main/res/values-ia/strings.xml
+++ b/app/src/main/res/values-ia/strings.xml
@@ -4,8 +4,7 @@
<string name="menu_about">Circa</string>
<string name="button_about">Circa</string>
<string name="menu_exit">Sortir</string>
- <string name="btn_cancel">Cancellar</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">General</string>
<!--New Wizard Strings-->
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 7ca828d8..808657d2 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Keluar</string>
<string name="menu_scan">Pindai BridgeQR</string>
<string name="menu_share_bridge">Bagikan BridgeQR</string>
- <string name="btn_okay">Oke</string>
- <string name="btn_cancel">Batal</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Beberapa Rincian Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
index 77427587..4fa75a8b 100644
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Keluar</string>
<string name="menu_scan">Pindai BridgeQR</string>
<string name="menu_share_bridge">Bagikan BridgeQR</string>
- <string name="btn_okay">Oke</string>
- <string name="btn_cancel">Batal</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Beberapa Rincian Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 2026ca19..c758955c 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -10,7 +10,6 @@
<string name="menu_about">Mengenai</string>
<string name="button_about">Mengenai</string>
<string name="menu_exit">Keluar</string>
- <string name="btn_cancel">Batal</string>
<!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Umum</string>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 801e4330..2d5138ef 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Hætta</string>
<string name="menu_scan">Skanna BridgeQR</string>
<string name="menu_share_bridge">Deila BridgeQR</string>
- <string name="btn_okay">Ã lagi</string>
- <string name="btn_cancel">Hætta við</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Fáein nánari atriði um Orbot</string>
<string name="wizard_details_msg">Orbot er opinn og frjáls hugbúnaður sem inniheldur Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent og Polipo. Það sér um að útbúa staðværan HTTP-milliþjón (8118) og SOCKS-milliþjón (9050) inn á Tor-netið. Orbot getur einnig, á tækjum með rótaraðgangi, sent alla internetumferð à gegnum Tor.</string>
@@ -148,11 +146,9 @@
<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="filemanager_not_available">Skráastjóri ekki tiltækur</string>
<string name="please_grant_permissions_for_external_storage">Gefðu heimild til að nota ytri gagnageymslu</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="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>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 22e1dac1..762127e3 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Esci</string>
<string name="menu_scan">Scansiona BridgeQR</string>
<string name="menu_share_bridge">Condividi BridgeQR</string>
- <string name="btn_okay">Ok</string>
- <string name="btn_cancel">Annulla</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Alcuni dettagli su Orbot</string>
<string name="wizard_details_msg">Orbot é un\'applicazione open source che contiene Tor, Obfs4proxy, BadVPN, Tun2Socks, LibEvent e Polipo. Esso fornisce un proxy HTTP locale (8118) e un proxy SOCKS (9050) per la rete Tor. Orbot permette anche, nei dispositivi rootati, di inviare tutto il traffico tramite Tor.</string>
@@ -148,11 +146,9 @@
<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="filemanager_not_available">Filemanager non disponibile</string>
<string name="please_grant_permissions_for_external_storage">Consenti l\'autorizzazione per l\'archiviazione esterna</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="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>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index f6859955..24e005d0 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -16,8 +16,6 @@
<string name="menu_exit">יצי××”</string>
<string name="menu_scan">סרוק BridgeQR</string>
<string name="menu_share_bridge">שתף BridgeQR</string>
- <string name="btn_okay">×ישור</string>
- <string name="btn_cancel">ביטול</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">×¤×¨×˜×™× ×ž×¡×•×™×ž×™× ×©×œ Orbot </string>
<string name="wizard_details_msg">Orbot ×”×™× ×פליקציית קוד פתוח הכוללת ×ת Tor, LibEvent ו-Polipo. ×”×™× ×ž×ª×—×‘×¨ לרשת Tor ב×מצעות שרת פרוקסי HTTP מקומי (8118) ושרת פרוקסי SOCKS (פורט 9050). Orbot יכולה ×‘× ×•×¡×£ ×¢× ×”×¨×©×ות רוט ×œ× ×ª×‘ ×ת כל תעבורת ×”××™× ×˜×¨× ×˜ של המכשיר דרך Tor כברירת מחדל.</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 384c93a2..940c0331 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">終了</string>
<string name="menu_scan">ブリッジQRをスã‚ャン</string>
<string name="menu_share_bridge">ブリッジQRを共有</string>
- <string name="btn_okay">OK</string>
- <string name="btn_cancel">ã‚ャンセル</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Orbot詳細</string>
<string name="wizard_details_msg">Orbot ã¯Torã€Obfs4Proxyã€BadVPN Tun2Socksã€LibEventã€Polipoã‚’å«ã‚€ã‚ªãƒ¼ãƒ—ンソースアプリã§ã™ã€‚ãƒãƒ¼ã‚«ãƒ«HTTPプãƒã‚ã‚· (8118) 㨠SOCKSプãƒã‚ã‚· (9050) ã‚’Torãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«æŽ¥ç¶šã—ã¾ã™ã€‚root化ã•ã‚ŒãŸç«¯æœ«ã§ã¯Orbotã¯å…¨ã¦ã®é€šä¿¡ã‚’Torを通ã—ã¦è¡Œã†ã“ã¨ã‚‚ã§ãã¾ã™ã€‚</string>
@@ -148,11 +146,9 @@
<string name="delete_service">サービスを削除</string>
<string name="backup_saved_at_external_storage">ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã¯å¤–部記憶装置ã«ä¿å˜ã•ã‚Œã¾ã—ãŸ</string>
<string name="backup_restored">ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã‹ã‚‰å¾©å…ƒ</string>
- <string name="filemanager_not_available">該当ファイル・マãƒãƒ¼ã‚¸ãƒ£ãƒ¼ãªã—</string>
<string name="please_grant_permissions_for_external_storage">外部記憶ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹è¨±å¯ã‚’与ãˆã¦ä¸‹ã•ã„。</string>
<string name="restore_backup">ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã®å¾©æ—§</string>
- <string name="create_a_backup_first">最åˆã«ã€ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—を作æˆã—ã¦ä¸‹ã•ã„</string>
- <string name="name_can_t_be_empty">åå‰ã¯ãƒ–ランクã®ã¾ã¾ã«ã§ãã¾ã›ã‚“</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>
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index 5d222dbb..9e5403b7 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -3,7 +3,6 @@
<string name="app_name">ಆರà³à²¬à³‹à²Ÿà³</string>
<string name="menu_about">ಬಗà³à²—ೆ</string>
<string name="button_about">ಬಗà³à²—ೆ</string>
- <string name="btn_cancel">Cancel</string>
<!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<!--New Wizard Strings-->
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 086e9be6..d80f9108 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">종료</string>
<string name="menu_scan">브릿지 QR코드 스캔하기</string>
<string name="menu_share_bridge">브릿지 QR코드 ê³µìœ í•˜ê¸°</string>
- <string name="btn_okay">확ì¸</string>
- <string name="btn_cancel">취소</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Orbotì— ëŒ€í•œ 몇몇 ìƒì„¸ì‚¬í•</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-ky/strings.xml b/app/src/main/res/values-ky/strings.xml
index f63feabf..57a3ca97 100644
--- a/app/src/main/res/values-ky/strings.xml
+++ b/app/src/main/res/values-ky/strings.xml
@@ -5,8 +5,7 @@
<string name="menu_about">Программа жөнүндө</string>
<string name="button_about">Программа жөнүндө</string>
<string name="menu_exit">Чыгуу</string>
- <string name="btn_cancel">Ðйнуу</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<!--New Wizard Strings-->
<!--Title Screen-->
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index fbd7a5fc..2ff6f375 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">IÅ¡eiti</string>
<string name="menu_scan">Nuskaityti tilto QR kodÄ…</string>
<string name="menu_share_bridge">Dalintis tilto QR kodu</string>
- <string name="btn_okay">Gerai</string>
- <string name="btn_cancel">Atsisakyti</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Orbot detalÄ—s</string>
<string name="wizard_details_msg">Orbot yra atviro kodo programėlė, kuri susideda iš Tor, Obfs4Proxy, BadVPN, Tun2Socks, LibEvent ir Polipo. Ji leidžia jungtis prie Tor tinklo per HTTP (8118) ir SOCKS (9050) tarpinius serverius. Orbot taip pat leidžia perkelti visą tinklo srautą per Tor tinklą, jeigu turite root/supernaudotojo privilegijas.</string>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index 51732372..4266a96d 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Iziet</string>
<string name="menu_scan">Skenēt BridgeQR</string>
<string name="menu_share_bridge">Koplietot BridgeQR</string>
- <string name="btn_okay">Labi</string>
- <string name="btn_cancel">Atcelt</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">VairÄk informÄcijas par Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index 949f1c8b..8a3a2731 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Излез</string>
<string name="menu_scan">Скенирај QR на моÑÑ‚</string>
<string name="menu_share_bridge">Сподели QR на моÑÑ‚</string>
- <string name="btn_okay">OK</string>
- <string name="btn_cancel">Откажи</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Ðеколку детали за Orbot</string>
<string name="wizard_details_msg">Orbot e апликација Ñо отворен код која Ñодржи Tor Obfs4Proxy, BadVPN Tun2Socks, LibEvent и Polipo. Овозможува локален HTTP прокÑи (8118) и SOCKS прокÑи (9050) во Tor мрежата. Orbot иÑто така има можноÑÑ‚, на уред Ñо root приÑтап, да го иÑпраќа целиот интернет Ñообраќај преку Tor.</string>
@@ -148,11 +146,9 @@
<string name="delete_service">Избриши уÑлуга</string>
<string name="backup_saved_at_external_storage">Резервната копија е Ñнимена на надворешна меморија</string>
<string name="backup_restored">Вратено од резервна копија</string>
- <string name="filemanager_not_available">Менаџерот на датотеки не е доÑтапен</string>
<string name="please_grant_permissions_for_external_storage">Ве молиме дадете дозволи за надворешна меморија</string>
<string name="restore_backup">Врати резервна копија</string>
- <string name="create_a_backup_first">Создади резервна копија</string>
- <string name="name_can_t_be_empty">Името не може да биде празно</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>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index 0a582739..d6e713bc 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -4,7 +4,6 @@
<string name="menu_stop">നിരàµâ€à´¤àµà´¤àµà´•</string>
<string name="menu_about">വിവരം</string>
<string name="button_about">വിവരം</string>
- <string name="btn_cancel">റദàµà´¦à´¾à´•àµà´•àµà´• </string>
<!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">പൊതàµà´µà´¾à´¯à´¤àµ</string>
diff --git a/app/src/main/res/values-mn/strings.xml b/app/src/main/res/values-mn/strings.xml
index 29345090..dd5db5b3 100644
--- a/app/src/main/res/values-mn/strings.xml
+++ b/app/src/main/res/values-mn/strings.xml
@@ -2,8 +2,7 @@
<resources>
<string name="menu_about">Тухай</string>
<string name="button_about">Тухай</string>
- <string name="btn_cancel">Cancel</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<!--New Wizard Strings-->
<!--Title Screen-->
diff --git a/app/src/main/res/values-ms-rMY/strings.xml b/app/src/main/res/values-ms-rMY/strings.xml
index b1fa7de0..e6a87012 100644
--- a/app/src/main/res/values-ms-rMY/strings.xml
+++ b/app/src/main/res/values-ms-rMY/strings.xml
@@ -13,8 +13,6 @@
<string name="main_layout_upload">Muat naik</string>
<string name="button_about">Tentang</string>
<string name="menu_exit">Keluar</string>
- <string name="btn_okay">Okay</string>
- <string name="btn_cancel">Batal</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Maklumat Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index dc6edad7..d018f812 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -12,8 +12,6 @@
<string name="menu_about">Tentang</string>
<string name="button_about">Tentang</string>
<string name="menu_exit">Keluar</string>
- <string name="btn_okay">Okay</string>
- <string name="btn_cancel">Batal</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Maklumat Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
index 6f1e25b9..c8181628 100644
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@@ -7,7 +7,6 @@
<string name="main_layout_download">ဒေါင်းလုဒ်</string>
<string name="button_about">အကြောင်း</string>
<string name="menu_exit">ထွက်ရန်</string>
- <string name="btn_cancel">ဖျက်သá€á€™á€ºá€¸á€›á€”်</string>
<!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">ယေဘုယျ</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index b780794a..0b3385a4 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Avslutt</string>
<string name="menu_scan">Skann BridgeQR</string>
<string name="menu_share_bridge">Del BridgeQR</string>
- <string name="btn_okay">Ok</string>
- <string name="btn_cancel">Avbryt</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Noen Orbot-detaljer</string>
<!--END Welcome Wizard strings (DJH)-->
@@ -142,8 +140,7 @@
<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="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>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index c681a577..4ee74353 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Sluiten</string>
<string name="menu_scan">BridgeQR scannen</string>
<string name="menu_share_bridge">BridgeQR delen</string>
- <string name="btn_okay">Oké</string>
- <string name="btn_cancel">Annuleren</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Enkele Orbot-gegevens</string>
<string name="wizard_details_msg">Orbot is een openbronapplicatie die Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent en Polipo bevat. Het creëert een lokale HTTP-proxy (8118) en een SOCKS-proxy (9050) naar het Tor-netwerk. Orbot heeft ook de mogelijkheid om al het internetverkeer over het Tor-netwerk te sturen.</string>
@@ -148,11 +146,9 @@
<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="filemanager_not_available">Bestandsbeheerder niet beschikbaar</string>
<string name="please_grant_permissions_for_external_storage">Verleen toestemmingen voor externe opslag</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="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>
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
index 8b163418..c8ef4e30 100644
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@@ -4,8 +4,7 @@
<string name="menu_about">ਇਸ ਬਾਰੇ</string>
<string name="button_about">ਇਸ ਬਾਰੇ</string>
<string name="menu_exit">ਬੰਦ ਕਰੋ</string>
- <string name="btn_cancel">ਰੱਦ ਕਰੋ</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<!--New Wizard Strings-->
<!--Title Screen-->
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index c7d97517..2f8f36a4 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Wyjście</string>
<string name="menu_scan">Skanuj BridgeQR</string>
<string name="menu_share_bridge">Podziel siÄ™ BridgeQR</string>
- <string name="btn_okay">OK</string>
- <string name="btn_cancel">Anuluj</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Niektóre szczegóły o Orbocie</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-ps/strings.xml b/app/src/main/res/values-ps/strings.xml
index e832af24..12fa5a98 100644
--- a/app/src/main/res/values-ps/strings.xml
+++ b/app/src/main/res/values-ps/strings.xml
@@ -1,7 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="btn_cancel">Cancel</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<!--New Wizard Strings-->
<!--Title Screen-->
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 787cecf1..b290a20a 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Sair</string>
<string name="menu_scan">Escanear BridgeQR</string>
<string name="menu_share_bridge">Compartilhar BridgeQR</string>
- <string name="btn_okay">Okay</string>
- <string name="btn_cancel">Cancelar</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Alguns detalhes do Orbot</string>
<string name="wizard_details_msg">Orbot é um software de código aberto que contem Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent e Polipo. Ele fornece um proxy local HTTP (8118) e um proxy SOCKS (9050) como acesso a rede Tor. Orbot também tem a habilidade, em dispositivos com acesso root, de enviar todo o trafego de Internet via rede Tor.</string>
@@ -148,11 +146,9 @@
<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="filemanager_not_available">Gerenciador de arquivos não está disponÃvel</string>
<string name="please_grant_permissions_for_external_storage">Por favor dê permissões ao armazenamento externo</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="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>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 8fe12cbd..3007685b 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -19,8 +19,6 @@
<string name="menu_exit">Sair</string>
<string name="menu_scan">Digitalizar BridgeQR</string>
<string name="menu_share_bridge">Partilhar BridgeQR</string>
- <string name="btn_okay">Ok</string>
- <string name="btn_cancel">Cancelar</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Alguns Detalhes do Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index b819147e..9f465f0a 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -15,8 +15,6 @@
<string name="menu_exit">Sair</string>
<string name="menu_scan">Digitalizar BridgeQR</string>
<string name="menu_share_bridge">Compartilhar BridgeQR</string>
- <string name="btn_okay">OK</string>
- <string name="btn_cancel">Cancelar</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Alguns Detalhes do Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index dc8ae0d6..ab884808 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -4,8 +4,7 @@
<string name="menu_about">Despre</string>
<string name="button_about">Despre</string>
<string name="menu_exit">IeÅŸire</string>
- <string name="btn_cancel">Revocare</string>
- <!--Welcome Wizard strings (DJH)-->
+ <!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">General</string>
<!--New Wizard Strings-->
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 47587d6d..47c329ea 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">IeÅŸire</string>
<string name="menu_scan">Scanează BridgeQR</string>
<string name="menu_share_bridge">Distribuie BridgeQR</string>
- <string name="btn_okay">Ok</string>
- <string name="btn_cancel">Revocare</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Detalii Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 6149e0a9..7c1ecf28 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Выход</string>
<string name="menu_scan">Сканировать QR-код моÑта</string>
<string name="menu_share_bridge">Опубликовать QR-код моÑта</string>
- <string name="btn_okay">OK</string>
- <string name="btn_cancel">Отмена</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Ðекоторые ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ программе Orbot</string>
<string name="wizard_details_msg">Orbot — Ñто приложение Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¼ иÑходным кодом, которое Ñодержит Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent и Polipo. Оно предоÑтавлÑет локальный HTTP- (8118) и SOCKS-прокÑи (9050) в Ñеть Tor. Orbot также позволÑет на уÑтройÑтвах Ñ Ð¿Ñ€Ð°Ð²Ð°Ð¼Ð¸ root переÑылать веÑÑŒ интернет-трафик через Tor.</string>
@@ -148,11 +146,9 @@
<string name="delete_service">Удалить Ñлужбу</string>
<string name="backup_saved_at_external_storage">Ð ÐµÐ·ÐµÑ€Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ Ñохранена на внешнем хранилище</string>
<string name="backup_restored">ВоÑÑтановлено из резервной копии</string>
- <string name="filemanager_not_available">Файловый менеджер недоÑтупен</string>
<string name="please_grant_permissions_for_external_storage">ПредоÑтавьте Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð´Ð¾Ñтупа к внешнему хранилищу</string>
<string name="restore_backup">ВоÑÑтановить из копии</string>
- <string name="create_a_backup_first">Сначала Ñоздайте резервную копию</string>
- <string name="name_can_t_be_empty">Ð˜Ð¼Ñ Ð½Ðµ может быть пуÑтым</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>
diff --git a/app/src/main/res/values-si-rLK/strings.xml b/app/src/main/res/values-si-rLK/strings.xml
index e533ac70..d25c1f8a 100644
--- a/app/src/main/res/values-si-rLK/strings.xml
+++ b/app/src/main/res/values-si-rLK/strings.xml
@@ -14,8 +14,6 @@
<string name="main_layout_upload">උඩුගචකරන්න </string>
<string name="button_about">පිළිබද</string>
<string name="menu_exit">ඉවà¶à·Š වන්න</string>
- <string name="btn_okay">එකගයි</string>
- <string name="btn_cancel">අවලංගු කරන්න</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Orbot පිළිබද ඇà¶à·à¶¸à·Š විස්à¶à¶» </string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 9efec20c..7306f4ec 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">UkonÄiÅ¥</string>
<string name="menu_scan">Zoskenovať BridgeQR</string>
<string name="menu_share_bridge">Zdielať BridgeQR</string>
- <string name="btn_okay">OK</string>
- <string name="btn_cancel">Zrušiť</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Niekoľko detailov o Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 795934f7..b819d581 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -13,8 +13,6 @@
<string name="main_layout_upload">Naloži</string>
<string name="button_about">O programu</string>
<string name="menu_exit">Izhod</string>
- <string name="btn_okay">Potrdi</string>
- <string name="btn_cancel">Prekini</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Nekaj podrobnosti o Orbot-u</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-sn/strings.xml b/app/src/main/res/values-sn/strings.xml
index 247cd012..fc47b092 100644
--- a/app/src/main/res/values-sn/strings.xml
+++ b/app/src/main/res/values-sn/strings.xml
@@ -6,7 +6,6 @@
<string name="menu_about">Maererano</string>
<string name="button_about">Maererano</string>
<string name="menu_exit">Buda</string>
- <string name="btn_cancel">Kanzura</string>
<!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<!--New Wizard Strings-->
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index a54bdc79..b871275a 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -9,8 +9,6 @@
<string name="main_layout_download">Shkarkim</string>
<string name="button_about">Informacione</string>
<string name="menu_exit">Dil</string>
- <string name="btn_okay">Ne rregul</string>
- <string name="btn_cancel">Anullo</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Disa detaje te Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index ea0b1d80..8a4dc91a 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Излаз</string>
<string name="menu_scan">Скенирај BridgeQR</string>
<string name="menu_share_bridge">Подели BridgeQR</string>
- <string name="btn_okay">У реду</string>
- <string name="btn_cancel">Откажи</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Детаљи о Орботу</string>
<string name="wizard_details_msg">Орбот је апликација отвореног кода која Ñадржи Тор, Obfs4Proxy, BadVPN Tun2Socks, LibEvent и Polipo. Омогућава локални HTTP proxy (8118) и SOCKS proxy (9050) у Тор мрежу. Орбот такође има могућноÑÑ‚ да на рутованом уређају шаље Ñав интернет Ñаобраћај преко Тор-а.</string>
@@ -146,11 +144,9 @@
<string name="delete_service">Обриши УÑлугу</string>
<string name="backup_saved_at_external_storage">Резербна копија је Ñачувана на Ñпољној меморији</string>
<string name="backup_restored">Резервна копија је обновљена</string>
- <string name="filemanager_not_available">Менаџер фајлова није доÑтупан</string>
<string name="please_grant_permissions_for_external_storage">Молимо да дате дозволе за екÑтерно Ñкладиштење</string>
<string name="restore_backup">Обнови резервну копију</string>
- <string name="create_a_backup_first">Ðаправи резервну копију прво</string>
- <string name="name_can_t_be_empty">Име не може бити празно</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>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index f3ec3142..d9b78350 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Avsluta</string>
<string name="menu_scan">Skanna BridgeQR</string>
<string name="menu_share_bridge">Dela BridgeQR</string>
- <string name="btn_okay">Okej</string>
- <string name="btn_cancel">Avbryt</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Orbot-information</string>
<string name="wizard_details_msg">Orbot är ett program med öppen källkod som innehåller Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent och Polipo. Den tillhandahåller en lokal HTTP-proxy (8118) och en SOCKS-proxy (9050) i Tor-nätverket. Orbot har också förmågan att, på rotad enhet, skicka all internettrafik genom Tor.</string>
@@ -148,11 +146,9 @@
<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="filemanager_not_available">Filhanteraren är inte tillgänglig</string>
<string name="please_grant_permissions_for_external_storage">Bevilja tillstånd för extern lagring</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="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>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index f5dbc3ff..77ff4796 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -16,8 +16,6 @@
<string name="menu_exit">வெளியேறà¯</string>
<string name="menu_scan">ஸà¯à®•à¯‡à®©à¯ BridgeQR</string>
<string name="menu_share_bridge">BridgeQR பகிரà¯à®¨à¯à®¤à®¿à®Ÿà¯</string>
- <string name="btn_okay">சரி</string>
- <string name="btn_cancel">ரதà¯à®¤à¯ செயà¯</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">ஆரà¯à®ªà®¾à®Ÿà¯ பறà¯à®±à®¿à®¯ தகவலà¯</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index b6e23352..f227ce70 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">à¸à¸à¸</string>
<string name="menu_scan">สà¹à¸à¸™ BridgeQR</string>
<string name="menu_share_bridge">à¹à¸Šà¸£à¹Œ BridgeQR</string>
- <string name="btn_okay">ตà¸à¸¥à¸‡</string>
- <string name="btn_cancel">ยà¸à¹€à¸¥à¸´à¸</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">รายละเà¸à¸µà¸¢à¸”เà¸à¸µà¹ˆà¸¢à¸§à¸à¸±à¸š Orbot</string>
<string name="wizard_details_msg">Orbot เป็นà¹à¸à¸›à¸žà¸¥à¸´à¹€à¸„ชันโà¸à¹€à¸žà¹ˆà¸™à¸‹à¸à¸£à¹Œà¸ªà¸—ี่ประà¸à¸à¸šà¸”้วย Tor, Obfs4Proxy, BadVPN, Tun2Socks, LibEvent à¹à¸¥à¸° Polipo โดย Orbot จะสร้างพร็à¸à¸à¸‹à¸µ (8118) à¹à¸¥à¸°à¸žà¸£à¹‡à¸à¸à¸‹à¸µ SOCKS (9050) ในเครื่à¸à¸‡ ภายในเครืà¸à¸‚่าย Tor Orbot ยังสามารถทำà¸à¸²à¸£à¸£à¸±à¸šà¸ªà¹ˆà¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¸—ั้งหมดส่งผ่าน Tor ได้บนà¸à¸¸à¸›à¸à¸£à¸“์ที่ได้ทำà¸à¸²à¸£ root à¹à¸¥à¹‰à¸§</string>
@@ -148,11 +146,9 @@
<string name="delete_service">บริà¸à¸²à¸£à¸¥à¸š</string>
<string name="backup_saved_at_external_storage">ข้à¸à¸¡à¸¹à¸¥à¸ªà¸³à¸£à¸à¸‡à¸šà¸±à¸™à¸—ึà¸à¸—ี่ที่เà¸à¹‡à¸šà¸‚้à¸à¸¡à¸¹à¸¥à¸ ายนà¸à¸</string>
<string name="backup_restored">คืนค่าข้à¸à¸¡à¸¹à¸¥à¸ªà¸³à¸£à¸à¸‡</string>
- <string name="filemanager_not_available">ไม่สามารถใช้ Filemanager ได้</string>
<string name="please_grant_permissions_for_external_storage">à¸à¸£à¸¸à¸“าà¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¹€à¸‚้าถึงที่เà¸à¹‡à¸šà¸‚้à¸à¸¡à¸¹à¸¥à¸ ายนà¸à¸</string>
<string name="restore_backup">คืนค่าข้à¸à¸¡à¸¹à¸¥à¸ªà¸³à¸£à¸à¸‡</string>
- <string name="create_a_backup_first">สร้างข้à¸à¸¡à¸¹à¸¥à¸ªà¸³à¸£à¸à¸‡à¸à¹ˆà¸à¸™</string>
- <string name="name_can_t_be_empty">ปล่à¸à¸¢à¸Šà¸·à¹ˆà¸à¹ƒà¸«à¹‰à¸§à¹ˆà¸²à¸‡à¹„ม่ได้</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>
diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml
index 30bdb73c..9514f37e 100644
--- a/app/src/main/res/values-tl/strings.xml
+++ b/app/src/main/res/values-tl/strings.xml
@@ -14,8 +14,6 @@
<string name="button_about">Tungkol</string>
<string name="menu_exit">Labasan</string>
<string name="menu_share_bridge">Ipamahagi ang BridgeQR</string>
- <string name="btn_okay">Okay</string>
- <string name="btn_cancel">Kanselahin</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Ilang detalye sa Orbot</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index e050f9e6..13bafec3 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Çıkış</string>
<string name="menu_scan">QR kodu tara</string>
<string name="menu_share_bridge">QR kodu paylaÅŸ</string>
- <string name="btn_okay">Tamam</string>
- <string name="btn_cancel">Ä°ptal</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Bazı Orbot Ayrıntıları</string>
<string name="wizard_details_msg">Orbot; Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent ve Polipo yapılarını kapsayan açık kaynaklı bir uygulamadır. Tor ağına bağlanmak için bir yerel HTTP vekil sunucu (8118) ve bir SOCKS vekil sunucu (9050) sağlar. Orbot ayrıca, rootlanmış aygıtlarda tüm İnternet trafiğini Tor üzerinden gönderebilir.</string>
@@ -148,11 +146,9 @@
<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="filemanager_not_available">Dosya tarayıcı kullanılamıyor</string>
<string name="please_grant_permissions_for_external_storage">Lütfen dış depolama için izinleri verin</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="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>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 16c57e1c..7655621b 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Вихід</string>
<string name="menu_scan">Сканувати BridgeQR</string>
<string name="menu_share_bridge">ПоділитиÑÑ BridgeQR</string>
- <string name="btn_okay">OK</string>
- <string name="btn_cancel">Відміна</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">ДеÑкі відомоÑÑ‚Ñ– про програму Orbot</string>
<string name="wizard_details_msg">Orbot — це програма з відкритим кодом, Ñка міÑтить Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent Ñ– Polipo. Він забезпечує локальний HTTP-прокÑÑ– (8118) та прокÑÑ– SOCKS (9050) у мережу Tor. Orbot також має здатніÑÑ‚ÑŒ, на кореневому приÑтрої, відправлÑти веÑÑŒ інтернет-трафік через Tor.</string>
@@ -148,11 +146,9 @@
<string name="delete_service">Вилучити СервіÑ</string>
<string name="backup_saved_at_external_storage">Резервна ÐºÐ¾Ð¿Ñ–Ñ Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð° на зовнішній пам\'ÑÑ‚Ñ–</string>
<string name="backup_restored">Резервне ÐºÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ð½Ð½Ñ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾</string>
- <string name="filemanager_not_available">Менеджер файлів недоÑтупний</string>
<string name="please_grant_permissions_for_external_storage">Ðадайте дозволи на зовнішню пам\'ÑÑ‚ÑŒ</string>
<string name="restore_backup">Відновити резервну копію</string>
- <string name="create_a_backup_first">Спершу Ñтворити резервну копію</string>
- <string name="name_can_t_be_empty">Ðазва не може бути порожньою</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>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 17c15bd2..0a9144d1 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -5,7 +5,6 @@
<string name="menu_start">شروع کرئیں</string>
<string name="menu_about">کے بارے میں</string>
<string name="button_about">کے بارے میں</string>
- <string name="btn_cancel">تنسیخ کیجیے</string>
<!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">عام </string>
diff --git a/app/src/main/res/values-uz/strings.xml b/app/src/main/res/values-uz/strings.xml
index 470ee983..88a8df79 100644
--- a/app/src/main/res/values-uz/strings.xml
+++ b/app/src/main/res/values-uz/strings.xml
@@ -10,7 +10,6 @@
<string name="main_layout_upload">Yuklash</string>
<string name="button_about">Dasur haqida</string>
<string name="menu_exit">Chiqish</string>
- <string name="btn_cancel">Bekor qilish</string>
<!--Welcome Wizard strings (DJH)-->
<!--END Welcome Wizard strings (DJH)-->
<string name="pref_general_group">Umumiy</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 2b789ede..1f1ffff1 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Thoát</string>
<string name="menu_scan">Quét mã BridgeQR</string>
<string name="menu_share_bridge">Xuất mã BridgeQR</string>
- <string name="btn_okay">Äồng ý</string>
- <string name="btn_cancel">Hủy</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Và i chi tiết vỠOrbot</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 12adef13..1ca54872 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">退出</string>
<string name="menu_scan">扫æ网桥QRç </string>
<string name="menu_share_bridge">分享网桥QRç </string>
- <string name="btn_okay">确定</string>
- <string name="btn_cancel">å–消</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">更多 Orbot ä¿¡æ¯</string>
<!--END Welcome Wizard strings (DJH)-->
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 4c79d4d6..e19327a9 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">離開</string>
<string name="menu_scan">掃æ網橋 QR 碼</string>
<string name="menu_share_bridge">分享網橋 QR 碼</string>
- <string name="btn_okay">確定</string>
- <string name="btn_cancel">å–消</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Orbot 的一些詳細資料</string>
<string name="wizard_details_msg">Orbot 是一款開æºæ‡‰ç”¨,å…¶åŒ…å« Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent 與 Polipo.它æ供了本地的 HTTP ä»£ç† (8118) 與 SOCKS ä»£ç† (9050) 到 Tor 網路ä¸. Orbot 也有能力å¯åœ¨å–得最高權é™çš„è¨å‚™ä¸Šä¾†åˆ©ç”¨ Tor 傳é€äº’è¯ç¶²æµé‡</string>
@@ -148,11 +146,9 @@
<string name="delete_service">刪除æœå‹™</string>
<string name="backup_saved_at_external_storage">備份檔儲å˜åœ¨å¤–部儲å˜å™¨</string>
<string name="backup_restored">備份已還原</string>
- <string name="filemanager_not_available">檔案管ç†å“¡ä¸å¯ç”¨</string>
<string name="please_grant_permissions_for_external_storage">請授權外接儲å˜å™¨ä½¿ç”¨</string>
<string name="restore_backup">還原備份</string>
- <string name="create_a_backup_first">先創立備份</string>
- <string name="name_can_t_be_empty">å稱ä¸å¯ç©ºç™½</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>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bc73e840..85b356c9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,8 +17,6 @@
<string name="menu_exit">Exit</string>
<string name="menu_scan">Scan BridgeQR</string>
<string name="menu_share_bridge">Share BridgeQR</string>
- <string name="btn_okay">Okay</string>
- <string name="btn_cancel">Cancel</string>
<!--Welcome Wizard strings (DJH)-->
<string name="wizard_details">Some Orbot Details</string>
<string name="wizard_details_msg">Orbot is an open-source application that contains Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string>
@@ -188,10 +186,8 @@
<string name="delete_service">Delete Service</string>
<string name="backup_saved_at_external_storage">Backup saved at external storage</string>
<string name="backup_restored">Backup restored</string>
- <string name="filemanager_not_available">Filemanager not available</string>
<string name="please_grant_permissions_for_external_storage">Please grant permissions for external storage</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>
diff --git a/appcore/src/main/java/org/torproject/android/core/DiskUtils.kt b/appcore/src/main/java/org/torproject/android/core/DiskUtils.kt
new file mode 100644
index 00000000..f9ce78ec
--- /dev/null
+++ b/appcore/src/main/java/org/torproject/android/core/DiskUtils.kt
@@ -0,0 +1,39 @@
+package org.torproject.android.core
+
+import android.content.ContentResolver
+import android.content.Intent
+import android.net.Uri
+import java.io.BufferedReader
+import java.io.IOException
+import java.lang.StringBuilder
+
+object DiskUtils {
+ @JvmStatic
+ fun createWriteFileIntent(filename: String, mimeType: String): Intent = Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
+ addCategory(Intent.CATEGORY_OPENABLE)
+ type = mimeType
+ putExtra(Intent.EXTRA_TITLE, filename)
+ }
+
+ @JvmStatic
+ fun createReadFileIntent(mimeType: String): Intent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
+ addCategory(Intent.CATEGORY_OPENABLE)
+ type = mimeType
+ }
+
+ @JvmStatic
+ fun readFileFromInputStream(contentResolver: ContentResolver, file: Uri): String {
+ val text = StringBuilder()
+ val input = contentResolver.openInputStream(file)
+ val reader = BufferedReader(input!!.reader())
+ reader.use { reader ->
+ var line = reader.readLine()
+ while (line != null) {
+ text.append(line)
+ line = reader.readLine()
+ }
+ }
+ return text.toString()
+ }
+
+}
\ No newline at end of file
diff --git a/appcore/src/main/java/org/torproject/android/core/ExternalStorage.kt b/appcore/src/main/java/org/torproject/android/core/ExternalStorage.kt
deleted file mode 100644
index 77493195..00000000
--- a/appcore/src/main/java/org/torproject/android/core/ExternalStorage.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.torproject.android.core
-
-import android.os.Environment
-import java.io.File
-
-object ExternalStorage {
- private const val ORBOT_BACKUPS_DIR = "Orbot"
- @JvmStatic
- fun getOrCreateBackupDir(): File? {
- // Checks if external storage is available for read and write
- if (Environment.MEDIA_MOUNTED != Environment.getExternalStorageState()) return null
- val dir = File(Environment.getExternalStorageDirectory(), ORBOT_BACKUPS_DIR)
- return if (!dir.isDirectory && !dir.mkdirs()) null else dir
- }
-}
\ No newline at end of file
More information about the tor-commits
mailing list