December 2020 - tor-commits - lists.torproject.org

[orbot/master] Correct data-rate units, Fixes #378
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 590d440dadd6cd8a8dc5b50ffb62320b8d5ef5b1 Author: bim <dsnake(a)protonmail.com> Date: Sun Dec 6 13:53:12 2020 -0500 Correct data-rate units, Fixes #378 --- app-mini/src/main/res/values-ar/strings.xml | 2 -- app-mini/src/main/res/values-ay/strings.xml | 2 -- app-mini/src/main/res/values-az/strings.xml | 2 -- app-mini/src/main/res/values-be/strings.xml | 2 -- app-mini/src/main/res/values-bg/strings.xml | 2 -- app-mini/src/main/res/values-ca/strings.xml | 2 -- app-mini/src/main/res/values-cs-rCZ/strings.xml | 2 -- app-mini/src/main/res/values-de/strings.xml | 2 -- app-mini/src/main/res/values-el/strings.xml | 2 -- app-mini/src/main/res/values-es-rAR/strings.xml | 2 -- app-mini/src/main/res/values-es/strings.xml | 2 -- app-mini/src/main/res/values-eu/strings.xml | 2 -- app-mini/src/main/res/values-fa/strings.xml | 2 -- app-mini/src/main/res/values-fi/strings.xml | 2 -- app-mini/src/main/res/values-fr-rFR/strings.xml | 2 -- app-mini/src/main/res/values-fr/strings.xml | 2 -- app-mini/src/main/res/values-gl/strings.xml | 2 -- app-mini/src/main/res/values-he/strings.xml | 2 -- app-mini/src/main/res/values-hi/strings.xml | 2 -- app-mini/src/main/res/values-hr/strings.xml | 2 -- app-mini/src/main/res/values-hu/strings.xml | 2 -- app-mini/src/main/res/values-id/strings.xml | 2 -- app-mini/src/main/res/values-in-rID/strings.xml | 2 -- app-mini/src/main/res/values-is/strings.xml | 2 -- app-mini/src/main/res/values-it/strings.xml | 2 -- app-mini/src/main/res/values-iw/strings.xml | 2 -- app-mini/src/main/res/values-ja/strings.xml | 2 -- app-mini/src/main/res/values-ko/strings.xml | 2 -- app-mini/src/main/res/values-lv/strings.xml | 2 -- app-mini/src/main/res/values-mk/strings.xml | 2 -- app-mini/src/main/res/values-nb/strings.xml | 2 -- app-mini/src/main/res/values-nl/strings.xml | 2 -- app-mini/src/main/res/values-pl/strings.xml | 2 -- app-mini/src/main/res/values-pt-rBR/strings.xml | 2 -- app-mini/src/main/res/values-pt-rPT/strings.xml | 2 -- app-mini/src/main/res/values-pt/strings.xml | 2 -- app-mini/src/main/res/values-ro/strings.xml | 2 -- app-mini/src/main/res/values-ru/strings.xml | 2 -- app-mini/src/main/res/values-sk/strings.xml | 2 -- app-mini/src/main/res/values-sr/strings.xml | 2 -- app-mini/src/main/res/values-sv/strings.xml | 2 -- app-mini/src/main/res/values-th/strings.xml | 2 -- app-mini/src/main/res/values-tl/strings.xml | 2 -- app-mini/src/main/res/values-tr/strings.xml | 2 -- app-mini/src/main/res/values-uk/strings.xml | 2 -- app-mini/src/main/res/values-vi/strings.xml | 2 -- app-mini/src/main/res/values-zh-rCN/strings.xml | 2 -- app-mini/src/main/res/values-zh-rTW/strings.xml | 2 -- app-mini/src/main/res/values/strings.xml | 4 ---- .../java/org/torproject/android/OrbotMainActivity.java | 16 ++++++++-------- app/src/main/res/values-ar/strings.xml | 4 ---- app/src/main/res/values-ay/strings.xml | 4 ---- app/src/main/res/values-az/strings.xml | 4 ---- app/src/main/res/values-be/strings.xml | 4 ---- app/src/main/res/values-bg/strings.xml | 4 ---- app/src/main/res/values-ca/strings.xml | 4 ---- app/src/main/res/values-cs-rCZ/strings.xml | 4 ---- app/src/main/res/values-da/strings.xml | 2 -- app/src/main/res/values-de/strings.xml | 4 ---- app/src/main/res/values-el/strings.xml | 4 ---- app/src/main/res/values-es-rAR/strings.xml | 4 ---- app/src/main/res/values-es/strings.xml | 4 ---- app/src/main/res/values-eu/strings.xml | 4 ---- app/src/main/res/values-fa/strings.xml | 4 ---- app/src/main/res/values-fi/strings.xml | 4 ---- app/src/main/res/values-fr-rFR/strings.xml | 4 ---- app/src/main/res/values-fr/strings.xml | 4 ---- app/src/main/res/values-gl/strings.xml | 4 ---- app/src/main/res/values-he/strings.xml | 4 ---- app/src/main/res/values-hi/strings.xml | 4 ---- app/src/main/res/values-hr/strings.xml | 4 ---- app/src/main/res/values-hu/strings.xml | 4 ---- app/src/main/res/values-id/strings.xml | 4 ---- app/src/main/res/values-in-rID/strings.xml | 4 ---- app/src/main/res/values-is/strings.xml | 4 ---- app/src/main/res/values-it/strings.xml | 4 ---- app/src/main/res/values-iw/strings.xml | 4 ---- app/src/main/res/values-ja/strings.xml | 4 ---- app/src/main/res/values-ko/strings.xml | 4 ---- app/src/main/res/values-lv/strings.xml | 4 ---- app/src/main/res/values-mk/strings.xml | 4 ---- app/src/main/res/values-my/strings.xml | 2 -- app/src/main/res/values-nb/strings.xml | 4 ---- app/src/main/res/values-nl/strings.xml | 4 ---- app/src/main/res/values-pl/strings.xml | 4 ---- app/src/main/res/values-pt-rBR/strings.xml | 4 ---- app/src/main/res/values-pt-rPT/strings.xml | 4 ---- app/src/main/res/values-pt/strings.xml | 4 ---- app/src/main/res/values-ro/strings.xml | 4 ---- app/src/main/res/values-ru/strings.xml | 4 ---- app/src/main/res/values-si-rLK/strings.xml | 2 -- app/src/main/res/values-sk/strings.xml | 4 ---- app/src/main/res/values-sr/strings.xml | 4 ---- app/src/main/res/values-sv/strings.xml | 4 ---- app/src/main/res/values-th/strings.xml | 4 ---- app/src/main/res/values-tl/strings.xml | 4 ---- app/src/main/res/values-tr/strings.xml | 4 ---- app/src/main/res/values-uk/strings.xml | 4 ---- app/src/main/res/values-vi/strings.xml | 4 ---- app/src/main/res/values-zh-rCN/strings.xml | 4 ---- app/src/main/res/values-zh-rTW/strings.xml | 4 ---- app/src/main/res/values/strings.xml | 11 ++++------- 102 files changed, 12 insertions(+), 313 deletions(-) diff --git a/app-mini/src/main/res/values-ar/strings.xml b/app-mini/src/main/res/values-ar/strings.xml index d7fd30eb..a8dbc404 100644 --- a/app-mini/src/main/res/values-ar/strings.xml +++ b/app-mini/src/main/res/values-ar/strings.xml @@ -116,8 +116,6 @@ <string name="pref_torrc_title">ترتيبات خاصة بـ torrc</string> <string name="pref_torrc_summary">للخبراء فقط : أدخل أسطر ملف torrc مباشرةً</string> <string name="pref_torrc_dialog">torrc خاص</string> - <string name="kbps">كيلوبيت في الثانية</string> - <string name="mbps">ميغابيت في الثانية</string> <string name="kb">كيلوبايت</string> <string name="mb">ميغابايت</string> <string name="bridges_updated">تم تحديث الجسور</string> diff --git a/app-mini/src/main/res/values-ay/strings.xml b/app-mini/src/main/res/values-ay/strings.xml index aeeedd59..ca0481a8 100644 --- a/app-mini/src/main/res/values-ay/strings.xml +++ b/app-mini/src/main/res/values-ay/strings.xml @@ -119,8 +119,6 @@ <string name="pref_torrc_title">Torrc mayjt\'ayaña</string> <string name="pref_torrc_summary">YATIRINAKATAKIKI: torrc apthapitan chiqak mayjt\'ayam</string> <string name="pref_torrc_dialog">Maynipachpatak Torrc kuttayaña</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Jichhaptayat jalakipañanaka</string> diff --git a/app-mini/src/main/res/values-az/strings.xml b/app-mini/src/main/res/values-az/strings.xml index d67dc076..5f50bf33 100644 --- a/app-mini/src/main/res/values-az/strings.xml +++ b/app-mini/src/main/res/values-az/strings.xml @@ -116,8 +116,6 @@ LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string> <string name="pref_torrc_title">Torrc Custom Config</string> <string name="pref_torrc_summary">YALNIZ EKSPERTLƏR: birbaşa torrc config xətlərini daxil edin</string> <string name="pref_torrc_dialog">Custom Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Körpülər yeniləndi</string> diff --git a/app-mini/src/main/res/values-be/strings.xml b/app-mini/src/main/res/values-be/strings.xml index 9533e9c9..462ce5fc 100644 --- a/app-mini/src/main/res/values-be/strings.xml +++ b/app-mini/src/main/res/values-be/strings.xml @@ -119,8 +119,6 @@ <string name="pref_torrc_title">Карыстальніцкія налады Torrc</string> <string name="pref_torrc_summary">ТОЛЬКІ ДЛЯ ЭКСПЕРТАЎ: унясіце налады наўпрост у радкі файла канфігурацыі torrc</string> <string name="pref_torrc_dialog">Карыстальніцкі Torrc</string> - <string name="kbps">кбіт/с</string> - <string name="mbps">мбіт/с</string> <string name="kb">КБ</string> <string name="mb">МБ</string> <string name="bridges_updated">Масты абноўлены</string> diff --git a/app-mini/src/main/res/values-bg/strings.xml b/app-mini/src/main/res/values-bg/strings.xml index 9166a944..90da19be 100644 --- a/app-mini/src/main/res/values-bg/strings.xml +++ b/app-mini/src/main/res/values-bg/strings.xml @@ -115,8 +115,6 @@ <string name="pref_torrc_title">Torrc Custom Config</string> <string name="pref_torrc_summary">САМО ЗА ЕКСПЕРТИ: въведи директно torrc конфигурационният код</string> <string name="pref_torrc_dialog">Ръчно настроен Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Мостове включени!</string> diff --git a/app-mini/src/main/res/values-ca/strings.xml b/app-mini/src/main/res/values-ca/strings.xml index 1cea27f3..36e2a1d2 100644 --- a/app-mini/src/main/res/values-ca/strings.xml +++ b/app-mini/src/main/res/values-ca/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Configuració personalitzada del Torrc</string> <string name="pref_torrc_summary">NOMÉS EXPERTS: Escriviu les línies de configuració directa del Torrc</string> <string name="pref_torrc_dialog">Torrc personalitzat</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">S\'han actualitzat els ponts</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 4b308812..e9269469 100644 --- a/app-mini/src/main/res/values-cs-rCZ/strings.xml +++ b/app-mini/src/main/res/values-cs-rCZ/strings.xml @@ -114,8 +114,6 @@ <string name="pref_torrc_title">Torrc vstastní konfigurace</string> <string name="pref_torrc_summary">POUZE PRO EXPERTY: zadejte přímo řádky nastavení torrc</string> <string name="pref_torrc_dialog">Vlastní Torrs</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">kB</string> <string name="mb">MB</string> <string name="bridges_updated">Bridge aktualizovány</string> diff --git a/app-mini/src/main/res/values-de/strings.xml b/app-mini/src/main/res/values-de/strings.xml index e6ffbf36..48ec58f3 100644 --- a/app-mini/src/main/res/values-de/strings.xml +++ b/app-mini/src/main/res/values-de/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Benutzerdefinierte Torrc-Konfiguration</string> <string name="pref_torrc_summary">NUR FÜR EXPERTEN: torrc-Konfigurationszeilen direkt eingeben</string> <string name="pref_torrc_dialog">Benutzerdefinierter Torrc</string> - <string name="kbps">Kbit/s</string> - <string name="mbps">Mbit/s</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Brücken Aktualisiert</string> diff --git a/app-mini/src/main/res/values-el/strings.xml b/app-mini/src/main/res/values-el/strings.xml index f1b85e4f..cfff37a8 100644 --- a/app-mini/src/main/res/values-el/strings.xml +++ b/app-mini/src/main/res/values-el/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Torrc Custom Config</string> <string name="pref_torrc_summary">ΜΟΝΟ ΓΙΑ ΕΙΔΙΚΟΥΣ: πληκτρολογήστε απευθείας torrc config γραμμές</string> <string name="pref_torrc_dialog">Προσαρμογή Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Οι γέφυρες ενημερώθηκαν</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 709fa574..a71184de 100644 --- a/app-mini/src/main/res/values-es-rAR/strings.xml +++ b/app-mini/src/main/res/values-es-rAR/strings.xml @@ -102,8 +102,6 @@ <string name="pref_socks_title">Tor SOCKS</string> <string name="pref_dnsport_title">Puerto DNS Tor</string> <string name="pref_dnsport_dialog">Configuración del Puerto DNS</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="get_bridges_email">Email</string> diff --git a/app-mini/src/main/res/values-es/strings.xml b/app-mini/src/main/res/values-es/strings.xml index f63c64e7..21b80b75 100644 --- a/app-mini/src/main/res/values-es/strings.xml +++ b/app-mini/src/main/res/values-es/strings.xml @@ -121,8 +121,6 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de <string name="pref_torrc_title">Configuración personalizada de torrc</string> <string name="pref_torrc_summary">SÓLO EXPERTOS: Introduzca directamente las líneas de configuración en el fichero torrc</string> <string name="pref_torrc_dialog">torrc personalizado</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Bridges actualizados</string> diff --git a/app-mini/src/main/res/values-eu/strings.xml b/app-mini/src/main/res/values-eu/strings.xml index 6b952c70..c1d362ad 100644 --- a/app-mini/src/main/res/values-eu/strings.xml +++ b/app-mini/src/main/res/values-eu/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Torrc konfigurazio pertsonala</string> <string name="pref_torrc_summary">ADITUAK BESTERIK EZ: sartu torrc konfigurazio lerroak</string> <string name="pref_torrc_dialog">Torrc pertsonalizatua</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Zubiak eguneratuta</string> diff --git a/app-mini/src/main/res/values-fa/strings.xml b/app-mini/src/main/res/values-fa/strings.xml index de9cf07b..9078e6b5 100644 --- a/app-mini/src/main/res/values-fa/strings.xml +++ b/app-mini/src/main/res/values-fa/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">پیکربندی سفارشی Torrc</string> <string name="pref_torrc_summary">فقط متخصصان: enter direct torrc config lines</string> <string name="pref_torrc_dialog">سفارشی Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Bridges به روز شدند</string> diff --git a/app-mini/src/main/res/values-fi/strings.xml b/app-mini/src/main/res/values-fi/strings.xml index f0b183c5..73ceb3ac 100644 --- a/app-mini/src/main/res/values-fi/strings.xml +++ b/app-mini/src/main/res/values-fi/strings.xml @@ -115,8 +115,6 @@ <string name="pref_torrc_title">Torrc:n mukautetut asetukset</string> <string name="pref_torrc_summary">VAIN ASIANTUNTIJAT: syötä torrc:n määritysrivejä suoraan</string> <string name="pref_torrc_dialog">Mukautettu torrc</string> - <string name="kbps">kilobittiä per sekunti</string> - <string name="mbps">megabittiä per sekunti</string> <string name="kb">kt</string> <string name="mb">Mt</string> <string name="bridges_updated">Sillat päivitetty</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 ad7f5413..601b244c 100644 --- a/app-mini/src/main/res/values-fr-rFR/strings.xml +++ b/app-mini/src/main/res/values-fr-rFR/strings.xml @@ -115,8 +115,6 @@ <string name="pref_torrc_title">Configuration personnalisée de Torrc</string> <string name="pref_torrc_summary">EXPERTS SEULEMENT : saisissez les lignes de configuration de torrc direct</string> <string name="pref_torrc_dialog">Personnaliser Torrc </string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">Ko</string> <string name="mb">Mo</string> <string name="bridges_updated">Ponts mis à jour</string> diff --git a/app-mini/src/main/res/values-fr/strings.xml b/app-mini/src/main/res/values-fr/strings.xml index 9b909234..d5b8edca 100644 --- a/app-mini/src/main/res/values-fr/strings.xml +++ b/app-mini/src/main/res/values-fr/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Configuration personnalisée de Torrc</string> <string name="pref_torrc_summary">EXPERTS SEULEMENT : saisissez les lignes de configuration de torrc direct</string> <string name="pref_torrc_dialog">Personnaliser Torrc </string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">Ko</string> <string name="mb">Mo</string> <string name="bridges_updated">Ponts mis à jour</string> diff --git a/app-mini/src/main/res/values-gl/strings.xml b/app-mini/src/main/res/values-gl/strings.xml index 88ef572a..afa33369 100644 --- a/app-mini/src/main/res/values-gl/strings.xml +++ b/app-mini/src/main/res/values-gl/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Axuste Torrc personalizado</string> <string name="pref_torrc_summary">SO PARA EXPERTAS: introducir liñas de configuración directa torrc</string> <string name="pref_torrc_dialog">Torrc personalizado</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Pontes actualizadas</string> diff --git a/app-mini/src/main/res/values-he/strings.xml b/app-mini/src/main/res/values-he/strings.xml index 6573befe..2e388a24 100644 --- a/app-mini/src/main/res/values-he/strings.xml +++ b/app-mini/src/main/res/values-he/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">תצורה מותאמת אישית של Torrc</string> <string name="pref_torrc_summary">מומחים בלבד: הכנס שורות תצורת torrc ישיר</string> <string name="pref_torrc_dialog">Torrc מותאם אישית</string> - <string name="kbps">ק\"ב/ש</string> - <string name="mbps">מ\"ב/ש</string> <string name="kb">ק\"ב</string> <string name="mb">מ\"ב</string> <string name="bridges_updated">גשרים עודכנו</string> diff --git a/app-mini/src/main/res/values-hi/strings.xml b/app-mini/src/main/res/values-hi/strings.xml index d9fef9c8..5fbee296 100644 --- a/app-mini/src/main/res/values-hi/strings.xml +++ b/app-mini/src/main/res/values-hi/strings.xml @@ -121,8 +121,6 @@ <string name="pref_torrc_title">टोररक कस्टम कॉन्फ़िग</string> <string name="pref_torrc_summary">केवल विशेषज्ञ: प्रत्यक्ष टॉर्च कॉन्फ़िग लाइनें दर्ज करें</string> <string name="pref_torrc_dialog">कस्टम टोररक</string> - <string name="kbps">केबीपीएस</string> - <string name="mbps">एमबीपीएस</string> <string name="kb">कब</string> <string name="mb">मब </string> <string name="bridges_updated">पुल अपडेटेड </string> diff --git a/app-mini/src/main/res/values-hr/strings.xml b/app-mini/src/main/res/values-hr/strings.xml index 8d7d64a7..6b096e51 100644 --- a/app-mini/src/main/res/values-hr/strings.xml +++ b/app-mini/src/main/res/values-hr/strings.xml @@ -115,8 +115,6 @@ <string name="pref_torrc_title">Torrc prilagođena konfiguracija</string> <string name="pref_torrc_summary">SAMO ZA STRUČNJAKE: unesite direktno torrc konfiguracijske linije</string> <string name="pref_torrc_dialog">Prilagođeni Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Mostova ažurirano</string> diff --git a/app-mini/src/main/res/values-hu/strings.xml b/app-mini/src/main/res/values-hu/strings.xml index a96cedd1..7650c8be 100644 --- a/app-mini/src/main/res/values-hu/strings.xml +++ b/app-mini/src/main/res/values-hu/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Torrc egyedi konfiguráció</string> <string name="pref_torrc_summary">CSAK SZAKÉRTŐKNEK: torrc konfigurációs sorok közvetlen beírása</string> <string name="pref_torrc_dialog">Egyedi Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Hidak frissítve</string> diff --git a/app-mini/src/main/res/values-id/strings.xml b/app-mini/src/main/res/values-id/strings.xml index 33770a27..5f3dcb8a 100644 --- a/app-mini/src/main/res/values-id/strings.xml +++ b/app-mini/src/main/res/values-id/strings.xml @@ -115,8 +115,6 @@ <string name="pref_torrc_title">Konfigurasi Torrc</string> <string name="pref_torrc_summary">HANYA UNTUK AHLI: masukkan baris konfigurasi direct Torrc</string> <string name="pref_torrc_dialog">Torrc Custom</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Bridge Telah Diperbarui</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 e1dbef8b..00d78343 100644 --- a/app-mini/src/main/res/values-in-rID/strings.xml +++ b/app-mini/src/main/res/values-in-rID/strings.xml @@ -115,8 +115,6 @@ <string name="pref_torrc_title">Konfigurasi Torrc</string> <string name="pref_torrc_summary">HANYA UNTUK AHLI: masukkan baris konfigurasi direct Torrc</string> <string name="pref_torrc_dialog">Torrc Custom</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Bridge Telah Diperbarui</string> diff --git a/app-mini/src/main/res/values-is/strings.xml b/app-mini/src/main/res/values-is/strings.xml index 1fdf58ab..7db32d11 100644 --- a/app-mini/src/main/res/values-is/strings.xml +++ b/app-mini/src/main/res/values-is/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Sérsniðnar stillingar Torrc</string> <string name="pref_torrc_summary">AÐEINS SÉRFRÆÐINGAR: sláðu inn stillingarlínur beint í torrc</string> <string name="pref_torrc_dialog">Sérsniðið Torrc</string> - <string name="kbps">kb/sek</string> - <string name="mbps">mb/sek</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Brýr uppfærðar</string> diff --git a/app-mini/src/main/res/values-it/strings.xml b/app-mini/src/main/res/values-it/strings.xml index 2606154c..46394b42 100644 --- a/app-mini/src/main/res/values-it/strings.xml +++ b/app-mini/src/main/res/values-it/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Configurazioni personalizzate di Torrc</string> <string name="pref_torrc_summary">SOLO ESPERTI: inserisci direttamente configurazioni torrc</string> <string name="pref_torrc_dialog">Torrc personalizzate</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Bridge attivati</string> diff --git a/app-mini/src/main/res/values-iw/strings.xml b/app-mini/src/main/res/values-iw/strings.xml index e8dbb353..3534083b 100644 --- a/app-mini/src/main/res/values-iw/strings.xml +++ b/app-mini/src/main/res/values-iw/strings.xml @@ -94,8 +94,6 @@ <string name="pref_transport_title">Tor TransProxy Port</string> <string name="pref_transport_dialog">הגדרת הפורט של TransProxy</string> <string name="pref_dnsport_title">Tor DNS Port</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="menu_qr">קוד QR</string> diff --git a/app-mini/src/main/res/values-ja/strings.xml b/app-mini/src/main/res/values-ja/strings.xml index a6f82937..b3c7ea44 100644 --- a/app-mini/src/main/res/values-ja/strings.xml +++ b/app-mini/src/main/res/values-ja/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Torrc カスタム設定</string> <string name="pref_torrc_summary">上級者家のみ: 直接torrc設定行を入力します</string> <string name="pref_torrc_dialog">Torrcをカスタム</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">ブリッジを更新しました</string> diff --git a/app-mini/src/main/res/values-ko/strings.xml b/app-mini/src/main/res/values-ko/strings.xml index d064dbf0..b99be824 100644 --- a/app-mini/src/main/res/values-ko/strings.xml +++ b/app-mini/src/main/res/values-ko/strings.xml @@ -115,8 +115,6 @@ <string name="pref_torrc_title">사용자 지정 Torrc 구성</string> <string name="pref_torrc_summary">전문가 전용: torrc 구성 줄을 직접 입력합니다</string> <string name="pref_torrc_dialog">나만의 Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">브릿지가 업데이트되었습니다</string> diff --git a/app-mini/src/main/res/values-lv/strings.xml b/app-mini/src/main/res/values-lv/strings.xml index c8f912f7..cc9ec1d8 100644 --- a/app-mini/src/main/res/values-lv/strings.xml +++ b/app-mini/src/main/res/values-lv/strings.xml @@ -115,8 +115,6 @@ <string name="pref_torrc_title">Torrc pielāgota konfigurēšana</string> <string name="pref_torrc_summary">VIENĪGI EKSPERTIEM: tieši ievadīt torrc konfigurēšanas rindas</string> <string name="pref_torrc_dialog">Pielāgot Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Tilti ir atjaunināti</string> diff --git a/app-mini/src/main/res/values-mk/strings.xml b/app-mini/src/main/res/values-mk/strings.xml index 112f8c27..50a7b299 100644 --- a/app-mini/src/main/res/values-mk/strings.xml +++ b/app-mini/src/main/res/values-mk/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Прилагодено поставување на torrc</string> <string name="pref_torrc_summary">САМО ЗА ЕКСПЕРТИ: внесете директни команди за поставување на torrc</string> <string name="pref_torrc_dialog">Прилагоден torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Ажурирани мостови</string> diff --git a/app-mini/src/main/res/values-nb/strings.xml b/app-mini/src/main/res/values-nb/strings.xml index 1e96243d..d9854d16 100644 --- a/app-mini/src/main/res/values-nb/strings.xml +++ b/app-mini/src/main/res/values-nb/strings.xml @@ -117,8 +117,6 @@ <string name="pref_torrc_title">Egendefinert torrc-oppsett</string> <string name="pref_torrc_summary">BARE FOR EKSPERTER: skriv inn direkte torrc-oppsettslinjer</string> <string name="pref_torrc_dialog">Egendefinert torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Broer oppdatert</string> diff --git a/app-mini/src/main/res/values-nl/strings.xml b/app-mini/src/main/res/values-nl/strings.xml index 0384bba0..db5cb256 100644 --- a/app-mini/src/main/res/values-nl/strings.xml +++ b/app-mini/src/main/res/values-nl/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Torrc aangepaste configuratie</string> <string name="pref_torrc_summary">ENKEL VOOR GEVORDERDEN: voer rechtstreeks torrc-configuratieregels in</string> <string name="pref_torrc_dialog">Aangepaste Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Bridges bijgewerkt</string> diff --git a/app-mini/src/main/res/values-pl/strings.xml b/app-mini/src/main/res/values-pl/strings.xml index 537cb01e..77020281 100644 --- a/app-mini/src/main/res/values-pl/strings.xml +++ b/app-mini/src/main/res/values-pl/strings.xml @@ -115,8 +115,6 @@ <string name="pref_torrc_title">Konfiguracja Torrc klienta</string> <string name="pref_torrc_summary">TYLKO DLA EKSPERTÓW: wpisz linijki konfiguracyjne torrc</string> <string name="pref_torrc_dialog">Torrc klienta</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Zaktualizowane Bridges</string> diff --git a/app-mini/src/main/res/values-pt-rBR/strings.xml b/app-mini/src/main/res/values-pt-rBR/strings.xml index fe77e9bb..c9139bbf 100644 --- a/app-mini/src/main/res/values-pt-rBR/strings.xml +++ b/app-mini/src/main/res/values-pt-rBR/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Config Personalizada do Torrc</string> <string name="pref_torrc_summary">SOMENTE EXPERIENTES: adicione sua própria linha de configuração torrc</string> <string name="pref_torrc_dialog">Torrc Personalizado</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Pontes Atualizadas</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 31b869c8..06d7e7d8 100644 --- a/app-mini/src/main/res/values-pt-rPT/strings.xml +++ b/app-mini/src/main/res/values-pt-rPT/strings.xml @@ -47,8 +47,6 @@ <string name="set_locale_title">idioma</string> <string name="pref_socks_title">SOCKS do Tor</string> <string name="pref_dnsport_title">Porta DNS do Tor</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="menu_qr">Códigos QR</string> diff --git a/app-mini/src/main/res/values-pt/strings.xml b/app-mini/src/main/res/values-pt/strings.xml index f10f226e..4a18c10f 100644 --- a/app-mini/src/main/res/values-pt/strings.xml +++ b/app-mini/src/main/res/values-pt/strings.xml @@ -70,8 +70,6 @@ <string name="updating_settings_in_tor_service">a atualizar as definições no serviço Tor</string> <string name="pref_socks_title">SOCKS Tor</string> <string name="pref_dnsport_title">Porta DNS Tor</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Pontes Atualizadas</string> diff --git a/app-mini/src/main/res/values-ro/strings.xml b/app-mini/src/main/res/values-ro/strings.xml index c467b1e7..ed16bea2 100644 --- a/app-mini/src/main/res/values-ro/strings.xml +++ b/app-mini/src/main/res/values-ro/strings.xml @@ -115,8 +115,6 @@ <string name="pref_torrc_title">Configurare personalizată Torrc</string> <string name="pref_torrc_summary">PENTRU EXPERŢI: introdu direct liniile de configurare ale torrc</string> <string name="pref_torrc_dialog">Torrc Personalizat</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Punţi activate</string> diff --git a/app-mini/src/main/res/values-ru/strings.xml b/app-mini/src/main/res/values-ru/strings.xml index a96d664b..0cd94d2c 100644 --- a/app-mini/src/main/res/values-ru/strings.xml +++ b/app-mini/src/main/res/values-ru/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Пользовательские настройки Torrc</string> <string name="pref_torrc_summary">ТОЛЬКО ДЛЯ ЭКСПЕРТОВ: внесите настройки напрямую в строки файла конфигурации torrc</string> <string name="pref_torrc_dialog">Пользовательский Torrc</string> - <string name="kbps">кбит/с</string> - <string name="mbps">мбит/с</string> <string name="kb">КБ</string> <string name="mb">МБ</string> <string name="bridges_updated">Мосты обновлены</string> diff --git a/app-mini/src/main/res/values-sk/strings.xml b/app-mini/src/main/res/values-sk/strings.xml index 4e9309b1..7f1fec5a 100644 --- a/app-mini/src/main/res/values-sk/strings.xml +++ b/app-mini/src/main/res/values-sk/strings.xml @@ -115,8 +115,6 @@ <string name="pref_torrc_title">Vlastné nastavenie Torrc</string> <string name="pref_torrc_summary">LEN PRE EXPERTOV: vložiť priamo riadky nastavenia torrc</string> <string name="pref_torrc_dialog">Vlasné Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Premostenia aktualizované</string> diff --git a/app-mini/src/main/res/values-sr/strings.xml b/app-mini/src/main/res/values-sr/strings.xml index 67ca4867..f745b39b 100644 --- a/app-mini/src/main/res/values-sr/strings.xml +++ b/app-mini/src/main/res/values-sr/strings.xml @@ -118,8 +118,6 @@ <string name="pref_torrc_title">Torrc Прерађена Подешавања</string> <string name="pref_torrc_summary">САМО ЗА ЕКСПЕРТЕ: унети директно torrc линије подешавања</string> <string name="pref_torrc_dialog">Подеси Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Bridges Ажурирање</string> diff --git a/app-mini/src/main/res/values-sv/strings.xml b/app-mini/src/main/res/values-sv/strings.xml index 1605d2b2..80518ff2 100644 --- a/app-mini/src/main/res/values-sv/strings.xml +++ b/app-mini/src/main/res/values-sv/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Torrc anpassad konfiguration</string> <string name="pref_torrc_summary">ENDAST EXPERTER: ange torrc konfiguration direkt</string> <string name="pref_torrc_dialog">Anpassad Torrc</string> - <string name="kbps">kb/s</string> - <string name="mbps">mb/s</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Bryggor uppdaterade</string> diff --git a/app-mini/src/main/res/values-th/strings.xml b/app-mini/src/main/res/values-th/strings.xml index cc076900..36996761 100644 --- a/app-mini/src/main/res/values-th/strings.xml +++ b/app-mini/src/main/res/values-th/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">กำหนดค่า Torrc เอง</string> <string name="pref_torrc_summary">สำหรับผู้เชี่ยวชาญเท่านั้น: ระบุบรรทัดที่กำหนดค่า torcc โดยตรง</string> <string name="pref_torrc_dialog">Torrc ที่กำหนดเอง</string> - <string name="kbps">กิโลบิตต่อวินาที</string> - <string name="mbps">เมกะบิตต่อวินาที</string> <string name="kb">กิโลไบต์</string> <string name="mb">เมกะไบต์</string> <string name="bridges_updated">ปรับปรุง Bridges แล้ว</string> diff --git a/app-mini/src/main/res/values-tl/strings.xml b/app-mini/src/main/res/values-tl/strings.xml index a7f6287f..0ac1f22a 100644 --- a/app-mini/src/main/res/values-tl/strings.xml +++ b/app-mini/src/main/res/values-tl/strings.xml @@ -100,8 +100,6 @@ <string name="pref_disable_network_title">Walang Auto-Sleep sa Network</string> <string name="pref_disable_network_summary">Ilagay ang Tor sa sleep kapag walang internet na pwede</string> <string name="newnym">Ikaw ay nagpalit ng bagong pagkakakilanlan sa Tor!</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="get_bridges_email">Email</string> diff --git a/app-mini/src/main/res/values-tr/strings.xml b/app-mini/src/main/res/values-tr/strings.xml index 139c1b01..aff7c371 100644 --- a/app-mini/src/main/res/values-tr/strings.xml +++ b/app-mini/src/main/res/values-tr/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Özel Torrc Ayarları</string> <string name="pref_torrc_summary">UZMANLAR İÇİN: torrc ayar satırlarını doğrudan yazın</string> <string name="pref_torrc_dialog">Özel Torrc Ayarları</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Köprüler Güncellendi</string> diff --git a/app-mini/src/main/res/values-uk/strings.xml b/app-mini/src/main/res/values-uk/strings.xml index be4e0c6b..6d079faf 100644 --- a/app-mini/src/main/res/values-uk/strings.xml +++ b/app-mini/src/main/res/values-uk/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Додаткові налаштування Torrc</string> <string name="pref_torrc_summary">ЛИШЕ ДЛЯ ЕКСПЕРТІВ: введіть безпосередні рядки налаштувань torrc</string> <string name="pref_torrc_dialog">Додаткове у Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Мости оновлено</string> diff --git a/app-mini/src/main/res/values-vi/strings.xml b/app-mini/src/main/res/values-vi/strings.xml index 1922a77f..ca6d5626 100644 --- a/app-mini/src/main/res/values-vi/strings.xml +++ b/app-mini/src/main/res/values-vi/strings.xml @@ -115,8 +115,6 @@ <string name="pref_torrc_title">Cấu hình tùy chỉnh cho Torrc</string> <string name="pref_torrc_summary">CHỈ NGƯỜI DÙNG CHUYÊN MÔN: nhập các thiết lập trực tiếp cho torrc</string> <string name="pref_torrc_dialog">Torrc tùy chỉnh</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">Bridge được cập nhậ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 87b84171..8fb6a562 100644 --- a/app-mini/src/main/res/values-zh-rCN/strings.xml +++ b/app-mini/src/main/res/values-zh-rCN/strings.xml @@ -115,8 +115,6 @@ <string name="pref_torrc_title">Torrc 自定义配置</string> <string name="pref_torrc_summary">仅供专家：直接输入 torrc 配置行</string> <string name="pref_torrc_dialog">自定义 Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">网桥已更新</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 9422f6b4..40724ef2 100644 --- a/app-mini/src/main/res/values-zh-rTW/strings.xml +++ b/app-mini/src/main/res/values-zh-rTW/strings.xml @@ -120,8 +120,6 @@ <string name="pref_torrc_title">Torrc 自訂設置</string> <string name="pref_torrc_summary">僅限專家：輸入 torrc 設定指令</string> <string name="pref_torrc_dialog">自訂 Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> <string name="kb">KB</string> <string name="mb">MB</string> <string name="bridges_updated">網橋已更新</string> diff --git a/app-mini/src/main/res/values/strings.xml b/app-mini/src/main/res/values/strings.xml index 919b2126..9d4af5fa 100644 --- a/app-mini/src/main/res/values/strings.xml +++ b/app-mini/src/main/res/values/strings.xml @@ -147,10 +147,6 @@ <string name="pref_torrc_dialog">Custom Torrc</string> - <string name="kbps">kbps</string> - - <string name="mbps">mbps</string> - <string name="kb">KB</string> <string name="mb">MB</string> diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 302154de..bab82a5d 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -1066,29 +1066,29 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan private String formatCount(long count) { NumberFormat numberFormat = NumberFormat.getInstance(Locale.getDefault()); // Converts the supplied argument into a string. - // Under 2Mb, returns "xxx.xKb" - // Over 2Mb, returns "xxx.xxMb" + // Under 2 mebibytes, returns "xxx.xKiB/s" + // Over 2 mebibytes, returns "xxx.xxMiB/s" if (count < 1e6) return numberFormat.format(Math.round(((float) ((int) (count * 10 / 1024)) / 10))) - + getString(R.string.kbps); + + getString(R.string.kibibyte_per_second); else return numberFormat.format(Math .round(((float) ((int) (count * 100 / 1024 / 1024)) / 100))) - + getString(R.string.mbps); + + getString(R.string.mebibyte_per_second); } private String formatTotal(long count) { NumberFormat numberFormat = NumberFormat.getInstance(Locale.getDefault()); // Converts the supplied argument into a string. - // Under 2Mb, returns "xxx.xKb" - // Over 2Mb, returns "xxx.xxMb" + // Under 2MiB, returns "xxx.xKiB" + // Over 2MiB, returns "xxx.xxMiB" if (count < 1e6) return numberFormat.format(Math.round(((float) ((int) (count * 10 / 1024)) / 10))) - + getString(R.string.kb); + + getString(R.string.kibibyte); else return numberFormat.format(Math .round(((float) ((int) (count * 100 / 1024 / 1024)) / 100))) - + getString(R.string.mb); + + getString(R.string.mebibyte); } private void requestNewTorIdentity() { diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 54636f35..df4fdf7b 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -115,10 +115,6 @@ <string name="pref_torrc_title">ترتيبات خاصة بـ torrc</string> <string name="pref_torrc_summary">للخبراء فقط : أدخل أسطر ملف torrc مباشرةً</string> <string name="pref_torrc_dialog">torrc خاص</string> - <string name="kbps">كيلوبيت في الثانية</string> - <string name="mbps">ميغابيت في الثانية</string> - <string name="kb">كيلوبايت</string> - <string name="mb">ميغابايت</string> <string name="bridges_updated">تم تحديث الجسور</string> <string name="restart_orbot_to_use_this_bridge_">الرجاء إعادة تشغيل أوربوت لتفعيل التعديلات</string> <string name="menu_qr">رمز كيو آر</string> diff --git a/app/src/main/res/values-ay/strings.xml b/app/src/main/res/values-ay/strings.xml index f5da93b7..d62954ca 100644 --- a/app/src/main/res/values-ay/strings.xml +++ b/app/src/main/res/values-ay/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Torrc mayjt\'ayaña</string> <string name="pref_torrc_summary">YATIRINAKATAKIKI: torrc apthapitan chiqak mayjt\'ayam</string> <string name="pref_torrc_dialog">Maynipachpatak Torrc kuttayaña</string> - <string name="kbps">KBps</string> - <string name="mbps">MBps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Jichhaptayat jalakipañanaka</string> <string name="restart_orbot_to_use_this_bridge_">Mayjt\'ayatanak aqtayañatak Orbot mayamp qhant\'ayam, amp suma</string> <string name="menu_qr">QR chimpunaka</string> diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 266a754a..88160da4 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -115,10 +115,6 @@ LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string> <string name="pref_torrc_title">Torrc Custom Config</string> <string name="pref_torrc_summary">YALNIZ EKSPERTLƏR: birbaşa torrc config xətlərini daxil edin</string> <string name="pref_torrc_dialog">Custom Torrc</string> - <string name="kbps">KBps</string> - <string name="mbps">MBps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Körpülər yeniləndi</string> <string name="restart_orbot_to_use_this_bridge_">Lütfən, Orbotu söndürün və yenidən yandırın ki, dəyişikliklər tətbiq edilsin.</string> <string name="menu_qr">QR kodlar</string> diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index 7d3f2907..fee628e6 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Карыстальніцкія налады Torrc</string> <string name="pref_torrc_summary">ТОЛЬКІ ДЛЯ ЭКСПЕРТАЎ: унясіце налады наўпрост у радкі файла канфігурацыі torrc</string> <string name="pref_torrc_dialog">Карыстальніцкі Torrc</string> - <string name="kbps">кбіт/с</string> - <string name="mbps">мбіт/с</string> - <string name="kb">КБ</string> - <string name="mb">МБ</string> <string name="bridges_updated">Масты абноўлены</string> <string name="restart_orbot_to_use_this_bridge_">Калі ласка, перазапусціце Orbot для ўступу змены ў сілу</string> <string name="menu_qr">QR-коды</string> diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 2d4c6f86..f0bfdf89 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -113,10 +113,6 @@ <string name="pref_torrc_title">Torrc Custom Config</string> <string name="pref_torrc_summary">САМО ЗА ЕКСПЕРТИ: въведи директно torrc конфигурационният код</string> <string name="pref_torrc_dialog">Ръчно настроен Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Мостове включени!</string> <string name="restart_orbot_to_use_this_bridge_">Моля, рестартирай Orbot, за да влязат в действие промените</string> <string name="menu_qr">QR Кодове</string> diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 0f353372..d5b05e23 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Configuració personalitzada del Torrc</string> <string name="pref_torrc_summary">NOMÉS EXPERTS: Escriviu les línies de configuració directa del Torrc</string> <string name="pref_torrc_dialog">Torrc personalitzat</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">S\'han actualitzat els ponts</string> <string name="restart_orbot_to_use_this_bridge_">Reinicieu l\'Orbot per aplicar els canvis</string> <string name="menu_qr">Codis QR</string> diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index b262d02d..dca66e74 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -112,10 +112,6 @@ <string name="pref_torrc_title">Torrc vstastní konfigurace</string> <string name="pref_torrc_summary">POUZE PRO EXPERTY: zadejte přímo řádky nastavení torrc</string> <string name="pref_torrc_dialog">Vlastní Torrs</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">kB</string> - <string name="mb">MB</string> <string name="bridges_updated">Bridge aktualizovány</string> <string name="restart_orbot_to_use_this_bridge_">Pro projevení změn restartujte Orbot</string> <string name="menu_qr">QR kódy</string> diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 5263007f..955f757c 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -92,8 +92,6 @@ <string name="pref_use_persistent_notifications">Vis altid ikonet i statuslinien når Orbot er forbundet til netværket</string> <string name="pref_use_persistent_notifications_title">Vis altid notifikationer</string> <string name="set_locale_title">Sprog</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="get_bridges_email">Mail</string> <string name="hidden_services">Skjulte tjenester</string> <string name="title_activity_hidden_services">Skjulte tjenester</string> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 993a9266..e563d7d5 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Benutzerdefinierte Torrc-Konfiguration</string> <string name="pref_torrc_summary">NUR FÜR EXPERTEN: torrc-Konfigurationszeilen direkt eingeben</string> <string name="pref_torrc_dialog">Benutzerdefinierter Torrc</string> - <string name="kbps">Kbit/s</string> - <string name="mbps">Mbit/s</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Brücken Aktualisiert</string> <string name="restart_orbot_to_use_this_bridge_">Bitte Tor Erneut Starten um die Änderungen wirksam werden zu lassen</string> <string name="menu_qr">QR Codes</string> diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index c900d1c0..2664399a 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Torrc Custom Config</string> <string name="pref_torrc_summary">ΜΟΝΟ ΓΙΑ ΕΙΔΙΚΟΥΣ: πληκτρολογήστε απευθείας torrc config γραμμές</string> <string name="pref_torrc_dialog">Προσαρμογή Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Οι γέφυρες ενημερώθηκαν</string> <string name="restart_orbot_to_use_this_bridge_">Παρακαλούμε επανεκκινήστε το Orbot για να ενεργοποιήσετε τις αλλαγές</string> <string name="menu_qr">Κώδικες QR</string> diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml index daeb0304..ee14d5ec 100644 --- a/app/src/main/res/values-es-rAR/strings.xml +++ b/app/src/main/res/values-es-rAR/strings.xml @@ -100,10 +100,6 @@ <string name="pref_socks_title">Tor SOCKS</string> <string name="pref_dnsport_title">Puerto DNS Tor</string> <string name="pref_dnsport_dialog">Configuración del Puerto DNS</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="get_bridges_email">Email</string> <string name="save">Guardar</string> <string name="name">Nombre</string> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 132dc1ac..244d2d25 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -119,10 +119,6 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de <string name="pref_torrc_title">Configuración personalizada de torrc</string> <string name="pref_torrc_summary">SÓLO EXPERTOS: Introduzca directamente las líneas de configuración en el fichero torrc</string> <string name="pref_torrc_dialog">torrc personalizado</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Bridges actualizados</string> <string name="restart_orbot_to_use_this_bridge_">Por favor, reinicie Orbot para habilitar los cambios</string> <string name="menu_qr">Códigos QR</string> diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 5923d4ee..66e8c156 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Torrc konfigurazio pertsonala</string> <string name="pref_torrc_summary">ADITUAK BESTERIK EZ: sartu torrc konfigurazio lerroak</string> <string name="pref_torrc_dialog">Torrc pertsonalizatua</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Zubiak eguneratuta</string> <string name="restart_orbot_to_use_this_bridge_">Berrabiarazi Orbot aldaketak aplikatzeko</string> <string name="menu_qr">QR Kodeak</string> diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 5122b88d..f2cdead5 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">پیکربندی سفارشی Torrc</string> <string name="pref_torrc_summary">فقط متخصصان: enter direct torrc config lines</string> <string name="pref_torrc_dialog">سفارشی Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Bridges به روز شدند</string> <string name="restart_orbot_to_use_this_bridge_">برای فعال کردن تغییرات لطفا Orbot را راه اندازی مجدد کنید</string> <string name="menu_qr">کدهای QR</string> diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 9f4228cb..1aa74953 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -113,10 +113,6 @@ <string name="pref_torrc_title">Torrc:n mukautetut asetukset</string> <string name="pref_torrc_summary">VAIN ASIANTUNTIJAT: syötä torrc:n määritysrivejä suoraan</string> <string name="pref_torrc_dialog">Mukautettu torrc</string> - <string name="kbps">kilobittiä per sekunti</string> - <string name="mbps">megabittiä per sekunti</string> - <string name="kb">kt</string> - <string name="mb">Mt</string> <string name="bridges_updated">Sillat päivitetty</string> <string name="restart_orbot_to_use_this_bridge_">Käynnistä Orbot uudelleen ottaaksesi muutokset käyttöön</string> <string name="menu_qr">QR-koodit</string> diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml index 67b8e006..27922dca 100644 --- a/app/src/main/res/values-fr-rFR/strings.xml +++ b/app/src/main/res/values-fr-rFR/strings.xml @@ -113,10 +113,6 @@ <string name="pref_torrc_title">Configuration personnalisée de Torrc</string> <string name="pref_torrc_summary">EXPERTS SEULEMENT : saisissez les lignes de configuration de torrc direct</string> <string name="pref_torrc_dialog">Personnaliser Torrc </string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">Ko</string> - <string name="mb">Mo</string> <string name="bridges_updated">Ponts mis à jour</string> <string name="restart_orbot_to_use_this_bridge_">Veuillez redémarrer Orbot pour activer les changements</string> <string name="menu_qr">Codes QR</string> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 005b1b45..46bafec3 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Configuration personnalisée de Torrc</string> <string name="pref_torrc_summary">EXPERTS SEULEMENT : saisissez les lignes de configuration de torrc direct</string> <string name="pref_torrc_dialog">Personnaliser Torrc </string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">Ko</string> - <string name="mb">Mo</string> <string name="bridges_updated">Ponts mis à jour</string> <string name="restart_orbot_to_use_this_bridge_">Veuillez redémarrer Orbot pour activer les changements</string> <string name="menu_qr">Codes QR</string> diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 5f7bb235..0b3ec278 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Axuste Torrc personalizado</string> <string name="pref_torrc_summary">SO PARA EXPERTAS: introducir liñas de configuración directa torrc</string> <string name="pref_torrc_dialog">Torrc personalizado</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Pontes actualizadas</string> <string name="restart_orbot_to_use_this_bridge_">Por favor, reinicie Orbot para activar os cambios</string> <string name="menu_qr">Códigod QR</string> diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index d0d918d7..484131cf 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">תצורה מותאמת אישית של Torrc</string> <string name="pref_torrc_summary">מומחים בלבד: הכנס שורות תצורת torrc ישיר</string> <string name="pref_torrc_dialog">Torrc מותאם אישית</string> - <string name="kbps">ק\"ב/ש</string> - <string name="mbps">מ\"ב/ש</string> - <string name="kb">ק\"ב</string> - <string name="mb">מ\"ב</string> <string name="bridges_updated">גשרים עודכנו</string> <string name="restart_orbot_to_use_this_bridge_">אנא הפעל מחדש את Orbot כדי לאפשר את השינויים</string> <string name="menu_qr">קודי QR</string> diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 7425c540..1c605f74 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -119,10 +119,6 @@ <string name="pref_torrc_title">टोररक कस्टम कॉन्फ़िग</string> <string name="pref_torrc_summary">केवल विशेषज्ञ: प्रत्यक्ष टॉर्च कॉन्फ़िग लाइनें दर्ज करें</string> <string name="pref_torrc_dialog">कस्टम टोररक</string> - <string name="kbps">केबीपीएस</string> - <string name="mbps">एमबीपीएस</string> - <string name="kb">कब</string> - <string name="mb">मब </string> <string name="bridges_updated">पुल अपडेटेड </string> <string name="restart_orbot_to_use_this_bridge_">परिवर्तन सक्षम करने के लिए Orbot पुनः प्रारंभ करें</string> <string name="menu_qr">QR कोड</string> diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index a6cfecca..be6aa908 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -113,10 +113,6 @@ <string name="pref_torrc_title">Torrc prilagođena konfiguracija</string> <string name="pref_torrc_summary">SAMO ZA STRUČNJAKE: unesite direktno torrc konfiguracijske linije</string> <string name="pref_torrc_dialog">Prilagođeni Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Mostova ažurirano</string> <string name="restart_orbot_to_use_this_bridge_">Ponovno pokrenite Orbot da bi omogućili promjene</string> <string name="menu_qr">QR kodovi</string> diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 23a13203..84cac672 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Torrc egyedi konfiguráció</string> <string name="pref_torrc_summary">CSAK SZAKÉRTŐKNEK: torrc konfigurációs sorok közvetlen beírása</string> <string name="pref_torrc_dialog">Egyedi Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Hidak frissítve</string> <string name="restart_orbot_to_use_this_bridge_">Kérlek indítsd újra az Orbot-ot a változások engedélyezéséhez</string> <string name="menu_qr">QR kódok</string> diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index b00d1ac9..92576335 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -113,10 +113,6 @@ <string name="pref_torrc_title">Konfigurasi Torrc</string> <string name="pref_torrc_summary">HANYA UNTUK AHLI: masukkan baris konfigurasi direct Torrc</string> <string name="pref_torrc_dialog">Torrc Custom</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Bridge Telah Diperbarui</string> <string name="restart_orbot_to_use_this_bridge_">Silakan start ulang Orbot untuk mengaktifkan perubahan</string> <string name="menu_qr">Kode QR</string> diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml index b5bc11c3..45885348 100644 --- a/app/src/main/res/values-in-rID/strings.xml +++ b/app/src/main/res/values-in-rID/strings.xml @@ -113,10 +113,6 @@ <string name="pref_torrc_title">Konfigurasi Torrc</string> <string name="pref_torrc_summary">HANYA UNTUK AHLI: masukkan baris konfigurasi direct Torrc</string> <string name="pref_torrc_dialog">Torrc Custom</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Bridge Telah Diperbarui</string> <string name="restart_orbot_to_use_this_bridge_">Silakan start ulang Orbot untuk mengaktifkan perubahan</string> <string name="menu_qr">Kode QR</string> diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index cae63586..51dec2be 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Sérsniðnar stillingar Torrc</string> <string name="pref_torrc_summary">AÐEINS SÉRFRÆÐINGAR: sláðu inn stillingarlínur beint í torrc</string> <string name="pref_torrc_dialog">Sérsniðið Torrc</string> - <string name="kbps">kb/sek</string> - <string name="mbps">mb/sek</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Brýr uppfærðar</string> <string name="restart_orbot_to_use_this_bridge_">Endurræstu Orbot til að breytingarnar taki gildi</string> <string name="menu_qr">QR-kóðar</string> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index aedee7b2..09989198 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Configurazioni personalizzate di Torrc</string> <string name="pref_torrc_summary">SOLO ESPERTI: inserisci direttamente configurazioni torrc</string> <string name="pref_torrc_dialog">Torrc personalizzate</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Bridge attivati</string> <string name="restart_orbot_to_use_this_bridge_">Per favore riavvia Orbot per rendere effettive le modifiche</string> <string name="menu_qr">Codici QR</string> diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index df55cd70..c772f2b7 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -92,10 +92,6 @@ <string name="pref_transport_title">Tor TransProxy Port</string> <string name="pref_transport_dialog">הגדרת הפורט של TransProxy</string> <string name="pref_dnsport_title">Tor DNS Port</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="menu_qr">קוד QR</string> <string name="get_bridges_email">דוא\"ל</string> <string name="send_email">שלח דוא\"ל</string> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 9f48da09..120ac13c 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Torrc カスタム設定</string> <string name="pref_torrc_summary">上級者家のみ: 直接torrc設定行を入力します</string> <string name="pref_torrc_dialog">Torrcをカスタム</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">ブリッジを更新しました</string> <string name="restart_orbot_to_use_this_bridge_">変更を有効にするにはOrbotを再起動してください</string> <string name="menu_qr">QRコード</string> diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 1c51ec2d..3d169dcd 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -113,10 +113,6 @@ <string name="pref_torrc_title">사용자 지정 Torrc 구성</string> <string name="pref_torrc_summary">전문가 전용: torrc 구성 줄을 직접 입력합니다</string> <string name="pref_torrc_dialog">나만의 Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">브릿지가 업데이트되었습니다</string> <string name="restart_orbot_to_use_this_bridge_">변경을 완료하려면 Orbot을 재시작하세요</string> <string name="menu_qr">QR 코드</string> diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 67df6a13..3c752274 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -113,10 +113,6 @@ <string name="pref_torrc_title">Torrc pielāgota konfigurēšana</string> <string name="pref_torrc_summary">VIENĪGI EKSPERTIEM: tieši ievadīt torrc konfigurēšanas rindas</string> <string name="pref_torrc_dialog">Pielāgot Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Tilti ir atjaunināti</string> <string name="restart_orbot_to_use_this_bridge_">Lūdzu pārstartējiet Orbot, lai iespējotu izmaiņas</string> <string name="menu_qr">QR kodi</string> diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index e3cf7015..530b2183 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Прилагодено поставување на torrc</string> <string name="pref_torrc_summary">САМО ЗА ЕКСПЕРТИ: внесете директни команди за поставување на torrc</string> <string name="pref_torrc_dialog">Прилагоден torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Ажурирани мостови</string> <string name="restart_orbot_to_use_this_bridge_">Ве молиме повторно стартувајте го Orbot за да се овозможат промените</string> <string name="menu_qr">QR-кодови</string> diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml index d9456370..c2a6e7bd 100644 --- a/app/src/main/res/values-my/strings.xml +++ b/app/src/main/res/values-my/strings.xml @@ -18,8 +18,6 @@  <string name="error">ချို့ယွင်းချက်</string> <string name="set_locale_title">ဘာသာစကား</string> - <string name="kb">ကီလိုဘိုက်</string> - <string name="mb">မဂ္ဂါဘိုက်</string> <string name="get_bridges_email">အီးေမးလ္</string> <string name="hidden_services">Hidden Services</string> <string name="title_activity_hidden_services">Hidden Services</string> diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 847f8a37..8810cd38 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -115,10 +115,6 @@ <string name="pref_torrc_title">Egendefinert torrc-oppsett</string> <string name="pref_torrc_summary">BARE FOR EKSPERTER: skriv inn direkte torrc-oppsettslinjer</string> <string name="pref_torrc_dialog">Egendefinert torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Broer oppdatert</string> <string name="restart_orbot_to_use_this_bridge_">Gjør omstart av Orbot før endringer trer i kraft</string> <string name="menu_qr">QR-koder</string> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 45fae346..815a9a2b 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Torrc aangepaste configuratie</string> <string name="pref_torrc_summary">ENKEL VOOR GEVORDERDEN: voer rechtstreeks torrc-configuratieregels in</string> <string name="pref_torrc_dialog">Aangepaste Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Bridges bijgewerkt</string> <string name="restart_orbot_to_use_this_bridge_">Herstart Orbot om de wijzigingen in te schakelen</string> <string name="menu_qr">QR-codes</string> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 0f2cb6fe..521f319e 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -113,10 +113,6 @@ <string name="pref_torrc_title">Konfiguracja Torrc klienta</string> <string name="pref_torrc_summary">TYLKO DLA EKSPERTÓW: wpisz linijki konfiguracyjne torrc</string> <string name="pref_torrc_dialog">Torrc klienta</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Zaktualizowane Bridges</string> <string name="restart_orbot_to_use_this_bridge_">Proszę zrestartować Orbot, aby zmiany mogły wejść w życie</string> <string name="menu_qr">Kody QR</string> diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 7214addd..35e4f594 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Config Personalizada do Torrc</string> <string name="pref_torrc_summary">SOMENTE EXPERIENTES: adicione sua própria linha de configuração torrc</string> <string name="pref_torrc_dialog">Torrc Personalizado</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Pontes Atualizadas</string> <string name="restart_orbot_to_use_this_bridge_">Por favor reinicie Orbot para habilitar as mundanças</string> <string name="menu_qr">QR Codes</string> diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index f2b53796..aeb1e6c8 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -45,10 +45,6 @@ <string name="set_locale_title">idioma</string> <string name="pref_socks_title">SOCKS do Tor</string> <string name="pref_dnsport_title">Porta DNS do Tor</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="menu_qr">Códigos QR</string> <string name="get_bridges_email">E-mail</string> <string name="send_email">Enviar Mensagem</string> diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 60224208..5f7c7c48 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -68,10 +68,6 @@ <string name="updating_settings_in_tor_service">a atualizar as definições no serviço Tor</string> <string name="pref_socks_title">SOCKS Tor</string> <string name="pref_dnsport_title">Porta DNS Tor</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Pontes Atualizadas</string> <string name="menu_qr">Códigos QR</string> <string name="get_bridges_email">Correio Eletrónico</string> diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index a66a817b..0504e815 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -113,10 +113,6 @@ <string name="pref_torrc_title">Configurare personalizată Torrc</string> <string name="pref_torrc_summary">PENTRU EXPERŢI: introdu direct liniile de configurare ale torrc</string> <string name="pref_torrc_dialog">Torrc Personalizat</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Punţi activate</string> <string name="restart_orbot_to_use_this_bridge_">Vă rugăm reporniţi Orbot pentru a aplica modificările</string> <string name="menu_qr">Coduri QR</string> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 2371b913..34c660b6 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Пользовательские настройки Torrc</string> <string name="pref_torrc_summary">ТОЛЬКО ДЛЯ ЭКСПЕРТОВ: внесите настройки напрямую в строки файла конфигурации torrc</string> <string name="pref_torrc_dialog">Пользовательский Torrc</string> - <string name="kbps">кбит/с</string> - <string name="mbps">мбит/с</string> - <string name="kb">КБ</string> - <string name="mb">МБ</string> <string name="bridges_updated">Мосты обновлены</string> <string name="restart_orbot_to_use_this_bridge_">Пожалуйста, перезапустите Orbot для вступления изменения в силу</string> <string name="menu_qr">QR-коды</string> diff --git a/app/src/main/res/values-si-rLK/strings.xml b/app/src/main/res/values-si-rLK/strings.xml index 2604766b..3c9bc9d7 100644 --- a/app/src/main/res/values-si-rLK/strings.xml +++ b/app/src/main/res/values-si-rLK/strings.xml @@ -81,8 +81,6 @@ <string name="pref_use_persistent_notifications">Orbot සම්බන්ධ වී ඇති සැමවිටම විට මෙවලම් තීරුවේ නිරූපකය තබාගන්න</string> <string name="pref_use_persistent_notifications_title">නිවේදන ලැබීමට සලස්වන්න </string> <string name="set_locale_title">භාෂාව</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="hidden_services">සැගවුණු සේවා </string> <string name="title_activity_hidden_services">සැගවුණු සේවා </string> <string name="menu_hidden_services">සැගවුණු සේවා </string> diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index d72eb96b..e37ea50a 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -113,10 +113,6 @@ <string name="pref_torrc_title">Vlastné nastavenie Torrc</string> <string name="pref_torrc_summary">LEN PRE EXPERTOV: vložiť priamo riadky nastavenia torrc</string> <string name="pref_torrc_dialog">Vlasné Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Premostenia aktualizované</string> <string name="restart_orbot_to_use_this_bridge_">Prosím reštartujte Orbot, aby sa aktivovali zmeny</string> <string name="menu_qr">QR kódy</string> diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index e4dacc88..2551d36b 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -116,10 +116,6 @@ <string name="pref_torrc_title">Torrc Прерађена Подешавања</string> <string name="pref_torrc_summary">САМО ЗА ЕКСПЕРТЕ: унети директно torrc линије подешавања</string> <string name="pref_torrc_dialog">Подеси Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Bridges Ажурирање</string> <string name="restart_orbot_to_use_this_bridge_">Молимо покрените поново Орбот ради примењивања промена</string> <string name="menu_qr">QR Кодови</string> diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 0080cdc1..d86b85da 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Torrc anpassad konfiguration</string> <string name="pref_torrc_summary">ENDAST EXPERTER: ange torrc konfiguration direkt</string> <string name="pref_torrc_dialog">Anpassad Torrc</string> - <string name="kbps">kb/s</string> - <string name="mbps">mb/s</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Bryggor uppdaterade</string> <string name="restart_orbot_to_use_this_bridge_">Vänligen starta om Orbot för att aktivera ändringarna</string> <string name="menu_qr">QR-koder</string> diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 63ce987c..3d68ddc0 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">กำหนดค่า Torrc เอง</string> <string name="pref_torrc_summary">สำหรับผู้เชี่ยวชาญเท่านั้น: ระบุบรรทัดที่กำหนดค่า torcc โดยตรง</string> <string name="pref_torrc_dialog">Torrc ที่กำหนดเอง</string> - <string name="kbps">กิโลบิตต่อวินาที</string> - <string name="mbps">เมกะบิตต่อวินาที</string> - <string name="kb">กิโลไบต์</string> - <string name="mb">เมกะไบต์</string> <string name="bridges_updated">ปรับปรุง Bridges แล้ว</string> <string name="restart_orbot_to_use_this_bridge_">กรุณาเริ่ม Orbot ใหม่เพื่อให้การเปลี่ยนแปลงใช้งานได้</string> <string name="menu_qr">รหัสคิวอาร์</string> diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml index 4d0672eb..c095b970 100644 --- a/app/src/main/res/values-tl/strings.xml +++ b/app/src/main/res/values-tl/strings.xml @@ -98,10 +98,6 @@ <string name="pref_disable_network_title">Walang Auto-Sleep sa Network</string> <string name="pref_disable_network_summary">Ilagay ang Tor sa sleep kapag walang internet na pwede</string> <string name="newnym">Ikaw ay nagpalit ng bagong pagkakakilanlan sa Tor!</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="get_bridges_email">Email</string> <string name="send_email">Send Email</string> <string name="save">I-save</string> diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 6dd2dd88..27635dba 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Özel Torrc Ayarları</string> <string name="pref_torrc_summary">UZMANLAR İÇİN: torrc ayar satırlarını doğrudan yazın</string> <string name="pref_torrc_dialog">Özel Torrc Ayarları</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Köprüler Güncellendi</string> <string name="restart_orbot_to_use_this_bridge_">Değişiklikleri etkinleştirmek için Orbot uygulamasını yeniden başlatın</string> <string name="menu_qr">QR Kodları</string> diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index cc69b3dd..af30b762 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Додаткові налаштування Torrc</string> <string name="pref_torrc_summary">ЛИШЕ ДЛЯ ЕКСПЕРТІВ: введіть безпосередні рядки налаштувань torrc</string> <string name="pref_torrc_dialog">Додаткове у Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Мости оновлено</string> <string name="restart_orbot_to_use_this_bridge_">Будь ласка, перезапустіть Orbot, щоб зміни ввійшли в силу</string> <string name="menu_qr">QR-коди</string> diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index cfeaa442..1c06cc7c 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -113,10 +113,6 @@ <string name="pref_torrc_title">Cấu hình tùy chỉnh cho Torrc</string> <string name="pref_torrc_summary">CHỈ NGƯỜI DÙNG CHUYÊN MÔN: nhập các thiết lập trực tiếp cho torrc</string> <string name="pref_torrc_dialog">Torrc tùy chỉnh</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">Bridge được cập nhật</string> <string name="restart_orbot_to_use_this_bridge_">Vui lòng khởi động lại Orbot để áp dụng thay đổi</string> <string name="menu_qr">Mã QR</string> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 054fedcf..c574b7e5 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -113,10 +113,6 @@ <string name="pref_torrc_title">Torrc 自定义配置</string> <string name="pref_torrc_summary">仅供专家：直接输入 torrc 配置行</string> <string name="pref_torrc_dialog">自定义 Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">网桥已更新</string> <string name="restart_orbot_to_use_this_bridge_">请重启 Orbot 以使变更生效</string> <string name="menu_qr">QR码</string> diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 3420d5dd..53c2fd03 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -118,10 +118,6 @@ <string name="pref_torrc_title">Torrc 自訂設置</string> <string name="pref_torrc_summary">僅限專家：輸入 torrc 設定指令</string> <string name="pref_torrc_dialog">自訂 Torrc</string> - <string name="kbps">kbps</string> - <string name="mbps">mbps</string> - <string name="kb">KB</string> - <string name="mb">MB</string> <string name="bridges_updated">網橋已更新</string> <string name="restart_orbot_to_use_this_bridge_">請重新啟動 Orbot 來讓設定生效。</string> <string name="menu_qr">QR 碼</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 857f649c..1c5d2425 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -145,13 +145,10 @@ <string name="pref_torrc_dialog">Custom Torrc</string> - <string name="kbps">KBps</string> - - <string name="mbps">MBps</string> - - <string name="kb">KB</string> - - <string name="mb">MB</string> + <string name="kibibyte_per_second">KiB/s</string> + <string name="mebibyte_per_second">MiB/s</string> + <string name="kibibyte">KiB</string> + <string name="mebibyte">MiB</string> <string name="bridges_updated">Bridges Updated</string>

