commit 2fd6da45deceb321cb5a9b6038e55471defbd1bd Merge: 37d7388e 2380ed07 Author: n8fr8 nathan@guardianproject.info Date: Thu Feb 4 16:47:57 2021 -0500
Merge branch 'no_bridge_in_settings' of https://github.com/bitmold/orbot into bitmold-no_bridge_in_settings
app-mini/src/main/res/values-ar/strings.xml | 3 +- app-mini/src/main/res/values-ay/strings.xml | 3 +- app-mini/src/main/res/values-az/strings.xml | 3 +- app-mini/src/main/res/values-be/strings.xml | 3 +- app-mini/src/main/res/values-bg/strings.xml | 3 +- app-mini/src/main/res/values-ca/strings.xml | 3 +- app-mini/src/main/res/values-cs-rCZ/strings.xml | 3 +- app-mini/src/main/res/values-de/strings.xml | 3 +- app-mini/src/main/res/values-el/strings.xml | 3 +- app-mini/src/main/res/values-es/strings.xml | 3 +- app-mini/src/main/res/values-eu/strings.xml | 3 +- app-mini/src/main/res/values-fa/strings.xml | 3 +- app-mini/src/main/res/values-fi/strings.xml | 3 +- app-mini/src/main/res/values-fr-rFR/strings.xml | 3 +- app-mini/src/main/res/values-fr/strings.xml | 3 +- app-mini/src/main/res/values-gl/strings.xml | 3 +- app-mini/src/main/res/values-he/strings.xml | 3 +- app-mini/src/main/res/values-hi/strings.xml | 3 +- app-mini/src/main/res/values-hr/strings.xml | 3 +- app-mini/src/main/res/values-hu/strings.xml | 3 +- app-mini/src/main/res/values-id/strings.xml | 3 +- app-mini/src/main/res/values-in-rID/strings.xml | 3 +- app-mini/src/main/res/values-is/strings.xml | 3 +- app-mini/src/main/res/values-it/strings.xml | 3 +- app-mini/src/main/res/values-iw/strings.xml | 3 +- app-mini/src/main/res/values-ja/strings.xml | 3 +- app-mini/src/main/res/values-ko/strings.xml | 3 +- app-mini/src/main/res/values-lv/strings.xml | 3 +- app-mini/src/main/res/values-mk/strings.xml | 3 +- app-mini/src/main/res/values-nb/strings.xml | 3 +- app-mini/src/main/res/values-nl/strings.xml | 3 +- app-mini/src/main/res/values-pl/strings.xml | 3 +- app-mini/src/main/res/values-pt-rBR/strings.xml | 3 +- app-mini/src/main/res/values-pt-rPT/strings.xml | 3 +- app-mini/src/main/res/values-pt/strings.xml | 3 +- app-mini/src/main/res/values-ro/strings.xml | 3 +- app-mini/src/main/res/values-ru/strings.xml | 3 +- app-mini/src/main/res/values-sk/strings.xml | 3 +- app-mini/src/main/res/values-sr/strings.xml | 3 +- app-mini/src/main/res/values-sv/strings.xml | 3 +- app-mini/src/main/res/values-th/strings.xml | 3 +- app-mini/src/main/res/values-tr/strings.xml | 3 +- app-mini/src/main/res/values-uk/strings.xml | 3 +- app-mini/src/main/res/values-vi/strings.xml | 3 +- app-mini/src/main/res/values-zh-rCN/strings.xml | 3 +- app-mini/src/main/res/values-zh-rTW/strings.xml | 3 +- app-mini/src/main/res/values/strings.xml | 2 - .../org/torproject/android/OrbotMainActivity.java | 48 ---------------------- app/src/main/res/layout/layout_apps_item.xml | 1 - app/src/main/res/menu/orbot_main.xml | 16 -------- app/src/main/res/values-ar/strings.xml | 3 -- app/src/main/res/values-ay/strings.xml | 6 +-- app/src/main/res/values-az/strings.xml | 5 +-- app/src/main/res/values-be/strings.xml | 6 +-- app/src/main/res/values-bg/strings.xml | 5 +-- app/src/main/res/values-ca/strings.xml | 4 -- app/src/main/res/values-cs-rCZ/strings.xml | 5 +-- 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-eo/strings.xml | 3 +- app/src/main/res/values-es-rAR/strings.xml | 3 -- app/src/main/res/values-es/strings.xml | 4 -- app/src/main/res/values-et/strings.xml | 2 - 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 | 6 +-- 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 | 5 +-- app/src/main/res/values-hu/strings.xml | 4 -- app/src/main/res/values-id/strings.xml | 5 +-- app/src/main/res/values-in-rID/strings.xml | 5 +-- 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 | 5 +-- app/src/main/res/values-ja/strings.xml | 4 -- app/src/main/res/values-ko/strings.xml | 5 +-- app/src/main/res/values-lv/strings.xml | 5 +-- app/src/main/res/values-mk/strings.xml | 4 -- app/src/main/res/values-ms-rMY/strings.xml | 2 - app/src/main/res/values-ms/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 | 5 +-- 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 | 5 +-- app/src/main/res/values-sr/strings.xml | 6 +-- 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 | 2 - 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 | 3 -- app/src/main/res/values-zh-rCN/strings.xml | 4 -- app/src/main/res/values-zh-rTW/strings.xml | 6 +-- app/src/main/res/values/strings.xml | 5 --- app/src/main/res/xml/preferences.xml | 16 -------- 106 files changed, 63 insertions(+), 384 deletions(-)