commit 9a03f1203f63c50ee6a550511f830e32cba3b038 Merge: 602d2115 a749fe0d Author: n8fr8 nathan@guardianproject.info Date: Fri Jul 9 11:21:59 2021 -0400

Merge branch 'master' of github.com:guardianproject/orbot into syphyr-main

app/src/main/res/values-fr-rFR/strings.xml | 4 +- app/src/main/res/values-it/strings.xml | 6 +-- app/src/main/res/values-iw/strings.xml | 5 ++- app/src/main/res/values-pt-rBR/strings.xml | 2 + app/src/main/res/values-ro-rRO/strings.xml | 44 ++++++++++++++++++---- app/src/main/res/values-tr/strings.xml | 2 + app/src/main/res/values-uk/strings.xml | 2 + app/src/main/res/values-vi/strings.xml | 2 + app/src/main/res/values-zh-rCN/strings.xml | 4 +- fastlane/metadata/android/zh-CN/title.txt | 2 +- .../torproject/android/service/OrbotService.java | 2 +- orbotservice/src/main/res/raw/bridges.txt | 1 - 12 files changed, 58 insertions(+), 18 deletions(-)