October 2020 - tor-commits - lists.torproject.org

[orbot/master] Removed old+unused update.json file to address concerns in #323
by n8fr8＠torproject.org 07 Oct '20

07 Oct '20

commit 23e5b459f67db12acf461e4f839872a4f275b1d2 Author: bim <dsnake(a)protonmail.com> Date: Thu Aug 27 01:26:00 2020 -0400 Removed old+unused update.json file to address concerns in #323 --- update.json | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/update.json b/update.json deleted file mode 100644 index a3c30cda..00000000 --- a/update.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "latestVersion": "16.0.0.1", - "latestVersionCode": 16000003, - "url": "https://github.com/n8fr8/orbot/releases", - "releaseNotes": [ - "- New look and feel", - "- Easier setup and onboarding", - "- Bridge wizard and network testing" - ] -}

1 0

[orbot/master] removed unused app module drawables
by n8fr8＠torproject.org 07 Oct '20

07 Oct '20

commit 1c579b851fb07a69e493964522d4a6b90c8d24af Author: bim <dsnake(a)protonmail.com> Date: Wed Sep 2 10:44:20 2020 -0400 removed unused app module drawables --- app/src/main/res/drawable-hdpi-v11/ic_stat_notifyerr.png | Bin 359 -> 0 bytes app/src/main/res/drawable-hdpi-v11/ic_stat_tor.png | Bin 660 -> 0 bytes app/src/main/res/drawable-hdpi-v11/ic_stat_tor_off.png | Bin 944 -> 0 bytes app/src/main/res/drawable-hdpi-v11/ic_stat_tor_xfer.png | Bin 1073 -> 0 bytes app/src/main/res/drawable-hdpi-v9/ic_stat_notifyerr.png | Bin 508 -> 0 bytes app/src/main/res/drawable-hdpi-v9/ic_stat_tor.png | Bin 640 -> 0 bytes app/src/main/res/drawable-hdpi/ic_stat_notifyerr.png | Bin 901 -> 0 bytes app/src/main/res/drawable-hdpi/ic_stat_tor.png | Bin 715 -> 0 bytes app/src/main/res/drawable-hdpi/ic_stat_tor_xfer.png | Bin 969 -> 0 bytes app/src/main/res/drawable-ldpi-v11/ic_stat_notifyerr.png | Bin 262 -> 0 bytes app/src/main/res/drawable-ldpi-v11/ic_stat_tor.png | Bin 420 -> 0 bytes app/src/main/res/drawable-ldpi-v9/ic_stat_notifyerr.png | Bin 326 -> 0 bytes app/src/main/res/drawable-ldpi-v9/ic_stat_tor.png | Bin 365 -> 0 bytes app/src/main/res/drawable-ldpi/ic_stat_notifyerr.png | Bin 443 -> 0 bytes app/src/main/res/drawable-ldpi/ic_stat_tor.png | Bin 494 -> 0 bytes app/src/main/res/drawable-mdpi-v11/ic_stat_notifyerr.png | Bin 317 -> 0 bytes app/src/main/res/drawable-mdpi-v11/ic_stat_tor.png | Bin 441 -> 0 bytes app/src/main/res/drawable-mdpi-v11/ic_stat_tor_xfer.png | Bin 741 -> 0 bytes app/src/main/res/drawable-mdpi-v9/ic_stat_notifyerr.png | Bin 417 -> 0 bytes app/src/main/res/drawable-mdpi-v9/ic_stat_tor.png | Bin 464 -> 0 bytes .../main/res/drawable-xhdpi-v11/ic_stat_notifyerr.png | Bin 406 -> 0 bytes app/src/main/res/drawable-xhdpi-v11/ic_stat_tor.png | Bin 887 -> 0 bytes app/src/main/res/drawable-xhdpi-v11/ic_stat_tor_xfer.png | Bin 1348 -> 0 bytes app/src/main/res/drawable-xhdpi-v9/ic_stat_notifyerr.png | Bin 580 -> 0 bytes app/src/main/res/drawable-xhdpi-v9/ic_stat_tor.png | Bin 864 -> 0 bytes app/src/main/res/drawable-xxhdpi-v11/ic_stat_tor.png | Bin 1307 -> 0 bytes .../main/res/drawable-xxhdpi-v11/ic_stat_tor_xfer.png | Bin 1734 -> 0 bytes app/src/main/res/drawable-xxxhdpi-v11/ic_stat_tor.png | Bin 1734 -> 0 bytes .../main/res/drawable-xxxhdpi-v11/ic_stat_tor_xfer.png | Bin 2424 -> 0 bytes app/src/main/res/drawable/ic_stat_tor_off.png | Bin 944 -> 0 bytes app/src/main/res/drawable/ic_stat_tor_xfer.png | Bin 628 -> 0 bytes 31 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/src/main/res/drawable-hdpi-v11/ic_stat_notifyerr.png b/app/src/main/res/drawable-hdpi-v11/ic_stat_notifyerr.png deleted file mode 100644 index 782a52d9..00000000 Binary files a/app/src/main/res/drawable-hdpi-v11/ic_stat_notifyerr.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi-v11/ic_stat_tor.png b/app/src/main/res/drawable-hdpi-v11/ic_stat_tor.png deleted file mode 100644 index 543c788f..00000000 Binary files a/app/src/main/res/drawable-hdpi-v11/ic_stat_tor.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi-v11/ic_stat_tor_off.png b/app/src/main/res/drawable-hdpi-v11/ic_stat_tor_off.png deleted file mode 100644 index a8cbe1de..00000000 Binary files a/app/src/main/res/drawable-hdpi-v11/ic_stat_tor_off.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi-v11/ic_stat_tor_xfer.png b/app/src/main/res/drawable-hdpi-v11/ic_stat_tor_xfer.png deleted file mode 100644 index 781f061a..00000000 Binary files a/app/src/main/res/drawable-hdpi-v11/ic_stat_tor_xfer.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi-v9/ic_stat_notifyerr.png b/app/src/main/res/drawable-hdpi-v9/ic_stat_notifyerr.png deleted file mode 100644 index 75f8a863..00000000 Binary files a/app/src/main/res/drawable-hdpi-v9/ic_stat_notifyerr.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi-v9/ic_stat_tor.png b/app/src/main/res/drawable-hdpi-v9/ic_stat_tor.png deleted file mode 100644 index 716e4981..00000000 Binary files a/app/src/main/res/drawable-hdpi-v9/ic_stat_tor.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_stat_notifyerr.png b/app/src/main/res/drawable-hdpi/ic_stat_notifyerr.png deleted file mode 100644 index abd8c126..00000000 Binary files a/app/src/main/res/drawable-hdpi/ic_stat_notifyerr.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_stat_tor.png b/app/src/main/res/drawable-hdpi/ic_stat_tor.png deleted file mode 100644 index 0f8f87d1..00000000 Binary files a/app/src/main/res/drawable-hdpi/ic_stat_tor.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_stat_tor_xfer.png b/app/src/main/res/drawable-hdpi/ic_stat_tor_xfer.png deleted file mode 100644 index 44a2f772..00000000 Binary files a/app/src/main/res/drawable-hdpi/ic_stat_tor_xfer.png and /dev/null differ diff --git a/app/src/main/res/drawable-ldpi-v11/ic_stat_notifyerr.png b/app/src/main/res/drawable-ldpi-v11/ic_stat_notifyerr.png deleted file mode 100644 index 43d71e2f..00000000 Binary files a/app/src/main/res/drawable-ldpi-v11/ic_stat_notifyerr.png and /dev/null differ diff --git a/app/src/main/res/drawable-ldpi-v11/ic_stat_tor.png b/app/src/main/res/drawable-ldpi-v11/ic_stat_tor.png deleted file mode 100644 index e3d85b5b..00000000 Binary files a/app/src/main/res/drawable-ldpi-v11/ic_stat_tor.png and /dev/null differ diff --git a/app/src/main/res/drawable-ldpi-v9/ic_stat_notifyerr.png b/app/src/main/res/drawable-ldpi-v9/ic_stat_notifyerr.png deleted file mode 100644 index eedf7faf..00000000 Binary files a/app/src/main/res/drawable-ldpi-v9/ic_stat_notifyerr.png and /dev/null differ diff --git a/app/src/main/res/drawable-ldpi-v9/ic_stat_tor.png b/app/src/main/res/drawable-ldpi-v9/ic_stat_tor.png deleted file mode 100644 index 2f344690..00000000 Binary files a/app/src/main/res/drawable-ldpi-v9/ic_stat_tor.png and /dev/null differ diff --git a/app/src/main/res/drawable-ldpi/ic_stat_notifyerr.png b/app/src/main/res/drawable-ldpi/ic_stat_notifyerr.png deleted file mode 100644 index 645432c2..00000000 Binary files a/app/src/main/res/drawable-ldpi/ic_stat_notifyerr.png and /dev/null differ diff --git a/app/src/main/res/drawable-ldpi/ic_stat_tor.png b/app/src/main/res/drawable-ldpi/ic_stat_tor.png deleted file mode 100644 index 1a18c2ab..00000000 Binary files a/app/src/main/res/drawable-ldpi/ic_stat_tor.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi-v11/ic_stat_notifyerr.png b/app/src/main/res/drawable-mdpi-v11/ic_stat_notifyerr.png deleted file mode 100644 index e55893c3..00000000 Binary files a/app/src/main/res/drawable-mdpi-v11/ic_stat_notifyerr.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi-v11/ic_stat_tor.png b/app/src/main/res/drawable-mdpi-v11/ic_stat_tor.png deleted file mode 100644 index be7dccf7..00000000 Binary files a/app/src/main/res/drawable-mdpi-v11/ic_stat_tor.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi-v11/ic_stat_tor_xfer.png b/app/src/main/res/drawable-mdpi-v11/ic_stat_tor_xfer.png deleted file mode 100644 index 04168ec8..00000000 Binary files a/app/src/main/res/drawable-mdpi-v11/ic_stat_tor_xfer.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi-v9/ic_stat_notifyerr.png b/app/src/main/res/drawable-mdpi-v9/ic_stat_notifyerr.png deleted file mode 100644 index b19d6b65..00000000 Binary files a/app/src/main/res/drawable-mdpi-v9/ic_stat_notifyerr.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi-v9/ic_stat_tor.png b/app/src/main/res/drawable-mdpi-v9/ic_stat_tor.png deleted file mode 100644 index be212d07..00000000 Binary files a/app/src/main/res/drawable-mdpi-v9/ic_stat_tor.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi-v11/ic_stat_notifyerr.png b/app/src/main/res/drawable-xhdpi-v11/ic_stat_notifyerr.png deleted file mode 100644 index 36f750a5..00000000 Binary files a/app/src/main/res/drawable-xhdpi-v11/ic_stat_notifyerr.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi-v11/ic_stat_tor.png b/app/src/main/res/drawable-xhdpi-v11/ic_stat_tor.png deleted file mode 100644 index 2344022f..00000000 Binary files a/app/src/main/res/drawable-xhdpi-v11/ic_stat_tor.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi-v11/ic_stat_tor_xfer.png b/app/src/main/res/drawable-xhdpi-v11/ic_stat_tor_xfer.png deleted file mode 100644 index 270a4139..00000000 Binary files a/app/src/main/res/drawable-xhdpi-v11/ic_stat_tor_xfer.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi-v9/ic_stat_notifyerr.png b/app/src/main/res/drawable-xhdpi-v9/ic_stat_notifyerr.png deleted file mode 100644 index 7eaea7be..00000000 Binary files a/app/src/main/res/drawable-xhdpi-v9/ic_stat_notifyerr.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi-v9/ic_stat_tor.png b/app/src/main/res/drawable-xhdpi-v9/ic_stat_tor.png deleted file mode 100644 index ce82130d..00000000 Binary files a/app/src/main/res/drawable-xhdpi-v9/ic_stat_tor.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi-v11/ic_stat_tor.png b/app/src/main/res/drawable-xxhdpi-v11/ic_stat_tor.png deleted file mode 100644 index c162b7e0..00000000 Binary files a/app/src/main/res/drawable-xxhdpi-v11/ic_stat_tor.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi-v11/ic_stat_tor_xfer.png b/app/src/main/res/drawable-xxhdpi-v11/ic_stat_tor_xfer.png deleted file mode 100644 index 0d09348f..00000000 Binary files a/app/src/main/res/drawable-xxhdpi-v11/ic_stat_tor_xfer.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi-v11/ic_stat_tor.png b/app/src/main/res/drawable-xxxhdpi-v11/ic_stat_tor.png deleted file mode 100644 index 5b6154a8..00000000 Binary files a/app/src/main/res/drawable-xxxhdpi-v11/ic_stat_tor.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi-v11/ic_stat_tor_xfer.png b/app/src/main/res/drawable-xxxhdpi-v11/ic_stat_tor_xfer.png deleted file mode 100644 index 8e6eb04a..00000000 Binary files a/app/src/main/res/drawable-xxxhdpi-v11/ic_stat_tor_xfer.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_stat_tor_off.png b/app/src/main/res/drawable/ic_stat_tor_off.png deleted file mode 100644 index a8cbe1de..00000000 Binary files a/app/src/main/res/drawable/ic_stat_tor_off.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_stat_tor_xfer.png b/app/src/main/res/drawable/ic_stat_tor_xfer.png deleted file mode 100644 index ec893235..00000000 Binary files a/app/src/main/res/drawable/ic_stat_tor_xfer.png and /dev/null differ

1 0

[orbot/master] update version code for RC1 1631300100
by n8fr8＠torproject.org 07 Oct '20

07 Oct '20

commit 0637afe3702134c6355f5e3462638146aa05cf0b Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Sep 8 13:19:12 2020 -0400 update version code for RC1 1631300100 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 16656dc7..b1904a69 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,7 +77,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 29 - versionCode 1631200100 + versionCode 1631300100 versionName getVersionName() archivesBaseName = "Orbot-$versionName" }

1 0

[orbot/master] Removed unused assets from orbotservice module
by n8fr8＠torproject.org 07 Oct '20

07 Oct '20

