[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor-browser-build/maint-8.5] Bug 30404: Remove Orbot Project
commit 1a6a3be5ad0c05ce5c31f0036e7fdbba12796695
Author: sisbell <shane.isbell@xxxxxxxxx>
Date: Sun May 5 17:46:44 2019 -0700
Bug 30404: Remove Orbot Project
---
projects/firefox/build | 3 +-
projects/firefox/config | 3 -
.../0001-Bug-28051-Build-Orbot-as-a-library.patch | 261 ----
.../0002-Bug-28051-Exclude-the-AppUpdater.patch | 39 -
...-Bug-28051-Delete-the-Onboarding-activity.patch | 208 ---
...ename-the-Hidden-Service-content-provider.patch | 308 ----
.../0005-Bug-28051-Cast-the-layout-elements.patch | 81 --
...on-t-use-Orbot-s-LocaleHelper-for-locale-.patch | 129 --
...ename-Orbot-s-preferences-so-they-don-t-c.patch | 53 -
...ake-TorService-compatible-with-the-suppor.patch | 49 -
...1-Change-Orbot-s-behavior-for-Tor-Browser.patch | 150 --
...010-Bug-28051-Rename-Orbot-as-Tor-Browser.patch | 1532 --------------------
...ell-Proguard-it-should-keep-an-unused-met.patch | 32 -
...Bug-28051-Escape-the-apostrophe-correctly.patch | 64 -
...51-Add-a-notification-compatibility-class.patch | 221 ---
.../0014-Bug-29794-Update-built-in-bridges.patch | 34 -
projects/orbot/0015-dependencies.patch | 29 -
projects/orbot/build | 38 -
projects/orbot/config | 52 -
projects/orbot/gradle-dependencies-list.txt | 193 ---
projects/orbot/set_gradle_repo_to_local.patch | 19 -
21 files changed, 1 insertion(+), 3497 deletions(-)
diff --git a/projects/firefox/build b/projects/firefox/build
index 0fd5b99..c15aac2 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -105,8 +105,7 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig
mv $rootdir/[% c('input_files_by_name/gradle-dependencies') %] $gradle_repo
cp -r $gradle_repo/plugins-release/* $gradle_repo
cp -r $gradle_repo/maven2/* $gradle_repo
- # Move orbot files so they will be included in the apk during the build
- cp $rootdir/[% c('input_files_by_name/orbot') %]/* mobile/android/app
+ # Move Android library dependencies so they will be included in the apk during the build
cp $rootdir/[% c('input_files_by_name/topl') %]/* mobile/android/app
cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* mobile/android/app
# Apply patches
diff --git a/projects/firefox/config b/projects/firefox/config
index ff58ef2..35dac3a 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -160,9 +160,6 @@ input_files:
name: gradle-dependencies
exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
enable: '[% c("var/android") %]'
- - project: orbot
- name: orbot
- enable: '[% c("var/android") %]'
- project: tor-android-service
name: tor-android-service
enable: '[% c("var/android") %]'
diff --git a/projects/orbot/0001-Bug-28051-Build-Orbot-as-a-library.patch b/projects/orbot/0001-Bug-28051-Build-Orbot-as-a-library.patch
deleted file mode 100644
index 3b34dec..0000000
--- a/projects/orbot/0001-Bug-28051-Build-Orbot-as-a-library.patch
+++ /dev/null
@@ -1,261 +0,0 @@
-From 6a7ccfc48d3ec930390cabfd460730915215f674 Mon Sep 17 00:00:00 2001
-From: Matthew Finkel <Matthew.Finkel@xxxxxxxxx>
-Date: Sat, 24 Nov 2018 04:32:56 +0000
-Subject: [PATCH 01/13] Bug 28051 - Build Orbot as a library
-
----
- app/build.gradle | 31 ++++++++++++++++++++-----------
- app/src/main/AndroidManifest.xml | 32 +++++++++++++++++++-------------
- build.gradle | 3 ++-
- jsocksAndroid/build.gradle | 8 +++++---
- orbotservice/build.gradle | 11 +++++++----
- 5 files changed, 53 insertions(+), 32 deletions(-)
-
-diff --git a/app/build.gradle b/app/build.gradle
-index ba57f72c..3051dd5c 100644
---- a/app/build.gradle
-+++ b/app/build.gradle
-@@ -1,12 +1,16 @@
--apply plugin: 'com.android.application'
-+// Build it as a library, instead of an app
-+apply plugin: 'com.android.library'
-
- android {
-- compileSdkVersion 27
-- buildToolsVersion '27.0.3'
-+ // Match Fennec's version
-+ compileSdkVersion 26
-+ buildToolsVersion '26.0.2'
- defaultConfig {
-- applicationId "org.torproject.android"
-+ // Libraries can't have an applicationId
-+ //applicationId "org.torproject.android"
- minSdkVersion 16
-- targetSdkVersion 27
-+ // Match Fennec's version
-+ targetSdkVersion 26
- }
- lintOptions {
- checkReleaseBuilds false
-@@ -17,7 +21,8 @@ android {
- buildTypes {
- release {
- minifyEnabled true
-- shrinkResources true
-+ // Match Fennec
-+ shrinkResources false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
- }
- }
-@@ -32,8 +37,10 @@ android {
- fullperm {
- dimension "free"
- minSdkVersion 16
-- applicationId 'org.torproject.android'
-- targetSdkVersion 27
-+ // Libraries can't have an applicationId
-+ //applicationId 'org.torproject.android'
-+ // Match Fennec's versions
-+ targetSdkVersion 26
- versionCode 16050100
- versionName '16.0.5-RC-1-tor-0.3.4.9'
- archivesBaseName = "Orbot-$versionName"
-@@ -70,9 +77,11 @@ dependencies {
- // implementation 'com.github.delight-im:Android-Languages:v1.0.1'
- implementation 'com.android.support.constraint:constraint-layout:1.1.3'
- implementation project(':orbotservice')
-- implementation 'com.android.support:design:27.1.1'
-+ // Match Fennec's ANDROID_SUPPORT_LIBRARY_VERSION
-+ implementation 'com.android.support:design:23.4.0'
- implementation 'pl.bclogic:pulsator4droid:1.0.3'
-- implementation 'com.github.apl-devs:appintro:v4.2.2'
-- implementation 'com.github.javiersantos:AppUpdater:2.6.4'
-+ // These require higher versions of ANDROID_SUPPORT_LIBRARY_VERSION
-+ //implementation 'com.github.apl-devs:appintro:v4.2.2'
-+ //implementation 'com.github.javiersantos:AppUpdater:2.6.4'
-
- }
-diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
-index 56db8266..2cd00888 100644
---- a/app/src/main/AndroidManifest.xml
-+++ b/app/src/main/AndroidManifest.xml
-@@ -15,15 +15,13 @@
- <uses-feature android:name="android.hardware.touchscreen"
- android:required="false" />
-
-+ <!-- Delete Orbot's name, icon, and label, so they don't conflict with the app -->
-+ <!-- Fennec enables hardwareAccelerated= -->
- <application
-- android:name=".OrbotApp"
- android:allowBackup="false"
- android:allowClearUserData="true"
- android:configChanges="locale|orientation|screenSize"
- android:description="@string/app_description"
-- android:hardwareAccelerated="false"
-- android:icon="@drawable/ic_launcher"
-- android:label="@string/app_name"
- android:theme="@style/DefaultTheme"
- tools:replace="android:allowBackup"
- >
-@@ -31,10 +29,10 @@
- android:name=".OrbotMainActivity"
- android:excludeFromRecents="true"
- android:launchMode="singleTop">
-+ <!-- When Orbot has android.intent.category.LAUNCHER, then a
-+ launcher icon is added on the app menu. We don't want this. -->
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
--
-- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- <intent-filter>
- <action android:name="android.intent.action.VIEW" />
-@@ -57,17 +55,20 @@
- </activity>
-
- <!-- This is for ensuring the background service still runs when/if the app is swiped away -->
-+ <!-- We want the app and background service to die when the user swipes away the app,
-+ so disable this activity -->
- <activity
- android:name=".service.util.DummyActivity"
- android:allowTaskReparenting="true"
- android:alwaysRetainTaskState="false"
- android:clearTaskOnLaunch="true"
-- android:enabled="true"
-+ android:enabled="false"
- android:excludeFromRecents="true"
- android:finishOnTaskLaunch="true"
- android:noHistory="true"
- android:stateNotNeeded="true"
- android:theme="@android:style/Theme.Translucent" />
-+ <!-- Don't export the VPN functionality, we don't want to use it -->
- <activity
- android:name=".vpn.VPNEnableActivity"
- android:exported="false"
-@@ -85,26 +86,29 @@
- android:enabled="true"
- android:permission="android.permission.BIND_VPN_SERVICE"
- android:stopWithTask="false"></service>
-+ <!-- Disable the VPN functionality, we don't want to use it -->
- <service
- android:name=".service.vpn.TorVpnService"
-- android:enabled="true"
-+ android:enabled="false"
- android:permission="android.permission.BIND_VPN_SERVICE">
- <intent-filter>
- <action android:name="android.net.VpnService" />
- </intent-filter>
- </service>
-
-+ <!-- Don't let other apps start our Orbot -->
- <receiver
- android:name=".service.StartTorReceiver"
-- android:exported="true">
-+ android:exported="false">
- <intent-filter>
- <action android:name="org.torproject.android.intent.action.START" />
- </intent-filter>
- </receiver>
-+ <!-- Don't automatically start our Orbot when the device boots -->
- <receiver
- android:name=".OnBootReceiver"
-- android:enabled="true"
-- android:exported="true">
-+ android:enabled="false"
-+ android:exported="false">
- <intent-filter>
- <action android:name="android.intent.action.BOOT_COMPLETED" />
-
-@@ -154,7 +158,9 @@
- android:value=".OrbotMainActivity" />
- </activity>
-
-- <activity android:name=".ui.onboarding.OnboardingActivity"/>
-+ <!-- Disable the Onboarding activity, because it depends on a library that
-+ depends on a newer version of the Android Support Library -->
-+ <!--<activity android:name=".ui.onboarding.OnboardingActivity"/>-->
- <activity android:name=".ui.onboarding.BridgeWizardActivity"/>
-
- <provider
-@@ -163,4 +169,4 @@
- android:exported="false" />
- </application>
-
--</manifest>
-\ No newline at end of file
-+</manifest>
-diff --git a/build.gradle b/build.gradle
-index 553079b6..ce06f082 100644
---- a/build.gradle
-+++ b/build.gradle
-@@ -5,7 +5,8 @@ buildscript {
- google()
- }
- dependencies {
-- classpath 'com.android.tools.build:gradle:3.1.4'
-+ // Match Fennec
-+ classpath 'com.android.tools.build:gradle:3.0.1'
- }
- }
-
-diff --git a/jsocksAndroid/build.gradle b/jsocksAndroid/build.gradle
-index 7ac21e4e..8f173b5f 100644
---- a/jsocksAndroid/build.gradle
-+++ b/jsocksAndroid/build.gradle
-@@ -1,12 +1,14 @@
- apply plugin: 'com.android.library'
-
- android {
-- compileSdkVersion 27
-- buildToolsVersion '27.0.3'
-+ // Match Fennec's version
-+ compileSdkVersion 26
-+ buildToolsVersion '26.0.2'
-
- defaultConfig {
- minSdkVersion 16
-- targetSdkVersion 27
-+ // Match Fennec's version
-+ targetSdkVersion 26
- }
-
- buildTypes {
-diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle
-index fb9b6946..e95f76ac 100644
---- a/orbotservice/build.gradle
-+++ b/orbotservice/build.gradle
-@@ -1,8 +1,9 @@
- apply plugin: 'com.android.library'
-
- android {
-- compileSdkVersion 27
-- buildToolsVersion '27.0.3'
-+ // Match Fennec's version
-+ compileSdkVersion 26
-+ buildToolsVersion '26.0.2'
-
- sourceSets {
- main {
-@@ -12,7 +13,8 @@ android {
-
- defaultConfig {
- minSdkVersion 16
-- targetSdkVersion 27
-+ // Match Fennec's version
-+ targetSdkVersion 26
- versionCode 1
- versionName "1.0"
-
-@@ -28,7 +30,8 @@ android {
- dependencies {
- implementation project(':jsocksAndroid')
- implementation 'org.torproject:tor-android-binary:0.3.4.9'
-- implementation 'com.android.support:appcompat-v7:27.1.1'
-+ // Match Fennec's version
-+ implementation 'com.android.support:appcompat-v7:23.4.0'
- implementation 'com.jrummyapps:android-shell:1.0.1'
- implementation fileTree(dir: 'libs', include: ['.so'])
- testImplementation 'junit:junit:4.12'
---
-2.17.1
-
diff --git a/projects/orbot/0002-Bug-28051-Exclude-the-AppUpdater.patch b/projects/orbot/0002-Bug-28051-Exclude-the-AppUpdater.patch
deleted file mode 100644
index 98c01fc..0000000
--- a/projects/orbot/0002-Bug-28051-Exclude-the-AppUpdater.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 4a5480df8f23ccc96af794a2194d6a6c33513dc7 Mon Sep 17 00:00:00 2001
-From: Matthew Finkel <Matthew.Finkel@xxxxxxxxx>
-Date: Sat, 24 Nov 2018 04:34:52 +0000
-Subject: [PATCH 02/13] Bug 28051 - Exclude the AppUpdater
-
----
- app/src/main/java/org/torproject/android/OrbotApp.java | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/app/src/main/java/org/torproject/android/OrbotApp.java b/app/src/main/java/org/torproject/android/OrbotApp.java
-index 7279c8e2..291b0456 100644
---- a/app/src/main/java/org/torproject/android/OrbotApp.java
-+++ b/app/src/main/java/org/torproject/android/OrbotApp.java
-@@ -18,10 +18,6 @@ import android.support.v4.app.NotificationCompat;
- import android.util.Log;
- import android.widget.RemoteViews;
-
--import com.github.javiersantos.appupdater.AppUpdater;
--import com.github.javiersantos.appupdater.enums.Display;
--import com.github.javiersantos.appupdater.enums.UpdateFrom;
--
- import org.torproject.android.service.OrbotConstants;
- import org.torproject.android.service.TorEventHandler;
- import org.torproject.android.service.TorService;
-@@ -49,11 +45,6 @@ public class OrbotApp extends Application implements OrbotConstants
-
- //Language.setFromPreference(this, "pref_default_locale");
-
-- //check for updates via github, since it is unlikely to be blocked; notify the user of places where upgrades can be found
-- new AppUpdater(this)
-- .setUpdateFrom(UpdateFrom.JSON)
-- .setUpdateJSON("https://raw.githubusercontent.com/n8fr8/orbot/master/update.json";)
-- .setDisplay(Display.NOTIFICATION).start();
- }
-
- @Override
---
-2.17.1
-
diff --git a/projects/orbot/0003-Bug-28051-Delete-the-Onboarding-activity.patch b/projects/orbot/0003-Bug-28051-Delete-the-Onboarding-activity.patch
deleted file mode 100644
index 2683d65..0000000
--- a/projects/orbot/0003-Bug-28051-Delete-the-Onboarding-activity.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-From 1b6c2cf4b610787e17ad746f7a69f947f717b938 Mon Sep 17 00:00:00 2001
-From: Matthew Finkel <Matthew.Finkel@xxxxxxxxx>
-Date: Sat, 24 Nov 2018 04:36:56 +0000
-Subject: [PATCH 03/13] Bug 28051 - Delete the Onboarding activity
-
-It depends on a library that depends on a newer version of
-the Android Support Library
----
- .../torproject/android/OrbotMainActivity.java | 13 +-
- .../ui/onboarding/OnboardingActivity.java | 147 ------------------
- 2 files changed, 1 insertion(+), 159 deletions(-)
- delete mode 100644 app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java
-
-diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
-index e18711b1..7ad979ff 100644
---- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
-+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
-@@ -29,7 +29,6 @@ import org.torproject.android.settings.SettingsPreferences;
- import org.torproject.android.ui.AppManagerActivity;
- import org.torproject.android.ui.Rotate3dAnimation;
- import org.torproject.android.ui.onboarding.BridgeWizardActivity;
--import org.torproject.android.ui.onboarding.OnboardingActivity;
- import org.torproject.android.ui.hiddenservices.ClientCookiesActivity;
- import org.torproject.android.ui.hiddenservices.HiddenServicesActivity;
- import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
-@@ -197,16 +196,6 @@ public class OrbotMainActivity extends AppCompatActivity
- new IntentFilter(TorServiceConstants.LOCAL_ACTION_LOG));
-
- boolean showFirstTime = mPrefs.getBoolean("connect_first_time", true);
--
-- if (showFirstTime)
-- {
-- Editor pEdit = mPrefs.edit();
-- pEdit.putBoolean("connect_first_time", false);
-- pEdit.commit();
-- startActivity(new Intent(this,OnboardingActivity.class));
-- }
--
--
- }
-
- private void sendIntentToService(final String action) {
-@@ -870,7 +859,7 @@ public class OrbotMainActivity extends AppCompatActivity
- @Override
- public void onClick(DialogInterface dialog, int which) {
-
-- startActivity(OnboardingActivity.getInstallIntent(TorServiceConstants.BROWSER_APP_USERNAME,OrbotMainActivity.this));
-+ dialog.cancel();
-
-
- }
-diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java
-deleted file mode 100644
-index a8bad692..00000000
---- a/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java
-+++ /dev/null
-@@ -1,147 +0,0 @@
--package org.torproject.android.ui.onboarding;
--
--import android.content.Context;
--import android.content.Intent;
--import android.content.pm.PackageManager;
--import android.content.pm.ResolveInfo;
--import android.net.Uri;
--import android.os.Bundle;
--import android.support.annotation.Nullable;
--import android.support.v4.app.Fragment;
--import android.text.TextUtils;
--import android.util.Log;
--import android.view.View;
--
--import com.github.paolorotolo.appintro.AppIntro;
--
--import org.torproject.android.R;
--import org.torproject.android.settings.LocaleHelper;
--import org.torproject.android.ui.AppManagerActivity;
--import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
--import org.torproject.android.vpn.VPNEnableActivity;
--
--import java.util.List;
--
--public class OnboardingActivity extends AppIntro {
--
-- @Override
-- protected void onCreate(@Nullable Bundle savedInstanceState) {
-- super.onCreate(savedInstanceState);
--
-- // Instead of fragments, you can also use our default slide
-- // Just set a title, description, background and image. AppIntro will do the rest.
-- CustomSlideBigText welcome = CustomSlideBigText.newInstance(R.layout.custom_slide_big_text);
-- welcome.setTitle(getString(R.string.hello));
-- welcome.setSubTitle(getString(R.string.welcome));
-- addSlide(welcome);
--
-- CustomSlideBigText intro2 = CustomSlideBigText.newInstance(R.layout.custom_slide_big_text);
-- intro2.setTitle(getString(R.string.browser_the_internet));
-- intro2.setSubTitle(getString(R.string.no_tracking));
-- addSlide(intro2);
--
-- CustomSlideBigText cs2 = CustomSlideBigText.newInstance(R.layout.custom_slide_big_text);
-- cs2.setTitle(getString(R.string.bridges_sometimes));
-- cs2.showButton(getString(R.string.action_more), new View.OnClickListener() {
-- @Override
-- public void onClick(View v) {
-- startActivity(new Intent(OnboardingActivity.this,BridgeWizardActivity.class));
-- }
-- });
-- addSlide(cs2);
--
-- if (PermissionManager.isLollipopOrHigher()) {
--
-- CustomSlideBigText cs3 = CustomSlideBigText.newInstance(R.layout.custom_slide_big_text);
-- cs3.setTitle(getString(R.string.vpn_setup));
-- cs3.setSubTitle(getString(R.string.vpn_setup_sub));
-- cs3.showButton(getString(R.string.action_vpn_choose), new View.OnClickListener() {
-- @Override
-- public void onClick(View v) {
-- startActivity(new Intent(OnboardingActivity.this, VPNEnableActivity.class));
-- startActivityForResult(new Intent(OnboardingActivity.this, AppManagerActivity.class), 9999);
--
-- }
-- });
-- addSlide(cs3);
--
-- }
--
-- // OPTIONAL METHODS
-- // Override bar/separator color.
-- setBarColor(getResources().getColor(R.color.dark_purple));
-- setSeparatorColor(getResources().getColor(R.color.panel_background_main));
--
-- // Hide Skip/Done button.
-- showSkipButton(false);
-- setProgressButtonEnabled(true);
-- }
--
-- @Override
-- public void onSkipPressed(Fragment currentFragment) {
-- super.onSkipPressed(currentFragment);
-- // Do something when users tap on Skip button.
-- }
--
-- @Override
-- public void onDonePressed(Fragment currentFragment) {
-- super.onDonePressed(currentFragment);
-- // Do something when users tap on Done button.
-- finish();
-- }
--
-- @Override
-- public void onSlideChanged(@Nullable Fragment oldFragment, @Nullable Fragment newFragment) {
-- super.onSlideChanged(oldFragment, newFragment);
-- // Do something when the slide changes.
-- }
--
--
-- @Override
-- protected void attachBaseContext(Context base) {
-- super.attachBaseContext(LocaleHelper.onAttach(base));
-- }
--
-- public static boolean isAppInstalled(PackageManager pm, String packageName) {
-- try {
-- pm.getPackageInfo(packageName, PackageManager.GET_ACTIVITIES);
-- return true;
-- } catch (PackageManager.NameNotFoundException e) {
-- return false;
-- }
-- }
--
-- public static Intent getInstallIntent(String packageName, Context context) {
-- final Intent intent = new Intent(Intent.ACTION_VIEW);
-- intent.setData(Uri.parse(MARKET_URI + packageName));
--
-- PackageManager pm = context.getPackageManager();
-- List<ResolveInfo> resInfos = pm.queryIntentActivities(intent, 0);
--
-- String foundPackageName = null;
-- for (ResolveInfo r : resInfos) {
-- Log.i("Install", "market: " + r.activityInfo.packageName);
-- if (TextUtils.equals(r.activityInfo.packageName, FDROID_PACKAGE_NAME)
-- || TextUtils.equals(r.activityInfo.packageName, PLAY_PACKAGE_NAME)) {
-- foundPackageName = r.activityInfo.packageName;
-- break;
-- }
-- }
--
-- if (foundPackageName == null) {
-- intent.setData(Uri.parse(FDROID_APP_URI + packageName));
-- } else {
-- intent.setPackage(foundPackageName);
-- }
-- return intent;
-- }
--
-- final static String MARKET_URI = "market://details?id=";
-- final static String FDROID_APP_URI = "https://f-droid.org/repository/browse/?fdid=";;
-- final static String PLAY_APP_URI = "https://play.google.com/store/apps/details?id=";;
-- final static String FDROID_URI = "https://f-droid.org/repository/browse/?fdfilter=info.guardianproject";;
-- final static String PLAY_URI = "https://play.google.com/store/apps/developer?id=The+Guardian+Project";;
--
-- private final static String FDROID_PACKAGE_NAME = "org.fdroid.fdroid";
-- private final static String PLAY_PACKAGE_NAME = "com.android.vending";
--}
-\ No newline at end of file
---
-2.17.1
-
diff --git a/projects/orbot/0004-Bug-28051-Rename-the-Hidden-Service-content-provider.patch b/projects/orbot/0004-Bug-28051-Rename-the-Hidden-Service-content-provider.patch
deleted file mode 100644
index c2cfb1b..0000000
--- a/projects/orbot/0004-Bug-28051-Rename-the-Hidden-Service-content-provider.patch
+++ /dev/null
@@ -1,308 +0,0 @@
-From b8ce28e8487772deaa9655245c3b43055e32937d Mon Sep 17 00:00:00 2001
-From: Matthew Finkel <Matthew.Finkel@xxxxxxxxx>
-Date: Sat, 24 Nov 2018 04:40:57 +0000
-Subject: [PATCH 04/13] Bug 28051 - Rename the Hidden Service content provider
-
----
- app/src/main/AndroidManifest.xml | 13 ++++++++-----
- .../org/torproject/android/OrbotMainActivity.java | 2 +-
- .../ui/hiddenservices/ClientCookiesActivity.java | 2 +-
- .../ui/hiddenservices/HiddenServicesActivity.java | 2 +-
- .../adapters/ClientCookiesAdapter.java | 2 +-
- .../hiddenservices/adapters/OnionListAdapter.java | 2 +-
- .../ui/hiddenservices/backup/BackupUtils.java | 4 ++--
- .../hiddenservices/dialogs/AddCookieDialog.java | 2 +-
- .../dialogs/CookieDeleteDialog.java | 2 +-
- .../ui/hiddenservices/dialogs/HSCookieDialog.java | 2 +-
- .../ui/hiddenservices/dialogs/HSDataDialog.java | 2 +-
- .../ui/hiddenservices/dialogs/HSDeleteDialog.java | 2 +-
- .../providers/CookieContentProvider.java | 4 ++--
- .../providers/HSContentProvider.java | 4 ++--
- app/src/minimalperm/AndroidManifest.xml | 15 +++++++++------
- .../torproject/android/service/TorService.java | 6 ++++--
- 16 files changed, 37 insertions(+), 29 deletions(-)
-
-diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
-index 2cd00888..3c6262c2 100644
---- a/app/src/main/AndroidManifest.xml
-+++ b/app/src/main/AndroidManifest.xml
-@@ -135,13 +135,15 @@
- android:value=".OrbotMainActivity" />
- </activity>
-
-+ <!-- Modify the Content Provider name so it doesn't collide with Orbot (when Orbot is installed, too).
-+ TBA fails while starting when this happens -->
- <provider
-- android:name=".ui.hiddenservices.providers.HSContentProvider"
-- android:authorities="org.torproject.android.ui.hiddenservices.providers"
-+ android:name="org.torproject.torbrowser.ui.hiddenservices.providers.HSContentProvider"
-+ android:authorities="org.torproject.torbrowser.ui.hiddenservices.providers"
- android:exported="false" />
- <provider
- android:name="android.support.v4.content.FileProvider"
-- android:authorities="org.torproject.android.ui.hiddenservices.storage"
-+ android:authorities="org.torproject.torbrowser.ui.hiddenservices.storage"
- android:exported="false"
- android:grantUriPermissions="true">
- <meta-data
-@@ -163,9 +165,10 @@
- <!--<activity android:name=".ui.onboarding.OnboardingActivity"/>-->
- <activity android:name=".ui.onboarding.BridgeWizardActivity"/>
-
-+ <!-- Modify the Content Provider name -->
- <provider
-- android:name=".ui.hiddenservices.providers.CookieContentProvider"
-- android:authorities="org.torproject.android.ui.hiddenservices.providers.cookie"
-+ android:name="org.torproject.torbrowser.ui.hiddenservices.providers.CookieContentProvider"
-+ android:authorities="org.torproject.torbrowser.ui.hiddenservices.providers.cookie"
- android:exported="false" />
- </application>
-
-diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
-index 7ad979ff..ff5dd120 100644
---- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
-+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
-@@ -33,7 +33,7 @@ import org.torproject.android.ui.hiddenservices.ClientCookiesActivity;
- import org.torproject.android.ui.hiddenservices.HiddenServicesActivity;
- import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
- import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
--import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
-+import org.torproject.torbrowser.ui.hiddenservices.providers.HSContentProvider;
- import org.torproject.android.vpn.VPNEnableActivity;
-
- import android.annotation.SuppressLint;
-diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java
-index e6939800..933915d0 100644
---- a/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java
-+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java
-@@ -31,7 +31,7 @@ import org.torproject.android.ui.hiddenservices.dialogs.AddCookieDialog;
- import org.torproject.android.ui.hiddenservices.dialogs.CookieActionsDialog;
- import org.torproject.android.ui.hiddenservices.dialogs.SelectCookieBackupDialog;
- import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
--import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
-+import org.torproject.torbrowser.ui.hiddenservices.providers.CookieContentProvider;
-
- public class ClientCookiesActivity extends AppCompatActivity {
- public final int WRITE_EXTERNAL_STORAGE_FROM_COOKIE_ACTIONBAR = 3;
-diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java
-index d7c1f313..3e2d9c3c 100644
---- a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java
-+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java
-@@ -28,7 +28,7 @@ import org.torproject.android.ui.hiddenservices.dialogs.HSActionsDialog;
- import org.torproject.android.ui.hiddenservices.dialogs.HSDataDialog;
- import org.torproject.android.ui.hiddenservices.dialogs.SelectHSBackupDialog;
- import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
--import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
-+import org.torproject.torbrowser.ui.hiddenservices.providers.HSContentProvider;
-
- public class HiddenServicesActivity extends AppCompatActivity {
- public final int WRITE_EXTERNAL_STORAGE_FROM_ACTIONBAR = 1;
-diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/ClientCookiesAdapter.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/ClientCookiesAdapter.java
-index bbc317a6..670c108a 100644
---- a/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/ClientCookiesAdapter.java
-+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/ClientCookiesAdapter.java
-@@ -14,7 +14,7 @@ import android.widget.TextView;
- import android.widget.Toast;
-
- import org.torproject.android.R;
--import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
-+import org.torproject.torbrowser.ui.hiddenservices.providers.CookieContentProvider;
-
- public class ClientCookiesAdapter extends CursorAdapter {
- private LayoutInflater cursorInflater;
-diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/OnionListAdapter.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/OnionListAdapter.java
-index 9824c773..0079bce3 100644
---- a/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/OnionListAdapter.java
-+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/OnionListAdapter.java
-@@ -14,7 +14,7 @@ import android.widget.TextView;
- import android.widget.Toast;
-
- import org.torproject.android.R;
--import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
-+import org.torproject.torbrowser.ui.hiddenservices.providers.HSContentProvider;
-
- public class OnionListAdapter extends CursorAdapter {
- private LayoutInflater cursorInflater;
-diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java
-index a4790dd8..06606039 100644
---- a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java
-+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java
-@@ -12,8 +12,8 @@ import org.json.JSONException;
- import org.json.JSONObject;
- import org.torproject.android.R;
- import org.torproject.android.service.TorServiceConstants;
--import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
--import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
-+import org.torproject.torbrowser.ui.hiddenservices.providers.CookieContentProvider;
-+import org.torproject.torbrowser.ui.hiddenservices.providers.HSContentProvider;
- import org.torproject.android.ui.hiddenservices.storage.ExternalStorage;
-
- import java.io.File;
-diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java
-index 75663648..d6e280db 100644
---- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java
-+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java
-@@ -14,7 +14,7 @@ import android.widget.EditText;
- import android.widget.Toast;
-
- import org.torproject.android.R;
--import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
-+import org.torproject.torbrowser.ui.hiddenservices.providers.CookieContentProvider;
-
- public class AddCookieDialog extends DialogFragment {
-
-diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieDeleteDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieDeleteDialog.java
-index 60c4d8e3..fc183981 100644
---- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieDeleteDialog.java
-+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieDeleteDialog.java
-@@ -10,7 +10,7 @@ import android.support.v4.app.DialogFragment;
- import android.support.v7.app.AlertDialog;
-
- import org.torproject.android.R;
--import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
-+import org.torproject.torbrowser.ui.hiddenservices.providers.CookieContentProvider;
-
- public class CookieDeleteDialog extends DialogFragment {
-
-diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSCookieDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSCookieDialog.java
-index 39c1b510..0ae7dae5 100644
---- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSCookieDialog.java
-+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSCookieDialog.java
-@@ -18,7 +18,7 @@ import com.google.zxing.integration.android.IntentIntegrator;
- import org.json.JSONException;
- import org.json.JSONObject;
- import org.torproject.android.R;
--import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
-+import org.torproject.torbrowser.ui.hiddenservices.providers.CookieContentProvider;
-
- public class HSCookieDialog extends DialogFragment {
-
-diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java
-index 98255604..bc1754b9 100644
---- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java
-+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java
-@@ -15,7 +15,7 @@ import android.widget.EditText;
- import android.widget.Toast;
-
- import org.torproject.android.R;
--import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
-+import org.torproject.torbrowser.ui.hiddenservices.providers.HSContentProvider;
-
- public class HSDataDialog extends DialogFragment {
-
-diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java
-index ac5df743..0a60f22b 100644
---- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java
-+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java
-@@ -11,7 +11,7 @@ import android.support.v7.app.AlertDialog;
-
- import org.torproject.android.R;
- import org.torproject.android.service.TorServiceConstants;
--import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
-+import org.torproject.torbrowser.ui.hiddenservices.providers.HSContentProvider;
-
- import java.io.File;
-
-diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/CookieContentProvider.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/CookieContentProvider.java
-index f420a6d8..4a371933 100644
---- a/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/CookieContentProvider.java
-+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/CookieContentProvider.java
-@@ -1,4 +1,4 @@
--package org.torproject.android.ui.hiddenservices.providers;
-+package org.torproject.torbrowser.ui.hiddenservices.providers;
-
- import android.content.ContentProvider;
- import android.content.ContentUris;
-@@ -22,7 +22,7 @@ public class CookieContentProvider extends ContentProvider {
- ClientCookie.AUTH_COOKIE_VALUE,
- ClientCookie.ENABLED
- };
-- private static final String AUTH = "org.torproject.android.ui.hiddenservices.providers.cookie";
-+ private static final String AUTH = "org.torproject.torbrowser.ui.hiddenservices.providers.cookie";
- public static final Uri CONTENT_URI =
- Uri.parse("content://" + AUTH + "/cookie");
- //UriMatcher
-diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java
-index d7b558fd..be7d2de2 100644
---- a/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java
-+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java
-@@ -1,4 +1,4 @@
--package org.torproject.android.ui.hiddenservices.providers;
-+package org.torproject.torbrowser.ui.hiddenservices.providers;
-
- import android.content.ContentProvider;
- import android.content.ContentUris;
-@@ -27,7 +27,7 @@ public class HSContentProvider extends ContentProvider {
- HiddenService.CREATED_BY_USER,
- HiddenService.ENABLED
- };
-- private static final String AUTH = "org.torproject.android.ui.hiddenservices.providers";
-+ private static final String AUTH = "org.torproject.torbrowser.ui.hiddenservices.providers";
- public static final Uri CONTENT_URI =
- Uri.parse("content://" + AUTH + "/hs");
- //UriMatcher
-diff --git a/app/src/minimalperm/AndroidManifest.xml b/app/src/minimalperm/AndroidManifest.xml
-index adf74209..fedadd9b 100644
---- a/app/src/minimalperm/AndroidManifest.xml
-+++ b/app/src/minimalperm/AndroidManifest.xml
-@@ -122,8 +122,10 @@
- </intent-filter>
- </receiver>
-
-+ <!-- Modify the Content Provider name so it doesn't collide with Orbot (when Orbot is installed, too).
-+ TBA fails while starting when this happens -->
- <activity
-- android:name=".ui.hiddenservices.HiddenServicesActivity"
-+ android:name="org.torproject.torbrowser.ui.hiddenservices.HiddenServicesActivity"
- android:label="@string/title_activity_hidden_services"
- android:theme="@style/DefaultTheme">
- <meta-data
-@@ -132,12 +134,12 @@
- </activity>
-
- <provider
-- android:name=".ui.hiddenservices.providers.HSContentProvider"
-- android:authorities="org.torproject.android.ui.hiddenservices.providers"
-+ android:name="org.torproject.torbrowser.ui.hiddenservices.providers.HSContentProvider"
-+ android:authorities="org.torproject.torbrowser.ui.hiddenservices.providers"
- android:exported="false" />
- <provider
- android:name="android.support.v4.content.FileProvider"
-- android:authorities="org.torproject.android.ui.hiddenservices.storage"
-+ android:authorities="org.torproject.torbrowser.ui.hiddenservices.storage"
- android:exported="false"
- android:grantUriPermissions="true">
- <meta-data
-@@ -154,9 +156,10 @@
- android:value=".OrbotMainActivity" />
- </activity>
-
-+ <!-- Modify the Content Provider name -->
- <provider
-- android:name=".ui.hiddenservices.providers.CookieContentProvider"
-- android:authorities="org.torproject.android.ui.hiddenservices.providers.cookie"
-+ android:name="org.torproject.torbrowser.ui.hiddenservices.providers.CookieContentProvider"
-+ android:authorities="org.torproject.torbrowser.ui.hiddenservices.providers.cookie"
- android:exported="false" />
- </application>
-
-diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
-index fec88b1f..edd0e3d5 100644
---- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java
-+++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
-@@ -138,8 +138,10 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
-
- private ArrayList<Bridge> alBridges = null;
-
-- private static final Uri HS_CONTENT_URI = Uri.parse("content://org.torproject.android.ui.hiddenservices.providers/hs");
-- private static final Uri COOKIE_CONTENT_URI = Uri.parse("content://org.torproject.android.ui.hiddenservices.providers.cookie/cookie");
-+ // Modify the Content Provider name so it doesn't collide with Orbot (when Orbot is installed, too).
-+ // TBA fails while starting when this happens
-+ private static final Uri HS_CONTENT_URI = Uri.parse("content://org.torproject.torbrowser.ui.hiddenservices.providers/hs");
-+ private static final Uri COOKIE_CONTENT_URI = Uri.parse("content://org.torproject.torbrowser.ui.hiddenservices.providers.cookie/cookie");
-
- public static final class HiddenService implements BaseColumns {
- public static final String NAME = "name";
---
-2.17.1
-
diff --git a/projects/orbot/0005-Bug-28051-Cast-the-layout-elements.patch b/projects/orbot/0005-Bug-28051-Cast-the-layout-elements.patch
deleted file mode 100644
index 13aeeec..0000000
--- a/projects/orbot/0005-Bug-28051-Cast-the-layout-elements.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From f05130d2184702b5005ecabe5363225459f7df74 Mon Sep 17 00:00:00 2001
-From: Matthew Finkel <Matthew.Finkel@xxxxxxxxx>
-Date: Sat, 24 Nov 2018 04:44:03 +0000
-Subject: [PATCH 05/13] Bug 28051 - Cast the layout elements
-
-This is now required since we are using an older Android support library -
-23.4.0 instead of 27.1.1. The exact reason for this is not known.
----
- .../torproject/android/ui/AppManagerActivity.java | 4 ++--
- .../android/ui/onboarding/BridgeWizardActivity.java | 12 ++++++------
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
-index 2f60a40c..5bdcd504 100644
---- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
-+++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
-@@ -58,8 +58,8 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList
- this.setContentView(R.layout.layout_apps);
- setTitle(R.string.apps_mode);
- getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-- listApps = findViewById(R.id.applistview);
-- progressBar = findViewById(R.id.progressBar);
-+ listApps = (GridView) findViewById(R.id.applistview);
-+ progressBar = (ProgressBar) findViewById(R.id.progressBar);
- }
-
- /*
-diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
-index e03a8d2d..e047e58f 100644
---- a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
-+++ b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
-@@ -34,16 +34,16 @@ public class BridgeWizardActivity extends AppCompatActivity {
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_bridge_wizard);
-- Toolbar toolbar = findViewById(R.id.toolbar);
-+ Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
- setSupportActionBar(toolbar);
- getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-- tvStatus = findViewById(R.id.lbl_bridge_test_status);
-+ tvStatus = (TextView) findViewById(R.id.lbl_bridge_test_status);
- tvStatus.setVisibility(View.GONE);
-
- setTitle(getString(R.string.bridges));
-
-- RadioButton btnDirect = findViewById(R.id.btnBridgesDirect);
-+ RadioButton btnDirect = (RadioButton) findViewById(R.id.btnBridgesDirect);
- btnDirect.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
-@@ -53,7 +53,7 @@ public class BridgeWizardActivity extends AppCompatActivity {
- }
- });
-
-- RadioButton btnObfs4 = findViewById(R.id.btnBridgesObfs4);
-+ RadioButton btnObfs4 = (RadioButton) findViewById(R.id.btnBridgesObfs4);
- btnObfs4.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
-@@ -64,7 +64,7 @@ public class BridgeWizardActivity extends AppCompatActivity {
- });
-
-
-- RadioButton btnMeek = findViewById(R.id.btnBridgesMeek);
-+ RadioButton btnMeek = (RadioButton) findViewById(R.id.btnBridgesMeek);
- btnMeek.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
-@@ -75,7 +75,7 @@ public class BridgeWizardActivity extends AppCompatActivity {
- });
-
-
-- RadioButton btnNew = findViewById(R.id.btnBridgesNew);
-+ RadioButton btnNew = (RadioButton) findViewById(R.id.btnBridgesNew);
- btnNew.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
---
-2.17.1
-
diff --git a/projects/orbot/0006-Bug-28051-Don-t-use-Orbot-s-LocaleHelper-for-locale-.patch b/projects/orbot/0006-Bug-28051-Don-t-use-Orbot-s-LocaleHelper-for-locale-.patch
deleted file mode 100644
index cfd5a1c..0000000
--- a/projects/orbot/0006-Bug-28051-Don-t-use-Orbot-s-LocaleHelper-for-locale-.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 4b33256dc2f3f626cca70880069a94074e312132 Mon Sep 17 00:00:00 2001
-From: Matthew Finkel <Matthew.Finkel@xxxxxxxxx>
-Date: Sat, 24 Nov 2018 04:46:49 +0000
-Subject: [PATCH 06/13] Bug 28051 - Don't use Orbot's LocaleHelper for locale
- selection
-
----
- .../main/java/org/torproject/android/OrbotMainActivity.java | 6 ------
- .../torproject/android/settings/SettingsPreferences.java | 5 -----
- .../android/ui/hiddenservices/ClientCookiesActivity.java | 6 ------
- .../android/ui/hiddenservices/HiddenServicesActivity.java | 6 ------
- .../android/ui/onboarding/BridgeWizardActivity.java | 6 ------
- 5 files changed, 29 deletions(-)
-
-diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
-index ff5dd120..044b957f 100644
---- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
-+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
-@@ -24,7 +24,6 @@ import org.torproject.android.service.TorService;
- import org.torproject.android.service.TorServiceConstants;
- import org.torproject.android.service.util.TorServiceUtils;
- import org.torproject.android.settings.Languages;
--import org.torproject.android.settings.LocaleHelper;
- import org.torproject.android.settings.SettingsPreferences;
- import org.torproject.android.ui.AppManagerActivity;
- import org.torproject.android.ui.Rotate3dAnimation;
-@@ -427,11 +426,6 @@ public class OrbotMainActivity extends AppCompatActivity
- }
- }
-
-- @Override
-- protected void attachBaseContext(Context base) {
-- super.attachBaseContext(LocaleHelper.onAttach(base));
-- }
--
- /*
- * Create the UI Options Menu (non-Javadoc)
- * @see android.app.Activity#onCreateOptionsMenu(android.view.Menu)
-diff --git a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
-index c3b5189d..df85a9f6 100644
---- a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
-+++ b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
-@@ -47,11 +47,6 @@ public class SettingsPreferences
- });
- }
-
-- @Override
-- protected void attachBaseContext(Context base) {
-- super.attachBaseContext(LocaleHelper.onAttach(base));
-- }
--
- @Override
- protected void onPause() {
- //Language.setFromPreference(this, "pref_default_locale", true);
-diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java
-index 933915d0..dd3a54e0 100644
---- a/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java
-+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java
-@@ -25,7 +25,6 @@ import com.google.zxing.integration.android.IntentResult;
- import org.json.JSONException;
- import org.json.JSONObject;
- import org.torproject.android.R;
--import org.torproject.android.settings.LocaleHelper;
- import org.torproject.android.ui.hiddenservices.adapters.ClientCookiesAdapter;
- import org.torproject.android.ui.hiddenservices.dialogs.AddCookieDialog;
- import org.torproject.android.ui.hiddenservices.dialogs.CookieActionsDialog;
-@@ -103,11 +102,6 @@ public class ClientCookiesActivity extends AppCompatActivity {
- }
-
-
-- @Override
-- protected void attachBaseContext(Context base) {
-- super.attachBaseContext(LocaleHelper.onAttach(base));
-- }
--
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- getMenuInflater().inflate(R.menu.cookie_menu, menu);
-diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java
-index 3e2d9c3c..75aefd14 100644
---- a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java
-+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java
-@@ -22,7 +22,6 @@ import android.widget.Spinner;
- import android.widget.Toast;
-
- import org.torproject.android.R;
--import org.torproject.android.settings.LocaleHelper;
- import org.torproject.android.ui.hiddenservices.adapters.OnionListAdapter;
- import org.torproject.android.ui.hiddenservices.dialogs.HSActionsDialog;
- import org.torproject.android.ui.hiddenservices.dialogs.HSDataDialog;
-@@ -108,11 +107,6 @@ public class HiddenServicesActivity extends AppCompatActivity {
- }
-
-
-- @Override
-- protected void attachBaseContext(Context base) {
-- super.attachBaseContext(LocaleHelper.onAttach(base));
-- }
--
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- getMenuInflater().inflate(R.menu.hs_menu, menu);
-diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
-index e047e58f..47778a32 100644
---- a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
-+++ b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
-@@ -19,7 +19,6 @@ import android.widget.TextView;
- import org.torproject.android.R;
- import org.torproject.android.service.OrbotConstants;
- import org.torproject.android.service.util.Prefs;
--import org.torproject.android.settings.LocaleHelper;
-
- import java.io.IOException;
- import java.net.InetSocketAddress;
-@@ -92,11 +91,6 @@ public class BridgeWizardActivity extends AppCompatActivity {
-
- }
-
-- @Override
-- protected void attachBaseContext(Context base) {
-- super.attachBaseContext(LocaleHelper.onAttach(base));
-- }
--
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- if (item.getItemId() == android.R.id.home) {
---
-2.17.1
-
diff --git a/projects/orbot/0007-Bug-28051-Rename-Orbot-s-preferences-so-they-don-t-c.patch b/projects/orbot/0007-Bug-28051-Rename-Orbot-s-preferences-so-they-don-t-c.patch
deleted file mode 100644
index 97dbc48..0000000
--- a/projects/orbot/0007-Bug-28051-Rename-Orbot-s-preferences-so-they-don-t-c.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From a700bbe8356b4ab0a56460018e82cff1ded66c0b Mon Sep 17 00:00:00 2001
-From: Matthew Finkel <Matthew.Finkel@xxxxxxxxx>
-Date: Sat, 24 Nov 2018 04:48:27 +0000
-Subject: [PATCH 07/13] Bug 28051 - Rename Orbot's preferences so they don't
- conflict with Fennec's
-
----
- .../org/torproject/android/settings/SettingsPreferences.java | 3 ++-
- .../main/res/xml-fa/{preferences.xml => orbot_preferences.xml} | 0
- .../main/res/xml/{preferences.xml => orbot_preferences.xml} | 0
- docs/WALKTHROUGH | 2 +-
- 4 files changed, 3 insertions(+), 2 deletions(-)
- rename app/src/main/res/xml-fa/{preferences.xml => orbot_preferences.xml} (100%)
- rename app/src/main/res/xml/{preferences.xml => orbot_preferences.xml} (100%)
-
-diff --git a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
-index df85a9f6..0e7edcd8 100644
---- a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
-+++ b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
-@@ -24,7 +24,8 @@ public class SettingsPreferences
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
-- addPreferencesFromResource(R.xml.preferences);
-+ // Rename preferences so it doesn't conflict with Fennec
-+ addPreferencesFromResource(R.xml.orbot_preferences);
- getPreferenceManager().setSharedPreferencesMode(Context.MODE_MULTI_PROCESS);
-
- prefLocale = (ListPreference) findPreference("pref_default_locale");
-diff --git a/app/src/main/res/xml-fa/preferences.xml b/app/src/main/res/xml-fa/orbot_preferences.xml
-similarity index 100%
-rename from app/src/main/res/xml-fa/preferences.xml
-rename to app/src/main/res/xml-fa/orbot_preferences.xml
-diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/orbot_preferences.xml
-similarity index 100%
-rename from app/src/main/res/xml/preferences.xml
-rename to app/src/main/res/xml/orbot_preferences.xml
-diff --git a/docs/WALKTHROUGH b/docs/WALKTHROUGH
-index 55a356b5..8e432b04 100644
---- a/docs/WALKTHROUGH
-+++ b/docs/WALKTHROUGH
-@@ -30,7 +30,7 @@
- //for this type of non-time critical function you just want to happen in the background at some point soon-ish
-
- â??â??â?? SettingsPreferences.java
-- // Settings activity that loads the res/xml/preferences.xml resource up
-+ // Settings activity that loads the res/xml/orbot_preferences.xml resource up
- // has some custom event handlng, onActivityResult callback result code's as well
- // basically meant to tell Orbot activity if critical settings have been modified and whether
- // those new settings should be applied (like iptables/transproxy changes)
---
-2.17.1
-
diff --git a/projects/orbot/0008-Bug-28051-Make-TorService-compatible-with-the-suppor.patch b/projects/orbot/0008-Bug-28051-Make-TorService-compatible-with-the-suppor.patch
deleted file mode 100644
index 720fc90..0000000
--- a/projects/orbot/0008-Bug-28051-Make-TorService-compatible-with-the-suppor.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From a99a14cefc17e50dc2eafb0c99760dd8e09aaabd Mon Sep 17 00:00:00 2001
-From: Matthew Finkel <Matthew.Finkel@xxxxxxxxx>
-Date: Sat, 24 Nov 2018 04:49:59 +0000
-Subject: [PATCH 08/13] Bug 28051 - Make TorService compatible with the support
- libraries
-
----
- .../org/torproject/android/service/TorService.java | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
-index edd0e3d5..a12a97bd 100644
---- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java
-+++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
-@@ -35,7 +35,10 @@ import android.os.Build;
- import android.os.IBinder;
- import android.os.RemoteException;
- import android.provider.BaseColumns;
--import android.support.annotation.RequiresApi;
-+// Not available in 23.4.0
-+// https://developer.android.com/reference/android/support/annotation/RequiresApi
-+//import android.support.annotation.RequiresApi;
-+import android.annotation.TargetApi;
- import android.support.v4.app.NotificationCompat;
- import android.support.v4.content.LocalBroadcastManager;
- import android.text.TextUtils;
-@@ -250,7 +253,10 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
-
- private final static String NOTIFICATION_CHANNEL_ID = "orbot_channel_1";
-
-- @RequiresApi(api = Build.VERSION_CODES.O)
-+ // Use TargetApi until we use a support library version that adds the
-+ // RequriesApi annotation
-+ //@RequiresApi(api = Build.VERSION_CODES.O)
-+ @TargetApi(value = Build.VERSION_CODES.O)
- private void createNotificationChannel ()
- {
- NotificationManager mNotificationManager =
-@@ -300,7 +306,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
-
- mNotifyBuilder.setCategory(Notification.CATEGORY_SERVICE);
-
-- mNotifyBuilder.setChannelId(NOTIFICATION_CHANNEL_ID);
-
-
- Intent intentRefresh = new Intent();
---
-2.17.1
-
diff --git a/projects/orbot/0009-Bug-28051-Change-Orbot-s-behavior-for-Tor-Browser.patch b/projects/orbot/0009-Bug-28051-Change-Orbot-s-behavior-for-Tor-Browser.patch
deleted file mode 100644
index c46304f..0000000
--- a/projects/orbot/0009-Bug-28051-Change-Orbot-s-behavior-for-Tor-Browser.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From e9d07a68a445b644106780a4759cf41657762c91 Mon Sep 17 00:00:00 2001
-From: Matthew Finkel <Matthew.Finkel@xxxxxxxxx>
-Date: Sat, 24 Nov 2018 04:52:26 +0000
-Subject: [PATCH 09/13] Bug 28051 - Change Orbot's behavior for Tor Browser
-
----
- .../torproject/android/OrbotMainActivity.java | 10 +++++++++-
- app/src/main/res/menu/orbot_main.xml | 2 +-
- .../torproject/android/service/TorService.java | 17 ++++++++++++-----
- .../android/service/TorServiceConstants.java | 11 ++++++-----
- 4 files changed, 28 insertions(+), 12 deletions(-)
-
-diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
-index 044b957f..e011817e 100644
---- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
-+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
-@@ -552,7 +552,9 @@ public class OrbotMainActivity extends AppCompatActivity
- * still exists
- **/
- private void doExit() {
-- stopTor();
-+ // Don't stop Tor when we exit Orbot. Let Fennec take care of
-+ // that when we really exit the app.
-+ //stopTor();
-
- // Kill all the wizard activities
- setResult(RESULT_CLOSE_ALL);
-@@ -1122,6 +1124,11 @@ public class OrbotMainActivity extends AppCompatActivity
-
- mTxtOrbotLog.append(torServiceMsg + '\n');
-
-+ // Return to the browser when we reach 100% bootstrapped
-+ if (torServiceMsg.contains(TorServiceConstants.TOR_CONTROL_PORT_MSG_BOOTSTRAP_DONE)) {
-+ finish();
-+ }
-+
- }
-
- if (torStatus == null || newTorStatus.equals(torStatus)) {
-@@ -1384,6 +1391,7 @@ public class OrbotMainActivity extends AppCompatActivity
- iv.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
-+ // This should never be false, because we are the browser now.
- if (!appInstalledOrNot(TorServiceConstants.BROWSER_APP_USERNAME))
- promptInstallOrfox();
- else
-diff --git a/app/src/main/res/menu/orbot_main.xml b/app/src/main/res/menu/orbot_main.xml
-index cb25b9e0..1231da8e 100644
---- a/app/src/main/res/menu/orbot_main.xml
-+++ b/app/src/main/res/menu/orbot_main.xml
-@@ -87,7 +87,7 @@
- />
-
- <item android:id="@+id/menu_exit"
-- android:title="@string/menu_exit"
-+ android:title="@string/button_close"
- android:icon="@drawable/ic_menu_exit"
- yourapp:showAsAction="never"
-
-diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
-index a12a97bd..189ee6ab 100644
---- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java
-+++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
-@@ -285,6 +285,10 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
- //Reusable code.
- PackageManager pm = getPackageManager();
- Intent intent = pm.getLaunchIntentForPackage(getPackageName());
-+ // Add these so Fennec's LauncherActivity can correctly route the request
-+ // to Orbot when the user taps the Notification
-+ intent.setAction(TorServiceConstants.TOR_APP_USERNAME);
-+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0);
-
- if (mNotifyBuilder == null)
-@@ -413,9 +417,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
- @Override
- public void onTaskRemoved(Intent rootIntent){
- Log.d(OrbotConstants.TAG,"task removed");
-- Intent intent = new Intent( this, DummyActivity.class );
-- intent.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK );
-- startActivity( intent );
-+ // Don't prevent being killed. If the user swiped away the
-+ // app, then we should die.
-+ stopTor();
- }
-
- @Override
-@@ -656,12 +660,14 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
- }
-
- extraLines.append("SOCKSPort ").append(socksPortPref).append(isolate).append('\n');
-- extraLines.append("SafeSocks 0").append('\n');
-+ // We don't want this disabled.
-+ //extraLines.append("SafeSocks 0").append('\n');
- extraLines.append("TestSocks 0").append('\n');
- if (Prefs.openProxyOnAllInterfaces())
- extraLines.append("SocksListenAddress 0.0.0.0").append('\n');
-
-- extraLines.append("HTTPTunnelPort ").append(mPortHTTP).append(isolate).append('\n');
-+ // We don't want/need this either
-+ //extraLines.append("HTTPTunnelPort ").append(mPortHTTP).append(isolate).append('\n');
-
-
- if(prefs.getBoolean(OrbotConstants.PREF_CONNECTION_PADDING, false))
-@@ -869,6 +875,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
-
- String torCmdString = fileTor.getCanonicalPath()
- + " DataDirectory " + appCacheHome.getCanonicalPath()
-+ + " SocksPort " + TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT
- + " --defaults-torrc " + torrcPath
- + " -f " + torrcPath + ".custom";
-
-diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java
-index 4b62a6a8..44743156 100644
---- a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java
-+++ b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java
-@@ -8,7 +8,7 @@ import android.content.Intent;
- public interface TorServiceConstants {
-
- String TOR_APP_USERNAME = "org.torproject.android";
-- String BROWSER_APP_USERNAME = "info.guardianproject.orfox";
-+ String BROWSER_APP_USERNAME = "org.torproject.torbrowser_alpha";
-
- String DIRECTORY_TOR_BINARY = "bin";
- String DIRECTORY_TOR_DATA = "data";
-@@ -52,15 +52,16 @@ public interface TorServiceConstants {
-
- String IP_LOCALHOST = "127.0.0.1";
- int UPDATE_TIMEOUT = 1000;
-- int TOR_TRANSPROXY_PORT_DEFAULT = 9040;
-+ int TOR_TRANSPROXY_PORT_DEFAULT = 9140;
-
- int STANDARD_DNS_PORT = 53;
- int TOR_DNS_PORT_DEFAULT = 5400;
- String TOR_VPN_DNS_LISTEN_ADDRESS = "127.0.0.1";
-
-- int CONTROL_PORT_DEFAULT = 9051;
-- int HTTP_PROXY_PORT_DEFAULT = 8118; // like Privoxy!
-- int SOCKS_PROXY_PORT_DEFAULT = 9050;
-+ // Not used, but we'll change this for consistency
-+ int CONTROL_PORT_DEFAULT = 9151;
-+ int HTTP_PROXY_PORT_DEFAULT = 8218; // like Privoxy!
-+ int SOCKS_PROXY_PORT_DEFAULT = 9150;
-
-
- //path to check Tor against
---
-2.17.1
-
diff --git a/projects/orbot/0010-Bug-28051-Rename-Orbot-as-Tor-Browser.patch b/projects/orbot/0010-Bug-28051-Rename-Orbot-as-Tor-Browser.patch
deleted file mode 100644
index c65e7da..0000000
--- a/projects/orbot/0010-Bug-28051-Rename-Orbot-as-Tor-Browser.patch
+++ /dev/null
@@ -1,1532 +0,0 @@
-From d8e44193ca75fe1317b2fdd178fa26657bb50422 Mon Sep 17 00:00:00 2001
-From: Matthew Finkel <Matthew.Finkel@xxxxxxxxx>
-Date: Sat, 24 Nov 2018 04:55:12 +0000
-Subject: [PATCH 10/13] Bug 28051 - Rename Orbot as Tor Browser
-
----
- app/src/main/res/values-ay/strings.xml | 2 +-
- app/src/main/res/values-az/strings.xml | 2 +-
- app/src/main/res/values-ca/strings.xml | 2 +-
- app/src/main/res/values-cs-rCZ/strings.xml | 2 +-
- app/src/main/res/values-cs/strings.xml | 2 +-
- app/src/main/res/values-cy/strings.xml | 2 +-
- app/src/main/res/values-da/strings.xml | 2 +-
- app/src/main/res/values-de/strings.xml | 2 +-
- app/src/main/res/values-el/strings.xml | 2 +-
- app/src/main/res/values-en-rGB/strings.xml | 2 +-
- app/src/main/res/values-eo/strings.xml | 2 +-
- app/src/main/res/values-es-rAR/strings.xml | 2 +-
- app/src/main/res/values-es/strings.xml | 2 +-
- app/src/main/res/values-et/strings.xml | 2 +-
- app/src/main/res/values-eu/strings.xml | 2 +-
- app/src/main/res/values-fi/strings.xml | 2 +-
- app/src/main/res/values-fr-rFR/strings.xml | 2 +-
- app/src/main/res/values-fr/strings.xml | 2 +-
- app/src/main/res/values-gl/strings.xml | 2 +-
- app/src/main/res/values-he/strings.xml | 2 +-
- app/src/main/res/values-hr/strings.xml | 2 +-
- app/src/main/res/values-hu/strings.xml | 2 +-
- app/src/main/res/values-hy-rAM/strings.xml | 2 +-
- app/src/main/res/values-id/strings.xml | 2 +-
- app/src/main/res/values-in-rID/strings.xml | 2 +-
- app/src/main/res/values-in/strings.xml | 2 +-
- app/src/main/res/values-is/strings.xml | 2 +-
- app/src/main/res/values-it/strings.xml | 2 +-
- app/src/main/res/values-iw/strings.xml | 2 +-
- app/src/main/res/values-ja/strings.xml | 2 +-
- app/src/main/res/values-ko/strings.xml | 2 +-
- app/src/main/res/values-lt/strings.xml | 2 +-
- app/src/main/res/values-lv/strings.xml | 2 +-
- app/src/main/res/values-mk/strings.xml | 2 +-
- app/src/main/res/values-mr-rIN/strings.xml | 2 +-
- app/src/main/res/values-ms-rMY/strings.xml | 2 +-
- app/src/main/res/values-ms/strings.xml | 2 +-
- app/src/main/res/values-nb/strings.xml | 2 +-
- app/src/main/res/values-nl/strings.xml | 2 +-
- app/src/main/res/values-pl/strings.xml | 2 +-
- app/src/main/res/values-pt-rBR/strings.xml | 2 +-
- app/src/main/res/values-pt-rPT/strings.xml | 2 +-
- app/src/main/res/values-pt/strings.xml | 2 +-
- app/src/main/res/values-ro/strings.xml | 2 +-
- app/src/main/res/values-rs-rAR/strings.xml | 2 +-
- app/src/main/res/values-ru/strings.xml | 2 +-
- app/src/main/res/values-si-rLK/strings.xml | 2 +-
- app/src/main/res/values-sk/strings.xml | 2 +-
- app/src/main/res/values-sl/strings.xml | 2 +-
- app/src/main/res/values-sn/strings.xml | 2 +-
- app/src/main/res/values-sq/strings.xml | 2 +-
- app/src/main/res/values-sv/strings.xml | 2 +-
- app/src/main/res/values-th/strings.xml | 2 +-
- app/src/main/res/values-tl/strings.xml | 2 +-
- app/src/main/res/values-tr/strings.xml | 2 +-
- app/src/main/res/values-uk/strings.xml | 2 +-
- app/src/main/res/values-uz/strings.xml | 2 +-
- app/src/main/res/values-vi/strings.xml | 2 +-
- app/src/main/res/values-zh-rCN/strings.xml | 2 +-
- app/src/main/res/values-zh-rTW/strings.xml | 2 +-
- app/src/main/res/values/strings.xml | 2 +-
- orbotservice/src/main/res/values-az/strings.xml | 2 +-
- orbotservice/src/main/res/values-ca/strings.xml | 2 +-
- orbotservice/src/main/res/values-cs-rCZ/strings.xml | 2 +-
- 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 | 2 +-
- orbotservice/src/main/res/values-de/strings.xml | 2 +-
- orbotservice/src/main/res/values-el/strings.xml | 2 +-
- orbotservice/src/main/res/values-eo/strings.xml | 2 +-
- orbotservice/src/main/res/values-es-rAR/strings.xml | 2 +-
- orbotservice/src/main/res/values-es/strings.xml | 2 +-
- orbotservice/src/main/res/values-et/strings.xml | 2 +-
- orbotservice/src/main/res/values-eu/strings.xml | 2 +-
- orbotservice/src/main/res/values-fi/strings.xml | 2 +-
- orbotservice/src/main/res/values-fr-rFR/strings.xml | 2 +-
- 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 | 2 +-
- orbotservice/src/main/res/values-hi/strings.xml | 2 +-
- orbotservice/src/main/res/values-hr/strings.xml | 2 +-
- orbotservice/src/main/res/values-hu/strings.xml | 2 +-
- orbotservice/src/main/res/values-id/strings.xml | 2 +-
- orbotservice/src/main/res/values-in-rID/strings.xml | 2 +-
- orbotservice/src/main/res/values-in/strings.xml | 2 +-
- orbotservice/src/main/res/values-is/strings.xml | 2 +-
- orbotservice/src/main/res/values-it/strings.xml | 2 +-
- orbotservice/src/main/res/values-iw/strings.xml | 2 +-
- orbotservice/src/main/res/values-ja/strings.xml | 2 +-
- orbotservice/src/main/res/values-ko/strings.xml | 2 +-
- orbotservice/src/main/res/values-lv/strings.xml | 2 +-
- orbotservice/src/main/res/values-mk/strings.xml | 2 +-
- orbotservice/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 | 2 +-
- orbotservice/src/main/res/values-nl/strings.xml | 2 +-
- orbotservice/src/main/res/values-pl/strings.xml | 2 +-
- orbotservice/src/main/res/values-pt-rBR/strings.xml | 2 +-
- orbotservice/src/main/res/values-pt-rPT/strings.xml | 2 +-
- orbotservice/src/main/res/values-pt/strings.xml | 2 +-
- orbotservice/src/main/res/values-ro/strings.xml | 2 +-
- orbotservice/src/main/res/values-rs-rAR/strings.xml | 2 +-
- orbotservice/src/main/res/values-ru/strings.xml | 2 +-
- orbotservice/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-sn/strings.xml | 2 +-
- orbotservice/src/main/res/values-sv/strings.xml | 2 +-
- orbotservice/src/main/res/values-th/strings.xml | 2 +-
- orbotservice/src/main/res/values-tl/strings.xml | 2 +-
- orbotservice/src/main/res/values-tr/strings.xml | 2 +-
- orbotservice/src/main/res/values-uk/strings.xml | 2 +-
- orbotservice/src/main/res/values-uz/strings.xml | 2 +-
- orbotservice/src/main/res/values-vi/strings.xml | 2 +-
- orbotservice/src/main/res/values-zh-rCN/strings.xml | 2 +-
- orbotservice/src/main/res/values-zh-rTW/strings.xml | 2 +-
- orbotservice/src/main/res/values/strings.xml | 2 +-
- 117 files changed, 117 insertions(+), 117 deletions(-)
-
-diff --git a/app/src/main/res/values-ay/strings.xml b/app/src/main/res/values-ay/strings.xml
-index 12256d87..c61d039d 100644
---- a/app/src/main/res/values-ay/strings.xml
-+++ b/app/src/main/res/values-ay/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot </string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbotax proxyn mä wakichawipawa, llikatuq jan lunthatayasiñatakiw yaqha wakichawinakampachar yanapi. Orbotax Toratuqiw uraqpachan luratanak jañ uñjayasiñatak atamirinaktuq jark\'aqi. Torax Software Libre ukhamawa, ukampirus maynin luratanakapa, aruskipatanakapa, amuyunakap jan uñjayasiñatakiw jark\'aqi. </string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
-index de881840..5c449773 100644
---- a/app/src/main/res/values-az/strings.xml
-+++ b/app/src/main/res/values-az/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Pulsuz proksi tÉ?tbiqetmÉ?si olan Orbot baÅ?qa tÉ?tbiqetmÉ?lÉ?rÉ? internetdÉ?n daha tÉ?hlükÉ?siz istifadÉ? etmÉ?k imkanı verir. Orbot sizin internet trafikinizi Å?ifrÉ?lÉ?mÉ?k üçün Tordan istifadÉ? edir vÉ? dünyanın hÉ?r yerindÉ? kompüterlÉ?rin birindÉ?n o birinÉ? sıçramaqla bunu gizlÉ?dir. Tor pulsuz proqram tÉ?minatıdır, eyni zamanda sizin Å?É?xsi azadlıÄ?ınız vÉ? tÉ?hlükÉ?sizliyinizÉ?, gizli biznes fÉ?aliyyÉ?ti vÉ? É?laqÉ?lÉ?rÉ?, o cümlÉ?dÉ?n trafik analiz adlanan dövlÉ?t tÉ?hlükÉ?sizliyinÉ? xÉ?lÉ?l gÉ?tirÉ? bilÉ?cÉ?k Å?É?bÉ?kÉ? nÉ?zarÉ?ti formalarından müdafiÉ? olunmaÄ?a yardım edÉ?n açıq Å?É?bÉ?kÉ?dir.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
-index bac4cbad..c37f1399 100644
---- a/app/src/main/res/values-ca/strings.xml
-+++ b/app/src/main/res/values-ca/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">L\'Orbot és una aplicació de servidor intermediari gratuïta que capacita a les altres aplicacions per utilitzar internet de forma més segura. L\'Orbot utilitza Tor per xifrar les vostres comunicacions per Internet i ocultar-les fent-les saltar per una sèrie d\'ordinadors repartits per tot el món. Tor és un programari lliure i una xarxa oberta que us ajuda a defensar-vos d\'un tipus de vigilà ncia a la xarxa que amenaça la llibertat personal i la privadesa, activitats empresarials i relacions confidencials i la seguretat en general, coneguda com anà lisi de trà nsit.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">https://check.torproject.org</string>
-diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
-index 06712165..cb278203 100644
---- a/app/src/main/res/values-cs-rCZ/strings.xml
-+++ b/app/src/main/res/values-cs-rCZ/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot je bezplatný proxy server, který umožÅ?uje bezpeÄ?nÄ?jÅ¡Ã použità internetu v ostatnÃch apklikacÃch. Orbot použÃvá Tor pro Å¡ifrovánà internetového provozu a skrývá se dÃky pÅ?edávánà provozu pÅ?es vÃce poÄ?ÃtaÄ?ů po celém svÄ?tÄ?. Tor je bezplatný software a otevÅ?ená sÃÅ¥, která vám pomáhá chránit se pÅ?ed sledovánÃm sÃtÄ?, které ohrožuje osobnà svobodu, bezpeÄ?nost, důvÄ?rné obchodnà aktivity a vztahy a pÅ?ed státnÃm sledovánÃm, oznaÄ?ovaným jako anylýza provozu.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
-index c9cbb2fb..7d759070 100644
---- a/app/src/main/res/values-cs/strings.xml
-+++ b/app/src/main/res/values-cs/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot je proxy aplikace zdarma, která umožÅ?uje ostatnÃm aplikacÃm použÃvat internet bezpeÄ?nÄ?ji. PoužÃvá Tor pro zaÅ¡ifrovánà pÅ?enášených dat a skrývá je pomocà skoků pÅ?es sérii poÄ?ÃtaÄ?ů po celém svÄ?tÄ?. Tor je software zdarma a jeho otevÅ?ená sÃÅ¥ pomáhá v obranÄ? proti sledovánÃ, které zasahuje do osobnà svobody a soukromÃ, důvÄ?rných obchodnÃch komunikacà a vztahů a proti státnà bezpeÄ?nosti zvané analýza internetového provozu.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
-index 25a6dd54..2a4652b3 100644
---- a/app/src/main/res/values-cy/strings.xml
-+++ b/app/src/main/res/values-cy/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
-index bf019372..20f46135 100644
---- a/app/src/main/res/values-da/strings.xml
-+++ b/app/src/main/res/values-da/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot er en gratis og åben proxy-applikation, der gør det muligt at anvende internettet mere sikkert fra andre programmer. Orbot bruger Tor til at kryptere internettrafikken, og skjuler den ved at sende den gennem serverere, lokaliseret i hele verden. Tor er gratis og åben software, der kan hjælpe dig mod netværksovervågning kaldet trafikanalyse, der kan true din personlige frihed, dit privatliv, handelsaktivitet og forhold.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
-index c9b435da..d4451ac3 100644
---- a/app/src/main/res/values-de/strings.xml
-+++ b/app/src/main/res/values-de/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot ist eine kostenlose Proxy-App, die es anderen Apps ermöglicht, das Internet sicherer zu nutzen. Orbot verwendet Tor, um Ihren Internetverkehr zu verschlüsseln und versteckt ihn dann, indem er durch eine Reihe von Computern auf der ganzen Welt springt. Tor ist freie Software und ein offenes Netzwerk, das Ihnen hilft, sich gegen eine Form der Netzwerküberwachung zu verteidigen, die persönliche Freiheit und Privatsphäre, vertrauliche Geschäftsaktivitäten und Beziehungen sowie die staatliche Sicherheit, die als Verkehrsanalyse bezeichnet wird, bedroht.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
-index 12015e1c..8f84cbe3 100644
---- a/app/src/main/res/values-el/strings.xml
-+++ b/app/src/main/res/values-el/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Το Orbot είναι μια δÏ?Ï?εάν εÏ?αÏ?μογή μεÏ?ολάβηÏ?ηÏ? Ï?οÏ? εÏ?ιÏ?Ï?ÎÏ?ει Ï?ε άλλεÏ? εÏ?αÏ?μογÎÏ? να Ï?Ï?ηÏ?ιμοÏ?οιοÏ?ν Ï?ο Î?ιαδίκÏ?Ï?ο με Ï?εÏ?ιÏ?Ï?Ï?Ï?εÏ?η αÏ?Ï?άλεια. Το Orbot Ï?Ï?ηÏ?ιμοÏ?οιεί Ï?ον Tor για Ï?ην κÏ?Ï?Ï?Ï?ογÏ?άÏ?ηÏ?η Ï?ηÏ? διαδικÏ?Ï?ακήÏ? Ï?αÏ? κίνηÏ?ηÏ? και Ï?Ï?η Ï?Ï?νÎÏ?εια Ï?ην κÏ?Ï?βει αναÏ?ηδÏ?νÏ?αÏ? μÎÏ?Ï? μιαÏ? Ï?ειÏ?άÏ? Ï?Ï?ολογιÏ?Ï?Ï?ν Ï?ε Ï?λο Ï?ον κÏ?Ï?μο. Το Tor είναι ελεÏ?θεÏ?ο λογιÏ?μικÏ? και Îνα ανοιÏ?Ï?Ï? δίκÏ?Ï?ο Ï?οÏ? Ï?αÏ? βοηθά να Ï?Ï?αθείÏ?ε ενάνÏ?ια Ï?ε μια μοÏ?Ï?ή εÏ?ιÏ?ήÏ?ηÏ?ηÏ? δικÏ?Ï?οÏ? Ï?οÏ? αÏ?ειλεί Ï?ην Ï?Ï?οÏ?Ï?Ï?ική ελεÏ?θεÏ?ία και ιδιÏ?Ï?ικÏ?Ï?ηÏ?α, εμÏ?ιÏ?Ï?εÏ?Ï?ικÎÏ? εÏ?ιÏ?ειÏ?ημαÏ?ικÎÏ? δÏ?αÏ?Ï?ηÏ?ιÏ?Ï?ηÏ?εÏ? και Ï?Ï?
ÎÏ?ειÏ?, και Ï?ην κÏ?αÏ?ική αÏ?Ï?άλεια γνÏ?Ï?Ï?ή Ï?Ï? traffic analysis.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
-index 839ff9c2..b3e4a0cc 100644
---- a/app/src/main/res/values-en-rGB/strings.xml
-+++ b/app/src/main/res/values-en-rGB/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</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="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
-index f66130f8..7c1e24d3 100644
---- a/app/src/main/res/values-eo/strings.xml
-+++ b/app/src/main/res/values-eo/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml
-index 54fa6102..f3f7faff 100644
---- a/app/src/main/res/values-es-rAR/strings.xml
-+++ b/app/src/main/res/values-es-rAR/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot es una aplicación de proxy gratuita que le permite a otras aplicaciones utilizar Internet de forma segura. Tor encripta tu trafico de Internet y lo oculta rebotandolo a través de una serie de ordenadores alrededor del mundo. Tor es un software gratuito y una red abierta que te ayuda a defenderte contra una forma de vigilancia de red que amenaza la libertad personal y la privacidad, actividades confidenciales de negocios y relaciones, y la seguridad de estado conocida como análisis de trafico.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
-index bd0a8b83..f232ee7c 100644
---- a/app/src/main/res/values-es/strings.xml
-+++ b/app/src/main/res/values-es/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot es una aplicación libre de proxy (interpuesto) que faculta a otras aplicaciones para usar Internet de forma más segura. Orbot utiliza Tor para cifrar su tráfico de Internet, y luego lo oculta rebotándolo a través de una serie de computadoras por todo el mundo. Tor es software libre y una red abierta que le ayuda a defenderse contra una forma de vigilancia de red conocida como análisis de tráfico que amenaza la libertad y la privacidad personales, las actividades y relaciones comerciales confidenciales, y la seguridad de estado.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">https://check.torproject.org/?lang=es</string>
-diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
-index e9c7b46d..9f838a7f 100644
---- a/app/src/main/res/values-et/strings.xml
-+++ b/app/src/main/res/values-et/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot on vabalt kasutatav proxy rakendus, mis võimaldab teistel rakendustel Interneti turvalisemat kasutust. Orbot krüpteerib ja peidab teie Internetiliikluse Tor abil paljude maailma arvutite vahel põrgatades. Tor on vaba tarkvara ja vaba võrgustik mis aitab teil kaitsta oma privaatsust, vabadust, konfidentsiaalset äritegevust, suhteid ja riiklikku julgeolekut arvutivõrgus toimuva liikluse analüüsi eest.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.orghttp://check.torproject.org</string>
-diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
-index 7f2240c0..0d556574 100644
---- a/app/src/main/res/values-eu/strings.xml
-+++ b/app/src/main/res/values-eu/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot proxy aplikazio aske bat da beste aplikazioei Interneten erabilera seguruago bat egitea ahalbidetzen diena. Orbot-ek Tor erabiltzen du zure Internet trafikoa zifratzeko eta mundu osoan barrena hainbat konputagailuetatik pasatuz ezkutatzeko. Tor software askea eta sare irekia da, askatasun eta pribatutasun pertsonala, aktibitate eta erlazio komertzial konfidentzialak erasotzen dituen sare analisi moten kontra eginez babesten zaituena.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
-index 06c54138..2f5b2e59 100644
---- a/app/src/main/res/values-fi/strings.xml
-+++ b/app/src/main/res/values-fi/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot on ilmainen välityspalvelinsovellus, joka tarjoaa muille sovelluksille mahdollisuuden käyttää internetiä turvallisemmin. Orbot käyttää Toria kryptaamaan verkkoliikenteesi ja sitten piilottaa sen kierrättämällä sitä usean tietokoneen kautta ympäri maailman. Tor on vapaa ohjelmisto ja avoin verkosto, jotka auttavat puolustautumaan vapautta ja yksityisyyttä uhkaavalta verkkovalvonnalta ja valtioiden verkonseurannalta sekä suojaamaan salaisia liiketoimintoja ja -yhteyksiä.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
-index 1851e1e1..b638ef52 100644
---- a/app/src/main/res/values-fr-rFR/strings.xml
-+++ b/app/src/main/res/values-fr-rFR/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot est une appli libre de serveur mandataire permettant aux applis dâ??utiliser Internet avec une sécurité accrue. Orbot utilise Tor pour chiffrer votre trafic Internet et le cache ensuite en le relayant au travers dâ??ordinateurs de par le monde. Tor est un logiciel libre et un réseau ouvert qui vous aide à vous défendre contre une forme de surveillance réseau qui menace la liberté personnelle et la protection des données personnelles, les activités professionnelles confidentielles et les relations, et lâ??analyse du trafic des gouvernements.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
-index 6c99890d..253a30ec 100644
---- a/app/src/main/res/values-fr/strings.xml
-+++ b/app/src/main/res/values-fr/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot est une appli libre de serveur mandataire permettant aux applis dâ??utiliser Internet avec une sécurité accrue. Orbot utilise Tor pour chiffrer votre trafic Internet et le cache ensuite en le relayant au travers dâ??ordinateurs de par le monde. Tor est un logiciel libre et un réseau ouvert qui vous aide à vous défendre contre une forme de surveillance réseau qui menace la liberté personnelle et la protection des données personnelles, les activités professionnelles confidentielles et les relations, et lâ??analyse du trafic des gouvernements.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
-index 4570acc5..ad580a33 100644
---- a/app/src/main/res/values-gl/strings.xml
-+++ b/app/src/main/res/values-gl/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot é unha aplicación de proxy libre que permite a outras aplicacións usar a internet dun xeito máis seguro. Orbot usa Tor para encriptar o teu tráfico de internet ocultando e rebotándoo a través dunha serie de ordenadores ao redor do mundo. Tor é software libre e unha rede aberta que axuda a defenderte contra unha forma de vixiancia na rede que ameaza a liberdade e privacidade persoal, actividades confidenciáis de negocios e relacións, e estado de seguridade coñecido como análise de tráfico.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
-index f322afb3..55c2629f 100644
---- a/app/src/main/res/values-he/strings.xml
-+++ b/app/src/main/res/values-he/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot ×?×?×? ×?×?ש×?×? ×?×?× ×?×? ש×? ×?פ×?×?Ö¾×?×?×? ×?×?עצ×?×? ×?×?ש×?×?×?×? ×?×?ר×?×? ×?×?שת×?ש ×?×?×?× ×?×¨× ×? ×?×?תר ×?×?×?×?×?. Orbot ×?שת×?ש ×?-Tor ×?×?×? ×?×?צפ×?×? ×?ת תע×?×?רת ×?×?×?× ×?×¨× ×? ש×?×? ×?×?×? ×?סת×?ר ×?×?ת×? ×?×?×?צע×?ת ×?קפצ×? ×?ר×? ס×?רת ×?×?ש×?×?×? ×?ר×?×?×? ×?×¢×?×?×?. Tor ×?×?×? ת×?×?× ×? ×?×?× ×?×?ת ×?רשת פת×?×?×? ×?×¢×?×?רת ×?×? ×?×?ת×?×?× ×? ×?×¤× ×? צ×?ר×? ש×? ×?עק×? ×?רשת ×?×?×?×?×?×? ×¢×? ×?×?ר×?ת ×?×?ש×?ת ×?פר×?×?×?ת, פע×?×?×?×?×?ת עסק×?×?ת ×?ש×?×?×?ת, ×?×?×?×?×?×? ×?×?×?× ×? ×?×?×?×?ר ×?ש×? × ×?ת×?×? תע×?×?ר×?.</string>
- <string name="internal_web_url">http://orbot</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
-index 9a7b63cc..b7a0beef 100644
---- a/app/src/main/res/values-hr/strings.xml
-+++ b/app/src/main/res/values-hr/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot je besplatna proxy aplikacija koja omoguÄ?uje ostalim aplikacijama da koriste internet sigurnije. Orbot koristi Tor za enkripciju VaÅ¡eg Internet prometa, a zatim ga skriva Å¡aljuÄ?i ga kroz seriju raÄ?unala diljem svijeta. Tor je besplatan software i otvorena mreža koja pomaže u borbi protiv nadzora mreže koji ugrožava osobne slobode i privatnost, povjerljive poslovne aktivnosti i odnose, te pomaže u borbi protiv analize prometa.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
-index 7ea880e4..bd1c3d28 100644
---- a/app/src/main/res/values-hu/strings.xml
-+++ b/app/src/main/res/values-hu/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Az Orbot egy ingyenes proxy alkalmazás, ami képessé tesz alkalmazásokat, hogy biztonságosabban használhassák az internetet. Az Orbot Tor-t használ, hogy titkosÃtsa az internetforgalmadat és elrejtse azáltal, hogy pattogtatja számÃtógépek sorozatain keresztül a világ körül. A Tor ingyenes szoftver és nyitott hálózat, ami segÃt megvédeni a hálózati felügyelettÅ?l, ami fenyegeti a személyi szabadságot és magánéletet, a bizalmas céges tevékenységeket és kapcsolatokat, és állambiztonság cÃmén a forgalomelemzéstÅ?l.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-hy-rAM/strings.xml b/app/src/main/res/values-hy-rAM/strings.xml
-index 616e9d04..cbd348e8 100644
---- a/app/src/main/res/values-hy-rAM/strings.xml
-+++ b/app/src/main/res/values-hy-rAM/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="menu_about">Õ?Õ¡Õ½Õ«Õ¶</string>
- <string name="button_about">Õ?Õ¡Õ½Õ«Õ¶</string>
- <string name="menu_verify">Õ?Õ¿Õ¸Ö?Õ£Õ¥Õ¬</string>
-diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
-index 9a9876cf..8e53eda5 100644
---- a/app/src/main/res/values-id/strings.xml
-+++ b/app/src/main/res/values-id/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot adalah aplikasi proxy gratis yang membuat aplikasi-aplikasi lainnya dapat terkoneksi dengan internet secara aman. Orbot menggunakan Tor untuk mengenkripsi hubungan internet anda dan menyalurkannya melewati berbagai komputer di seluruh dunia. Tor adalah software gratis dan suatu network terbuka, yang membantu anda menghindari pengawasan network yang mengancam kebebasan pribadi dan privasi, aktivitas bisnis rahasia dan relasi, serta keamanan negara yang dikenal dengan analisa traffic.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
-index 8b99a0d9..a4d72620 100644
---- a/app/src/main/res/values-in-rID/strings.xml
-+++ b/app/src/main/res/values-in-rID/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot adalah aplikasi proxy gratis yang membuat aplikasi-aplikasi lainnya dapat terkoneksi dengan internet secara aman. Orbot menggunakan Tor untuk mengenkripsi hubungan internet Anda dan menyalurkannya melewati berbagai komputer di seluruh dunia. Tor adalah software gratis dan layanan terbuka, yang membantu Anda menghindari pengawasan jaringan yang mengancam kebebasan pribadi dan privasi, aktivitas bisnis rahasia dan relasi, serta keamanan negara yang dikenal dengan analisis traffic.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
-index 42c44612..01701557 100644
---- a/app/src/main/res/values-in/strings.xml
-+++ b/app/src/main/res/values-in/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
-index 134cab09..ef258dcb 100644
---- a/app/src/main/res/values-is/strings.xml
-+++ b/app/src/main/res/values-is/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot er frjálst og ókeypis milliþjónsforrit (proxy) sem gerir öðrum forritum kleift að nota veraldarvefinn á öruggari hátt. Orbot notar Tor til að dulkóða umferð þÃna á netinu og felur hana svo með að hoppa à gegnum fjölda tölva um allan heim. Tor er frjáls hugbúnaður og opið net sem aðstoðar þig við að verjast eftirliti á netinu sem vinnur gegn frelsi einkalÃfsins og friðhelgi; vinnur gegn viðkvæmum viðskiptamálum og samböndum og þeirri tegund rÃkisöryggis sem þekkt er sem umferðargreining.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
-index 3d9f3f21..2743e6a9 100644
---- a/app/src/main/res/values-it/strings.xml
-+++ b/app/src/main/res/values-it/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot è un\'applicazione proxy che permette alle altre applicazioni di accedere a internet in maniera più sicura. Orbot usa Tor per cifrare il traffico internet e lo nasconde poi facendolo rimbalzare attraverso una serie di computer attorno al mondo. Tor è un software libero e una rete aperta che aiuta a difendersi da una forma di sorveglianza della rete conosciuta come analisi del traffico. Quest\'ultima minaccia libertà e privacy personale, attività commerciali riservate, rapporti interpersonali, e persino la sicurezza di stato.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
-index e5e33f9b..9245cdc2 100644
---- a/app/src/main/res/values-iw/strings.xml
-+++ b/app/src/main/res/values-iw/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot ×?×?× ×? ×?פ×?×?קצ×?×?ת פר×?קס×? ×?×?× ×?×?ת ×?×?×?פשרת ×?×?פ×?×?קצ×?×?ת ×?×?ר×?ת ×?×?שת×?ש ×?×?×?× ×?×¨× ×? ×?×?×?×?×?. Orbot × ×¢×?רת ×?-Tor ×?×?×? ×?×?צפ×?×? ×?ת תע×?×?רת ×?×?×?× ×?×¨× ×? ש×?×? ×?×?×?ס×?×?ת×? ×?×?×?צע×?ת×? × ×?ת×?×?×? ×?ר×? ×?ספר ×?×?ש×?×?×? ×?ר×?×?×? ×?×¢×?×?×?. Tor ×?×?×? ת×?×?× ×? ×?×?פש×?ת ×?רשת פת×?×?×? ×?×?ס×?×?עת ×?×? ×?×?ת×?×?× ×? ×?×¤× ×? ס×?×?×?×? ×?ס×?×?×?×?×? ש×? ×?×?צע×? × ×?×?×?ר ×?×?עק×? ×?×?ר רשת ×?×?×?× ×?×¨× ×? ×?×?×?×?×?×?×?×? ×¢×? ×?פר×?×?×?ת, ×?×?×?ר×?ת ×?×?×?ש×?ת, פע×?×?×?×?×?ת עסק×?×?ת ×?×?ער×?×?ת ×?×?ס×?×? ×?ש×?×?×?ת.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
-index a3226fcc..4d7d3c87 100644
---- a/app/src/main/res/values-ja/strings.xml
-+++ b/app/src/main/res/values-ja/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbotã?¯ä»?ã?®ã?¢ã??ã?ªã??ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã??ã??ã??å®?å?¨ã?«ä½¿ã??ã??ã?¨ã??å?¯è?½ã?«ã??ã??ã??ã?ªã?¼ã?®ã??ã?ã?ã?·ã?¢ã??ã?ªã?§ã??ã??Orbotã?§ã?¯ã??Torã??ç?¨ã??ã?¦ã??ã?ªã??ã?®ç«¯æ?«ã?®ã??ã?©ã??ã?£ã??ã?¯ã??æ??å?·å??ã??ã??ä¸?ç??ä¸ã?®ã?³ã?³ã??ã?¥ã?¼ã?¿ã?¼ã??ä¸ç¶?ã??ã??ã??ã?¨ã?§ã??ã??ã?®ã??ã?©ã??ã?£ã??ã?¯ã??é? ã??ã?¾ã??ã??Torã?¯ã??ã?ªã?¼ã?®ã?½ã??ã??ã?¦ã?§ã?¢ã?¨ã?ªã?¼ã??ã?³ã?ªã??ã??ã??ã?¯ã?¼ã?¯ã?§ã??ã??ã??ã?¦ã?¼ã?¶ã?¼ã?®è?ªç?±ã?¨ã??ã?©ã?¤ã??ã?·ã?¼ã??è??ã??ã??ç?£è¦?æ´»å??ã??ã??æ©?å¯?ã?®ã??ã?¸ã??ã?¹æ´»å??ã??å?½å®¶ã?«ã??ã??ã??ã?©ã??ã?£ã??ã?¯å??æ??ã??ã??身ã??å®?ã??ã??ã?¨ã??å?©ã??ã?¦ã??ã??ã?¾ã??ã??</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
-index b9336955..d9a362e9 100644
---- a/app/src/main/res/values-ko/strings.xml
-+++ b/app/src/main/res/values-ko/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbotì?? ë?¤ë¥¸ ì?±ì?´ ì?¸í?°ë?·ì?? ë?? ì??ì ?í??ê²? ì?´ì?©í? ì?? ì??ë??ë¡? ë??ì??주ë?? 무ë£? í??ë¡?ì?? ì?±ì??ë??ë?¤. Orbotì?? Tor를 ì?´ì?©í??ì?¬ ì?¬ë?¬ë¶?ì?? ì?¸í?°ë?· í?¸ë??í?½ì?? ì??í?¸í??í??ê³ ì ? ì?¸ê³?ì?? ì?°ê²°ë?? ì»´í?¨í?°ë¥¼ ê±°ì³?ì?? ì?¨ê¹?ë??ë?¤. Torë?? 무ë£? ì??í??í?¸ì?¨ì?´ì?´ë©´ì?? ê°?ë°© ë?¤í?¸ì??í?¬ë¡?ì?? ì?¬ë?¬ë¶?ì?? ê°?ì?¸ì?? ì??ì? , ì?¬ì??í??, ì??ë°?í?? ì?¬ì?? í??ë??, ê´?ê³?, êµê°? ì??보를 ì??í??í??ë?? ë?¤í?¸ì??í?¬ ê°?ì??ì?¸ í?¸ë??í?½ ë¶?ì??ì?¼ë¡?ë¶?í?° ë³´í?¸í?©ë??ë?¤.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
-index 0b798a52..d9669e3c 100644
---- a/app/src/main/res/values-lt/strings.xml
-+++ b/app/src/main/res/values-lt/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot yra tarpinÄ? (proxy) programÄ?lÄ?, kuri leidžia kitoms programÄ?lÄ?ms naudotis internetu žymiai saugiau. Orbot naudoja Tor, taip užšifruodama interneto srautÄ? ir jį paslepia Å¡okinÄ?dama tarp daugybÄ?s kompiuterių adresų iÅ¡ viso pasaulio. Tor yra nemokama programa bei atviras tinklas, kuris leidžia apsisaugoti nuo tinklo stebÄ?jimų, kurie kelia grÄ?smÄ? asmeninei laisvei ir privatumui, konfidencialumui, taip leidžianti iÅ¡vengti tinklo srauto analizavimo.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
-index 7c222d67..074506dd 100644
---- a/app/src/main/res/values-lv/strings.xml
-+++ b/app/src/main/res/values-lv/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot ir starpniekserveru bezmaksas lietotne, kas sniedz iespÄ?ju citÄ?m lietotnÄ?m droÅ¡Ä?k lietot internetu. Orbot izmanto Tor, lai Å¡ifrÄ?tu JÅ«su interneta datplÅ«smu, tad to paslÄ?pj, pÄ?rsÅ«tot to caur daudziem datoriem visÄ? pasaulÄ?. Tor ir bezmaksas programmatÅ«ra un atvÄ?rts tÄ«kls, kas palÄ«dz Jums aizsargÄ?ties pret tÄ«kla uzraudzÄ«bas veidu - datplÅ«smas analÄ«zi -, ar kuras palÄ«dzÄ«bu tiek apdraudÄ?ta personiskÄ? brÄ«vÄ«ba un privÄ?tums, konfidenciÄ?las lietiÅ¡Ä·as darbÄ«bas un attiecÄ«bas, kÄ? arÄ« valsts droÅ¡Ä«ba. </string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
-index e73b8a0e..5c1ac41b 100644
---- a/app/src/main/res/values-mk/strings.xml
-+++ b/app/src/main/res/values-mk/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot е Ñ?лободна пÑ?окÑ?и апликаÑ?иÑ?а коÑ?а им овозможÑ?ва на дÑ?Ñ?гиÑ?е апликаÑ?ии да го коÑ?иÑ?Ñ?аÑ? Ð?нÑ?еÑ?неÑ?оÑ? побезбедно. Orbot коÑ?иÑ?Ñ?и Tor за енкÑ?ипÑ?иÑ?аÑ?е на инÑ?еÑ?неÑ? Ñ?ообÑ?аÑ?аÑ?оÑ?, а поÑ?оа го Ñ?окÑ?ива и го поÑ?Ñ?кокнÑ?ва пÑ?екÑ? Ñ?еÑ?иÑ?а компÑ?Ñ?Ñ?еÑ?и низ Ñ?елиоÑ? Ñ?веÑ?. Tor е Ñ?лободен Ñ?оÑ?Ñ?веÑ? и оÑ?воÑ?ена мÑ?ежа коÑ? ви помага да Ñ?е одбаÑ?ниÑ?е од Ñ?оÑ?ми на надзоÑ? на мÑ?ежаÑ?а коÑ? им Ñ?е заканÑ?ва на ваÑ?аÑ?а лиÑ?на Ñ?лобода и пÑ?иваÑ?ноÑ?Ñ?, довеÑ?ливиÑ?е деловни акÑ?ивноÑ?Ñ?и и одноÑ?и, и дÑ?жавнаÑ?а безбедноÑ?Ñ? познаÑ?а како анализа на Ñ?ообÑ?аÑ?аÑ?оÑ?.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-mr-rIN/strings.xml b/app/src/main/res/values-mr-rIN/strings.xml
-index 3eb48141..a4022654 100644
---- a/app/src/main/res/values-mr-rIN/strings.xml
-+++ b/app/src/main/res/values-mr-rIN/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">à¤?रà¥?बà¥?à¤? à¤?à¤? विनामà¥?लà¥?य पà¥?रà¥?à¤?à¥?सà¥? à¤?à¥?प à¤?हà¥? à¤?à¥? à¤?तर à¤?à¥?पà¥?सना à¤?à¤?à¤?रनà¥?à¤?à¤?ा à¤?धिà¤? सà¥?रà¤?à¥?षितपणà¥? वापर à¤?रणà¥?यास सà¤?à¥?षम à¤?रतà¥?. à¤?रà¥?बà¥?à¤? à¤?पलà¥?या à¤?à¤?à¤?रनà¥?à¤? रहदारà¥?à¤?à¥? à¤?नà¥?à¤?à¥?रिपà¥?à¤? à¤?रणà¥?यासाठà¥? à¤?à¥?रà¤?ा वापर à¤?रतà¥? à¤?णि नà¤?तर à¤?à¤?à¤à¤°à¤¾à¤¤à¥?ल सà¤?à¤?णà¤?ाà¤?à¤?à¥?या मालिà¤?à¥?दà¥?वारà¥? à¤?डà¥? मारà¥?न लपवतà¥?. à¤?à¥?र हा à¤?à¤? विनामà¥?लà¥?य सà¥?फà¥?à¤?वà¥?à¤?र à¤?णि à¤?à¤? à¤?à¥?ला नà¥?à¤?वरà¥?à¤? à¤?हà¥? à¤?à¥? à¤?पलà¥?याला नà¥?à¤?वरà¥?à¤? सà¥?वतà¤?तà¥?रता à¤?णि à¤?à¥?पनà¥?यता, à¤?à¥?पनà¥?य वà¥?यवसाय à¤?à¥?रियाà¤?लाप
�णि नात�स�ब�ध �णि रहदार� विश�ल�षणास म�हण�न �ळ�ल�या �ाणार�या रा��य स�र��ष�स धम�� द�णार�या न��वर�� निर���षणा�� र��षण �रण�यास मदत �रत�.</string>
- <string name="wizard_title">Orbot</string>
- <!--Welcome Wizard strings (DJH)-->
-diff --git a/app/src/main/res/values-ms-rMY/strings.xml b/app/src/main/res/values-ms-rMY/strings.xml
-index e929c97b..a454494f 100644
---- a/app/src/main/res/values-ms-rMY/strings.xml
-+++ b/app/src/main/res/values-ms-rMY/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
-index 3caddf4a..86003e19 100644
---- a/app/src/main/res/values-ms/strings.xml
-+++ b/app/src/main/res/values-ms/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
-index 2c644b43..ca1bd9ad 100644
---- a/app/src/main/res/values-nb/strings.xml
-+++ b/app/src/main/res/values-nb/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot er et friprog-mellomtjeningsprogram som gjør det mulig for andre programmer å bruke Internett sikrere. Orbot bruker Tor for å kryptere din internettrafikk, og skjuler da din trafikk ved å sende trafikken gjennom en lang rekke datamaskiner over hele verden. Tor er fri programvare, og et åpent nettverk som hjelper deg å forsvare deg mot en form for nettverksovervåking som truer din personlige frihet og privatliv, konfidensiell bedriftsvirksomhet og relasjoner, og statlig snoking kjent som trafikkanalyse.</string>
- <string name="internal_web_url">https://torproject.org</string>
- <string name="default_web_url">https://check.torproject.org</string>
-diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
-index 939112d2..801bac8d 100644
---- a/app/src/main/res/values-nl/strings.xml
-+++ b/app/src/main/res/values-nl/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot is een vrije proxy-app die het andere apps mogelijk maakt het internet veiliger te gebruiken. Orbot gebruikt Tor om je internetverkeer te versleutelen en het vervolgens te verhullen het door het door een serie computers over de hele wereld te routeren. Tor is vrije software en een open netwerk dat je helpt te verdedigen tegen een vorm van netwerktoezicht, genaamd \'verkeersanalyse\', die persoonlijke vrijheid en privacy, vertrouwelijke bedrijfsactiviteiten en relaties en staatsveiligheid bedreigt.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org/?lang=nl</string>
-diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
-index 192e8773..d38062e1 100644
---- a/app/src/main/res/values-pl/strings.xml
-+++ b/app/src/main/res/values-pl/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot jest darmowÄ? aplikacjÄ? proxy która wspomaga inne aplikacje do używania internetu bezpiecznie. Orbot używa Tora do szyfrowania Twojego ruchu internetowego i nastÄ?pnie przepuszczania go przez wiele innych komputereów pororzucanych na caÅ?ym Å?wiecie. Tor jest darmowym oprogramowaniem i otwartÄ? sieciÄ? która pomaga Tobie w obronie przed monitoringiem sieci która zagrarza osobistej wolnoÅ?ci i prywatnoÅ?ci, poufnym biznesowym aktywnoÅ?ciom.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
-index 286feceb..c4e243f2 100644
---- a/app/src/main/res/values-pt-rBR/strings.xml
-+++ b/app/src/main/res/values-pt-rBR/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot é um aplicativo de proxy livre que capacita outros aplicativos a usar a internet com mais segurança. Orbot usa o Tor para criptografar seu tráfego na internet e então o esconde \"saltando\" entre uma série de computadores ao redor do mundo. Tor é um software livre e de rede aberta que ajuda você a se defender de certas formas de vigilância que ameaçam privacidade e liberdade pessoais, atividades e relações comerciais confidenciais e segurança estatal conhecida como análise de tráfego.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
-index 25f6741d..e9fa7b75 100644
---- a/app/src/main/res/values-pt-rPT/strings.xml
-+++ b/app/src/main/res/values-pt-rPT/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot é uma app proxy gratuita que fortifica outras apps para utilizar a internet mais seguramente. Orbot usa Tor para encriptar o seu tráfego de Internet e ocultá-lo saltando entre uma série de computadores no mundo todo. Tor é um software gratuito e uma rede aberta que ajuda-lhe a defender contra uma forma de rede de vigilância que ameaça a liberdade pessoal e privacidade, actividades de negócios confidenciais e parentesco, e segurança de estado conhecido como análise de tráfego.
-
- </string>
-diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
-index fd97061c..a255b33a 100644
---- a/app/src/main/res/values-pt/strings.xml
-+++ b/app/src/main/res/values-pt/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
-index 81354f92..cad6f923 100644
---- a/app/src/main/res/values-ro/strings.xml
-+++ b/app/src/main/res/values-ro/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot este o aplicaÅ£ie gratuitÄ? de proxy care permite altor aplicaÅ£ii sÄ? foloseascÄ? internetul în siguranÅ£Ä?. Orbot foloseÅ?te Tor pentru a cripta traficul de internet dupÄ? care îl ascunde printr-o serie de calculatoare din întreaga lume. Tor este un program gratuit si o reÅ£ea deschisÄ? care te ajutÄ? sÄ? te aperi de monitorizarea reÅ£elelor, lucru care ameninÅ£Ä? libertatea personalÄ? Å?i intimitatea, activitÄ?Å£i confidenÅ£iale legate de afaceri si relaÅ£ii personale Å?i de analiza traficului.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-rs-rAR/strings.xml b/app/src/main/res/values-rs-rAR/strings.xml
-index 132b67e8..a368dfcb 100644
---- a/app/src/main/res/values-rs-rAR/strings.xml
-+++ b/app/src/main/res/values-rs-rAR/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
-index 96b3d622..12dcbcf1 100644
---- a/app/src/main/res/values-ru/strings.xml
-+++ b/app/src/main/res/values-ru/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot â?? Ñ?Ñ?о Ñ?вободнаÑ? пÑ?огÑ?амма длÑ? пÑ?окÑ?и-Ñ?оединений, она позволÑ?еÑ? дÑ?Ñ?гим пÑ?иложениÑ?м более безопаÑ?но иÑ?полÑ?зоваÑ?Ñ? инÑ?еÑ?неÑ?-Ñ?оединение. Orbot иÑ?полÑ?зÑ?еÑ? Tor длÑ? Ñ?иÑ?Ñ?ованиÑ? инÑ?еÑ?неÑ?-Ñ?Ñ?аÑ?ика, коÑ?оÑ?Ñ?й заÑ?ем Ñ?кÑ?Ñ?ваеÑ?Ñ?Ñ? в Ñ?оде пеÑ?еÑ?Ñ?лки Ñ?еÑ?ез неÑ?колÑ?ко компÑ?Ñ?Ñ?еÑ?ов в Ñ?азнÑ?Ñ? Ñ?аÑ?Ñ?Ñ?Ñ? планеÑ?Ñ?. Tor Ñ?влÑ?еÑ?Ñ?Ñ? Ñ?вободнÑ?м пÑ?огÑ?аммнÑ?м пÑ?иложением, а Ñ?акже оÑ?кÑ?Ñ?Ñ?ой Ñ?еÑ?Ñ?Ñ?, помогаÑ?Ñ?ей заÑ?иÑ?иÑ?Ñ?Ñ?Ñ? оÑ? Ñ?лежки в Ñ?еÑ?Ñ?Ñ?, Ñ?гÑ?ожаÑ?Ñ?ей лиÑ?ной Ñ?вободе и Ñ?аÑ?Ñ?ной жизни, конÑ?иденÑ?иалÑ?ноÑ?Ñ?и бизнеÑ?-деÑ?Ñ?елÑ?ноÑ?Ñ?и и конÑ?акÑ?ов, а Ñ?акже гоÑ?Ñ?даÑ?Ñ?Ñ?венной пÑ?огÑ?амÐ
¼Ñ? безопаÑ?ноÑ?Ñ?и, извеÑ?Ñ?ной как анализ Ñ?Ñ?аÑ?ика.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-si-rLK/strings.xml b/app/src/main/res/values-si-rLK/strings.xml
-index fa3e5671..d898bba1 100644
---- a/app/src/main/res/values-si-rLK/strings.xml
-+++ b/app/src/main/res/values-si-rLK/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot යනà·? à¶?නà·?à¶?à·?à¶à·? à¶?à·?පà·?à·?à·? à·?ට à·?ඩà·? à¶?à·?රà¶?à·?à·?à·?à¶?à·?රà·?à·? à¶?නà·?à¶à¶»à·?ජà·?ලà·?යà·? à·?à·?රà·?à·?à·?රà·?මට à¶?ඩ à·?ලà·?à·?දà·?න නà·?à·?මà·?ලà·?à·? ලබà·?දà·?නà·?නà·?à·?à·? පà·?රà·?à¶?à·?à·?à·? à·?à·?à·?à·?à·?à·?à¶?à·?. à¶?ය Tor යà·?à·?දà·?à¶?නà·?මà·?නà·? à¶?බà¶?à·?à·? à¶?නà·?à¶à¶»à·?ජà·?ල à¶?නà·?දà·?නà·? à¶?à·?à·?à¶à¶±à¶º à¶?රයà·? à¶?මà·?නà·?ම à¶?ය ලà·?à·?à·? à·?ටà·? à·?à·? à¶?නà·?à¶?à·?à¶à·? à·?මà·?නà·?à¶à¶» පරà·?à¶?නà¶? à·?රà·?à·? à¶?à·?නයමà·?නà·? à¶?බà¶?à·?à·? à¶?නà·?à¶à¶»à·?ජà·?ල à¶?නà·?දà·?නà·? à·?à¶?à·?à·? à¶à¶¶à·?à¶?නà·?. Tor යනà·? </string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
-index 478b7983..98793020 100644
---- a/app/src/main/res/values-sk/strings.xml
-+++ b/app/src/main/res/values-sk/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot je bezplatná proxy aplikácia, ktorá umožÅ?uje ostatným aplikáciam použÃvaÅ¥ internet bezpeÄ?nejÅ¡ie. Orbot použÃva Tor pre Å¡ifrovanie vaÅ¡ej internetovej komunikácie, ktorú následne schová za sériu náhodných poÄ?ÃtaÄ?ov z celého sveta. Tor je bezplatný software a otvorená sieÅ¥, ktorá pomáha chrániÅ¥ proti sledovaniu sietÃ, ktoré ohrozuje osobnú slobodu a súkromie, dôverné pracovné aktivity a vzÅ¥ahy a tiež bezpeÄ?nosÅ¥ Å¡tátov známu ako analýza prevádzky.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
-index 5a8d2d42..84df0612 100644
---- a/app/src/main/res/values-sl/strings.xml
-+++ b/app/src/main/res/values-sl/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org/?lang=sl</string>
- <string name="secure_default_web_url">https://check.torproject.org/?lang=sl</string>
-diff --git a/app/src/main/res/values-sn/strings.xml b/app/src/main/res/values-sn/strings.xml
-index 08498df8..880f85cd 100644
---- a/app/src/main/res/values-sn/strings.xml
-+++ b/app/src/main/res/values-sn/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
- <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
-index 4765e738..a4ca3dc7 100644
---- a/app/src/main/res/values-sq/strings.xml
-+++ b/app/src/main/res/values-sq/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot eshte nje perfaqesues falas per internetin i cili ndihmon programet e tjera te perdori internetin ne menyre me te sigurte. Orbot perdor Tor per te shifruar trafikun tuaj te internetit nepermjet nje serie me kompjutere perqark botes. Tor eshte nje softwere pa pagese dhe nje rrjet i hapur qe ju ndihmon juve te mbroheni nga cdo forme mbikqyrjeje ne rrjet qe cenon lirine dhe privatesine personale, aktivitetet konfidenciale te lidhjeve dhe bizneseve, dhe siqurine e gjendjes te njohur si analiza e trafikut.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
-index 35275219..6f47c97b 100644
---- a/app/src/main/res/values-sv/strings.xml
-+++ b/app/src/main/res/values-sv/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot är en gratis proxyapp som möjliggör andra appar att använda internet mer säkert. Orbot använder Tor för att kryptera din internettrafik och döljer den genom att den studsar genom ett antal datorer världen över. Tor är fri programvara och ett öppet nätverk som hjälper dig att skydda dig mot en form av nätverksövervakning som hotar personlig integritet och frihet, hemliga affärsaktiviteter och relationer, och skyddar mot statlig övervakning även kallad trafikanalys.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
-index 43ec54ad..a46ffd38 100644
---- a/app/src/main/res/values-th/strings.xml
-+++ b/app/src/main/res/values-th/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot à¸?ืà¸à¹?à¸à¸?à¸?รà¹?à¸à¸?à¸?ีà¸?รีà¸?ีà¹?à¸?à¹?วยà¹?à¸?ิà¹?มà¸?ระสิà¸?à¸?ิภาà¸?à¹?หà¹?à¸?ัà¸?à¹?à¸à¸?à¸à¸·à¹?à¸?à¹? à¹?หà¹?สามารà¸?à¹?à¸?à¹?à¸?าà¸?à¸à¸´à¸?à¹?à¸?à¸à¸£à¹?à¹?à¸?à¹?à¸?à¹?à¸?à¹?à¸à¸¢à¹?าà¸?à¸?ลà¸à¸?ภัยมาà¸?à¸?ึà¹?à¸? Orbot à¹?à¸?à¹? Tor à¹?à¸?à¸?ารà¹?à¸?à¹?ารหัสà¸?ารรัà¸?สà¹?à¸?à¸?à¹?à¸à¸¡à¸¹à¸¥à¸?าà¸?à¸à¸´à¸?à¹?à¸?à¸à¸£à¹?à¹?à¸?à¹?à¸?à¸?à¸à¸?à¸?ุà¸?à¹?ละà¸?ำà¸?ารà¸?à¹?à¸à¸?à¸?à¹?à¸à¸¡à¸¹à¸¥à¹?à¸?ยà¸?ารสะà¸?à¹?à¸à¸?à¸?ารà¹?à¸?ืà¹?à¸à¸¡à¸?à¹?à¸à¸?à¹?าà¸?à¸?ลุà¹?มà¸?à¸à¸?à¹?à¸?รืà¹?à¸à¸?à¸?à¸à¸¡à¸?ิวà¹?à¸?à¸à¸£à¹?à¸?ัà¹?วà¹?ลà¸? Tor à¹?à¸?à¹?à¸?à¸?à¸à¸?à¸?à¹?à¹?วรà¹?à¸?รีà¹?ละà¹?à¸?à¹?à¸?à¹?à¸?รืà¸à¸?à¹?ายà¹?à¸?à¸?à¹?à¸?ิà¸?à¸?ีà¹?à¸?à¹?วยà¸?à¸?à¸?à¹?à¸à¸?à¸?ุà¸?à¸?าà¸?à¸?ารสà¸à¸?สà¹?à¸à¸?à¹?à¸?รืà¸à¸?à¹?ายà¸?ีà¹?
à¸?ุà¸?à¸?ามà¸à¸´à¸ªà¸£à¸ าà¸?à¹?ละà¸?วามà¹?à¸?à¹?à¸?สà¹?วà¸?à¸?ัวà¸?à¸à¸?à¸?ูà¹?à¸?à¸? รัà¸?ษาà¸?วามลัà¸?à¸?าà¸?à¸?ุรà¸?ิà¸?à¹?ละà¸?วามสัมà¸?ัà¸?à¸?à¹? à¹?ละà¸?ารสรà¹?าà¸?à¸?วามà¸?ลà¸à¸?ภัยà¹?à¸?ยà¸?ารวิà¹?à¸?ราะหà¹?à¸?ารรัà¸?สà¹?à¸?à¸?à¹?à¸à¸¡à¸¹à¸¥</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml
-index 92f605a1..2b922a13 100644
---- a/app/src/main/res/values-tl/strings.xml
-+++ b/app/src/main/res/values-tl/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
-index c44cad3b..1ccef895 100644
---- a/app/src/main/res/values-tr/strings.xml
-+++ b/app/src/main/res/values-tr/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot baÅ?ka uygulamaların Ä°nterneti daha güvenli olarak kullanmasını saÄ?layan ücretsiz bir vekil sunucu uygulamasıdır. Orbot Tor yazılımını kullanarak Ä°nternet trafiÄ?inizi Å?ifreler ve dünya üzerindeki pek çok farklı bilgisayardan geçirerek gizler. Tor kiÅ?isel özgürlüÄ?ünüze, kiÅ?isel bilgilerinize, gizli ticari iÅ?lemlerinize ve iliÅ?kilerinize karÅ?ı tehdit oluÅ?turan ve devlet güvenliÄ?i olarak bilinen aÄ? izlemelerine karÅ?ı koruma saÄ?layan bir özgür yazılım ve açık aÄ? yazılımıdır.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">https://check.torproject.org/?lang=tr</string>
-diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
-index ba32ec23..c54f1549 100644
---- a/app/src/main/res/values-uk/strings.xml
-+++ b/app/src/main/res/values-uk/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot â?? Ñ?е вÑ?лÑ?на пÑ?огÑ?ама длÑ? пÑ?окÑ?Ñ?-з\'Ñ?днанÑ?, Ñ?ка дозволÑ?Ñ? Ñ?нÑ?им додаÑ?кам безпеÑ?нÑ?Ñ?е викоÑ?иÑ?Ñ?овÑ?ваÑ?и Ñ?нÑ?еÑ?неÑ?-з\'Ñ?днаннÑ?. Orbot викоÑ?иÑ?Ñ?овÑ?Ñ? Tor длÑ? Ñ?иÑ?Ñ?Ñ?ваннÑ? Ñ?нÑ?еÑ?неÑ?-Ñ?Ñ?аÑ?Ñ?кÑ?, Ñ?кий далÑ? пÑ?иÑ?овÑ?Ñ?Ñ?Ñ?Ñ?Ñ? пÑ?д Ñ?аÑ? пеÑ?еÑ?иланнÑ? Ñ?еÑ?ез кÑ?лÑ?ка комп\'Ñ?Ñ?еÑ?Ñ?в Ñ? Ñ?Ñ?зниÑ? Ñ?аÑ?Ñ?инаÑ? планеÑ?и. Tor Ñ? вÑ?лÑ?ним пÑ?огÑ?амним забезпеÑ?еннÑ?м, а Ñ?акож вÑ?дкÑ?иÑ?оÑ? меÑ?ежеÑ?, Ñ?о допомагаÑ? заÑ?иÑ?Ñ?иÑ?иÑ?Ñ? вÑ?д меÑ?ежевого Ñ?Ñ?еженнÑ?, Ñ?ке загÑ?ожÑ?Ñ? оÑ?обиÑ?Ñ?Ñ?й Ñ?вободÑ? Ñ?а пÑ?иваÑ?номÑ? жиÑ?Ñ?Ñ?, конÑ?Ñ?денÑ?Ñ?йнÑ?й бÑ?знеÑ?-дÑ?Ñ?лÑ?ноÑ?Ñ?Ñ? Ñ? конÑ?акÑ?ам, а Ñ?акож деÑ?жавноÑ? пÑ?огÑ?ами безпеки, Ñ?о Ð
²Ñ?дома Ñ?к аналÑ?з Ñ?Ñ?аÑ?Ñ?кÑ?.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-uz/strings.xml b/app/src/main/res/values-uz/strings.xml
-index ac5e479d..497cc900 100644
---- a/app/src/main/res/values-uz/strings.xml
-+++ b/app/src/main/res/values-uz/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
-index fd2b2133..f1684c2a 100644
---- a/app/src/main/res/values-vi/strings.xml
-+++ b/app/src/main/res/values-vi/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot là má»?t ứng dụng proxy miá»?n phÃ, Ä?ược thiết kế Ä?á»? là m cho các ứng dụng khác kết ná»?i vá»?i Internet má»?t cách an toà n. Orbot sá» dụng Tor Ä?á»? mã hóa các kết ná»?i Internet rá»?i ẩn danh nó thông qua má»?t loạt các nút trong mạng Tor. Tor là phần má»?m miá»?n phà và là má»?t mạng lÆ°á»?i má»? giúp bạn chá»?ng lại sá»± giám sát mạng, vá»?n Ä?e dá»?a riêng tÆ° trá»±c tuyến, hay các hoạt Ä?á»?ng bà máºt...</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
-index 5f2c7965..b69369e4 100644
---- a/app/src/main/res/values-zh-rCN/strings.xml
-+++ b/app/src/main/res/values-zh-rCN/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot æ?¯ä¸?款å??è´¹ç??代ç??åº?ç?¨ï¼?è?½å¤?让å?¶ä»?åº?ç?¨æ?´å®?å?¨å?°ä½¿ç?¨äº?è??ç½?ã??é??è¿?å?¨ä½?äº?ä¸?ç??å??å?°ç??ä¸?ç³»å??计ç®?æ?ºä¹?é?´è¿?è¡?跳转ï¼?Orbot å?¯å?©ç?¨ Tor 对ç½?ç»?é??ä¿¡è¿?è¡?å? å¯?并é??è??ã??Tor æ?¯ä¸?款å??è´¹ç??软件ï¼?并ä¸?æ?¯ä¸?个å¼?æ?¾ç??ç½?ç»?ã??å®?å?¯ä»¥ä¿?æ?¤ç?¨æ?·å??å??æµ?é??å??æ??ç??å?±å®³ï¼?è¿?ç§?ç½?ç»?ç??æ?§å?¯å¯¹ä¸ªäººè?ªç?±ä¸?é??ç§?ã??å??ä¸?æ?ºå¯?æ´»å?¨å??å?³ç³»ä»¥å??å?½å®¶å®?å?¨é? æ??å¨?è??ã??</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
-index 0a7c4d03..b397bd71 100644
---- a/app/src/main/res/values-zh-rTW/strings.xml
-+++ b/app/src/main/res/values-zh-rTW/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version='1.0' encoding='UTF-8'?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot æ?¯ä¸?款å??è²»ç??網絡代ç??æ??ç?¨ç¨?å¼?ï¼?ç?¨ä¾?ä¿?è·å?¶ä»?æ??ç?¨ç¨?å¼?ç??ä¸?網å®?å?¨ã??Orbot 使ç?¨ Tor å?¨å?¨ç??ä¸?ç³»å??ç??é?»è?¦é??è·³èº?ï¼?é??å?°å? å¯?並é?±è??網路æµ?é??ã??Tor æ?¯å??è?ªç?±è»?é«?ä¹?æ?¯å??é??æ?¾ç¶²è·¯ï¼?è?½å¹«æ?¨æ?µç¦¦æµ?é??å??æ??é??種網路ç?£æ?§æ¨¡å¼?ï¼?å®?å¨?è??å?°å??人ç??è?ªç?±è??é?±ç§?ã??å??æ¥æ©?å¯?æ´»å??è??å??å??é??ä¿?ã??ç??è?³å¨?è??å??家å®?å?¨ã??</string>
- <string name="internal_web_url">https://guardianproject.info/apps/orbot/</string>
- <string name="default_web_url">https://check.torproject.org</string>
-diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
-index fb51caa1..6cf4f993 100644
---- a/app/src/main/res/values/strings.xml
-+++ b/app/src/main/res/values/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</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="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-az/strings.xml b/orbotservice/src/main/res/values-az/strings.xml
-index c1d53370..9b851eb8 100644
---- a/orbotservice/src/main/res/values-az/strings.xml
-+++ b/orbotservice/src/main/res/values-az/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Pulsuz proksi tÉ?tbiqetmÉ?si olan Orbot baÅ?qa tÉ?tbiqetmÉ?lÉ?rÉ? internetdÉ?n daha tÉ?hlükÉ?siz istifadÉ? etmÉ?k imkanı verir. Orbot sizin internet trafikinizi Å?ifrÉ?lÉ?mÉ?k üçün Tordan istifadÉ? edir vÉ? dünyanın hÉ?r yerindÉ? kompüterlÉ?rin birindÉ?n o birinÉ? sıçramaqla bunu gizlÉ?dir. Tor pulsuz proqram tÉ?minatıdır, eyni zamanda sizin Å?É?xsi azadlıÄ?ınız vÉ? tÉ?hlükÉ?sizliyinizÉ?, gizli biznes fÉ?aliyyÉ?ti vÉ? É?laqÉ?lÉ?rÉ?, o cümlÉ?dÉ?n trafik analiz adlanan dövlÉ?t tÉ?hlükÉ?sizliyinÉ? xÉ?lÉ?l gÉ?tirÉ? bilÉ?cÉ?k Å?É?bÉ?kÉ? nÉ?zarÉ?ti formalarından müdafiÉ? olunmaÄ?a yardım edÉ?n açıq Å?É?bÉ?kÉ?dir.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-ca/strings.xml b/orbotservice/src/main/res/values-ca/strings.xml
-index c6632ded..36fb7d0b 100644
---- a/orbotservice/src/main/res/values-ca/strings.xml
-+++ b/orbotservice/src/main/res/values-ca/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">https://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-cs-rCZ/strings.xml b/orbotservice/src/main/res/values-cs-rCZ/strings.xml
-index 066b230a..c7bb4d9c 100644
---- a/orbotservice/src/main/res/values-cs-rCZ/strings.xml
-+++ b/orbotservice/src/main/res/values-cs-rCZ/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-cs/strings.xml b/orbotservice/src/main/res/values-cs/strings.xml
-index 65e386fa..aa78f3ae 100644
---- a/orbotservice/src/main/res/values-cs/strings.xml
-+++ b/orbotservice/src/main/res/values-cs/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-cy/strings.xml b/orbotservice/src/main/res/values-cy/strings.xml
-index a48a10a4..a7f78c30 100644
---- a/orbotservice/src/main/res/values-cy/strings.xml
-+++ b/orbotservice/src/main/res/values-cy/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-da/strings.xml b/orbotservice/src/main/res/values-da/strings.xml
-index 54b5004d..39a76a74 100644
---- a/orbotservice/src/main/res/values-da/strings.xml
-+++ b/orbotservice/src/main/res/values-da/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot er en gratis og åben proxy-applikation, der gør det muligt at anvende internettet mere sikkert fra andre programmer. Orbot bruger Tor til at kryptere internettrafikken, og skjuler den ved at sende den gennem serverere, lokaliseret i hele verden. Tor er gratis og åben software, der kan hjælpe dig mod netværksovervågning kaldet trafikanalyse, der kan true din personlige frihed, dit privatliv, handelsaktivitet og forhold.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-de/strings.xml b/orbotservice/src/main/res/values-de/strings.xml
-index acf26626..46bbf7bb 100644
---- a/orbotservice/src/main/res/values-de/strings.xml
-+++ b/orbotservice/src/main/res/values-de/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot ist eine kostenlose Proxy-Anwendung, mit deren Hilfe andere Anwendungen das Internet sicherer nutzen können. Orbot verwendet Tor, um Ihren Internetverkehr zu verschlüsseln und ihn dann zu verbergen, indem er über eine Reihe weltweit verteilter Computer geleitet wird. Tor ist ein freies Programm und ein offenes Netzwerk, das Ihnen hilft, sich gegen Angriffe auf die persönliche Freiheit und die Privatsphäre oder auf vertrauliche Geschäftsbeziehungen sowie gegen die Datenüberwachung aus Staatssicherheitsgründen zu wehren.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-el/strings.xml b/orbotservice/src/main/res/values-el/strings.xml
-index 675c6877..e592e349 100644
---- a/orbotservice/src/main/res/values-el/strings.xml
-+++ b/orbotservice/src/main/res/values-el/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-eo/strings.xml b/orbotservice/src/main/res/values-eo/strings.xml
-index 3c103de7..f41ecf08 100644
---- a/orbotservice/src/main/res/values-eo/strings.xml
-+++ b/orbotservice/src/main/res/values-eo/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-es-rAR/strings.xml b/orbotservice/src/main/res/values-es-rAR/strings.xml
-index b921a402..707ffa40 100644
---- a/orbotservice/src/main/res/values-es-rAR/strings.xml
-+++ b/orbotservice/src/main/res/values-es-rAR/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-es/strings.xml b/orbotservice/src/main/res/values-es/strings.xml
-index 76c8fa0b..e0bcc0a5 100644
---- a/orbotservice/src/main/res/values-es/strings.xml
-+++ b/orbotservice/src/main/res/values-es/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot es una aplicación libre de proxy (interpuesto) que faculta a otras aplicaciones para usar Internet de forma más segura. Orbot utiliza Tor para cifrar su tráfico de Internet, y luego lo oculta rebotándolo a través de una serie de computadoras por todo el mundo. Tor es software libre y una red abierta que le ayuda a defenderse contra una forma de vigilancia de red conocida como análisis de tráfico que amenaza la libertad y la privacidad personales, las actividades y relaciones comerciales confidenciales, y la seguridad de estado.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">https://check.torproject.org/?lang=es</string>
-diff --git a/orbotservice/src/main/res/values-et/strings.xml b/orbotservice/src/main/res/values-et/strings.xml
-index 9bb32b5d..b5387cbf 100644
---- a/orbotservice/src/main/res/values-et/strings.xml
-+++ b/orbotservice/src/main/res/values-et/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.orghttp://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-eu/strings.xml b/orbotservice/src/main/res/values-eu/strings.xml
-index f824a45a..160447dc 100644
---- a/orbotservice/src/main/res/values-eu/strings.xml
-+++ b/orbotservice/src/main/res/values-eu/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-fi/strings.xml b/orbotservice/src/main/res/values-fi/strings.xml
-index 2616f723..6c2a503d 100644
---- a/orbotservice/src/main/res/values-fi/strings.xml
-+++ b/orbotservice/src/main/res/values-fi/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot on ilmainen välityspalvelinsovellus, joka tarjoaa muille sovelluksille mahdollisuuden käyttää internetiä turvallisemmin. Orbot käyttää Toria kryptaamaan verkkoliikenteesi ja sitten piilottaa sen kierrättämällä sitä usean tietokoneen kautta ympäri maailman. Tor on vapaa ohjelmisto ja avoin verkosto, jotka auttavat puolustautumaan vapautta ja yksityisyyttä uhkaavalta verkkovalvonnalta ja valtioiden verkonseurannalta sekä suojaamaan salaisia liiketoimintoja ja -yhteyksiä.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-fr-rFR/strings.xml b/orbotservice/src/main/res/values-fr-rFR/strings.xml
-index 3a11d068..f43bf0a2 100644
---- a/orbotservice/src/main/res/values-fr-rFR/strings.xml
-+++ b/orbotservice/src/main/res/values-fr-rFR/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot est une appli libre de serveur mandataire permettant aux applis d\'utiliser Internet avec une sécurité accrue. Orbot utilise Tor pour chiffrer votre trafic Internet et le cache ensuite en le relayant au travers d\'ordinateurs de par le monde. Tor est un logiciel libre et un réseau ouvert qui vous aide à vous défendre contre une forme de surveillance réseau qui menace la liberté personnelle et la protection des données personnelles, les activités professionnelles confidentielles et les relations, et l\'analyse du trafic des gouvernements.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-fr/strings.xml b/orbotservice/src/main/res/values-fr/strings.xml
-index fa051335..f7d510b1 100644
---- a/orbotservice/src/main/res/values-fr/strings.xml
-+++ b/orbotservice/src/main/res/values-fr/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot est une application proxy gratuite qui améliore l\'utilisation plus sécurisée des applications. Orbot utilise Tor pour crypter votre trafic internet et le cacher en passant par une série d\'ordinateur partout dans le monde. Tor est un logiciel gratuit et un réseau ouvert qui vous aide à vous défendre contre les surveillances de réseau qui font peur à la liberté personnelle et la vie privée, les activités confidentielles des entreprises et des relations, et l\'état de la sécurité connu sous le nom d\'analyse de trafic.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-gl/strings.xml b/orbotservice/src/main/res/values-gl/strings.xml
-index c0afa0e4..03609374 100644
---- a/orbotservice/src/main/res/values-gl/strings.xml
-+++ b/orbotservice/src/main/res/values-gl/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot é unha aplicación de proxy libre que permite a outras aplicacións usar a internet dun xeito máis seguro. Orbot usa Tor para encriptar o teu tráfico de internet ocultando e rebotándoo a través dunha serie de ordenadores ao redor do mundo. Tor é software libre e unha rede aberta que axuda a defenderte contra unha forma de vixiancia na rede que ameaza a liberdade e privacidade persoal, actividades confidenciáis de negocios e relacións, e estado de seguridade coñecido como análise de tráfico.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-he/strings.xml b/orbotservice/src/main/res/values-he/strings.xml
-index e5e33f9b..9245cdc2 100644
---- a/orbotservice/src/main/res/values-he/strings.xml
-+++ b/orbotservice/src/main/res/values-he/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot ×?×?× ×? ×?פ×?×?קצ×?×?ת פר×?קס×? ×?×?× ×?×?ת ×?×?×?פשרת ×?×?פ×?×?קצ×?×?ת ×?×?ר×?ת ×?×?שת×?ש ×?×?×?× ×?×¨× ×? ×?×?×?×?×?. Orbot × ×¢×?רת ×?-Tor ×?×?×? ×?×?צפ×?×? ×?ת תע×?×?רת ×?×?×?× ×?×¨× ×? ש×?×? ×?×?×?ס×?×?ת×? ×?×?×?צע×?ת×? × ×?ת×?×?×? ×?ר×? ×?ספר ×?×?ש×?×?×? ×?ר×?×?×? ×?×¢×?×?×?. Tor ×?×?×? ת×?×?× ×? ×?×?פש×?ת ×?רשת פת×?×?×? ×?×?ס×?×?עת ×?×? ×?×?ת×?×?× ×? ×?×¤× ×? ס×?×?×?×? ×?ס×?×?×?×?×? ש×? ×?×?צע×? × ×?×?×?ר ×?×?עק×? ×?×?ר רשת ×?×?×?× ×?×¨× ×? ×?×?×?×?×?×?×?×? ×¢×? ×?פר×?×?×?ת, ×?×?×?ר×?ת ×?×?×?ש×?ת, פע×?×?×?×?×?ת עסק×?×?ת ×?×?ער×?×?ת ×?×?ס×?×? ×?ש×?×?×?ת.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-hi/strings.xml b/orbotservice/src/main/res/values-hi/strings.xml
-index 9156dfa2..45db42fd 100644
---- a/orbotservice/src/main/res/values-hi/strings.xml
-+++ b/orbotservice/src/main/res/values-hi/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">�रब�� �� म�फ�त ��प</string>
- <string name="menu_browse">ब�रा��़</string>
- <string name="menu_settings">स��ि���स</string>
-diff --git a/orbotservice/src/main/res/values-hr/strings.xml b/orbotservice/src/main/res/values-hr/strings.xml
-index 8d341f35..be3f647a 100644
---- a/orbotservice/src/main/res/values-hr/strings.xml
-+++ b/orbotservice/src/main/res/values-hr/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot je besplatna proxy aplikacija koja omoguÄ?uje ostalim aplikacijama da koriste internet sigurnije. Orbot koristi Tor za enkripciju VaÅ¡eg Internet prometa, a zatim ga skriva Å¡aljuÄ?i ga kroz seriju raÄ?unala diljem svijeta. Tor je besplatan software i otvorena mreža koja pomaže u borbi protiv nadzora mreže koji ugrožava osobne slobode i privatnost, povjerljive poslovne aktivnosti i odnose, te pomaže u borbi protiv analize prometa.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-hu/strings.xml b/orbotservice/src/main/res/values-hu/strings.xml
-index a854f25b..bb93ec6e 100644
---- a/orbotservice/src/main/res/values-hu/strings.xml
-+++ b/orbotservice/src/main/res/values-hu/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Az Orbot egy ingyenes proxy alkalmazás, ami képessé tesz alkalmazásokat, hogy biztonságosabban használhassák az internetet. Az Orbot Tor-t használ, hogy titkosÃtsa az internetforgalmadat és elrejtse azáltal, hogy pattogtatja számÃtógépek sorozatain keresztül a világ körül. A Tor ingyenes szoftver és nyitott hálózat, ami segÃt megvédeni a hálózati felügyelettÅ?l, ami fenyegeti a személyi szabadságot és magánéletet, a bizalmas céges tevékenységeket és kapcsolatokat, és állambiztonság cÃmén a forgalomelemzéstÅ?l.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-id/strings.xml b/orbotservice/src/main/res/values-id/strings.xml
-index c91af41b..f958e63f 100644
---- a/orbotservice/src/main/res/values-id/strings.xml
-+++ b/orbotservice/src/main/res/values-id/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot adalah aplikasi proxy gratis yang membuat aplikasi-aplikasi lainnya dapat terkoneksi dengan internet secara aman. Orbot menggunakan Tor untuk mengenkripsi hubungan internet anda dan menyalurkannya melewati berbagai komputer di seluruh dunia. Tor adalah software gratis dan suatu network terbuka, yang membantu anda menghindari pengawasan network yang mengancam kebebasan pribadi dan privasi, aktivitas bisnis rahasia dan relasi, serta keamanan negara yang dikenal dengan analisa traffic.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-in-rID/strings.xml b/orbotservice/src/main/res/values-in-rID/strings.xml
-index c91af41b..f958e63f 100644
---- a/orbotservice/src/main/res/values-in-rID/strings.xml
-+++ b/orbotservice/src/main/res/values-in-rID/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot adalah aplikasi proxy gratis yang membuat aplikasi-aplikasi lainnya dapat terkoneksi dengan internet secara aman. Orbot menggunakan Tor untuk mengenkripsi hubungan internet anda dan menyalurkannya melewati berbagai komputer di seluruh dunia. Tor adalah software gratis dan suatu network terbuka, yang membantu anda menghindari pengawasan network yang mengancam kebebasan pribadi dan privasi, aktivitas bisnis rahasia dan relasi, serta keamanan negara yang dikenal dengan analisa traffic.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-in/strings.xml b/orbotservice/src/main/res/values-in/strings.xml
-index 42c44612..01701557 100644
---- a/orbotservice/src/main/res/values-in/strings.xml
-+++ b/orbotservice/src/main/res/values-in/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-is/strings.xml b/orbotservice/src/main/res/values-is/strings.xml
-index bb91f636..e3381d11 100644
---- a/orbotservice/src/main/res/values-is/strings.xml
-+++ b/orbotservice/src/main/res/values-is/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot er ókeypis proxy smáforrit sem gerir öðrum smáforritum kleift að nota veraldarvefinn á öruggari hátt. Orbot notar Tor til að dulkóða umferð þÃna á netinu og felur hana svo með að hoppa à gegnum fjölda tölva um allan heim. Tor er ókeypis hugbúnaður og opið net sem aðstoðar þig við að verjast gegn eftirliti á netinu sem vinnur gegn frelsi einkalÃfsins og friðhelgi, trúnaðar viðskiptamálum og samböndum, og rÃkisöryggi þekkt sem umferðargreining.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-it/strings.xml b/orbotservice/src/main/res/values-it/strings.xml
-index a09c43e3..75accf86 100644
---- a/orbotservice/src/main/res/values-it/strings.xml
-+++ b/orbotservice/src/main/res/values-it/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot è un\'applicazione proxy che permette alle altre applicazioni di accedere a internet in maniera più sicura. Orbot usa Tor per cifrare il traffico internet e lo nasconde poi facendolo rimbalzare attraverso una serie di computer attorno al mondo. Tor è un software libero e una rete aperta che aiuta a difendersi da una forma di sorveglianza della rete conosciuta come analisi del traffico. Quest\'ultima minaccia libertà e privacy personale, attività commerciali riservate, rapporti interpersonali, e persino la sicurezza di stato.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-iw/strings.xml b/orbotservice/src/main/res/values-iw/strings.xml
-index e5e33f9b..9245cdc2 100644
---- a/orbotservice/src/main/res/values-iw/strings.xml
-+++ b/orbotservice/src/main/res/values-iw/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot ×?×?× ×? ×?פ×?×?קצ×?×?ת פר×?קס×? ×?×?× ×?×?ת ×?×?×?פשרת ×?×?פ×?×?קצ×?×?ת ×?×?ר×?ת ×?×?שת×?ש ×?×?×?× ×?×¨× ×? ×?×?×?×?×?. Orbot × ×¢×?רת ×?-Tor ×?×?×? ×?×?צפ×?×? ×?ת תע×?×?רת ×?×?×?× ×?×¨× ×? ש×?×? ×?×?×?ס×?×?ת×? ×?×?×?צע×?ת×? × ×?ת×?×?×? ×?ר×? ×?ספר ×?×?ש×?×?×? ×?ר×?×?×? ×?×¢×?×?×?. Tor ×?×?×? ת×?×?× ×? ×?×?פש×?ת ×?רשת פת×?×?×? ×?×?ס×?×?עת ×?×? ×?×?ת×?×?× ×? ×?×¤× ×? ס×?×?×?×? ×?ס×?×?×?×?×? ש×? ×?×?צע×? × ×?×?×?ר ×?×?עק×? ×?×?ר רשת ×?×?×?× ×?×¨× ×? ×?×?×?×?×?×?×?×? ×¢×? ×?פר×?×?×?ת, ×?×?×?ר×?ת ×?×?×?ש×?ת, פע×?×?×?×?×?ת עסק×?×?ת ×?×?ער×?×?ת ×?×?ס×?×? ×?ש×?×?×?ת.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-ja/strings.xml b/orbotservice/src/main/res/values-ja/strings.xml
-index d283168d..6546c60c 100644
---- a/orbotservice/src/main/res/values-ja/strings.xml
-+++ b/orbotservice/src/main/res/values-ja/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbotã?¯ä»?ã?®ã?¢ã??ã?ªã??ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã??ã??ã??å®?å?¨ã?«ä½¿ã??ã??ã?¨ã??å?¯è?½ã?«ã??ã??ã??ã?ªã?¼ã?®ã??ã?ã?ã?·ã?¢ã??ã?ªã?§ã??ã??Orbotã?§ã?¯ã??Torã??ç?¨ã??ã?¦ã??ã?ªã??ã?®ç«¯æ?«ã?®ã??ã?©ã??ã?£ã??ã?¯ã??æ??å?·å??ã??ã??ä¸?ç??ä¸ã?®ã?³ã?³ã??ã?¥ã?¼ã?¿ã?¼ã??ä¸ç¶?ã??ã??ã??ã?¨ã?§ã??ã??ã?®ã??ã?©ã??ã?£ã??ã?¯ã??é? ã??ã?¾ã??ã??Torã?¯ã??ã?ªã?¼ã?®ã?½ã??ã??ã?¦ã?§ã?¢ã?¨ã?ªã?¼ã??ã?³ã?ªã??ã??ã??ã?¯ã?¼ã?¯ã?§ã??ã??ã??ã?¦ã?¼ã?¶ã?¼ã?®è?ªç?±ã?¨ã??ã?©ã?¤ã??ã?·ã?¼ã??è??ã??ã??ç?£è¦?æ´»å??ã??ã??æ©?å¯?ã?®ã??ã?¸ã??ã?¹æ´»å??ã??å?½å®¶ã?«ã??ã??ã??ã?©ã??ã?£ã??ã?¯å??æ??ã??ã??身ã??å®?ã??ã??ã?¨ã??å?©ã??ã?¦ã??ã??ã?¾ã??ã??</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-ko/strings.xml b/orbotservice/src/main/res/values-ko/strings.xml
-index 765b5720..623d9334 100644
---- a/orbotservice/src/main/res/values-ko/strings.xml
-+++ b/orbotservice/src/main/res/values-ko/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-lv/strings.xml b/orbotservice/src/main/res/values-lv/strings.xml
-index 33eb1852..d8eca2b9 100644
---- a/orbotservice/src/main/res/values-lv/strings.xml
-+++ b/orbotservice/src/main/res/values-lv/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot ir starpniekserveru bezmaksas lietotne, kas sniedz iespÄ?ju citÄ?m lietotnÄ?m droÅ¡Ä?k lietot internetu. Orbot izmanto Tor, lai Å¡ifrÄ?tu JÅ«su interneta datplÅ«smu, tad to paslÄ?pj, pÄ?rsÅ«tot to caur daudziem datoriem visÄ? pasaulÄ?. Tor ir bezmaksas programmatÅ«ra un atvÄ?rts tÄ«kls, kas palÄ«dz Jums aizsargÄ?ties pret tÄ«kla uzraudzÄ«bas veidu - datplÅ«smas analÄ«zi -, ar kuras palÄ«dzÄ«bu tiek apdraudÄ?ta personiskÄ? brÄ«vÄ«ba un privÄ?tums, konfidenciÄ?las lietiÅ¡Ä·as darbÄ«bas un attiecÄ«bas, kÄ? arÄ« valsts droÅ¡Ä«ba. </string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-mk/strings.xml b/orbotservice/src/main/res/values-mk/strings.xml
-index 4d48678a..88957145 100644
---- a/orbotservice/src/main/res/values-mk/strings.xml
-+++ b/orbotservice/src/main/res/values-mk/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot е Ñ?лободна пÑ?окÑ?и апликаÑ?иÑ?а коÑ?а им овозможÑ?ва на дÑ?Ñ?гиÑ?е апликаÑ?ии да го коÑ?иÑ?Ñ?аÑ? инÑ?еÑ?неÑ?оÑ? побезбедно. Orbot коÑ?иÑ?Ñ?и Tor за Ñ?иÑ?Ñ?иÑ?аÑ?е на инÑ?еÑ?неÑ?-Ñ?ообÑ?аÑ?аÑ?оÑ?, а поÑ?оа го Ñ?окÑ?ива и го доÑ?Ñ?авÑ?ва пÑ?екÑ? неколкÑ? компÑ?Ñ?Ñ?еÑ?и во Ñ?елиоÑ? Ñ?веÑ?. Tor е Ñ?лободен Ñ?оÑ?Ñ?веÑ? и оÑ?воÑ?ена мÑ?ежа коÑ?а Ñ?е Ñ?пÑ?авÑ?ва Ñ?о вид надзоÑ? на мÑ?ежаÑ?а коÑ?а Ñ?Ñ?еÑ?и на лиÑ?наÑ?а Ñ?лобода и пÑ?иваÑ?ноÑ?Ñ?а, довеÑ?ливи деловни акÑ?ивноÑ?Ñ?и и одноÑ?и, и дÑ?жавнаÑ?а безбедноÑ?Ñ? познаÑ?а како анализа на Ñ?ообÑ?аÑ?аÑ?оÑ?.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-ms-rMY/strings.xml b/orbotservice/src/main/res/values-ms-rMY/strings.xml
-index c9cecc16..d991a2ac 100644
---- a/orbotservice/src/main/res/values-ms-rMY/strings.xml
-+++ b/orbotservice/src/main/res/values-ms-rMY/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-ms/strings.xml b/orbotservice/src/main/res/values-ms/strings.xml
-index 8e56f6a1..92208048 100644
---- a/orbotservice/src/main/res/values-ms/strings.xml
-+++ b/orbotservice/src/main/res/values-ms/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-nb/strings.xml b/orbotservice/src/main/res/values-nb/strings.xml
-index cd48c319..23d5a6d7 100644
---- a/orbotservice/src/main/res/values-nb/strings.xml
-+++ b/orbotservice/src/main/res/values-nb/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot er en gratis proxy app som gjør det mulig for andre apps å bruke internett mer sikkert. Orbot bruker Tor for å kryptere din Internettrafikk, og skjuler da din trafikk ved å sende trafikken gjennom en lang rekke datamaskiner over hele verden. Tor er et gratis dataprogram, og et åpent nettverk som hjelper deg å forsvare deg mot en form for nettverksovervåking som truer din personlige frihet og privatliv, konfidensiell bedriftsvirksomhet og relasjoner, og statlig sikkerhet kjent som trafikkanalyse.</string>
- <string name="internal_web_url">https://torproject.org</string>
- <string name="default_web_url">https://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-nl/strings.xml b/orbotservice/src/main/res/values-nl/strings.xml
-index 935bd901..f61d5db6 100644
---- a/orbotservice/src/main/res/values-nl/strings.xml
-+++ b/orbotservice/src/main/res/values-nl/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot is een gratis en vrije proxy-app die het andere apps mogelijk maakt het internet veiliger te gebruiken. Orbot gebruikt Tor om je internetverkeer te coderen en het vervolgens te verhullen het door het door een serie computers over de hele wereld te routeren. Tor is vrije software en een open netwerk dat je helpt te verdedigen tegen een vorm van netwerktoezicht die persoonlijke vrijheid en privacy, vertrouwelijke bedrijfsactiviteiten en relaties en staatsveiligheid genaamd \'traffic analyse\' bedreigt.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-pl/strings.xml b/orbotservice/src/main/res/values-pl/strings.xml
-index 960bd0af..be67cc76 100644
---- a/orbotservice/src/main/res/values-pl/strings.xml
-+++ b/orbotservice/src/main/res/values-pl/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot jest darmowÄ? aplikacjÄ? proxy która wspomaga inne aplikacje do używania internetu bezpiecznie. Orbot używa Tora do szyfrowania Twojego ruchu internetowego i nastÄ?pnie przepuszczania go przez wiele innych komputereów pororzucanych na caÅ?ym Å?wiecie. Tor jest darmowym oprogramowaniem i otwartÄ? sieciÄ? która pomaga Tobie w obronie przed monitoringiem sieci która zagrarza osobistej wolnoÅ?ci i prywatnoÅ?ci, poufnym biznesowym aktywnoÅ?ciom.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-pt-rBR/strings.xml b/orbotservice/src/main/res/values-pt-rBR/strings.xml
-index 47bd4184..e8912642 100644
---- a/orbotservice/src/main/res/values-pt-rBR/strings.xml
-+++ b/orbotservice/src/main/res/values-pt-rBR/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot é um aplicativo de proxy livre que capacita outros aplicativos a usar a internet com mais segurança. Orbot usa o Tor para criptografar seu tráfego na internet e então o esconde \"saltando\" entre uma série de computadores ao redor do mundo. Tor é um software livre e de rede aberta que ajuda você a se defender de certas formas de vigilância que ameaçam privacidade e liberdade pessoais, atividades e relações comerciais confidenciais e segurança estatal conhecida como análise de tráfego.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-pt-rPT/strings.xml b/orbotservice/src/main/res/values-pt-rPT/strings.xml
-index 20ba24b2..7ec5b7db 100644
---- a/orbotservice/src/main/res/values-pt-rPT/strings.xml
-+++ b/orbotservice/src/main/res/values-pt-rPT/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="wizard_title">Orbot</string>
- <!--Welcome Wizard strings (DJH)-->
- <!--END Welcome Wizard strings (DJH)-->
-diff --git a/orbotservice/src/main/res/values-pt/strings.xml b/orbotservice/src/main/res/values-pt/strings.xml
-index 69f7a770..bf6930e5 100644
---- a/orbotservice/src/main/res/values-pt/strings.xml
-+++ b/orbotservice/src/main/res/values-pt/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-ro/strings.xml b/orbotservice/src/main/res/values-ro/strings.xml
-index e445b4b7..ba48c91d 100644
---- a/orbotservice/src/main/res/values-ro/strings.xml
-+++ b/orbotservice/src/main/res/values-ro/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-rs-rAR/strings.xml b/orbotservice/src/main/res/values-rs-rAR/strings.xml
-index 132b67e8..a368dfcb 100644
---- a/orbotservice/src/main/res/values-rs-rAR/strings.xml
-+++ b/orbotservice/src/main/res/values-rs-rAR/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-ru/strings.xml b/orbotservice/src/main/res/values-ru/strings.xml
-index 94029fb0..82127335 100644
---- a/orbotservice/src/main/res/values-ru/strings.xml
-+++ b/orbotservice/src/main/res/values-ru/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot - Ñ?Ñ?о Ñ?вободнаÑ? пÑ?огÑ?амма длÑ? пÑ?окÑ?и-Ñ?оединений, она позволÑ?еÑ? дÑ?Ñ?гим пÑ?иложениÑ?м более безопаÑ?но иÑ?полÑ?зоваÑ?Ñ? инÑ?еÑ?неÑ?-Ñ?оединение. Orbot иÑ?полÑ?зÑ?еÑ? Tor длÑ? Ñ?иÑ?Ñ?ованиÑ? инÑ?еÑ?неÑ?-Ñ?Ñ?аÑ?ика, коÑ?оÑ?Ñ?й заÑ?ем Ñ?кÑ?Ñ?ваеÑ?Ñ?Ñ? в Ñ?оде пеÑ?еÑ?Ñ?лки Ñ?еÑ?ез неÑ?колÑ?ко компÑ?Ñ?Ñ?еÑ?ов в Ñ?азнÑ?Ñ? Ñ?аÑ?Ñ?Ñ?Ñ? планеÑ?Ñ?. Tor Ñ?влÑ?еÑ?Ñ?Ñ? Ñ?вободнÑ?м пÑ?огÑ?аммнÑ?м пÑ?иложением, а Ñ?акже оÑ?кÑ?Ñ?Ñ?ой Ñ?еÑ?Ñ?Ñ?, помогаÑ?Ñ?ей заÑ?иÑ?иÑ?Ñ?Ñ?Ñ? оÑ? Ñ?лежки в Ñ?еÑ?Ñ?Ñ?, Ñ?гÑ?ожаÑ?Ñ?ей лиÑ?ной Ñ?вободе и Ñ?аÑ?Ñ?ной жизни, конÑ?иденÑ?иалÑ?нÑ?м бизнеÑ?-деÑ?Ñ?елÑ?ноÑ?Ñ?и и конÑ?акÑ?ам, а Ñ?акже гоÑ?Ñ?даÑ?Ñ?Ñ?венной пÑ?огÑ?амме б
езопаÑ?ноÑ?Ñ?и, извеÑ?Ñ?ной как анализ Ñ?Ñ?аÑ?ика.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-si-rLK/strings.xml b/orbotservice/src/main/res/values-si-rLK/strings.xml
-index dfda50a4..5880bf97 100644
---- a/orbotservice/src/main/res/values-si-rLK/strings.xml
-+++ b/orbotservice/src/main/res/values-si-rLK/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-sk/strings.xml b/orbotservice/src/main/res/values-sk/strings.xml
-index 2f648ef5..20841e2b 100644
---- a/orbotservice/src/main/res/values-sk/strings.xml
-+++ b/orbotservice/src/main/res/values-sk/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-sl/strings.xml b/orbotservice/src/main/res/values-sl/strings.xml
-index 1b8a4c6b..12ac776d 100644
---- a/orbotservice/src/main/res/values-sl/strings.xml
-+++ b/orbotservice/src/main/res/values-sl/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org/?lang=sl</string>
- <string name="secure_default_web_url">https://check.torproject.org/?lang=sl</string>
-diff --git a/orbotservice/src/main/res/values-sn/strings.xml b/orbotservice/src/main/res/values-sn/strings.xml
-index ad1cd1de..d5ade2c6 100644
---- a/orbotservice/src/main/res/values-sn/strings.xml
-+++ b/orbotservice/src/main/res/values-sn/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
- <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-diff --git a/orbotservice/src/main/res/values-sv/strings.xml b/orbotservice/src/main/res/values-sv/strings.xml
-index e176cb2a..e56ebd05 100644
---- a/orbotservice/src/main/res/values-sv/strings.xml
-+++ b/orbotservice/src/main/res/values-sv/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot är en gratis proxyapp som möjliggör andra appar att använda internet mer säkert. Orbot använder Tor för att kryptera din internettrafik och döljer den genom att den studsar genom ett antal datorer världen över. Tor är fri programvara och ett öppet nätverk som hjälper dig att skydda dig mot en form av nätverksövervakning som hotar personlig integritet och frihet, hemliga affärsaktiviteter och relationer, och skyddar mot statlig övervakning även kallad trafikanalys.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-th/strings.xml b/orbotservice/src/main/res/values-th/strings.xml
-index d73cfbe4..2d0ea772 100644
---- a/orbotservice/src/main/res/values-th/strings.xml
-+++ b/orbotservice/src/main/res/values-th/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-tl/strings.xml b/orbotservice/src/main/res/values-tl/strings.xml
-index ab165c1e..f2ef8e30 100644
---- a/orbotservice/src/main/res/values-tl/strings.xml
-+++ b/orbotservice/src/main/res/values-tl/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-tr/strings.xml b/orbotservice/src/main/res/values-tr/strings.xml
-index ac750255..ec2a1f17 100644
---- a/orbotservice/src/main/res/values-tr/strings.xml
-+++ b/orbotservice/src/main/res/values-tr/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot baÅ?ka uygulamaların interneti daha güvenli olarak kullanmasını saÄ?layan ücretsiz bir proxy uygulamasıdır. Orbot Tor\'u kullanarak internet trafiÄ?inizi Å?ifreler ve dünya üzerindeki pek çok farklı bilgisayardan geçirerek gizler. Tor sizin kiÅ?isel özgürlüÄ?ünüzü ve mahremiyetinizi, gizli ticari aktivitelerinizi ve baÄ?lantılarınızı koruma altına alan bir yazılım ve açık aÄ?dır.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">https://check.torproject.org/?lang=tr</string>
-diff --git a/orbotservice/src/main/res/values-uk/strings.xml b/orbotservice/src/main/res/values-uk/strings.xml
-index 9672e2c2..2bea2383 100644
---- a/orbotservice/src/main/res/values-uk/strings.xml
-+++ b/orbotservice/src/main/res/values-uk/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot â?? Ñ?е вÑ?лÑ?на пÑ?огÑ?ама длÑ? пÑ?окÑ?Ñ?-з\'Ñ?днанÑ?, Ñ?ка дозволÑ?Ñ? Ñ?нÑ?им додаÑ?кам безпеÑ?нÑ?Ñ?е викоÑ?иÑ?Ñ?овÑ?ваÑ?и Ñ?нÑ?еÑ?неÑ?-з\'Ñ?днаннÑ?. Orbot викоÑ?иÑ?Ñ?овÑ?Ñ? Tor длÑ? Ñ?иÑ?Ñ?Ñ?ваннÑ? Ñ?нÑ?еÑ?неÑ?-Ñ?Ñ?аÑ?Ñ?кÑ?, Ñ?кий далÑ? пÑ?иÑ?овÑ?Ñ?Ñ?Ñ?Ñ?Ñ? пÑ?д Ñ?аÑ? пеÑ?еÑ?иланнÑ? Ñ?еÑ?ез кÑ?лÑ?ка комп\'Ñ?Ñ?еÑ?Ñ?в Ñ? Ñ?Ñ?зниÑ? Ñ?аÑ?Ñ?инаÑ? планеÑ?и. Tor Ñ? вÑ?лÑ?ним пÑ?огÑ?амним забезпеÑ?еннÑ?м, а Ñ?акож вÑ?дкÑ?иÑ?оÑ? меÑ?ежеÑ?, Ñ?о допомагаÑ? заÑ?иÑ?Ñ?иÑ?иÑ?Ñ? вÑ?д меÑ?ежевого Ñ?Ñ?еженнÑ?, Ñ?ке загÑ?ожÑ?Ñ? оÑ?обиÑ?Ñ?Ñ?й Ñ?вободÑ? Ñ?а пÑ?иваÑ?номÑ? жиÑ?Ñ?Ñ?, конÑ?Ñ?денÑ?Ñ?йнÑ?й бÑ?знеÑ?-дÑ?Ñ?лÑ?ноÑ?Ñ?Ñ? Ñ? конÑ?акÑ?ам, а Ñ?акож деÑ?жавноÑ? пÑ?огÑ?ами безпеки, Ñ?о Ð
²Ñ?дома Ñ?к аналÑ?з Ñ?Ñ?аÑ?Ñ?кÑ?.</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-uz/strings.xml b/orbotservice/src/main/res/values-uz/strings.xml
-index 785d9672..cff0ea57 100644
---- a/orbotservice/src/main/res/values-uz/strings.xml
-+++ b/orbotservice/src/main/res/values-uz/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-vi/strings.xml b/orbotservice/src/main/res/values-vi/strings.xml
-index 0401b9ce..d844ce8c 100644
---- a/orbotservice/src/main/res/values-vi/strings.xml
-+++ b/orbotservice/src/main/res/values-vi/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot là má»?t ứng dụng proxy miá»?n phÃ, Ä?ược thiết kế Ä?á»? là m cho các ứng dụng khác kết ná»?i vá»?i Internet má»?t cách an toà n. Orbot sá» dụng Tor Ä?á»? mã hóa các kết ná»?i Internet rá»?i ẩn danh nó thông qua má»?t loạt các nút trong mạng Tor. Tor là phần má»?m miá»?n phà và là má»?t mạng lÆ°á»?i má»? giúp bạn chá»?ng lại sá»± giám sát mạng, vá»?n Ä?e dá»?a riêng tÆ° trá»±c tuyến, hay các hoạt Ä?á»?ng bà máºt...</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-zh-rCN/strings.xml b/orbotservice/src/main/res/values-zh-rCN/strings.xml
-index 49459292..f2754d65 100644
---- a/orbotservice/src/main/res/values-zh-rCN/strings.xml
-+++ b/orbotservice/src/main/res/values-zh-rCN/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbot æ?¯ä¸?款å??è´¹ç??代ç??åº?ç?¨ï¼?è?½å¤?让å?¶ä»?åº?ç?¨æ?´å®?å?¨å?°ä½¿ç?¨äº?è??ç½?ã??é??è¿?å?¨ä½?äº?ä¸?ç??å??å?°ç??ä¸?ç³»å??计ç®?æ?ºä¹?é?´è¿?è¡?跳转ï¼?Orbot å?¯å?©ç?¨ Tor 对ç½?ç»?é??ä¿¡è¿?è¡?å? å¯?并é??è??ã??Tor æ?¯ä¸?款å??è´¹ç??软件ï¼?并ä¸?æ?¯ä¸?个å¼?æ?¾ç??ç½?ç»?ã??å®?å?¯ä»¥ä¿?æ?¤ç?¨æ?·å??å??æµ?é??å??æ??ç??å?±å®³ï¼?è¿?ç§?ç½?ç»?ç??æ?§å?¯å¯¹ä¸ªäººè?ªç?±ä¸?é??ç§?ã??å??ä¸?æ?ºå¯?æ´»å?¨å??å?³ç³»ä»¥å??å?½å®¶å®?å?¨é? æ??å¨?è??ã??</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
-diff --git a/orbotservice/src/main/res/values-zh-rTW/strings.xml b/orbotservice/src/main/res/values-zh-rTW/strings.xml
-index b255c75c..2558fef6 100644
---- a/orbotservice/src/main/res/values-zh-rTW/strings.xml
-+++ b/orbotservice/src/main/res/values-zh-rTW/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</string>
- <string name="app_description">Orbotæ?¯ä¸?款å??è²»ç??網絡代ç??æ??ç?¨ç¨?å¼?ï¼?ç?¨ä¾?ä¿?è·å?¶ä»?æ??ç?¨ç¨?å¼?ç??ä¸?網å®?å?¨ã??
- Orbot使ç?¨Torå?¨å?¨ç??ä¸?ç³»å??ç??é?»è?¦é??è·³èº?ï¼?以便é?±è??網路æµ?é??並å? å¯?ã??Toræ?¯å??å??è²»è»?é«?ä¹?æ?¯å??é??æ?¾ç¶²è·¯ï¼?è?½å¹«æ?¨æ?µç¦¦æµ?é??å??æ??ã??å®?æ?¯æ??ä¸?種網路ç?£æ?§ï¼?ç?½æ¶?å?°å??人ç??è?ªç?±è??é?±ç§?ã??å??æ¥é?¨å??ç??æ©?å¯?é??ä¿?å??æ´»å??ã??ç??è?³å??家å®?å?¨ã??</string>
- <string name="internal_web_url">http://orbot/</string>
-diff --git a/orbotservice/src/main/res/values/strings.xml b/orbotservice/src/main/res/values/strings.xml
-index 11485598..f269d88f 100644
---- a/orbotservice/src/main/res/values/strings.xml
-+++ b/orbotservice/src/main/res/values/strings.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <resources>
-- <string name="app_name">Orbot</string>
-+ <string name="app_name">Tor Browser</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="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
---
-2.17.1
-
diff --git a/projects/orbot/0011-Bug-28051-Tell-Proguard-it-should-keep-an-unused-met.patch b/projects/orbot/0011-Bug-28051-Tell-Proguard-it-should-keep-an-unused-met.patch
deleted file mode 100644
index 778196f..0000000
--- a/projects/orbot/0011-Bug-28051-Tell-Proguard-it-should-keep-an-unused-met.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 10f169fd4f963f1cdcd7e6a2b8306322bb54e901 Mon Sep 17 00:00:00 2001
-From: Matthew Finkel <Matthew.Finkel@xxxxxxxxx>
-Date: Tue, 27 Nov 2018 15:37:22 +0000
-Subject: [PATCH 11/13] Bug 28051 - Tell Proguard it should keep an unused
- method
-
----
- app/proguard-rules.txt | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/app/proguard-rules.txt b/app/proguard-rules.txt
-index b1120f82..3a8d4ef9 100644
---- a/app/proguard-rules.txt
-+++ b/app/proguard-rules.txt
-@@ -11,4 +11,12 @@
- -keep class okhttp3.** { *; }
- -keep interface okhttp3.** { *; }
- -dontwarn okhttp3.**
---dontwarn okio.**
-\ No newline at end of file
-+-dontwarn okio.**
-+
-+# This method is called in the main Application (which is now
-+# Fennec's GeckoApplication), so we must explicitly keep this
-+# or else proguard sees it is not used when then library is
-+# compiled and prunes it.
-+-keep class org.torproject.android.settings.Languages {
-+ void setup(java.lang.Class, int);
-+}
---
-2.17.1
-
diff --git a/projects/orbot/0012-Bug-28051-Escape-the-apostrophe-correctly.patch b/projects/orbot/0012-Bug-28051-Escape-the-apostrophe-correctly.patch
deleted file mode 100644
index 89592c0..0000000
--- a/projects/orbot/0012-Bug-28051-Escape-the-apostrophe-correctly.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 14a02d41d9be2ab7a90f9af321e07e07ae3c2b15 Mon Sep 17 00:00:00 2001
-From: Matthew Finkel <Matthew.Finkel@xxxxxxxxx>
-Date: Sat, 24 Nov 2018 04:55:53 +0000
-Subject: [PATCH 12/13] Bug 28051 - Escape the apostrophe correctly
-
----
- app/src/main/res/values-be/strings.xml | 12 ++++++------
- app/src/main/res/values-en-rGB/poestrings.xml | 2 +-
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
-index c4ff8ec9..03d8e29d 100644
---- a/app/src/main/res/values-be/strings.xml
-+++ b/app/src/main/res/values-be/strings.xml
-@@ -43,9 +43,9 @@
- <string name="pref_transparent_all_title">Ð?акÑ?Ñ?оÑ?ваÑ?Ñ? Ñ?Ñ?Ñ? пÑ?аз Tor</string>
- <string name="pref_transparent_all_summary">Ð?акÑ?Ñ?оÑ?ваÑ?Ñ? Ñ?Ñ?аÑ?Ñ?к Ñ?Ñ?Ñ?Ñ? дадаÑ?каÑ? пÑ?аз Tor</string>
- <string name="pref_transparent_port_fallback_title">Ð Ñ?зеÑ?вовÑ? поÑ?Ñ? пÑ?окÑ?Ñ?</string>
-- <string name="pref_transparent_port_fallback_summary">Ð?Ð?Ð?ЯРÐÐ?Ð?Ð?Ð?Ð?Ð?: абÑ?Ñ?одзÑ?Ñ?Ñ? агÑ?лÑ?нÑ?Ñ? паÑ?Ñ?Ñ? (80, 443 Ñ? г. д.). *Ð?ЫÐ?Ð?РЫСТÐ?Ð?Ð?Ð?ЦЬ ТÐ?Ð?ЬÐ?Ð?* калÑ? Ñ?Ñ?жÑ?мÑ? \\'УÑ?Ñ?\\' Ñ?Ñ? \\'Ð?адаÑ?ак\\' не пÑ?аÑ?Ñ?Ñ?Ñ?Ñ?.</string>
-+ <string name="pref_transparent_port_fallback_summary">Ð?Ð?Ð?ЯРÐÐ?Ð?Ð?Ð?Ð?Ð?: абÑ?Ñ?одзÑ?Ñ?Ñ? агÑ?лÑ?нÑ?Ñ? паÑ?Ñ?Ñ? (80, 443 Ñ? г. д.). *Ð?ЫÐ?Ð?РЫСТÐ?Ð?Ð?Ð?ЦЬ ТÐ?Ð?ЬÐ?Ð?* калÑ? Ñ?Ñ?жÑ?мÑ? \'УÑ?Ñ?\' Ñ?Ñ? \'Ð?адаÑ?ак\' не пÑ?аÑ?Ñ?Ñ?Ñ?Ñ?.</string>
- <string name="pref_transparent_port_title">СпÑ?Ñ? паÑ?Ñ?оÑ?</string>
-- <string name="pref_transparent_port_summary">СпÑ?Ñ? паÑ?Ñ?оÑ? длÑ? пÑ?окÑ?Ñ?каÑ?Ñ?Ñ?. *Ð?ЫÐ?Ð?РЫСТÐ?Ð?Ð?Ð?ЦЬ ТÐ?Ð?ЬÐ?Ð?* калÑ? Ñ?Ñ?жÑ?мÑ? \\'УÑ?Ñ?\\' Ñ?Ñ? \\'Ð?адаÑ?ак\\' не пÑ?аÑ?Ñ?Ñ?Ñ?Ñ?.</string>
-+ <string name="pref_transparent_port_summary">СпÑ?Ñ? паÑ?Ñ?оÑ? длÑ? пÑ?окÑ?Ñ?каÑ?Ñ?Ñ?. *Ð?ЫÐ?Ð?РЫСТÐ?Ð?Ð?Ð?ЦЬ ТÐ?Ð?ЬÐ?Ð?* калÑ? Ñ?Ñ?жÑ?мÑ? \'УÑ?Ñ?\' Ñ?Ñ? \'Ð?адаÑ?ак\' не пÑ?аÑ?Ñ?Ñ?Ñ?Ñ?.</string>
- <string name="pref_transparent_port_dialog">УвÑ?дзÑ?Ñ?е паÑ?Ñ?Ñ? длÑ? пÑ?окÑ?Ñ?Ñ?аÑ?Ñ?Ñ?</string>
- <string name="pref_has_root">Ð?апÑ?Ñ?аÑ?Ñ? root-доÑ?Ñ?Ñ?п</string>
- <string name="pref_has_root_summary">Ð?апÑ?Ñ?аÑ?Ñ? root-доÑ?Ñ?Ñ?п длÑ? пÑ?азÑ?Ñ?Ñ?Ñ?ай пÑ?окÑ?Ñ?Ñ?аÑ?Ñ?Ñ?</string>
-@@ -87,7 +87,7 @@
- <string name="wizard_final_msg">Ð?Ñ?лÑ?Ñ?нÑ? лÑ?дзей ва Ñ?Ñ?Ñ?м Ñ?веÑ?е вÑ?каÑ?Ñ?Ñ?Ñ?оÑ?ваÑ?Ñ?Ñ? Tor па Ñ?ознÑ?Ñ? пÑ?Ñ?Ñ?Ñ?наÑ?. Ð?Ñ?Ñ?налÑ?Ñ?Ñ?Ñ? Ñ? блогеÑ?Ñ?, пÑ?аваабаÑ?онÑ?Ñ?, Ñ?Ñ?пÑ?аÑ?оÑ?нÑ?кÑ? пÑ?авааÑ?оÑ?нÑ?Ñ? оÑ?ганаÑ?, Ñ?алдаÑ?Ñ?, каÑ?паÑ?аÑ?Ñ?Ñ?, гÑ?амадзÑ?не кÑ?аÑ?н з Ñ?Ñ?пÑ?Ñ?Ñ?Ñ?Ñ?нÑ?м Ñ?Ñ?жÑ?мам Ñ? пÑ?оÑ?Ñ?а звÑ?Ñ?айнÑ?Ñ? гÑ?амадзÑ?не..., а заÑ?аз гаÑ?овÑ? Ñ? вÑ?!</string>
- <string name="wizard_exit_at_first_screen_toast">Ð?алÑ? лаÑ?ка, наладзÑ?Ñ?е Orbot пеÑ?Ñ? Ñ?Ñ?м пÑ?Ñ?Ñ?Ñ?Ñ?пÑ?Ñ?Ñ? да вÑ?каÑ?Ñ?Ñ?Ñ?аннÑ?!</string>
- <!--END Welcome Wizard strings (DJH)-->
-- <string name="connect_first_time">Ð?Ñ? паÑ?пÑ?Ñ?ова далÑ?Ñ?Ñ?лÑ?Ñ?Ñ? да Ñ?еÑ?кÑ? Tor, але гÑ?Ñ?а Ð?Ð? знаÑ?Ñ?Ñ?Ñ?, Ñ?Ñ?о ваÑ?а пÑ?Ñ?лада бÑ?Ñ?пеÑ?наÑ?. Ð?Ñ? можаÑ?е Ñ?каÑ?Ñ?Ñ?Ñ?аÑ?Ñ?а Ñ?Ñ?нкÑ?Ñ?Ñ?й \\'Ð?Ñ?авеÑ?ка\\' з менÑ?, каб пÑ?аÑ?Ñ?Ñ?Ñ?аваÑ?Ñ? ваÑ? бÑ?аÑ?заÑ?.\n\nÐ?аведаеÑ?е наÑ? Ñ?айÑ? https://guardianproject.info/apps/orbot Ñ?Ñ? адпÑ?аÑ?Ñ?е лÑ?Ñ?Ñ? на адÑ?аÑ? help@xxxxxxxxxxxxxxxxxxxx, каб даведаÑ?Ñ?а болÑ?Ñ?.</string>
-+ <string name="connect_first_time">Ð?Ñ? паÑ?пÑ?Ñ?ова далÑ?Ñ?Ñ?лÑ?Ñ?Ñ? да Ñ?еÑ?кÑ? Tor, але гÑ?Ñ?а Ð?Ð? знаÑ?Ñ?Ñ?Ñ?, Ñ?Ñ?о ваÑ?а пÑ?Ñ?лада бÑ?Ñ?пеÑ?наÑ?. Ð?Ñ? можаÑ?е Ñ?каÑ?Ñ?Ñ?Ñ?аÑ?Ñ?а Ñ?Ñ?нкÑ?Ñ?Ñ?й \'Ð?Ñ?авеÑ?ка\' з менÑ?, каб пÑ?аÑ?Ñ?Ñ?Ñ?аваÑ?Ñ? ваÑ? бÑ?аÑ?заÑ?.\n\nÐ?аведаеÑ?е наÑ? Ñ?айÑ? https://guardianproject.info/apps/orbot Ñ?Ñ? адпÑ?аÑ?Ñ?е лÑ?Ñ?Ñ? на адÑ?аÑ? help@xxxxxxxxxxxxxxxxxxxx, каб даведаÑ?Ñ?а болÑ?Ñ?.</string>
- <string name="tor_check">Ð?Ñ?Ñ?а пÑ?Ñ?вÑ?дзе да запÑ?Ñ?кÑ? бÑ?аÑ?заÑ?а, абÑ?анага на ваÑ?ай пÑ?Ñ?ладзе па змаÑ?Ñ?аннÑ?, Ñ? падклÑ?Ñ?Ñ?ннÑ? да Ñ?айÑ?а https://check.torproject.org дзелÑ? пÑ?авеÑ?кÑ? пÑ?авÑ?лÑ?наÑ?Ñ?Ñ? пÑ?аÑ?Ñ? Orbot Ñ? вÑ?знаÑ?Ñ?ннÑ?, Ñ?Ñ? падклÑ?Ñ?анÑ? вÑ? да Ñ?еÑ?кÑ? Tor.</string>
- <string name="pref_hs_group">СÑ?аванÑ?Ñ? Ñ?лÑ?жбÑ?</string>
- <string name="pref_general_group">Ð?гÑ?лÑ?нÑ?Ñ?</string>
-@@ -101,9 +101,9 @@
- <string name="wizard_warning_msg">Сама па Ñ?абе Ñ?Ñ?Ñ?алÑ?Ñ?ка Orbot не зÑ?обÑ?Ñ?Ñ? аÑ?Ñ?амаÑ?Ñ?Ñ?на ваÑ? мабÑ?лÑ?нÑ? Ñ?Ñ?аÑ?Ñ?к ананÑ?мнÑ?м.\n\n Ð?Ñ? павÑ?ннÑ? пÑ?авÑ?лÑ?на наладзÑ?Ñ?Ñ? Orbot, ваÑ?Ñ? пÑ?Ñ?ладÑ? Ñ? Ñ?нÑ?Ñ?Ñ? дадаÑ?кÑ?, Ñ?Ñ?о б паÑ?пÑ?Ñ?ова вÑ?каÑ?Ñ?Ñ?Ñ?оÑ?ваÑ?Ñ? Tor.</string>
- <!--Permissions screen-->
- <string name="wizard_permissions_title">Ð?азволÑ?</string>
-- <string name="wizard_permissions_root_msg1">Ð?Ñ? гÑ?Ñ?ак жа можаÑ?е па жаданнÑ? даÑ?Ñ? Orbot пÑ?авÑ? \\'СÑ?пеÑ?каÑ?Ñ?Ñ?Ñ?аÑ?а\\' длÑ? доÑ?Ñ?Ñ?пÑ? да дадаÑ?ковÑ?Ñ? магÑ?Ñ?маÑ?Ñ?Ñ?Ñ? Ñ?Ñ?пÑ? пÑ?азÑ?Ñ?Ñ?Ñ?ай пÑ?окÑ?Ñ?Ñ?аÑ?Ñ?Ñ?.</string>
-- <string name="wizard_permissions_root_msg2">Ð?даеÑ?Ñ?а, ваÑ?а пÑ?Ñ?лада не мае root-пÑ?авоÑ? Ñ? не пÑ?апанÑ?е доÑ?Ñ?Ñ?п \\'СÑ?пеÑ?каÑ?Ñ?Ñ?Ñ?аÑ?а\\'.\n\nÐ?алÑ? лаÑ?ка, паÑ?пÑ?абÑ?йÑ?е Ñ?Ñ?жÑ?м \\'Ð?адаÑ?кÑ?\\' на галоÑ?нÑ?м Ñ?кÑ?ане.</string>
-- <string name="wizard_permissions_no_root_msg">Ð?даеÑ?Ñ?а, ваÑ?а пÑ?Ñ?лада не мае root-пÑ?авоÑ? Ñ? не пÑ?апанÑ?е доÑ?Ñ?Ñ?п \\'СÑ?пеÑ?каÑ?Ñ?Ñ?Ñ?аÑ?а\\'.\n\n Ð?алÑ? лаÑ?ка, паÑ?пÑ?абÑ?йÑ?е Ñ?Ñ?жÑ?м \\'Ð?адаÑ?кÑ?\\' на галоÑ?нÑ?м Ñ?кÑ?ане.</string>
-+ <string name="wizard_permissions_root_msg1">Ð?Ñ? гÑ?Ñ?ак жа можаÑ?е па жаданнÑ? даÑ?Ñ? Orbot пÑ?авÑ? \'СÑ?пеÑ?каÑ?Ñ?Ñ?Ñ?аÑ?а\' длÑ? доÑ?Ñ?Ñ?пÑ? да дадаÑ?ковÑ?Ñ? магÑ?Ñ?маÑ?Ñ?Ñ?Ñ? Ñ?Ñ?пÑ? пÑ?азÑ?Ñ?Ñ?Ñ?ай пÑ?окÑ?Ñ?Ñ?аÑ?Ñ?Ñ?.</string>
-+ <string name="wizard_permissions_root_msg2">Ð?даеÑ?Ñ?а, ваÑ?а пÑ?Ñ?лада не мае root-пÑ?авоÑ? Ñ? не пÑ?апанÑ?е доÑ?Ñ?Ñ?п \'СÑ?пеÑ?каÑ?Ñ?Ñ?Ñ?аÑ?а\'.\n\nÐ?алÑ? лаÑ?ка, паÑ?пÑ?абÑ?йÑ?е Ñ?Ñ?жÑ?м \'Ð?адаÑ?кÑ?\' на галоÑ?нÑ?м Ñ?кÑ?ане.</string>
-+ <string name="wizard_permissions_no_root_msg">Ð?даеÑ?Ñ?а, ваÑ?а пÑ?Ñ?лада не мае root-пÑ?авоÑ? Ñ? не пÑ?апанÑ?е доÑ?Ñ?Ñ?п \'СÑ?пеÑ?каÑ?Ñ?Ñ?Ñ?аÑ?а\'.\n\n Ð?алÑ? лаÑ?ка, паÑ?пÑ?абÑ?йÑ?е Ñ?Ñ?жÑ?м \'Ð?адаÑ?кÑ?\' на галоÑ?нÑ?м Ñ?кÑ?ане.</string>
- <!--TipsAndTricks screen-->
- <string name="wizard_tips_title">Ð?адаÑ?кÑ?, Ñ?Ñ?о пÑ?аÑ?Ñ?Ñ?Ñ?Ñ? з Orbot</string>
- <string name="wizard_tips_gibberbot">ChatSecure: дадаÑ?ак длÑ? бÑ?Ñ?пеÑ?нага лÑ?Ñ?Ñ?аваннÑ? з пÑ?Ñ?ваÑ?нÑ?м Ñ?Ñ?Ñ?Ñ?аваннем</string>
-diff --git a/app/src/main/res/values-en-rGB/poestrings.xml b/app/src/main/res/values-en-rGB/poestrings.xml
-index 62663670..d09c7d6a 100644
---- a/app/src/main/res/values-en-rGB/poestrings.xml
-+++ b/app/src/main/res/values-en-rGB/poestrings.xml
-@@ -14,7 +14,7 @@
- <string name="action_more">TELL ME MORE</string>
-
- <string name="vpn_setup">You can enable any app to go through Tor using our built-in VPN.</string>
-- <string name="vpn_setup_sub">This won\\'t make you anonymous, but it will help get through firewalls.</string>
-+ <string name="vpn_setup_sub">This won\'t make you anonymous, but it will help get through firewalls.</string>
- <string name="action_vpn_choose">CHOOSE APPS</string>
-
- <string name="status_connected">Connected!</string>
---
-2.17.1
-
diff --git a/projects/orbot/0013-Bug-28051-Add-a-notification-compatibility-class.patch b/projects/orbot/0013-Bug-28051-Add-a-notification-compatibility-class.patch
deleted file mode 100644
index 73d55e4..0000000
--- a/projects/orbot/0013-Bug-28051-Add-a-notification-compatibility-class.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-From 0fde60f64b342fafc7150272c8de0544b0c430df Mon Sep 17 00:00:00 2001
-From: Matthew Finkel <Matthew.Finkel@xxxxxxxxx>
-Date: Wed, 21 Nov 2018 18:05:42 +0000
-Subject: [PATCH 13/13] Bug 28051 - Add a notification compatibility class
-
----
- .../android/service/TorService.java | 7 +-
- .../util/NotificationBuilderCompat.java | 162 ++++++++++++++++++
- 2 files changed, 166 insertions(+), 3 deletions(-)
- create mode 100644 orbotservice/src/main/java/org/torproject/android/service/util/NotificationBuilderCompat.java
-
-diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
-index 189ee6ab..745e5e8b 100644
---- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java
-+++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
-@@ -55,6 +55,7 @@ import org.torproject.android.control.TorControlConnection;
- import org.torproject.android.service.util.OtherResourceInstaller;
- import org.torproject.android.service.vpn.TorifiedApp;
- import org.torproject.android.service.util.DummyActivity;
-+import org.torproject.android.service.util.NotificationBuilderCompat;
- import org.torproject.android.service.util.Prefs;
- import org.torproject.android.service.util.TorServiceUtils;
- import org.torproject.android.service.util.Utils;
-@@ -120,7 +121,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
- private int mNetworkType = -1;
-
- private NotificationManager mNotificationManager = null;
-- private NotificationCompat.Builder mNotifyBuilder;
-+ private NotificationBuilderCompat mNotifyBuilder;
- private Notification mNotification;
- private boolean mNotificationShowing = false;
-
-@@ -251,7 +252,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
- mNotificationShowing = false;
- }
-
-- private final static String NOTIFICATION_CHANNEL_ID = "orbot_channel_1";
-+ private final static String NOTIFICATION_CHANNEL_ID = "torbrowser_channel_1";
-
- // Use TargetApi until we use a support library version that adds the
- // RequriesApi annotation
-@@ -298,7 +299,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
-
- if (mNotifyBuilder == null)
- {
-- mNotifyBuilder = new NotificationCompat.Builder(this)
-+ mNotifyBuilder = new NotificationBuilderCompat(this, NOTIFICATION_CHANNEL_ID)
- .setContentTitle(getString(R.string.app_name))
- .setSmallIcon(R.drawable.ic_stat_tor);
-
-diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/NotificationBuilderCompat.java b/orbotservice/src/main/java/org/torproject/android/service/util/NotificationBuilderCompat.java
-new file mode 100644
-index 00000000..eac657ff
---- /dev/null
-+++ b/orbotservice/src/main/java/org/torproject/android/service/util/NotificationBuilderCompat.java
-@@ -0,0 +1,162 @@
-+package org.torproject.android.service.util;
-+
-+import android.app.Notification;
-+import android.app.Notification.Builder;
-+import android.app.Notification.Style;
-+import android.app.PendingIntent;
-+import android.content.Context;
-+import android.graphics.Bitmap;
-+import android.os.Build;
-+import android.util.Log;
-+
-+import java.lang.reflect.Constructor;
-+
-+/*
-+ * This is a compatibility wrapper-class around the native
-+ * android.app.Notification.Builder class. This class is needed
-+ * because we are currently targeting Android API level 26 and
-+ * supporting API level 16 as the minimum level, but we're using
-+ * the Android Support Library 23.4.0. This puts us in a situation
-+ * where Android API 26 requires "channels", but the support library
-+ * doesn't know what a channel is.
-+ *
-+ * This is a temporary hack until we upgrade to a newer support library
-+ * (mozilla-central uses 26.1.0, at the time of this writing).
-+ */
-+
-+public class NotificationBuilderCompat {
-+ private static final String LOGTAG = "NotificationBuilderCompat";
-+ private static final Class notificationBuilderClass = Notification.Builder.class;
-+
-+ /* Credit: http://www.javadocexamples.com/java/lang/Class/getDeclaredConstructor(...%20parameterTypes).html */
-+ // Constructor signature before Android O
-+ private static final Class[] REPLICATE_CONSTRUCTOR_PARAMS_PRE_O = new Class[]{Context.class};
-+ // Constructor signature Android O and newer
-+ private static final Class[] REPLICATE_CONSTRUCTOR_PARAMS_O_PLUS = new Class[]{Context.class, String.class};
-+
-+ public static final String DEFAULT_CHANNEL_ID = "torbrowser_channel_0";
-+
-+ private Notification.Builder mBuilder;
-+
-+ public NotificationBuilderCompat(Context context, String channelId) {
-+ Constructor constructor;
-+
-+ // If we think we're running on a device with Oreo or newer, then
-+ // try constructing a Notification.Builder with a channel Id.
-+ if (Build.VERSION.SDK_INT >= 26) {
-+ try {
-+ constructor = notificationBuilderClass.getConstructor(REPLICATE_CONSTRUCTOR_PARAMS_O_PLUS);
-+ mBuilder = (Notification.Builder) constructor.newInstance(context, channelId);
-+ return;
-+ } catch (Exception e) {}
-+ }
-+ try {
-+ // Fall back on the constructor without a channel ID
-+ constructor = notificationBuilderClass.getConstructor(REPLICATE_CONSTRUCTOR_PARAMS_PRE_O);
-+ mBuilder = (Notification.Builder) constructor.newInstance(context);
-+ } catch (Exception e) {
-+ mBuilder = new Notification.Builder(context);
-+ }
-+ }
-+
-+ public NotificationBuilderCompat(Context context) {
-+ this(context, DEFAULT_CHANNEL_ID);
-+ }
-+
-+ public NotificationBuilderCompat setContentText(CharSequence title) {
-+ mBuilder = mBuilder.setContentText(title);
-+ return this;
-+ }
-+
-+ public NotificationBuilderCompat setContentTitle(CharSequence title) {
-+ mBuilder = mBuilder.setContentTitle(title);
-+ return this;
-+ }
-+
-+ public NotificationBuilderCompat setSmallIcon(int icon, int level) {
-+ mBuilder = mBuilder.setSmallIcon(icon, level);
-+ return this;
-+ }
-+
-+ public NotificationBuilderCompat setSmallIcon(int icon) {
-+ mBuilder = mBuilder.setSmallIcon(icon);
-+ return this;
-+ }
-+
-+ public NotificationBuilderCompat setLargeIcon(Bitmap b) {
-+ mBuilder = mBuilder.setLargeIcon(b);
-+ return this;
-+ }
-+
-+ public NotificationBuilderCompat setContentIntent(PendingIntent intent) {
-+ mBuilder = mBuilder.setContentIntent(intent);
-+ return this;
-+ }
-+
-+ public NotificationBuilderCompat setCategory(String category) {
-+ // This was added in API level 21
-+ if (Build.VERSION.SDK_INT >= 21) {
-+ mBuilder = mBuilder.setCategory(category);
-+ }
-+ return this;
-+ }
-+
-+ public NotificationBuilderCompat addAction(int icon, CharSequence title, PendingIntent intent) {
-+ mBuilder = mBuilder.addAction(icon, title, intent);
-+ return this;
-+ }
-+
-+ public NotificationBuilderCompat setOngoing(boolean ongoing) {
-+ mBuilder = mBuilder.setOngoing(ongoing);
-+ return this;
-+ }
-+
-+ public NotificationBuilderCompat setTicker(CharSequence tickerText) {
-+ mBuilder = mBuilder.setTicker(tickerText);
-+ return this;
-+ }
-+
-+ public NotificationBuilderCompat setPriority(int prio) {
-+ mBuilder = mBuilder.setPriority(prio);
-+ return this;
-+ }
-+
-+ public NotificationBuilderCompat setDeleteIntent(PendingIntent intent) {
-+ mBuilder = mBuilder.setDeleteIntent(intent);
-+ return this;
-+ }
-+
-+ public NotificationBuilderCompat setAutoCancel(boolean autoCancel) {
-+ mBuilder = mBuilder.setAutoCancel(autoCancel);
-+ return this;
-+ }
-+
-+ public NotificationBuilderCompat setDefaults(int defaults) {
-+ mBuilder = mBuilder.setDefaults(defaults);
-+ return this;
-+ }
-+
-+ public NotificationBuilderCompat setStyle(Notification.Style style) {
-+ mBuilder = mBuilder.setStyle(style);
-+ return this;
-+ }
-+
-+ public NotificationBuilderCompat setWhen(long when) {
-+ mBuilder = mBuilder.setWhen(when);
-+ return this;
-+ }
-+
-+ public NotificationBuilderCompat setProgress(int max, int progress, boolean indeterminate) {
-+ mBuilder = mBuilder.setProgress(max, progress, indeterminate);
-+ return this;
-+ }
-+
-+ public NotificationBuilderCompat setLights(int argb, int onMs, int offMs) {
-+ mBuilder = mBuilder.setLights(argb, onMs, offMs);
-+ return this;
-+ }
-+
-+ public Notification build() {
-+ return mBuilder.build();
-+ }
-+}
---
-2.17.1
-
diff --git a/projects/orbot/0014-Bug-29794-Update-built-in-bridges.patch b/projects/orbot/0014-Bug-29794-Update-built-in-bridges.patch
deleted file mode 100644
index b841723..0000000
--- a/projects/orbot/0014-Bug-29794-Update-built-in-bridges.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 53a2ebc7fa4ce959203c94c874efc5ee6d070020 Mon Sep 17 00:00:00 2001
-From: Matthew Finkel <Matthew.Finkel@xxxxxxxxx>
-Date: Fri, 15 Mar 2019 16:47:06 +0000
-Subject: [PATCH] Bug 29794 - Update built-in bridges
-
----
- orbotservice/src/main/res/raw/bridges.txt | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/orbotservice/src/main/res/raw/bridges.txt b/orbotservice/src/main/res/raw/bridges.txt
-index 1e448ea1..61019737 100644
---- a/orbotservice/src/main/res/raw/bridges.txt
-+++ b/orbotservice/src/main/res/raw/bridges.txt
-@@ -1,7 +1,11 @@
--obfs4 78.215.187.186:45675 AE907EE5FAA5D0D27E0C83EFA6ADF8E79FCC0FF1 cert=/TRjMo+RinKaixARMjMtZZBhystaBe+aDaapPrbiITFtWx3M/AJcvpjHjO54tJqLd1+IWQ iat-mode=0
--obfs4 107.160.7.24:443 7A0904F6D182B81BEFE0DEDAFEC974494672627B cert=a5/IlZMnDvb8d92LTHMfsBIgL7QlDLPiXiLwe85uedC80mGD0QerygzmsWnMEdwG9ER9Eg iat-mode=0
--obfs4 79.136.160.201:46501 66AC975BF7CB429D057AE07FC0312C57D61BAEC1 cert=dCtn9Ya8z+R8YQikdWgC3XTAt58z5Apnm95QHrJwnhFSdnphPPEz+NMm6OawWc2srKLjJg iat-mode=0
--obfs4 94.242.249.2:58809 6AF3024788A7EA8F84E3FA3F60018B62291803E4 cert=X0sDCJLKMM/EISdGDEfGrsks41UYmScjIIXQ9AZgWFVKNKS6klcNEpdF4tNXFz6kIyk4Ug iat-mode=0
--obfs4 35.203.134.33:2224 15524C683CC872C8C8FB5B779A8D53F54F7ADCD4 cert=bXLTv0Kwt1zgPBoeVF86vC+0tYAHepR7+QMczhhTQw9hpAIhatt/Bpe6rSGY63Zh8aZ+dQ iat-mode=0
--obfs4 188.166.252.228:9443 595770328CA95E39FF5B81013880B46CA1B29546 cert=3PjhGUq3xWDMrBAzbV1eU4zPSB3GRGBpYdXQEs9hkrwC9RSZdnEe1P+cg7VgLgYTj/2MMg iat-mode=0
-+obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9
-+obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9
-+obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED
-+obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A
-+obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1
-+obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0
-+obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0
-+obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0
-+obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0
-+obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0
- meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com
---
-2.11.0
-
diff --git a/projects/orbot/0015-dependencies.patch b/projects/orbot/0015-dependencies.patch
deleted file mode 100644
index 1102538..0000000
--- a/projects/orbot/0015-dependencies.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/app/build.gradle b/app/build.gradle
-index 3051dd5c..ef178e91 100644
---- a/app/build.gradle
-+++ b/app/build.gradle
-@@ -76,12 +76,16 @@ android {
- dependencies {
- // implementation 'com.github.delight-im:Android-Languages:v1.0.1'
- implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-- implementation project(':orbotservice')
- // Match Fennec's ANDROID_SUPPORT_LIBRARY_VERSION
- implementation 'com.android.support:design:23.4.0'
- implementation 'pl.bclogic:pulsator4droid:1.0.3'
- // These require higher versions of ANDROID_SUPPORT_LIBRARY_VERSION
- //implementation 'com.github.apl-devs:appintro:v4.2.2'
- //implementation 'com.github.javiersantos:AppUpdater:2.6.4'
-+ implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-+ implementation 'com.android.support:appcompat-v7:23.4.0'
-+ implementation 'net.freehaven.tor.control:jtorctl:0.2'
-+ implementation 'org.slf4j:slf4j-api:1.7.25'
-+ implementation 'org.slf4j:slf4j-android:1.7.25'
-
- }
-diff --git a/settings.gradle b/settings.gradle
-index 9984a03e..e7b4def4 100644
---- a/settings.gradle
-+++ b/settings.gradle
-@@ -1,2 +1 @@
--include ':jsocksAndroid', ':orbotservice'
- include ':app'
diff --git a/projects/orbot/build b/projects/orbot/build
deleted file mode 100644
index 9d0d423..0000000
--- a/projects/orbot/build
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-[% c("var/set_default_env") -%]
-output_dir=[% dest_dir %]/[% c('filename') %]
-gradle_repo=$rootdir/[% c('input_files_by_name/gradle-dependencies') %]
-export GRADLE_MAVEN_REPO="file://$gradle_repo"
-
-# The download script assumes artifact package name is the complete URL path.
-# In some cases this is incorrect, so copy those artifacts to correct location
-cp -r $gradle_repo/dl/android/maven2/* $gradle_repo
-cp -r $gradle_repo/plugins-release/* $gradle_repo
-cp -r $gradle_repo/maven2/* $gradle_repo
-
-mkdir -p /var/tmp/build $output_dir
-
-[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
-tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
-
-# Patch projects
-cd /var/tmp/build/[% project %]-[% c('version') %]
-for p in $rootdir/*.patch
- do patch -p1 < $p
-done
-
-mkdir app/libs
-cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/*.aar app/libs/
-cp $rootdir/[% c('input_files_by_name/topl') %]/* app/libs/
-
-# Build Android Libraries and Apps
-$GRADLE_HOME/gradle-4.1/bin/gradle --offline assembleRelease -x lint
-
-# Remove these classes so we don't have problem with duplicates later in the build
-orbot_apk=app/build/outputs/aar/Orbot-*.aar
-unzip $orbot_apk classes.jar -d .
-zip classes.jar --delete "com/runjva/*" "com/msopentech/*" "org/torproject/android/service/*"
-zip -r $orbot_apk classes.jar
-
-# Package
-cp $orbot_apk $output_dir
diff --git a/projects/orbot/config b/projects/orbot/config
deleted file mode 100644
index 0f72ecf..0000000
--- a/projects/orbot/config
+++ /dev/null
@@ -1,52 +0,0 @@
-# vim: filetype=yaml sw=2
-version: '[% c("abbrev") %]'
-filename: 'orbot-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
-git_hash: '[% c("var/orbot_version") %]-tor-[% c("var/tor_version") %]'
-git_url: https://git.torproject.org/orbot.git
-
-var:
- tor_version: 0.3.4.9
- orbot_version: 16.0.5-RC-1
- deps:
- - build-essential
- - autotools-dev
- - unzip
- - zip
- container:
- use_container: 1
- # this should be updated when the list of gradle dependencies is changed
- gradle_dependencies_version: 3
-
-targets:
- android:
- var:
- arch_deps:
- - openjdk-8-jdk
-
-input_files:
- - project: container-image
- - name: '[% c("var/compiler") %]'
- project: '[% c("var/compiler") %]'
- - project: tor-android-service
- name: tor-android-service
- - project: tor-onion-proxy-library
- name: topl
- - filename: 0001-Bug-28051-Build-Orbot-as-a-library.patch
- - filename: 0002-Bug-28051-Exclude-the-AppUpdater.patch
- - filename: 0003-Bug-28051-Delete-the-Onboarding-activity.patch
- - filename: 0004-Bug-28051-Rename-the-Hidden-Service-content-provider.patch
- - filename: 0005-Bug-28051-Cast-the-layout-elements.patch
- - filename: 0006-Bug-28051-Don-t-use-Orbot-s-LocaleHelper-for-locale-.patch
- - filename: 0007-Bug-28051-Rename-Orbot-s-preferences-so-they-don-t-c.patch
- - filename: 0008-Bug-28051-Make-TorService-compatible-with-the-suppor.patch
- - filename: 0009-Bug-28051-Change-Orbot-s-behavior-for-Tor-Browser.patch
- - filename: 0010-Bug-28051-Rename-Orbot-as-Tor-Browser.patch
- - filename: 0011-Bug-28051-Tell-Proguard-it-should-keep-an-unused-met.patch
- - filename: 0012-Bug-28051-Escape-the-apostrophe-correctly.patch
- - filename: 0013-Bug-28051-Add-a-notification-compatibility-class.patch
- - filename: 0014-Bug-29794-Update-built-in-bridges.patch
- - filename: 0015-dependencies.patch
- - filename: set_gradle_repo_to_local.patch
- - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'
- name: gradle-dependencies
- exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
diff --git a/projects/orbot/gradle-dependencies-list.txt b/projects/orbot/gradle-dependencies-list.txt
deleted file mode 100644
index c3fb2ef..0000000
--- a/projects/orbot/gradle-dependencies-list.txt
+++ /dev/null
@@ -1,193 +0,0 @@
-# On how to update dependencies see projects/common/how-to-create-gradle-dependencies-list.txt
-# Don't forget to update var/gradle_dependencies_version when modifying this file
-sha256sum | url
-54b34e941b8e1414bd3e40d736efd3481772dc26db3296f6aa45cec9f6203d86 | https://repo1.maven.org/maven2/commons-codec/commons-codec/1.6/commons-codec-1.6.jar
-949246020c08a0543389082af38268cdce4ee7a7a8218097369b9845752866cb | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.0.1/lint-checks-26.0.1.jar
-feab9191311c3d7aeef2b66d6064afc80d3d1d52d980fb07ae43c78c987ba93a | https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom
-b677d99c309dc272f60cefa1f1b639ab750d592ded0ea7bfc9f9c5600ebd742d | https://repo1.maven.org/maven2/pl/bclogic/pulsator4droid/1.0.3/pulsator4droid-1.0.3.aar
-b2b5dd46cf998fa626eb6f8a1c114f6167c8d392694164e62533e5898e9b31f2 | https://repo1.maven.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.pom
-a34658f5c5de4b573eef21131cc32cc25f7b66407944f312b28ec2e56abb1fa9 | https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/5.1/asm-analysis-5.1.jar
-8d4006178fedef4255797b806167cf4a6774158eedabf96420693afbbd00fee3 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.0.1/protos-26.0.1.pom
-905721a0eea90a81534abb7ee6ef4ea2e5e645fa1def0a5cd88402df1b46c9ed | https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar
-c0de2bbc4cb8297419659813ecd4ed1d077ed1dd5c1f5544cc5143e493e84c10 | https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/5.1/asm-tree-5.1.jar
-e824935c264b041e847b67808aee704f8cd47d698203259057e42f473e1f6f30 | https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCommon/3.0.1/compilerCommon-3.0.1.jar
-cc6a41dc3eaacc9e440a6bd0d2890b20d36b4ee408fe2d67122f328bb6e01581 | https://repo1.maven.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.jar
-f264dd9f79a1fde10ce5ecc53221eff24be4c9331c830b7d52f2f08a7b633de2 | https://repo1.maven.org/maven2/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar
-d7e368746fa68ca6ba63519fb0838be9a278d509a5fcee6cd4a778a119eae447 | https://dl.google.com/dl/android/maven2/com/android/support/appcompat-v7/23.4.0/appcompat-v7-23.4.0.pom
-6b87237de8c2e1740cf80627c7f3ce3e15de1930bb250c55a1eca94fa3e014df | https://repo1.maven.org/maven2/org/codehaus/codehaus-parent/4/codehaus-parent-4.pom
-1158e94c7de4da480873f0b4ab4a1da14c0d23d4b1902cc94a58a6f0f9ab579e | https://repo1.maven.org/maven2/com/google/guava/guava/22.0/guava-22.0.jar
-7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca | https://repo1.maven.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk15on-1.56.jar
-5fe8a11e913086fb7ab505b930987f30cfa3f4b226d4bbbc68003ca4387ae40e | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.0.1/lint-api-26.0.1.jar
-362e9324ee7c697e21279e20077b52737ddef3f1b2c1a7abe5ad34b465145550 | https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.2.6/httpclient-4.2.6.jar
-23e6d006f7d07bb43ebc80b2e530c8cdd65bbabcaaf911c3f12e2ea26167178c | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core/3.0.1/gradle-core-3.0.1.pom
-3d6eba428555a558de046b5d76eacc1f5a54b4f5f20b84d636ed7aff18aa48c3 | https://repo1.maven.org/maven2/org/apache/httpcomponents/project/7/project-7.pom
-cf149955279b07d4f11e817985c1164a69e930d73db7441b43a6ef53bbd286c4 | https://repo1.maven.org/maven2/com/google/errorprone/error_prone_parent/2.0.18/error_prone_parent-2.0.18.pom
-f0c98c571e93a7cb4dd18df0fa308f0963e7a0620ac2d4244e61e709d03ad6be | https://repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.pom
-401877d5e70ad599e9b6cff18434ea0332f637b51f8ec68352646c836f9bb2a4 | https://repo1.maven.org/maven2/org/antlr/antlr4-master/4.5.3/antlr4-master-4.5.3.pom
-932e6bab9a24a7bc958bbdb7e29e04d083b473d11c4ba3fab1e9b7149579f272 | https://repo1.maven.org/maven2/com/google/protobuf/protobuf-parent/3.0.0/protobuf-parent-3.0.0.pom
-2a0475c2625fc27f80d3c5021130509b4068e0f984f2511e7a77a097de48b41d | https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.1/sdklib-26.0.1.pom
-8fdc3336e7b01873193ba9c48b87de7d788dc0954d1eb45c322492627a4b5c6e | https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk15on-1.56.pom
-d0f2e16d054e8bb97add9ca26525eb2346f692809fcd2a28787da8ceb3c35ee8 | https://repo1.maven.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom
-7846399b35c7cd642a9b3a000c3e2d62d04eb37a4547b6933cc8b18bcc2f086b | https://repo1.maven.org/maven2/com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3.pom
-8b870b3f2ee38bf15681acbc8b628df1ccf7c533190b5c79af9934b6cd66d451 | https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.0.1/baseLibrary-3.0.1.pom
-58aa4df8faae90e484c0bc47494a1ec97dc51fe53eae2b4a70d60ea7489cdf8c | https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/26.0.1/intellij-core-26.0.1.jar
-953b116521a73575eee990e3f2c36a892fb088bb2d9a3027c82193cb7a013ef7 | https://repo1.maven.org/maven2/it/unimi/dsi/fastutil/7.2.0/fastutil-7.2.0.pom
-ddb0fc5402b4cd8f31d5f29c830793d3ec00fd8ce60786254e5f0f132f0bdd8d | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.0.1/lint-api-26.0.1.pom
-efa86e5cd922f17b472fdfcae57234d8d4ac3e148b6250737dfce454af7a7a44 | https://repo1.maven.org/maven2/com/google/jimfs/jimfs/1.1/jimfs-1.1.pom
-e336a35a1e102c2f11ce1ea7f0872df14e332374b8eacc0877e50f85f84c3d09 | https://dl.google.com/dl/android/maven2/com/android/support/animated-vector-drawable/23.4.0/animated-vector-drawable-23.4.0.pom
-965aeb2bedff369819bdde1bf7a0b3b89b8247dd69c88b86375d76163bb8c397 | https://repo1.maven.org/maven2/org/jetbrains/annotations/13.0/annotations-13.0.pom
-2994a7eb78f2710bd3d3bfb639b2c94e219cedac0d4d084d516e78c16dddecf6 | https://repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar
-e767a1248adb4843110457e839e504c2511649ee78f05a6a311ea7f23578894d | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.0.1/builder-test-api-3.0.1.jar
-ee032c39ae5e3cd099148fbba9a2124f9ed613e5cb93e03ee0fa8808ce364040 | https://repo1.maven.org/maven2/org/ow2/asm/asm-util/5.1/asm-util-5.1.jar
-c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd | https://repo1.maven.org/maven2/com/google/jimfs/jimfs/1.1/jimfs-1.1.jar
-b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454 | https://repo1.maven.org/maven2/org/sonatype/oss/oss-parent/7/oss-parent-7.pom
-e30f1db6058f745f26112ef309f89becb27c617c7d9e4c6e02165a7620a92e6a | https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.1/common-26.0.1.pom
-47a89be0fa0fedd476db5fd2c83487654d2a119c391f83a142be876667cf7dab | https://repo1.maven.org/maven2/com/googlecode/json-simple/json-simple/1.1/json-simple-1.1.pom
-e8b4151ae1679f1abe7a14ee371ac9b3c651ae7b63290d1f586bdd0f78face9a | https://repo1.maven.org/maven2/com/android/tools/build/transform-api/2.0.0-deprecated-use-gradle-api/transform-api-2.0.0-deprecated-use-gradle-api.jar
-6895e368fa59168428c78cdf300bb29352073f397d8f260af3de82df2c8b2448 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.0.1/tracker-26.0.1.jar
-9466512cd8cf0bd66a8a3661685373f7b3deafded11096e044926ff5c82c7a4c | https://repo1.maven.org/maven2/com/google/code/gson/gson/2.3/gson-2.3.jar
-1d2e883717b8ab7d3fcc9fa01034d165809a9c94daa6303a838f11e4d36adc86 | https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/5.3.3/proguard-base-5.3.3.jar
-fb8c5e55e30a7addb4ff210858a0e8d2494ed6757bbe19012da99d51586c3cbb | https://repo1.maven.org/maven2/org/apache/commons/commons-parent/22/commons-parent-22.pom
-38db692b5cbaf69d89b1fe5b0fc38a5cc83f898716f8bc64086fa17c25ea57d6 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.0.1/shared-26.0.1.pom
-74fa208043740642f7e6eb09faba15965218ad2f50ce3020efb100136e4b591c | https://repo1.maven.org/maven2/it/unimi/dsi/fastutil/7.2.0/fastutil-7.2.0.jar
-ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478 | https://repo1.maven.org/maven2/org/jetbrains/annotations/13.0/annotations-13.0.jar
-ce6f913cad1f0db3aad70186d65c5bc7ffcc9a99e3fe8e0b137312819f7c362f | https://repo1.maven.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar
-59970f2f0cfce6487b7180d7de653d904d8160fb2cd9d8aba6c375d39fec6652 | https://repo1.maven.org/maven2/pl/bclogic/pulsator4droid/1.0.3/pulsator4droid-1.0.3.pom
-e7a7a5810829dee924cec654a569a48301fcedd487f7b88710e816d127385f51 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.0.1/shared-26.0.1.jar
-9f85ff2fd7d6cb3097aa47fb419ee7f0ebe869109f98aba9f4eca3f49e74a40e | https://repo1.maven.org/maven2/org/apache/apache/16/apache-16.pom
-43edcc0fc3bd8520bf60066f54088f272e39aa856d25cdd6ca9ee4d8f5c32666 | https://dl.google.com/dl/android/maven2/com/android/support/support-vector-drawable/23.4.0/support-vector-drawable-23.4.0.pom
-c3c99bf58182889fe86315e9a01473ee2c95540b9dedef898cec64554d925c54 | https://repo1.maven.org/maven2/com/android/tools/annotations/24.5.0/annotations-24.5.0.pom
-aeb197158a2fb6bd2cb9233e22874f8051f82891dbd82b6b089f49e309f82e40 | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.1/lint-26.0.1.jar
-7a3554c605e088e7e323b1084656243f0444fa353e2f2dee1f1a4204eb64ff09 | https://repo1.maven.org/maven2/org/jacoco/org.jacoco.report/0.7.4.201502262128/org.jacoco.report-0.7.4.201502262128.jar
-d3d96637b0e8e61046567b8c87b667dcf3cd31c7447f651cb58d6e6e744adfba | https://dl.google.com/dl/android/maven2/com/android/support/appcompat-v7/23.4.0/appcompat-v7-23.4.0.aar
-d49d179f707d3f3a00b2a7d36136b54aa8d44fa22770703cd82fe52fb39e22eb | https://repo1.maven.org/maven2/com/android/tools/build/transform-api/2.0.0-deprecated-use-gradle-api/transform-api-2.0.0-deprecated-use-gradle-api.pom
-e899e02ec8ac6a73fb9c9c7cb9ebd9bfc4ce8263412285d5ec6f2df920880905 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.0.1/builder-model-3.0.1.pom
-b6eb99f1362b8344ca5400d57a35c49e3504f23f3dee304fdb879d4d953f4bc6 | https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.2.5/httpcore-4.2.5.pom
-26c5856e954b5f864db76f13b86919b59c6eecf9fd930b96baa8884626baf2f5 | https://repo1.maven.org/maven2/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-4.9.jar
-fcfb09fb0ea0aa97d3cfe7ea792398081348e468f126b3603cb3803f240197f0 | https://repo1.maven.org/maven2/com/squareup/javawriter/2.5.0/javawriter-2.5.0.jar
-ec4c74554312fac5116350164786f91b35c9e082fa4ea598bfa42b5db05d7abb | https://repo1.maven.org/maven2/org/jacoco/org.jacoco.core/0.7.4.201502262128/org.jacoco.core-0.7.4.201502262128.jar
-4f88a89142c64bf03906f84609594666e9694df56e3e6f05edfab8a68b39d837 | https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.1/annotations-26.0.1.pom
-467ae650442e876867379094e7518dfdd67d22c5352ebd39808c84259e9790ba | https://repo1.maven.org/maven2/org/apache/commons/commons-parent/25/commons-parent-25.pom
-f26bdec2b9496470c0ce63b0d290816e8000ef018daaa259597ebae947fd690f | https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/5.3.3/proguard-gradle-5.3.3.pom
-8b0aa8a74e990ca8d633ab7bd1938530e921548df13fd4020224a61065378876 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.0.1/builder-test-api-3.0.1.pom
-e2b4935e76d91b5abec44de309f2c8bb8d1d2e6cc0b8790b43cb654f1e22c722 | https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.0.1/layoutlib-api-26.0.1.pom
-cb4cfad870bf563a07199f3ebea5763f0dec440fcda0b318640b1feaa788656b | https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.0.18/error_prone_annotations-2.0.18.jar
-567ae5af5665bb445802ca650a4dc848737c9ee564f69f2ead5df1189d394304 | https://dl.google.com/dl/android/maven2/com/android/support/recyclerview-v7/23.4.0/recyclerview-v7-23.4.0.pom
-a06e35d3fff3a6b813d94894ebf3e498f9540c864c5b39ae783907e3a6c72889 | https://repo1.maven.org/maven2/commons-codec/commons-codec/1.6/commons-codec-1.6.pom
-8bd632c00bdf80a7de36c22b60f12452c147d8eca2f00d79d66699ebe7daa02a | https://repo1.maven.org/maven2/org/apache/commons/commons-parent/5/commons-parent-5.pom
-d2da399a9967c69f0a21739256fa79d284222c223082cacadc17372244764b54 | https://repo1.maven.org/maven2/org/ow2/asm/asm/5.1/asm-5.1.jar
-2068320bd6bad744c3673ab048f67e30bef8f518996fa380033556600669905d | https://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar
-52b6fd2eaf2240e14dbe752f1fa884270cc668d6f350e8e7f65f6033a8172d69 | https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcomponents-client/4.2.6/httpcomponents-client-4.2.6.pom
-2c1542faf343185b7cab9c3d55c8ae5471d6d095d3887a4adefdbdf2984dc0b6 | https://repo1.maven.org/maven2/org/apache/commons/commons-compress/1.12/commons-compress-1.12.jar
-6b5ad911a13a5c814c04be4376586eec15838158cb59b9f062ae138ddff1b861 | https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.0.1/layoutlib-api-26.0.1.jar
-31629566148e8a47688ae43b420abc3ecd783ed15b33bebc00824bf24c9b15aa | https://repo1.maven.org/maven2/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.jar
-2cafbe356f71c208013d021f32943904798cd6459e5107f9fe27000eb5bc2aef | https://dl.google.com/dl/android/maven2/com/android/support/constraint/constraint-layout-solver/1.1.3/constraint-layout-solver-1.1.3.jar
-757bfe906193b8b651e79dc26cd67d6b55d0770a2cdfb0381591504f779d4a76 | https://repo1.maven.org/maven2/com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3.jar
-4946e60a547c8eda69f3bc23c5b6f0dadcf8469ea49b1d1da7de34aecfcf18dd | https://repo1.maven.org/maven2/org/apache/apache/9/apache-9.pom
-bcb7ce66a9c629fa7c723a767b6430e1a383e8d4dd543d603dcb0ad1b855b8b2 | https://dl.google.com/dl/android/maven2/com/android/support/animated-vector-drawable/23.4.0/animated-vector-drawable-23.4.0.aar
-db3cd95bec1001605e1653f2843e8542e712fa2bb672fd9c8c1ace86c57673d1 | https://repo1.maven.org/maven2/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.pom
-fbd7b254e02d8aef60c418a5f0e14a783b38a16162caffb2d2a16ccd5d2c09b4 | https://repo1.maven.org/maven2/org/slf4j/slf4j-android/1.7.25/slf4j-android-1.7.25.jar
-27b4e5c0b80d3ff8b92f4c93b3b4d3ecf16c01589f4cdf70ca7cf64cb42d8122 | https://dl.google.com/dl/android/maven2/com/android/support/constraint/constraint-layout/1.1.3/constraint-layout-1.1.3.aar
-81120db4d5490c4f0e9789e1178d2bac231fcff2618bd80f8ef6ff03c550d59b | https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/5.1/asm-analysis-5.1.pom
-bede73084ec812b916f686cc6e47625bd0756154bef589a4c2b419e54a393bf5 | https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.0.1/manifest-merger-26.0.1.jar
-97b3786e1f55e74bddf8ad102bf50e33bbcbc1f6b7fd7b36f0bbbb25cd4981be | https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.jar
-a20fb26c8de5b0ff7a3069e681fcf01ebefd2f3d24b832c3af22d981d7d4376b | https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.1/repository-26.0.1.pom
-45eb0d6e49430271b5fb385c53fae0b81d6ad3eae465a7a8d948217bcae1e86d | https://repo1.maven.org/maven2/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3.jar
-321668fc474a73140eb9cc73c779f1ebb9f60948aade3beddee082ecefcf0259 | https://repo1.maven.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk15on-1.56.pom
-9e9323a26ba8eb2394efef0c96d31b70df570808630dc147cab1e73541cc5194 | https://repo1.maven.org/maven2/org/apache/apache/4/apache-4.pom
-cd6db17a11a31ede794ccbd1df0e4d9750f640234731f21cff885a9997277e81 | https://repo1.maven.org/maven2/com/google/google/1/google-1.pom
-cf7e3630e1929ddeffcb0315db2acb37182c92dd3af970111b6115592f64d077 | https://repo1.maven.org/maven2/org/jacoco/org.jacoco.core/0.7.4.201502262128/org.jacoco.core-0.7.4.201502262128.pom
-f4778bb3abf2df40bfa365d00ff301b5eec76f2933b85f6aa3918e2ab6f08b91 | https://dl.google.com/dl/android/maven2/com/android/support/design/23.4.0/design-23.4.0.pom
-f51550a06b1410bd4962cb0e71df0b921a60a7ef47bfa9c4825a14be72316eea | https://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.14/animal-sniffer-parent-1.14.pom
-9144127192d6f612c2366825dceaeb23b0d53130b83e0bf1ffe107d1470a8487 | https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.0.18/error_prone_annotations-2.0.18.pom
-f5a0a1eeaa100ed36aa83eca562d5dbb7e9b045c98b44db7da4745e9d9a20328 | https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.2.6/httpclient-4.2.6.pom
-21bb4d44dff54e33a37c11af69859a714202ae00969aab5453eba7276688f8ec | https://repo1.maven.org/maven2/org/apache/httpcomponents/project/4.1.1/project-4.1.1.pom
-f34b3a0b62cdb468eb7e8335de4edc87958dc299306c2b4ba8ea15e6a4be106a | https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/5.3.3/proguard-gradle-5.3.3.jar
-18f5c52120db036e88d6136f8839c832d074bdda95c756c6f429249d2db54ac6 | https://repo1.maven.org/maven2/org/slf4j/slf4j-parent/1.7.25/slf4j-parent-1.7.25.pom
-2ba9c1cfec6b4a183b72a5ccc6cb2c83479d6ad7e931543c792292c1679a7f43 | https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/26.0.1/uast-26.0.1.pom
-bfadb3b40f65dd6de1666d6b29f8bb54031396c76eeef4146cf9f28255f8bf33 | https://repo1.maven.org/maven2/com/google/guava/guava/22.0/guava-22.0.pom
-a32de739cfdf515774e696f91aa9697d2e7731e5cb5045ca8a4b657f8b1b4fb4 | https://repo1.maven.org/maven2/org/antlr/antlr4/4.5.3/antlr4-4.5.3.jar
-0c0e9d1857c250d1d71b5c6be7b8cc29afe55e7419a90d13bbe968ae5bd7240e | https://repo1.maven.org/maven2/org/ow2/asm/asm-util/5.1/asm-util-5.1.pom
-1ef71c25a9d46ae0ce023d02a5734e0b06fdf934fbc5948e20482526b22b4179 | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.1/gradle-3.0.1.pom
-f2885288839f82f824a0c042922ae7f24ed0d55ce26a74b6a7c557e0b7e30c24 | https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.1.3-2/kotlin-stdlib-1.1.3-2.jar
-31ce606f4e9518936299bb0d27c978fa61e185fd1de7c9874fe959a53e34a685 | https://repo1.maven.org/maven2/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.pom
-ff513db0361fd41237bef4784968bc15aae478d4ec0a9496f811072ccaf3841d | https://repo1.maven.org/maven2/org/apache/apache/13/apache-13.pom
-1917871c8deb468307a584680c87a44572f5a8b0b98c6d397fc0f5f86596dbe7 | https://repo.spring.io/plugins-release/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824.jar
-07f08b315c812406e9d497e1b592689742feb3950c1a713f95e2692d3e15b619 | https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.0.1.pom
-7e8bdca281bdcb6dad48a80854837f1c0ab46f31a0b292370e320f471f5b9cfd | https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.1/sdk-common-26.0.1.jar
-bd9b9cb1a3987b1427f7a18babe7f92078e32bbe2e1dca6dced00cc0e3a077a9 | https://repo1.maven.org/maven2/org/slf4j/slf4j-android/1.7.25/slf4j-android-1.7.25.pom
-b27bbb9d269a97be8ff0ac480c0f09c9a953f62e6ff05d90fcbb0ddb4de97c77 | https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.1/common-26.0.1.jar
-668eb6aeb3d038267e719deb55f38a4233a12602afb97e89da609c095394400a | https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.1/apksig-3.0.1.pom
-ecd46dc69f5212b35eb21d64db68072f956c000083030ff53e09d1f81487c580 | https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/26.0.1/uast-26.0.1.jar
-7af7e2d8b24b4798f04c2b7da24c9fbd1b7557b4e017c2054481565916079092 | https://repo1.maven.org/maven2/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-4.9.pom
-2ec779741f72313fc6623d0f0e42b2450dd2425dd6ad319697e658aae9ae177b | https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.pom
-cd36b31f1495f4fe55a936dd00607abdd945e1f8074549225a04c402d1d35750 | https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.pom
-b787d574c851505e76212968b9ae1641ea79804aef7f5a2cee2a01cd4055213a | https://repo1.maven.org/maven2/org/apache/commons/commons-compress/1.12/commons-compress-1.12.pom
-d48935ae1641774e03ce24b0b3f7aeee66931a1e5d9ad4d47b5f93d237ea07fb | https://dl.google.com/dl/android/maven2/com/android/support/constraint/constraint-layout/1.1.3/constraint-layout-1.1.3.pom
-f8fd874c37c89d5dfe5ec8190d94626512bd36ab2c2ac9d4b67515c5bee745cb | https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.1.3-2/kotlin-stdlib-1.1.3-2.pom
-c71555751e57e0ef912870e8ac9625ae782502a6a5b9c19ccf83b2a97d8b26bd | https://repo1.maven.org/maven2/com/google/jimfs/jimfs-parent/1.1/jimfs-parent-1.1.pom
-150021a89ae6f252415cbfff5c3111bf87433776b997b68e6e71f37e5b696799 | https://dl.google.com/dl/android/maven2/com/android/support/support-vector-drawable/23.4.0/support-vector-drawable-23.4.0.aar
-fee07b2760ef3ed20f2edefa70504a29f9216d277adae56ce85778ee4b18cd04 | https://dl.google.com/dl/android/maven2/com/android/support/support-v4/23.4.0/support-v4-23.4.0.pom
-9cddda75f4a1b4469e73f44e7b61a3e897d0f657df4797f9106ffe88c4eeade0 | https://repo1.maven.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6.1.jar
-87cd27e1a02a5c3eb6d85059ce98696bb1b44c2b8b650f0567c86df60fa61da7 | https://repo1.maven.org/maven2/org/apache/commons/commons-parent/39/commons-parent-39.pom
-df5f5e4b6d2ddcde49ed5a4e7e3bf2cb7f87e0d9892e5b066f995c4d703b228f | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.0.1/protos-26.0.1.jar
-5dc327c690d031a11aa8f9f4cdc391fb938fbb7c7c143cc4bc60dd573d1fd1c9 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0.1/builder-3.0.1.pom
-052b0d2b58e5df4f30e4f64bdf5414473f6cfa10147f8f8d89cb0b63316ba8f3 | https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.0.1/manifest-merger-26.0.1.pom
-13c1448f7ebb61f67e6fbd6cd5c188804c17c4d7e77c4b79b316ede4ef9cd9b3 | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.1/lint-26.0.1.pom
-fcd77cba4ea3893429860b93da5d43f2e089f2ba8bdfa97ef724f410f404152a | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.1/gradle-3.0.1.jar
-536c45e8804de01321c478cfb994377f81f1e32897636616fa21b877fd137c6f | https://repo1.maven.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6.1.pom
-70c458dcf6040317b41ddf50a7d53a02b8a85b0723b36cde9562c59e3cd11dae | https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.jar
-5f1d5eab6940ece3ebb73691d8a60434d8d1e330176442be8f35a1585345b2ec | https://dl.google.com/dl/android/maven2/com/android/support/design/23.4.0/design-23.4.0.aar
-0a640f956f4cdde8b5d3458a67ca67599eeb6f47349167a3f1afce7d60978027 | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core/3.0.1/gradle-core-3.0.1.jar
-f056ed61a281b3e230a63e4abf510c0d2f9bf7ff513cacb65a29538ba90ab177 | https://repo1.maven.org/maven2/org/jacoco/org.jacoco.build/0.7.4.201502262128/org.jacoco.build-0.7.4.201502262128.pom
-1a56992fc50f838fd091b6b9701b30da64b00bd2fe76ad2c800212eb459b49e2 | https://repo1.maven.org/maven2/com/google/code/gson/gson/2.3/gson-2.3.pom
-8a4e4b32eedaa72976a757e12cf1dfe742725db0b7311bf176dd937ba4236384 | https://repo1.maven.org/maven2/org/antlr/antlr4/4.5.3/antlr4-4.5.3.pom
-a9d65daccc5afca97372936246ac49fb587423e005606e7981b0efc66b0e9385 | https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.1/annotations-26.0.1.jar
-85ec8258fafc283f61647e6a11b404890821c11db6fcf550779ecf7a14151007 | https://repo1.maven.org/maven2/org/ow2/asm/asm-parent/5.1/asm-parent-5.1.pom
-6f52ba933a117bd67131b281214510ea30232b9807bfe569bc0c17e6a2d4018c | https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.1/repository-26.0.1.jar
-2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439 | https://repo1.maven.org/maven2/com/googlecode/json-simple/json-simple/1.1/json-simple-1.1.jar
-c9a55463942128f0b7fad62b8bee5886d1cb1c733fb3b78507465b025e6a4031 | https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCommon/3.0.1/compilerCommon-3.0.1.pom
-1879f19a05991e3ed95910b96689333396b0c467a215dc4d1f90018404b72a26 | https://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.pom
-81f73f8b25b430f5a40a39727bbcef653a1d0868cc69233b44e4282ce5a94ff9 | https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.0.1.jar
-47be4ebd35a100945bac20b2efba158fe032520229a73bc060ac57986d132dfa | https://dl.google.com/dl/android/maven2/com/android/support/constraint/constraint-layout-solver/1.1.3/constraint-layout-solver-1.1.3.pom
-18c4a0095d5c1da6b817592e767bb23d29dd2f560ad74df75ff3961dbde25b79 | https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar
-ec3a75bebddbf19ff56a281cf5d1ad146169dcaa0e69d7b14f4aaba2e7775f34 | https://repo.spring.io/plugins-release/net/freehaven/tor/control/jtorctl/0.2/jtorctl-0.2.jar
-803be394edb8dd7d1e678683ed85aee7f86a172c90f03e6198c8a49d4f342b99 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0.1/builder-3.0.1.jar
-e1abd7f1116cf5e0c59947693e2189208ec94296b2a3394c959e3511d399a7b0 | https://repo1.maven.org/maven2/com/squareup/javawriter/2.5.0/javawriter-2.5.0.pom
-e91a88dd0c5e99069b7f09d4a46b5e06f1e9c4c72fc0a8e987e25d86af480f01 | https://dl.google.com/dl/android/maven2/com/android/support/support-annotations/23.4.0/support-annotations-23.4.0.jar
-1f8c906d0de98ddfa81b1ce520ee52fbd280c222383b66cba89e16eafb626001 | https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.0.1/baseLibrary-3.0.1.jar
-fb5369fc7ea4b2e3cf8d6f20243f1d97f81341bf818b179cd8dbd1da7a781a21 | https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/5.1/asm-tree-5.1.pom
-e51efb2ec140b2849b9880fb161cb6e30dd672368a534c1f47ab46d7f537d9ca | https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/5.3.3/proguard-base-5.3.3.pom
-7cd9d7a0b5d93dfd461a148891b43509cf403a9c7f9fb49060d3554df1c81e1e | https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.pom
-963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349 | https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk15on-1.56.jar
-8c6191e0dd8bfdc862332cb79b08185ac5b63565d405dac2605be4c2b19774bd | https://repo1.maven.org/maven2/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3.pom
-5215b648798c6c8d9b9cde3642d3bfb5a4cc894b7c8411004352e7de5d119827 | https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcomponents-client/4.1/httpcomponents-client-4.1.pom
-1eaf9182e1977c1c50a70edbfbf70536398c68990bfaafc9f0e9899041201539 | https://repo1.maven.org/maven2/com/google/guava/guava-parent/22.0/guava-parent-22.0.pom
-faf82de0dc02e0c0ae327cd653f37255496b2e53fce280b3ab4cb34553a89086 | https://repo1.maven.org/maven2/com/intellij/annotations/12.0/annotations-12.0.pom
-a0d002465c0f611eedaaef2b2530707d2e9fb3a5c7ed66f53c556a12f714f43a | https://dl.google.com/dl/android/maven2/com/android/support/support-v4/23.4.0/support-v4-23.4.0.aar
-712d7c974d20b71ce730938a3dda8d23e87cfd16500e1c1a2c9ecc2c9ff0d323 | https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.1/apksig-3.0.1.jar
-3369726ca2b0e3736c741ff3c22e06f707a1007ff20ccc5b5ba5d0d9a01ead30 | https://repo.spring.io/plugins-release//net/freehaven/tor/control/jtorctl/0.2/jtorctl-0.2.pom
-164e7a9cf23a4e63bbc961f8db7d965d53d685710660a88249641f91d36f83a4 | https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcomponents-core/4.2.5/httpcomponents-core-4.2.5.pom
-a9660f8b64b74f474226c70a50187d8efcac448d32ce97756f408975aa52cdaa | https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.1/sdk-common-26.0.1.pom
-10107898991129eff2042a41b1bfc2d72c4ea8e4babe429ae3aeb32c69c568de | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.0.1/tracker-26.0.1.pom
-5d252585d47129cd667d96c92237383138a42edec5a8963a7dd44cd770faed91 | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.0.1/lint-checks-26.0.1.pom
-3e395d6fbc43c09a3774cac8694ce527398305ea3fd5492d80e25af27d382a9c | https://repo1.maven.org/maven2/org/codehaus/mojo/mojo-parent/34/mojo-parent-34.pom
-0ee5f691cbbedb69969b48374d27412f821959af5d2dffbabc424b607cdbbdf6 | https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.1.3-2/kotlin-reflect-1.1.3-2.jar
-cf251279505960889b6b281c26af0438656ebac3845e52791925cf7649cb15a6 | https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.1/sdklib-26.0.1.jar
-e6531a278b4f632f198a6e45b9e11de1b2b678cd5a4e0fdff442f604c2439a42 | https://repo1.maven.org/maven2/org/jacoco/org.jacoco.report/0.7.4.201502262128/org.jacoco.report-0.7.4.201502262128.pom
-6d079b5abf39f323baaccc68463beef5cf2e9574f333dd749ae96753f00eb205 | https://repo1.maven.org/maven2/org/ow2/asm/asm/5.1/asm-5.1.pom
-9619e68f7eb36da3a28a60315f34320972badbad43749cc66712bb95b96a4ef3 | https://dl.google.com/dl/android/maven2/com/android/support/support-annotations/23.4.0/support-annotations-23.4.0.pom
-a47c950c755747ca3093a05e9ec85d0e2f33cbd224909f571fe7577963a4d799 | https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.1.3-2/kotlin-reflect-1.1.3-2.pom
-ee041b3beb682e8bbf2dc16b6edc233483cbc36bde27fd13996617a667b615a5 | https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/26.0.1/intellij-core-26.0.1.pom
-a1e7d6b3efc1703c7c8f1b15ecf8757f17d0ac41f32c9a48481a5caf638c55db | https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.0.0/protobuf-java-3.0.0.jar
-e4c7afb8f0d7aa159318d42a011cc2c9b0525d820973cbca5318bec6c649cecc | https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.0.0/protobuf-java-3.0.0.pom
-24465b2ba90dc5ed7e2c05f1c87fe4256c27df6d3cd69b6177f3cb447b05c021 | https://dl.google.com/dl/android/maven2/com/android/support/recyclerview-v7/23.4.0/recyclerview-v7-23.4.0.aar
-f8ab13b14be080fe2f617f90e55599760e4a1b4deeea5c595df63d0d6375ed6d | https://repo1.maven.org/maven2/com/intellij/annotations/12.0/annotations-12.0.jar
-e2f7b17610f9f0a2b55c019b7627be3d42ec142fde1db5caf8a34dbe3bb8dbcd | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.0.1/gradle-api-3.0.1.pom
-63b465cc628f8c305702b12b26501cea236a3175db15b5a7356e98484aa63db5 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.0.1/builder-model-3.0.1.jar
-fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a | https://repo1.maven.org/maven2/org/sonatype/oss/oss-parent/9/oss-parent-9.pom
-51215c67d2c068d8b7d2f6f80f51372a098075deccc448d4bdd7b987ba8328fb | https://repo1.maven.org/maven2/org/ow2/ow2/1.3/ow2-1.3.pom
-e5e82da4cc66c8d917bbf743e3c0752efe8522735e7fc9dbddb65bccea81cfe9 | https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.2.5/httpcore-4.2.5.jar
-0288414509c625b8dd544384fbd29f502bdc8b4f86cfc26625aa23eef9fa6057 | https://repo1.maven.org/maven2/net/sf/proguard/proguard-parent/5.3.3/proguard-parent-5.3.3.pom
-24633fb1e62a9e4b1a25e2c1751d68be89e050b488652456e545b8019539137d | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.0.1/gradle-api-3.0.1.jar
-5c415a9d8585200de4be1947e15291cc79f599b06249375f5c9ea22d4b2d090f | https://repo.spring.io/plugins-release/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824.pom
diff --git a/projects/orbot/set_gradle_repo_to_local.patch b/projects/orbot/set_gradle_repo_to_local.patch
deleted file mode 100644
index ec16ae2..0000000
--- a/projects/orbot/set_gradle_repo_to_local.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/build.gradle b/build.gradle
-index 553079b6..751ac6a3 100644
---- a/build.gradle
-+++ b/build.gradle
-@@ -3,6 +3,7 @@ buildscript {
- repositories {
- jcenter()
- google()
-+ maven { url System.getenv("GRADLE_MAVEN_REPO") }
- }
- dependencies {
- classpath 'com.android.tools.build:gradle:3.1.4'
-@@ -15,5 +16,6 @@ allprojects {
- maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master"; }
- google()
- maven { url 'https://jitpack.io' }
-+ maven { url System.getenv("GRADLE_MAVEN_REPO") }
- }
- }
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits