[tor-commits] [orbot/master] Merge branch 'master' of github.com:guardianproject/orbot

[n8fr8 at torproject.org]

commit 515d0e52c6c8d9dedb58bb4dab84b12179b45b93
Merge: 2a114a6a aa48f6b6
Author: n8fr8 <nathan at guardianproject.info>
Date:   Mon Nov 8 09:44:39 2021 -0500

    Merge branch 'master' of github.com:guardianproject/orbot

 LICENSE                                            |  4 +-
 app-mini/build.gradle                              |  5 +-
 app-tv/build.gradle                                | 15 ++++-
 app/build.gradle                                   |  7 +--
 app/src/main/res/layout/layout_about.xml           | 67 ++++++++--------------
 app/src/main/res/values-ar/strings.xml             |  1 -
 app/src/main/res/values-ay/strings.xml             |  3 +-
 app/src/main/res/values-az/strings.xml             |  1 -
 app/src/main/res/values-be/strings.xml             |  3 +-
 app/src/main/res/values-bg/strings.xml             |  1 -
 app/src/main/res/values-bn-rBD/strings.xml         |  1 -
 app/src/main/res/values-bn/strings.xml             |  1 -
 app/src/main/res/values-ca/strings.xml             |  1 -
 app/src/main/res/values-cs-rCZ/strings.xml         |  1 -
 app/src/main/res/values-cs/strings.xml             |  1 -
 app/src/main/res/values-cy/strings.xml             |  1 -
 app/src/main/res/values-da/strings.xml             |  1 -
 app/src/main/res/values-de/strings.xml             |  1 -
 app/src/main/res/values-el/strings.xml             |  1 -
 app/src/main/res/values-en-rGB/strings.xml         |  1 -
 app/src/main/res/values-eo/strings.xml             |  1 -
 app/src/main/res/values-es-rAR/strings.xml         |  3 +-
 app/src/main/res/values-es/strings.xml             |  1 -
 app/src/main/res/values-et/strings.xml             |  1 -
 app/src/main/res/values-eu/strings.xml             |  1 -
 app/src/main/res/values-fa/strings.xml             |  1 -
 app/src/main/res/values-fi/strings.xml             |  1 -
 app/src/main/res/values-fr-rFR/strings.xml         |  1 -
 app/src/main/res/values-fr/strings.xml             |  3 +-
 app/src/main/res/values-gl/strings.xml             |  1 -
 app/src/main/res/values-hi/strings.xml             |  1 -
 app/src/main/res/values-hr/strings.xml             |  3 +-
 app/src/main/res/values-hu/strings.xml             |  1 -
 app/src/main/res/values-in/strings.xml             |  1 -
 app/src/main/res/values-is/strings.xml             |  1 -
 app/src/main/res/values-it/strings.xml             |  1 -
 app/src/main/res/values-iw/strings.xml             |  1 -
 app/src/main/res/values-ja/strings.xml             |  1 -
 app/src/main/res/values-ko/strings.xml             |  1 -
 app/src/main/res/values-lt-rLT/strings.xml         |  1 -
 app/src/main/res/values-lt/strings.xml             |  3 +-
 app/src/main/res/values-lv/strings.xml             |  1 -
 app/src/main/res/values-mk/strings.xml             |  1 -
 app/src/main/res/values-ms-rMY/strings.xml         |  1 -
 app/src/main/res/values-ms/strings.xml             |  1 -
 app/src/main/res/values-nb/strings.xml             |  1 -
 app/src/main/res/values-nl/strings.xml             |  1 -
 app/src/main/res/values-pl/strings.xml             |  1 -
 app/src/main/res/values-pt-rBR/strings.xml         |  1 -
 app/src/main/res/values-pt-rPT/strings.xml         |  1 -
 app/src/main/res/values-pt/strings.xml             |  1 -
 app/src/main/res/values-ro-rRO/strings.xml         |  1 -
 app/src/main/res/values-ro/strings.xml             |  1 -
 app/src/main/res/values-ru/strings.xml             |  1 -
 app/src/main/res/values-si-rLK/strings.xml         |  1 -
 app/src/main/res/values-sk-rSK/strings.xml         |  1 -
 app/src/main/res/values-sk/strings.xml             |  1 -
 app/src/main/res/values-sl/strings.xml             |  1 -
 app/src/main/res/values-sq/strings.xml             |  1 -
 app/src/main/res/values-sr/strings.xml             |  3 +-
 app/src/main/res/values-sv/strings.xml             |  1 -
 app/src/main/res/values-ta/strings.xml             |  1 -
 app/src/main/res/values-th/strings.xml             |  1 -
 app/src/main/res/values-tl/strings.xml             |  1 -
 app/src/main/res/values-tr/strings.xml             |  1 -
 app/src/main/res/values-uk/strings.xml             |  1 -
 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                |  9 +--
 dependencies.gradle                                | 58 +++++++++----------
 .../torproject/android/service/OrbotService.java   |  2 +-
 72 files changed, 86 insertions(+), 161 deletions(-)