commit 5a8cac6f939137f6dafe5ba52506aa2302a18102 Author: bim <dsnake(a)protonmail.com> Date: Wed Sep 2 10:40:02 2020 -0400 Removed unused assets from orbotservice module --- .../main/res/drawable-hdpi-v11/ic_stat_tor_off.png | Bin 944 -> 0 bytes orbotservice/src/main/res/drawable/ic_onion.xml | 9 ----- orbotservice/src/main/res/drawable/ic_transfer.xml | 9 ----- .../notification_template_part_chronometer.xml | 25 ------------- .../res/layout/notification_template_part_time.xml | 25 ------------- orbotservice/src/main/res/values-ar/strings.xml | 7 +--- orbotservice/src/main/res/values-az/strings.xml | 9 ++--- orbotservice/src/main/res/values-bg/strings.xml | 7 +--- .../src/main/res/values-bn-rBD/strings.xml | 2 -- orbotservice/src/main/res/values-ca/strings.xml | 2 -- .../src/main/res/values-cs-rCZ/strings.xml | 4 +-- orbotservice/src/main/res/values-cs/strings.xml | 2 -- orbotservice/src/main/res/values-cy/strings.xml | 2 -- orbotservice/src/main/res/values-da/strings.xml | 3 -- orbotservice/src/main/res/values-de/strings.xml | 7 +--- orbotservice/src/main/res/values-el/strings.xml | 2 -- orbotservice/src/main/res/values-eo/strings.xml | 2 -- .../src/main/res/values-es-rAR/strings.xml | 2 -- orbotservice/src/main/res/values-es/strings.xml | 7 +--- orbotservice/src/main/res/values-et/strings.xml | 4 --- orbotservice/src/main/res/values-eu/strings.xml | 3 -- orbotservice/src/main/res/values-fa/strings.xml | 7 +--- orbotservice/src/main/res/values-fi/strings.xml | 7 +--- .../src/main/res/values-fr-rFR/strings.xml | 7 +--- orbotservice/src/main/res/values-fr/strings.xml | 2 -- orbotservice/src/main/res/values-gl/strings.xml | 2 -- orbotservice/src/main/res/values-he/strings.xml | 7 +--- orbotservice/src/main/res/values-hr/strings.xml | 7 +--- orbotservice/src/main/res/values-hu/strings.xml | 7 +--- orbotservice/src/main/res/values-id/strings.xml | 7 +--- .../src/main/res/values-in-rID/strings.xml | 7 +--- orbotservice/src/main/res/values-is/strings.xml | 7 +--- orbotservice/src/main/res/values-it/strings.xml | 7 +--- orbotservice/src/main/res/values-iw/strings.xml | 7 +--- orbotservice/src/main/res/values-ja/strings.xml | 7 +--- orbotservice/src/main/res/values-ko/strings.xml | 2 -- orbotservice/src/main/res/values-lv/strings.xml | 7 +--- orbotservice/src/main/res/values-mk/strings.xml | 7 +--- .../src/main/res/values-ms-rMY/strings.xml | 2 -- orbotservice/src/main/res/values-ms/strings.xml | 2 -- orbotservice/src/main/res/values-nb/strings.xml | 7 +--- orbotservice/src/main/res/values-nl/strings.xml | 7 +--- orbotservice/src/main/res/values-pl/strings.xml | 7 +--- .../src/main/res/values-pt-rBR/strings.xml | 7 +--- orbotservice/src/main/res/values-pt/strings.xml | 6 +--- orbotservice/src/main/res/values-ro/strings.xml | 7 +--- orbotservice/src/main/res/values-ru/strings.xml | 7 +--- .../src/main/res/values-si-rLK/strings.xml | 2 -- orbotservice/src/main/res/values-sk/strings.xml | 2 -- orbotservice/src/main/res/values-sl/strings.xml | 2 -- orbotservice/src/main/res/values-sr/strings.xml | 2 -- orbotservice/src/main/res/values-sv/strings.xml | 7 +--- orbotservice/src/main/res/values-ta/strings.xml | 2 -- orbotservice/src/main/res/values-th/strings.xml | 1 - orbotservice/src/main/res/values-tl/strings.xml | 3 -- orbotservice/src/main/res/values-tr/strings.xml | 7 +--- orbotservice/src/main/res/values-uk/strings.xml | 7 +--- orbotservice/src/main/res/values-vi/strings.xml | 7 +--- .../src/main/res/values-zh-rCN/strings.xml | 7 +--- .../src/main/res/values-zh-rTW/strings.xml | 2 -- orbotservice/src/main/res/values/colors.xml | 9 +---- orbotservice/src/main/res/values/strings.xml | 39 +++++---------------- 62 files changed, 42 insertions(+), 346 deletions(-) diff --git a/orbotservice/src/main/res/drawable-hdpi-v11/ic_stat_tor_off.png b/orbotservice/src/main/res/drawable-hdpi-v11/ic_stat_tor_off.png deleted file mode 100644 index a8cbe1de..00000000 Binary files a/orbotservice/src/main/res/drawable-hdpi-v11/ic_stat_tor_off.png and /dev/null differ diff --git a/orbotservice/src/main/res/drawable/ic_onion.xml b/orbotservice/src/main/res/drawable/ic_onion.xml deleted file mode 100644 index 3047a149..00000000 --- a/orbotservice/src/main/res/drawable/ic_onion.xml +++ /dev/null @@ -1,9 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="69.9dp" - android:height="107.3dp" - android:viewportWidth="69.9" - android:viewportHeight="107.3"> - <path - android:pathData="M59.9,54.5c-3.4,-3.1 -7.7,-5.6 -12.1,-8.1c-2,-1.1 -8.1,-5.9 -6,-12.7l-3.8,-1.6c6,-9.3 13.8,-18.5 23.4,-27.1c-7.7,2.6 -14.5,6.6 -19.6,13.7c3,-6.3 7.9,-12.5 13.3,-18.8c-7.4,5.3 -13.8,11.3 -17.8,19.3L40.1,8c-4,7.2 -6.8,14.5 -7.9,21.8l-5.9,-2.4l-1,0.8c5.2,9.3 2.5,14.2 -0.1,15.9C20,47.6 12.5,52.1 8.7,56c-7.2,7.4 -9.3,14.4 -8.6,23.7c0.7,11.9 9.4,21.8 20.9,25.7c5.1,1.7 9.8,1.9 15,1.9c8.4,0 17,-2.2 23.3,-7.5c6.7,-5.5 10.6,-13.9 10.6,-22.5C69.9,68.6 66.3,60.3 59.9,54.5zM18.6,101.8C9.3,97.3 3.1,87.6 2.7,79.7C1.9,63.6 9.6,58.9 16.8,53c4,-3.3 9.6,-4.9 12.8,-10.8c0.6,-1.3 1,-4.1 0.2,-7.1c-0.3,-1 -1.8,-4.6 -2.4,-5.4l8.9,3.9l0,0l0,0c-0.2,4.2 -0.3,7.6 0.5,10.7c0.9,3.4 5.3,8.3 7.1,14c3.5,10.8 2.6,24.9 0.1,35.9c-0.4,1.8 -1.7,4 -3.3,6c0.6,-1.1 1.1,-2.2 1.4,-3.4c2.5,-8.9 3.6,-13 2.4,-22.8c-0.2,-1 -0.6,-4.2 -2.1,-7.7C40.3,61 37.1,56 36.7,54.9c-0.7,-1.7 -1.7,-8.9 -1.8,-13.8C35,45.3 35.3,53 36.4,56c0.3,1 3.2,5.5 5.3,11c1.4,3.8 1.7,7.3 2,8.3c1,4.5 -0.2,12.1 -1.8,19.3c-0.5,2.6 -1.9,5 .6 -3.7,7.9c1,-1.4 1.8,-3.2 2.4,-5.3c1.2,-4.2 1.7,-9.6 1.6,-13c-0.1,-2 -1,-6.3 -2.5,-10.2c-0.9,-2.1 -2.2,-4.3 -3.1,-5.8c-1,-1.5 -1,-4.8 -1.4,-8.6c0.1,4.1 -0.3,6.2 0.7,9.1c0.6,1.7 2.8,4.1 3.4,6.4c0.9,3.1 1.8,6.5 1.7,8.6c0,2.4 -0.1,6.8 -1.2,11.6c-0.7,3.6 -2.3,6.7 -4.9,8.7c1.1,-1.4 1.7,-2.8 2,-4.2c0.4,-2.1 0.5,-4.1 0.7,-6.6c0.2,-2.1 0.1,-4.8 -0.5,-7.7c-0.8,-3.6 -2.1,-7.2 -2.7,-9.7c0.1,2.8 1.2,6.3 1.7,10c0.4,2.7 0.2,5.4 0.1,7.8c-0.1,2.8 -1,7.7 -2.2,10.1c-1.2,-0.5 -1.6,-1.2 -2.4,-2.2c-1,-1.3 -1.6,-2.7 -2.2,-4.3c-0.5,-1.2 -1,-2.6 -1.3,-4.1c-0.3,-2.4 -0.2,-6.1 2.5,-9.9c2.1,-3 2.5,-3.2 3.2,-6.7c-1,3.1 -1.7,3.4 -3.9,6c-2.5,2.9 -2.9,7.1 -2.9,10.5c0,1.4 0.6,3 1.1,4.5c0.6,1.6 1.2,3.2 2,4.4c0.6,1 1.4,1.7 2.1,2.2c-2.6,-0.7 -5.3,-1.7 -7,-3.1c-4.2,-3.6 -7.9,-9.7 -8.4,-15.1c-0.4,-4.4 3.6,-10.8 9.3,-14c4.8,-2.8 5.9,-5.9 6.9,-11c-1.4,4.4 -2.8,8.2 -7.4,10.5C19,75 15.6,80.8 15.9,86.4c0.5,7.1 3.3,12 9,15.9c1.3,0.9 3.1,1.8 5,2.5c-7.1,-1.7 -8,-2.7 -10.4,-5.5c0,-0.2 -0.6,-0.6 -0.6,-0.7c-3.2,-3.6 -7.2,-9.8 - 8.6,-15.5c-0.5,-2 -1,-4.1 -0.4,-6.1c2.6,-9.4 8.3,-13 14,-16.9c1.4,-1 2.8,-1.9 4.1,-2.9c3.2,-2.5 4,-9 4.7,-12.7c-1.3,4.5 -2.7,10.1 -5.2,11.9c-1.3,1 -2.9,1.8 -4.2,2.7c-5.9,4 -11.8,7.8 -14.5,17.5c-0.6,2.5 -0.2,4.3 0.4,6.7c1.5,5.9 5.5,12.3 8.9,16.1c0,0 0.6,0.6 0.6,0.6c1.5,1.7 3.4,3 5.7,3.9C22.3,103.4 20.4,102.7 18.6,101.8z" - android:fillColor="#010101"/> -</vector> diff --git a/orbotservice/src/main/res/drawable/ic_transfer.xml b/orbotservice/src/main/res/drawable/ic_transfer.xml deleted file mode 100644 index a2d1fa99..00000000 --- a/orbotservice/src/main/res/drawable/ic_transfer.xml +++ /dev/null @@ -1,9 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> - <path - android:fillColor="#FF000000" - android:pathData="M9,3L5,6.99h3L8,14h2L10,6.99h3L9,3zM16,17.01L16,10h-2v7.01h-3L15,21l4,-3.99h-3z"/> -</vector> diff --git a/orbotservice/src/main/res/layout/notification_template_part_chronometer.xml b/orbotservice/src/main/res/layout/notification_template_part_chronometer.xml deleted file mode 100644 index 14a4758a..00000000 --- a/orbotservice/src/main/res/layout/notification_template_part_chronometer.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - - -<Chronometer android:id="@+id/chronometer" xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:layout_weight="0" - android:singleLine="true" - android:gravity="center" - android:paddingStart="8dp" - /> diff --git a/orbotservice/src/main/res/layout/notification_template_part_time.xml b/orbotservice/src/main/res/layout/notification_template_part_time.xml deleted file mode 100644 index e3b91fad..00000000 --- a/orbotservice/src/main/res/layout/notification_template_part_time.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - - -<DateTimeView android:id="@+id/time" xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:layout_weight="0" - android:singleLine="true" - android:gravity="center" - android:paddingStart="8dp" - /> diff --git a/orbotservice/src/main/res/values-ar/strings.xml b/orbotservice/src/main/res/values-ar/strings.xml index a9762839..a131e2e3 100644 --- a/orbotservice/src/main/res/values-ar/strings.xml +++ b/orbotservice/src/main/res/values-ar/strings.xml @@ -6,8 +6,6 @@ <string name="status_activated">متصل بشبكة تور</string> <string name="status_disabled">تم إيقاف اوربوت</string> <string name="status_shutting_down">جاري ايقاف خدمة تور</string> - <string name="tor_process_starting">جاري تشغيل تور...</string> - <string name="tor_process_complete">كامل.</string>    @@ -23,9 +21,6 @@ <string name="something_bad_happened">حصل خطأ ما. افحص السجل</string> <string name="unable_to_read_hidden_service_name">غير قادر على قراءة اسم الخدمة المخفية</string> <string name="unable_to_start_tor">غير قادر على بدء تور:</string> - <string name="no_internet_connection_tor">لا يوجد ارتباط بألانترنيت: تور في وضع الوقف المؤقت</string> <string name="newnym">لقد تحولت الى هوية تور جديدة</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">لا يوجد اتصال بألشبكة. سيدخل تور الى وضع النوم</string> - <string name="network_connectivity_is_good_waking_tor_up_">الاتصال بألشبكة جيد. تنبيه تور من النوم</string> - <string name="updating_settings_in_tor_service">تحديث الاعدادات في خدمات تور</string> + <string name="updating_settings_in_tor_service">تحديث الاعدادات في خدمات تور</string> </resources> diff --git a/orbotservice/src/main/res/values-az/strings.xml b/orbotservice/src/main/res/values-az/strings.xml index 647d20e2..a0da0477 100644 --- a/orbotservice/src/main/res/values-az/strings.xml +++ b/orbotservice/src/main/res/values-az/strings.xml @@ -6,9 +6,7 @@ <string name="status_activated">Tor şəbəkəsinə bağlandı</string> <string name="status_disabled">Orbot deaktivasiya edildi</string> <string name="status_shutting_down">Tor xidməti işini başa vurur</string> - <string name="tor_process_starting">Tor xidməti başlayır...</string> - <string name="tor_process_complete">tamamla.</string> -  +     @@ -23,9 +21,6 @@ <string name="something_bad_happened">Nə isə pis bir şey oldu. Girişi yoxla</string> <string name="unable_to_read_hidden_service_name">gizli xidmət adını oxumağı deaktivləşdir</string> <string name="unable_to_start_tor">Tor-un başlanmasını dayandır:</string> - <string name="no_internet_connection_tor">İnternet yoxdur; Tor gözləyir</string> - <string name="newnym">Yeni Tor oxşarına qoşuldun!</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">İnternetlə əlaqə yoxdur. Tor gözləmə rejiminə keçir...</string> - <string name="network_connectivity_is_good_waking_tor_up_">İnternetlə əlaqə yaxşıdır. Tor iş rejiminə keçir...</string> + <string name="newnym">Yeni Tor oxşarına qoşuldun!</string> <string name="updating_settings_in_tor_service">Tor xidmətində quraşdırmalar yüklənir</string> </resources> diff --git a/orbotservice/src/main/res/values-bg/strings.xml b/orbotservice/src/main/res/values-bg/strings.xml index 2d39773a..43d541bf 100644 --- a/orbotservice/src/main/res/values-bg/strings.xml +++ b/orbotservice/src/main/res/values-bg/strings.xml @@ -6,8 +6,6 @@ <string name="status_activated">Свързан към Тор мрежата</string> <string name="status_disabled">Орбот е деактивиран</string> <string name="status_shutting_down">TorService спира</string> - <string name="tor_process_starting">Стартиране на Тор клиент...</string> - <string name="tor_process_complete">завършено.</string>    @@ -23,9 +21,6 @@ <string name="something_bad_happened">Нещо лошо се случи. Проверете лога</string> <string name="unable_to_read_hidden_service_name">не може да прочете име на скрита услуга</string> <string name="unable_to_start_tor">Не може да стартира Тор:</string> - <string name="no_internet_connection_tor">Няма интернет връзка; Tor е в режим на изчакване...</string> <string name="newnym">Сменихте своята Тор идентичност!</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">Няма интернет връзка. Преминаване в режим на изчкаване...</string> - <string name="network_connectivity_is_good_waking_tor_up_">Добра интернет връзка. Събуждане на Tor...</string> - <string name="updating_settings_in_tor_service">обновяване на настройките в Tor услугата</string> + <string name="updating_settings_in_tor_service">обновяване на настройките в Tor услугата</string> </resources> diff --git a/orbotservice/src/main/res/values-bn-rBD/strings.xml b/orbotservice/src/main/res/values-bn-rBD/strings.xml index c1cc6e6b..3f5d7d2e 100644 --- a/orbotservice/src/main/res/values-bn-rBD/strings.xml +++ b/orbotservice/src/main/res/values-bn-rBD/strings.xml @@ -5,8 +5,6 @@ <string name="status_starting_up">অরবট চালু হচ্ছে . . . </string> <string name="status_activated">টর নেটওয়ার্কের সাথে সংযুক্ত হয়েছে</string> <string name="status_disabled">অরবট নিষ্ক্রিয় করা হয়েছে</string> - <string name="tor_process_starting">টর ক্লায়েন্ট চালু করা হচ্ছে</string> - <string name="tor_process_complete">সম্পূর্ণ</string>    diff --git a/orbotservice/src/main/res/values-ca/strings.xml b/orbotservice/src/main/res/values-ca/strings.xml index 007b5bbf..60195126 100644 --- a/orbotservice/src/main/res/values-ca/strings.xml +++ b/orbotservice/src/main/res/values-ca/strings.xml @@ -4,8 +4,6 @@ <string name="status_starting_up">L\'Orbot s\'està iniciant...</string> <string name="status_activated">Esteu connectat a la xarxa Tor</string> <string name="status_disabled">L\'Orbot està desactivat</string> - <string name="tor_process_starting">S\'està iniciant el client Tor...</string> - <string name="tor_process_complete">fet.</string>    diff --git a/orbotservice/src/main/res/values-cs-rCZ/strings.xml b/orbotservice/src/main/res/values-cs-rCZ/strings.xml index 4ee8d8e6..c997196e 100644 --- a/orbotservice/src/main/res/values-cs-rCZ/strings.xml +++ b/orbotservice/src/main/res/values-cs-rCZ/strings.xml @@ -4,9 +4,7 @@ <string name="status_starting_up">Orbot se spouští...</string> <string name="status_activated">Připojen k síti Tor</string> <string name="status_disabled">Orbot je deaktivován</string> - <string name="tor_process_starting">Startuji Tor klienta...</string> - <string name="tor_process_complete">hotovo.</string> -  +     diff --git a/orbotservice/src/main/res/values-cs/strings.xml b/orbotservice/src/main/res/values-cs/strings.xml index 6e108c0d..3cb27925 100644 --- a/orbotservice/src/main/res/values-cs/strings.xml +++ b/orbotservice/src/main/res/values-cs/strings.xml @@ -5,8 +5,6 @@ <string name="status_activated">Připojen k síti Tor</string> <string name="status_disabled">\"Orbot je deaktivován</string> <string name="status_shutting_down">Orbot se vypíná</string> - <string name="tor_process_starting">Startuji Tor klienta…</string> - <string name="tor_process_complete">hotovo.</string>    diff --git a/orbotservice/src/main/res/values-cy/strings.xml b/orbotservice/src/main/res/values-cy/strings.xml index 2885b44d..0b48c553 100644 --- a/orbotservice/src/main/res/values-cy/strings.xml +++ b/orbotservice/src/main/res/values-cy/strings.xml @@ -3,8 +3,6 @@ <string name="app_name">Orbot</string> <string name="status_starting_up">Mae Orbot yn cychwyn...</string> <string name="status_activated">Wedi cysylltu â rhwydwaith Tor</string> - <string name="tor_process_starting">Yn cychwyn cleient Tor</string> - <string name="tor_process_complete">Wedi ei gwblhau.</string>    diff --git a/orbotservice/src/main/res/values-da/strings.xml b/orbotservice/src/main/res/values-da/strings.xml index ddbe9829..7abda071 100644 --- a/orbotservice/src/main/res/values-da/strings.xml +++ b/orbotservice/src/main/res/values-da/strings.xml @@ -5,8 +5,6 @@ <string name="status_starting_up">Orbot starter op ...</string> <string name="status_activated">Der er forbindelse til Tor-netværket</string> <string name="status_disabled">Orbot er slået fra</string> - <string name="tor_process_starting">Starter Tor klienten...</string> - <string name="tor_process_complete">udført.</string>    @@ -22,5 +20,4 @@ <string name="something_bad_happened">Noget slemt er sket. Check loggen</string> <string name="unable_to_read_hidden_service_name">ikke i stand til at læse navnet på den skjulte service</string> <string name="unable_to_start_tor">Kunne ikke starte Tor:</string> - <string name="no_internet_connection_tor">Ingen internetforbindelse; Tor er på standby...</string> </resources> diff --git a/orbotservice/src/main/res/values-de/strings.xml b/orbotservice/src/main/res/values-de/strings.xml index e316a463..42e901f4 100644 --- a/orbotservice/src/main/res/values-de/strings.xml +++ b/orbotservice/src/main/res/values-de/strings.xml @@ -6,8 +6,6 @@ <string name="status_activated">Verbunden mit dem Tor-Netzwerk</string> <string name="status_disabled">Orbot ist deaktiviert</string> <string name="status_shutting_down">TorService wird heruntergefahren</string> - <string name="tor_process_starting">Tor-Programm wird gestartet …</string> - <string name="tor_process_complete">abgeschlossen.</string>    @@ -23,9 +21,6 @@ <string name="something_bad_happened">Etwas ist schief gelaufen. Bitte Protokoll prüfen</string> <string name="unable_to_read_hidden_service_name">Name des versteckten Dienstes kann nicht gelesen werden</string> <string name="unable_to_start_tor">Tor kann nicht gestartet werden:</string> - <string name="no_internet_connection_tor">Keine Internetverbindung; Tor ist in Bereitschaft …</string> <string name="newnym">Sie haben zu einer neuen Tor-Identität gewechselt!</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">Keine Netzwerkverbindung. Tor wird in Bereitschaft versetzt …</string> - <string name="network_connectivity_is_good_waking_tor_up_">Netzwerkverbindung ist vorhanden. Tor wird aktiviert …</string> - <string name="updating_settings_in_tor_service">Einstellungen im Tor-Dienst werden aktualisiert</string> + <string name="updating_settings_in_tor_service">Einstellungen im Tor-Dienst werden aktualisiert</string> </resources> diff --git a/orbotservice/src/main/res/values-el/strings.xml b/orbotservice/src/main/res/values-el/strings.xml index 42d71e19..1241bdf9 100644 --- a/orbotservice/src/main/res/values-el/strings.xml +++ b/orbotservice/src/main/res/values-el/strings.xml @@ -4,8 +4,6 @@ <string name="status_starting_up">Το Orbot ξεκινά</string> <string name="status_activated">Συνδέθηκε στο δίκτυο Tor</string> <string name="status_disabled">\"Το Orbot είναι Απενεργοποιημένο</string> - <string name="tor_process_starting">Εκκίνηση του πελάτη Tor...</string> - <string name="tor_process_complete">ολοκληρώθηκε...</string>    diff --git a/orbotservice/src/main/res/values-eo/strings.xml b/orbotservice/src/main/res/values-eo/strings.xml index fc385eb1..b3e4bf94 100644 --- a/orbotservice/src/main/res/values-eo/strings.xml +++ b/orbotservice/src/main/res/values-eo/strings.xml @@ -4,8 +4,6 @@ <string name="status_starting_up">Orbot ŝaltiĝas...</string> <string name="status_activated">Konektita al Tor-reto</string> <string name="status_disabled">Orbot estas malaktivigita</string> - <string name="tor_process_starting">Ŝaltiĝas Tor-kliento...</string> - <string name="tor_process_complete">kompleta.</string>    diff --git a/orbotservice/src/main/res/values-es-rAR/strings.xml b/orbotservice/src/main/res/values-es-rAR/strings.xml index 66672aa0..1763d99f 100644 --- a/orbotservice/src/main/res/values-es-rAR/strings.xml +++ b/orbotservice/src/main/res/values-es-rAR/strings.xml @@ -4,8 +4,6 @@ <string name="status_starting_up">Orbot está iniciándose...</string> <string name="status_activated">Conectado a la red Tor</string> <string name="status_disabled">\"Orbot está Desactivado</string> - <string name="tor_process_starting">Iniciando el cliente Tor...</string> - <string name="tor_process_complete">Completar</string>    diff --git a/orbotservice/src/main/res/values-es/strings.xml b/orbotservice/src/main/res/values-es/strings.xml index c34ac188..981f39c6 100644 --- a/orbotservice/src/main/res/values-es/strings.xml +++ b/orbotservice/src/main/res/values-es/strings.xml @@ -6,8 +6,6 @@ <string name="status_activated">Conectado a la red Tor</string> <string name="status_disabled">Orbot está desactivado</string> <string name="status_shutting_down">TorService se está cerrando</string> - <string name="tor_process_starting">Iniciando cliente Tor...</string> - <string name="tor_process_complete">completado.</string>    @@ -23,9 +21,6 @@ <string name="something_bad_happened">Hubo algún tipo de problema. Compruebe el registro (log)</string> <string name="unable_to_read_hidden_service_name">No fue posible leer el nombre del servicio oculto</string> <string name="unable_to_start_tor">No fue posible iniciar Tor: </string> - <string name="no_internet_connection_tor">Sin conexión a Internet; Tor está en suspensión...</string> <string name="newnym">¡Ha cambiado a una nueva identidad de Tor!</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">No hay conectividad de red. Poniendo a Tor a dormir...</string> - <string name="network_connectivity_is_good_waking_tor_up_">La conectividad de red es buena. Despertando a Tor...</string> - <string name="updating_settings_in_tor_service">actualizando la configuración en el servicio Tor</string> + <string name="updating_settings_in_tor_service">actualizando la configuración en el servicio Tor</string> </resources> diff --git a/orbotservice/src/main/res/values-et/strings.xml b/orbotservice/src/main/res/values-et/strings.xml index 0abd8fce..1843e29f 100644 --- a/orbotservice/src/main/res/values-et/strings.xml +++ b/orbotservice/src/main/res/values-et/strings.xml @@ -4,8 +4,6 @@ <string name="status_starting_up">Orbot käivitub...</string> <string name="status_activated">Ühendatud Tor võrgustikku</string> <string name="status_disabled">Orbot deaktiveeritud</string> - <string name="tor_process_starting">Tor kliendi käivitamine...</string> - <string name="tor_process_complete">valmis.</string>    @@ -22,6 +20,4 @@ <string name="unable_to_read_hidden_service_name">ei õnnestu lugeda varjatud teenuse nime</string> <string name="unable_to_start_tor">Tor käivitamine ebaõnnestus:</string> <string name="newnym">Lülitusite uuele Tor identiteedile!</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">Interneti ühendus puudub. Panen Tori magama...</string> - <string name="network_connectivity_is_good_waking_tor_up_">Interneti ühendus hea. Äratan Tori üles...</string> </resources> diff --git a/orbotservice/src/main/res/values-eu/strings.xml b/orbotservice/src/main/res/values-eu/strings.xml index fe300c89..e1e0bed2 100644 --- a/orbotservice/src/main/res/values-eu/strings.xml +++ b/orbotservice/src/main/res/values-eu/strings.xml @@ -4,8 +4,6 @@ <string name="status_starting_up">Orbot abiarazten ari da...</string> <string name="status_activated">Tor sarera konektatuta</string> <string name="status_disabled">\"Orbot desaktibatuta dago</string> - <string name="tor_process_starting">Tor bezeroa hasten...</string> - <string name="tor_process_complete">eginda.</string>    @@ -21,6 +19,5 @@ <string name="something_bad_happened">Zerbait txarra gertatu da. Begiratu logetan</string> <string name="unable_to_read_hidden_service_name">ezkutuko zerbitzuare izena ezin da irakurri</string> <string name="unable_to_start_tor">Ezin izan da Tor hasi:</string> - <string name="no_internet_connection_tor">Ez dago Interneterako konexiorik; Tor egonean dago...</string> <string name="newnym">ChatSecure - Andriodentzako berehalako mezulari bezero ziurra</string> </resources> diff --git a/orbotservice/src/main/res/values-fa/strings.xml b/orbotservice/src/main/res/values-fa/strings.xml index dc5b032f..fad3a175 100644 --- a/orbotservice/src/main/res/values-fa/strings.xml +++ b/orbotservice/src/main/res/values-fa/strings.xml @@ -6,8 +6,6 @@ <string name="status_activated">متصل به شبکه تور</string> <string name="status_disabled">اربوت غیرفعال شده است.</string> <string name="status_shutting_down">TorService خاموش است</string> - <string name="tor_process_starting">شروع کلاینت تور...</string> - <string name="tor_process_complete">تمام.</string>    @@ -23,9 +21,6 @@ <string name="something_bad_happened">اتفاق بدی افتاد. وقایع ثبت شده را چک کنید</string> <string name="unable_to_read_hidden_service_name">ناتوان در خواندن نام سرویس مخفی</string> <string name="unable_to_start_tor">ناتوان در راه اندازی تور:</string> - <string name="no_internet_connection_tor">ارتباط اینترنتی وجود ندارد; تور آماده کار است... </string> <string name="newnym">شما به شناسه جدید تور منتقل شدید</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">ارتباط شبکه ای وجود ندارد. تور به حالت خواب می رود</string> - <string name="network_connectivity_is_good_waking_tor_up_">ارتباط شبکه ای خوب است. تور را بیدار نمایید...</string> - <string name="updating_settings_in_tor_service">به روز رسانی تنظیمات در سرویس Tor</string> + <string name="updating_settings_in_tor_service">به روز رسانی تنظیمات در سرویس Tor</string> </resources> diff --git a/orbotservice/src/main/res/values-fi/strings.xml b/orbotservice/src/main/res/values-fi/strings.xml index 980cb85a..ba45a7b9 100644 --- a/orbotservice/src/main/res/values-fi/strings.xml +++ b/orbotservice/src/main/res/values-fi/strings.xml @@ -5,8 +5,6 @@ <string name="status_starting_up">Orbot käynnistyy...</string> <string name="status_activated">Yhdistetty Tor-verkkoon</string> <string name="status_disabled">Orbot on poistettu käytöstä</string> - <string name="tor_process_starting">Käynnistetään Tor-ohjelmaa...</string> - <string name="tor_process_complete">valmis.</string>    @@ -22,9 +20,6 @@ <string name="something_bad_happened">Jotain pahaa tapahtui. Tarkista loki</string> <string name="unable_to_read_hidden_service_name">piilopalvelunimen lukeminen epäonnistui</string> <string name="unable_to_start_tor">Torin käynnistys epäonnistui:</string> - <string name="no_internet_connection_tor">Ei internet-yhteyttä; Tor on valmiustilassa...</string> <string name="newnym">Vaihdoit Tor-identiteettisi uuteen!</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">Ei verkkoyhteyttä. Tor siirtyy valmiustilaan...</string> - <string name="network_connectivity_is_good_waking_tor_up_">Verkkoyhteys toimii. Herätetään Tor...</string> - <string name="updating_settings_in_tor_service">päivitetään Tor-palvelun asetuksia</string> + <string name="updating_settings_in_tor_service">päivitetään Tor-palvelun asetuksia</string> </resources> diff --git a/orbotservice/src/main/res/values-fr-rFR/strings.xml b/orbotservice/src/main/res/values-fr-rFR/strings.xml index 30ad587f..f6031429 100644 --- a/orbotservice/src/main/res/values-fr-rFR/strings.xml +++ b/orbotservice/src/main/res/values-fr-rFR/strings.xml @@ -6,8 +6,6 @@ <string name="status_activated">Connecté au réseau Tor</string> <string name="status_disabled">Orbot est désactivé</string> <string name="status_shutting_down">TorService est en cours d\'extinction</string> - <string name="tor_process_starting">Démarrage du client Tor...</string> - <string name="tor_process_complete">terminé.</string>    @@ -23,9 +21,6 @@ <string name="something_bad_happened">Quelque chose n\'a pas été. Vérifiez le journal</string> <string name="unable_to_read_hidden_service_name">impossible de lire le nom du service caché</string> <string name="unable_to_start_tor">Impossible de démarrer Tor :</string> - <string name="no_internet_connection_tor">Pas de connexion Internet ; Tor est en attente...</string> <string name="newnym">Vous avez basculé vers une nouvelle identité Tor !</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">Pas de connectivité réseau. Mise au repos de Tor...</string> - <string name="network_connectivity_is_good_waking_tor_up_">La connectivité réseau est bonne. Réveil de Tor...</string> - <string name="updating_settings_in_tor_service">mise à jour des paramètres dans le service Tor</string> + <string name="updating_settings_in_tor_service">mise à jour des paramètres dans le service Tor</string> </resources> diff --git a/orbotservice/src/main/res/values-fr/strings.xml b/orbotservice/src/main/res/values-fr/strings.xml index 79e119d6..328224b6 100644 --- a/orbotservice/src/main/res/values-fr/strings.xml +++ b/orbotservice/src/main/res/values-fr/strings.xml @@ -6,8 +6,6 @@ <string name="status_activated">Connecté au réseau Tor</string> <string name="status_disabled">Orbot est désactivé</string> <string name="status_shutting_down">Le service Tor est en cours de fermeture</string> - <string name="tor_process_starting">Démarrage du client Tor...</string> - <string name="tor_process_complete">terminé.</string>    diff --git a/orbotservice/src/main/res/values-gl/strings.xml b/orbotservice/src/main/res/values-gl/strings.xml index 03226ad2..e43495be 100644 --- a/orbotservice/src/main/res/values-gl/strings.xml +++ b/orbotservice/src/main/res/values-gl/strings.xml @@ -5,8 +5,6 @@ <string name="status_starting_up">Orbot está a se iniciar...</string> <string name="status_activated">Conectado á rede Tor</string> <string name="status_disabled">Orbot está desactivado</string> - <string name="tor_process_starting">Iniciando cliente Tor...</string> - <string name="tor_process_complete">completado.</string>    diff --git a/orbotservice/src/main/res/values-he/strings.xml b/orbotservice/src/main/res/values-he/strings.xml index c22e5b90..aa7e87ea 100644 --- a/orbotservice/src/main/res/values-he/strings.xml +++ b/orbotservice/src/main/res/values-he/strings.xml @@ -5,8 +5,6 @@ <string name="status_starting_up">Orbot מתחיל…</string> <string name="status_activated">מחובר לרשת Tor</string> <string name="status_disabled">Orbot כבוי</string> - <string name="tor_process_starting">מתחיל לקוח Tor...</string> - <string name="tor_process_complete">הושלם.</string>    @@ -20,9 +18,6 @@ <string name="something_bad_happened">משהו רע התרחש. בדוק את היומן</string> <string name="unable_to_read_hidden_service_name">לא מסוגל לקרוא שם שירות נסתר</string> <string name="unable_to_start_tor">לא מסוגל להתחיל את Tor:</string> - <string name="no_internet_connection_tor">אין חיבור לאינטרנט; תור ממתין...</string> <string name="newnym">החלפת אל זהות Tor חדשה!</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">אין חיבור לרשת. מכבה את Tor....</string> - <string name="network_connectivity_is_good_waking_tor_up_">החיבור עובד טוב. מעיר את Tor...</string> - <string name="updating_settings_in_tor_service">מעדכן הגדרות Tor במכשיר</string> + <string name="updating_settings_in_tor_service">מעדכן הגדרות Tor במכשיר</string> </resources> diff --git a/orbotservice/src/main/res/values-hr/strings.xml b/orbotservice/src/main/res/values-hr/strings.xml index 32329f31..1e9d6f57 100644 --- a/orbotservice/src/main/res/values-hr/strings.xml +++ b/orbotservice/src/main/res/values-hr/strings.xml @@ -6,8 +6,6 @@ <string name="status_activated">Spojen na Tor mrežu</string> <string name="status_disabled">Orbot je deaktiviran</string> <string name="status_shutting_down">TorService se gasi</string> - <string name="tor_process_starting">Pokrećem Tor klijent...</string> - <string name="tor_process_complete">gotovo.</string>    @@ -23,9 +21,6 @@ <string name="something_bad_happened">Nešto loše se dogodilo. Provjerite dnevnik</string> <string name="unable_to_read_hidden_service_name">nije moguće pročitati ime skrivene usluge</string> <string name="unable_to_start_tor">Nije moguće pokrenuti Tor:</string> - <string name="no_internet_connection_tor">Nema internet veze; Tor je u stanju pripravnosti...</string> <string name="newnym">Prebacili ste se na nov Tor identitet!</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">Nema mrežne povezivosti. Stavljam Tor na spavanje...</string> - <string name="network_connectivity_is_good_waking_tor_up_">Mrežan povezanost je dobra. Budim Tor...</string> - <string name="updating_settings_in_tor_service">ažuriram postavke u Tor usluzi</string> + <string name="updating_settings_in_tor_service">ažuriram postavke u Tor usluzi</string> </resources> diff --git a/orbotservice/src/main/res/values-hu/strings.xml b/orbotservice/src/main/res/values-hu/strings.xml index b88cf39c..440f4022 100644 --- a/orbotservice/src/main/res/values-hu/strings.xml +++ b/orbotservice/src/main/res/values-hu/strings.xml @@ -6,8 +6,6 @@ <string name="status_activated">Csatlakozva a Tor hálózathoz</string> <string name="status_disabled">Az Orbot deaktiválva</string> <string name="status_shutting_down">A TorService leáll</string> - <string name="tor_process_starting">A Tor kliens indítása...</string> - <string name="tor_process_complete">kész.</string>    @@ -23,9 +21,6 @@ <string name="something_bad_happened">Valami rossz történt. Nézd meg a naplót.</string> <string name="unable_to_read_hidden_service_name">nem olvasható a rejtett szolgáltatás neve</string> <string name="unable_to_start_tor">A Tor indítása sikertelen:</string> - <string name="no_internet_connection_tor">Nincs internetkapcsolat; Tor készenlétben...</string> <string name="newnym">Új Tor identitásra váltottál!</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">Nincs hálózati kapcsolat. Tor alvó állapotba helyezése...</string> - <string name="network_connectivity_is_good_waking_tor_up_">A hálózati kapcsolat jó. Tor felébresztése...</string> - <string name="updating_settings_in_tor_service">a Tor szolgáltatás beállításainak frissítése</string> + <string name="updating_settings_in_tor_service">a Tor szolgáltatás beállításainak frissítése</string> </resources> diff --git a/orbotservice/src/main/res/values-id/strings.xml b/orbotservice/src/main/res/values-id/strings.xml index 694ac3d9..61f38f07 100644 --- a/orbotservice/src/main/res/values-id/strings.xml +++ b/orbotservice/src/main/res/values-id/strings.xml @@ -6,8 +6,6 @@ <string name="status_activated">Tersambung ke Jaringan Tor</string> <string name="status_disabled">Orbot telah dibatalkan</string> <string name="status_shutting_down">TorService dimatikan</string> - <string name="tor_process_starting">Memulai klien Tor...</string> - <string name="tor_process_complete">selesai.</string>    @@ -23,9 +21,6 @@ <string name="something_bad_happened">Sesuatu yang buruk terjadi. Periksa log</string> <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama layanan tersembunyi</string> <string name="unable_to_start_tor">Tidak dapat memulai Tor:</string> - <string name="no_internet_connection_tor">Tidak ada koneksi internet; Tor sedang standby...</string> <string name="newnym">Anda telah beralih ke identitas Tor baru!</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">Tidak ada jaringan terhubung. Menidurkan Tor...</string> - <string name="network_connectivity_is_good_waking_tor_up_">Jaringan terhubung baik. Memanggil Tor...</string> - <string name="updating_settings_in_tor_service">memperbarui setting pada layanan Tor</string> + <string name="updating_settings_in_tor_service">memperbarui setting pada layanan Tor</string> </resources> diff --git a/orbotservice/src/main/res/values-in-rID/strings.xml b/orbotservice/src/main/res/values-in-rID/strings.xml index 694ac3d9..61f38f07 100644 --- a/orbotservice/src/main/res/values-in-rID/strings.xml +++ b/orbotservice/src/main/res/values-in-rID/strings.xml @@ -6,8 +6,6 @@ <string name="status_activated">Tersambung ke Jaringan Tor</string> <string name="status_disabled">Orbot telah dibatalkan</string> <string name="status_shutting_down">TorService dimatikan</string> - <string name="tor_process_starting">Memulai klien Tor...</string> - <string name="tor_process_complete">selesai.</string>    @@ -23,9 +21,6 @@ <string name="something_bad_happened">Sesuatu yang buruk terjadi. Periksa log</string> <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama layanan tersembunyi</string> <string name="unable_to_start_tor">Tidak dapat memulai Tor:</string> - <string name="no_internet_connection_tor">Tidak ada koneksi internet; Tor sedang standby...</string> <string name="newnym">Anda telah beralih ke identitas Tor baru!</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">Tidak ada jaringan terhubung. Menidurkan Tor...</string> - <string name="network_connectivity_is_good_waking_tor_up_">Jaringan terhubung baik. Memanggil Tor...</string> - <string name="updating_settings_in_tor_service">memperbarui setting pada layanan Tor</string> + <string name="updating_settings_in_tor_service">memperbarui setting pada layanan Tor</string> </resources> diff --git a/orbotservice/src/main/res/values-is/strings.xml b/orbotservice/src/main/res/values-is/strings.xml index 7aecb72d..90f75a88 100644 --- a/orbotservice/src/main/res/values-is/strings.xml +++ b/orbotservice/src/main/res/values-is/strings.xml @@ -5,8 +5,6 @@ <string name="status_starting_up">Orbot er að ræsa...</string> <string name="status_activated">Tengdur við Tor netið</string> <string name="status_disabled">Orbot er slökkt</string> - <string name="tor_process_starting">Kveiki á Tor notanda...</string> - <string name="tor_process_complete">lokið.</string>    @@ -22,9 +20,6 @@ <string name="something_bad_happened">Eitthvað slæmt gerðist. Athugaðu skráninguna</string> <string name="unable_to_read_hidden_service_name">get ekki lesið nafn földu þjónustunnar</string> <string name="unable_to_start_tor">Get ekki kveikt á Tor:</string> - <string name="no_internet_connection_tor">Engin tenging við netið; Tor er í biðstöðu...</string> <string name="newnym">Þú ert komin með nýtt Tor auðkenni!</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">Engin tenging við netið. Tor verður svæfður...</string> - <string name="network_connectivity_is_good_waking_tor_up_">Tenging við netið er góð. Tor verður vakinn...</string> - <string name="updating_settings_in_tor_service">uppfæri stillingar í Tor þjónustu</string> + <string name="updating_settings_in_tor_service">uppfæri stillingar í Tor þjónustu</string> </resources> diff --git a/orbotservice/src/main/res/values-it/strings.xml b/orbotservice/src/main/res/values-it/strings.xml index 734a7fd3..734e80b7 100644 --- a/orbotservice/src/main/res/values-it/strings.xml +++ b/orbotservice/src/main/res/values-it/strings.xml @@ -6,8 +6,6 @@ <string name="status_activated">Connesso alla rete Tor</string> <string name="status_disabled">\"Orbot è disattivato</string> <string name="status_shutting_down">TorService si sta spegnendo</string> - <string name="tor_process_starting">Avvio client Tor...</string> - <string name="tor_process_complete">completa.</string>    @@ -23,9 +21,6 @@ <string name="something_bad_happened">E\' accaduto un evento indesiderato. Controllare i log.</string> <string name="unable_to_read_hidden_service_name">Impossibile leggere il nome del servizio nascosto.</string> <string name="unable_to_start_tor">Impossibile avviare Tor:</string> - <string name="no_internet_connection_tor">Nessuna connessione ad internet; Tor è in standby...</string> <string name="newnym">Sei passato a una nuova identità Tor!</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">Nessuna connettività di rete. Mettendo Tor a riposo...</string> - <string name="network_connectivity_is_good_waking_tor_up_">Connettività di rete buona. Svegliando Tor...</string> - <string name="updating_settings_in_tor_service">aggiornamento impostazioni nel servizio Tor</string> + <string name="updating_settings_in_tor_service">aggiornamento impostazioni nel servizio Tor</string> </resources> diff --git a/orbotservice/src/main/res/values-iw/strings.xml b/orbotservice/src/main/res/values-iw/strings.xml index c22e5b90..aa7e87ea 100644 --- a/orbotservice/src/main/res/values-iw/strings.xml +++ b/orbotservice/src/main/res/values-iw/strings.xml @@ -5,8 +5,6 @@ <string name="status_starting_up">Orbot מתחיל…</string> <string name="status_activated">מחובר לרשת Tor</string> <string name="status_disabled">Orbot כבוי</string> - <string name="tor_process_starting">מתחיל לקוח Tor...</string> - <string name="tor_process_complete">הושלם.</string>    @@ -20,9 +18,6 @@ <string name="something_bad_happened">משהו רע התרחש. בדוק את היומן</string> <string name="unable_to_read_hidden_service_name">לא מסוגל לקרוא שם שירות נסתר</string> <string name="unable_to_start_tor">לא מסוגל להתחיל את Tor:</string> - <string name="no_internet_connection_tor">אין חיבור לאינטרנט; תור ממתין...</string> <string name="newnym">החלפת אל זהות Tor חדשה!</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">אין חיבור לרשת. מכבה את Tor....</string> - <string name="network_connectivity_is_good_waking_tor_up_">החיבור עובד טוב. מעיר את Tor...</string> - <string name="updating_settings_in_tor_service">מעדכן הגדרות Tor במכשיר</string> + <string name="updating_settings_in_tor_service">מעדכן הגדרות Tor במכשיר</string> </resources> diff --git a/orbotservice/src/main/res/values-ja/strings.xml b/orbotservice/src/main/res/values-ja/strings.xml index f3f39f89..4a536bc0 100644 --- a/orbotservice/src/main/res/values-ja/strings.xml +++ b/orbotservice/src/main/res/values-ja/strings.xml @@ -6,8 +6,6 @@ <string name="status_activated">Torネットワークに接続しています</string> <string name="status_disabled">\"Orbotが解除されました</string> <string name="status_shutting_down">TorServiceが終了しています</string> - <string name="tor_process_starting">Torクライエントを開始しています...</string> - <string name="tor_process_complete">完了</string>    @@ -23,9 +21,6 @@ <string name="something_bad_happened">何かが起こりました。ログを確認してください。</string> <string name="unable_to_read_hidden_service_name">hidden serviceの名前読込不能</string> <string name="unable_to_start_tor">Torを実行できませんでした</string> - <string name="no_internet_connection_tor">インターネット接続なし。Torは待機中です...</string> <string name="newnym">新たな Tor の身元に切り替えました。</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">ネットワーク接続がありません。Torはスリープします…</string> - <string name="network_connectivity_is_good_waking_tor_up_">ネットワーク接続は良好です。Torを有効にします…</string> - <string name="updating_settings_in_tor_service">Torサービスの設定を更新中</string> + <string name="updating_settings_in_tor_service">Torサービスの設定を更新中</string> </resources> diff --git a/orbotservice/src/main/res/values-ko/strings.xml b/orbotservice/src/main/res/values-ko/strings.xml index 148b7d15..0e420193 100644 --- a/orbotservice/src/main/res/values-ko/strings.xml +++ b/orbotservice/src/main/res/values-ko/strings.xml @@ -4,8 +4,6 @@ <string name="status_starting_up">Orbot 시작 중…</string> <string name="status_activated">Tor 네트워크에 연결됨</string> <string name="status_disabled">Orbot이 비활성화되어 있습니다</string> - <string name="tor_process_starting">Tor 클라이언트 시작 중…</string> - <string name="tor_process_complete">완료.</string>    diff --git a/orbotservice/src/main/res/values-lv/strings.xml b/orbotservice/src/main/res/values-lv/strings.xml index 14e80906..abf085b5 100644 --- a/orbotservice/src/main/res/values-lv/strings.xml +++ b/orbotservice/src/main/res/values-lv/strings.xml @@ -5,8 +5,6 @@ <string name="status_starting_up">Orbot startē...</string> <string name="status_activated">Izveidots savienojums ar tīklu Tor</string> <string name="status_disabled">Orbot ir deaktivēts</string> - <string name="tor_process_starting">Startē Tor klientu...</string> - <string name="tor_process_complete">pabeidz.</string>    @@ -22,9 +20,6 @@ <string name="something_bad_happened">Nav labi. Pārbaudiet žurnālu</string> <string name="unable_to_read_hidden_service_name">Nespēj lasīt slēpta pakalpojuma nosaukumu</string> <string name="unable_to_start_tor">Nevar startēt Tor:</string> - <string name="no_internet_connection_tor">Nav interneta savienojuma; Tor ir gaidstāvē...</string> <string name="newnym">Jūs pārslēdzāties uz jaunu Tor\'a identitāti!</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">Nav tīkla savienojuma. Tor\'am iestata miega režīmu...</string> - <string name="network_connectivity_is_good_waking_tor_up_">Labs tīkla savienojums. Aktivizē Tor\'u...</string> - <string name="updating_settings_in_tor_service">atjaunina Tor pakalpojuma iestatījumus </string> + <string name="updating_settings_in_tor_service">atjaunina Tor pakalpojuma iestatījumus </string> </resources> diff --git a/orbotservice/src/main/res/values-mk/strings.xml b/orbotservice/src/main/res/values-mk/strings.xml index b92e6344..dfc09fe3 100644 --- a/orbotservice/src/main/res/values-mk/strings.xml +++ b/orbotservice/src/main/res/values-mk/strings.xml @@ -5,8 +5,6 @@ <string name="status_starting_up">Орбот се стартува...</string> <string name="status_activated">Поврзан на мрежата на Tor</string> <string name="status_disabled">Орбот е деактивиран</string> - <string name="tor_process_starting">Стартување на клиентот на Tor...</string> - <string name="tor_process_complete">завршено.</string>    @@ -22,9 +20,6 @@ <string name="something_bad_happened">Настана грешка. Проверете во дневникот</string> <string name="unable_to_read_hidden_service_name">не може да се прочита името на скриениот сервис</string> <string name="unable_to_start_tor">Tor не може да се стартува:</string> - <string name="no_internet_connection_tor">Нема интернет-врска; Tor е во мирување...</string> <string name="newnym">Се префрливте на нов идентитет на Tor!</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">Нема мрежно поврзување. Ставете го Тор на режимот на спиење...</string> - <string name="network_connectivity_is_good_waking_tor_up_">Мрежното поврзување е добро. Го буди Tor...</string> - <string name="updating_settings_in_tor_service">ажурирање на поставките во сервисот Tor </string> + <string name="updating_settings_in_tor_service">ажурирање на поставките во сервисот Tor </string> </resources> diff --git a/orbotservice/src/main/res/values-ms-rMY/strings.xml b/orbotservice/src/main/res/values-ms-rMY/strings.xml index e89a46d2..4ca71d26 100644 --- a/orbotservice/src/main/res/values-ms-rMY/strings.xml +++ b/orbotservice/src/main/res/values-ms-rMY/strings.xml @@ -4,8 +4,6 @@ <string name="status_starting_up">Orbot telah dimulakan..</string> <string name="status_activated">Bersambung ke rangkaian Tor</string> <string name="status_disabled">\"Orbot telah dinyah-aktifkan</string> - <string name="tor_process_starting">Memulakan klien Tor..</string> - <string name="tor_process_complete">selesai.</string>    diff --git a/orbotservice/src/main/res/values-ms/strings.xml b/orbotservice/src/main/res/values-ms/strings.xml index d1335f26..badbaf86 100644 --- a/orbotservice/src/main/res/values-ms/strings.xml +++ b/orbotservice/src/main/res/values-ms/strings.xml @@ -5,8 +5,6 @@ <string name="status_activated">Bersambung ke rangkaian Tor</string> <string name="status_disabled">\"Orbot telah dinyah-aktifkan</string> <string name="status_shutting_down">Orbot sedang ditutup</string> - <string name="tor_process_starting">Memulakan klien Tor..</string> - <string name="tor_process_complete">selesai.</string>    diff --git a/orbotservice/src/main/res/values-nb/strings.xml b/orbotservice/src/main/res/values-nb/strings.xml index 8dbc71be..5de62d07 100644 --- a/orbotservice/src/main/res/values-nb/strings.xml +++ b/orbotservice/src/main/res/values-nb/strings.xml @@ -5,8 +5,6 @@ <string name="status_starting_up">Orbot starter...</string> <string name="status_activated">Koblet til Tor-nettverket</string> <string name="status_disabled">Orbot er deaktivert</string> - <string name="tor_process_starting">Starter Tor klient...</string> - <string name="tor_process_complete">fullført.</string>    @@ -22,9 +20,6 @@ <string name="something_bad_happened">Noe alvorlig skjedde. Sjekk loggen.</string> <string name="unable_to_read_hidden_service_name">klarte ikke å lese skjult tjenestenavn</string> <string name="unable_to_start_tor">Klarte ikke å starte Tor:</string> - <string name="no_internet_connection_tor">Ingen Internett-tilkobling; Tor er i ventemodus... </string> <string name="newnym">Du har byttet til en ny Tor-identitet!</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">Ingen nettverkstilkobling. Putting Tor å sove ...</string> - <string name="network_connectivity_is_good_waking_tor_up_">Nettverkstilkobling er bra. Våkne Tor opp ...</string> - <string name="updating_settings_in_tor_service">Oppdaterer innstillinger i Tor service</string> + <string name="updating_settings_in_tor_service">Oppdaterer innstillinger i Tor service</string> </resources> diff --git a/orbotservice/src/main/res/values-nl/strings.xml b/orbotservice/src/main/res/values-nl/strings.xml index 93085c81..795b7ff9 100644 --- a/orbotservice/src/main/res/values-nl/strings.xml +++ b/orbotservice/src/main/res/values-nl/strings.xml @@ -6,8 +6,6 @@ <string name="status_activated">Verbonden met het Tor-netwerk</string> <string name="status_disabled">Orbot is uitgeschakeld</string> <string name="status_shutting_down">TorService wordt afgesloten</string> - <string name="tor_process_starting">Bezig met Tor client starten…</string> - <string name="tor_process_complete">klaar.</string>    @@ -23,9 +21,6 @@ <string name="something_bad_happened">Er is een fout opgetreden. Controleer de log</string> <string name="unable_to_read_hidden_service_name">Kan verborgen dienst-naam niet lezen</string> <string name="unable_to_start_tor">Kan Tor niet starten:</string> - <string name="no_internet_connection_tor">Geen internetverbinding; Tor is op stand-by…</string> <string name="newnym">Je bent naar een nieuwe Tor identiteit gewisseld!</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">Geen internetverbinding. Tor wordt te slapen gelegd…</string> - <string name="network_connectivity_is_good_waking_tor_up_">Netwerkverbinding is in orde. Tor wordt wakker gemaakt…</string> - <string name="updating_settings_in_tor_service">instellingen in Tor-dienst worden bijgewerkt</string> + <string name="updating_settings_in_tor_service">instellingen in Tor-dienst worden bijgewerkt</string> </resources> diff --git a/orbotservice/src/main/res/values-pl/strings.xml b/orbotservice/src/main/res/values-pl/strings.xml index 81e18d9c..6ea25936 100644 --- a/orbotservice/src/main/res/values-pl/strings.xml +++ b/orbotservice/src/main/res/values-pl/strings.xml @@ -6,8 +6,6 @@ <string name="status_activated">Podłączony do sieci Tor</string> <string name="status_disabled">Orbot wyłączony</string> <string name="status_shutting_down">TorService wyłącza się</string> - <string name="tor_process_starting">Uruchamianie klienta sieci Tor...</string> - <string name="tor_process_complete">gotowe.</string>    @@ -23,9 +21,6 @@ <string name="something_bad_happened">Coś nie poszło nie tak. Sprawdź logi</string> <string name="unable_to_read_hidden_service_name">uniemożliw czytanie nazw ukrytych serwisów</string> <string name="unable_to_start_tor">Nie można wystartować aplikacji Tor:</string> - <string name="no_internet_connection_tor">Brak połączenia internetowego; Tor jest w trybie oczekiwania...</string> <string name="newnym">Nowa tożsamość Tor\'a została zmieniona!</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">Brak połączenia internetowego. Tor będzie w trybie snu...</string> - <string name="network_connectivity_is_good_waking_tor_up_">Połączenie internetowe jest dobre. Trwa budzenie Tora...</string> - <string name="updating_settings_in_tor_service">aktualizowanie ustawień w serwisie Tor</string> + <string name="updating_settings_in_tor_service">aktualizowanie ustawień w serwisie Tor</string> </resources> diff --git a/orbotservice/src/main/res/values-pt-rBR/strings.xml b/orbotservice/src/main/res/values-pt-rBR/strings.xml index 290272fb..847f7aef 100644 --- a/orbotservice/src/main/res/values-pt-rBR/strings.xml +++ b/orbotservice/src/main/res/values-pt-rBR/strings.xml @@ -6,8 +6,6 @@ <string name="status_activated">Conectado à rede Tor</string> <string name="status_disabled">Orbot está desativado</string> <string name="status_shutting_down">TorService está desligando</string> - <string name="tor_process_starting">Iniciando cliente Tor...</string> - <string name="tor_process_complete">completo.</string>    @@ -23,9 +21,6 @@ <string name="something_bad_happened">Algo ruim aconteceu. Cheque o lo</string> <string name="unable_to_read_hidden_service_name">habilitar ler o nome do serviço oculto</string> <string name="unable_to_start_tor">Habilitar iniciar o Tor:</string> - <string name="no_internet_connection_tor">Sem conexão na internet; Tor está na espera...</string> <string name="newnym">Você trocou para uma nova identidade Tor!</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">Sem conectividade na rede. Colocando o Tor para dormir...</string> - <string name="network_connectivity_is_good_waking_tor_up_">Conectividade da rede está boa. Acordando Tor</string> - <string name="updating_settings_in_tor_service">atualizando configurações no serviço Tor</string> + <string name="updating_settings_in_tor_service">atualizando configurações no serviço Tor</string> </resources> diff --git a/orbotservice/src/main/res/values-pt/strings.xml b/orbotservice/src/main/res/values-pt/strings.xml index e2791207..9266d81d 100644 --- a/orbotservice/src/main/res/values-pt/strings.xml +++ b/orbotservice/src/main/res/values-pt/strings.xml @@ -4,8 +4,6 @@ <string name="status_starting_up">O Orbot está a iniciar...</string> <string name="status_activated">Conetado à rede Tor</string> <string name="status_disabled">O Orbot está desativado</string> - <string name="tor_process_starting">A iniciar o cliente Tor...</string> - <string name="tor_process_complete">completo.</string>    @@ -20,7 +18,5 @@ <string name="unable_to_read_hidden_service_name">não é possível ler o nome do serviço ocultado</string> <string name="unable_to_start_tor">Não é possível iniciar o Tor:</string> <string name="newnym">Mudou para uma nova identidade do Tor!</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">Nenhuma conetividade de rede. A hibernar Tor…</string> - <string name="network_connectivity_is_good_waking_tor_up_">A conetividade de rede é boa. A iniciar Tor…</string> - <string name="updating_settings_in_tor_service">a atualizar as definições no serviço Tor</string> + <string name="updating_settings_in_tor_service">a atualizar as definições no serviço Tor</string> </resources> diff --git a/orbotservice/src/main/res/values-ro/strings.xml b/orbotservice/src/main/res/values-ro/strings.xml index 1dbcc393..5b5d08c2 100644 --- a/orbotservice/src/main/res/values-ro/strings.xml +++ b/orbotservice/src/main/res/values-ro/strings.xml @@ -4,8 +4,6 @@ <string name="status_starting_up">Orbot porneste...</string> <string name="status_activated">Conectat la reteaua Tor</string> <string name="status_disabled">Orbot este dezactivat</string> - <string name="tor_process_starting">Porneste clientul Tor...</string> - <string name="tor_process_complete">terminat.</string>    @@ -21,9 +19,6 @@ <string name="something_bad_happened">Ceva rau s-a intamplat. Verifica log-ul</string> <string name="unable_to_read_hidden_service_name">nu am putut citi numele serviciului ascuns</string> <string name="unable_to_start_tor">Nu am reusit sa pornesc Tor:</string> - <string name="no_internet_connection_tor">Nu este conexiune la internet; Tor este în așteptare...</string> <string name="newnym">Ați comutat la o nouă identitate Tor!</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">Nu este conexiune la rețea. Se pune Tor în adormire...</string> - <string name="network_connectivity_is_good_waking_tor_up_">Conexiunea la rețea este bună. Se trezește Tor...</string> - <string name="updating_settings_in_tor_service">se actualizează configurările în serviciul Tor</string> + <string name="updating_settings_in_tor_service">se actualizează configurările în serviciul Tor</string> </resources> diff --git a/orbotservice/src/main/res/values-ru/strings.xml b/orbotservice/src/main/res/values-ru/strings.xml index 674235d2..2b0cca3f 100644 --- a/orbotservice/src/main/res/values-ru/strings.xml +++ b/orbotservice/src/main/res/values-ru/strings.xml @@ -6,8 +6,6 @@ <string name="status_activated">Подключён к сети Tor</string> <string name="status_disabled">Orbot отключён</string> <string name="status_shutting_down">Служба Tor выключается</string> - <string name="tor_process_starting">Запускается клиент Tor...</string> - <string name="tor_process_complete">завершено.</string>    @@ -23,9 +21,6 @@ <string name="something_bad_happened">Произошла какая-то ошибка. Проверьте журнал.</string> <string name="unable_to_read_hidden_service_name">невозможно прочитать имя скрытой службы</string> <string name="unable_to_start_tor">Невозможно запустить Tor:</string> - <string name="no_internet_connection_tor">Отсутствует подключение к интернету, Tor находится в режиме ожидания…</string> <string name="newnym">Вы переключились на новый идентификатор Tor!</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">Нет подключения к сети. Tor входит в режим сна...</string> - <string name="network_connectivity_is_good_waking_tor_up_">Подключение к сети установлено. Tor просыпается...</string> - <string name="updating_settings_in_tor_service">обновление настроек в сервисе Tor</string> + <string name="updating_settings_in_tor_service">обновление настроек в сервисе Tor</string> </resources> diff --git a/orbotservice/src/main/res/values-si-rLK/strings.xml b/orbotservice/src/main/res/values-si-rLK/strings.xml index ff1136a3..51c9389a 100644 --- a/orbotservice/src/main/res/values-si-rLK/strings.xml +++ b/orbotservice/src/main/res/values-si-rLK/strings.xml @@ -4,8 +4,6 @@ <string name="status_starting_up">Orbot ආරම්භ කරමින්…</string> <string name="status_activated">Tor ජාලයට සබැදියි</string> <string name="status_disabled">Orbot ක්‍රියාවිරහිත කර ඇත </string> - <string name="tor_process_starting">Tor දායකයා ආරම්භ කරමින්...</string> - <string name="tor_process_complete">සම්පුර්ණයි.</string>    diff --git a/orbotservice/src/main/res/values-sk/strings.xml b/orbotservice/src/main/res/values-sk/strings.xml index fa60df47..996d73ee 100644 --- a/orbotservice/src/main/res/values-sk/strings.xml +++ b/orbotservice/src/main/res/values-sk/strings.xml @@ -4,8 +4,6 @@ <string name="status_starting_up">Orbot štartuje…</string> <string name="status_activated">Pripojený do Tor siete</string> <string name="status_disabled">Orbot je deaktivovaný</string> - <string name="tor_process_starting">Štartujem Tor klienta...</string> - <string name="tor_process_complete">hotovo.</string>    diff --git a/orbotservice/src/main/res/values-sl/strings.xml b/orbotservice/src/main/res/values-sl/strings.xml index e7aa9f3c..7f1d22c5 100644 --- a/orbotservice/src/main/res/values-sl/strings.xml +++ b/orbotservice/src/main/res/values-sl/strings.xml @@ -4,8 +4,6 @@ <string name="status_starting_up">Orbot se zaganja...</string> <string name="status_activated">Povezan v omrežje Tor</string> <string name="status_disabled">Orbot ni aktiviran</string> - <string name="tor_process_starting">Zagon Tor klijenta...</string> - <string name="tor_process_complete">končano.</string>    diff --git a/orbotservice/src/main/res/values-sr/strings.xml b/orbotservice/src/main/res/values-sr/strings.xml index ac81e996..ab08b3ec 100644 --- a/orbotservice/src/main/res/values-sr/strings.xml +++ b/orbotservice/src/main/res/values-sr/strings.xml @@ -5,8 +5,6 @@ <string name="status_starting_up">Орбот се покреће...</string> <string name="status_activated">Повезан са Тор мрежом</string> <string name="status_disabled">Орбот је деактивиран</string> - <string name="tor_process_starting">Покреће се Тор клијент...</string> - <string name="tor_process_complete">завршено.</string>    diff --git a/orbotservice/src/main/res/values-sv/strings.xml b/orbotservice/src/main/res/values-sv/strings.xml index 867bb428..e0a93631 100644 --- a/orbotservice/src/main/res/values-sv/strings.xml +++ b/orbotservice/src/main/res/values-sv/strings.xml @@ -6,8 +6,6 @@ <string name="status_activated">Uppkopplad till Tor nätverket</string> <string name="status_disabled">Orbot är inaktiverad</string> <string name="status_shutting_down">TorService avslutas</string> - <string name="tor_process_starting">Startar Tor klient...</string> - <string name="tor_process_complete">färdig.</string>    @@ -23,9 +21,6 @@ <string name="something_bad_happened">Något dåligt hände. Kolla loggen.</string> <string name="unable_to_read_hidden_service_name">kan inte läsa gömda tjänstens namn</string> <string name="unable_to_start_tor">Kan inte starta Tor:</string> - <string name="no_internet_connection_tor">Ingen internetanslutning; Tor är i standby-läge...</string> <string name="newnym">Du har bytt till en ny Tor identitet!</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">Ingen nätverksanslutning. Försätter Tor i dvala...</string> - <string name="network_connectivity_is_good_waking_tor_up_">Nätverksanslutningen fungerar. Väcker Tor...</string> - <string name="updating_settings_in_tor_service">uppdaterar inställningar i Tor-tjänsten</string> + <string name="updating_settings_in_tor_service">uppdaterar inställningar i Tor-tjänsten</string> </resources> diff --git a/orbotservice/src/main/res/values-ta/strings.xml b/orbotservice/src/main/res/values-ta/strings.xml index 7c258685..0351d9da 100644 --- a/orbotservice/src/main/res/values-ta/strings.xml +++ b/orbotservice/src/main/res/values-ta/strings.xml @@ -5,8 +5,6 @@ <string name="status_starting_up">ஆர்பாட் துவங்குகிறது...</string> <string name="status_activated">தோர் நெட்வொர்க் இணைக்கப்பட்ட</string> <string name="status_disabled">ஆர்பாட் நிறுத்தப்பட்டது</string> - <string name="tor_process_starting">தோர் துவங்கப்படுகிறது...</string> - <string name="tor_process_complete">முடிந்தது.</string>    diff --git a/orbotservice/src/main/res/values-th/strings.xml b/orbotservice/src/main/res/values-th/strings.xml index b184f1cc..00c8b4a2 100644 --- a/orbotservice/src/main/res/values-th/strings.xml +++ b/orbotservice/src/main/res/values-th/strings.xml @@ -2,7 +2,6 @@ <resources> <string name="app_name">Orbot</string> <string name="status_activated">เชื่อมต่อกับเครือข่าย Tor</string> - <string name="tor_process_complete">เสร็จ</string>    diff --git a/orbotservice/src/main/res/values-tl/strings.xml b/orbotservice/src/main/res/values-tl/strings.xml index 84374004..cdc446fc 100644 --- a/orbotservice/src/main/res/values-tl/strings.xml +++ b/orbotservice/src/main/res/values-tl/strings.xml @@ -4,8 +4,6 @@ <string name="status_starting_up">Nagsisimula na ang Orbot…</string> <string name="status_activated">Konektado sa Tor network</string> <string name="status_disabled">Naka-deactivate ang Orbot</string> - <string name="tor_process_starting">Binubuksan ang Tor client…</string> - <string name="tor_process_complete">kumpleto na.</string>    @@ -21,6 +19,5 @@ <string name="something_bad_happened">May nangyaring masama. Tingnan ang log</string> <string name="unable_to_read_hidden_service_name">hindi mabasa ang pangalan ng tagong serbisyo</string> <string name="unable_to_start_tor">Hindi masimulan ang Tor:</string> - <string name="no_internet_connection_tor">Walang connection sa internet; Ang Tor ay naka-standby mode...</string> <string name="newnym">Ikaw ay nagpalit ng bagong pagkakakilanlan sa Tor!</string> </resources> diff --git a/orbotservice/src/main/res/values-tr/strings.xml b/orbotservice/src/main/res/values-tr/strings.xml index cdfd067f..8fdc1085 100644 --- a/orbotservice/src/main/res/values-tr/strings.xml +++ b/orbotservice/src/main/res/values-tr/strings.xml @@ -6,8 +6,6 @@ <string name="status_activated">Tor ağına bağlandı</string> <string name="status_disabled">Orbot devre dışı bırakıldı</string> <string name="status_shutting_down">Tor hizmeti kapatılıyor</string> - <string name="tor_process_starting">Tor kullanımı başlatılıyor...</string> - <string name="tor_process_complete">tamamlandı.</string>    @@ -23,9 +21,6 @@ <string name="something_bad_happened">Kötü bir şey oldu. Kayıtlara bakınız</string> <string name="unable_to_read_hidden_service_name">gizli hizmet adı okunamıyor</string> <string name="unable_to_start_tor">Tor başlatılamadı:</string> - <string name="no_internet_connection_tor">İnternet bağlantısı yok; Tor bekleme modunda...</string> <string name="newnym">Yeni bir Tor kimliğine geçiş yaptınız!</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">Hiçbir ağ bağlantısı yok. Tor uyku moduna alınıyor...</string> - <string name="network_connectivity_is_good_waking_tor_up_">Ağ bağlantısı iyi. Tor uyandırılıyor... </string> - <string name="updating_settings_in_tor_service">Tor hizmet ayarları güncellemesi</string> + <string name="updating_settings_in_tor_service">Tor hizmet ayarları güncellemesi</string> </resources> diff --git a/orbotservice/src/main/res/values-uk/strings.xml b/orbotservice/src/main/res/values-uk/strings.xml index 23551efb..da62e234 100644 --- a/orbotservice/src/main/res/values-uk/strings.xml +++ b/orbotservice/src/main/res/values-uk/strings.xml @@ -5,8 +5,6 @@ <string name="status_starting_up">Запуск Orbot...</string> <string name="status_activated">Під\'єднаний до мережі Tor</string> <string name="status_disabled">«Orbot» від\'єднаний</string> - <string name="tor_process_starting">Запускається клієнт Tor...</string> - <string name="tor_process_complete">завершено.</string>    @@ -22,9 +20,6 @@ <string name="something_bad_happened">Виникла якась помилка. Перевірте лог</string> <string name="unable_to_read_hidden_service_name">неможливо прочитати ім\'я прихованої служби</string> <string name="unable_to_start_tor">Неможливо запустити Tor:</string> - <string name="no_internet_connection_tor">Немає інтернет-з\'єднання; Tor в режимі очікування…</string> <string name="newnym">Ви перемкнулись на новий ідентифікатор Tor!</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">Немає доступу до мережі інтернет. Tor переходить в режим сну…</string> - <string name="network_connectivity_is_good_waking_tor_up_">Доступ до мережі хороший. Tor виходить з режиму сну…</string> - <string name="updating_settings_in_tor_service">оновлення налаштувань у сервісі Tor</string> + <string name="updating_settings_in_tor_service">оновлення налаштувань у сервісі Tor</string> </resources> diff --git a/orbotservice/src/main/res/values-vi/strings.xml b/orbotservice/src/main/res/values-vi/strings.xml index ea17ed96..e5b39dff 100644 --- a/orbotservice/src/main/res/values-vi/strings.xml +++ b/orbotservice/src/main/res/values-vi/strings.xml @@ -6,8 +6,6 @@ <string name="status_activated">Đã kết nối với mạng Tor</string> <string name="status_disabled">Orbot đã được vô hiệu hóa</string> <string name="status_shutting_down">Đang tắt dịch vụ Tor</string> - <string name="tor_process_starting">Bắt đầu Tor</string> - <string name="tor_process_complete">hoàn thành.</string>    @@ -23,9 +21,6 @@ <string name="something_bad_happened">Có gì đó không ổn. Xin xem lại nhật ký</string> <string name="unable_to_read_hidden_service_name">không thể đọc được tên dịch vụ ẩn</string> <string name="unable_to_start_tor">Không thể khởi động Tor được: </string> - <string name="no_internet_connection_tor">Không có kết nối Internet; Tor đang ở chế độ chờ...</string> <string name="newnym">Bạn đã chuyển sang một mạch Tor mới!</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">Không có mạng. Đang chuyển Tor sang chế độ ngủ...</string> - <string name="network_connectivity_is_good_waking_tor_up_">Kết nối mạng tốt. Đang \"đánh thức\" Tor...</string> - <string name="updating_settings_in_tor_service">đang cập nhật cài đặt dịch vụ Tor</string> + <string name="updating_settings_in_tor_service">đang cập nhật cài đặt dịch vụ Tor</string> </resources> diff --git a/orbotservice/src/main/res/values-zh-rCN/strings.xml b/orbotservice/src/main/res/values-zh-rCN/strings.xml index f831c4c7..888444a0 100644 --- a/orbotservice/src/main/res/values-zh-rCN/strings.xml +++ b/orbotservice/src/main/res/values-zh-rCN/strings.xml @@ -6,8 +6,6 @@ <string name="status_activated">已连接到 Tor 网络</string> <string name="status_disabled">Orbot 已停用</string> <string name="status_shutting_down">Tor服务正在关闭</string> - <string name="tor_process_starting">正在启动 Tor 客户端...</string> - <string name="tor_process_complete">完成。</string>    @@ -23,9 +21,6 @@ <string name="something_bad_happened">发生错误，请检查日志</string> <string name="unable_to_read_hidden_service_name">无法读取隐藏服务名称</string> <string name="unable_to_start_tor">无法启动 Tor：</string> - <string name="no_internet_connection_tor">没有互联网连接；Tor 处于待机状态…</string> <string name="newnym">已切换为新的 Tor 标识！</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">没有网络连接；让 Tor 进入睡眠…</string> - <string name="network_connectivity_is_good_waking_tor_up_">网络连接良好。正在唤醒 Tor...</string> - <string name="updating_settings_in_tor_service">正在更新 Tor 服务中的设置</string> + <string name="updating_settings_in_tor_service">正在更新 Tor 服务中的设置</string> </resources> diff --git a/orbotservice/src/main/res/values-zh-rTW/strings.xml b/orbotservice/src/main/res/values-zh-rTW/strings.xml index 4b65958f..41fc8821 100644 --- a/orbotservice/src/main/res/values-zh-rTW/strings.xml +++ b/orbotservice/src/main/res/values-zh-rTW/strings.xml @@ -7,8 +7,6 @@ Orbot使用Tor在全球一系列的電腦間跳躍，以便隱藏網路流量並 <string name="status_activated">已連線至 Tor 網路</string> <string name="status_disabled">Orbot 已停用</string> <string name="status_shutting_down">Tor服務正在關閉</string> - <string name="tor_process_starting">啟動Tor 用戶端...</string> - <string name="tor_process_complete">完成。</string>    diff --git a/orbotservice/src/main/res/values/colors.xml b/orbotservice/src/main/res/values/colors.xml index af92426f..81869efd 100644 --- a/orbotservice/src/main/res/values/colors.xml +++ b/orbotservice/src/main/res/values/colors.xml @@ -1,9 +1,2 @@ - <resources> - <color name="panel_background">#ffffff</color> - <color name="panel_background_dark">#efefef</color> - <color name="panel_background_main">#efefef</color> - <color name="bright_green">#ccff2a</color> - <color name="dark_green">#669901</color> - <color name="dark_purple">#3f2b4f</color> - </resources> + <resources></resources> diff --git a/orbotservice/src/main/res/values/strings.xml b/orbotservice/src/main/res/values/strings.xml index 603207fa..b77869d1 100644 --- a/orbotservice/src/main/res/values/strings.xml +++ b/orbotservice/src/main/res/values/strings.xml @@ -1,46 +1,23 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Orbot</string> - <string name="app_description">Orbot is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world. Tor is free software and an open network that helps you defend against a form of network surveillance that threatens personal freedom and privacy, confidential business activities and relationships, and state security known as traffic analysis.</string> + <string name="app_name">Orbot</string> + <string name="app_description">Orbot is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world. Tor is free software and an open network that helps you defend against a form of network surveillance that threatens personal freedom and privacy, confidential business activities and relationships, and state security known as traffic analysis.</string> <string name="status_starting_up">Orbot is starting…</string> - <string name="status_activated">Connected to the Tor network</string> - <string name="status_disabled">Orbot is deactivated</string> - <string name="status_shutting_down">TorService is shutting down</string> - <string name="tor_process_starting">Starting Tor client…</string> - <string name="tor_process_complete">complete.</string> -  -  -  -  -  -  -  -  - + <string name="status_activated">Connected to the Tor network</string> + <string name="status_disabled">Orbot is deactivated</string> + <string name="status_shutting_down">TorService is shutting down</string> <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string> <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string> - <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string> + <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string> <string name="found_existing_tor_process">found existing Tor process…</string> - <string name="something_bad_happened">Something bad happened. Check the log</string> + <string name="something_bad_happened">Something bad happened. Check the log</string> <string name="unable_to_read_hidden_service_name">unable to read onion service name</string> - <string name="unable_to_start_tor">Unable to start Tor:</string> + <string name="unable_to_start_tor">Unable to start Tor:</string> - <string name="no_internet_connection_tor">No internet connection; Tor is on standby…</string> <string name="newnym">You\'ve switched to a new Tor identity!</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">No network connectivity. Putting Tor to sleep…</string> - <string name="network_connectivity_is_good_waking_tor_up_">Network connectivity is good. Waking Tor up…</string> <string name="updating_settings_in_tor_service">updating settings in Tor service</string> - <string name="menu_new_identity">New Identity</string> - - <string name="Title">Title</string> - <string name="SubTitle">SubTitle</string> - <string name="ButtonText">ButtonText</string> - <string name="WelcomeFragment">welcome</string> - <string name="Intro2Fragment">intro2</string> - <string name="CS2Fragment">cs2</string> - <string name="CS3Fragment">cs3</string> </resources>