1 0

[orbot/master] Merge pull request #417 from bitmold/correct_bandwidth_labels
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 7e7007e347797f53b0613c1f16df9f3434428130 Merge: f9d5fcf5 590d440d Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Tue Dec 8 17:14:08 2020 -0500 Merge pull request #417 from bitmold/correct_bandwidth_labels Correct data-rate units, Fixes #378 app-mini/src/main/res/values-ar/strings.xml | 2 -- app-mini/src/main/res/values-ay/strings.xml | 2 -- app-mini/src/main/res/values-az/strings.xml | 2 -- app-mini/src/main/res/values-be/strings.xml | 2 -- app-mini/src/main/res/values-bg/strings.xml | 2 -- app-mini/src/main/res/values-ca/strings.xml | 2 -- app-mini/src/main/res/values-cs-rCZ/strings.xml | 2 -- app-mini/src/main/res/values-de/strings.xml | 2 -- app-mini/src/main/res/values-el/strings.xml | 2 -- app-mini/src/main/res/values-es-rAR/strings.xml | 2 -- app-mini/src/main/res/values-es/strings.xml | 2 -- app-mini/src/main/res/values-eu/strings.xml | 2 -- app-mini/src/main/res/values-fa/strings.xml | 2 -- app-mini/src/main/res/values-fi/strings.xml | 2 -- app-mini/src/main/res/values-fr-rFR/strings.xml | 2 -- app-mini/src/main/res/values-fr/strings.xml | 2 -- app-mini/src/main/res/values-gl/strings.xml | 2 -- app-mini/src/main/res/values-he/strings.xml | 2 -- app-mini/src/main/res/values-hi/strings.xml | 2 -- app-mini/src/main/res/values-hr/strings.xml | 2 -- app-mini/src/main/res/values-hu/strings.xml | 2 -- app-mini/src/main/res/values-id/strings.xml | 2 -- app-mini/src/main/res/values-in-rID/strings.xml | 2 -- app-mini/src/main/res/values-is/strings.xml | 2 -- app-mini/src/main/res/values-it/strings.xml | 2 -- app-mini/src/main/res/values-iw/strings.xml | 2 -- app-mini/src/main/res/values-ja/strings.xml | 2 -- app-mini/src/main/res/values-ko/strings.xml | 2 -- app-mini/src/main/res/values-lv/strings.xml | 2 -- app-mini/src/main/res/values-mk/strings.xml | 2 -- app-mini/src/main/res/values-nb/strings.xml | 2 -- app-mini/src/main/res/values-nl/strings.xml | 2 -- app-mini/src/main/res/values-pl/strings.xml | 2 -- app-mini/src/main/res/values-pt-rBR/strings.xml | 2 -- app-mini/src/main/res/values-pt-rPT/strings.xml | 2 -- app-mini/src/main/res/values-pt/strings.xml | 2 -- app-mini/src/main/res/values-ro/strings.xml | 2 -- app-mini/src/main/res/values-ru/strings.xml | 2 -- app-mini/src/main/res/values-sk/strings.xml | 2 -- app-mini/src/main/res/values-sr/strings.xml | 2 -- app-mini/src/main/res/values-sv/strings.xml | 2 -- app-mini/src/main/res/values-th/strings.xml | 2 -- app-mini/src/main/res/values-tl/strings.xml | 2 -- app-mini/src/main/res/values-tr/strings.xml | 2 -- app-mini/src/main/res/values-uk/strings.xml | 2 -- app-mini/src/main/res/values-vi/strings.xml | 2 -- app-mini/src/main/res/values-zh-rCN/strings.xml | 2 -- app-mini/src/main/res/values-zh-rTW/strings.xml | 2 -- app-mini/src/main/res/values/strings.xml | 4 ---- .../java/org/torproject/android/OrbotMainActivity.java | 16 ++++++++-------- app/src/main/res/values-ar/strings.xml | 4 ---- app/src/main/res/values-ay/strings.xml | 4 ---- app/src/main/res/values-az/strings.xml | 4 ---- app/src/main/res/values-be/strings.xml | 4 ---- app/src/main/res/values-bg/strings.xml | 4 ---- app/src/main/res/values-ca/strings.xml | 4 ---- app/src/main/res/values-cs-rCZ/strings.xml | 4 ---- app/src/main/res/values-da/strings.xml | 2 -- app/src/main/res/values-de/strings.xml | 4 ---- app/src/main/res/values-el/strings.xml | 4 ---- app/src/main/res/values-es-rAR/strings.xml | 4 ---- app/src/main/res/values-es/strings.xml | 4 ---- app/src/main/res/values-eu/strings.xml | 4 ---- app/src/main/res/values-fa/strings.xml | 4 ---- app/src/main/res/values-fi/strings.xml | 4 ---- app/src/main/res/values-fr-rFR/strings.xml | 4 ---- app/src/main/res/values-fr/strings.xml | 4 ---- app/src/main/res/values-gl/strings.xml | 4 ---- app/src/main/res/values-he/strings.xml | 4 ---- app/src/main/res/values-hi/strings.xml | 4 ---- app/src/main/res/values-hr/strings.xml | 4 ---- app/src/main/res/values-hu/strings.xml | 4 ---- app/src/main/res/values-id/strings.xml | 4 ---- app/src/main/res/values-in-rID/strings.xml | 4 ---- app/src/main/res/values-is/strings.xml | 4 ---- app/src/main/res/values-it/strings.xml | 4 ---- app/src/main/res/values-iw/strings.xml | 4 ---- app/src/main/res/values-ja/strings.xml | 4 ---- app/src/main/res/values-ko/strings.xml | 4 ---- app/src/main/res/values-lv/strings.xml | 4 ---- app/src/main/res/values-mk/strings.xml | 4 ---- app/src/main/res/values-my/strings.xml | 2 -- app/src/main/res/values-nb/strings.xml | 4 ---- app/src/main/res/values-nl/strings.xml | 4 ---- app/src/main/res/values-pl/strings.xml | 4 ---- app/src/main/res/values-pt-rBR/strings.xml | 4 ---- app/src/main/res/values-pt-rPT/strings.xml | 4 ---- app/src/main/res/values-pt/strings.xml | 4 ---- app/src/main/res/values-ro/strings.xml | 4 ---- app/src/main/res/values-ru/strings.xml | 4 ---- app/src/main/res/values-si-rLK/strings.xml | 2 -- app/src/main/res/values-sk/strings.xml | 4 ---- app/src/main/res/values-sr/strings.xml | 4 ---- app/src/main/res/values-sv/strings.xml | 4 ---- app/src/main/res/values-th/strings.xml | 4 ---- app/src/main/res/values-tl/strings.xml | 4 ---- app/src/main/res/values-tr/strings.xml | 4 ---- app/src/main/res/values-uk/strings.xml | 4 ---- app/src/main/res/values-vi/strings.xml | 4 ---- app/src/main/res/values-zh-rCN/strings.xml | 4 ---- app/src/main/res/values-zh-rTW/strings.xml | 4 ---- app/src/main/res/values/strings.xml | 11 ++++------- 102 files changed, 12 insertions(+), 313 deletions(-)

