[tor-commits] [orbot/master] Merge branch 'master' of github.com:guardianproject/orbot
n8fr8 at torproject.org
n8fr8 at torproject.org
Wed Dec 23 16:36:12 UTC 2020
commit 823f4646d45fa6ca54d429def472d71a571ab35c
Merge: da347295 7e7007e3
Author: n8fr8 <nathan at 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(-)
More information about the tor-commits
mailing list