1 0

[orbot/master] removed unused placeholder assets
by n8fr8＠torproject.org 07 Oct '20

07 Oct '20

commit 4fc4a0977844ba51a0704cc6465f41e8f07a6ac6 Author: bim <dsnake(a)protonmail.com> Date: Tue Sep 8 09:47:09 2020 -0400 removed unused placeholder assets --- app/src/appmax/ic_launcher-web.png | Bin 26340 -> 0 bytes app/src/appmax/res/mipmap-anydpi-v26/ic_launcher.xml | 5 ----- .../appmax/res/mipmap-anydpi-v26/ic_launcher_round.xml | 5 ----- app/src/appmax/res/mipmap-hdpi/ic_launcher.png | Bin 2858 -> 0 bytes .../appmax/res/mipmap-hdpi/ic_launcher_foreground.png | Bin 2629 -> 0 bytes app/src/appmax/res/mipmap-hdpi/ic_launcher_round.png | Bin 5049 -> 0 bytes app/src/appmax/res/mipmap-mdpi/ic_launcher.png | Bin 1713 -> 0 bytes .../appmax/res/mipmap-mdpi/ic_launcher_foreground.png | Bin 1663 -> 0 bytes app/src/appmax/res/mipmap-mdpi/ic_launcher_round.png | Bin 2928 -> 0 bytes app/src/appmax/res/mipmap-xhdpi/ic_launcher.png | Bin 3827 -> 0 bytes .../appmax/res/mipmap-xhdpi/ic_launcher_foreground.png | Bin 3594 -> 0 bytes app/src/appmax/res/mipmap-xhdpi/ic_launcher_round.png | Bin 6995 -> 0 bytes app/src/appmax/res/mipmap-xxhdpi/ic_launcher.png | Bin 5759 -> 0 bytes .../appmax/res/mipmap-xxhdpi/ic_launcher_foreground.png | Bin 5804 -> 0 bytes app/src/appmax/res/mipmap-xxhdpi/ic_launcher_round.png | Bin 10664 -> 0 bytes app/src/appmax/res/mipmap-xxxhdpi/ic_launcher.png | Bin 7711 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 8206 -> 0 bytes app/src/appmax/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 14870 -> 0 bytes app/src/appmax/res/values/ic_launcher_background.xml | 4 ---- 19 files changed, 14 deletions(-) diff --git a/app/src/appmax/ic_launcher-web.png b/app/src/appmax/ic_launcher-web.png deleted file mode 100644 index 64e54bb0..00000000 Binary files a/app/src/appmax/ic_launcher-web.png and /dev/null differ diff --git a/app/src/appmax/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/appmax/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 036d09bc..00000000 --- a/app/src/appmax/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:drawable="@color/ic_launcher_background"/> - <foreground android:drawable="@mipmap/ic_launcher_foreground"/> -</adaptive-icon> \ No newline at end of file diff --git a/app/src/appmax/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/appmax/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 036d09bc..00000000 --- a/app/src/appmax/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:drawable="@color/ic_launcher_background"/> - <foreground android:drawable="@mipmap/ic_launcher_foreground"/> -</adaptive-icon> \ No newline at end of file diff --git a/app/src/appmax/res/mipmap-hdpi/ic_launcher.png b/app/src/appmax/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index dbd6e745..00000000 Binary files a/app/src/appmax/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/appmax/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/appmax/res/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index dc0c1811..00000000 Binary files a/app/src/appmax/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/appmax/res/mipmap-hdpi/ic_launcher_round.png b/app/src/appmax/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 52607429..00000000 Binary files a/app/src/appmax/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/appmax/res/mipmap-mdpi/ic_launcher.png b/app/src/appmax/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index cf639a2c..00000000 Binary files a/app/src/appmax/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/appmax/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/appmax/res/mipmap-mdpi/ic_launcher_foreground.png deleted file mode 100644 index 9038937b..00000000 Binary files a/app/src/appmax/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/appmax/res/mipmap-mdpi/ic_launcher_round.png b/app/src/appmax/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index fe7f8737..00000000 Binary files a/app/src/appmax/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/appmax/res/mipmap-xhdpi/ic_launcher.png b/app/src/appmax/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index cb327015..00000000 Binary files a/app/src/appmax/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/appmax/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/appmax/res/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index c93ae0ce..00000000 Binary files a/app/src/appmax/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/appmax/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/appmax/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 96148faf..00000000 Binary files a/app/src/appmax/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/appmax/res/mipmap-xxhdpi/ic_launcher.png b/app/src/appmax/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 8474d14f..00000000 Binary files a/app/src/appmax/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/appmax/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/appmax/res/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index bf41594e..00000000 Binary files a/app/src/appmax/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/appmax/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/appmax/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index 0579eabc..00000000 Binary files a/app/src/appmax/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/appmax/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/appmax/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 1795e37d..00000000 Binary files a/app/src/appmax/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/appmax/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/appmax/res/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 5a4c77bc..00000000 Binary files a/app/src/appmax/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/appmax/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/appmax/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index 7e2084c6..00000000 Binary files a/app/src/appmax/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/appmax/res/values/ic_launcher_background.xml b/app/src/appmax/res/values/ic_launcher_background.xml deleted file mode 100644 index 225a1525..00000000 --- a/app/src/appmax/res/values/ic_launcher_background.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <color name="ic_launcher_background">#EAA9E5</color> -</resources> \ No newline at end of file