1 0

[orbot/master] enable start/stop of Snowflake client
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit f675a7f126a9595f0525327a12e2feb6feea2b4d Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Dec 8 20:37:52 2020 -0500 enable start/stop of Snowflake client --- .../torproject/android/service/OrbotService.java | 32 +++++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 04f4f053..b1b64aeb 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -307,9 +307,12 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb sendCallbackStatus(STATUS_STOPPING); sendCallbackLogMessage(getString(R.string.status_shutting_down)); - if (useIPtProxy()) + if (useIPtObfs4Proxy()) IPtProxy.stopObfs4Proxy(); + if (useIPtSnowflakeProxy()) + IPtProxy.stopSnowflake(); + stopTorDaemon(true); //stop the foreground priority and make sure to remove the persistant notification @@ -326,12 +329,23 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } - private static boolean useIPtProxy () + private static boolean useIPtObfs4Proxy () { String bridgeList = Prefs.getBridgesList(); return bridgeList.contains("obfs3")|| bridgeList.contains("obfs4")||bridgeList.contains("meek"); } + private static boolean useIPtSnowflakeProxy () + { + String bridgeList = Prefs.getBridgesList(); + return bridgeList.contains("snowflake"); + } + + private void startSnowflakeProxy () { + IPtProxy.startSnowflake( "stun:stun.l.google.com:19302", "https://snowflake-broker.azureedge.net/", + "ajax.aspnetcdn.com", null, true, false, true, 3); + } + /** * if someone stops during startup, we may have to wait for the conn port to be setup, so we can properly shutdown tor * @throws Exception @@ -1403,6 +1417,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb boolean obfs3Bridges = bridgeList.contains("obfs3"); boolean obfs4Bridges = bridgeList.contains("obfs4"); boolean meekBridges = bridgeList.contains("meek"); + boolean snowflakeBridges = bridgeList.contains("snowflake"); //check if any PT bridges are needed if (obfs3Bridges) @@ -1414,7 +1429,10 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb if (meekBridges) extraLines.append("ClientTransportPlugin meek_lite socks5 127.0.0.1:" + IPtProxy.MeekSocksPort).append('\n'); - if (bridgeList != null && bridgeList.length() > 5) //longer then 1 = some real values here + if (snowflakeBridges) + extraLines.append("ClientTransportPlugin snowflake socks5 127.0.0.1:" + IPtProxy.SnowflakeSocksPort).append('\n'); + + if (bridgeList != null && bridgeList.length() > 10) //longer then 1 = some real values here { String[] bridgeListLines = parseBridgesFromSettings(bridgeList); int bridgeIdx = (int) Math.floor(Math.random() * ((double) bridgeListLines.length)); @@ -1429,6 +1447,8 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb if (meekBridges) type = "meek_lite"; + else if (snowflakeBridges) + type = "snowflake"; getBridges(type, extraLines); @@ -1760,9 +1780,13 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb if (!TextUtils.isEmpty(action)) { if (action.equals(ACTION_START) || action.equals(ACTION_START_ON_BOOT)) { - if (useIPtProxy()) + if (useIPtObfs4Proxy()) IPtProxy.startObfs4Proxy("DEBUG", false, false); + if (useIPtSnowflakeProxy()) + startSnowflakeProxy(); + + startTor(); replyWithStatus(mIntent);

