commit e448c18b450423cca58e221dfcf30524ccb4fdf1 Merge: 656d39b7 351ef96f Author: n8fr8 nathan@guardianproject.info Date: Fri Jul 5 07:24:03 2019 -0400
Merge branch 'bitmold-remove_orfox'
.../org/torproject/android/OrbotMainActivity.java | 118 ++------------------- .../android/ui/onboarding/OnboardingActivity.java | 63 ----------- app/src/main/res/drawable/orfox64.png | Bin 4142 -> 0 bytes app/src/main/res/values-ar/strings.xml | 5 +- app/src/main/res/values-ay/strings.xml | 5 +- app/src/main/res/values-az/strings.xml | 1 - app/src/main/res/values-be/strings.xml | 7 +- app/src/main/res/values-bg/strings.xml | 2 - app/src/main/res/values-ca/strings.xml | 3 - app/src/main/res/values-cs-rCZ/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 3 - app/src/main/res/values-el/strings.xml | 5 +- app/src/main/res/values-es-rAR/strings.xml | 3 +- app/src/main/res/values-es/strings.xml | 5 +- app/src/main/res/values-eu/strings.xml | 3 - app/src/main/res/values-fa/strings.xml | 3 - app/src/main/res/values-fi/strings.xml | 3 +- app/src/main/res/values-fr-rFR/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 5 +- app/src/main/res/values-gl/strings.xml | 5 +- app/src/main/res/values-he/strings.xml | 5 +- app/src/main/res/values-hi/strings.xml | 5 +- app/src/main/res/values-hr/strings.xml | 3 +- app/src/main/res/values-hu/strings.xml | 5 +- app/src/main/res/values-id/strings.xml | 1 - app/src/main/res/values-in-rID/strings.xml | 1 - app/src/main/res/values-is/strings.xml | 3 - app/src/main/res/values-it/strings.xml | 3 - app/src/main/res/values-iw/strings.xml | 3 +- app/src/main/res/values-ja/strings.xml | 3 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-lv/strings.xml | 1 - app/src/main/res/values-mk/strings.xml | 5 +- app/src/main/res/values-nb/strings.xml | 4 +- app/src/main/res/values-nl/strings.xml | 3 - app/src/main/res/values-pl/strings.xml | 2 - app/src/main/res/values-pt-rBR/strings.xml | 5 +- app/src/main/res/values-pt-rPT/strings.xml | 1 - app/src/main/res/values-ro/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 5 +- app/src/main/res/values-sk/strings.xml | 1 - app/src/main/res/values-sr/strings.xml | 3 - app/src/main/res/values-sv/strings.xml | 3 - app/src/main/res/values-ta/strings.xml | 1 - app/src/main/res/values-th/strings.xml | 3 - app/src/main/res/values-tl/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 7 +- app/src/main/res/values-uk/strings.xml | 3 - app/src/main/res/values-uz/strings.xml | 3 +- app/src/main/res/values-vi/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 3 - app/src/main/res/values/strings.xml | 4 - .../android/service/TorServiceConstants.java | 3 +- 54 files changed, 29 insertions(+), 309 deletions(-)