1 0

[orbot/master] Merge pull request #385 from bitmold/delete_eclipse_files
by n8fr8＠torproject.org 07 Oct '20

07 Oct '20

commit e46fb67099825f9786dd404e096815926f944e93 Merge: 4fc4a097 dfd5d7a0 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Tue Sep 8 13:47:43 2020 -0400 Merge pull request #385 from bitmold/delete_eclipse_files removed eclipse/ant build files .classpath | 13 ------- .project | 79 ----------------------------------------- add-proguard-release.xml | 46 ------------------------ bcdroid.manifest | 3 -- build.xml | 92 ------------------------------------------------ custom_rules.xml | 57 ------------------------------ 6 files changed, 290 deletions(-)

1 0

[orbot/master] Revert "removed unused app module drawables" (this was a mistake, sorry)
by n8fr8＠torproject.org 07 Oct '20

07 Oct '20

commit c5b52f6cd75694a73f1039ef204d525590ff9f68 Author: bim <dsnake(a)protonmail.com> Date: Wed Sep 9 09:33:23 2020 -0400 Revert "removed unused app module drawables" (this was a mistake, sorry) This reverts commit 1c579b851fb07a69e493964522d4a6b90c8d24af. --- app/src/main/res/drawable-hdpi-v11/ic_stat_notifyerr.png | Bin 0 -> 359 bytes app/src/main/res/drawable-hdpi-v11/ic_stat_tor.png | Bin 0 -> 660 bytes app/src/main/res/drawable-hdpi-v11/ic_stat_tor_off.png | Bin 0 -> 944 bytes app/src/main/res/drawable-hdpi-v11/ic_stat_tor_xfer.png | Bin 0 -> 1073 bytes app/src/main/res/drawable-hdpi-v9/ic_stat_notifyerr.png | Bin 0 -> 508 bytes app/src/main/res/drawable-hdpi-v9/ic_stat_tor.png | Bin 0 -> 640 bytes app/src/main/res/drawable-hdpi/ic_stat_notifyerr.png | Bin 0 -> 901 bytes app/src/main/res/drawable-hdpi/ic_stat_tor.png | Bin 0 -> 715 bytes app/src/main/res/drawable-hdpi/ic_stat_tor_xfer.png | Bin 0 -> 969 bytes app/src/main/res/drawable-ldpi-v11/ic_stat_notifyerr.png | Bin 0 -> 262 bytes app/src/main/res/drawable-ldpi-v11/ic_stat_tor.png | Bin 0 -> 420 bytes app/src/main/res/drawable-ldpi-v9/ic_stat_notifyerr.png | Bin 0 -> 326 bytes app/src/main/res/drawable-ldpi-v9/ic_stat_tor.png | Bin 0 -> 365 bytes app/src/main/res/drawable-ldpi/ic_stat_notifyerr.png | Bin 0 -> 443 bytes app/src/main/res/drawable-ldpi/ic_stat_tor.png | Bin 0 -> 494 bytes app/src/main/res/drawable-mdpi-v11/ic_stat_notifyerr.png | Bin 0 -> 317 bytes app/src/main/res/drawable-mdpi-v11/ic_stat_tor.png | Bin 0 -> 441 bytes app/src/main/res/drawable-mdpi-v11/ic_stat_tor_xfer.png | Bin 0 -> 741 bytes app/src/main/res/drawable-mdpi-v9/ic_stat_notifyerr.png | Bin 0 -> 417 bytes app/src/main/res/drawable-mdpi-v9/ic_stat_tor.png | Bin 0 -> 464 bytes .../main/res/drawable-xhdpi-v11/ic_stat_notifyerr.png | Bin 0 -> 406 bytes app/src/main/res/drawable-xhdpi-v11/ic_stat_tor.png | Bin 0 -> 887 bytes app/src/main/res/drawable-xhdpi-v11/ic_stat_tor_xfer.png | Bin 0 -> 1348 bytes app/src/main/res/drawable-xhdpi-v9/ic_stat_notifyerr.png | Bin 0 -> 580 bytes app/src/main/res/drawable-xhdpi-v9/ic_stat_tor.png | Bin 0 -> 864 bytes app/src/main/res/drawable-xxhdpi-v11/ic_stat_tor.png | Bin 0 -> 1307 bytes .../main/res/drawable-xxhdpi-v11/ic_stat_tor_xfer.png | Bin 0 -> 1734 bytes app/src/main/res/drawable-xxxhdpi-v11/ic_stat_tor.png | Bin 0 -> 1734 bytes .../main/res/drawable-xxxhdpi-v11/ic_stat_tor_xfer.png | Bin 0 -> 2424 bytes app/src/main/res/drawable/ic_stat_tor_off.png | Bin 0 -> 944 bytes app/src/main/res/drawable/ic_stat_tor_xfer.png | Bin 0 -> 628 bytes 31 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/src/main/res/drawable-hdpi-v11/ic_stat_notifyerr.png b/app/src/main/res/drawable-hdpi-v11/ic_stat_notifyerr.png new file mode 100644 index 00000000..782a52d9 Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v11/ic_stat_notifyerr.png differ diff --git a/app/src/main/res/drawable-hdpi-v11/ic_stat_tor.png b/app/src/main/res/drawable-hdpi-v11/ic_stat_tor.png new file mode 100644 index 00000000..543c788f Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v11/ic_stat_tor.png differ diff --git a/app/src/main/res/drawable-hdpi-v11/ic_stat_tor_off.png b/app/src/main/res/drawable-hdpi-v11/ic_stat_tor_off.png new file mode 100644 index 00000000..a8cbe1de Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v11/ic_stat_tor_off.png differ diff --git a/app/src/main/res/drawable-hdpi-v11/ic_stat_tor_xfer.png b/app/src/main/res/drawable-hdpi-v11/ic_stat_tor_xfer.png new file mode 100644 index 00000000..781f061a Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v11/ic_stat_tor_xfer.png differ diff --git a/app/src/main/res/drawable-hdpi-v9/ic_stat_notifyerr.png b/app/src/main/res/drawable-hdpi-v9/ic_stat_notifyerr.png new file mode 100644 index 00000000..75f8a863 Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v9/ic_stat_notifyerr.png differ diff --git a/app/src/main/res/drawable-hdpi-v9/ic_stat_tor.png b/app/src/main/res/drawable-hdpi-v9/ic_stat_tor.png new file mode 100644 index 00000000..716e4981 Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v9/ic_stat_tor.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_stat_notifyerr.png b/app/src/main/res/drawable-hdpi/ic_stat_notifyerr.png new file mode 100644 index 00000000..abd8c126 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_stat_notifyerr.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_stat_tor.png b/app/src/main/res/drawable-hdpi/ic_stat_tor.png new file mode 100644 index 00000000..0f8f87d1 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_stat_tor.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_stat_tor_xfer.png b/app/src/main/res/drawable-hdpi/ic_stat_tor_xfer.png new file mode 100644 index 00000000..44a2f772 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_stat_tor_xfer.png differ diff --git a/app/src/main/res/drawable-ldpi-v11/ic_stat_notifyerr.png b/app/src/main/res/drawable-ldpi-v11/ic_stat_notifyerr.png new file mode 100644 index 00000000..43d71e2f Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v11/ic_stat_notifyerr.png differ diff --git a/app/src/main/res/drawable-ldpi-v11/ic_stat_tor.png b/app/src/main/res/drawable-ldpi-v11/ic_stat_tor.png new file mode 100644 index 00000000..e3d85b5b Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v11/ic_stat_tor.png differ diff --git a/app/src/main/res/drawable-ldpi-v9/ic_stat_notifyerr.png b/app/src/main/res/drawable-ldpi-v9/ic_stat_notifyerr.png new file mode 100644 index 00000000..eedf7faf Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v9/ic_stat_notifyerr.png differ diff --git a/app/src/main/res/drawable-ldpi-v9/ic_stat_tor.png b/app/src/main/res/drawable-ldpi-v9/ic_stat_tor.png new file mode 100644 index 00000000..2f344690 Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v9/ic_stat_tor.png differ diff --git a/app/src/main/res/drawable-ldpi/ic_stat_notifyerr.png b/app/src/main/res/drawable-ldpi/ic_stat_notifyerr.png new file mode 100644 index 00000000..645432c2 Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_stat_notifyerr.png differ diff --git a/app/src/main/res/drawable-ldpi/ic_stat_tor.png b/app/src/main/res/drawable-ldpi/ic_stat_tor.png new file mode 100644 index 00000000..1a18c2ab Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_stat_tor.png differ diff --git a/app/src/main/res/drawable-mdpi-v11/ic_stat_notifyerr.png b/app/src/main/res/drawable-mdpi-v11/ic_stat_notifyerr.png new file mode 100644 index 00000000..e55893c3 Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v11/ic_stat_notifyerr.png differ diff --git a/app/src/main/res/drawable-mdpi-v11/ic_stat_tor.png b/app/src/main/res/drawable-mdpi-v11/ic_stat_tor.png new file mode 100644 index 00000000..be7dccf7 Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v11/ic_stat_tor.png differ diff --git a/app/src/main/res/drawable-mdpi-v11/ic_stat_tor_xfer.png b/app/src/main/res/drawable-mdpi-v11/ic_stat_tor_xfer.png new file mode 100644 index 00000000..04168ec8 Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v11/ic_stat_tor_xfer.png differ diff --git a/app/src/main/res/drawable-mdpi-v9/ic_stat_notifyerr.png b/app/src/main/res/drawable-mdpi-v9/ic_stat_notifyerr.png new file mode 100644 index 00000000..b19d6b65 Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v9/ic_stat_notifyerr.png differ diff --git a/app/src/main/res/drawable-mdpi-v9/ic_stat_tor.png b/app/src/main/res/drawable-mdpi-v9/ic_stat_tor.png new file mode 100644 index 00000000..be212d07 Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v9/ic_stat_tor.png differ diff --git a/app/src/main/res/drawable-xhdpi-v11/ic_stat_notifyerr.png b/app/src/main/res/drawable-xhdpi-v11/ic_stat_notifyerr.png new file mode 100644 index 00000000..36f750a5 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v11/ic_stat_notifyerr.png differ diff --git a/app/src/main/res/drawable-xhdpi-v11/ic_stat_tor.png b/app/src/main/res/drawable-xhdpi-v11/ic_stat_tor.png new file mode 100644 index 00000000..2344022f Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v11/ic_stat_tor.png differ diff --git a/app/src/main/res/drawable-xhdpi-v11/ic_stat_tor_xfer.png b/app/src/main/res/drawable-xhdpi-v11/ic_stat_tor_xfer.png new file mode 100644 index 00000000..270a4139 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v11/ic_stat_tor_xfer.png differ diff --git a/app/src/main/res/drawable-xhdpi-v9/ic_stat_notifyerr.png b/app/src/main/res/drawable-xhdpi-v9/ic_stat_notifyerr.png new file mode 100644 index 00000000..7eaea7be Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v9/ic_stat_notifyerr.png differ diff --git a/app/src/main/res/drawable-xhdpi-v9/ic_stat_tor.png b/app/src/main/res/drawable-xhdpi-v9/ic_stat_tor.png new file mode 100644 index 00000000..ce82130d Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v9/ic_stat_tor.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v11/ic_stat_tor.png b/app/src/main/res/drawable-xxhdpi-v11/ic_stat_tor.png new file mode 100644 index 00000000..c162b7e0 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v11/ic_stat_tor.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v11/ic_stat_tor_xfer.png b/app/src/main/res/drawable-xxhdpi-v11/ic_stat_tor_xfer.png new file mode 100644 index 00000000..0d09348f Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v11/ic_stat_tor_xfer.png differ diff --git a/app/src/main/res/drawable-xxxhdpi-v11/ic_stat_tor.png b/app/src/main/res/drawable-xxxhdpi-v11/ic_stat_tor.png new file mode 100644 index 00000000..5b6154a8 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v11/ic_stat_tor.png differ diff --git a/app/src/main/res/drawable-xxxhdpi-v11/ic_stat_tor_xfer.png b/app/src/main/res/drawable-xxxhdpi-v11/ic_stat_tor_xfer.png new file mode 100644 index 00000000..8e6eb04a Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v11/ic_stat_tor_xfer.png differ diff --git a/app/src/main/res/drawable/ic_stat_tor_off.png b/app/src/main/res/drawable/ic_stat_tor_off.png new file mode 100644 index 00000000..a8cbe1de Binary files /dev/null and b/app/src/main/res/drawable/ic_stat_tor_off.png differ diff --git a/app/src/main/res/drawable/ic_stat_tor_xfer.png b/app/src/main/res/drawable/ic_stat_tor_xfer.png new file mode 100644 index 00000000..ec893235 Binary files /dev/null and b/app/src/main/res/drawable/ic_stat_tor_xfer.png differ