1 0

[orbot/master] Merge branch 'master' of github.com:guardianproject/orbot
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 823f4646d45fa6ca54d429def472d71a571ab35c Merge: da347295 7e7007e3 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Dec 8 17:14:14 2020 -0500 Merge branch 'master' of github.com:guardianproject/orbot INSTALL | 40 ---------- LICENSE | 2 +- README => README.md | 0 TODO | 8 -- app-mini/src/main/res/values-ar/strings.xml | 2 - app-mini/src/main/res/values-ay/strings.xml | 2 - app-mini/src/main/res/values-az/strings.xml | 2 - app-mini/src/main/res/values-be/strings.xml | 2 - app-mini/src/main/res/values-bg/strings.xml | 2 - app-mini/src/main/res/values-ca/strings.xml | 2 - app-mini/src/main/res/values-cs-rCZ/strings.xml | 2 - app-mini/src/main/res/values-de/strings.xml | 2 - app-mini/src/main/res/values-el/strings.xml | 2 - app-mini/src/main/res/values-es-rAR/strings.xml | 2 - app-mini/src/main/res/values-es/strings.xml | 2 - app-mini/src/main/res/values-eu/strings.xml | 2 - app-mini/src/main/res/values-fa/strings.xml | 2 - app-mini/src/main/res/values-fi/strings.xml | 2 - app-mini/src/main/res/values-fr-rFR/strings.xml | 2 - app-mini/src/main/res/values-fr/strings.xml | 2 - app-mini/src/main/res/values-gl/strings.xml | 2 - app-mini/src/main/res/values-he/strings.xml | 2 - app-mini/src/main/res/values-hi/strings.xml | 2 - app-mini/src/main/res/values-hr/strings.xml | 2 - app-mini/src/main/res/values-hu/strings.xml | 2 - app-mini/src/main/res/values-id/strings.xml | 2 - app-mini/src/main/res/values-in-rID/strings.xml | 2 - app-mini/src/main/res/values-is/strings.xml | 2 - app-mini/src/main/res/values-it/strings.xml | 2 - app-mini/src/main/res/values-iw/strings.xml | 2 - app-mini/src/main/res/values-ja/strings.xml | 2 - app-mini/src/main/res/values-ko/strings.xml | 2 - app-mini/src/main/res/values-lv/strings.xml | 2 - app-mini/src/main/res/values-mk/strings.xml | 2 - app-mini/src/main/res/values-nb/strings.xml | 2 - app-mini/src/main/res/values-nl/strings.xml | 2 - app-mini/src/main/res/values-pl/strings.xml | 2 - app-mini/src/main/res/values-pt-rBR/strings.xml | 2 - app-mini/src/main/res/values-pt-rPT/strings.xml | 2 - app-mini/src/main/res/values-pt/strings.xml | 2 - app-mini/src/main/res/values-ro/strings.xml | 2 - app-mini/src/main/res/values-ru/strings.xml | 2 - app-mini/src/main/res/values-sk/strings.xml | 2 - app-mini/src/main/res/values-sr/strings.xml | 2 - app-mini/src/main/res/values-sv/strings.xml | 2 - app-mini/src/main/res/values-th/strings.xml | 2 - app-mini/src/main/res/values-tl/strings.xml | 2 - app-mini/src/main/res/values-tr/strings.xml | 2 - app-mini/src/main/res/values-uk/strings.xml | 2 - app-mini/src/main/res/values-vi/strings.xml | 2 - app-mini/src/main/res/values-zh-rCN/strings.xml | 2 - app-mini/src/main/res/values-zh-rTW/strings.xml | 2 - app-mini/src/main/res/values/strings.xml | 4 - .../org/torproject/android/OrbotMainActivity.java | 16 ++-- app/src/main/res/values-ar/strings.xml | 4 - app/src/main/res/values-ay/strings.xml | 4 - app/src/main/res/values-az/strings.xml | 4 - app/src/main/res/values-be/strings.xml | 4 - app/src/main/res/values-bg/strings.xml | 4 - app/src/main/res/values-ca/strings.xml | 4 - app/src/main/res/values-cs-rCZ/strings.xml | 4 - app/src/main/res/values-da/strings.xml | 2 - app/src/main/res/values-de/strings.xml | 4 - app/src/main/res/values-el/strings.xml | 4 - app/src/main/res/values-es-rAR/strings.xml | 4 - app/src/main/res/values-es/strings.xml | 4 - app/src/main/res/values-eu/strings.xml | 4 - app/src/main/res/values-fa/strings.xml | 4 - app/src/main/res/values-fi/strings.xml | 4 - app/src/main/res/values-fr-rFR/strings.xml | 4 - app/src/main/res/values-fr/strings.xml | 4 - app/src/main/res/values-gl/strings.xml | 4 - app/src/main/res/values-he/strings.xml | 4 - app/src/main/res/values-hi/strings.xml | 4 - app/src/main/res/values-hr/strings.xml | 4 - app/src/main/res/values-hu/strings.xml | 4 - app/src/main/res/values-id/strings.xml | 4 - app/src/main/res/values-in-rID/strings.xml | 4 - app/src/main/res/values-is/strings.xml | 4 - app/src/main/res/values-it/strings.xml | 4 - app/src/main/res/values-iw/strings.xml | 4 - app/src/main/res/values-ja/strings.xml | 4 - app/src/main/res/values-ko/strings.xml | 4 - app/src/main/res/values-lv/strings.xml | 4 - app/src/main/res/values-mk/strings.xml | 4 - app/src/main/res/values-my/strings.xml | 2 - app/src/main/res/values-nb/strings.xml | 4 - app/src/main/res/values-nl/strings.xml | 4 - app/src/main/res/values-pl/strings.xml | 4 - app/src/main/res/values-pt-rBR/strings.xml | 4 - app/src/main/res/values-pt-rPT/strings.xml | 4 - app/src/main/res/values-pt/strings.xml | 4 - app/src/main/res/values-ro/strings.xml | 4 - app/src/main/res/values-ru/strings.xml | 4 - app/src/main/res/values-si-rLK/strings.xml | 2 - app/src/main/res/values-sk/strings.xml | 4 - app/src/main/res/values-sr/strings.xml | 4 - app/src/main/res/values-sv/strings.xml | 4 - app/src/main/res/values-th/strings.xml | 4 - app/src/main/res/values-tl/strings.xml | 4 - app/src/main/res/values-tr/strings.xml | 4 - app/src/main/res/values-uk/strings.xml | 4 - app/src/main/res/values-vi/strings.xml | 4 - app/src/main/res/values-zh-rCN/strings.xml | 4 - app/src/main/res/values-zh-rTW/strings.xml | 4 - app/src/main/res/values/strings.xml | 11 +-- docs/GSoC.txt | 45 ----------- docs/WALKTHROUGH | 85 --------------------- ic_launcher.svg => docs/ic_launcher.svg | 0 docs/onionroots.xcf | Bin 1748142 -> 0 bytes docs/orbotnewicons.xcf | Bin 1118257 -> 0 bytes 111 files changed, 13 insertions(+), 492 deletions(-)