1 0

[orbot/master] VpnUtils.getSharedPrefs was an exact duplicate of Prefs.getSharedPrefs
by n8fr8＠torproject.org 07 Oct '20

07 Oct '20

commit 2b7dd42d77588eb00632e3d0c72f6af7a3c6cb37 Author: bim <dsnake(a)protonmail.com> Date: Wed Sep 9 11:28:55 2020 -0400 VpnUtils.getSharedPrefs was an exact duplicate of Prefs.getSharedPrefs --- .../org/torproject/android/OrbotMainActivity.java | 3 +-- .../torproject/android/service/OrbotService.java | 17 ++++------------- .../org/torproject/android/service/util/Prefs.java | 21 ++++++++++----------- .../android/service/vpn/OrbotVpnManager.java | 5 +++-- .../torproject/android/service/vpn/VpnUtils.java | 11 +---------- 5 files changed, 19 insertions(+), 38 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 47f725ec..11c5d408 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -61,7 +61,6 @@ import org.torproject.android.service.util.Prefs; import org.torproject.android.service.util.Utils; import org.torproject.android.service.vpn.VpnConstants; import org.torproject.android.service.vpn.VpnPrefs; -import org.torproject.android.service.vpn.VpnUtils; import org.torproject.android.settings.Languages; import org.torproject.android.settings.LocaleHelper; import org.torproject.android.settings.SettingsPreferences; @@ -202,7 +201,7 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan } // Resets previous DNS Port to the default. - VpnUtils.getSharedPrefs(getApplicationContext()).edit().putInt(VpnPrefs.PREFS_DNS_PORT, + Prefs.getSharedPrefs(getApplicationContext()).edit().putInt(VpnPrefs.PREFS_DNS_PORT, VpnConstants.TOR_DNS_PORT_DEFAULT).apply(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index a61828d5..e6d70ce5 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -7,7 +7,6 @@ package org.torproject.android.service; - import android.annotation.SuppressLint; import android.app.Application; import android.app.Notification; @@ -28,7 +27,6 @@ import android.database.Cursor; import android.net.Uri; import android.net.VpnService; import android.os.Build; -import android.os.Environment; import android.os.Handler; import android.os.IBinder; import android.provider.BaseColumns; @@ -70,8 +68,6 @@ import java.io.InputStreamReader; import java.io.PrintStream; import java.io.PrintWriter; import java.net.Socket; -import java.nio.file.Files; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -85,10 +81,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeoutException; -import static org.torproject.android.service.vpn.VpnUtils.getSharedPrefs; - -public class OrbotService extends VpnService implements TorServiceConstants, OrbotConstants -{ +public class OrbotService extends VpnService implements TorServiceConstants, OrbotConstants { public final static String BINARY_TOR_VERSION = org.torproject.android.binary.TorServiceConstants.BINARY_TOR_VERSION; private String mCurrentStatus = STATUS_OFF; @@ -467,10 +460,8 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb super.onDestroy(); } - private void stopTor () - { - new Thread(() -> stopTorAsync()).start(); - + private void stopTor() { + new Thread(this::stopTorAsync).start(); } private void stopTorAsync () { @@ -1217,7 +1208,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb confDns = st.nextToken().split(":")[1]; confDns = confDns.substring(0, confDns.length() - 1); mPortDns = Integer.parseInt(confDns); - getSharedPrefs(getApplicationContext()).edit().putInt(VpnPrefs.PREFS_DNS_PORT, mPortDns).apply(); + Prefs.getSharedPrefs(getApplicationContext()).edit().putInt(VpnPrefs.PREFS_DNS_PORT, mPortDns).apply(); } String confTrans = conn.getInfo("net/listeners/trans"); diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java index 9b6ab825..099e2677 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java @@ -3,6 +3,7 @@ package org.torproject.android.service.util; import android.content.Context; import android.content.SharedPreferences; + import org.torproject.android.service.OrbotConstants; import java.util.Locale; @@ -20,7 +21,7 @@ public class Prefs { private final static String PREF_OPEN_PROXY_ON_ALL_INTERFACES = "pref_open_proxy_on_all_interfaces"; private final static String PREF_USE_VPN = "pref_vpn"; private final static String PREF_EXIT_NODES = "pref_exit_nodes"; - + private static SharedPreferences prefs; public static void setContext(Context context) { @@ -100,18 +101,16 @@ public class Prefs { public static void putStartOnBoot(boolean value) { putBoolean(PREF_START_ON_BOOT, value); } - - public static String getExitNodes () - { - return prefs.getString(PREF_EXIT_NODES, ""); + + public static String getExitNodes() { + return prefs.getString(PREF_EXIT_NODES, ""); } - - public static void setExitNodes (String exits) - { - putString(PREF_EXIT_NODES,exits); + + public static void setExitNodes(String exits) { + putString(PREF_EXIT_NODES, exits); } - public static SharedPreferences getSharedPrefs (Context context) { - return context.getSharedPreferences(OrbotConstants.PREF_TOR_SHARED_PREFS,0 | Context.MODE_MULTI_PROCESS); + public static SharedPreferences getSharedPrefs(Context context) { + return context.getSharedPreferences(OrbotConstants.PREF_TOR_SHARED_PREFS, Context.MODE_MULTI_PROCESS); } } diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java index 3dd315fd..ea27af99 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java @@ -39,6 +39,7 @@ import org.torproject.android.service.OrbotService; import org.torproject.android.service.R; import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.util.CustomNativeLoader; +import org.torproject.android.service.util.Prefs; import java.io.BufferedReader; import java.io.File; @@ -77,7 +78,7 @@ public class OrbotVpnManager implements Handler.Callback { private final static boolean mIsLollipop = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP; - private File filePdnsd = null; + private File filePdnsd; private final static String PDNSD_BIN = "pdnsd"; @@ -326,7 +327,7 @@ public class OrbotVpnManager implements Handler.Callback { @TargetApi(Build.VERSION_CODES.LOLLIPOP) private void doLollipopAppRouting (VpnService.Builder builder) throws NameNotFoundException { - SharedPreferences prefs = VpnUtils.getSharedPrefs(mService.getApplicationContext()); + SharedPreferences prefs = Prefs.getSharedPrefs(mService.getApplicationContext()); ArrayList<TorifiedApp> apps = TorifiedApp.getApps(mService, prefs); diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/VpnUtils.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/VpnUtils.java index 68841fda..e1cdd375 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/VpnUtils.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/VpnUtils.java @@ -1,7 +1,5 @@ package org.torproject.android.service.vpn; -import android.content.Context; -import android.content.SharedPreferences; import android.util.Log; import org.apache.commons.io.IOUtils; @@ -13,16 +11,9 @@ import java.io.InputStreamReader; import java.util.List; import static java.lang.Runtime.getRuntime; -import static org.torproject.android.service.vpn.VpnPrefs.PREF_TOR_SHARED_PREFS; public class VpnUtils { - public static SharedPreferences getSharedPrefs(Context context) { - return context.getSharedPreferences(PREF_TOR_SHARED_PREFS, - Context.MODE_MULTI_PROCESS); - } - - public static int findProcessId(String command) throws IOException { String[] cmds = {"ps -ef","ps -A","toolbox ps"}; @@ -73,7 +64,7 @@ public class VpnUtils { for (int i = 0; i < cmds.length; i++) { - Process proc = null; + Process proc; try { proc = getRuntime().exec(cmds[i] + "killall " + signal + " " + fileProcBin.getName

1 0

[orbot/master] Merge pull request #387 from bitmold/new_identity_str
by n8fr8＠torproject.org 07 Oct '20

07 Oct '20

commit 13d57462d8a6fb98142406066735a8e44d635f71 Merge: e46fb670 81346eb2 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Tue Sep 8 13:48:18 2020 -0400 Merge pull request #387 from bitmold/new_identity_str Added orbotservice module to transifex config for #386 .tx/config | 7 +++++++ 1 file changed, 7 insertions(+)

1 0

[orbot/master] Merge branch 'master' of https://github.com/guardianproject/orbot
by n8fr8＠torproject.org 07 Oct '20

07 Oct '20

commit 2334ed0a65e57e6ebdedd600911b1b1c746a359e Merge: c5b52f6c 13d57462 Author: bim <dsnake(a)protonmail.com> Date: Wed Sep 9 10:38:43 2020 -0400 Merge branch 'master' of https://github.com/guardianproject/orbot .classpath | 13 ------- .project | 79 ----------------------------------------- .tx/config | 7 ++++ add-proguard-release.xml | 46 ------------------------ bcdroid.manifest | 3 -- build.xml | 92 ------------------------------------------------ custom_rules.xml | 57 ------------------------------ 7 files changed, 7 insertions(+), 290 deletions(-)

1 0