1 0

[orbot/master] enable selection of Snowflake from bridge wizard activity
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit bbe63e4ee5ebe1191c4c2a25ff343fa432f11a61 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Dec 8 20:38:00 2020 -0500 enable selection of Snowflake from bridge wizard activity --- .../android/ui/onboarding/BridgeWizardActivity.java | 11 +++++++++++ app/src/main/res/layout/content_bridge_wizard.xml | 7 +++++++ app/src/main/res/values/strings.xml | 1 + 3 files changed, 19 insertions(+) diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java index 8a359b1b..465d8c58 100644 --- a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java +++ b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java @@ -41,6 +41,7 @@ public class BridgeWizardActivity extends AppCompatActivity { private RadioButton mBtObfs4; private RadioButton mBtMeek; private RadioButton mBtCustom; + private RadioButton mBtSnowflake; private View mBtnConfgiureCustomBridges; @SuppressWarnings("SameParameterValue") @@ -125,6 +126,14 @@ public class BridgeWizardActivity extends AppCompatActivity { testBridgeConnection(); }); + mBtSnowflake = findViewById(R.id.btnBridgesSnowflake); + mBtSnowflake.setOnCheckedChangeListener((buttonView, isChecked) -> { + if (!isChecked) return; + cancelHostTestIfRunning(); + Prefs.setBridgesList("snowflake"); + Prefs.putBridgesEnabled(true); + }); + mBtCustom = findViewById(R.id.btnCustomBridges); mBtCustom.setOnCheckedChangeListener((buttonView, isChecked) -> { if (isChecked) { @@ -249,6 +258,8 @@ public class BridgeWizardActivity extends AppCompatActivity { mBtMeek.setChecked(true); } else if (Prefs.getBridgesList().equals("obfs4")) { mBtObfs4.setChecked(true); + } else if (Prefs.getBridgesList().equals("snowflake")) { + mBtSnowflake.setChecked(true); } else { mBtCustom.setChecked(true); } diff --git a/app/src/main/res/layout/content_bridge_wizard.xml b/app/src/main/res/layout/content_bridge_wizard.xml index 0b75ffa4..d5bdea3d 100644 --- a/app/src/main/res/layout/content_bridge_wizard.xml +++ b/app/src/main/res/layout/content_bridge_wizard.xml @@ -58,6 +58,13 @@ android:layout_margin="12dp" android:text="@string/bridge_cloud" /> + <RadioButton + android:id="@+id/btnBridgesSnowflake" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="12dp" + android:text="@string/bridge_snowflake" /> + <RadioButton android:id="@+id/btnCustomBridges" android:layout_width="wrap_content" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1c5d2425..8f8cbbf2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -253,4 +253,5 @@ <string name="in_a_browser">In a browser, visit %s and tap "Get Bridges" > "Just Give Me Bridges!"</string> <string name="paste_bridges">Paste Bridges</string> <string name="use_qr_code">Use QR Code</string> + <string name="bridge_snowflake">Connect through other Tor peers (experimental)</string> </resources>

1 0

[orbot/master] add snowflake entry to built in bridges
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit fa18797fc904518890f7c73332032a115af9fa97 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Dec 8 20:18:36 2020 -0500 add snowflake entry to built in bridges --- orbotservice/src/main/res/raw-fa/bridges.txt | 1 + orbotservice/src/main/res/raw/bridges.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/orbotservice/src/main/res/raw-fa/bridges.txt b/orbotservice/src/main/res/raw-fa/bridges.txt index 3069edb3..11d7a193 100644 --- a/orbotservice/src/main/res/raw-fa/bridges.txt +++ b/orbotservice/src/main/res/raw-fa/bridges.txt @@ -9,3 +9,4 @@ obfs4 94.242.249.2:40190 C7BE8154678E7537CCAC60B097D51A8A7EF8BCDF cert=8jw57wlMl obfs4 77.81.104.251:443 115C90EBD0EB631C177560A872535772215478D9 cert=UsuF7oN4KNKviZP54JOyTCoCphrdM5gwZK4vT8GnCAcmqLUJEJxyw1dpko9a/ii6He4iZg iat-mode=0 obfs4 5.249.146.133:80 FAF3A0073330D6AD92F3B4874B0D945562A633EF cert=TRe8bAODtjcGij7EPQaUayWEOqR99wDh2l3B4hFtCsn1JTJCph03pRZ9tx8wynpLYKWMQg iat-mode=0 meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com +snowflake 192.0.2.3:1 \ No newline at end of file diff --git a/orbotservice/src/main/res/raw/bridges.txt b/orbotservice/src/main/res/raw/bridges.txt index c631831b..8787099c 100644 --- a/orbotservice/src/main/res/raw/bridges.txt +++ b/orbotservice/src/main/res/raw/bridges.txt @@ -5,3 +5,4 @@ obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWOD obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0 obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0 meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com +snowflake 192.0.2.3:1 \ No newline at end of file

1 0

[orbot/master] more improvements to bridge PT init logic
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 4a2e8b14c8f3a5419453389c947468a95b3d6fc3 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Dec 11 18:09:38 2020 -0500 more improvements to bridge PT init logic --- .../torproject/android/service/OrbotService.java | 41 ++++++++++------------ 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index d03fd989..227f503e 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -307,7 +307,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb sendCallbackStatus(STATUS_STOPPING); sendCallbackLogMessage(getString(R.string.status_shutting_down)); - if (useIPtObfs4Proxy()) + if (useIPtObfsMeekProxy()) IPtProxy.stopObfs4Proxy(); if (useIPtSnowflakeProxy()) @@ -329,10 +329,10 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } - private static boolean useIPtObfs4Proxy () + private static boolean useIPtObfsMeekProxy () { String bridgeList = Prefs.getBridgesList(); - return bridgeList.contains("obfs3")|| bridgeList.contains("obfs4")||bridgeList.contains("meek"); + return bridgeList.contains("obfs")||bridgeList.contains("meek"); } private static boolean useIPtSnowflakeProxy () @@ -1415,35 +1415,30 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb // extraLines.append("UpdateBridgesFromAuthority 1").append('\n'); String bridgeList = Prefs.getBridgesList(); - boolean obfsBridges = bridgeList.contains("obfs"); - boolean meekBridges = bridgeList.contains("meek"); - boolean snowflakeBridges = bridgeList.contains("snowflake"); + + String builtInBridgeType = null; //check if any PT bridges are needed - if (obfsBridges) { + if (bridgeList.contains("obfs")) { extraLines.append("ClientTransportPlugin obfs3 socks5 127.0.0.1:" + IPtProxy.Obfs3SocksPort).append('\n'); extraLines.append("ClientTransportPlugin obfs4 socks5 127.0.0.1:" + IPtProxy.Obfs4SocksPort).append('\n'); + + if (bridgeList.equals("obfs4")) + builtInBridgeType = "obfs4"; } - if (meekBridges) + if (bridgeList.equals("meek")) { extraLines.append("ClientTransportPlugin meek_lite socks5 127.0.0.1:" + IPtProxy.MeekSocksPort).append('\n'); + builtInBridgeType = "meek_lite"; + } - if (snowflakeBridges) + if (bridgeList.equals("snowflake")) { extraLines.append("ClientTransportPlugin snowflake socks5 127.0.0.1:" + IPtProxy.SnowflakeSocksPort).append('\n'); - - if (obfsBridges||meekBridges||snowflakeBridges) - { - - String type = "obfs4"; - - if (meekBridges) - type = "meek_lite"; - else if (snowflakeBridges) - type = "snowflake"; - - getBridges(type, extraLines); - + builtInBridgeType = "snowflake"; } + + if (!TextUtils.isEmpty(builtInBridgeType)) + getBridges(builtInBridgeType, extraLines); else { String[] bridgeListLines = parseBridgesFromSettings(bridgeList); @@ -1781,7 +1776,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb if (!TextUtils.isEmpty(action)) { if (action.equals(ACTION_START) || action.equals(ACTION_START_ON_BOOT)) { - if (useIPtObfs4Proxy()) + if (useIPtObfsMeekProxy()) IPtProxy.startObfs4Proxy("DEBUG", false, false); if (useIPtSnowflakeProxy())

1 0

[orbot/master] Removed outdated repository files, made README a markdown file.
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit cabca2a7be6659efe4d55fd4555591d174380050 Author: bim <dsnake(a)protonmail.com> Date: Sun Nov 29 15:53:48 2020 -0500 Removed outdated repository files, made README a markdown file. It would make sense to eventually populate README.md with instructions about how to use the app, how to get involved with the project etc --- INSTALL | 40 ---------------------------------------- LICENSE | 2 +- README => README.md | 0 TODO | 8 -------- 4 files changed, 1 insertion(+), 49 deletions(-) diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 1624d1a2..00000000 --- a/INSTALL +++ /dev/null @@ -1,40 +0,0 @@ - -Orbot: Android Onion Routing Robot -*********************************************** -Orbot is a freely licensed open-source application developed for the -Android platform. It acts as a front-end to the Tor binary application, -and also provides an HTTP Proxy for connecting web browsers and other -HTTP client applications into the Tor SOCKS interface. - -*** PreReqs *** -You need the Android Developer SDK to compile and build the APK file: -http://developer.android.com/ -The project files including in this distribution are meant to be used -with Eclipse: http://eclipse.org/ - -*** How to use *** -Currently, Orbot will work with any application that supports using -an HTTP or SOCKS Proxy. Once you start Tor using Orbot, you can then -point your application to HTTP port 8118 or SOCKS port 9050 on localhost -IP 127.0.0.1. - -If you have root access, and a version of Android with iptables that -supports the netfilter owner module, then Orbot can setup transparent -proxying for any application. - -Finally, Firefox on Android is available, and we have released an -add-on named ProxyMob for configuring SOCKS proxy settings for use -with the local Tor socks proxy. - -** A Few Notes ** - -To ensure you are connected to the Tor network, you should browse to -https://check.torproject.org/ - -The first time you activate Orbot, it may take a while to connect to -Tor. Check the message log to ensure you are "100% Bootstrapped". - -*********************************************** - -/* Copyright (c) 2009,2010,2011, Nathan Freitas, The Guardian Project - * http://guardianproject.info/ */ diff --git a/LICENSE b/LICENSE index b857146b..194b99d9 100644 --- a/LICENSE +++ b/LICENSE @@ -4,7 +4,7 @@ provide anonymity on the Internet from a Google Android smartphone. It also lists the licenses for other components used by Orbot, including Tor, and iptables. -For more information about Orbot, see https://guardianproject.info/apps/orbot +For more information about Orbot, see https://guardianproject.info/apps/org.torproject.android/ If you got this file as a part of a larger bundle, there may be other license terms that you should be aware of. diff --git a/README b/README.md similarity index 100% rename from README rename to README.md diff --git a/TODO b/TODO deleted file mode 100644 index ba269567..00000000 --- a/TODO +++ /dev/null @@ -1,8 +0,0 @@ - -Current tracked tickets for Orbot can be found here: -https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=new&status=reopened&group=component&component=Orbot&order=priority - -If you would like to join the project, we have some ideas for volunteering here: -http://www.torproject.org/getinvolved/volunteer.html.en#project-orbot - -You can find us in IRC on FREENODE or OFTC in the #guardianproject and #tor-dev channels \ No newline at end of file

1 0

[orbot/master] remove local IPtProxy; use jitpack dependency instead
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 051a5791b1ab32b5b3f6d35b42d628d7658e1ef0 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Dec 8 17:42:18 2020 -0500 remove local IPtProxy; use jitpack dependency instead --- IPtProxy/IPtProxy.aar | Bin 29425327 -> 0 bytes IPtProxy/build.gradle | 2 -- orbotservice/build.gradle | 3 +-- settings.gradle | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/IPtProxy/IPtProxy.aar b/IPtProxy/IPtProxy.aar deleted file mode 100644 index ed76d5fb..00000000 Binary files a/IPtProxy/IPtProxy.aar and /dev/null differ diff --git a/IPtProxy/build.gradle b/IPtProxy/build.gradle deleted file mode 100644 index afc0293e..00000000 --- a/IPtProxy/build.gradle +++ /dev/null @@ -1,2 +0,0 @@ -configurations.maybeCreate("default") -artifacts.add("default", file('IPtProxy.aar')) \ No newline at end of file diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index 447ee60d..c1b99e7b 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -60,6 +60,5 @@ dependencies { implementation 'info.guardianproject:jtorctl:0.4' - /*********** IPtProxy: https://github.com/tladesignz/IPtProxy **********/ - implementation project(path: ':IPtProxy') + implementation 'com.github.tladesignz:IPtProxy:0.5.0' } diff --git a/settings.gradle b/settings.gradle index d9af051e..46cf1758 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,3 @@ -include ':IPtProxy' include ':intentintegrator' include ':appcore' include ':orbotservice',':app',':app-mini'

1 0

[orbot/master] clean-up logic for setting PT bridge lines
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit b2fb0e74e6a881eaf87cab61f49e7d8d293b1342 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Dec 11 17:48:34 2020 -0500 clean-up logic for setting PT bridge lines --- .../torproject/android/service/OrbotService.java | 29 +++++++++++----------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index b1b64aeb..d03fd989 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -342,6 +342,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } private void startSnowflakeProxy () { + //this is using the current, default Tor snowflake infrastructure IPtProxy.startSnowflake( "stun:stun.l.google.com:19302", "https://snowflake-broker.azureedge.net/", "ajax.aspnetcdn.com", null, true, false, true, 3); } @@ -1414,17 +1415,15 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb // extraLines.append("UpdateBridgesFromAuthority 1").append('\n'); String bridgeList = Prefs.getBridgesList(); - boolean obfs3Bridges = bridgeList.contains("obfs3"); - boolean obfs4Bridges = bridgeList.contains("obfs4"); + boolean obfsBridges = bridgeList.contains("obfs"); boolean meekBridges = bridgeList.contains("meek"); boolean snowflakeBridges = bridgeList.contains("snowflake"); //check if any PT bridges are needed - if (obfs3Bridges) + if (obfsBridges) { extraLines.append("ClientTransportPlugin obfs3 socks5 127.0.0.1:" + IPtProxy.Obfs3SocksPort).append('\n'); - - if (obfs4Bridges) extraLines.append("ClientTransportPlugin obfs4 socks5 127.0.0.1:" + IPtProxy.Obfs4SocksPort).append('\n'); + } if (meekBridges) extraLines.append("ClientTransportPlugin meek_lite socks5 127.0.0.1:" + IPtProxy.MeekSocksPort).append('\n'); @@ -1432,16 +1431,8 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb if (snowflakeBridges) extraLines.append("ClientTransportPlugin snowflake socks5 127.0.0.1:" + IPtProxy.SnowflakeSocksPort).append('\n'); - if (bridgeList != null && bridgeList.length() > 10) //longer then 1 = some real values here + if (obfsBridges||meekBridges||snowflakeBridges) { - String[] bridgeListLines = parseBridgesFromSettings(bridgeList); - int bridgeIdx = (int) Math.floor(Math.random() * ((double) bridgeListLines.length)); - String bridgeLine = bridgeListLines[bridgeIdx]; - extraLines.append("Bridge "); - extraLines.append(bridgeLine); - extraLines.append("\n"); - - } else { String type = "obfs4"; @@ -1453,6 +1444,16 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb getBridges(type, extraLines); } + else + { + String[] bridgeListLines = parseBridgesFromSettings(bridgeList); + int bridgeIdx = (int) Math.floor(Math.random() * ((double) bridgeListLines.length)); + String bridgeLine = bridgeListLines[bridgeIdx]; + extraLines.append("Bridge "); + extraLines.append(bridgeLine); + extraLines.append("\n"); + + } }

1 0