tbb-commits
Threads by month
- ----- 2025 -----
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- 1 participants
- 19540 discussions
[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28640: Try showing the homepage after the distribution loads
by gk＠torproject.org 30 Nov '18
by gk＠torproject.org 30 Nov '18
30 Nov '18
commit bd3d1614a144377b32f5f548ce235c8ae0fb01d8
Author: Matthew Finkel <Matthew.Finkel(a)gmail.com>
Date: Thu Nov 29 23:44:43 2018 +0000
Bug 28640: Try showing the homepage after the distribution loads
---
.../base/java/org/mozilla/gecko/BrowserApp.java | 23 ++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
index 814b46f24295..9330a6ba9838 100644
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -3155,6 +3155,29 @@ public class BrowserApp extends GeckoApp
// Don't show any onFinish actions when hiding from this Activity.
mFirstrunAnimationContainer.registerOnFinishListener(null);
mFirstrunAnimationContainer.hide();
+
+ // This is a little hacky, but this ensures about:tor (or whichever homepage
+ // is configured) shows when the user closes the FirstRun panels.
+ String homepageUrl = Tabs.getHomepage(BrowserApp.this);
+
+ // If the homepage is already open in one of the tabs, then switch to that tab.
+ int homepage_index = Tabs.getInstance().isOpen(homepageUrl);
+ if (homepage_index != Tabs.INVALID_TAB_ID) {
+ Tabs.getInstance().selectTab(homepage_index);
+ return true;
+ }
+
+ // Open in the currently selected tab by default
+ int tab_flags = Tabs.LOADURL_NONE;
+
+ // If there's more than one tab open, then the user opened at least one of them.
+ // Don't modify their tabs and open a new tab for the homepage.
+ if (Tabs.getInstance().getDisplayCount() > 1) {
+ tab_flags = Tabs.LOADURL_NEW_TAB;
+ }
+
+ Tabs.getInstance().loadUrl(homepageUrl, tab_flags);
+
return true;
}
1
0
[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28640: Reload distribution preferences when a new version of the app is installed
by gk＠torproject.org 30 Nov '18
by gk＠torproject.org 30 Nov '18
30 Nov '18
commit 20f13426dec48e7b3b1df2cbd6cc41b3432fa267
Author: Matthew Finkel <Matthew.Finkel(a)gmail.com>
Date: Thu Nov 29 20:33:14 2018 +0000
Bug 28640: Reload distribution preferences when a new version of the app is installed
---
.../base/java/org/mozilla/gecko/distribution/Distribution.java | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java b/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java
index ea9534bfd741..93c325e451bd 100644
--- a/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java
+++ b/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java
@@ -43,7 +43,9 @@ import org.mozilla.gecko.EventDispatcher;
import org.mozilla.gecko.GeckoAppShell;
import org.mozilla.gecko.GeckoApplication;
import org.mozilla.gecko.GeckoSharedPrefs;
+import org.mozilla.gecko.preferences.DistroSharedPrefsImport;
import org.mozilla.gecko.Telemetry;
+import org.mozilla.gecko.preferences.GeckoPreferences;
import org.mozilla.gecko.util.FileUtils;
import org.mozilla.gecko.util.GeckoBundle;
import org.mozilla.gecko.util.HardwareUtils;
@@ -246,6 +248,7 @@ public class Distribution {
final String preferencesJSON = FileUtils.readStringFromFile(descFile);
data = new GeckoBundle(1);
data.putString("preferences", preferencesJSON);
+ DistroSharedPrefsImport.importPreferences(distribution.context, distribution);
} catch (IOException e) {
Log.e(LOGTAG, "Error getting distribution descriptor file.", e);
@@ -498,6 +501,13 @@ public class Distribution {
// We've done the work once; don't do it again.
if (this.state == STATE_SET) {
+ // If this is a new version of the app, then copy the
+ // distribution files from the APK
+ if (!AppConstants.MOZ_APP_BUILDID.equals(settings.getString(GeckoPreferences.PREFS_APP_UPDATE_LAST_BUILD_ID, null))) {
+ Log.i(LOGTAG, "Copying APK distribution file because the build ID changed.");
+ copyAndCheckAPKDistribution();
+ }
+
// Note that we don't compute the distribution directory.
// Call `ensureDistributionDir` if you need it.
runReadyQueue();
1
0
[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28640: Do not load Torbutton from the user's profile (only on Android)
by gk＠torproject.org 30 Nov '18
by gk＠torproject.org 30 Nov '18
30 Nov '18
commit 62ec69b09ff02649b3eab64a08fa87549c0bfc16
Author: Matthew Finkel <Matthew.Finkel(a)gmail.com>
Date: Fri Nov 30 07:05:05 2018 +0000
Bug 28640: Do not load Torbutton from the user's profile (only on Android)
---
toolkit/mozapps/extensions/internal/XPIProvider.jsm | 11 +++++++++++
toolkit/mozapps/extensions/internal/moz.build | 5 ++++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index a8be063ddbde..f9e48977053e 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -1601,6 +1601,17 @@ var XPIStates = {
for (let [id, file] of location.getAddonLocations(true)) {
knownIds.delete(id);
+#if defined(TOR_BROWSER_VERSION) && defined(ANDROID)
+ // Remove Torbutton if it is installed in the user profile
+ if (id === "torbutton(a)torproject.org" &&
+ location.name === KEY_APP_PROFILE) {
+ logger.debug("Uninstalling Torbutton from user profile.");
+ location.uninstallAddon(id);
+ changed = true;
+ continue;
+ }
+#endif
+
let xpiState = loc.get(id);
if (!xpiState) {
logger.debug("New add-on ${id} in ${location}", {id, location: location.name});
diff --git a/toolkit/mozapps/extensions/internal/moz.build b/toolkit/mozapps/extensions/internal/moz.build
index 8661ef7125dd..32b75a5cef68 100644
--- a/toolkit/mozapps/extensions/internal/moz.build
+++ b/toolkit/mozapps/extensions/internal/moz.build
@@ -15,10 +15,13 @@ EXTRA_JS_MODULES.addons += [
'ProductAddonChecker.jsm',
'SpellCheckDictionaryBootstrap.js',
'XPIInstall.jsm',
- 'XPIProvider.jsm',
'XPIProviderUtils.js',
]
+EXTRA_PP_JS_MODULES.addons += [
+ 'XPIProvider.jsm',
+]
+
TESTING_JS_MODULES += [
'AddonTestUtils.jsm',
]
1
0
commit 68ad9e3d555d18d894c2ae0a1e8b3e797642ff54
Author: Georg Koppen <gk(a)torproject.org>
Date: Thu Nov 29 21:30:25 2018 +0000
Release preparations for 2.1.2
Version bump and CHANGELOG update
---
src/CHANGELOG | 11 +++++++++++
src/install.rdf | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/CHANGELOG b/src/CHANGELOG
index 468d2a99..0db59514 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -1,3 +1,14 @@
+2.1.2
+ * Bug 25013: Integrate Torbutton into tor-browser for Android
+ * Bug 27111: Update about:tor desktop version to work on mobile
+ * Bug 28093: Update donation banner style to make it fit in small screens
+ * Bug 28543: about:tor has scroll bar between widths 900px and 1000px
+ * Bug 28039: Enable dump() if log method is 0
+ * Bug 27701: Don't show App Blocker dialog on Android
+ * Bug 28187: Change tor circuit icon to torbutton.svg
+ * Bug 28515: Use en-US for english Torbutton strings
+ * Translations update
+
2.1.1
* Bug 23925+27959: Donation banner for year end 2018 campaign
* Bug 24172: Donation banner clobbers Tor Browser version string
diff --git a/src/install.rdf b/src/install.rdf
index fcd857a4..45bee11a 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -6,7 +6,7 @@
<em:name>Torbutton</em:name>
<em:creator>Mike Perry</em:creator>
<em:id>torbutton(a)torproject.org</em:id>
- <em:version>2.1.1</em:version>
+ <em:version>2.1.2</em:version>
<em:multiprocessCompatible>true</em:multiprocessCompatible>
<em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL>
<em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>
1
0
commit 473a9bff9a7aaee1be54185d0c085e2affba3a15
Author: Georg Koppen <gk(a)torproject.org>
Date: Thu Nov 29 21:29:58 2018 +0000
Translations update
---
src/chrome/locale/da/aboutTor.dtd | 10 +++++-----
src/chrome/locale/da/torbutton.properties | 2 +-
src/chrome/locale/fr/aboutTor.dtd | 16 ++++++++--------
src/chrome/locale/it/aboutTor.dtd | 4 ++--
src/chrome/locale/pt-BR/aboutTor.dtd | 6 +++---
src/chrome/locale/zh-CN/aboutTor.dtd | 10 +++++-----
6 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/src/chrome/locale/da/aboutTor.dtd b/src/chrome/locale/da/aboutTor.dtd
index ba40ff02..bc06d980 100644
--- a/src/chrome/locale/da/aboutTor.dtd
+++ b/src/chrome/locale/da/aboutTor.dtd
@@ -35,13 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "Beskyt privatlivet af millioner.">
<!ENTITY aboutTor.donationBanner.line2e "Hold Tor stærk.">
<!ENTITY aboutTor.donationBanner.line2f "Vi har brug for din støtte!">
-<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
-<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
-<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019.">
+<!ENTITY aboutTor.donationBanner.line2g "Støt internetfrihed.">
+<!ENTITY aboutTor.donationBanner.line2h "Forsvar det åbne web.">
+<!ENTITY aboutTor.donationBanner.line2i "Støt privatliv og frihed online.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla matcher hver donation frem til 2019.">
<!ENTITY aboutTor.donationBanner.line3 "Giv i dag, og Mozilla vil matche din donation.">
-<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong.">
+<!ENTITY aboutTor.donationBanner.line3b "Giv nu og din gave bliver dobbelt så stærk.">
<!ENTITY aboutTor.donationBanner.buttonA "Donér nu">
<!ENTITY aboutTor.donationBanner.buttonB "Jeg er med">
diff --git a/src/chrome/locale/da/torbutton.properties b/src/chrome/locale/da/torbutton.properties
index ef2e85a9..573e4e1f 100644
--- a/src/chrome/locale/da/torbutton.properties
+++ b/src/chrome/locale/da/torbutton.properties
@@ -1,6 +1,6 @@
torbutton.circuit_display.internet = Internettet
torbutton.circuit_display.ip_unknown = Ukendt IP-adresse
-torbutton.circuit_display.onion_site = Løg side
+torbutton.circuit_display.onion_site = Løg-sted
torbutton.circuit_display.this_browser = Browseren
torbutton.circuit_display.relay = Relæ
torbutton.circuit_display.tor_bridge = Bro
diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd
index 69dcd0f8..0df6622d 100644
--- a/src/chrome/locale/fr/aboutTor.dtd
+++ b/src/chrome/locale/fr/aboutTor.dtd
@@ -30,18 +30,18 @@
<!ENTITY aboutTor.donationBanner.line1 "Tor : l’union fait la force">
<!ENTITY aboutTor.donationBanner.line2a "L’anonymat est contagieux.">
-<!ENTITY aboutTor.donationBanner.line2b "Promouvoir les droits universels de la personne.">
-<!ENTITY aboutTor.donationBanner.line2c "Défendre la liberté.">
-<!ENTITY aboutTor.donationBanner.line2d "Protéger la vie privée de millions de personnes.">
-<!ENTITY aboutTor.donationBanner.line2e "Assurer la robustesse de Tor.">
+<!ENTITY aboutTor.donationBanner.line2b "Promouvez les droits universels de la personne.">
+<!ENTITY aboutTor.donationBanner.line2c "Défendez la liberté.">
+<!ENTITY aboutTor.donationBanner.line2d "Protégez la vie privée de millions de personnes.">
+<!ENTITY aboutTor.donationBanner.line2e "Assurez la robustesse de Tor.">
<!ENTITY aboutTor.donationBanner.line2f "Nous avons besoin de votre soutien !">
<!ENTITY aboutTor.donationBanner.line2g "Soutenez la liberté sur Internet.">
-<!ENTITY aboutTor.donationBanner.line2h "Défendez le web ouvert.">
-<!ENTITY aboutTor.donationBanner.line2i "Prise en charge de la vie privée et de la liberté en ligne.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla s'engage à verser un montant équivalent à chaque don jusqu'en 2019.">
+<!ENTITY aboutTor.donationBanner.line2h "Défendez le Web ouvert.">
+<!ENTITY aboutTor.donationBanner.line2i "Soutenez la vie privé et la liberté en ligne.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla versera un montant équivalent à chaque don jusqu’en 2019.">
<!ENTITY aboutTor.donationBanner.line3 "Faites un don aujourd’hui et Mozilla fera un don équivalent.">
-<!ENTITY aboutTor.donationBanner.line3b "Donnez maintenant, et votre don devient deux fois plus fort.">
+<!ENTITY aboutTor.donationBanner.line3b "Faites un don maintenant et sa force en sera doublée.">
<!ENTITY aboutTor.donationBanner.buttonA "Faites un don maintenant">
<!ENTITY aboutTor.donationBanner.buttonB "Comptez sur moi">
diff --git a/src/chrome/locale/it/aboutTor.dtd b/src/chrome/locale/it/aboutTor.dtd
index 128a95bd..daad7130 100644
--- a/src/chrome/locale/it/aboutTor.dtd
+++ b/src/chrome/locale/it/aboutTor.dtd
@@ -38,10 +38,10 @@
<!ENTITY aboutTor.donationBanner.line2g "Supporta la libertà di internet.">
<!ENTITY aboutTor.donationBanner.line2h "Difendi il web aperto.">
<!ENTITY aboutTor.donationBanner.line2i "Sostieni la privacy e la libertà online.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla corrisponderà tutte le donazioni fino al 2019.">
<!ENTITY aboutTor.donationBanner.line3 "Dai oggi, e Mozilla ricambierà la tua donazione.">
-<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong.">
+<!ENTITY aboutTor.donationBanner.line3b "Dona ora e il tuo regalo diventerà due volte più valoroso.">
<!ENTITY aboutTor.donationBanner.buttonA "Dona Ora">
<!ENTITY aboutTor.donationBanner.buttonB "Contami">
diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd b/src/chrome/locale/pt-BR/aboutTor.dtd
index c137ac41..243a012b 100644
--- a/src/chrome/locale/pt-BR/aboutTor.dtd
+++ b/src/chrome/locale/pt-BR/aboutTor.dtd
@@ -36,9 +36,9 @@
<!ENTITY aboutTor.donationBanner.line2d "Proteger a privacidade de milhões de pessoas.">
<!ENTITY aboutTor.donationBanner.line2e "Manter a força do Tor.">
<!ENTITY aboutTor.donationBanner.line2f "Precisamos do seu apoio!">
-<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
-<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
-<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
+<!ENTITY aboutTor.donationBanner.line2g "Apóie a liberdade na internet.">
+<!ENTITY aboutTor.donationBanner.line2h "Defenda a web aberta.">
+<!ENTITY aboutTor.donationBanner.line2i "Apóie a privacidade e liberdade online.">
<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019.">
<!ENTITY aboutTor.donationBanner.line3 "Doe hoje, e a Mozilla duplicará a sua doação.">
diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd
index 0ae7596e..2707eb0a 100644
--- a/src/chrome/locale/zh-CN/aboutTor.dtd
+++ b/src/chrome/locale/zh-CN/aboutTor.dtd
@@ -35,13 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "保护数百万人的隐私。">
<!ENTITY aboutTor.donationBanner.line2e "让 Tor 网络保持健壮。">
<!ENTITY aboutTor.donationBanner.line2f "我们需要你的帮助！">
-<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
-<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
-<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
-<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019.">
+<!ENTITY aboutTor.donationBanner.line2g "支持互联网自由。">
+<!ENTITY aboutTor.donationBanner.line2h "捍卫互联网的开放。">
+<!ENTITY aboutTor.donationBanner.line2i "保障隐私和网络自由。">
+<!ENTITY aboutTor.donationBanner.line2j "直到2019年，Mozilla 将匹配所有捐赠。">
<!ENTITY aboutTor.donationBanner.line3 "现在捐款， Mozilla 也能从你的捐赠中受益。">
-<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong.">
+<!ENTITY aboutTor.donationBanner.line3b "现在捐赠，您的支持将化作双倍的力量。">
<!ENTITY aboutTor.donationBanner.buttonA "现在就捐助">
<!ENTITY aboutTor.donationBanner.buttonB "算我一个">
1
0
commit 49df74bbb79cec5c5505abe0e174117eb509c9cc
Author: Georg Koppen <gk(a)torproject.org>
Date: Thu Nov 29 21:26:35 2018 +0000
Version bump (0.2.18)
---
src/install.rdf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/install.rdf b/src/install.rdf
index 1ee7a87..bfc698d 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -7,7 +7,7 @@
<em:creator>The Tor Project, Inc.</em:creator>
<em:contributor>Pearl Crescent, LLC</em:contributor>
<em:id>tor-launcher(a)torproject.org</em:id>
- <em:version>0.2.17</em:version>
+ <em:version>0.2.18</em:version>
<em:multiprocessCompatible>true</em:multiprocessCompatible>
<em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL>
<em:updateURL>data:text/plain,</em:updateURL>
1
0
[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 26690: Port padlock states for .onion services to mobile
by gk＠torproject.org 29 Nov '18
by gk＠torproject.org 29 Nov '18
29 Nov '18
commit e5659b39d8bc51faecac5daa7f2cb9b63d4dccf8
Author: Igor Oliveira <igt0(a)torproject.org>
Date: Mon Oct 29 12:30:14 2018 -0200
Bug 26690: Port padlock states for .onion services to mobile
Prior to this patch, TBA was showing onion services as insecure
connection and SSL/TLS ones as encrypted connections(lock icon).
This patch fixes the issue adding several new onion icons to indicate
all the various permutations of onions services hosted HTTP or HTTPS
pages.
---
.../src/main/res/drawable/site_security_icon.xml | 10 +++++++++-
.../app/src/photon/res/drawable-hdpi/ic_onion.png | Bin 0 -> 807 bytes
.../photon/res/drawable-hdpi/ic_onion_disabled.png | Bin 0 -> 975 bytes
.../src/photon/res/drawable-hdpi/ic_onion_lock.png | Bin 0 -> 932 bytes
.../app/src/photon/res/drawable-xhdpi/ic_onion.png | Bin 0 -> 1015 bytes
.../res/drawable-xhdpi/ic_onion_disabled.png | Bin 0 -> 1260 bytes
.../photon/res/drawable-xhdpi/ic_onion_lock.png | Bin 0 -> 1275 bytes
.../src/photon/res/drawable-xxhdpi/ic_onion.png | Bin 0 -> 1592 bytes
.../res/drawable-xxhdpi/ic_onion_disabled.png | Bin 0 -> 1892 bytes
.../photon/res/drawable-xxhdpi/ic_onion_lock.png | Bin 0 -> 1899 bytes
.../src/photon/res/drawable-xxxhdpi/ic_onion.png | Bin 0 -> 2099 bytes
.../res/drawable-xxxhdpi/ic_onion_disabled.png | Bin 0 -> 2526 bytes
.../photon/res/drawable-xxxhdpi/ic_onion_lock.png | Bin 0 -> 2568 bytes
.../photon/res/drawable/security_mode_icon_nm.xml | 9 +++++++++
.../photon/res/drawable/security_mode_icon_pm.xml | 9 +++++++++
.../base/java/org/mozilla/gecko/SiteIdentity.java | 14 ++++++++++++++
.../mozilla/gecko/toolbar/SecurityModeUtil.java | 21 ++++++++++++++++-----
.../mozilla/gecko/toolbar/SiteIdentityPopup.java | 17 +++++++++++------
mobile/android/chrome/content/browser.js | 14 +++++++++++++-
19 files changed, 81 insertions(+), 13 deletions(-)
diff --git a/mobile/android/app/src/main/res/drawable/site_security_icon.xml b/mobile/android/app/src/main/res/drawable/site_security_icon.xml
index ac8624f861ad..f5f4c7775110 100644
--- a/mobile/android/app/src/main/res/drawable/site_security_icon.xml
+++ b/mobile/android/app/src/main/res/drawable/site_security_icon.xml
@@ -28,5 +28,13 @@
<item
android:drawable="@drawable/ic_search_icon"
android:maxLevel="6" />
-
+ <item
+ android:drawable="@drawable/ic_onion"
+ android:maxLevel="7"/>
+ <item
+ android:drawable="@drawable/ic_onion_lock"
+ android:maxLevel="8"/>
+ <item
+ android:drawable="@drawable/ic_onion_disabled"
+ android:maxLevel="9"/>
</level-list>
diff --git a/mobile/android/app/src/photon/res/drawable-hdpi/ic_onion.png b/mobile/android/app/src/photon/res/drawable-hdpi/ic_onion.png
new file mode 100644
index 000000000000..1a61d982752b
Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-hdpi/ic_onion.png differ
diff --git a/mobile/android/app/src/photon/res/drawable-hdpi/ic_onion_disabled.png b/mobile/android/app/src/photon/res/drawable-hdpi/ic_onion_disabled.png
new file mode 100644
index 000000000000..9669d12101fb
Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-hdpi/ic_onion_disabled.png differ
diff --git a/mobile/android/app/src/photon/res/drawable-hdpi/ic_onion_lock.png b/mobile/android/app/src/photon/res/drawable-hdpi/ic_onion_lock.png
new file mode 100644
index 000000000000..b0f60fea5b28
Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-hdpi/ic_onion_lock.png differ
diff --git a/mobile/android/app/src/photon/res/drawable-xhdpi/ic_onion.png b/mobile/android/app/src/photon/res/drawable-xhdpi/ic_onion.png
new file mode 100755
index 000000000000..074330c3a25a
Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-xhdpi/ic_onion.png differ
diff --git a/mobile/android/app/src/photon/res/drawable-xhdpi/ic_onion_disabled.png b/mobile/android/app/src/photon/res/drawable-xhdpi/ic_onion_disabled.png
new file mode 100755
index 000000000000..09db37998d33
Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-xhdpi/ic_onion_disabled.png differ
diff --git a/mobile/android/app/src/photon/res/drawable-xhdpi/ic_onion_lock.png b/mobile/android/app/src/photon/res/drawable-xhdpi/ic_onion_lock.png
new file mode 100755
index 000000000000..13799b7fa8f7
Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-xhdpi/ic_onion_lock.png differ
diff --git a/mobile/android/app/src/photon/res/drawable-xxhdpi/ic_onion.png b/mobile/android/app/src/photon/res/drawable-xxhdpi/ic_onion.png
new file mode 100755
index 000000000000..711bb3c8d8fa
Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-xxhdpi/ic_onion.png differ
diff --git a/mobile/android/app/src/photon/res/drawable-xxhdpi/ic_onion_disabled.png b/mobile/android/app/src/photon/res/drawable-xxhdpi/ic_onion_disabled.png
new file mode 100755
index 000000000000..0d931669abf3
Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-xxhdpi/ic_onion_disabled.png differ
diff --git a/mobile/android/app/src/photon/res/drawable-xxhdpi/ic_onion_lock.png b/mobile/android/app/src/photon/res/drawable-xxhdpi/ic_onion_lock.png
new file mode 100755
index 000000000000..f7a5c29b4c17
Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-xxhdpi/ic_onion_lock.png differ
diff --git a/mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_onion.png b/mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_onion.png
new file mode 100755
index 000000000000..97a0beabbe0c
Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_onion.png differ
diff --git a/mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_onion_disabled.png b/mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_onion_disabled.png
new file mode 100755
index 000000000000..aec29bf6238b
Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_onion_disabled.png differ
diff --git a/mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_onion_lock.png b/mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_onion_lock.png
new file mode 100755
index 000000000000..71df527b2a6a
Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-xxxhdpi/ic_onion_lock.png differ
diff --git a/mobile/android/app/src/photon/res/drawable/security_mode_icon_nm.xml b/mobile/android/app/src/photon/res/drawable/security_mode_icon_nm.xml
index 0b6b496b0b34..bb0da0b843d2 100644
--- a/mobile/android/app/src/photon/res/drawable/security_mode_icon_nm.xml
+++ b/mobile/android/app/src/photon/res/drawable/security_mode_icon_nm.xml
@@ -28,5 +28,14 @@
<item
android:drawable="@drawable/ic_search_icon"
android:maxLevel="6" />
+ <item
+ android:drawable="@drawable/ic_onion"
+ android:maxLevel="7"/>
+ <item
+ android:drawable="@drawable/ic_onion_lock"
+ android:maxLevel="8"/>
+ <item
+ android:drawable="@drawable/ic_onion_disabled"
+ android:maxLevel="9"/>
</level-list>
diff --git a/mobile/android/app/src/photon/res/drawable/security_mode_icon_pm.xml b/mobile/android/app/src/photon/res/drawable/security_mode_icon_pm.xml
index edbd269040d1..be47d7fe081f 100644
--- a/mobile/android/app/src/photon/res/drawable/security_mode_icon_pm.xml
+++ b/mobile/android/app/src/photon/res/drawable/security_mode_icon_pm.xml
@@ -28,5 +28,14 @@
<item
android:drawable="@drawable/ic_search_icon"
android:maxLevel="6" />
+ <item
+ android:drawable="@drawable/ic_onion"
+ android:maxLevel="7"/>
+ <item
+ android:drawable="@drawable/ic_onion_lock"
+ android:maxLevel="8"/>
+ <item
+ android:drawable="@drawable/ic_onion_disabled"
+ android:maxLevel="9"/>
</level-list>
diff --git a/mobile/android/base/java/org/mozilla/gecko/SiteIdentity.java b/mobile/android/base/java/org/mozilla/gecko/SiteIdentity.java
index 1a046657329d..f5dcb5747386 100644
--- a/mobile/android/base/java/org/mozilla/gecko/SiteIdentity.java
+++ b/mobile/android/base/java/org/mozilla/gecko/SiteIdentity.java
@@ -25,6 +25,8 @@ public class SiteIdentity {
private String mCountry;
private String mVerifier;
private String mOrigin;
+ private boolean mIsOnionHost;
+ private boolean mHasCert;
public enum SecurityMode {
UNKNOWN,
@@ -59,6 +61,8 @@ public class SiteIdentity {
mCountry = null;
mVerifier = null;
mSecure = false;
+ mIsOnionHost = false;
+ mHasCert = false;
}
public void reset() {
@@ -110,6 +114,8 @@ public class SiteIdentity {
mVerifier = identityData.getString("verifier");
mSecure = identityData.getBoolean("secure");
mSecurityException = identityData.getBoolean("securityException");
+ mIsOnionHost = identityData.getBoolean("isOnionHost");
+ mHasCert = identityData.getBoolean("hasCert");
}
public SecurityMode getSecurityMode() {
@@ -152,6 +158,14 @@ public class SiteIdentity {
return mSecure;
}
+ public boolean isOnionHost() {
+ return mIsOnionHost;
+ }
+
+ public boolean hasCert() {
+ return mHasCert;
+ }
+
public MixedMode getMixedModeActive() {
return mMixedModeActive;
}
diff --git a/mobile/android/base/java/org/mozilla/gecko/toolbar/SecurityModeUtil.java b/mobile/android/base/java/org/mozilla/gecko/toolbar/SecurityModeUtil.java
index ceb33b8e3acb..10bc83c279a1 100644
--- a/mobile/android/base/java/org/mozilla/gecko/toolbar/SecurityModeUtil.java
+++ b/mobile/android/base/java/org/mozilla/gecko/toolbar/SecurityModeUtil.java
@@ -35,6 +35,9 @@ public class SecurityModeUtil {
LOCK_SECURE(1),
LOCK_WARNING(-1), // not used for now. reserve for MixedDisplayContent icon, if any.
LOCK_INSECURE(3),
+ ONION(7),
+ ONION_ACTIVATE(8),
+ ONION_DISABLED(9),
WARNING(2),
TRACKING_CONTENT_BLOCKED(4),
TRACKING_CONTENT_LOADED(5);
@@ -100,6 +103,8 @@ public class SecurityModeUtil {
final MixedMode displayMixedMode = identity.getMixedModeDisplay();
final TrackingMode trackingMode = identity.getTrackingMode();
final boolean securityException = identity.isSecurityException();
+ final boolean isOnionHost = identity.isOnionHost();
+ final boolean hasCert = identity.hasCert();
if (securityException) {
return IconType.WARNING;
@@ -108,9 +113,9 @@ public class SecurityModeUtil {
} else if (trackingMode == TrackingMode.TRACKING_CONTENT_BLOCKED) {
return IconType.TRACKING_CONTENT_BLOCKED;
} else if (activeMixedMode == MixedMode.LOADED) {
- return IconType.LOCK_INSECURE;
+ return isOnionHost ? IconType.ONION_DISABLED : IconType.LOCK_INSECURE;
} else if (displayMixedMode == MixedMode.LOADED) {
- return IconType.WARNING;
+ return isOnionHost ? IconType.ONION_DISABLED : IconType.WARNING;
}
// Chrome-UI checking is after tracking/mixed-content, even for about: pages, as they
@@ -119,9 +124,15 @@ public class SecurityModeUtil {
return IconType.DEFAULT;
}
- return securityModeMap.containsKey(securityMode)
- ? securityModeMap.get(securityMode)
- : IconType.UNKNOWN;
+ if (securityMode == SecurityMode.UNKNOWN) {
+ return isOnionHost ? IconType.ONION : IconType.UNKNOWN;
+ } else if (securityMode == SecurityMode.IDENTIFIED) {
+ return isOnionHost ? (hasCert ? IconType.ONION_ACTIVATE : IconType.ONION) : IconType.LOCK_SECURE;
+ } else if (securityMode == SecurityMode.VERIFIED) {
+ return isOnionHost ? IconType.ONION_ACTIVATE : IconType.LOCK_SECURE;
+ } else {
+ return IconType.UNKNOWN;
+ }
}
/**
diff --git a/mobile/android/base/java/org/mozilla/gecko/toolbar/SiteIdentityPopup.java b/mobile/android/base/java/org/mozilla/gecko/toolbar/SiteIdentityPopup.java
index 831f69f2bf09..df67f0a9b9ed 100644
--- a/mobile/android/base/java/org/mozilla/gecko/toolbar/SiteIdentityPopup.java
+++ b/mobile/android/base/java/org/mozilla/gecko/toolbar/SiteIdentityPopup.java
@@ -144,8 +144,9 @@ public class SiteIdentityPopup extends AnchoredPopup implements BundleEventListe
init();
}
- final boolean isIdentityKnown = (siteIdentity.getSecurityMode() == SecurityMode.IDENTIFIED ||
- siteIdentity.getSecurityMode() == SecurityMode.VERIFIED);
+ final boolean isIdentityKnown = ((siteIdentity.getSecurityMode() == SecurityMode.IDENTIFIED ||
+ siteIdentity.getSecurityMode() == SecurityMode.VERIFIED) &&
+ siteIdentity.hasCert());
updateConnectionState(siteIdentity);
toggleIdentityKnownContainerVisibility(isIdentityKnown);
@@ -322,7 +323,8 @@ public class SiteIdentityPopup extends AnchoredPopup implements BundleEventListe
} else if (!siteIdentity.isSecure()) {
if (siteIdentity.getMixedModeActive() == MixedMode.LOADED) {
// Active Mixed Content loaded because user has disabled blocking.
- mIcon.setImageResource(R.drawable.ic_lock_disabled);
+ int resId = siteIdentity.isOnionHost() ? R.drawable.ic_onion_disabled : R.drawable.ic_lock_disabled;
+ mIcon.setImageResource(resId);
clearSecurityStateIcon();
mMixedContentActivity.setVisibility(View.VISIBLE);
mMixedContentActivity.setText(R.string.mixed_content_protection_disabled);
@@ -330,7 +332,8 @@ public class SiteIdentityPopup extends AnchoredPopup implements BundleEventListe
mLink.setVisibility(View.VISIBLE);
} else if (siteIdentity.getMixedModeDisplay() == MixedMode.LOADED) {
// Passive Mixed Content loaded.
- mIcon.setImageResource(R.drawable.ic_lock_inactive);
+ int resId = siteIdentity.isOnionHost() ? R.drawable.ic_onion_disabled : R.drawable.ic_lock_inactive;
+ mIcon.setImageResource(resId);
setSecurityStateIcon(R.drawable.ic_warning_major, 1);
mMixedContentActivity.setVisibility(View.VISIBLE);
if (siteIdentity.getMixedModeActive() == MixedMode.BLOCKED) {
@@ -342,7 +345,8 @@ public class SiteIdentityPopup extends AnchoredPopup implements BundleEventListe
} else {
// Unencrypted connection with no mixed content.
- mIcon.setImageResource(R.drawable.globe_light);
+ int resId = siteIdentity.isOnionHost() ? R.drawable.ic_onion : R.drawable.globe_light;
+ mIcon.setImageResource(resId);
clearSecurityStateIcon();
mMixedContentActivity.setVisibility(View.GONE);
@@ -361,7 +365,8 @@ public class SiteIdentityPopup extends AnchoredPopup implements BundleEventListe
} else {
// Connection is secure.
- mIcon.setImageResource(R.drawable.ic_lock);
+ int resId = siteIdentity.isOnionHost() ? (siteIdentity.hasCert() ? R.drawable.ic_onion_lock : R.drawable.ic_onion) : R.drawable.ic_lock;
+ mIcon.setImageResource(resId);
setSecurityStateIcon(R.drawable.img_check, 2);
mSecurityState.setTextColor(ContextCompat.getColor(mContext, R.color.affirmative_green));
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 51fe1422acc5..3e074009fad9 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -5558,6 +5558,12 @@ var IdentityHandler = {
*/
getIdentityData : function() {
let result = {};
+
+ // Even if the connection is secure, it may not have a certificate
+ if (!this._lastStatus) {
+ return result;
+ }
+
let status = this._lastStatus.QueryInterface(Ci.nsISSLStatus);
let cert = status.serverCert;
@@ -5585,6 +5591,10 @@ var IdentityHandler = {
return result;
},
+ isOnionHost: function isOnionHost() {
+ return this._uri.host.toLowerCase().endsWith(".onion");
+ },
+
/**
* Determines the identity mode corresponding to the icon we show in the urlbar.
*/
@@ -5704,6 +5714,8 @@ var IdentityHandler = {
};
result.host = this.getEffectiveHost();
+ result.isOnionHost = this.isOnionHost();
+ result.hasCert = !!this._lastStatus;
// Don't show identity data for pages with an unknown identity or if any
// mixed content is loaded (mixed display content is loaded by default).
@@ -5757,7 +5769,7 @@ var IdentityHandler = {
// hasMatchingOverride does not handle that, so avoid calling it.
// Updating the tooltip value in those cases isn't critical.
// FIXME: Fixing bug 646690 would probably makes this check unnecessary
- if (this._lastLocation.hostname &&
+ if (this._lastLocation.hostname && iData.cert &&
this._overrideService.hasMatchingOverride(this._lastLocation.hostname,
(this._lastLocation.port || 443),
iData.cert, {}, {})) {
1
0
[tor-browser-build/master] Bug 28581: Add armv7 target to README files
by boklm＠torproject.org 29 Nov '18
by boklm＠torproject.org 29 Nov '18
29 Nov '18
commit 6427b82f2a2819ffce640a7bfcee7702360e7bad
Author: Georg Koppen <gk(a)torproject.org>
Date: Thu Nov 29 10:02:29 2018 +0000
Bug 28581: Add armv7 target to README files
---
README | 1 +
README.HACKING | 18 +++++++++++-------
README.MAKEFILE | 16 ++++++++--------
3 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/README b/README
index 8ebef9b..5fb32ba 100644
--- a/README
+++ b/README
@@ -79,6 +79,7 @@ name to the makefile target:
$ make nightly-linux-i686
$ make nightly-windows-i686
$ make nightly-osx-x86_64
+ $ make nightly-android-armv7
When you want to quickly do a build to test a change, you can use the
testbuild makefile target, and find the build in the testbuild directory.
diff --git a/README.HACKING b/README.HACKING
index 9b846a7..d9b0674 100644
--- a/README.HACKING
+++ b/README.HACKING
@@ -44,16 +44,18 @@ In each of those places, an option can be defined:
The targets are usually used to select:
- the platform: torbrowser-linux-x86_64, torbrowser-linux-i686,
- torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64
+ torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64,
+ torbrowser-android-armv7
- the channel: release, nightly, alpha
The targets torbrowser-linux-x86_64, torbrowser-linux-i686,
-torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64 are
-special cases. They do not contain options directly, instead they contain a
-list of other targets. For instance, the torbrowser-linux-x86_64 target is
-pointing to the linux-x86_64 and linux targets. You should define an option
-under the linux target if it applies to Linux on both architectures, or under
-the linux-x86_64 if it only applies to the x86_64 architecture.
+torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64, and
+torbrowser-android-armv7 are special cases. They do not contain options
+directly, instead they contain a list of other targets. For instance, the
+torbrowser-linux-x86_64 target is pointing to the linux-x86_64 and linux
+targets. You should define an option under the linux target if it applies to
+Linux on both architectures, or under the linux-x86_64 if it only applies to the
+x86_64 architecture.
An option that is defined at the root of rbm.conf can be overridden by
an other definition under a target, or inside projects/$project/config.
@@ -152,6 +154,8 @@ $platform should be one of the following:
- torbrowser-osx-x86_64
+ - torbrowser-android-armv7
+
For example, to see tor's build script for linux x86_64 on the alpha
channel, you can use:
diff --git a/README.MAKEFILE b/README.MAKEFILE
index 7fd05e9..1514780 100644
--- a/README.MAKEFILE
+++ b/README.MAKEFILE
@@ -7,8 +7,8 @@ release
Build Tor Browser for the release channel, for all supported platforms.
The resulting build can be found in directory release/$version.
-release-{linux-x86_64,linux-i686,windows-i686,osx-x86_64}
----------------------------------------------------------
+release-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7}
+-----------------------------------------------------------------------
Same as release, for the selected platform only.
alpha
@@ -16,8 +16,8 @@ alpha
Build Tor Browser for the alpha channel, for all supported platforms.
The resulting build can be found in directory alpha/$version.
-alpha-{linux-x86_64,linux-i686,windows-i686,osx-x86_64}
--------------------------------------------------------
+alpha-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7}
+---------------------------------------------------------------------
Same as alpha, for the selected platform only.
nightly
@@ -29,8 +29,8 @@ components.
The resulting build can be found in directory nightly/$date
-nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64}
----------------------------------------------------------
+nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7}
+-----------------------------------------------------------------------
Same as nightly, for the selected platform only.
alpha_nightly
@@ -39,8 +39,8 @@ Build Tor Browser for the alpha channel, for all supported platforms.
This is the same as 'make alpha', but the output directory is different.
The resulting build can be found in directory alpha_nightly/$date
-alpha_nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64}
----------------------------------------------------------------
+alpha_nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7}
+-----------------------------------------------------------------------------
The same as alpha_nightly, for the selected platform only.
testbuild
1
0
[tor-browser-build/master] Bug 27977: Build Orbot with rbm/tor-browser-build
by gk＠torproject.org 29 Nov '18
by gk＠torproject.org 29 Nov '18
29 Nov '18
commit fa7c5374e7edc29bb759789a734dd5c194424602
Author: sisbell <shane.isbell(a)gmail.com>
Date: Thu Nov 15 16:20:39 2018 -0800
Bug 27977: Build Orbot with rbm/tor-browser-build
---
projects/firefox/build | 4 +
projects/firefox/config | 5 +-
projects/firefox/gradle-dependencies-list.txt | 662 ++++-----
.../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 +++
projects/orbot/build | 35 +
projects/orbot/config | 52 +
projects/orbot/gradle-dependencies-list.txt | 192 +++
projects/orbot/set_gradle_repo_to_local.patch | 19 +
20 files changed, 3769 insertions(+), 327 deletions(-)
diff --git a/projects/firefox/build b/projects/firefox/build
index d210b7a..e81ecfe 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -101,6 +101,10 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig
export ASAN_OPTIONS="detect_leaks=0"
[% END -%]
+[% IF c("var/android") %]
+ cp $rootdir/[% c('input_files_by_name/orbot') %]/* mobile/android/app
+[% END %]
+
eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] $(cat browser/config/version.txt))
if [ -z $MOZ_BUILD_DATE ]
then
diff --git a/projects/firefox/config b/projects/firefox/config
index 9f88ae8..68918d9 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -23,7 +23,7 @@ var:
container:
use_container: 1
# this should be updated when the list of gradle dependencies is changed
- gradle_dependencies_version: 2
+ gradle_dependencies_version: 3
targets:
release:
@@ -132,3 +132,6 @@ input_files:
name: gradle-dependencies
exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
enable: '[% c("var/android") %]'
+ - project: orbot
+ name: orbot
+ enable: '[% c("var/android") %]'
diff --git a/projects/firefox/gradle-dependencies-list.txt b/projects/firefox/gradle-dependencies-list.txt
index f96af50..da078c0 100644
--- a/projects/firefox/gradle-dependencies-list.txt
+++ b/projects/firefox/gradle-dependencies-list.txt
@@ -1,358 +1,368 @@
# 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
-f51550a06b1410bd4962cb0e71df0b921a60a7ef47bfa9c4825a14be72316eea | https://jcenter.bintray.com/org/codehaus/mojo/animal-sniffer-parent/1.14/an…
-fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/9/oss-parent-9.pom
-50cadbcd70d80cf627661628e9d5163fe4f0757b87e89e68b43663b509c031d5 | https://jcenter.bintray.com/org/simpleframework/simple-common/6.0.1/simple-…
-1ef71c25a9d46ae0ce023d02a5734e0b06fdf934fbc5948e20482526b22b4179 | https://maven.google.com/com/android/tools/build/gradle/3.0.1/gradle-3.0.1.…
-315a79bf0beee4a355ebe36de326b7b9b22a1ecdf22badd7e1bb2af94429bff1 | https://maven.google.com/com/android/support/cardview-v7/23.4.0/cardview-v7…
-f2abf7db3c5937fe021fd66f8bd2d9460cf2c9b1ad8efa0abb797d778390b22f | https://jcenter.bintray.com/com/squareup/haha/haha/2.0.2/haha-2.0.2.pom
-d49d179f707d3f3a00b2a7d36136b54aa8d44fa22770703cd82fe52fb39e22eb | https://jcenter.bintray.com/com/android/tools/build/transform-api/2.0.0-dep…
-0288414509c625b8dd544384fbd29f502bdc8b4f86cfc26625aa23eef9fa6057 | https://jcenter.bintray.com/net/sf/proguard/proguard-parent/5.3.3/proguard-…
-e91a88dd0c5e99069b7f09d4a46b5e06f1e9c4c72fc0a8e987e25d86af480f01 | https://maven.google.com/com/android/support/support-annotations/23.4.0/sup…
-d5831ee4f71055800821a34a3051cf1ed5b3702f295ffebd50f65fb5d81a71b8 | https://jcenter.bintray.com/org/mockito/mockito-core/1.10.19/mockito-core-1…
-fb5369fc7ea4b2e3cf8d6f20243f1d97f81341bf818b179cd8dbd1da7a781a21 | https://jcenter.bintray.com/org/ow2/asm/asm-tree/5.1/asm-tree-5.1.pom
-7af7e2d8b24b4798f04c2b7da24c9fbd1b7557b4e017c2054481565916079092 | https://jcenter.bintray.com/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-…
-b5b46ac0c09da41b04dbc753456b48912856a7ffbb1490676910b510c471d13f | https://jcenter.bintray.com/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.pom
-e6d920d5a1a34aaaebab1e6a82c36bbfd61f1eeaabc4534ee05d4faad56f1b7a | https://jcenter.bintray.com/org/apache/ant/ant/1.8.0/ant-1.8.0.pom
-9e9323a26ba8eb2394efef0c96d31b70df570808630dc147cab1e73541cc5194 | https://jcenter.bintray.com/org/apache/apache/4/apache-4.pom
-56057490cbc1eeae6227e6eb5c6d5b324b77429b8a78d15027c77d491ef9c675 | https://jcenter.bintray.com/org/ow2/asm/asm/5.0.1/asm-5.0.1.jar
-85c3c8840bb21554faf159998146f7ca9ef1b951defb29ec4e8252ec463728fd | https://jcenter.bintray.com/org/apache/maven/wagon/wagon-provider-api/1.0-b…
-47a89be0fa0fedd476db5fd2c83487654d2a119c391f83a142be876667cf7dab | https://jcenter.bintray.com/com/googlecode/json-simple/json-simple/1.1/json…
-857db5645aaefbd7fbe9ba6454b072bc0518ebaba08a93d5eae89a9850e949c4 | https://jcenter.bintray.com/com/getkeepsafe/dexcount/dexcount-gradle-plugin…
-2ca121831e597b4d8f2cb22d17c5c041fc23a7777ceb6bfbdd4dfb34bbe7d997 | https://jcenter.bintray.com/org/codehaus/plexus/plexus-utils/1.5.15/plexus-…
-ecaffef655fea6b138f0855a12f7dbb59fc0d6bffb5c1bfd31803cccb49ea08c | https://jcenter.bintray.com/org/apache/maven/maven-profile/2.2.1/maven-prof…
-f0c98c571e93a7cb4dd18df0fa308f0963e7a0620ac2d4244e61e709d03ad6be | https://jcenter.bintray.com/com/google/j2objc/j2objc-annotations/1.1/j2objc…
-70f418efbb506c5155da5f9a5a33262ea08a9e4d7fea186aa9015c41a7224ac2 | https://jcenter.bintray.com/org/hamcrest/hamcrest-integration/1.3/hamcrest-…
-fcd77cba4ea3893429860b93da5d43f2e089f2ba8bdfa97ef724f410f404152a | https://maven.google.com/com/android/tools/build/gradle/3.0.1/gradle-3.0.1.…
-fb1cb7fa27d892712ced8fbf8d027eb5052ecd3999dba1ba47824357accb40e7 | https://jcenter.bintray.com/org/ow2/asm/asm-commons/5.0.1/asm-commons-5.0.1…
-38db692b5cbaf69d89b1fe5b0fc38a5cc83f898716f8bc64086fa17c25ea57d6 | https://maven.google.com/com/android/tools/analytics-library/shared/26.0.1/…
-b46b548f116a5dd5b018e6f1f4760fe04f93aecdbea094c2f0890e8bf690ada3 | https://jcenter.bintray.com/org/robolectric/shadows-framework/3.5.1/shadows…
-343b1a3093410e3fb26c66998423ab389c3a7441cd1a8859bd327dd15b479aa4 | https://jcenter.bintray.com/org/objenesis/objenesis-parent/2.1/objenesis-pa…
-ff2aceed10da9930a44f6c8f81c6372d5e55eb59c4e0ea9d37f77dfd765fa9fa | https://jcenter.bintray.com/org/ow2/asm/asm-tree/5.0.1/asm-tree-5.0.1.jar
-f1226fd07fc72af8d6232bdfa70bf31d883a1a01cbc547f23a74e9066c692df1 | https://jcenter.bintray.com/com/google/guava/guava-parent/20.0/guava-parent…
-6d535f94efb663bdb682c9f27a50335394688009642ba7a9677504bc1be4129b | https://jcenter.bintray.com/org/hamcrest/hamcrest-parent/1.3/hamcrest-paren…
-1ceb4bfb0f098ae29b935044b2363e11323313fe3ed2055df8b79737d5056277 | https://jcenter.bintray.com/org/hamcrest/hamcrest-library/1.3/hamcrest-libr…
-419487d0c123d11cc6e1a12da517d02958ee1de209f1e1855bb14f5dd3759bb0 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions/…
-4f88a89142c64bf03906f84609594666e9694df56e3e6f05edfab8a68b39d837 | https://maven.google.com/com/android/tools/annotations/26.0.1/annotations-2…
-597b54cc1a494799d783921c6ac04352f33e94fca8e00f299d4ca192db79e3fc | https://jcenter.bintray.com/org/robolectric/shadows-framework/3.5.1/shadows…
-f699823d0081f69cbb676c1845ea222e0ada79bc88a53e5d22d8bd02d328f57e | https://jcenter.bintray.com/com/squareup/javawriter/2.1.1/javawriter-2.1.1.…
-ec4c74554312fac5116350164786f91b35c9e082fa4ea598bfa42b5db05d7abb | https://jcenter.bintray.com/org/jacoco/org.jacoco.core/0.7.4.201502262128/o…
-4a028c17c75cce301e13fdfbc0750ceb48a166dd1013ee516a49684472fcf0e5 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions/…
-1d2e883717b8ab7d3fcc9fa01034d165809a9c94daa6303a838f11e4d36adc86 | https://jcenter.bintray.com/net/sf/proguard/proguard-base/5.3.3/proguard-ba…
-b6eb99f1362b8344ca5400d57a35c49e3504f23f3dee304fdb879d4d953f4bc6 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcore/4.2.5/httpco…
-e899e02ec8ac6a73fb9c9c7cb9ebd9bfc4ce8263412285d5ec6f2df920880905 | https://maven.google.com/com/android/tools/build/builder-model/3.0.1/builde…
-3c09321a4140cbbaf50ceefb08f249e2a033eef78dc6efc3d3022515b05a0cda | https://maven.google.com/com/android/support/customtabs/23.4.0/customtabs-2…
-c74330cc6b806c804fd37e74487b4fe5d7c2750c5e15fbc6efa13bdee1bdef80 | https://jcenter.bintray.com/org/objenesis/objenesis/2.1/objenesis-2.1.jar
-d1e247c4ed3952385fd704ac9db2a222247cfe7d20508b4f3c76b90f857952ed | https://jcenter.bintray.com/org/apache/maven/maven-artifact-manager/2.2.1/m…
-db50fbb16778e5ff47eaf46a2b63891c546911e7bde06c068ecbe9806b02c672 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-gradle-plugin/1.1.5…
-7b5da383a465a071e90eac4a5e615992a499d9776938305d7581d8abbf3b13e5 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-compiler-runner/1.1…
-3d6eba428555a558de046b5d76eacc1f5a54b4f5f20b84d636ed7aff18aa48c3 | https://jcenter.bintray.com/org/apache/httpcomponents/project/7/project-7.p…
-2ba9c1cfec6b4a183b72a5ccc6cb2c83479d6ad7e931543c792292c1679a7f43 | https://maven.google.com/com/android/tools/external/org-jetbrains/uast/26.0…
-e37a4467bac5cdeb02c5c4b8e5063d2f4e67b69e3c7df6d6b610f13185572bab | https://jcenter.bintray.com/com/ibm/icu/icu4j/53.1/icu4j-53.1.jar
-a06e35d3fff3a6b813d94894ebf3e498f9540c864c5b39ae783907e3a6c72889 | https://jcenter.bintray.com/commons-codec/commons-codec/1.6/commons-codec-1…
-a47c950c755747ca3093a05e9ec85d0e2f33cbd224909f571fe7577963a4d799 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.1.3-2/kot…
-d3d96637b0e8e61046567b8c87b667dcf3cd31c7447f651cb58d6e6e744adfba | https://maven.google.com/com/android/support/appcompat-v7/23.4.0/appcompat-…
+0397963405810796ee2d9527e9d1e1a2ed9c44cdb83cdd6959a4ee148ab56fbe | https://jcenter.bintray.com/org/robolectric/sandbox/3.5.1/sandbox-3.5.1.pom
14db0f7d2299c5400ff7764bb37b4fa80306582d8965fdf6999091723e2384ce | https://jcenter.bintray.com/org/robolectric/annotations/3.5.1/annotations-3…
-be214032de23c6b520b79c1ccdb160948e0c67ed7c11984b7ec4ca5537867b4e | https://jcenter.bintray.com/org/apache/maven/wagon/wagon-http-lightweight/1…
-31ce606f4e9518936299bb0d27c978fa61e185fd1de7c9874fe959a53e34a685 | https://jcenter.bintray.com/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.pom
+cd6db17a11a31ede794ccbd1df0e4d9750f640234731f21cff885a9997277e81 | https://jcenter.bintray.com/com/google/google/1/google-1.pom
+d46777ad3ea8bca73491b2e02fc85b3664486abf5314cc4dc6740908bd855330 | https://jcenter.bintray.com/com/google/android/apps/common/testing/accessib…
+ee041b3beb682e8bbf2dc16b6edc233483cbc36bde27fd13996617a667b615a5 | https://maven.google.com/com/android/tools/external/com-intellij/intellij-c…
+536c45e8804de01321c478cfb994377f81f1e32897636616fa21b877fd137c6f | https://jcenter.bintray.com/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6…
+32c797717189ffd0dcc2fcb2e804ab5a0d0c8dfa78b2aa78037f61d4a572f62c | https://raw.githubusercontent.com/guardianproject/gpmaven/master/org/torpro…
+2ec779741f72313fc6623d0f0e42b2450dd2425dd6ad319697e658aae9ae177b | https://jcenter.bintray.com/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.pom
+8d4006178fedef4255797b806167cf4a6774158eedabf96420693afbbd00fee3 | https://maven.google.com/com/android/tools/analytics-library/protos/26.0.1/…
+c3fb02564ca173e45548d7a91aca1efe341db11da2656199d559773e7ae15edf | https://jcenter.bintray.com/org/ow2/asm/asm-commons/5.0.1/asm-commons-5.0.1…
+ff513db0361fd41237bef4784968bc15aae478d4ec0a9496f811072ccaf3841d | https://jcenter.bintray.com/org/apache/apache/13/apache-13.pom
+8b870b3f2ee38bf15681acbc8b628df1ccf7c533190b5c79af9934b6cd66d451 | https://maven.google.com/com/android/databinding/baseLibrary/3.0.1/baseLibr…
+c0de2bbc4cb8297419659813ecd4ed1d077ed1dd5c1f5544cc5143e493e84c10 | https://jcenter.bintray.com/org/ow2/asm/asm-tree/5.1/asm-tree-5.1.jar
+f09330e83f0e3a3f6648ee43a6814ee3a91df699adf7446d6f1f38e95e34cd88 | https://raw.githubusercontent.com/guardianproject/gpmaven/master/org/torpro…
8c6191e0dd8bfdc862332cb79b08185ac5b63565d405dac2605be4c2b19774bd | https://jcenter.bintray.com/com/android/tools/external/lombok/lombok-ast/0.…
-5fe8a11e913086fb7ab505b930987f30cfa3f4b226d4bbbc68003ca4387ae40e | https://maven.google.com/com/android/tools/lint/lint-api/26.0.1/lint-api-26…
-aeb197158a2fb6bd2cb9233e22874f8051f82891dbd82b6b089f49e309f82e40 | https://maven.google.com/com/android/tools/lint/lint/26.0.1/lint-26.0.1.jar
-ff9988062651ac02bfcafd3aa4302f9366fac66d4ad639b36530193afdbdd67b | https://jcenter.bintray.com/org/robolectric/utils/3.5.1/utils-3.5.1.pom
-59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a | https://jcenter.bintray.com/junit/junit/4.12/junit-4.12.jar
-beff8c3c1e840e0f7f78aadef170f347bae349f098babfc176765f499a4bcbb5 | https://jcenter.bintray.com/org/robolectric/sandbox/3.5.1/sandbox-3.5.1.jar
-91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff | https://jcenter.bintray.com/javax/inject/javax.inject/1/javax.inject-1.jar
-52b6fd2eaf2240e14dbe752f1fa884270cc668d6f350e8e7f65f6033a8172d69 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcomponents-client…
-50eb253acd0b6ee048f432d9fc3a3b36264efb3da1ffa7fb07f6c4d4b7a8ca31 | https://jcenter.bintray.com/org/codehaus/codehaus-parent/3/codehaus-parent-…
-95b8b357d19f63797dd7d67622fd3f18374d64acbc6584faba1c7759a31e8438 | https://jcenter.bintray.com/nekohtml/xercesMinimal/1.9.6.2/xercesMinimal-1.…
-603cf898f93b854f18021fab452aca3fe482368eeb2e720988ae82212ebcf4b6 | https://jcenter.bintray.com/org/robolectric/robolectric/3.5.1/robolectric-3…
-2bf4e59f3acd106fea6145a9a88fe8956509f8b9c0fdd11eb96fee757269e3f3 | https://jcenter.bintray.com/classworlds/classworlds/1.1-alpha-2/classworlds…
-1879f19a05991e3ed95910b96689333396b0c467a215dc4d1f90018404b72a26 | https://jcenter.bintray.com/org/codehaus/mojo/animal-sniffer-annotations/1.…
-567ae5af5665bb445802ca650a4dc848737c9ee564f69f2ead5df1189d394304 | https://maven.google.com/com/android/support/recyclerview-v7/23.4.0/recycle…
-8a4e4b32eedaa72976a757e12cf1dfe742725db0b7311bf176dd937ba4236384 | https://jcenter.bintray.com/org/antlr/antlr4/4.5.3/antlr4-4.5.3.pom
-401429d864e4c28b0ef7bc9213ac7b48989f8a9a26db200abb8c65f41f5a503e | https://jcenter.bintray.com/org/ow2/asm/asm-tree/5.0.1/asm-tree-5.0.1.pom
-b2b5dd46cf998fa626eb6f8a1c114f6167c8d392694164e62533e5898e9b31f2 | https://jcenter.bintray.com/commons-io/commons-io/2.4/commons-io-2.4.pom
-30b09c7504768820bfd8572ffcf8c2c55a668ecff6ca3e125906d00bf393a082 | https://maven.google.com/com/android/support/test/espresso/espresso-idling-…
-e2f7b17610f9f0a2b55c019b7627be3d42ec142fde1db5caf8a34dbe3bb8dbcd | https://maven.google.com/com/android/tools/build/gradle-api/3.0.1/gradle-ap…
-0397963405810796ee2d9527e9d1e1a2ed9c44cdb83cdd6959a4ee148ab56fbe | https://jcenter.bintray.com/org/robolectric/sandbox/3.5.1/sandbox-3.5.1.pom
+8b0aa8a74e990ca8d633ab7bd1938530e921548df13fd4020224a61065378876 | https://maven.google.com/com/android/tools/build/builder-test-api/3.0.1/bui…
363cc83767b760d7a564d5301e09467e6d48fc1c1c1664b1e18c50815ce19076 | https://jcenter.bintray.com/com/google/guava/guava/20.0/guava-20.0.pom
+bede73084ec812b916f686cc6e47625bd0756154bef589a4c2b419e54a393bf5 | https://jcenter.bintray.com/com/android/tools/build/manifest-merger/26.0.1/…
+f6775dc981540ffa10f33bd831f14608517ce38b90628e045707dd5bb5d1348e | https://jcenter.bintray.com/org/apache/maven/wagon/wagon-http-shared/1.0-be…
+9f85ff2fd7d6cb3097aa47fb419ee7f0ebe869109f98aba9f4eca3f49e74a40e | https://jcenter.bintray.com/org/apache/apache/16/apache-16.pom
+e5e82da4cc66c8d917bbf743e3c0752efe8522735e7fc9dbddb65bccea81cfe9 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcore/4.2.5/httpco…
+cc6a41dc3eaacc9e440a6bd0d2890b20d36b4ee408fe2d67122f328bb6e01581 | https://jcenter.bintray.com/commons-io/commons-io/2.4/commons-io-2.4.jar
+3e395d6fbc43c09a3774cac8694ce527398305ea3fd5492d80e25af27d382a9c | https://jcenter.bintray.com/org/codehaus/mojo/mojo-parent/34/mojo-parent-34…
+1ccea47240da2f0b75dbddb22718fd64cce42c20bf7983e35480b098ab62d26d | https://jcenter.bintray.com/com/squareup/leakcanary/leakcanary-android-no-o…
+8a4e4b32eedaa72976a757e12cf1dfe742725db0b7311bf176dd937ba4236384 | https://jcenter.bintray.com/org/antlr/antlr4/4.5.3/antlr4-4.5.3.pom
+e824935c264b041e847b67808aee704f8cd47d698203259057e42f473e1f6f30 | https://maven.google.com/com/android/databinding/compilerCommon/3.0.1/compi…
+6b87237de8c2e1740cf80627c7f3ce3e15de1930bb250c55a1eca94fa3e014df | https://jcenter.bintray.com/org/codehaus/codehaus-parent/4/codehaus-parent-…
+3c09321a4140cbbaf50ceefb08f249e2a033eef78dc6efc3d3022515b05a0cda | https://maven.google.com/com/android/support/customtabs/23.4.0/customtabs-2…
+0a640f956f4cdde8b5d3458a67ca67599eeb6f47349167a3f1afce7d60978027 | https://maven.google.com/com/android/tools/build/gradle-core/3.0.1/gradle-c…
+e6d920d5a1a34aaaebab1e6a82c36bbfd61f1eeaabc4534ee05d4faad56f1b7a | https://jcenter.bintray.com/org/apache/ant/ant/1.8.0/ant-1.8.0.pom
+401877d5e70ad599e9b6cff18434ea0332f637b51f8ec68352646c836f9bb2a4 | https://jcenter.bintray.com/org/antlr/antlr4-master/4.5.3/antlr4-master-4.5…
+b27bbb9d269a97be8ff0ac480c0f09c9a953f62e6ff05d90fcbb0ddb4de97c77 | https://jcenter.bintray.com/com/android/tools/common/26.0.1/common-26.0.1.j…
58aa4df8faae90e484c0bc47494a1ec97dc51fe53eae2b4a70d60ea7489cdf8c | https://maven.google.com/com/android/tools/external/com-intellij/intellij-c…
-b7134929f7cc7c04021ec1cc27ef63ab907e410cf0588e397b8851181eb91092 | https://jcenter.bintray.com/com/google/code/gson/gson/2.8.2/gson-2.8.2.jar
+965aeb2bedff369819bdde1bf7a0b3b89b8247dd69c88b86375d76163bb8c397 | https://jcenter.bintray.com/org/jetbrains/annotations/13.0/annotations-13.0…
+cf149955279b07d4f11e817985c1164a69e930d73db7441b43a6ef53bbd286c4 | https://jcenter.bintray.com/com/google/errorprone/error_prone_parent/2.0.18…
+260cc48a58764afbcadec4a9b41877c5aa826c760ae3b6b1db8bde44074c7c41 | https://jcenter.bintray.com/org/ow2/asm/asm/5.0.1/asm-5.0.1.pom
+cb4cfad870bf563a07199f3ebea5763f0dec440fcda0b318640b1feaa788656b | https://jcenter.bintray.com/com/google/errorprone/error_prone_annotations/2…
+a0d002465c0f611eedaaef2b2530707d2e9fb3a5c7ed66f53c556a12f714f43a | https://maven.google.com/com/android/support/support-v4/23.4.0/support-v4-2…
cd36b31f1495f4fe55a936dd00607abdd945e1f8074549225a04c402d1d35750 | https://jcenter.bintray.com/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.pom
-3759796aab6669f10d58d6f6ef1b25a8a9ca4f7ec48bd47ad5141dd1f0865a38 | https://jcenter.bintray.com/com/squareup/leakcanary/leakcanary-watcher/1.4-…
-0156d3f3f54a82eda56285b82aa85caadfdf00d90cde549f7091e0bb0702aad2 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.1.51/kotli…
-21bb4d44dff54e33a37c11af69859a714202ae00969aab5453eba7276688f8ec | https://jcenter.bintray.com/org/apache/httpcomponents/project/4.1.1/project…
-7a3554c605e088e7e323b1084656243f0444fa353e2f2dee1f1a4204eb64ff09 | https://jcenter.bintray.com/org/jacoco/org.jacoco.report/0.7.4.201502262128…
-616da56b2e90bf055b90436800259a8f82715f8e03307c512483328380a51248 | https://jcenter.bintray.com/org/simpleframework/simple-transport/6.0.1/simp…
-5d252585d47129cd667d96c92237383138a42edec5a8963a7dd44cd770faed91 | https://maven.google.com/com/android/tools/lint/lint-checks/26.0.1/lint-che…
-cf3d36efa6d760c6901a21fb14d9eab6553454742ecc4c5c484e2a347cdac4ea | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-annotation-processi…
-8bd632c00bdf80a7de36c22b60f12452c147d8eca2f00d79d66699ebe7daa02a | https://jcenter.bintray.com/org/apache/commons/commons-parent/5/commons-par…
-87cd27e1a02a5c3eb6d85059ce98696bb1b44c2b8b650f0567c86df60fa61da7 | https://jcenter.bintray.com/org/apache/commons/commons-parent/39/commons-pa…
-10107898991129eff2042a41b1bfc2d72c4ea8e4babe429ae3aeb32c69c568de | https://maven.google.com/com/android/tools/analytics-library/tracker/26.0.1…
-e246e2a062b5d989fdefc521c9c56431ba5554ff8d2344edee9218a34a546a33 | https://jcenter.bintray.com/org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.p…
-d53062ffe8677a4f5e1ad3a1d1fa37ed600fab39166d39be7ed204635c5f839b | https://jcenter.bintray.com/org/apache/maven/maven-artifact/2.2.1/maven-art…
-f26bdec2b9496470c0ce63b0d290816e8000ef018daaa259597ebae947fd690f | https://jcenter.bintray.com/net/sf/proguard/proguard-gradle/5.3.3/proguard-…
-7b0cdb372fbde4e801f76bdb416927162ebd32c0c4e53fa39828437d3112c9d5 | https://jcenter.bintray.com/com/squareup/leakcanary/leakcanary-android-no-o…
+7b33cee43a87b390f2ea8084ed431b605016e2ff4c24db9a1fbdd8ffe97ef92d | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1…
+13c1448f7ebb61f67e6fbd6cd5c188804c17c4d7e77c4b79b316ede4ef9cd9b3 | https://maven.google.com/com/android/tools/lint/lint/26.0.1/lint-26.0.1.pom
+381d72c526be217b770f9f8c3f749a86d3b1548ac5c1fcb48d267530ec60d43f | https://jcenter.bintray.com/org/codehaus/plexus/plexus-components/1.1.14/pl…
+ef5ff4dc0257c1eebed07da22b4695ffdd3030da8d224282fb9c565b56cf2f24 | https://jcenter.bintray.com/org/simpleframework/simple-http/6.0.1/simple-ht…
+7c758612888782ccfe376823aee7cdcc7e0cdafb097f7ef50295a0b0c3a16edf | https://jcenter.bintray.com/org/codehaus/plexus/plexus-container-default/1.…
+b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454 | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/7/oss-parent-7.pom
+757bfe906193b8b651e79dc26cd67d6b55d0770a2cdfb0381591504f779d4a76 | https://jcenter.bintray.com/com/googlecode/juniversalchardet/juniversalchar…
+f0c98c571e93a7cb4dd18df0fa308f0963e7a0620ac2d4244e61e709d03ad6be | https://jcenter.bintray.com/com/google/j2objc/j2objc-annotations/1.1/j2objc…
+85c3c8840bb21554faf159998146f7ca9ef1b951defb29ec4e8252ec463728fd | https://jcenter.bintray.com/org/apache/maven/wagon/wagon-provider-api/1.0-b…
5215b648798c6c8d9b9cde3642d3bfb5a4cc894b7c8411004352e7de5d119827 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcomponents-client…
-0ec9e69539aa51350a7d295003d8e7f36007d9cd4a3b93730994a24ada5a11c5 | https://maven.google.com/com/android/support/test/exposed-instrumentation-a…
-9f85ff2fd7d6cb3097aa47fb419ee7f0ebe869109f98aba9f4eca3f49e74a40e | https://jcenter.bintray.com/org/apache/apache/16/apache-16.pom
-90f163f78e3ffb6f1c7ad97de9e7eba4eea25807141b85d6d12be67ca25449c4 | https://jcenter.bintray.com/junit/junit/4.12/junit-4.12.pom
-ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478 | https://jcenter.bintray.com/org/jetbrains/annotations/13.0/annotations-13.0…
-bede73084ec812b916f686cc6e47625bd0756154bef589a4c2b419e54a393bf5 | https://jcenter.bintray.com/com/android/tools/build/manifest-merger/26.0.1/…
-668eb6aeb3d038267e719deb55f38a4233a12602afb97e89da609c095394400a | https://maven.google.com/com/android/tools/build/apksig/3.0.1/apksig-3.0.1.…
-bfadb3b40f65dd6de1666d6b29f8bb54031396c76eeef4146cf9f28255f8bf33 | https://jcenter.bintray.com/com/google/guava/guava/22.0/guava-22.0.pom
-2ec779741f72313fc6623d0f0e42b2450dd2425dd6ad319697e658aae9ae177b | https://jcenter.bintray.com/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.pom
-5f1d5eab6940ece3ebb73691d8a60434d8d1e330176442be8f35a1585345b2ec | https://maven.google.com/com/android/support/design/23.4.0/design-23.4.0.aar
-8f10ffd8df0d3e9819c8cc8402709c6b248bc53a954ef6e45470d9ae3a5735fb | https://jcenter.bintray.com/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.pom
-a20fb26c8de5b0ff7a3069e681fcf01ebefd2f3d24b832c3af22d981d7d4376b | https://maven.google.com/com/android/tools/repository/26.0.1/repository-26.…
-24ddb65b7a6c3befb6267ce5f739f237c84eba99389265c30df67c3dd8396a40 | https://jcenter.bintray.com/org/apache/maven/maven-project/2.2.1/maven-proj…
-3a0a524d3540d005d4df0ca39305fce1972f0d2d966d9b8e6bdb956011501584 | https://maven.google.com/com/android/support/test/runner/0.5/runner-0.5.pom
-c513995cf019d9213d4fda666589937b2bf1bea5c4cdd337e6170e80b18406ee | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/4/oss-parent-4.pom
+81120db4d5490c4f0e9789e1178d2bac231fcff2618bd80f8ef6ff03c550d59b | https://jcenter.bintray.com/org/ow2/asm/asm-analysis/5.1/asm-analysis-5.1.p…
+3db15325cd620c0e54c3d88b6b7ec1bac43db376e18c9bf56bd0c05402ee6be8 | https://jcenter.bintray.com/org/apache/maven/maven-plugin-registry/2.2.1/ma…
+efa86e5cd922f17b472fdfcae57234d8d4ac3e148b6250737dfce454af7a7a44 | https://jcenter.bintray.com/com/google/jimfs/jimfs/1.1/jimfs-1.1.pom
+fcfb09fb0ea0aa97d3cfe7ea792398081348e468f126b3603cb3803f240197f0 | https://jcenter.bintray.com/com/squareup/javawriter/2.5.0/javawriter-2.5.0.…
+d5831ee4f71055800821a34a3051cf1ed5b3702f295ffebd50f65fb5d81a71b8 | https://jcenter.bintray.com/org/mockito/mockito-core/1.10.19/mockito-core-1…
d125b3ade9f694ae60ef835f5ae000b6ba35fba8c34bafd8b40a1961375e63fa | https://jcenter.bintray.com/org/apache/maven/maven-profile/2.2.1/maven-prof…
-f056ed61a281b3e230a63e4abf510c0d2f9bf7ff513cacb65a29538ba90ab177 | https://jcenter.bintray.com/org/jacoco/org.jacoco.build/0.7.4.201502262128/…
-54b34e941b8e1414bd3e40d736efd3481772dc26db3296f6aa45cec9f6203d86 | https://jcenter.bintray.com/commons-codec/commons-codec/1.6/commons-codec-1…
-631b213b1b10c00c900aad759c88ed0c83084bae76336ad00dcfe1f24c48be65 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-compiler-embeddable…
-1bd627d7252500462075f4a08cd0db4dbbf1ccecc08b093709551b54c8649085 | https://jcenter.bintray.com/org/simpleframework/simple-transport/6.0.1/simp…
-965aeb2bedff369819bdde1bf7a0b3b89b8247dd69c88b86375d76163bb8c397 | https://jcenter.bintray.com/org/jetbrains/annotations/13.0/annotations-13.0…
-6b87237de8c2e1740cf80627c7f3ce3e15de1930bb250c55a1eca94fa3e014df | https://jcenter.bintray.com/org/codehaus/codehaus-parent/4/codehaus-parent-…
-905721a0eea90a81534abb7ee6ef4ea2e5e645fa1def0a5cd88402df1b46c9ed | https://jcenter.bintray.com/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.…
-1158e94c7de4da480873f0b4ab4a1da14c0d23d4b1902cc94a58a6f0f9ab579e | https://jcenter.bintray.com/com/google/guava/guava/22.0/guava-22.0.jar
-36a666e3b71ae7f0f0dca23654b67e086e6c93d192f60ba5dfd5519db6c288c8 | https://jcenter.bintray.com/com/google/guava/guava/20.0/guava-20.0.jar
-63b465cc628f8c305702b12b26501cea236a3175db15b5a7356e98484aa63db5 | https://maven.google.com/com/android/tools/build/builder-model/3.0.1/builde…
+7450c3330cf06c254db9f0dc5ef49eac15502311cf19e0208ba473076ee043d6 | https://jcenter.bintray.com/org/apache/maven/maven-parent/11/maven-parent-1…
+15d4b252c5aa3aeb8d634ae5aaf348ac6ce183b6b5e3615364e6c083715c1133 | https://jcenter.bintray.com/com/getkeepsafe/dexcount/dexcount-gradle-plugin…
+fcd77cba4ea3893429860b93da5d43f2e089f2ba8bdfa97ef724f410f404152a | https://maven.google.com/com/android/tools/build/gradle/3.0.1/gradle-3.0.1.…
+e116f32edcb77067289a3148143f2c0c97b27cf9a1342f8108ee37dec4868861 | https://jcenter.bintray.com/org/apache/maven/wagon/wagon-provider-api/1.0-b…
+70c458dcf6040317b41ddf50a7d53a02b8a85b0723b36cde9562c59e3cd11dae | https://jcenter.bintray.com/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.jar
+95b8b357d19f63797dd7d67622fd3f18374d64acbc6584faba1c7759a31e8438 | https://jcenter.bintray.com/nekohtml/xercesMinimal/1.9.6.2/xercesMinimal-1.…
+ee4e1227673b6ba0b462b567f011b88b6e4e4cd044e1c9734ffb1a2ff80d7ee7 | https://jcenter.bintray.com/org/robolectric/resources/3.5.1/resources-3.5.1…
+857db5645aaefbd7fbe9ba6454b072bc0518ebaba08a93d5eae89a9850e949c4 | https://jcenter.bintray.com/com/getkeepsafe/dexcount/dexcount-gradle-plugin…
+faf82de0dc02e0c0ae327cd653f37255496b2e53fce280b3ab4cb34553a89086 | https://jcenter.bintray.com/com/intellij/annotations/12.0/annotations-12.0.…
+343b1a3093410e3fb26c66998423ab389c3a7441cd1a8859bd327dd15b479aa4 | https://jcenter.bintray.com/org/objenesis/objenesis-parent/2.1/objenesis-pa…
31629566148e8a47688ae43b420abc3ecd783ed15b33bebc00824bf24c9b15aa | https://jcenter.bintray.com/org/apache/httpcomponents/httpmime/4.1/httpmime…
-ff513db0361fd41237bef4784968bc15aae478d4ec0a9496f811072ccaf3841d | https://jcenter.bintray.com/org/apache/apache/13/apache-13.pom
-e7a7a5810829dee924cec654a569a48301fcedd487f7b88710e816d127385f51 | https://maven.google.com/com/android/tools/analytics-library/shared/26.0.1/…
-ee041b3beb682e8bbf2dc16b6edc233483cbc36bde27fd13996617a667b615a5 | https://maven.google.com/com/android/tools/external/com-intellij/intellij-c…
-a0d002465c0f611eedaaef2b2530707d2e9fb3a5c7ed66f53c556a12f714f43a | https://maven.google.com/com/android/support/support-v4/23.4.0/support-v4-2…
-b9c445604a16b15c4269485d569252a53e3094efc8a0c252e09dee1f2f204568 | https://jcenter.bintray.com/org/robolectric/annotations/3.5.1/annotations-3…
-6d574f9ae0922791eb8f06979f0010997d4b862c7aec96d485ae797ddfc13278 | https://jcenter.bintray.com/org/robolectric/shadowapi/3.5.1/shadowapi-3.5.1…
-8ba35dd4ea1647b89a8ae082bb6c81d5695a1ec31e73aa57bfa3512069c4bee2 | https://jcenter.bintray.com/com/thoughtworks/xstream/xstream/1.4.8/xstream-…
-d135cff96dcbbc8a5fab30180e557cae620373cf26941d4c738a88896a2d98ed | https://jcenter.bintray.com/org/apache/maven/maven/2.2.1/maven-2.2.1.pom
-3e395d6fbc43c09a3774cac8694ce527398305ea3fd5492d80e25af27d382a9c | https://jcenter.bintray.com/org/codehaus/mojo/mojo-parent/34/mojo-parent-34…
-258f12f1facc44d0b25b9fa2bde33a58f3de9eea412588ff47922c9cac910a5a | https://maven.google.com/com/android/support/cardview-v7/23.4.0/cardview-v7…
-712d7c974d20b71ce730938a3dda8d23e87cfd16500e1c1a2c9ecc2c9ff0d323 | https://maven.google.com/com/android/tools/build/apksig/3.0.1/apksig-3.0.1.…
-949246020c08a0543389082af38268cdce4ee7a7a8218097369b9845752866cb | https://maven.google.com/com/android/tools/lint/lint-checks/26.0.1/lint-che…
-1917871c8deb468307a584680c87a44572f5a8b0b98c6d397fc0f5f86596dbe7 | https://jcenter.bintray.com/org/jetbrains/trove4j/trove4j/20160824/trove4j-…
-fb8c5e55e30a7addb4ff210858a0e8d2494ed6757bbe19012da99d51586c3cbb | https://jcenter.bintray.com/org/apache/commons/commons-parent/22/commons-pa…
-cf5c43860b53ba5a95c19bc6525cc43d3488a6fe3df2f649c0099a613a0640e3 | https://jcenter.bintray.com/com/google/code/gson/gson-parent/2.8.2/gson-par…
-3ec9d39b3e35fad9aab1e6b137466ce2190f88aee897cffa383e94a65287105e | https://jcenter.bintray.com/com/jayway/android/robotium/robotium-solo/5.5.4…
-953b116521a73575eee990e3f2c36a892fb088bb2d9a3027c82193cb7a013ef7 | https://jcenter.bintray.com/it/unimi/dsi/fastutil/7.2.0/fastutil-7.2.0.pom
-4ad0673155d7e0e5cf6d13689802d8d507f38e5ea00a6d2fb92aef206108213d | https://jcenter.bintray.com/org/apache/maven/maven-plugin-registry/2.2.1/ma…
-12a3c9a32b82fdc95223cab1f9d344e14ef3e396da14c4d0013451646f3280e7 | https://jcenter.bintray.com/org/codehaus/plexus/plexus-utils/1.5.15/plexus-…
-f34b3a0b62cdb468eb7e8335de4edc87958dc299306c2b4ba8ea15e6a4be106a | https://jcenter.bintray.com/net/sf/proguard/proguard-gradle/5.3.3/proguard-…
+5f1d5eab6940ece3ebb73691d8a60434d8d1e330176442be8f35a1585345b2ec | https://maven.google.com/com/android/support/design/23.4.0/design-23.4.0.aar
+56057490cbc1eeae6227e6eb5c6d5b324b77429b8a78d15027c77d491ef9c675 | https://jcenter.bintray.com/org/ow2/asm/asm/5.0.1/asm-5.0.1.jar
+34af0baedaef19375b7c1a7da967e9089d5e0754647fdbe9a302590392874b77 | https://jcenter.bintray.com/org/apache/maven/maven-project/2.2.1/maven-proj…
+963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349 | https://jcenter.bintray.com/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk…
+0ec9e69539aa51350a7d295003d8e7f36007d9cd4a3b93730994a24ada5a11c5 | https://maven.google.com/com/android/support/test/exposed-instrumentation-a…
+1870cb5f561ac94760064c5eff8d4259692dd5845680113e78ed9b239e6cf34a | https://jcenter.bintray.com/org/simpleframework/simple-http/6.0.1/simple-ht…
+bfc90e9e32d0eab1f397fb974b5f150a815188382ac41f372a7149d5bc178008 | https://jcenter.bintray.com/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar
+5d252585d47129cd667d96c92237383138a42edec5a8963a7dd44cd770faed91 | https://maven.google.com/com/android/tools/lint/lint-checks/26.0.1/lint-che…
fdff6cfa9ed9cc911c842a5d2395f209ec621ef1239d46810e9e495809d3ae09 | https://jcenter.bintray.com/nekohtml/nekohtml/1.9.6.2/nekohtml-1.9.6.2.jar
-ecd46dc69f5212b35eb21d64db68072f956c000083030ff53e09d1f81487c580 | https://maven.google.com/com/android/tools/external/org-jetbrains/uast/26.0…
-cf149955279b07d4f11e817985c1164a69e930d73db7441b43a6ef53bbd286c4 | https://jcenter.bintray.com/com/google/errorprone/error_prone_parent/2.0.18…
-ef71d45a49edfe76be0f520312a76bc2aae73ec0743a5ffffe10d30122c6e2b2 | https://jcenter.bintray.com/org/codehaus/plexus/plexus-container-default/1.…
-fcfb09fb0ea0aa97d3cfe7ea792398081348e468f126b3603cb3803f240197f0 | https://jcenter.bintray.com/com/squareup/javawriter/2.5.0/javawriter-2.5.0.…
-b3005544708f8583e455c22b09a4940596a057108bccdadb9db4d8e048091fed | https://jcenter.bintray.com/org/apache/maven/maven-error-diagnostics/2.2.1/…
-e2b4935e76d91b5abec44de309f2c8bb8d1d2e6cc0b8790b43cb654f1e22c722 | https://maven.google.com/com/android/tools/layoutlib/layoutlib-api/26.0.1/l…
-1a5c870be804f9041c1392606c19ef5a8ae503e79705962c2f8452c51cb0d27c | https://jcenter.bintray.com/com/squareup/leakcanary/leakcanary-analyzer/1.4…
-2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439 | https://jcenter.bintray.com/com/googlecode/json-simple/json-simple/1.1/json…
+9a9f556713a404e770c9dbdaed7eb086078014c989291960c76fdde6db4192f7 | https://jcenter.bintray.com/org/apache/maven/maven-settings/2.2.1/maven-set…
+40ceb7157feb263949e0f503fe5f71689333a621021aa20ce0d0acee3badaa0f | https://jcenter.bintray.com/com/google/j2objc/j2objc-annotations/1.1/j2objc…
+e1abd7f1116cf5e0c59947693e2189208ec94296b2a3394c959e3511d399a7b0 | https://jcenter.bintray.com/com/squareup/javawriter/2.5.0/javawriter-2.5.0.…
+cf7e3630e1929ddeffcb0315db2acb37182c92dd3af970111b6115592f64d077 | https://jcenter.bintray.com/org/jacoco/org.jacoco.core/0.7.4.201502262128/o…
+ed68ffe66e8fcc23fdeab4eab259a197a11f26325eae59c5afba3a273cd83d25 | https://maven.google.com/com/android/support/test/espresso/espresso-idling-…
+932e6bab9a24a7bc958bbdb7e29e04d083b473d11c4ba3fab1e9b7149579f272 | https://jcenter.bintray.com/com/google/protobuf/protobuf-parent/3.0.0/proto…
+c3c99bf58182889fe86315e9a01473ee2c95540b9dedef898cec64554d925c54 | https://jcenter.bintray.com/com/android/tools/annotations/24.5.0/annotation…
+1eaf9182e1977c1c50a70edbfbf70536398c68990bfaafc9f0e9899041201539 | https://jcenter.bintray.com/com/google/guava/guava-parent/22.0/guava-parent…
+736c8cb2b448d46a67d2a315e67e8903baaefc35e498df45a2d816f8698383c1 | https://jcenter.bintray.com/com/jrummyapps/android-shell/1.0.1/android-shel…
153b32f474fd676ec36ad807c508885005139140fc92168bb76bf6be31f8efb8 | https://jcenter.bintray.com/org/apache/maven/maven-model/2.2.1/maven-model-…
-1f8c906d0de98ddfa81b1ce520ee52fbd280c222383b66cba89e16eafb626001 | https://maven.google.com/com/android/databinding/baseLibrary/3.0.1/baseLibr…
-6f52ba933a117bd67131b281214510ea30232b9807bfe569bc0c17e6a2d4018c | https://maven.google.com/com/android/tools/repository/26.0.1/repository-26.…
-5fe283f47b0e7f7d95a4252af3fa7a0db4d8f080cd9df308608c0472b8f168a1 | https://jcenter.bintray.com/org/apache/maven/maven-repository-metadata/2.2.…
-07f08b315c812406e9d497e1b592689742feb3950c1a713f95e2692d3e15b619 | https://jcenter.bintray.com/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.…
-c5f51e723e84eee14c339170730b4e590342732e1560747ae559585a6ae09a0d | https://jcenter.bintray.com/org/robolectric/robolectric/3.5.1/robolectric-3…
-1870cb5f561ac94760064c5eff8d4259692dd5845680113e78ed9b239e6cf34a | https://jcenter.bintray.com/org/simpleframework/simple-http/6.0.1/simple-ht…
-58a4152e2ea975e955393d49ed23f3c88fa8368d75d2290fb2c28373a6c5a977 | https://maven.google.com/com/android/support/test/runner/0.5/runner-0.5.aar
-340422be8f3e3c847a0a0bf944296774f6db81f2fa8b34912bc931a112a26919 | https://jcenter.bintray.com/org/apache/maven/wagon/wagon-providers/1.0-beta…
-e8b4151ae1679f1abe7a14ee371ac9b3c651ae7b63290d1f586bdd0f78face9a | https://jcenter.bintray.com/com/android/tools/build/transform-api/2.0.0-dep…
-34af0baedaef19375b7c1a7da967e9089d5e0754647fdbe9a302590392874b77 | https://jcenter.bintray.com/org/apache/maven/maven-project/2.2.1/maven-proj…
-a9660f8b64b74f474226c70a50187d8efcac448d32ce97756f408975aa52cdaa | https://maven.google.com/com/android/tools/sdk-common/26.0.1/sdk-common-26.…
-ee032c39ae5e3cd099148fbba9a2124f9ed613e5cb93e03ee0fa8808ce364040 | https://jcenter.bintray.com/org/ow2/asm/asm-util/5.1/asm-util-5.1.jar
-f4778bb3abf2df40bfa365d00ff301b5eec76f2933b85f6aa3918e2ab6f08b91 | https://maven.google.com/com/android/support/design/23.4.0/design-23.4.0.pom
-f5a0a1eeaa100ed36aa83eca562d5dbb7e9b045c98b44db7da4745e9d9a20328 | https://jcenter.bintray.com/org/apache/httpcomponents/httpclient/4.2.6/http…
-9619e68f7eb36da3a28a60315f34320972badbad43749cc66712bb95b96a4ef3 | https://maven.google.com/com/android/support/support-annotations/23.4.0/sup…
-4054f186137e3b849a7c23c9e846cd57d8a2fe32c17d4c62bd420512d74c3d3f | https://jcenter.bintray.com/org/objenesis/objenesis/2.1/objenesis-2.1.pom
-645e30c1a93c6b50c918c14cea11e1f41015153fe6329149ad17d930e820be4a | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-gradle-plugin/1.1.5…
-a34658f5c5de4b573eef21131cc32cc25f7b66407944f312b28ec2e56abb1fa9 | https://jcenter.bintray.com/org/ow2/asm/asm-analysis/5.1/asm-analysis-5.1.j…
-2242fd02d12b1ca73267fb3d89863025517200e7a4ee426cba4667d0172c74c3 | https://jcenter.bintray.com/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.p…
-feab9191311c3d7aeef2b66d6064afc80d3d1d52d980fb07ae43c78c987ba93a | https://jcenter.bintray.com/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.…
-0c0e9d1857c250d1d71b5c6be7b8cc29afe55e7419a90d13bbe968ae5bd7240e | https://jcenter.bintray.com/org/ow2/asm/asm-util/5.1/asm-util-5.1.pom
-d47fc646324c22c66f2b0e0e743c850dde9a51990c53925e7501d960f2e8df84 | https://jcenter.bintray.com/com/squareup/javawriter/2.1.1/javawriter-2.1.1.…
-9e1d8dd83ca6003f841e3af878ce2dc7c22497493a7bb6d1b62ec1b0d0a83c05 | https://jcenter.bintray.com/com/almworks/sqlite4java/sqlite4java/0.282/sqli…
-467ae650442e876867379094e7518dfdd67d22c5352ebd39808c84259e9790ba | https://jcenter.bintray.com/org/apache/commons/commons-parent/25/commons-pa…
-ee4e1227673b6ba0b462b567f011b88b6e4e4cd044e1c9734ffb1a2ff80d7ee7 | https://jcenter.bintray.com/org/robolectric/resources/3.5.1/resources-3.5.1…
-51215c67d2c068d8b7d2f6f80f51372a098075deccc448d4bdd7b987ba8328fb | https://jcenter.bintray.com/org/ow2/ow2/1.3/ow2-1.3.pom
-e5e82da4cc66c8d917bbf743e3c0752efe8522735e7fc9dbddb65bccea81cfe9 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcore/4.2.5/httpco…
-e6531a278b4f632f198a6e45b9e11de1b2b678cd5a4e0fdff442f604c2439a42 | https://jcenter.bintray.com/org/jacoco/org.jacoco.report/0.7.4.201502262128…
-7c758612888782ccfe376823aee7cdcc7e0cdafb097f7ef50295a0b0c3a16edf | https://jcenter.bintray.com/org/codehaus/plexus/plexus-container-default/1.…
+949246020c08a0543389082af38268cdce4ee7a7a8218097369b9845752866cb | https://maven.google.com/com/android/tools/lint/lint-checks/26.0.1/lint-che…
+f264dd9f79a1fde10ce5ecc53221eff24be4c9331c830b7d52f2f08a7b633de2 | https://jcenter.bintray.com/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar
+164e7a9cf23a4e63bbc961f8db7d965d53d685710660a88249641f91d36f83a4 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcomponents-core/4…
+150021a89ae6f252415cbfff5c3111bf87433776b997b68e6e71f37e5b696799 | https://maven.google.com/com/android/support/support-vector-drawable/23.4.0…
+3759796aab6669f10d58d6f6ef1b25a8a9ca4f7ec48bd47ad5141dd1f0865a38 | https://jcenter.bintray.com/com/squareup/leakcanary/leakcanary-watcher/1.4-…
+0d25a88a1b1e44801f8912206a40ff249cb5702ee87cf3d243d5213f7bcf534f | https://jcenter.bintray.com/org/apache/maven/maven-settings/2.2.1/maven-set…
+50cadbcd70d80cf627661628e9d5163fe4f0757b87e89e68b43663b509c031d5 | https://jcenter.bintray.com/org/simpleframework/simple-common/6.0.1/simple-…
+3a0a524d3540d005d4df0ca39305fce1972f0d2d966d9b8e6bdb956011501584 | https://maven.google.com/com/android/support/test/runner/0.5/runner-0.5.pom
+91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff | https://jcenter.bintray.com/javax/inject/javax.inject/1/javax.inject-1.jar
+f2abf7db3c5937fe021fd66f8bd2d9460cf2c9b1ad8efa0abb797d778390b22f | https://jcenter.bintray.com/com/squareup/haha/haha/2.0.2/haha-2.0.2.pom
+34e08ee62116071cbb69c0ed70d15a7a5b208d62798c59f2120bb8929324cb63 | https://jcenter.bintray.com/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.jar
+2068320bd6bad744c3673ab048f67e30bef8f518996fa380033556600669905d | https://jcenter.bintray.com/org/codehaus/mojo/animal-sniffer-annotations/1.…
+3c4fa807380179c24966309fe642eee19558948ebfd326f8f01c301629a50cb0 | https://jcenter.bintray.com/com/squareup/leakcanary/leakcanary-android/1.4-…
+62dd8e35a2c4432bb22f8250bbfe08639635599b4064d5d747bd24cf3c02fac5 | https://jcenter.bintray.com/org/apache/maven/maven-model/2.2.1/maven-model-…
+97b3786e1f55e74bddf8ad102bf50e33bbcbc1f6b7fd7b36f0bbbb25cd4981be | https://jcenter.bintray.com/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.jar
+2ba9c1cfec6b4a183b72a5ccc6cb2c83479d6ad7e931543c792292c1679a7f43 | https://maven.google.com/com/android/tools/external/org-jetbrains/uast/26.0…
+e51efb2ec140b2849b9880fb161cb6e30dd672368a534c1f47ab46d7f537d9ca | https://jcenter.bintray.com/net/sf/proguard/proguard-base/5.3.3/proguard-ba…
+d1e247c4ed3952385fd704ac9db2a222247cfe7d20508b4f3c76b90f857952ed | https://jcenter.bintray.com/org/apache/maven/maven-artifact-manager/2.2.1/m…
+d7c632ad8f81044765e2963bde33073c5a098256c07ab48a63d792f9e1ed048c | https://maven.google.com/com/android/support/support-annotations/25.0.1/sup…
+712d7c974d20b71ce730938a3dda8d23e87cfd16500e1c1a2c9ecc2c9ff0d323 | https://maven.google.com/com/android/tools/build/apksig/3.0.1/apksig-3.0.1.…
+2a0e55bb02940d54bc025aca27ec5071535890fc8ef892cf4fb4fe63f216242d | https://jcenter.bintray.com/com/squareup/haha/haha/2.0.2/haha-2.0.2.jar
+715268d800bacd07236ee1e6f4407650e61cf979733bc262e4de15fbd13b920d | https://jcenter.bintray.com/org/mockito/mockito-core/1.10.19/mockito-core-1…
+668eb6aeb3d038267e719deb55f38a4233a12602afb97e89da609c095394400a | https://maven.google.com/com/android/tools/build/apksig/3.0.1/apksig-3.0.1.…
+beff8c3c1e840e0f7f78aadef170f347bae349f098babfc176765f499a4bcbb5 | https://jcenter.bintray.com/org/robolectric/sandbox/3.5.1/sandbox-3.5.1.jar
+85ec8258fafc283f61647e6a11b404890821c11db6fcf550779ecf7a14151007 | https://jcenter.bintray.com/org/ow2/asm/asm-parent/5.1/asm-parent-5.1.pom
+fde386a7905173a1b103de6ab820727584b50d0e32282e2797787c20a64ffa93 | https://jcenter.bintray.com/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.…
+597b54cc1a494799d783921c6ac04352f33e94fca8e00f299d4ca192db79e3fc | https://jcenter.bintray.com/org/robolectric/shadows-framework/3.5.1/shadows…
+52b6fd2eaf2240e14dbe752f1fa884270cc668d6f350e8e7f65f6033a8172d69 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcomponents-client…
+d49d179f707d3f3a00b2a7d36136b54aa8d44fa22770703cd82fe52fb39e22eb | https://jcenter.bintray.com/com/android/tools/build/transform-api/2.0.0-dep…
362e9324ee7c697e21279e20077b52737ddef3f1b2c1a7abe5ad34b465145550 | https://jcenter.bintray.com/org/apache/httpcomponents/httpclient/4.2.6/http…
-df5f5e4b6d2ddcde49ed5a4e7e3bf2cb7f87e0d9892e5b066f995c4d703b228f | https://maven.google.com/com/android/tools/analytics-library/protos/26.0.1/…
+e246e2a062b5d989fdefc521c9c56431ba5554ff8d2344edee9218a34a546a33 | https://jcenter.bintray.com/org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.p…
+cf7718bd0e99b70d4e06b0fca5ef757b1400bb4ec0da910aba6e2582a6c47dea | https://jitpack.io/com/github/delight-im/Android-Languages/v1.0.1/Android-L…
+02c12c3c2ae12dd475219ff691c82a4d9ea21f44bc594a181295bf6d43dcfbb0 | https://jcenter.bintray.com/com/google/code/findbugs/jsr305/2.0.1/jsr305-2.…
+401429d864e4c28b0ef7bc9213ac7b48989f8a9a26db200abb8c65f41f5a503e | https://jcenter.bintray.com/org/ow2/asm/asm-tree/5.0.1/asm-tree-5.0.1.pom
+d91daa358c2fd7adc1333020433a2c159ae28803b8603cfcaf599fcceab235f0 | https://jcenter.bintray.com/com/jrummyapps/android-shell/1.0.1/android-shel…
+b84d281f59b9da528139e0752a0e1cab0bd98d52c58442b00e45c9748e1d9eee | https://jcenter.bintray.com/org/codehaus/plexus/plexus-interpolation/1.11/p…
+cf3d36efa6d760c6901a21fb14d9eab6553454742ecc4c5c484e2a347cdac4ea | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-annotation-processi…
+b677d99c309dc272f60cefa1f1b639ab750d592ded0ea7bfc9f9c5600ebd742d | https://jcenter.bintray.com/pl/bclogic/pulsator4droid/1.0.3/pulsator4droid-…
+1dea25a2af87ff4757ece0dcb676e0d891dfe1e1e784d6251112e35f21d77b86 | https://maven.google.com/com/android/support/palette-v7/23.4.0/palette-v7-2…
+74fa208043740642f7e6eb09faba15965218ad2f50ce3020efb100136e4b591c | https://jcenter.bintray.com/it/unimi/dsi/fastutil/7.2.0/fastutil-7.2.0.jar
+f021eb07aebec822496f489a2d6ec5d3fa81a2717bfc8407cb0ebcaadcee2d7e | https://jcenter.bintray.com/org/apache/maven/wagon/wagon-http-lightweight/1…
+b5b46ac0c09da41b04dbc753456b48912856a7ffbb1490676910b510c471d13f | https://jcenter.bintray.com/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.pom
+6d079b5abf39f323baaccc68463beef5cf2e9574f333dd749ae96753f00eb205 | https://jcenter.bintray.com/org/ow2/asm/asm/5.1/asm-5.1.pom
+f52619bf2f5c5117f0af1c23adff3a9c8f468647be47fefc59b81dcec7e480e6 | https://jcenter.bintray.com/org/apache/maven/maven-ant-tasks/2.1.3/maven-an…
+2643837251ebdff33a7731646abb563a6050dbb1307937a6e401ef25f3c59103 | https://jcenter.bintray.com/com/jayway/android/robotium/robotium/5.5.4/robo…
+f699823d0081f69cbb676c1845ea222e0ada79bc88a53e5d22d8bd02d328f57e | https://jcenter.bintray.com/com/squareup/javawriter/2.1.1/javawriter-2.1.1.…
+3d6eba428555a558de046b5d76eacc1f5a54b4f5f20b84d636ed7aff18aa48c3 | https://jcenter.bintray.com/org/apache/httpcomponents/project/7/project-7.p…
7b0aa6ed7553597ce0610684a9f7eca8021eee218f2e2f427c04a7fbf5f920bd | https://jcenter.bintray.com/com/google/android/apps/common/testing/accessib…
-40ceb7157feb263949e0f503fe5f71689333a621021aa20ce0d0acee3badaa0f | https://jcenter.bintray.com/com/google/j2objc/j2objc-annotations/1.1/j2objc…
-ecf58351f8fe0c398b8b452216705bece5291b9b327d30202c16b28ac680450c | https://jcenter.bintray.com/org/apache/maven/maven-artifact-manager/2.2.1/m…
-b27bbb9d269a97be8ff0ac480c0f09c9a953f62e6ff05d90fcbb0ddb4de97c77 | https://jcenter.bintray.com/com/android/tools/common/26.0.1/common-26.0.1.j…
-fde386a7905173a1b103de6ab820727584b50d0e32282e2797787c20a64ffa93 | https://jcenter.bintray.com/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.…
+59970f2f0cfce6487b7180d7de653d904d8160fb2cd9d8aba6c375d39fec6652 | https://jcenter.bintray.com/pl/bclogic/pulsator4droid/1.0.3/pulsator4droid-…
dce95c6e899e42925697aa961b4f01ced3211003cd2101df93ce9d52bb3c3d0a | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-compiler-runner/1.1…
-c0de2bbc4cb8297419659813ecd4ed1d077ed1dd5c1f5544cc5143e493e84c10 | https://jcenter.bintray.com/org/ow2/asm/asm-tree/5.1/asm-tree-5.1.jar
-70c458dcf6040317b41ddf50a7d53a02b8a85b0723b36cde9562c59e3cd11dae | https://jcenter.bintray.com/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.jar
-ecbd655fd71d298eaf0787045b84324ce68936ad0de98c7a9c55538e539f2747 | https://jcenter.bintray.com/org/apache/ant/ant-parent/1.8.0/ant-parent-1.8.…
-c71555751e57e0ef912870e8ac9625ae782502a6a5b9c19ccf83b2a97d8b26bd | https://jcenter.bintray.com/com/google/jimfs/jimfs-parent/1.1/jimfs-parent-…
-0dc4d181e4d347893c2ddbd2e6cd5d7287fc651c03648fa64b2341c7366b1773 | https://jcenter.bintray.com/org/bouncycastle/bcprov-jdk15on/1.52/bcprov-jdk…
-34e08ee62116071cbb69c0ed70d15a7a5b208d62798c59f2120bb8929324cb63 | https://jcenter.bintray.com/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.jar
-db3cd95bec1001605e1653f2843e8542e712fa2bb672fd9c8c1ace86c57673d1 | https://jcenter.bintray.com/org/apache/httpcomponents/httpmime/4.1/httpmime…
-f8ab13b14be080fe2f617f90e55599760e4a1b4deeea5c595df63d0d6375ed6d | https://jcenter.bintray.com/com/intellij/annotations/12.0/annotations-12.0.…
-c3c99bf58182889fe86315e9a01473ee2c95540b9dedef898cec64554d925c54 | https://jcenter.bintray.com/com/android/tools/annotations/24.5.0/annotation…
-d7e368746fa68ca6ba63519fb0838be9a278d509a5fcee6cd4a778a119eae447 | https://maven.google.com/com/android/support/appcompat-v7/23.4.0/appcompat-…
-f095c882716d49269a806685dcb256fa6a36389b2713ac56bb758bf8693565a2 | https://jcenter.bintray.com/org/apache/maven/wagon/wagon-http-shared/1.0-be…
-e767a1248adb4843110457e839e504c2511649ee78f05a6a311ea7f23578894d | https://maven.google.com/com/android/tools/build/builder-test-api/3.0.1/bui…
-22a5564590c8bfd8df7efb2b0c7d9942b46a0beb59ba38899d59c1270f293b1c | https://jcenter.bintray.com/org/robolectric/resources/3.5.1/resources-3.5.1…
-9884c02d47244364e1fb27675b5ef3b206a2d2d3141ac77f57fd771a175c2a2f | https://jcenter.bintray.com/org/ow2/asm/asm-parent/5.0.1/asm-parent-5.0.1.p…
-7e4a34c7b63d879c5cec454e2e47eb1e61e271a58672e7e548659f4f23742500 | https://jcenter.bintray.com/org/bouncycastle/bcprov-jdk15on/1.52/bcprov-jdk…
-ef5ff4dc0257c1eebed07da22b4695ffdd3030da8d224282fb9c565b56cf2f24 | https://jcenter.bintray.com/org/simpleframework/simple-http/6.0.1/simple-ht…
-6422a1f272022e3153ed68af04e5a03548fe48061ed2846c044df84e02abb143 | https://jcenter.bintray.com/org/robolectric/junit/3.5.1/junit-3.5.1.pom
-e263064a6ebeba4209d1abb089f9fff5194d79bb011b525d276b3994025123e0 | https://maven.google.com/com/android/support/test/rules/0.5/rules-0.5.aar
-23e6d006f7d07bb43ebc80b2e530c8cdd65bbabcaaf911c3f12e2ea26167178c | https://maven.google.com/com/android/tools/build/gradle-core/3.0.1/gradle-c…
-b2e81b7d5a22755f2ea76aa9bbbd4359d61c4cb9577193ccfbb8f97378ed293b | https://jcenter.bintray.com/org/robolectric/junit/3.5.1/junit-3.5.1.jar
-5c415a9d8585200de4be1947e15291cc79f599b06249375f5c9ea22d4b2d090f | https://jcenter.bintray.com/org/jetbrains/trove4j/trove4j/20160824/trove4j-…
-e1abd7f1116cf5e0c59947693e2189208ec94296b2a3394c959e3511d399a7b0 | https://jcenter.bintray.com/com/squareup/javawriter/2.5.0/javawriter-2.5.0.…
-757bfe906193b8b651e79dc26cd67d6b55d0770a2cdfb0381591504f779d4a76 | https://jcenter.bintray.com/com/googlecode/juniversalchardet/juniversalchar…
-8b870b3f2ee38bf15681acbc8b628df1ccf7c533190b5c79af9934b6cd66d451 | https://maven.google.com/com/android/databinding/baseLibrary/3.0.1/baseLibr…
-711d64522f9ec410983bd310934296da134be4254a125080a0416ec178dfad1c | https://jcenter.bintray.com/org/hamcrest/hamcrest-library/1.3/hamcrest-libr…
-7bc4c7f999b9c673c714f7f8adb6281b11b8f14d5821a2b860c3d60c24518c66 | https://jcenter.bintray.com/com/squareup/leakcanary/leakcanary-watcher/1.4-…
-faf82de0dc02e0c0ae327cd653f37255496b2e53fce280b3ab4cb34553a89086 | https://jcenter.bintray.com/com/intellij/annotations/12.0/annotations-12.0.…
-cb4cfad870bf563a07199f3ebea5763f0dec440fcda0b318640b1feaa788656b | https://jcenter.bintray.com/com/google/errorprone/error_prone_annotations/2…
-401877d5e70ad599e9b6cff18434ea0332f637b51f8ec68352646c836f9bb2a4 | https://jcenter.bintray.com/org/antlr/antlr4-master/4.5.3/antlr4-master-4.5…
-d19c24122f9f70221e8d97a54f48fbf43feba5b003963057458982e0407aab42 | https://jcenter.bintray.com/com/jayway/android/robotium/robotium-solo/5.5.4…
-52d73f35f7e638ce3cb56546f879c20e7f7019f72aa20cde1fa80e97865dfd40 | https://jcenter.bintray.com/javax/annotation/javax.annotation-api/1.2/javax…
-7e8bdca281bdcb6dad48a80854837f1c0ab46f31a0b292370e320f471f5b9cfd | https://maven.google.com/com/android/tools/sdk-common/26.0.1/sdk-common-26.…
+a34658f5c5de4b573eef21131cc32cc25f7b66407944f312b28ec2e56abb1fa9 | https://jcenter.bintray.com/org/ow2/asm/asm-analysis/5.1/asm-analysis-5.1.j…
+e6531a278b4f632f198a6e45b9e11de1b2b678cd5a4e0fdff442f604c2439a42 | https://jcenter.bintray.com/org/jacoco/org.jacoco.report/0.7.4.201502262128…
+24465b2ba90dc5ed7e2c05f1c87fe4256c27df6d3cd69b6177f3cb447b05c021 | https://maven.google.com/com/android/support/recyclerview-v7/23.4.0/recycle…
+d47fc646324c22c66f2b0e0e743c850dde9a51990c53925e7501d960f2e8df84 | https://jcenter.bintray.com/com/squareup/javawriter/2.1.1/javawriter-2.1.1.…
+321668fc474a73140eb9cc73c779f1ebb9f60948aade3beddee082ecefcf0259 | https://jcenter.bintray.com/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk…
+7298feeb36ff14dd933c38e62585fb9973fea32fb3c4bc5379428cb1aac5dd3c | https://jcenter.bintray.com/org/apache/maven/wagon/wagon-file/1.0-beta-6/wa…
+38db692b5cbaf69d89b1fe5b0fc38a5cc83f898716f8bc64086fa17c25ea57d6 | https://maven.google.com/com/android/tools/analytics-library/shared/26.0.1/…
+0c0e9d1857c250d1d71b5c6be7b8cc29afe55e7419a90d13bbe968ae5bd7240e | https://jcenter.bintray.com/org/ow2/asm/asm-util/5.1/asm-util-5.1.pom
+45eb0d6e49430271b5fb385c53fae0b81d6ad3eae465a7a8d948217bcae1e86d | https://jcenter.bintray.com/com/android/tools/external/lombok/lombok-ast/0.…
0251dbb938740ace07a53675113eee753ba389db65aebc814b175af50321620e | https://jcenter.bintray.com/org/apache/ant/ant/1.8.0/ant-1.8.0.jar
-b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454 | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/7/oss-parent-7.pom
-d2da399a9967c69f0a21739256fa79d284222c223082cacadc17372244764b54 | https://jcenter.bintray.com/org/ow2/asm/asm/5.1/asm-5.1.jar
-c9268e671899430946b54c4d1b93c30f0db1b7df0b39b3c6279d6bd475a6fbdc | https://jcenter.bintray.com/com/thoughtworks/xstream/xstream-parent/1.4.8/x…
-fee07b2760ef3ed20f2edefa70504a29f9216d277adae56ce85778ee4b18cd04 | https://maven.google.com/com/android/support/support-v4/23.4.0/support-v4-2…
-d46777ad3ea8bca73491b2e02fc85b3664486abf5314cc4dc6740908bd855330 | https://jcenter.bintray.com/com/google/android/apps/common/testing/accessib…
-781ae7e6a1ae87e55b3e0a19a441bafd385f4ed9b5b4bd6316ec9bc6952d0273 | https://maven.google.com/com/android/support/test/exposed-instrumentation-a…
-b787d574c851505e76212968b9ae1641ea79804aef7f5a2cee2a01cd4055213a | https://jcenter.bintray.com/org/apache/commons/commons-compress/1.12/common…
-715268d800bacd07236ee1e6f4407650e61cf979733bc262e4de15fbd13b920d | https://jcenter.bintray.com/org/mockito/mockito-core/1.10.19/mockito-core-1…
-13c1448f7ebb61f67e6fbd6cd5c188804c17c4d7e77c4b79b316ede4ef9cd9b3 | https://maven.google.com/com/android/tools/lint/lint/26.0.1/lint-26.0.1.pom
-2f781378c1be7caa98fa1c5a109f296a6bcdcbe1f9a67a3d16e07f5eb786c96c | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-project/1.1.51/kotl…
-ce6f913cad1f0db3aad70186d65c5bc7ffcc9a99e3fe8e0b137312819f7c362f | https://jcenter.bintray.com/commons-logging/commons-logging/1.1.1/commons-l…
-a1e7d6b3efc1703c7c8f1b15ecf8757f17d0ac41f32c9a48481a5caf638c55db | https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.0.0/protobu…
-260cc48a58764afbcadec4a9b41877c5aa826c760ae3b6b1db8bde44074c7c41 | https://jcenter.bintray.com/org/ow2/asm/asm/5.0.1/asm-5.0.1.pom
-4a16a423391387d46724749ad29263e64894dadf6783aa38e4b9c888c88d25fe | https://jcenter.bintray.com/org/robolectric/shadowapi/3.5.1/shadowapi-3.5.1…
-2068320bd6bad744c3673ab048f67e30bef8f518996fa380033556600669905d | https://jcenter.bintray.com/org/codehaus/mojo/animal-sniffer-annotations/1.…
-02c12c3c2ae12dd475219ff691c82a4d9ea21f44bc594a181295bf6d43dcfbb0 | https://jcenter.bintray.com/com/google/code/findbugs/jsr305/2.0.1/jsr305-2.…
-ce9e83354fb5c24ed0e2b26a986130ed5d3dedeba288eb1fce563f78f7bb881f | https://maven.google.com/com/android/support/test/espresso/espresso-core/2.…
-a160969150a1671661098deef05da96e1a4f40b93dab045e222485aa976e75a6 | https://maven.google.com/com/android/support/customtabs/23.4.0/customtabs-2…
-3db15325cd620c0e54c3d88b6b7ec1bac43db376e18c9bf56bd0c05402ee6be8 | https://jcenter.bintray.com/org/apache/maven/maven-plugin-registry/2.2.1/ma…
-08426143d37d770f3e4dae45b0870c3ab1ba512cb64418f34496025b72d16760 | https://jcenter.bintray.com/org/apache/ant/ant-launcher/1.8.0/ant-launcher-…
-1e7f53fa5b8b5c807e986ba335665da03f18d660802d8bf061823089d1bee468 | https://jcenter.bintray.com/com/google/code/findbugs/jsr305/2.0.1/jsr305-2.…
-c9a55463942128f0b7fad62b8bee5886d1cb1c733fb3b78507465b025e6a4031 | https://maven.google.com/com/android/databinding/compilerCommon/3.0.1/compi…
-a219a1abf948400b669d08be73a6f9209fb720d237e5ff74c223bffe5f9df93d | https://jcenter.bintray.com/com/thoughtworks/xstream/xstream/1.4.8/xstream-…
-24633fb1e62a9e4b1a25e2c1751d68be89e050b488652456e545b8019539137d | https://maven.google.com/com/android/tools/build/gradle-api/3.0.1/gradle-ap…
-770471090ca40a17b9e436ee2ec00819be42042da6f4085ece1d37916dc08ff9 | https://jcenter.bintray.com/backport-util-concurrent/backport-util-concurre…
-727a7252ca385f648c3ddf4f104e3908cba723fa577fdd93b0cf851eb16c44f1 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.1.51/kotli…
943e12b100627804638fa285805a0ab788a680266531e650921ebfe4621a8bfa | https://jcenter.bintray.com/javax/inject/javax.inject/1/javax.inject-1.pom
-164e7a9cf23a4e63bbc961f8db7d965d53d685710660a88249641f91d36f83a4 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcomponents-core/4…
-15d4b252c5aa3aeb8d634ae5aaf348ac6ce183b6b5e3615364e6c083715c1133 | https://jcenter.bintray.com/com/getkeepsafe/dexcount/dexcount-gradle-plugin…
-ddb0fc5402b4cd8f31d5f29c830793d3ec00fd8ce60786254e5f0f132f0bdd8d | https://maven.google.com/com/android/tools/lint/lint-api/26.0.1/lint-api-26…
-381d72c526be217b770f9f8c3f749a86d3b1548ac5c1fcb48d267530ec60d43f | https://jcenter.bintray.com/org/codehaus/plexus/plexus-components/1.1.14/pl…
-9cddda75f4a1b4469e73f44e7b61a3e897d0f657df4797f9106ffe88c4eeade0 | https://jcenter.bintray.com/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6…
+0156d3f3f54a82eda56285b82aa85caadfdf00d90cde549f7091e0bb0702aad2 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.1.51/kotli…
+d2da399a9967c69f0a21739256fa79d284222c223082cacadc17372244764b54 | https://jcenter.bintray.com/org/ow2/asm/asm/5.1/asm-5.1.jar
+be214032de23c6b520b79c1ccdb160948e0c67ed7c11984b7ec4ca5537867b4e | https://jcenter.bintray.com/org/apache/maven/wagon/wagon-http-lightweight/1…
+9e9323a26ba8eb2394efef0c96d31b70df570808630dc147cab1e73541cc5194 | https://jcenter.bintray.com/org/apache/apache/4/apache-4.pom
+1d2e883717b8ab7d3fcc9fa01034d165809a9c94daa6303a838f11e4d36adc86 | https://jcenter.bintray.com/net/sf/proguard/proguard-base/5.3.3/proguard-ba…
+f26bdec2b9496470c0ce63b0d290816e8000ef018daaa259597ebae947fd690f | https://jcenter.bintray.com/net/sf/proguard/proguard-gradle/5.3.3/proguard-…
+31ce606f4e9518936299bb0d27c978fa61e185fd1de7c9874fe959a53e34a685 | https://jcenter.bintray.com/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.pom
+ecd46dc69f5212b35eb21d64db68072f956c000083030ff53e09d1f81487c580 | https://maven.google.com/com/android/tools/external/org-jetbrains/uast/26.0…
+315a79bf0beee4a355ebe36de326b7b9b22a1ecdf22badd7e1bb2af94429bff1 | https://maven.google.com/com/android/support/cardview-v7/23.4.0/cardview-v7…
+ef71d45a49edfe76be0f520312a76bc2aae73ec0743a5ffffe10d30122c6e2b2 | https://jcenter.bintray.com/org/codehaus/plexus/plexus-container-default/1.…
+8b5cd510f29b8f96143cd990747797e9408735c914078a47fa3a6290b474d045 | https://maven.google.com/com/android/support/test/rules/0.5/rules-0.5.pom
+6b5ad911a13a5c814c04be4376586eec15838158cb59b9f062ae138ddff1b861 | https://maven.google.com/com/android/tools/layoutlib/layoutlib-api/26.0.1/l…
+f34b3a0b62cdb468eb7e8335de4edc87958dc299306c2b4ba8ea15e6a4be106a | https://jcenter.bintray.com/net/sf/proguard/proguard-gradle/5.3.3/proguard-…
+e4c7afb8f0d7aa159318d42a011cc2c9b0525d820973cbca5318bec6c649cecc | https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.0.0/protobu…
+7e8bdca281bdcb6dad48a80854837f1c0ab46f31a0b292370e320f471f5b9cfd | https://maven.google.com/com/android/tools/sdk-common/26.0.1/sdk-common-26.…
+953b116521a73575eee990e3f2c36a892fb088bb2d9a3027c82193cb7a013ef7 | https://jcenter.bintray.com/it/unimi/dsi/fastutil/7.2.0/fastutil-7.2.0.pom
+fb8c5e55e30a7addb4ff210858a0e8d2494ed6757bbe19012da99d51586c3cbb | https://jcenter.bintray.com/org/apache/commons/commons-parent/22/commons-pa…
+1bd627d7252500462075f4a08cd0db4dbbf1ccecc08b093709551b54c8649085 | https://jcenter.bintray.com/org/simpleframework/simple-transport/6.0.1/simp…
+1f8c906d0de98ddfa81b1ce520ee52fbd280c222383b66cba89e16eafb626001 | https://maven.google.com/com/android/databinding/baseLibrary/3.0.1/baseLibr…
+4ad0673155d7e0e5cf6d13689802d8d507f38e5ea00a6d2fb92aef206108213d | https://jcenter.bintray.com/org/apache/maven/maven-plugin-registry/2.2.1/ma…
+8fdc3336e7b01873193ba9c48b87de7d788dc0954d1eb45c322492627a4b5c6e | https://jcenter.bintray.com/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk…
+d19c24122f9f70221e8d97a54f48fbf43feba5b003963057458982e0407aab42 | https://jcenter.bintray.com/com/jayway/android/robotium/robotium-solo/5.5.4…
+ec4c74554312fac5116350164786f91b35c9e082fa4ea598bfa42b5db05d7abb | https://jcenter.bintray.com/org/jacoco/org.jacoco.core/0.7.4.201502262128/o…
+e2f7b17610f9f0a2b55c019b7627be3d42ec142fde1db5caf8a34dbe3bb8dbcd | https://maven.google.com/com/android/tools/build/gradle-api/3.0.1/gradle-ap…
+b6eb99f1362b8344ca5400d57a35c49e3504f23f3dee304fdb879d4d953f4bc6 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcore/4.2.5/httpco…
+52d73f35f7e638ce3cb56546f879c20e7f7019f72aa20cde1fa80e97865dfd40 | https://jcenter.bintray.com/javax/annotation/javax.annotation-api/1.2/javax…
+f658a628efd6e0efe416b977638ba144af660fe6413f3637a4d03feb6a1ce806 | https://jcenter.bintray.com/org/apache/maven/maven-artifact/2.2.1/maven-art…
+d0f2e16d054e8bb97add9ca26525eb2346f692809fcd2a28787da8ceb3c35ee8 | https://jcenter.bintray.com/commons-logging/commons-logging/1.1.1/commons-l…
+0c5a9770ae0271dc97bcc6cb0f2e809a40ba587cdce2556f9db59912c8e158fc | https://jcenter.bintray.com/org/apache/maven/maven-parent/19/maven-parent-1…
+ecaffef655fea6b138f0855a12f7dbb59fc0d6bffb5c1bfd31803cccb49ea08c | https://jcenter.bintray.com/org/apache/maven/maven-profile/2.2.1/maven-prof…
+2bf4e59f3acd106fea6145a9a88fe8956509f8b9c0fdd11eb96fee757269e3f3 | https://jcenter.bintray.com/classworlds/classworlds/1.1-alpha-2/classworlds…
+7846399b35c7cd642a9b3a000c3e2d62d04eb37a4547b6933cc8b18bcc2f086b | https://jcenter.bintray.com/com/googlecode/juniversalchardet/juniversalchar…
+fb5369fc7ea4b2e3cf8d6f20243f1d97f81341bf818b179cd8dbd1da7a781a21 | https://jcenter.bintray.com/org/ow2/asm/asm-tree/5.1/asm-tree-5.1.pom
+ecbd655fd71d298eaf0787045b84324ce68936ad0de98c7a9c55538e539f2747 | https://jcenter.bintray.com/org/apache/ant/ant-parent/1.8.0/ant-parent-1.8.…
+1917871c8deb468307a584680c87a44572f5a8b0b98c6d397fc0f5f86596dbe7 | https://jcenter.bintray.com/org/jetbrains/trove4j/trove4j/20160824/trove4j-…
+ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478 | https://jcenter.bintray.com/org/jetbrains/annotations/13.0/annotations-13.0…
+905721a0eea90a81534abb7ee6ef4ea2e5e645fa1def0a5cd88402df1b46c9ed | https://jcenter.bintray.com/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.…
+a20fb26c8de5b0ff7a3069e681fcf01ebefd2f3d24b832c3af22d981d7d4376b | https://maven.google.com/com/android/tools/repository/26.0.1/repository-26.…
+db3cd95bec1001605e1653f2843e8542e712fa2bb672fd9c8c1ace86c57673d1 | https://jcenter.bintray.com/org/apache/httpcomponents/httpmime/4.1/httpmime…
+2ca121831e597b4d8f2cb22d17c5c041fc23a7777ceb6bfbdd4dfb34bbe7d997 | https://jcenter.bintray.com/org/codehaus/plexus/plexus-utils/1.5.15/plexus-…
+24633fb1e62a9e4b1a25e2c1751d68be89e050b488652456e545b8019539137d | https://maven.google.com/com/android/tools/build/gradle-api/3.0.1/gradle-ap…
+fee07b2760ef3ed20f2edefa70504a29f9216d277adae56ce85778ee4b18cd04 | https://maven.google.com/com/android/support/support-v4/23.4.0/support-v4-2…
+f095c882716d49269a806685dcb256fa6a36389b2713ac56bb758bf8693565a2 | https://jcenter.bintray.com/org/apache/maven/wagon/wagon-http-shared/1.0-be…
+4a028c17c75cce301e13fdfbc0750ceb48a166dd1013ee516a49684472fcf0e5 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions/…
+1e7f53fa5b8b5c807e986ba335665da03f18d660802d8bf061823089d1bee468 | https://jcenter.bintray.com/com/google/code/findbugs/jsr305/2.0.1/jsr305-2.…
+70cc10a9e0b028dd98ca870354afc45eb61eebbd5c6b247b9dd00b4af2b9279a | https://jcenter.bintray.com/org/simpleframework/simple-common/6.0.1/simple-…
+07f08b315c812406e9d497e1b592689742feb3950c1a713f95e2692d3e15b619 | https://jcenter.bintray.com/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.…
+2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439 | https://jcenter.bintray.com/com/googlecode/json-simple/json-simple/1.1/json…
+db50fbb16778e5ff47eaf46a2b63891c546911e7bde06c068ecbe9806b02c672 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-gradle-plugin/1.1.5…
+a0700d84efe7cc3103557bd0522f9443681b96ba9559c4bb7f9dc9bf35243485 | https://jcenter.bintray.com/com/ibm/icu/icu4j/53.1/icu4j-53.1.pom
+467ae650442e876867379094e7518dfdd67d22c5352ebd39808c84259e9790ba | https://jcenter.bintray.com/org/apache/commons/commons-parent/25/commons-pa…
+54b34e941b8e1414bd3e40d736efd3481772dc26db3296f6aa45cec9f6203d86 | https://jcenter.bintray.com/commons-codec/commons-codec/1.6/commons-codec-1…
+b3005544708f8583e455c22b09a4940596a057108bccdadb9db4d8e048091fed | https://jcenter.bintray.com/org/apache/maven/maven-error-diagnostics/2.2.1/…
+aeb197158a2fb6bd2cb9233e22874f8051f82891dbd82b6b089f49e309f82e40 | https://maven.google.com/com/android/tools/lint/lint/26.0.1/lint-26.0.1.jar
+2c1542faf343185b7cab9c3d55c8ae5471d6d095d3887a4adefdbdf2984dc0b6 | https://jcenter.bintray.com/org/apache/commons/commons-compress/1.12/common…
0ee5f691cbbedb69969b48374d27412f821959af5d2dffbabc424b607cdbbdf6 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.1.3-2/kot…
-052b0d2b58e5df4f30e4f64bdf5414473f6cfa10147f8f8d89cb0b63316ba8f3 | https://jcenter.bintray.com/com/android/tools/build/manifest-merger/26.0.1/…
-9144127192d6f612c2366825dceaeb23b0d53130b83e0bf1ffe107d1470a8487 | https://jcenter.bintray.com/com/google/errorprone/error_prone_annotations/2…
-b84d281f59b9da528139e0752a0e1cab0bd98d52c58442b00e45c9748e1d9eee | https://jcenter.bintray.com/org/codehaus/plexus/plexus-interpolation/1.11/p…
-2a0e55bb02940d54bc025aca27ec5071535890fc8ef892cf4fb4fe63f216242d | https://jcenter.bintray.com/com/squareup/haha/haha/2.0.2/haha-2.0.2.jar
-e824935c264b041e847b67808aee704f8cd47d698203259057e42f473e1f6f30 | https://maven.google.com/com/android/databinding/compilerCommon/3.0.1/compi…
-f021eb07aebec822496f489a2d6ec5d3fa81a2717bfc8407cb0ebcaadcee2d7e | https://jcenter.bintray.com/org/apache/maven/wagon/wagon-http-lightweight/1…
+419487d0c123d11cc6e1a12da517d02958ee1de209f1e1855bb14f5dd3759bb0 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions/…
+6f52ba933a117bd67131b281214510ea30232b9807bfe569bc0c17e6a2d4018c | https://maven.google.com/com/android/tools/repository/26.0.1/repository-26.…
+1933a6037439b389bda2feaccfc0113880fd8d88f7d240d2052b91108dd5ae89 | https://jcenter.bintray.com/org/apache/apache/5/apache-5.pom
+30f5789efa39ddbf96095aada3fc1260c4561faf2f714686717cb2dc5049475a | https://jcenter.bintray.com/net/java/jvnet-parent/3/jvnet-parent-3.pom
+24ddb65b7a6c3befb6267ce5f739f237c84eba99389265c30df67c3dd8396a40 | https://jcenter.bintray.com/org/apache/maven/maven-project/2.2.1/maven-proj…
+50eb253acd0b6ee048f432d9fc3a3b36264efb3da1ffa7fb07f6c4d4b7a8ca31 | https://jcenter.bintray.com/org/codehaus/codehaus-parent/3/codehaus-parent-…
+d7e368746fa68ca6ba63519fb0838be9a278d509a5fcee6cd4a778a119eae447 | https://maven.google.com/com/android/support/appcompat-v7/23.4.0/appcompat-…
+dec38b5e95eba8dbb0aefb0ea72fb777def93e75f60c247a143b0b81a5de3916 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1…
+1ceb4bfb0f098ae29b935044b2363e11323313fe3ed2055df8b79737d5056277 | https://jcenter.bintray.com/org/hamcrest/hamcrest-library/1.3/hamcrest-libr…
+950c765f9ebfb7de187cf70ec5b61218568b993bc760cb341bdf142ac94e751b | https://jcenter.bintray.com/com/squareup/leakcanary/leakcanary-android/1.4-…
+e8b4151ae1679f1abe7a14ee371ac9b3c651ae7b63290d1f586bdd0f78face9a | https://jcenter.bintray.com/com/android/tools/build/transform-api/2.0.0-dep…
+d53062ffe8677a4f5e1ad3a1d1fa37ed600fab39166d39be7ed204635c5f839b | https://jcenter.bintray.com/org/apache/maven/maven-artifact/2.2.1/maven-art…
+7e4a34c7b63d879c5cec454e2e47eb1e61e271a58672e7e548659f4f23742500 | https://jcenter.bintray.com/org/bouncycastle/bcprov-jdk15on/1.52/bcprov-jdk…
da9fd92eacdf63daf0be52eb71accc10ff7943a85d7aac9ea96cf7e03ee3d3cc | https://jcenter.bintray.com/org/apache/ant/ant-launcher/1.8.0/ant-launcher-…
-2d4cdc52be79184386d74333d1c4466b7960f83505bfd5e596e76c5ab6ee3bbf | https://jcenter.bintray.com/com/almworks/sqlite4java/sqlite4java/0.282/sqli…
-f6775dc981540ffa10f33bd831f14608517ce38b90628e045707dd5bb5d1348e | https://jcenter.bintray.com/org/apache/maven/wagon/wagon-http-shared/1.0-be…
-8fdc3336e7b01873193ba9c48b87de7d788dc0954d1eb45c322492627a4b5c6e | https://jcenter.bintray.com/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk…
-45eb0d6e49430271b5fb385c53fae0b81d6ad3eae465a7a8d948217bcae1e86d | https://jcenter.bintray.com/com/android/tools/external/lombok/lombok-ast/0.…
-bcb7ce66a9c629fa7c723a767b6430e1a383e8d4dd543d603dcb0ad1b855b8b2 | https://maven.google.com/com/android/support/animated-vector-drawable/23.4.…
-8b5cd510f29b8f96143cd990747797e9408735c914078a47fa3a6290b474d045 | https://maven.google.com/com/android/support/test/rules/0.5/rules-0.5.pom
-6b5ad911a13a5c814c04be4376586eec15838158cb59b9f062ae138ddff1b861 | https://maven.google.com/com/android/tools/layoutlib/layoutlib-api/26.0.1/l…
-1dea25a2af87ff4757ece0dcb676e0d891dfe1e1e784d6251112e35f21d77b86 | https://maven.google.com/com/android/support/palette-v7/23.4.0/palette-v7-2…
-321668fc474a73140eb9cc73c779f1ebb9f60948aade3beddee082ecefcf0259 | https://jcenter.bintray.com/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk…
-bfc90e9e32d0eab1f397fb974b5f150a815188382ac41f372a7149d5bc178008 | https://jcenter.bintray.com/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar
-aff003f3a0afcfad1bc8b4cce81813ababc48680345f16a1a70adcd1adcb8ce2 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-compiler-embeddable…
+43edcc0fc3bd8520bf60066f54088f272e39aa856d25cdd6ca9ee4d8f5c32666 | https://maven.google.com/com/android/support/support-vector-drawable/23.4.0…
+2242fd02d12b1ca73267fb3d89863025517200e7a4ee426cba4667d0172c74c3 | https://jcenter.bintray.com/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.p…
+e2b4935e76d91b5abec44de309f2c8bb8d1d2e6cc0b8790b43cb654f1e22c722 | https://maven.google.com/com/android/tools/layoutlib/layoutlib-api/26.0.1/l…
+b7134929f7cc7c04021ec1cc27ef63ab907e410cf0588e397b8851181eb91092 | https://jcenter.bintray.com/com/google/code/gson/gson/2.8.2/gson-2.8.2.jar
+a32de739cfdf515774e696f91aa9697d2e7731e5cb5045ca8a4b657f8b1b4fb4 | https://jcenter.bintray.com/org/antlr/antlr4/4.5.3/antlr4-4.5.3.jar
+6d535f94efb663bdb682c9f27a50335394688009642ba7a9677504bc1be4129b | https://jcenter.bintray.com/org/hamcrest/hamcrest-parent/1.3/hamcrest-paren…
+5c415a9d8585200de4be1947e15291cc79f599b06249375f5c9ea22d4b2d090f | https://jcenter.bintray.com/org/jetbrains/trove4j/trove4j/20160824/trove4j-…
+5dc327c690d031a11aa8f9f4cdc391fb938fbb7c7c143cc4bc60dd573d1fd1c9 | https://maven.google.com/com/android/tools/build/builder/3.0.1/builder-3.0.…
f7524cfffc9773ea75a9f7379139f00a57355e411009ea9529b7adf7ef93fde8 | https://jcenter.bintray.com/org/apache/maven/wagon/wagon-file/1.0-beta-6/wa…
-5909b396ca3a2be10d0eea32c74ef78d816e1b4ead21de1d78de1f890d033e04 | https://jcenter.bintray.com/javax/annotation/javax.annotation-api/1.2/javax…
+358700f7a5b932bce30ebb0010641a9cade4b8499a60845717b2e22a39697f92 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.1.60/kotli…
+4054f186137e3b849a7c23c9e846cd57d8a2fe32c17d4c62bd420512d74c3d3f | https://jcenter.bintray.com/org/objenesis/objenesis/2.1/objenesis-2.1.pom
+ff2aceed10da9930a44f6c8f81c6372d5e55eb59c4e0ea9d37f77dfd765fa9fa | https://jcenter.bintray.com/org/ow2/asm/asm-tree/5.0.1/asm-tree-5.0.1.jar
+bd94ab42c841db16fb480f4c65d33d297e544655ecc498b37c5cf33a0c5f1968 | https://maven.google.com/com/android/support/support-annotations/25.0.1/sup…
+df5f5e4b6d2ddcde49ed5a4e7e3bf2cb7f87e0d9892e5b066f995c4d703b228f | https://maven.google.com/com/android/tools/analytics-library/protos/26.0.1/…
+228367b7569fb1462a3eb1423bc2778e2fc7fbaee3d3767890c02b8924fa1889 | https://jcenter.bintray.com/org/apache/maven/maven-error-diagnostics/2.2.1/…
+340422be8f3e3c847a0a0bf944296774f6db81f2fa8b34912bc931a112a26919 | https://jcenter.bintray.com/org/apache/maven/wagon/wagon-providers/1.0-beta…
+a9660f8b64b74f474226c70a50187d8efcac448d32ce97756f408975aa52cdaa | https://maven.google.com/com/android/tools/sdk-common/26.0.1/sdk-common-26.…
+c5f51e723e84eee14c339170730b4e590342732e1560747ae559585a6ae09a0d | https://jcenter.bintray.com/org/robolectric/robolectric/3.5.1/robolectric-3…
+8c38b967ee2d7ae4c0bb021717f58717c9a627a82f4af9963263367de078164e | https://maven.google.com/com/android/support/palette-v7/23.4.0/palette-v7-2…
+ff9988062651ac02bfcafd3aa4302f9366fac66d4ad639b36530193afdbdd67b | https://jcenter.bintray.com/org/robolectric/utils/3.5.1/utils-3.5.1.pom
+616da56b2e90bf055b90436800259a8f82715f8e03307c512483328380a51248 | https://jcenter.bintray.com/org/simpleframework/simple-transport/6.0.1/simp…
+b2b5dd46cf998fa626eb6f8a1c114f6167c8d392694164e62533e5898e9b31f2 | https://jcenter.bintray.com/commons-io/commons-io/2.4/commons-io-2.4.pom
+d3d96637b0e8e61046567b8c87b667dcf3cd31c7447f651cb58d6e6e744adfba | https://maven.google.com/com/android/support/appcompat-v7/23.4.0/appcompat-…
+770471090ca40a17b9e436ee2ec00819be42042da6f4085ece1d37916dc08ff9 | https://jcenter.bintray.com/backport-util-concurrent/backport-util-concurre…
+42f0be9bf98c12dacdcb99dd141d83d4dc5bb7c37a6f26684cd3ff2287667fba | https://jcenter.bintray.com/org/hamcrest/hamcrest-integration/1.3/hamcrest-…
+711d64522f9ec410983bd310934296da134be4254a125080a0416ec178dfad1c | https://jcenter.bintray.com/org/hamcrest/hamcrest-library/1.3/hamcrest-libr…
+cf251279505960889b6b281c26af0438656ebac3845e52791925cf7649cb15a6 | https://maven.google.com/com/android/tools/sdklib/26.0.1/sdklib-26.0.1.jar
+7b5da383a465a071e90eac4a5e615992a499d9776938305d7581d8abbf3b13e5 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-compiler-runner/1.1…
+2a0475c2625fc27f80d3c5021130509b4068e0f984f2511e7a77a097de48b41d | https://maven.google.com/com/android/tools/sdklib/26.0.1/sdklib-26.0.1.pom
6895e368fa59168428c78cdf300bb29352073f397d8f260af3de82df2c8b2448 | https://maven.google.com/com/android/tools/analytics-library/tracker/26.0.1…
+22a5564590c8bfd8df7efb2b0c7d9942b46a0beb59ba38899d59c1270f293b1c | https://jcenter.bintray.com/org/robolectric/resources/3.5.1/resources-3.5.1…
+c71555751e57e0ef912870e8ac9625ae782502a6a5b9c19ccf83b2a97d8b26bd | https://jcenter.bintray.com/com/google/jimfs/jimfs-parent/1.1/jimfs-parent-…
+f8ab13b14be080fe2f617f90e55599760e4a1b4deeea5c595df63d0d6375ed6d | https://jcenter.bintray.com/com/intellij/annotations/12.0/annotations-12.0.…
+bfadb3b40f65dd6de1666d6b29f8bb54031396c76eeef4146cf9f28255f8bf33 | https://jcenter.bintray.com/com/google/guava/guava/22.0/guava-22.0.pom
+8ba35dd4ea1647b89a8ae082bb6c81d5695a1ec31e73aa57bfa3512069c4bee2 | https://jcenter.bintray.com/com/thoughtworks/xstream/xstream/1.4.8/xstream-…
+91b9f17a54e6c340c8d3ea4b359401170706eb26a82d51909abe6ba80081aed8 | https://jcenter.bintray.com/com/google/code/gson/gson/2.8.2/gson-2.8.2.pom
+59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a | https://jcenter.bintray.com/junit/junit/4.12/junit-4.12.jar
+052b0d2b58e5df4f30e4f64bdf5414473f6cfa10147f8f8d89cb0b63316ba8f3 | https://jcenter.bintray.com/com/android/tools/build/manifest-merger/26.0.1/…
+258f12f1facc44d0b25b9fa2bde33a58f3de9eea412588ff47922c9cac910a5a | https://maven.google.com/com/android/support/cardview-v7/23.4.0/cardview-v7…
+90f163f78e3ffb6f1c7ad97de9e7eba4eea25807141b85d6d12be67ca25449c4 | https://jcenter.bintray.com/junit/junit/4.12/junit-4.12.pom
+d135cff96dcbbc8a5fab30180e557cae620373cf26941d4c738a88896a2d98ed | https://jcenter.bintray.com/org/apache/maven/maven/2.2.1/maven-2.2.1.pom
+47a89be0fa0fedd476db5fd2c83487654d2a119c391f83a142be876667cf7dab | https://jcenter.bintray.com/com/googlecode/json-simple/json-simple/1.1/json…
0cc647963b74ad1d7a37c9868e9e5a8f474e49297e1863582253a08a4c719cb1 | https://jcenter.bintray.com/classworlds/classworlds/1.1-alpha-2/classworlds…
-0d25a88a1b1e44801f8912206a40ff249cb5702ee87cf3d243d5213f7bcf534f | https://jcenter.bintray.com/org/apache/maven/maven-settings/2.2.1/maven-set…
-a9d65daccc5afca97372936246ac49fb587423e005606e7981b0efc66b0e9385 | https://maven.google.com/com/android/tools/annotations/26.0.1/annotations-2…
-e51efb2ec140b2849b9880fb161cb6e30dd672368a534c1f47ab46d7f537d9ca | https://jcenter.bintray.com/net/sf/proguard/proguard-base/5.3.3/proguard-ba…
-d7d77326867e6d903156ebb18c244819b26aebe3aa82a1c57081081a0b6c4f63 | https://jcenter.bintray.com/org/robolectric/utils/3.5.1/utils-3.5.1.jar
-85ec8258fafc283f61647e6a11b404890821c11db6fcf550779ecf7a14151007 | https://jcenter.bintray.com/org/ow2/asm/asm-parent/5.1/asm-parent-5.1.pom
-f264dd9f79a1fde10ce5ecc53221eff24be4c9331c830b7d52f2f08a7b633de2 | https://jcenter.bintray.com/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar
-950c765f9ebfb7de187cf70ec5b61218568b993bc760cb341bdf142ac94e751b | https://jcenter.bintray.com/com/squareup/leakcanary/leakcanary-android/1.4-…
-a0700d84efe7cc3103557bd0522f9443681b96ba9559c4bb7f9dc9bf35243485 | https://jcenter.bintray.com/com/ibm/icu/icu4j/53.1/icu4j-53.1.pom
-e4c7afb8f0d7aa159318d42a011cc2c9b0525d820973cbca5318bec6c649cecc | https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.0.0/protobu…
-ed68ffe66e8fcc23fdeab4eab259a197a11f26325eae59c5afba3a273cd83d25 | https://maven.google.com/com/android/support/test/espresso/espresso-idling-…
-0a640f956f4cdde8b5d3458a67ca67599eeb6f47349167a3f1afce7d60978027 | https://maven.google.com/com/android/tools/build/gradle-core/3.0.1/gradle-c…
-963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349 | https://jcenter.bintray.com/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk…
-26c5856e954b5f864db76f13b86919b59c6eecf9fd930b96baa8884626baf2f5 | https://jcenter.bintray.com/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-…
-a32de739cfdf515774e696f91aa9697d2e7731e5cb5045ca8a4b657f8b1b4fb4 | https://jcenter.bintray.com/org/antlr/antlr4/4.5.3/antlr4-4.5.3.jar
-70cc10a9e0b028dd98ca870354afc45eb61eebbd5c6b247b9dd00b4af2b9279a | https://jcenter.bintray.com/org/simpleframework/simple-common/6.0.1/simple-…
-f16b5ea711dfe0323454b880180aa832420ec039936e4aa75fb978748634808a | https://jcenter.bintray.com/org/apache/maven/maven-ant-tasks/2.1.3/maven-an…
-2a0475c2625fc27f80d3c5021130509b4068e0f984f2511e7a77a097de48b41d | https://maven.google.com/com/android/tools/sdklib/26.0.1/sdklib-26.0.1.pom
+8bd632c00bdf80a7de36c22b60f12452c147d8eca2f00d79d66699ebe7daa02a | https://jcenter.bintray.com/org/apache/commons/commons-parent/5/commons-par…
f5655d331af6afcd4dbaedaa739b889380c771a7e83f7aea5c8544a05074cf0b | https://jcenter.bintray.com/nekohtml/nekohtml/1.9.6.2/nekohtml-1.9.6.2.pom
-89fc0cd20db030033ba04bb00c2837efe1e530b00f86935d6a645717d15bb978 | https://jcenter.bintray.com/com/google/protobuf/protobuf-java/2.6.1/protobu…
-1933a6037439b389bda2feaccfc0113880fd8d88f7d240d2052b91108dd5ae89 | https://jcenter.bintray.com/org/apache/apache/5/apache-5.pom
+30b09c7504768820bfd8572ffcf8c2c55a668ecff6ca3e125906d00bf393a082 | https://maven.google.com/com/android/support/test/espresso/espresso-idling-…
+7bc4c7f999b9c673c714f7f8adb6281b11b8f14d5821a2b860c3d60c24518c66 | https://jcenter.bintray.com/com/squareup/leakcanary/leakcanary-watcher/1.4-…
e30f1db6058f745f26112ef309f89becb27c617c7d9e4c6e02165a7620a92e6a | https://jcenter.bintray.com/com/android/tools/common/26.0.1/common-26.0.1.p…
-7298feeb36ff14dd933c38e62585fb9973fea32fb3c4bc5379428cb1aac5dd3c | https://jcenter.bintray.com/org/apache/maven/wagon/wagon-file/1.0-beta-6/wa…
-1ccea47240da2f0b75dbddb22718fd64cce42c20bf7983e35480b098ab62d26d | https://jcenter.bintray.com/com/squareup/leakcanary/leakcanary-android-no-o…
-42f0be9bf98c12dacdcb99dd141d83d4dc5bb7c37a6f26684cd3ff2287667fba | https://jcenter.bintray.com/org/hamcrest/hamcrest-integration/1.3/hamcrest-…
+6422a1f272022e3153ed68af04e5a03548fe48061ed2846c044df84e02abb143 | https://jcenter.bintray.com/org/robolectric/junit/3.5.1/junit-3.5.1.pom
+9cddda75f4a1b4469e73f44e7b61a3e897d0f657df4797f9106ffe88c4eeade0 | https://jcenter.bintray.com/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6…
+5fe8a11e913086fb7ab505b930987f30cfa3f4b226d4bbbc68003ca4387ae40e | https://maven.google.com/com/android/tools/lint/lint-api/26.0.1/lint-api-26…
55aa554843983f431df5616112cf688d38aa17c132357afd1c109435bfdac4e6 | https://jcenter.bintray.com/com/google/protobuf/protobuf-java/2.6.1/protobu…
-efa86e5cd922f17b472fdfcae57234d8d4ac3e148b6250737dfce454af7a7a44 | https://jcenter.bintray.com/com/google/jimfs/jimfs/1.1/jimfs-1.1.pom
-7846399b35c7cd642a9b3a000c3e2d62d04eb37a4547b6933cc8b18bcc2f086b | https://jcenter.bintray.com/com/googlecode/juniversalchardet/juniversalchar…
-62dd8e35a2c4432bb22f8250bbfe08639635599b4064d5d747bd24cf3c02fac5 | https://jcenter.bintray.com/org/apache/maven/maven-model/2.2.1/maven-model-…
-2643837251ebdff33a7731646abb563a6050dbb1307937a6e401ef25f3c59103 | https://jcenter.bintray.com/com/jayway/android/robotium/robotium/5.5.4/robo…
-9dad0f56523955b60a9903f4e8342891355d7a59c77f36a3b53cf6ff2e4df625 | https://jcenter.bintray.com/org/apache/maven/maven-repository-metadata/2.2.…
-f52619bf2f5c5117f0af1c23adff3a9c8f468647be47fefc59b81dcec7e480e6 | https://jcenter.bintray.com/org/apache/maven/maven-ant-tasks/2.1.3/maven-an…
-6b8361d8f44649e739343b77c644f1fef1f19d771734ed83785b0dc297198bd1 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-annotation-processi…
-7450c3330cf06c254db9f0dc5ef49eac15502311cf19e0208ba473076ee043d6 | https://jcenter.bintray.com/org/apache/maven/maven-parent/11/maven-parent-1…
-2c1542faf343185b7cab9c3d55c8ae5471d6d095d3887a4adefdbdf2984dc0b6 | https://jcenter.bintray.com/org/apache/commons/commons-compress/1.12/common…
-7b33cee43a87b390f2ea8084ed431b605016e2ff4c24db9a1fbdd8ffe97ef92d | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1…
+08426143d37d770f3e4dae45b0870c3ab1ba512cb64418f34496025b72d16760 | https://jcenter.bintray.com/org/apache/ant/ant-launcher/1.8.0/ant-launcher-…
+70f418efbb506c5155da5f9a5a33262ea08a9e4d7fea186aa9015c41a7224ac2 | https://jcenter.bintray.com/org/hamcrest/hamcrest-integration/1.3/hamcrest-…
+7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca | https://jcenter.bintray.com/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk…
+d7d77326867e6d903156ebb18c244819b26aebe3aa82a1c57081081a0b6c4f63 | https://jcenter.bintray.com/org/robolectric/utils/3.5.1/utils-3.5.1.jar
+567ae5af5665bb445802ca650a4dc848737c9ee564f69f2ead5df1189d394304 | https://maven.google.com/com/android/support/recyclerview-v7/23.4.0/recycle…
+66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9 | https://jcenter.bintray.com/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.…
+ddb0fc5402b4cd8f31d5f29c830793d3ec00fd8ce60786254e5f0f132f0bdd8d | https://maven.google.com/com/android/tools/lint/lint-api/26.0.1/lint-api-26…
81f73f8b25b430f5a40a39727bbcef653a1d0868cc69233b44e4282ce5a94ff9 | https://jcenter.bintray.com/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.…
-358700f7a5b932bce30ebb0010641a9cade4b8499a60845717b2e22a39697f92 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.1.60/kotli…
-9a9f556713a404e770c9dbdaed7eb086078014c989291960c76fdde6db4192f7 | https://jcenter.bintray.com/org/apache/maven/maven-settings/2.2.1/maven-set…
-c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd | https://jcenter.bintray.com/com/google/jimfs/jimfs/1.1/jimfs-1.1.jar
-dec38b5e95eba8dbb0aefb0ea72fb777def93e75f60c247a143b0b81a5de3916 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1…
-fd9507feb858fa620d1b4aa4b7039fdea1a77e09d3fd28cfbddfff468d9d8c28 | https://jcenter.bintray.com/org/codehaus/plexus/plexus-interpolation/1.11/p…
-24465b2ba90dc5ed7e2c05f1c87fe4256c27df6d3cd69b6177f3cb447b05c021 | https://maven.google.com/com/android/support/recyclerview-v7/23.4.0/recycle…
-0c5a9770ae0271dc97bcc6cb0f2e809a40ba587cdce2556f9db59912c8e158fc | https://jcenter.bintray.com/org/apache/maven/maven-parent/19/maven-parent-1…
-c219d697fa9c8f243d8f6e347499b6d4e8af1d0cac4bbc7b3907d338a2024c13 | https://jcenter.bintray.com/nekohtml/xercesMinimal/1.9.6.2/xercesMinimal-1.…
326ba49aa7a35e07b6cc592ad7a5b0f86f4667051a8e70e7639c54bc0c356dee | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.1.60/kotli…
-e116f32edcb77067289a3148143f2c0c97b27cf9a1342f8108ee37dec4868861 | https://jcenter.bintray.com/org/apache/maven/wagon/wagon-provider-api/1.0-b…
-cf251279505960889b6b281c26af0438656ebac3845e52791925cf7649cb15a6 | https://maven.google.com/com/android/tools/sdklib/26.0.1/sdklib-26.0.1.jar
-f5759b7fcdfc83a525a036deedcbd32e5b536b625ebc282426f16ca137eb5902 | https://jcenter.bintray.com/backport-util-concurrent/backport-util-concurre…
-30f5789efa39ddbf96095aada3fc1260c4561faf2f714686717cb2dc5049475a | https://jcenter.bintray.com/net/java/jvnet-parent/3/jvnet-parent-3.pom
-5dc327c690d031a11aa8f9f4cdc391fb938fbb7c7c143cc4bc60dd573d1fd1c9 | https://maven.google.com/com/android/tools/build/builder/3.0.1/builder-3.0.…
-7c75075badcb014443ee94c8c4cad2f4a9905be3ce9430fe7b220afc7fa3a80f | https://jcenter.bintray.com/org/codehaus/plexus/plexus-containers/1.0.3/ple…
-3c4fa807380179c24966309fe642eee19558948ebfd326f8f01c301629a50cb0 | https://jcenter.bintray.com/com/squareup/leakcanary/leakcanary-android/1.4-…
-c3fb02564ca173e45548d7a91aca1efe341db11da2656199d559773e7ae15edf | https://jcenter.bintray.com/org/ow2/asm/asm-commons/5.0.1/asm-commons-5.0.1…
-8b0aa8a74e990ca8d633ab7bd1938530e921548df13fd4020224a61065378876 | https://maven.google.com/com/android/tools/build/builder-test-api/3.0.1/bui…
-81120db4d5490c4f0e9789e1178d2bac231fcff2618bd80f8ef6ff03c550d59b | https://jcenter.bintray.com/org/ow2/asm/asm-analysis/5.1/asm-analysis-5.1.p…
-6d079b5abf39f323baaccc68463beef5cf2e9574f333dd749ae96753f00eb205 | https://jcenter.bintray.com/org/ow2/asm/asm/5.1/asm-5.1.pom
+a219a1abf948400b669d08be73a6f9209fb720d237e5ff74c223bffe5f9df93d | https://jcenter.bintray.com/com/thoughtworks/xstream/xstream/1.4.8/xstream-…
+8f10ffd8df0d3e9819c8cc8402709c6b248bc53a954ef6e45470d9ae3a5735fb | https://jcenter.bintray.com/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.pom
+e37a4467bac5cdeb02c5c4b8e5063d2f4e67b69e3c7df6d6b610f13185572bab | https://jcenter.bintray.com/com/ibm/icu/icu4j/53.1/icu4j-53.1.jar
+f4778bb3abf2df40bfa365d00ff301b5eec76f2933b85f6aa3918e2ab6f08b91 | https://maven.google.com/com/android/support/design/23.4.0/design-23.4.0.pom
+f51550a06b1410bd4962cb0e71df0b921a60a7ef47bfa9c4825a14be72316eea | https://jcenter.bintray.com/org/codehaus/mojo/animal-sniffer-parent/1.14/an…
+781ae7e6a1ae87e55b3e0a19a441bafd385f4ed9b5b4bd6316ec9bc6952d0273 | https://maven.google.com/com/android/support/test/exposed-instrumentation-a…
+e336a35a1e102c2f11ce1ea7f0872df14e332374b8eacc0877e50f85f84c3d09 | https://maven.google.com/com/android/support/animated-vector-drawable/23.4.…
+3ec9d39b3e35fad9aab1e6b137466ce2190f88aee897cffa383e94a65287105e | https://jcenter.bintray.com/com/jayway/android/robotium/robotium-solo/5.5.4…
+727a7252ca385f648c3ddf4f104e3908cba723fa577fdd93b0cf851eb16c44f1 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.1.51/kotli…
+fb1cb7fa27d892712ced8fbf8d027eb5052ecd3999dba1ba47824357accb40e7 | https://jcenter.bintray.com/org/ow2/asm/asm-commons/5.0.1/asm-commons-5.0.1…
+ee032c39ae5e3cd099148fbba9a2124f9ed613e5cb93e03ee0fa8808ce364040 | https://jcenter.bintray.com/org/ow2/asm/asm-util/5.1/asm-util-5.1.jar
+5fe283f47b0e7f7d95a4252af3fa7a0db4d8f080cd9df308608c0472b8f168a1 | https://jcenter.bintray.com/org/apache/maven/maven-repository-metadata/2.2.…
+f056ed61a281b3e230a63e4abf510c0d2f9bf7ff513cacb65a29538ba90ab177 | https://jcenter.bintray.com/org/jacoco/org.jacoco.build/0.7.4.201502262128/…
+803be394edb8dd7d1e678683ed85aee7f86a172c90f03e6198c8a49d4f342b99 | https://maven.google.com/com/android/tools/build/builder/3.0.1/builder-3.0.…
+2d4cdc52be79184386d74333d1c4466b7960f83505bfd5e596e76c5ab6ee3bbf | https://jcenter.bintray.com/com/almworks/sqlite4java/sqlite4java/0.282/sqli…
+c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd | https://jcenter.bintray.com/com/google/jimfs/jimfs/1.1/jimfs-1.1.jar
+63b465cc628f8c305702b12b26501cea236a3175db15b5a7356e98484aa63db5 | https://maven.google.com/com/android/tools/build/builder-model/3.0.1/builde…
332883794330d554c24cf311bf60481ad55bf773d5a4b71434d7f6c119ba9dbe | https://jcenter.bintray.com/com/squareup/leakcanary/leakcanary-analyzer/1.4…
-f658a628efd6e0efe416b977638ba144af660fe6413f3637a4d03feb6a1ce806 | https://jcenter.bintray.com/org/apache/maven/maven-artifact/2.2.1/maven-art…
-cc6a41dc3eaacc9e440a6bd0d2890b20d36b4ee408fe2d67122f328bb6e01581 | https://jcenter.bintray.com/commons-io/commons-io/2.4/commons-io-2.4.jar
-66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9 | https://jcenter.bintray.com/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.…
+36a666e3b71ae7f0f0dca23654b67e086e6c93d192f60ba5dfd5519db6c288c8 | https://jcenter.bintray.com/com/google/guava/guava/20.0/guava-20.0.jar
+9e1d8dd83ca6003f841e3af878ce2dc7c22497493a7bb6d1b62ec1b0d0a83c05 | https://jcenter.bintray.com/com/almworks/sqlite4java/sqlite4java/0.282/sqli…
+51215c67d2c068d8b7d2f6f80f51372a098075deccc448d4bdd7b987ba8328fb | https://jcenter.bintray.com/org/ow2/ow2/1.3/ow2-1.3.pom
+0288414509c625b8dd544384fbd29f502bdc8b4f86cfc26625aa23eef9fa6057 | https://jcenter.bintray.com/net/sf/proguard/proguard-parent/5.3.3/proguard-…
+a9d65daccc5afca97372936246ac49fb587423e005606e7981b0efc66b0e9385 | https://maven.google.com/com/android/tools/annotations/26.0.1/annotations-2…
+f1226fd07fc72af8d6232bdfa70bf31d883a1a01cbc547f23a74e9066c692df1 | https://jcenter.bintray.com/com/google/guava/guava-parent/20.0/guava-parent…
+21bb4d44dff54e33a37c11af69859a714202ae00969aab5453eba7276688f8ec | https://jcenter.bintray.com/org/apache/httpcomponents/project/4.1.1/project…
+c9a55463942128f0b7fad62b8bee5886d1cb1c733fb3b78507465b025e6a4031 | https://maven.google.com/com/android/databinding/compilerCommon/3.0.1/compi…
+7c75075badcb014443ee94c8c4cad2f4a9905be3ce9430fe7b220afc7fa3a80f | https://jcenter.bintray.com/org/codehaus/plexus/plexus-containers/1.0.3/ple…
+7af7e2d8b24b4798f04c2b7da24c9fbd1b7557b4e017c2054481565916079092 | https://jcenter.bintray.com/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-…
+10107898991129eff2042a41b1bfc2d72c4ea8e4babe429ae3aeb32c69c568de | https://maven.google.com/com/android/tools/analytics-library/tracker/26.0.1…
+9144127192d6f612c2366825dceaeb23b0d53130b83e0bf1ffe107d1470a8487 | https://jcenter.bintray.com/com/google/errorprone/error_prone_annotations/2…
4946e60a547c8eda69f3bc23c5b6f0dadcf8469ea49b1d1da7de34aecfcf18dd | https://jcenter.bintray.com/org/apache/apache/9/apache-9.pom
-150021a89ae6f252415cbfff5c3111bf87433776b997b68e6e71f37e5b696799 | https://maven.google.com/com/android/support/support-vector-drawable/23.4.0…
-7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca | https://jcenter.bintray.com/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk…
-cf7e3630e1929ddeffcb0315db2acb37182c92dd3af970111b6115592f64d077 | https://jcenter.bintray.com/org/jacoco/org.jacoco.core/0.7.4.201502262128/o…
-228367b7569fb1462a3eb1423bc2778e2fc7fbaee3d3767890c02b8924fa1889 | https://jcenter.bintray.com/org/apache/maven/maven-error-diagnostics/2.2.1/…
+a06e35d3fff3a6b813d94894ebf3e498f9540c864c5b39ae783907e3a6c72889 | https://jcenter.bintray.com/commons-codec/commons-codec/1.6/commons-codec-1…
+c9268e671899430946b54c4d1b93c30f0db1b7df0b39b3c6279d6bd475a6fbdc | https://jcenter.bintray.com/com/thoughtworks/xstream/xstream-parent/1.4.8/x…
025caec7c56a0cb4d86c45bc18ac3e23dba291e22ebceb76302a9a9b9b7183cc | https://jcenter.bintray.com/org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1…
-cd6db17a11a31ede794ccbd1df0e4d9750f640234731f21cff885a9997277e81 | https://jcenter.bintray.com/com/google/google/1/google-1.pom
-932e6bab9a24a7bc958bbdb7e29e04d083b473d11c4ba3fab1e9b7149579f272 | https://jcenter.bintray.com/com/google/protobuf/protobuf-parent/3.0.0/proto…
+4a16a423391387d46724749ad29263e64894dadf6783aa38e4b9c888c88d25fe | https://jcenter.bintray.com/org/robolectric/shadowapi/3.5.1/shadowapi-3.5.1…
+feab9191311c3d7aeef2b66d6064afc80d3d1d52d980fb07ae43c78c987ba93a | https://jcenter.bintray.com/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.…
+87cd27e1a02a5c3eb6d85059ce98696bb1b44c2b8b650f0567c86df60fa61da7 | https://jcenter.bintray.com/org/apache/commons/commons-parent/39/commons-pa…
+1ef71c25a9d46ae0ce023d02a5734e0b06fdf934fbc5948e20482526b22b4179 | https://maven.google.com/com/android/tools/build/gradle/3.0.1/gradle-3.0.1.…
+c513995cf019d9213d4fda666589937b2bf1bea5c4cdd337e6170e80b18406ee | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/4/oss-parent-4.pom
+9884c02d47244364e1fb27675b5ef3b206a2d2d3141ac77f57fd771a175c2a2f | https://jcenter.bintray.com/org/ow2/asm/asm-parent/5.0.1/asm-parent-5.0.1.p…
+9dad0f56523955b60a9903f4e8342891355d7a59c77f36a3b53cf6ff2e4df625 | https://jcenter.bintray.com/org/apache/maven/maven-repository-metadata/2.2.…
+23e6d006f7d07bb43ebc80b2e530c8cdd65bbabcaaf911c3f12e2ea26167178c | https://maven.google.com/com/android/tools/build/gradle-core/3.0.1/gradle-c…
+6d574f9ae0922791eb8f06979f0010997d4b862c7aec96d485ae797ddfc13278 | https://jcenter.bintray.com/org/robolectric/shadowapi/3.5.1/shadowapi-3.5.1…
+1a5c870be804f9041c1392606c19ef5a8ae503e79705962c2f8452c51cb0d27c | https://jcenter.bintray.com/com/squareup/leakcanary/leakcanary-analyzer/1.4…
+0dc4d181e4d347893c2ddbd2e6cd5d7287fc651c03648fa64b2341c7366b1773 | https://jcenter.bintray.com/org/bouncycastle/bcprov-jdk15on/1.52/bcprov-jdk…
+fd9507feb858fa620d1b4aa4b7039fdea1a77e09d3fd28cfbddfff468d9d8c28 | https://jcenter.bintray.com/org/codehaus/plexus/plexus-interpolation/1.11/p…
+645e30c1a93c6b50c918c14cea11e1f41015153fe6329149ad17d930e820be4a | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-gradle-plugin/1.1.5…
+a1e7d6b3efc1703c7c8f1b15ecf8757f17d0ac41f32c9a48481a5caf638c55db | https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.0.0/protobu…
+e899e02ec8ac6a73fb9c9c7cb9ebd9bfc4ce8263412285d5ec6f2df920880905 | https://maven.google.com/com/android/tools/build/builder-model/3.0.1/builde…
6ee434905eeb60a7c4d52b1f45288d5e53b68094f1cce6990bced2097c3dbec4 | https://maven.google.com/com/android/support/test/espresso/espresso-core/2.…
-1eaf9182e1977c1c50a70edbfbf70536398c68990bfaafc9f0e9899041201539 | https://jcenter.bintray.com/com/google/guava/guava-parent/22.0/guava-parent…
-91b9f17a54e6c340c8d3ea4b359401170706eb26a82d51909abe6ba80081aed8 | https://jcenter.bintray.com/com/google/code/gson/gson/2.8.2/gson-2.8.2.pom
-74fa208043740642f7e6eb09faba15965218ad2f50ce3020efb100136e4b591c | https://jcenter.bintray.com/it/unimi/dsi/fastutil/7.2.0/fastutil-7.2.0.jar
-e336a35a1e102c2f11ce1ea7f0872df14e332374b8eacc0877e50f85f84c3d09 | https://maven.google.com/com/android/support/animated-vector-drawable/23.4.…
-8d4006178fedef4255797b806167cf4a6774158eedabf96420693afbbd00fee3 | https://maven.google.com/com/android/tools/analytics-library/protos/26.0.1/…
-43edcc0fc3bd8520bf60066f54088f272e39aa856d25cdd6ca9ee4d8f5c32666 | https://maven.google.com/com/android/support/support-vector-drawable/23.4.0…
-97b3786e1f55e74bddf8ad102bf50e33bbcbc1f6b7fd7b36f0bbbb25cd4981be | https://jcenter.bintray.com/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.jar
-803be394edb8dd7d1e678683ed85aee7f86a172c90f03e6198c8a49d4f342b99 | https://maven.google.com/com/android/tools/build/builder/3.0.1/builder-3.0.…
-8c38b967ee2d7ae4c0bb021717f58717c9a627a82f4af9963263367de078164e | https://maven.google.com/com/android/support/palette-v7/23.4.0/palette-v7-2…
-d0f2e16d054e8bb97add9ca26525eb2346f692809fcd2a28787da8ceb3c35ee8 | https://jcenter.bintray.com/commons-logging/commons-logging/1.1.1/commons-l…
-536c45e8804de01321c478cfb994377f81f1e32897636616fa21b877fd137c6f | https://jcenter.bintray.com/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6…
+7a3554c605e088e7e323b1084656243f0444fa353e2f2dee1f1a4204eb64ff09 | https://jcenter.bintray.com/org/jacoco/org.jacoco.report/0.7.4.201502262128…
+c74330cc6b806c804fd37e74487b4fe5d7c2750c5e15fbc6efa13bdee1bdef80 | https://jcenter.bintray.com/org/objenesis/objenesis/2.1/objenesis-2.1.jar
+26c5856e954b5f864db76f13b86919b59c6eecf9fd930b96baa8884626baf2f5 | https://jcenter.bintray.com/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-…
+fc3958e775903d5816d017dd486357963b141ddeded2fc97ee7bd0a4f8a6ebb6 | https://jitpack.io/com/github/delight-im/Android-Languages/v1.0.1/Android-L…
+5909b396ca3a2be10d0eea32c74ef78d816e1b4ead21de1d78de1f890d033e04 | https://jcenter.bintray.com/javax/annotation/javax.annotation-api/1.2/javax…
+6b8361d8f44649e739343b77c644f1fef1f19d771734ed83785b0dc297198bd1 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-annotation-processi…
+7b0cdb372fbde4e801f76bdb416927162ebd32c0c4e53fa39828437d3112c9d5 | https://jcenter.bintray.com/com/squareup/leakcanary/leakcanary-android-no-o…
+58a4152e2ea975e955393d49ed23f3c88fa8368d75d2290fb2c28373a6c5a977 | https://maven.google.com/com/android/support/test/runner/0.5/runner-0.5.aar
+89fc0cd20db030033ba04bb00c2837efe1e530b00f86935d6a645717d15bb978 | https://jcenter.bintray.com/com/google/protobuf/protobuf-java/2.6.1/protobu…
+12a3c9a32b82fdc95223cab1f9d344e14ef3e396da14c4d0013451646f3280e7 | https://jcenter.bintray.com/org/codehaus/plexus/plexus-utils/1.5.15/plexus-…
+a47c950c755747ca3093a05e9ec85d0e2f33cbd224909f571fe7577963a4d799 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.1.3-2/kot…
+4f88a89142c64bf03906f84609594666e9694df56e3e6f05edfab8a68b39d837 | https://maven.google.com/com/android/tools/annotations/26.0.1/annotations-2…
+f16b5ea711dfe0323454b880180aa832420ec039936e4aa75fb978748634808a | https://jcenter.bintray.com/org/apache/maven/maven-ant-tasks/2.1.3/maven-an…
+e263064a6ebeba4209d1abb089f9fff5194d79bb011b525d276b3994025123e0 | https://maven.google.com/com/android/support/test/rules/0.5/rules-0.5.aar
+f5759b7fcdfc83a525a036deedcbd32e5b536b625ebc282426f16ca137eb5902 | https://jcenter.bintray.com/backport-util-concurrent/backport-util-concurre…
+2f781378c1be7caa98fa1c5a109f296a6bcdcbe1f9a67a3d16e07f5eb786c96c | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-project/1.1.51/kotl…
+ecf58351f8fe0c398b8b452216705bece5291b9b327d30202c16b28ac680450c | https://jcenter.bintray.com/org/apache/maven/maven-artifact-manager/2.2.1/m…
+e91a88dd0c5e99069b7f09d4a46b5e06f1e9c4c72fc0a8e987e25d86af480f01 | https://maven.google.com/com/android/support/support-annotations/23.4.0/sup…
+b46b548f116a5dd5b018e6f1f4760fe04f93aecdbea094c2f0890e8bf690ada3 | https://jcenter.bintray.com/org/robolectric/shadows-framework/3.5.1/shadows…
+b787d574c851505e76212968b9ae1641ea79804aef7f5a2cee2a01cd4055213a | https://jcenter.bintray.com/org/apache/commons/commons-compress/1.12/common…
+1158e94c7de4da480873f0b4ab4a1da14c0d23d4b1902cc94a58a6f0f9ab579e | https://jcenter.bintray.com/com/google/guava/guava/22.0/guava-22.0.jar
+aff003f3a0afcfad1bc8b4cce81813ababc48680345f16a1a70adcd1adcb8ce2 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-compiler-embeddable…
+1879f19a05991e3ed95910b96689333396b0c467a215dc4d1f90018404b72a26 | https://jcenter.bintray.com/org/codehaus/mojo/animal-sniffer-annotations/1.…
+e7a7a5810829dee924cec654a569a48301fcedd487f7b88710e816d127385f51 | https://maven.google.com/com/android/tools/analytics-library/shared/26.0.1/…
+a160969150a1671661098deef05da96e1a4f40b93dab045e222485aa976e75a6 | https://maven.google.com/com/android/support/customtabs/23.4.0/customtabs-2…
+b9c445604a16b15c4269485d569252a53e3094efc8a0c252e09dee1f2f204568 | https://jcenter.bintray.com/org/robolectric/annotations/3.5.1/annotations-3…
+631b213b1b10c00c900aad759c88ed0c83084bae76336ad00dcfe1f24c48be65 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-compiler-embeddable…
+fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/9/oss-parent-9.pom
+b2e81b7d5a22755f2ea76aa9bbbd4359d61c4cb9577193ccfbb8f97378ed293b | https://jcenter.bintray.com/org/robolectric/junit/3.5.1/junit-3.5.1.jar
+f5a0a1eeaa100ed36aa83eca562d5dbb7e9b045c98b44db7da4745e9d9a20328 | https://jcenter.bintray.com/org/apache/httpcomponents/httpclient/4.2.6/http…
+ce9e83354fb5c24ed0e2b26a986130ed5d3dedeba288eb1fce563f78f7bb881f | https://maven.google.com/com/android/support/test/espresso/espresso-core/2.…
+c219d697fa9c8f243d8f6e347499b6d4e8af1d0cac4bbc7b3907d338a2024c13 | https://jcenter.bintray.com/nekohtml/xercesMinimal/1.9.6.2/xercesMinimal-1.…
+603cf898f93b854f18021fab452aca3fe482368eeb2e720988ae82212ebcf4b6 | https://jcenter.bintray.com/org/robolectric/robolectric/3.5.1/robolectric-3…
+ce6f913cad1f0db3aad70186d65c5bc7ffcc9a99e3fe8e0b137312819f7c362f | https://jcenter.bintray.com/commons-logging/commons-logging/1.1.1/commons-l…
+e767a1248adb4843110457e839e504c2511649ee78f05a6a311ea7f23578894d | https://maven.google.com/com/android/tools/build/builder-test-api/3.0.1/bui…
+cf5c43860b53ba5a95c19bc6525cc43d3488a6fe3df2f649c0099a613a0640e3 | https://jcenter.bintray.com/com/google/code/gson/gson-parent/2.8.2/gson-par…
+9619e68f7eb36da3a28a60315f34320972badbad43749cc66712bb95b96a4ef3 | https://maven.google.com/com/android/support/support-annotations/23.4.0/sup…
+bcb7ce66a9c629fa7c723a767b6430e1a383e8d4dd543d603dcb0ad1b855b8b2 | https://maven.google.com/com/android/support/animated-vector-drawable/23.4.…
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
new file mode 100644
index 0000000..3b34dec
--- /dev/null
+++ b/projects/orbot/0001-Bug-28051-Build-Orbot-as-a-library.patch
@@ -0,0 +1,261 @@
+From 6a7ccfc48d3ec930390cabfd460730915215f674 Mon Sep 17 00:00:00 2001
+From: Matthew Finkel <Matthew.Finkel(a)gmail.com>
+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
new file mode 100644
index 0000000..98c01fc
--- /dev/null
+++ b/projects/orbot/0002-Bug-28051-Exclude-the-AppUpdater.patch
@@ -0,0 +1,39 @@
+From 4a5480df8f23ccc96af794a2194d6a6c33513dc7 Mon Sep 17 00:00:00 2001
+From: Matthew Finkel <Matthew.Finkel(a)gmail.com>
+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
new file mode 100644
index 0000000..2683d65
--- /dev/null
+++ b/projects/orbot/0003-Bug-28051-Delete-the-Onboarding-activity.patch
@@ -0,0 +1,208 @@
+From 1b6c2cf4b610787e17ad746f7a69f947f717b938 Mon Sep 17 00:00:00 2001
+From: Matthew Finkel <Matthew.Finkel(a)gmail.com>
+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
new file mode 100644
index 0000000..c2cfb1b
--- /dev/null
+++ b/projects/orbot/0004-Bug-28051-Rename-the-Hidden-Service-content-provider.patch
@@ -0,0 +1,308 @@
+From b8ce28e8487772deaa9655245c3b43055e32937d Mon Sep 17 00:00:00 2001
+From: Matthew Finkel <Matthew.Finkel(a)gmail.com>
+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
new file mode 100644
index 0000000..13aeeec
--- /dev/null
+++ b/projects/orbot/0005-Bug-28051-Cast-the-layout-elements.patch
@@ -0,0 +1,81 @@
+From f05130d2184702b5005ecabe5363225459f7df74 Mon Sep 17 00:00:00 2001
+From: Matthew Finkel <Matthew.Finkel(a)gmail.com>
+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
new file mode 100644
index 0000000..cfd5a1c
--- /dev/null
+++ b/projects/orbot/0006-Bug-28051-Don-t-use-Orbot-s-LocaleHelper-for-locale-.patch
@@ -0,0 +1,129 @@
+From 4b33256dc2f3f626cca70880069a94074e312132 Mon Sep 17 00:00:00 2001
+From: Matthew Finkel <Matthew.Finkel(a)gmail.com>
+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
new file mode 100644
index 0000000..97dbc48
--- /dev/null
+++ b/projects/orbot/0007-Bug-28051-Rename-Orbot-s-preferences-so-they-don-t-c.patch
@@ -0,0 +1,53 @@
+From a700bbe8356b4ab0a56460018e82cff1ded66c0b Mon Sep 17 00:00:00 2001
+From: Matthew Finkel <Matthew.Finkel(a)gmail.com>
+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
new file mode 100644
index 0000000..720fc90
--- /dev/null
+++ b/projects/orbot/0008-Bug-28051-Make-TorService-compatible-with-the-suppor.patch
@@ -0,0 +1,49 @@
+From a99a14cefc17e50dc2eafb0c99760dd8e09aaabd Mon Sep 17 00:00:00 2001
+From: Matthew Finkel <Matthew.Finkel(a)gmail.com>
+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/Requires…
++//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
new file mode 100644
index 0000000..c46304f
--- /dev/null
+++ b/projects/orbot/0009-Bug-28051-Change-Orbot-s-behavior-for-Tor-Browser.patch
@@ -0,0 +1,150 @@
+From e9d07a68a445b644106780a4759cf41657762c91 Mon Sep 17 00:00:00 2001
+From: Matthew Finkel <Matthew.Finkel(a)gmail.com>
+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
new file mode 100644
index 0000000..c65e7da
--- /dev/null
+++ b/projects/orbot/0010-Bug-28051-Rename-Orbot-as-Tor-Browser.patch
@@ -0,0 +1,1532 @@
+From d8e44193ca75fe1317b2fdd178fa26657bb50422 Mon Sep 17 00:00:00 2001
+From: Matthew Finkel <Matthew.Finkel(a)gmail.com>
+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
new file mode 100644
index 0000000..778196f
--- /dev/null
+++ b/projects/orbot/0011-Bug-28051-Tell-Proguard-it-should-keep-an-unused-met.patch
@@ -0,0 +1,32 @@
+From 10f169fd4f963f1cdcd7e6a2b8306322bb54e901 Mon Sep 17 00:00:00 2001
+From: Matthew Finkel <Matthew.Finkel(a)gmail.com>
+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
new file mode 100644
index 0000000..89592c0
--- /dev/null
+++ b/projects/orbot/0012-Bug-28051-Escape-the-apostrophe-correctly.patch
@@ -0,0 +1,64 @@
+From 14a02d41d9be2ab7a90f9af321e07e07ae3c2b15 Mon Sep 17 00:00:00 2001
+From: Matthew Finkel <Matthew.Finkel(a)gmail.com>
+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(a)guardianproject.info, каб ЎавеЎаÑÑа бПлÑÑ.</string>
++ <string name="connect_first_time">ÐÑ Ð¿Ð°ÑпÑÑ
Пва ЎалÑÑÑлÑÑÑ ÐŽÐ° ÑеÑÐºÑ Tor, але гÑÑа ÐРзМаÑÑÑÑ, ÑÑП ваÑа пÑÑлаЎа бÑÑпеÑМаÑ. ÐÑ ÐŒÐŸÐ¶Ð°Ñе ÑкаÑÑÑÑаÑÑа ÑÑМкÑÑÑй \'ÐÑавеÑка\' з ЌеМÑ, каб пÑаÑÑÑÑаваÑÑ Ð²Ð°Ñ Ð±ÑаÑзаÑ.\n\nÐавеЎаеÑе ÐœÐ°Ñ ÑÐ°Ð¹Ñ https://guardianproject.info/apps/orbot ÑÑ Ð°ÐŽÐ¿ÑаÑÑе лÑÑÑ ÐœÐ° аЎÑÐ°Ñ help(a)guardianproject.info, каб ЎавеЎаÑÑа бПлÑÑ.</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
new file mode 100644
index 0000000..73d55e4
--- /dev/null
+++ b/projects/orbot/0013-Bug-28051-Add-a-notification-compatibility-class.patch
@@ -0,0 +1,221 @@
+From 0fde60f64b342fafc7150272c8de0544b0c430df Mon Sep 17 00:00:00 2001
+From: Matthew Finkel <Matthew.Finkel(a)gmail.com>
+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(...%2… */
++ // 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/build b/projects/orbot/build
new file mode 100644
index 0000000..4e222a9
--- /dev/null
+++ b/projects/orbot/build
@@ -0,0 +1,35 @@
+#!/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/guardianproject/gpmaven/master/* $gradle_repo
+cp -r $gradle_repo/dl/android/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
+
+# Build OrbotService Native Libraries
+pushd /var/tmp/build/[% project %]-[% c('version') %]/orbotservice/src/main
+/var/tmp/dist/android-toolchain/android-ndk/ndk-build
+mv libs/armeabi-v7a/pdnsd libs/armeabi-v7a/pdnsd.so
+popd
+
+# Build Android Libraries and Apps
+$GRADLE_HOME/gradle-4.1/bin/gradle --offline assembleRelease -x lint
+
+# Package
+cp app/build/outputs/aar/* $output_dir
+cp orbotservice/build/outputs/aar/* $output_dir
+cp jsocksAndroid/build/outputs/aar/* $output_dir
diff --git a/projects/orbot/config b/projects/orbot/config
new file mode 100644
index 0000000..1bedbdb
--- /dev/null
+++ b/projects/orbot/config
@@ -0,0 +1,52 @@
+# 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
+git_submodule: 1
+
+var:
+ tor_version: 0.3.4.9
+ orbot_version: 16.0.5-RC-1
+ deps:
+ - build-essential
+ - autotools-dev
+ - unzip
+ - zip
+ - automake
+ - autoconf
+ - libtool
+ - gettext-base
+ - autopoint
+ container:
+ use_container: 1
+ # this should be updated when the list of gradle dependencies is changed
+ gradle_dependencies_version: 1
+
+targets:
+ android-armv7:
+ var:
+ arch_deps:
+ - openjdk-8-jdk
+
+input_files:
+ - project: container-image
+ - name: '[% c("var/compiler") %]'
+ project: '[% c("var/compiler") %]'
+ - 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: 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
new file mode 100644
index 0000000..c0243f7
--- /dev/null
+++ b/projects/orbot/gradle-dependencies-list.txt
@@ -0,0 +1,192 @@
+# 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
+e336a35a1e102c2f11ce1ea7f0872df14e332374b8eacc0877e50f85f84c3d09 | https://dl.google.com/dl/android/maven2/com/android/support/animated-vector…
+0288414509c625b8dd544384fbd29f502bdc8b4f86cfc26625aa23eef9fa6057 | https://jcenter.bintray.com/net/sf/proguard/proguard-parent/5.3.3/proguard-…
+ff513db0361fd41237bef4784968bc15aae478d4ec0a9496f811072ccaf3841d | https://jcenter.bintray.com/org/apache/apache/13/apache-13.pom
+cf251279505960889b6b281c26af0438656ebac3845e52791925cf7649cb15a6 | https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.1/sdk…
+cd36b31f1495f4fe55a936dd00607abdd945e1f8074549225a04c402d1d35750 | https://jcenter.bintray.com/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.pom
+905721a0eea90a81534abb7ee6ef4ea2e5e645fa1def0a5cd88402df1b46c9ed | https://jcenter.bintray.com/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.…
+d49d179f707d3f3a00b2a7d36136b54aa8d44fa22770703cd82fe52fb39e22eb | https://jcenter.bintray.com/com/android/tools/build/transform-api/2.0.0-dep…
+9144127192d6f612c2366825dceaeb23b0d53130b83e0bf1ffe107d1470a8487 | https://jcenter.bintray.com/com/google/errorprone/error_prone_annotations/2…
+1158e94c7de4da480873f0b4ab4a1da14c0d23d4b1902cc94a58a6f0f9ab579e | https://jcenter.bintray.com/com/google/guava/guava/22.0/guava-22.0.jar
+ce6f913cad1f0db3aad70186d65c5bc7ffcc9a99e3fe8e0b137312819f7c362f | https://jcenter.bintray.com/commons-logging/commons-logging/1.1.1/commons-l…
+7a3554c605e088e7e323b1084656243f0444fa353e2f2dee1f1a4204eb64ff09 | https://jcenter.bintray.com/org/jacoco/org.jacoco.report/0.7.4.201502262128…
+f4778bb3abf2df40bfa365d00ff301b5eec76f2933b85f6aa3918e2ab6f08b91 | https://dl.google.com/dl/android/maven2/com/android/support/design/23.4.0/d…
+85ec8258fafc283f61647e6a11b404890821c11db6fcf550779ecf7a14151007 | https://jcenter.bintray.com/org/ow2/asm/asm-parent/5.1/asm-parent-5.1.pom
+712d7c974d20b71ce730938a3dda8d23e87cfd16500e1c1a2c9ecc2c9ff0d323 | https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.…
+1eaf9182e1977c1c50a70edbfbf70536398c68990bfaafc9f0e9899041201539 | https://jcenter.bintray.com/com/google/guava/guava-parent/22.0/guava-parent…
+9466512cd8cf0bd66a8a3661685373f7b3deafded11096e044926ff5c82c7a4c | https://jcenter.bintray.com/com/google/code/gson/gson/2.3/gson-2.3.jar
+bfadb3b40f65dd6de1666d6b29f8bb54031396c76eeef4146cf9f28255f8bf33 | https://jcenter.bintray.com/com/google/guava/guava/22.0/guava-22.0.pom
+e6531a278b4f632f198a6e45b9e11de1b2b678cd5a4e0fdff442f604c2439a42 | https://jcenter.bintray.com/org/jacoco/org.jacoco.report/0.7.4.201502262128…
+d7c632ad8f81044765e2963bde33073c5a098256c07ab48a63d792f9e1ed048c | https://dl.google.com/dl/android/maven2/com/android/support/support-annotat…
+cb4cfad870bf563a07199f3ebea5763f0dec440fcda0b318640b1feaa788656b | https://jcenter.bintray.com/com/google/errorprone/error_prone_annotations/2…
+f2885288839f82f824a0c042922ae7f24ed0d55ce26a74b6a7c557e0b7e30c24 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.1.3-2/kotl…
+e2f7b17610f9f0a2b55c019b7627be3d42ec142fde1db5caf8a34dbe3bb8dbcd | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/…
+52b6fd2eaf2240e14dbe752f1fa884270cc668d6f350e8e7f65f6033a8172d69 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcomponents-client…
+c9a55463942128f0b7fad62b8bee5886d1cb1c733fb3b78507465b025e6a4031 | https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCom…
+51215c67d2c068d8b7d2f6f80f51372a098075deccc448d4bdd7b987ba8328fb | https://jcenter.bintray.com/org/ow2/ow2/1.3/ow2-1.3.pom
+ecd46dc69f5212b35eb21d64db68072f956c000083030ff53e09d1f81487c580 | https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetb…
+efa86e5cd922f17b472fdfcae57234d8d4ac3e148b6250737dfce454af7a7a44 | https://jcenter.bintray.com/com/google/jimfs/jimfs/1.1/jimfs-1.1.pom
+e767a1248adb4843110457e839e504c2511649ee78f05a6a311ea7f23578894d | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-tes…
+32c797717189ffd0dcc2fcb2e804ab5a0d0c8dfa78b2aa78037f61d4a572f62c | https://raw.githubusercontent.com/guardianproject/gpmaven/master/org/torpro…
+8b0aa8a74e990ca8d633ab7bd1938530e921548df13fd4020224a61065378876 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-tes…
+e5e82da4cc66c8d917bbf743e3c0752efe8522735e7fc9dbddb65bccea81cfe9 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcore/4.2.5/httpco…
+965aeb2bedff369819bdde1bf7a0b3b89b8247dd69c88b86375d76163bb8c397 | https://jcenter.bintray.com/org/jetbrains/annotations/13.0/annotations-13.0…
+c3c99bf58182889fe86315e9a01473ee2c95540b9dedef898cec64554d925c54 | https://jcenter.bintray.com/com/android/tools/annotations/24.5.0/annotation…
+a32de739cfdf515774e696f91aa9697d2e7731e5cb5045ca8a4b657f8b1b4fb4 | https://jcenter.bintray.com/org/antlr/antlr4/4.5.3/antlr4-4.5.3.jar
+f26bdec2b9496470c0ce63b0d290816e8000ef018daaa259597ebae947fd690f | https://jcenter.bintray.com/net/sf/proguard/proguard-gradle/5.3.3/proguard-…
+7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca | https://jcenter.bintray.com/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk…
+9619e68f7eb36da3a28a60315f34320972badbad43749cc66712bb95b96a4ef3 | https://dl.google.com/dl/android/maven2/com/android/support/support-annotat…
+d2da399a9967c69f0a21739256fa79d284222c223082cacadc17372244764b54 | https://jcenter.bintray.com/org/ow2/asm/asm/5.1/asm-5.1.jar
+59970f2f0cfce6487b7180d7de653d904d8160fb2cd9d8aba6c375d39fec6652 | https://jcenter.bintray.com/pl/bclogic/pulsator4droid/1.0.3/pulsator4droid-…
+a9660f8b64b74f474226c70a50187d8efcac448d32ce97756f408975aa52cdaa | https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.1…
+26c5856e954b5f864db76f13b86919b59c6eecf9fd930b96baa8884626baf2f5 | https://jcenter.bintray.com/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-…
+c71555751e57e0ef912870e8ac9625ae782502a6a5b9c19ccf83b2a97d8b26bd | https://jcenter.bintray.com/com/google/jimfs/jimfs-parent/1.1/jimfs-parent-…
+24465b2ba90dc5ed7e2c05f1c87fe4256c27df6d3cd69b6177f3cb447b05c021 | https://dl.google.com/dl/android/maven2/com/android/support/recyclerview-v7…
+fb5369fc7ea4b2e3cf8d6f20243f1d97f81341bf818b179cd8dbd1da7a781a21 | https://jcenter.bintray.com/org/ow2/asm/asm-tree/5.1/asm-tree-5.1.pom
+f056ed61a281b3e230a63e4abf510c0d2f9bf7ff513cacb65a29538ba90ab177 | https://jcenter.bintray.com/org/jacoco/org.jacoco.build/0.7.4.201502262128/…
+63b465cc628f8c305702b12b26501cea236a3175db15b5a7356e98484aa63db5 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-mod…
+a1e7d6b3efc1703c7c8f1b15ecf8757f17d0ac41f32c9a48481a5caf638c55db | https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.0.0/protobu…
+c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd | https://jcenter.bintray.com/com/google/jimfs/jimfs/1.1/jimfs-1.1.jar
+8c6191e0dd8bfdc862332cb79b08185ac5b63565d405dac2605be4c2b19774bd | https://jcenter.bintray.com/com/android/tools/external/lombok/lombok-ast/0.…
+fcfb09fb0ea0aa97d3cfe7ea792398081348e468f126b3603cb3803f240197f0 | https://jcenter.bintray.com/com/squareup/javawriter/2.5.0/javawriter-2.5.0.…
+e4c7afb8f0d7aa159318d42a011cc2c9b0525d820973cbca5318bec6c649cecc | https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.0.0/protobu…
+a20fb26c8de5b0ff7a3069e681fcf01ebefd2f3d24b832c3af22d981d7d4376b | https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.1…
+a0d002465c0f611eedaaef2b2530707d2e9fb3a5c7ed66f53c556a12f714f43a | https://dl.google.com/dl/android/maven2/com/android/support/support-v4/23.4…
+6d079b5abf39f323baaccc68463beef5cf2e9574f333dd749ae96753f00eb205 | https://jcenter.bintray.com/org/ow2/asm/asm/5.1/asm-5.1.pom
+1879f19a05991e3ed95910b96689333396b0c467a215dc4d1f90018404b72a26 | https://jcenter.bintray.com/org/codehaus/mojo/animal-sniffer-annotations/1.…
+567ae5af5665bb445802ca650a4dc848737c9ee564f69f2ead5df1189d394304 | https://dl.google.com/dl/android/maven2/com/android/support/recyclerview-v7…
+54b34e941b8e1414bd3e40d736efd3481772dc26db3296f6aa45cec9f6203d86 | https://jcenter.bintray.com/commons-codec/commons-codec/1.6/commons-codec-1…
+d91daa358c2fd7adc1333020433a2c159ae28803b8603cfcaf599fcceab235f0 | https://jcenter.bintray.com/com/jrummyapps/android-shell/1.0.1/android-shel…
+cc6a41dc3eaacc9e440a6bd0d2890b20d36b4ee408fe2d67122f328bb6e01581 | https://jcenter.bintray.com/commons-io/commons-io/2.4/commons-io-2.4.jar
+1f8c906d0de98ddfa81b1ce520ee52fbd280c222383b66cba89e16eafb626001 | https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary…
+949246020c08a0543389082af38268cdce4ee7a7a8218097369b9845752866cb | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/…
+803be394edb8dd7d1e678683ed85aee7f86a172c90f03e6198c8a49d4f342b99 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0…
+21bb4d44dff54e33a37c11af69859a714202ae00969aab5453eba7276688f8ec | https://jcenter.bintray.com/org/apache/httpcomponents/project/4.1.1/project…
+27b4e5c0b80d3ff8b92f4c93b3b4d3ecf16c01589f4cdf70ca7cf64cb42d8122 | https://dl.google.com/dl/android/maven2/com/android/support/constraint/cons…
+faf82de0dc02e0c0ae327cd653f37255496b2e53fce280b3ab4cb34553a89086 | https://jcenter.bintray.com/com/intellij/annotations/12.0/annotations-12.0.…
+1a56992fc50f838fd091b6b9701b30da64b00bd2fe76ad2c800212eb459b49e2 | https://jcenter.bintray.com/com/google/code/gson/gson/2.3/gson-2.3.pom
+87cd27e1a02a5c3eb6d85059ce98696bb1b44c2b8b650f0567c86df60fa61da7 | https://jcenter.bintray.com/org/apache/commons/commons-parent/39/commons-pa…
+f264dd9f79a1fde10ce5ecc53221eff24be4c9331c830b7d52f2f08a7b633de2 | https://jcenter.bintray.com/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar
+d48935ae1641774e03ce24b0b3f7aeee66931a1e5d9ad4d47b5f93d237ea07fb | https://dl.google.com/dl/android/maven2/com/android/support/constraint/cons…
+7846399b35c7cd642a9b3a000c3e2d62d04eb37a4547b6933cc8b18bcc2f086b | https://jcenter.bintray.com/com/googlecode/juniversalchardet/juniversalchar…
+23e6d006f7d07bb43ebc80b2e530c8cdd65bbabcaaf911c3f12e2ea26167178c | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core…
+5fe8a11e913086fb7ab505b930987f30cfa3f4b226d4bbbc68003ca4387ae40e | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.…
+6f52ba933a117bd67131b281214510ea30232b9807bfe569bc0c17e6a2d4018c | https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.1…
+31ce606f4e9518936299bb0d27c978fa61e185fd1de7c9874fe959a53e34a685 | https://jcenter.bintray.com/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.pom
+150021a89ae6f252415cbfff5c3111bf87433776b997b68e6e71f37e5b696799 | https://dl.google.com/dl/android/maven2/com/android/support/support-vector-…
+6b5ad911a13a5c814c04be4376586eec15838158cb59b9f062ae138ddff1b861 | https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutl…
+45eb0d6e49430271b5fb385c53fae0b81d6ad3eae465a7a8d948217bcae1e86d | https://jcenter.bintray.com/com/android/tools/external/lombok/lombok-ast/0.…
+ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478 | https://jcenter.bintray.com/org/jetbrains/annotations/13.0/annotations-13.0…
+2ba9c1cfec6b4a183b72a5ccc6cb2c83479d6ad7e931543c792292c1679a7f43 | https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetb…
+052b0d2b58e5df4f30e4f64bdf5414473f6cfa10147f8f8d89cb0b63316ba8f3 | https://jcenter.bintray.com/com/android/tools/build/manifest-merger/26.0.1/…
+9f85ff2fd7d6cb3097aa47fb419ee7f0ebe869109f98aba9f4eca3f49e74a40e | https://jcenter.bintray.com/org/apache/apache/16/apache-16.pom
+d7e368746fa68ca6ba63519fb0838be9a278d509a5fcee6cd4a778a119eae447 | https://dl.google.com/dl/android/maven2/com/android/support/appcompat-v7/23…
+47be4ebd35a100945bac20b2efba158fe032520229a73bc060ac57986d132dfa | https://dl.google.com/dl/android/maven2/com/android/support/constraint/cons…
+e1abd7f1116cf5e0c59947693e2189208ec94296b2a3394c959e3511d399a7b0 | https://jcenter.bintray.com/com/squareup/javawriter/2.5.0/javawriter-2.5.0.…
+b787d574c851505e76212968b9ae1641ea79804aef7f5a2cee2a01cd4055213a | https://jcenter.bintray.com/org/apache/commons/commons-compress/1.12/common…
+6b87237de8c2e1740cf80627c7f3ce3e15de1930bb250c55a1eca94fa3e014df | https://jcenter.bintray.com/org/codehaus/codehaus-parent/4/codehaus-parent-…
+757bfe906193b8b651e79dc26cd67d6b55d0770a2cdfb0381591504f779d4a76 | https://jcenter.bintray.com/com/googlecode/juniversalchardet/juniversalchar…
+b2b5dd46cf998fa626eb6f8a1c114f6167c8d392694164e62533e5898e9b31f2 | https://jcenter.bintray.com/commons-io/commons-io/2.4/commons-io-2.4.pom
+1d2e883717b8ab7d3fcc9fa01034d165809a9c94daa6303a838f11e4d36adc86 | https://jcenter.bintray.com/net/sf/proguard/proguard-base/5.3.3/proguard-ba…
+5f1d5eab6940ece3ebb73691d8a60434d8d1e330176442be8f35a1585345b2ec | https://dl.google.com/dl/android/maven2/com/android/support/design/23.4.0/d…
+668eb6aeb3d038267e719deb55f38a4233a12602afb97e89da609c095394400a | https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.…
+a06e35d3fff3a6b813d94894ebf3e498f9540c864c5b39ae783907e3a6c72889 | https://jcenter.bintray.com/commons-codec/commons-codec/1.6/commons-codec-1…
+e51efb2ec140b2849b9880fb161cb6e30dd672368a534c1f47ab46d7f537d9ca | https://jcenter.bintray.com/net/sf/proguard/proguard-base/5.3.3/proguard-ba…
+9cddda75f4a1b4469e73f44e7b61a3e897d0f657df4797f9106ffe88c4eeade0 | https://jcenter.bintray.com/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6…
+db3cd95bec1001605e1653f2843e8542e712fa2bb672fd9c8c1ace86c57673d1 | https://jcenter.bintray.com/org/apache/httpcomponents/httpmime/4.1/httpmime…
+5d252585d47129cd667d96c92237383138a42edec5a8963a7dd44cd770faed91 | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/…
+8bd632c00bdf80a7de36c22b60f12452c147d8eca2f00d79d66699ebe7daa02a | https://jcenter.bintray.com/org/apache/commons/commons-parent/5/commons-par…
+401877d5e70ad599e9b6cff18434ea0332f637b51f8ec68352646c836f9bb2a4 | https://jcenter.bintray.com/org/antlr/antlr4-master/4.5.3/antlr4-master-4.5…
+2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439 | https://jcenter.bintray.com/com/googlecode/json-simple/json-simple/1.1/json…
+ee032c39ae5e3cd099148fbba9a2124f9ed613e5cb93e03ee0fa8808ce364040 | https://jcenter.bintray.com/org/ow2/asm/asm-util/5.1/asm-util-5.1.jar
+f5a0a1eeaa100ed36aa83eca562d5dbb7e9b045c98b44db7da4745e9d9a20328 | https://jcenter.bintray.com/org/apache/httpcomponents/httpclient/4.2.6/http…
+70c458dcf6040317b41ddf50a7d53a02b8a85b0723b36cde9562c59e3cd11dae | https://jcenter.bintray.com/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.jar
+24633fb1e62a9e4b1a25e2c1751d68be89e050b488652456e545b8019539137d | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/…
+ee041b3beb682e8bbf2dc16b6edc233483cbc36bde27fd13996617a667b615a5 | https://dl.google.com/dl/android/maven2/com/android/tools/external/com-inte…
+bd94ab42c841db16fb480f4c65d33d297e544655ecc498b37c5cf33a0c5f1968 | https://dl.google.com/dl/android/maven2/com/android/support/support-annotat…
+7e8bdca281bdcb6dad48a80854837f1c0ab46f31a0b292370e320f471f5b9cfd | https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.1…
+7af7e2d8b24b4798f04c2b7da24c9fbd1b7557b4e017c2054481565916079092 | https://jcenter.bintray.com/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-…
+5dc327c690d031a11aa8f9f4cdc391fb938fbb7c7c143cc4bc60dd573d1fd1c9 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0…
+a47c950c755747ca3093a05e9ec85d0e2f33cbd224909f571fe7577963a4d799 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.1.3-2/kot…
+f8ab13b14be080fe2f617f90e55599760e4a1b4deeea5c595df63d0d6375ed6d | https://jcenter.bintray.com/com/intellij/annotations/12.0/annotations-12.0.…
+467ae650442e876867379094e7518dfdd67d22c5352ebd39808c84259e9790ba | https://jcenter.bintray.com/org/apache/commons/commons-parent/25/commons-pa…
+13c1448f7ebb61f67e6fbd6cd5c188804c17c4d7e77c4b79b316ede4ef9cd9b3 | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.1/…
+b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454 | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/7/oss-parent-7.pom
+fb8c5e55e30a7addb4ff210858a0e8d2494ed6757bbe19012da99d51586c3cbb | https://jcenter.bintray.com/org/apache/commons/commons-parent/22/commons-pa…
+2ec779741f72313fc6623d0f0e42b2450dd2425dd6ad319697e658aae9ae177b | https://jcenter.bintray.com/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.pom
+321668fc474a73140eb9cc73c779f1ebb9f60948aade3beddee082ecefcf0259 | https://jcenter.bintray.com/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk…
+d0f2e16d054e8bb97add9ca26525eb2346f692809fcd2a28787da8ceb3c35ee8 | https://jcenter.bintray.com/commons-logging/commons-logging/1.1.1/commons-l…
+8a4e4b32eedaa72976a757e12cf1dfe742725db0b7311bf176dd937ba4236384 | https://jcenter.bintray.com/org/antlr/antlr4/4.5.3/antlr4-4.5.3.pom
+a34658f5c5de4b573eef21131cc32cc25f7b66407944f312b28ec2e56abb1fa9 | https://jcenter.bintray.com/org/ow2/asm/asm-analysis/5.1/asm-analysis-5.1.j…
+f8fd874c37c89d5dfe5ec8190d94626512bd36ab2c2ac9d4b67515c5bee745cb | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.1.3-2/kotl…
+2cafbe356f71c208013d021f32943904798cd6459e5107f9fe27000eb5bc2aef | https://dl.google.com/dl/android/maven2/com/android/support/constraint/cons…
+10107898991129eff2042a41b1bfc2d72c4ea8e4babe429ae3aeb32c69c568de | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library…
+aeb197158a2fb6bd2cb9233e22874f8051f82891dbd82b6b089f49e309f82e40 | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.1/…
+e824935c264b041e847b67808aee704f8cd47d698203259057e42f473e1f6f30 | https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCom…
+cf149955279b07d4f11e817985c1164a69e930d73db7441b43a6ef53bbd286c4 | https://jcenter.bintray.com/com/google/errorprone/error_prone_parent/2.0.18…
+f09330e83f0e3a3f6648ee43a6814ee3a91df699adf7446d6f1f38e95e34cd88 | https://raw.githubusercontent.com/guardianproject/gpmaven/master/org/torpro…
+932e6bab9a24a7bc958bbdb7e29e04d083b473d11c4ba3fab1e9b7149579f272 | https://jcenter.bintray.com/com/google/protobuf/protobuf-parent/3.0.0/proto…
+81120db4d5490c4f0e9789e1178d2bac231fcff2618bd80f8ef6ff03c550d59b | https://jcenter.bintray.com/org/ow2/asm/asm-analysis/5.1/asm-analysis-5.1.p…
+74fa208043740642f7e6eb09faba15965218ad2f50ce3020efb100136e4b591c | https://jcenter.bintray.com/it/unimi/dsi/fastutil/7.2.0/fastutil-7.2.0.jar
+e899e02ec8ac6a73fb9c9c7cb9ebd9bfc4ce8263412285d5ec6f2df920880905 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-mod…
+e8b4151ae1679f1abe7a14ee371ac9b3c651ae7b63290d1f586bdd0f78face9a | https://jcenter.bintray.com/com/android/tools/build/transform-api/2.0.0-dep…
+6895e368fa59168428c78cdf300bb29352073f397d8f260af3de82df2c8b2448 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library…
+ec4c74554312fac5116350164786f91b35c9e082fa4ea598bfa42b5db05d7abb | https://jcenter.bintray.com/org/jacoco/org.jacoco.core/0.7.4.201502262128/o…
+1ef71c25a9d46ae0ce023d02a5734e0b06fdf934fbc5948e20482526b22b4179 | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.…
+e30f1db6058f745f26112ef309f89becb27c617c7d9e4c6e02165a7620a92e6a | https://jcenter.bintray.com/com/android/tools/common/26.0.1/common-26.0.1.p…
+fcd77cba4ea3893429860b93da5d43f2e089f2ba8bdfa97ef724f410f404152a | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.…
+9e9323a26ba8eb2394efef0c96d31b70df570808630dc147cab1e73541cc5194 | https://jcenter.bintray.com/org/apache/apache/4/apache-4.pom
+8fdc3336e7b01873193ba9c48b87de7d788dc0954d1eb45c322492627a4b5c6e | https://jcenter.bintray.com/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk…
+97b3786e1f55e74bddf8ad102bf50e33bbcbc1f6b7fd7b36f0bbbb25cd4981be | https://jcenter.bintray.com/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.jar
+31629566148e8a47688ae43b420abc3ecd783ed15b33bebc00824bf24c9b15aa | https://jcenter.bintray.com/org/apache/httpcomponents/httpmime/4.1/httpmime…
+4f88a89142c64bf03906f84609594666e9694df56e3e6f05edfab8a68b39d837 | https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.…
+b27bbb9d269a97be8ff0ac480c0f09c9a953f62e6ff05d90fcbb0ddb4de97c77 | https://jcenter.bintray.com/com/android/tools/common/26.0.1/common-26.0.1.j…
+ddb0fc5402b4cd8f31d5f29c830793d3ec00fd8ce60786254e5f0f132f0bdd8d | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.…
+47a89be0fa0fedd476db5fd2c83487654d2a119c391f83a142be876667cf7dab | https://jcenter.bintray.com/com/googlecode/json-simple/json-simple/1.1/json…
+fee07b2760ef3ed20f2edefa70504a29f9216d277adae56ce85778ee4b18cd04 | https://dl.google.com/dl/android/maven2/com/android/support/support-v4/23.4…
+8b870b3f2ee38bf15681acbc8b628df1ccf7c533190b5c79af9934b6cd66d451 | https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary…
+0a640f956f4cdde8b5d3458a67ca67599eeb6f47349167a3f1afce7d60978027 | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core…
+81f73f8b25b430f5a40a39727bbcef653a1d0868cc69233b44e4282ce5a94ff9 | https://jcenter.bintray.com/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.…
+953b116521a73575eee990e3f2c36a892fb088bb2d9a3027c82193cb7a013ef7 | https://jcenter.bintray.com/it/unimi/dsi/fastutil/7.2.0/fastutil-7.2.0.pom
+40ceb7157feb263949e0f503fe5f71689333a621021aa20ce0d0acee3badaa0f | https://jcenter.bintray.com/com/google/j2objc/j2objc-annotations/1.1/j2objc…
+a9d65daccc5afca97372936246ac49fb587423e005606e7981b0efc66b0e9385 | https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.…
+d3d96637b0e8e61046567b8c87b667dcf3cd31c7447f651cb58d6e6e744adfba | https://dl.google.com/dl/android/maven2/com/android/support/appcompat-v7/23…
+c0de2bbc4cb8297419659813ecd4ed1d077ed1dd5c1f5544cc5143e493e84c10 | https://jcenter.bintray.com/org/ow2/asm/asm-tree/5.1/asm-tree-5.1.jar
+3e395d6fbc43c09a3774cac8694ce527398305ea3fd5492d80e25af27d382a9c | https://jcenter.bintray.com/org/codehaus/mojo/mojo-parent/34/mojo-parent-34…
+5215b648798c6c8d9b9cde3642d3bfb5a4cc894b7c8411004352e7de5d119827 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcomponents-client…
+bede73084ec812b916f686cc6e47625bd0756154bef589a4c2b419e54a393bf5 | https://jcenter.bintray.com/com/android/tools/build/manifest-merger/26.0.1/…
+536c45e8804de01321c478cfb994377f81f1e32897636616fa21b877fd137c6f | https://jcenter.bintray.com/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6…
+38db692b5cbaf69d89b1fe5b0fc38a5cc83f898716f8bc64086fa17c25ea57d6 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library…
+f34b3a0b62cdb468eb7e8335de4edc87958dc299306c2b4ba8ea15e6a4be106a | https://jcenter.bintray.com/net/sf/proguard/proguard-gradle/5.3.3/proguard-…
+2068320bd6bad744c3673ab048f67e30bef8f518996fa380033556600669905d | https://jcenter.bintray.com/org/codehaus/mojo/animal-sniffer-annotations/1.…
+43edcc0fc3bd8520bf60066f54088f272e39aa856d25cdd6ca9ee4d8f5c32666 | https://dl.google.com/dl/android/maven2/com/android/support/support-vector-…
+e7a7a5810829dee924cec654a569a48301fcedd487f7b88710e816d127385f51 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library…
+cd6db17a11a31ede794ccbd1df0e4d9750f640234731f21cff885a9997277e81 | https://jcenter.bintray.com/com/google/google/1/google-1.pom
+1917871c8deb468307a584680c87a44572f5a8b0b98c6d397fc0f5f86596dbe7 | https://jcenter.bintray.com/org/jetbrains/trove4j/trove4j/20160824/trove4j-…
+8d4006178fedef4255797b806167cf4a6774158eedabf96420693afbbd00fee3 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library…
+58aa4df8faae90e484c0bc47494a1ec97dc51fe53eae2b4a70d60ea7489cdf8c | https://dl.google.com/dl/android/maven2/com/android/tools/external/com-inte…
+b677d99c309dc272f60cefa1f1b639ab750d592ded0ea7bfc9f9c5600ebd742d | https://jcenter.bintray.com/pl/bclogic/pulsator4droid/1.0.3/pulsator4droid-…
+963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349 | https://jcenter.bintray.com/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk…
+e91a88dd0c5e99069b7f09d4a46b5e06f1e9c4c72fc0a8e987e25d86af480f01 | https://dl.google.com/dl/android/maven2/com/android/support/support-annotat…
+2a0475c2625fc27f80d3c5021130509b4068e0f984f2511e7a77a097de48b41d | https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.1/sdk…
+e2b4935e76d91b5abec44de309f2c8bb8d1d2e6cc0b8790b43cb654f1e22c722 | https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutl…
+f0c98c571e93a7cb4dd18df0fa308f0963e7a0620ac2d4244e61e709d03ad6be | https://jcenter.bintray.com/com/google/j2objc/j2objc-annotations/1.1/j2objc…
+0ee5f691cbbedb69969b48374d27412f821959af5d2dffbabc424b607cdbbdf6 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.1.3-2/kot…
+736c8cb2b448d46a67d2a315e67e8903baaefc35e498df45a2d816f8698383c1 | https://jcenter.bintray.com/com/jrummyapps/android-shell/1.0.1/android-shel…
+bcb7ce66a9c629fa7c723a767b6430e1a383e8d4dd543d603dcb0ad1b855b8b2 | https://dl.google.com/dl/android/maven2/com/android/support/animated-vector…
+fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/9/oss-parent-9.pom
+cf7e3630e1929ddeffcb0315db2acb37182c92dd3af970111b6115592f64d077 | https://jcenter.bintray.com/org/jacoco/org.jacoco.core/0.7.4.201502262128/o…
+b6eb99f1362b8344ca5400d57a35c49e3504f23f3dee304fdb879d4d953f4bc6 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcore/4.2.5/httpco…
+3d6eba428555a558de046b5d76eacc1f5a54b4f5f20b84d636ed7aff18aa48c3 | https://jcenter.bintray.com/org/apache/httpcomponents/project/7/project-7.p…
+362e9324ee7c697e21279e20077b52737ddef3f1b2c1a7abe5ad34b465145550 | https://jcenter.bintray.com/org/apache/httpcomponents/httpclient/4.2.6/http…
+2c1542faf343185b7cab9c3d55c8ae5471d6d095d3887a4adefdbdf2984dc0b6 | https://jcenter.bintray.com/org/apache/commons/commons-compress/1.12/common…
+07f08b315c812406e9d497e1b592689742feb3950c1a713f95e2692d3e15b619 | https://jcenter.bintray.com/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.…
+4946e60a547c8eda69f3bc23c5b6f0dadcf8469ea49b1d1da7de34aecfcf18dd | https://jcenter.bintray.com/org/apache/apache/9/apache-9.pom
+df5f5e4b6d2ddcde49ed5a4e7e3bf2cb7f87e0d9892e5b066f995c4d703b228f | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library…
+feab9191311c3d7aeef2b66d6064afc80d3d1d52d980fb07ae43c78c987ba93a | https://jcenter.bintray.com/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.…
+0c0e9d1857c250d1d71b5c6be7b8cc29afe55e7419a90d13bbe968ae5bd7240e | https://jcenter.bintray.com/org/ow2/asm/asm-util/5.1/asm-util-5.1.pom
+164e7a9cf23a4e63bbc961f8db7d965d53d685710660a88249641f91d36f83a4 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcomponents-core/4…
+f51550a06b1410bd4962cb0e71df0b921a60a7ef47bfa9c4825a14be72316eea | https://jcenter.bintray.com/org/codehaus/mojo/animal-sniffer-parent/1.14/an…
+5c415a9d8585200de4be1947e15291cc79f599b06249375f5c9ea22d4b2d090f | https://jcenter.bintray.com/org/jetbrains/trove4j/trove4j/20160824/trove4j-…
diff --git a/projects/orbot/set_gradle_repo_to_local.patch b/projects/orbot/set_gradle_repo_to_local.patch
new file mode 100644
index 0000000..ec16ae2
--- /dev/null
+++ b/projects/orbot/set_gradle_repo_to_local.patch
@@ -0,0 +1,19 @@
+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") }
+ }
+ }
1
0
[tor-browser-build/maint-8.0] Bug 28657: Remove broken FTE bridge from Tor Browser
by boklm＠torproject.org 29 Nov '18
by boklm＠torproject.org 29 Nov '18
29 Nov '18
commit 18fbb8f8703803a7374ddd724be37eba7675c568
Author: Georg Koppen <gk(a)torproject.org>
Date: Thu Nov 29 09:51:18 2018 +0000
Bug 28657: Remove broken FTE bridge from Tor Browser
---
projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js
index ad34891..ec76ce7 100644
--- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js
+++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js
@@ -9,9 +9,8 @@ pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 109.105.109.163:389
pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A");
pref("extensions.torlauncher.default_bridge.fte.1", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42");
-pref("extensions.torlauncher.default_bridge.fte.2", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B");
-pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D");
-pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9");
+pref("extensions.torlauncher.default_bridge.fte.2", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D");
+pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9");
pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:15937 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0");
pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0");
1
0
[tor-browser-build/master] Bug 28657: Remove broken FTE bridge from Tor Browser
by boklm＠torproject.org 29 Nov '18
by boklm＠torproject.org 29 Nov '18
29 Nov '18
commit b7b964117cc26d1e06e7805ba5f4a538402aed89
Author: Georg Koppen <gk(a)torproject.org>
Date: Thu Nov 29 09:51:18 2018 +0000
Bug 28657: Remove broken FTE bridge from Tor Browser
---
projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js
index ad34891..ec76ce7 100644
--- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js
+++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js
@@ -9,9 +9,8 @@ pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 109.105.109.163:389
pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A");
pref("extensions.torlauncher.default_bridge.fte.1", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42");
-pref("extensions.torlauncher.default_bridge.fte.2", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B");
-pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D");
-pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9");
+pref("extensions.torlauncher.default_bridge.fte.2", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D");
+pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9");
pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:15937 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0");
pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0");
1
0
[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28051 - Open Orbot when the notification is tapped
by gk＠torproject.org 29 Nov '18
by gk＠torproject.org 29 Nov '18
29 Nov '18
commit 8e5290a7ff9c70dde87e055256717feb342a8645
Author: Matthew Finkel <Matthew.Finkel(a)gmail.com>
Date: Wed Nov 14 17:40:15 2018 +0000
Bug 28051 - Open Orbot when the notification is tapped
---
.../base/java/org/mozilla/gecko/LauncherActivity.java | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java b/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java
index e8f8facc24c6..4cd94ed538c7 100644
--- a/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java
+++ b/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java
@@ -45,6 +45,9 @@ import static org.mozilla.gecko.deeplink.DeepLinkContract.LINK_FXA_SIGNIN;
import org.mozilla.gecko.deeplink.DeepLinkContract;
+import org.torproject.android.OrbotMainActivity;
+import org.torproject.android.service.TorServiceConstants;
+
/**
* Activity that receives incoming Intents and dispatches them to the appropriate activities (e.g. browser, custom tabs, web app).
*/
@@ -67,6 +70,9 @@ public class LauncherActivity extends Activity {
} else if (isWebAppIntent(safeIntent)) {
dispatchWebAppIntent();
+ } else if (TorServiceConstants.TOR_APP_USERNAME.equals(getIntent().getAction())) {
+ dispatchOrbotIntent();
+
// If it's not a view intent, it won't be a custom tabs intent either. Just launch!
} else if (!isViewIntentWithURL(safeIntent)) {
dispatchNormalIntent();
@@ -116,6 +122,18 @@ public class LauncherActivity extends Activity {
startActivity(intent);
}
+ private void dispatchOrbotIntent() {
+ final String orbotStartAction = "android.intent.action.MAIN";
+ final Intent intent = new Intent(orbotStartAction, null, this, OrbotMainActivity.class);
+
+ //When we launch Orbot, we want a new task.
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+ intent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+
+ startActivity(intent);
+ }
+
private void dispatchUrlIntent(@NonNull String url) {
Intent intent = new Intent(getIntent());
intent.setData(Uri.parse(url));
1
0
[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28051 - Use Orbot's notification-builder wrapper class
by gk＠torproject.org 29 Nov '18
by gk＠torproject.org 29 Nov '18
29 Nov '18
commit e6c7c8b6022a3d9e5c1dab2966ab45b467d84630
Author: Matthew Finkel <Matthew.Finkel(a)gmail.com>
Date: Fri Nov 23 20:39:24 2018 +0000
Bug 28051 - Use Orbot's notification-builder wrapper class
This allows for notifications on all supported versions of Android.
---
.../gecko/notifications/NotificationClient.java | 39 ++++++++++++++++++++--
.../gecko/notifications/NotificationHelper.java | 5 +--
2 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java
index d8392a801e13..b2312b8780d2 100644
--- a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java
+++ b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java
@@ -7,12 +7,15 @@ package org.mozilla.gecko.notifications;
import android.app.Activity;
import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
import android.app.PendingIntent;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
import android.net.Uri;
+import android.os.Build;
import android.support.v4.app.NotificationCompat;
import android.support.v4.app.NotificationManagerCompat;
import android.util.Log;
@@ -28,6 +31,8 @@ import org.mozilla.gecko.NotificationListener;
import org.mozilla.gecko.R;
import org.mozilla.gecko.util.BitmapUtils;
+import org.torproject.android.service.util.NotificationBuilderCompat;
+
/**
* Client for posting notifications.
*/
@@ -37,8 +42,11 @@ public final class NotificationClient implements NotificationListener {
/* package */ static final String CLOSE_ACTION = AppConstants.ANDROID_PACKAGE_NAME + ".NOTIFICATION_CLOSE";
/* package */ static final String PERSISTENT_INTENT_EXTRA = "persistentIntent";
+ private static final String NOTIFICATION_CHANNEL_ID = NotificationBuilderCompat.DEFAULT_CHANNEL_ID;
+
private final Context mContext;
private final NotificationManagerCompat mNotificationManager;
+ private NotificationManager mNativeNotificationManager;
private final HashMap<String, Notification> mNotifications = new HashMap<>();
@@ -57,6 +65,8 @@ public final class NotificationClient implements NotificationListener {
public NotificationClient(Context context) {
mContext = context.getApplicationContext();
mNotificationManager = NotificationManagerCompat.from(mContext);
+
+ createNotificationChannel();
}
@Override // NotificationListener
@@ -72,6 +82,31 @@ public final class NotificationClient implements NotificationListener {
showNotification(name, cookie, title, text, host, imageUrl, data != null ? data : "");
}
+ /* Only create the notification channel if we're running on Android O or later.
+ * The notification channel is required for notifications on new Android versions.
+ */
+ private void createNotificationChannel() {
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+ return;
+ }
+
+ NotificationManager mNativeNotificationManager =
+ (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
+
+ CharSequence name = mContext.getString(R.string.app_name);
+ String description = mContext.getString(R.string.app_description);
+ int importance = NotificationManager.IMPORTANCE_LOW;
+
+ NotificationChannel mChannel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, name, importance);
+ mChannel.setDescription(description);
+ mChannel.enableLights(false);
+ mChannel.enableVibration(false);
+ mChannel.setShowBadge(false);
+ mChannel.setLockscreenVisibility(Notification.VISIBILITY_SECRET);
+
+ mNativeNotificationManager.createNotificationChannel(mChannel);
+ }
+
private void showNotification(String name, String cookie, String title,
String text, String host, String imageUrl,
String persistentData) {
@@ -142,7 +177,7 @@ public final class NotificationClient implements NotificationListener {
private void add(final String name, final String imageUrl, final String host,
final String alertTitle, final String alertText,
final PendingIntent contentIntent, final PendingIntent deleteIntent) {
- final NotificationCompat.Builder builder = new NotificationCompat.Builder(mContext)
+ final NotificationBuilderCompat builder = new NotificationBuilderCompat(mContext)
.setContentTitle(alertTitle)
.setContentText(alertText)
.setSmallIcon(R.drawable.ic_status_logo)
@@ -150,7 +185,7 @@ public final class NotificationClient implements NotificationListener {
.setDeleteIntent(deleteIntent)
.setAutoCancel(true)
.setDefaults(Notification.DEFAULT_SOUND)
- .setStyle(new NotificationCompat.BigTextStyle()
+ .setStyle(new Notification.BigTextStyle()
.bigText(alertText)
.setSummaryText(host));
diff --git a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java
index 34ea99882d9a..35366609da49 100644
--- a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java
+++ b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java
@@ -32,10 +32,11 @@ import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.graphics.Bitmap;
import android.net.Uri;
-import android.support.v4.app.NotificationCompat;
import android.support.v4.util.SimpleArrayMap;
import android.util.Log;
+import org.torproject.android.service.util.NotificationBuilderCompat;
+
public final class NotificationHelper implements BundleEventListener {
public static final String HELPER_BROADCAST_ACTION = AppConstants.ANDROID_PACKAGE_NAME + ".helperBroadcastAction";
@@ -233,7 +234,7 @@ public final class NotificationHelper implements BundleEventListener {
private void showNotification(final GeckoBundle message) {
ThreadUtils.assertOnUiThread();
- final NotificationCompat.Builder builder = new NotificationCompat.Builder(mContext);
+ final NotificationBuilderCompat builder = new NotificationBuilderCompat(mContext);
// These attributes are required
final String id = message.getString(ID_ATTR);
1
0
[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28051 - Integrate Orbot and add dependencies
by gk＠torproject.org 29 Nov '18
by gk＠torproject.org 29 Nov '18
29 Nov '18
commit 0bb30b64417fa0789edc6b8d9d8ff6c684a42a78
Author: Matthew Finkel <Matthew.Finkel(a)gmail.com>
Date: Wed Nov 14 17:36:53 2018 +0000
Bug 28051 - Integrate Orbot and add dependencies
---
build.gradle | 4 ++++
mobile/android/app/build.gradle | 11 +++++++++++
mobile/android/base/AndroidManifest.xml.in | 1 +
mobile/android/config/proguard/proguard.cfg | 13 +++++++++++++
4 files changed, 29 insertions(+)
diff --git a/build.gradle b/build.gradle
index a080e15b2fac..6cf2d4cc0e7a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,6 +32,10 @@ allprojects {
url repository
}
}
+ // These are needed for Orbot's dependencies
+ maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" }
+ maven { url 'https://jitpack.io' }
+ jcenter()
}
}
diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle
index 7c515bbe65a7..d0060901b6b3 100644
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -225,6 +225,9 @@ dependencies {
implementation "com.android.support:design:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}"
implementation "com.android.support:customtabs:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}"
implementation "com.android.support:palette-v7:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}"
+ implementation files('Orbot-16.0.5-RC-1-tor-0.3.4.9-fullperm-release.aar')
+ implementation files('orbotservice-release.aar')
+ implementation files('jsocksAndroid-release.aar')
if (mozconfig.substs.MOZ_NATIVE_DEVICES) {
implementation "com.android.support:mediarouter-v7:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}"
@@ -262,6 +265,14 @@ dependencies {
// Including the Robotium JAR directly can cause issues with dexing.
androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.5.4'
+
+ // Orbot
+ implementation 'com.github.delight-im:Android-Languages:v1.0.1'
+ implementation 'pl.bclogic:pulsator4droid:1.0.3'
+
+ // Orbotservice
+ implementation 'org.torproject:tor-android-binary:0.3.4.9'
+ implementation 'com.jrummyapps:android-shell:1.0.1'
}
// TODO: (bug 1261486): This impl is not robust -
diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in
index c4ea9a37683e..0e5f4edaf814 100644
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -24,6 +24,7 @@
#include FennecManifest_permissions.xml.in
<application android:label="@string/moz_app_displayname"
+ tools:replace="android:label"
android:icon="@drawable/icon"
android:logo="@drawable/logo"
android:name="@MOZ_ANDROID_APPLICATION_CLASS@"
diff --git a/mobile/android/config/proguard/proguard.cfg b/mobile/android/config/proguard/proguard.cfg
index 0be8a745e44b..5d94788a18af 100644
--- a/mobile/android/config/proguard/proguard.cfg
+++ b/mobile/android/config/proguard/proguard.cfg
@@ -165,6 +165,19 @@
# See: http://stackoverflow.com/questions/22441366/note-android-support-v4-text-ic…
-dontnote android.support.**
+# From https://github.com/square/okhttp/blob/master/okhttp/src/main/resources/META…
+# JSR 305 annotations are for embedding nullability information.
+-dontwarn javax.annotation.**
+
+# A resource is loaded with a relative path so the package of this class must be preserved.
+-keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
+
+# Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java.
+-dontwarn org.codehaus.mojo.animal_sniffer.*
+
+# OkHttp platform used only on JVM and when Conscrypt dependency is available.
+-dontwarn okhttp3.internal.platform.ConscryptPlatform
+
-include "adjust-keeps.cfg"
-include "leakcanary-keeps.cfg"
1
0
[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28051 - Launch Orbot if it isn't running in the background
by gk＠torproject.org 29 Nov '18
by gk＠torproject.org 29 Nov '18
29 Nov '18
commit 078d1f89036764b9486cd4de841ad2bfcd748ac0
Author: Matthew Finkel <Matthew.Finkel(a)gmail.com>
Date: Wed Nov 14 17:38:08 2018 +0000
Bug 28051 - Launch Orbot if it isn't running in the background
---
.../base/java/org/mozilla/gecko/BrowserApp.java | 64 ++++++----------------
.../java/org/mozilla/gecko/GeckoApplication.java | 10 ++++
.../main/java/org/mozilla/gecko/GeckoAppShell.java | 11 ----
3 files changed, 26 insertions(+), 59 deletions(-)
diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
index 5efd83398775..814b46f24295 100644
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -181,7 +181,8 @@ import org.mozilla.gecko.widget.GeckoActionProvider;
import org.mozilla.gecko.widget.SplashScreen;
import org.mozilla.geckoview.GeckoSession;
-import info.guardianproject.netcipher.proxy.OrbotHelper;
+import org.torproject.android.OrbotMainActivity;
+import org.torproject.android.service.TorServiceConstants;
import java.io.File;
import java.io.FileNotFoundException;
@@ -239,6 +240,7 @@ public class BrowserApp extends GeckoApp
public static final int ACTIVITY_REQUEST_TRIPLE_READERVIEW = 4001;
public static final int ACTIVITY_RESULT_TRIPLE_READERVIEW_ADD_BOOKMARK = 4002;
public static final int ACTIVITY_RESULT_TRIPLE_READERVIEW_IGNORE = 4003;
+ public static final int ACTIVITY_RESULT_ORBOT_LAUNCH = 5001;
public static final String ACTION_VIEW_MULTIPLE = AppConstants.ANDROID_PACKAGE_NAME + ".action.VIEW_MULTIPLE";
@@ -267,6 +269,8 @@ public class BrowserApp extends GeckoApp
private HomeScreen mHomeScreen;
private TabsPanel mTabsPanel;
+ private boolean mOrbotNeedsStart = true;
+
private boolean showSplashScreen = false;
private SplashScreen splashScreen;
/**
@@ -1278,45 +1282,11 @@ public class BrowserApp extends GeckoApp
}
}
- private BroadcastReceiver torStatusReceiver = new BroadcastReceiver() {
-
- @Override
- public void onReceive(Context context, Intent intent) {
- if (TextUtils.equals(intent.getAction(), OrbotHelper.ACTION_STATUS)) {
- GeckoAppShell.setTorStatus(intent);
- }
- }
- };
-
public void checkStartOrbot() {
- if (!OrbotHelper.isOrbotInstalled(this)) {
- final Intent installOrbotIntent = OrbotHelper.getOrbotInstallIntent(this);
-
- AlertDialog.Builder builder = new AlertDialog.Builder(this);
- builder.setTitle(R.string.install_orbot);
- builder.setMessage(R.string.you_must_have_orbot);
- builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialogInterface, int i) {
- startActivity(installOrbotIntent);
- }
- });
- builder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialogInterface, int i) {
- }
- });
- builder.show();
- } else {
- /* run in thread so Tor status updates will be received while the
- * Gecko event sync is blocking the main thread */
- HandlerThread handlerThread = new HandlerThread("torStatusReceiver");
- handlerThread.start();
- Looper looper = handlerThread.getLooper();
- Handler handler = new Handler(looper);
- registerReceiver(torStatusReceiver, new IntentFilter(OrbotHelper.ACTION_STATUS),
- null, handler);
- OrbotHelper.requestStartTor(this);
+ if (mOrbotNeedsStart) {
+ final String orbotStartAction = "android.intent.action.MAIN";
+ final Intent launchOrbot = new Intent(orbotStartAction, null, this, OrbotMainActivity.class);
+ startActivityForResult(launchOrbot, ACTIVITY_RESULT_ORBOT_LAUNCH, null);
}
}
@@ -1358,15 +1328,6 @@ public class BrowserApp extends GeckoApp
for (BrowserAppDelegate delegate : delegates) {
delegate.onPause(this);
}
-
- if (torStatusReceiver != null)
- {
- try {
- unregisterReceiver(torStatusReceiver);
- } catch (IllegalArgumentException e) {
- Log.w(LOGTAG, "Tor status receiver couldn't be unregistered", e);
- }
- }
}
@Override
@@ -1801,6 +1762,8 @@ public class BrowserApp extends GeckoApp
NotificationHelper.destroy();
GeckoNetworkManager.destroy();
+ mOrbotNeedsStart = true;
+
super.onDestroy();
}
@@ -3018,6 +2981,11 @@ public class BrowserApp extends GeckoApp
TabQueueHelper.processTabQueuePromptResponse(resultCode, this);
break;
+ case ACTIVITY_RESULT_ORBOT_LAUNCH:
+ Log.d(LOGTAG, "onActivityResult: ACTIVITY_RESULT_ORBOT_LAUNCH");
+ mOrbotNeedsStart = false;
+ break;
+
default:
for (final BrowserAppDelegate delegate : delegates) {
delegate.onActivityResult(this, requestCode, resultCode, data);
diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
index e896134e0af9..b8e4985332a9 100644
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
@@ -62,6 +62,9 @@ import java.lang.reflect.Method;
import java.net.URL;
import java.util.UUID;
+import org.torproject.android.service.util.Prefs;
+import org.torproject.android.settings.Languages;
+
public class GeckoApplication extends Application
implements HapticFeedbackDelegate {
private static final String LOG_TAG = "GeckoApplication";
@@ -319,6 +322,13 @@ public class GeckoApplication extends Application
"Profile:Create",
null);
+ // Give Orbot the base Context
+ Prefs.setContext(context);
+
+ // Initialize Orbot's Language settings
+ Languages.setup(BrowserApp.class, R.string.menu_settings);
+ Languages.setLanguage(this, Prefs.getDefaultLocale(), true);
+
super.onCreate();
}
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java
index f67603f853e2..34ba3315f295 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java
@@ -1895,15 +1895,4 @@ public class GeckoAppShell
public static String getDefaultLocale() {
return Locale.getDefault().toString();
}
-
- public static void setTorStatus(Intent intent) {
- sTorStatus = intent.getStringExtra(OrbotHelper.EXTRA_STATUS);
- if (OrbotHelper.STATUS_ON.equals(sTorStatus)) {
- sendPendingUrlIntents();
- }
- }
-
- public static String getTorStatus() {
- return sTorStatus;
- }
}
1
0
[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28051 - Use our Orbot for proxying our connections
by gk＠torproject.org 29 Nov '18
by gk＠torproject.org 29 Nov '18
29 Nov '18
commit 2ffe1e523e67c62a5bc160cfa8d09030cbdf5267
Author: Matthew Finkel <Matthew.Finkel(a)gmail.com>
Date: Wed Nov 14 17:39:03 2018 +0000
Bug 28051 - Use our Orbot for proxying our connections
---
mobile/android/app/000-tor-browser-android.js | 3 ---
.../geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java | 4 ++--
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/mobile/android/app/000-tor-browser-android.js b/mobile/android/app/000-tor-browser-android.js
index c329fcdee5f7..e7e337276acb 100644
--- a/mobile/android/app/000-tor-browser-android.js
+++ b/mobile/android/app/000-tor-browser-android.js
@@ -54,9 +54,6 @@ pref("media.realtime_decoder.enabled", false);
pref("general.useragent.updates.enabled", false);
pref("general.useragent.updates.url", "");
-// Override this because Orbot uses 9050 as the default
-pref("network.proxy.socks_port", 9050);
-
// Do not allow the user to install extensions from web
pref("xpinstall.enabled", false);
pref("extensions.enabledScopes", 1);
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java
index f05716fe1d09..41c2c7e705a1 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java
@@ -30,8 +30,8 @@ import java.util.List;
public class ProxySelector {
private static final String TOR_PROXY_ADDRESS = "127.0.0.1";
- private static final int TOR_SOCKS_PROXY_PORT = 9050;
- private static final int TOR_HTTP_PROXY_PORT = 8118;
+ private static final int TOR_SOCKS_PROXY_PORT = 9150;
+ private static final int TOR_HTTP_PROXY_PORT = 8218;
public static URLConnection openConnectionWithProxy(URI uri) throws IOException {
java.net.ProxySelector ps = java.net.ProxySelector.getDefault();
1
0
[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28051 - Stop the background service when we're quitting
by gk＠torproject.org 29 Nov '18
by gk＠torproject.org 29 Nov '18
29 Nov '18
commit 4514386c95b57153ca550d710c117efe5a3acf93
Author: Matthew Finkel <Matthew.Finkel(a)gmail.com>
Date: Wed Nov 14 17:39:45 2018 +0000
Bug 28051 - Stop the background service when we're quitting
If the user swips away the app, then initiate quitting as if the user
selected Quit from the menu.
---
mobile/android/base/java/org/mozilla/gecko/GeckoApp.java | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
index 802d8adafbeb..42a4f191d525 100644
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
@@ -91,6 +91,8 @@ import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
+import org.torproject.android.service.TorService;
+
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
@@ -596,6 +598,9 @@ public abstract class GeckoApp extends GeckoActivity
EventDispatcher.getInstance().dispatch("Browser:Quit", res);
+ Intent torService = new Intent(this, TorService.class);
+ stopService(torService);
+
// We don't call shutdown here because this creates a race condition which
// can cause the clearing of private data to fail. Instead, we shut down the
// UI only after we're done sanitizing.
@@ -2166,6 +2171,11 @@ public abstract class GeckoApp extends GeckoActivity
GeckoApplication.shutdown(!mRestartOnShutdown ? null : new Intent(
Intent.ACTION_MAIN, /* uri */ null, getApplicationContext(), getClass()));
}
+
+ if (isFinishing()) {
+ Log.i(LOGTAG, "onDestroy() is finishing.");
+ quitAndClear();
+ }
}
public void showSDKVersionError() {
1
0
commit 3a3dc1797bf5c9975ed2a35acf3c6c82c8ee39d5
Author: Georg Koppen <gk(a)torproject.org>
Date: Wed Nov 28 21:43:57 2018 +0000
Translations updatte
---
src/chrome/locale/cs/network-settings.dtd | 2 +-
src/chrome/locale/da/torlauncher.properties | 8 +--
src/chrome/locale/el/network-settings.dtd | 16 +++---
src/chrome/locale/es/torlauncher.properties | 2 +-
src/chrome/locale/fa/torlauncher.properties | 22 ++++-----
src/chrome/locale/gu/torlauncher.properties | 2 +-
src/chrome/locale/hr-HR/network-settings.dtd | 36 +++++++-------
src/chrome/locale/hr/network-settings.dtd | 74 ++++++++++++++--------------
src/chrome/locale/hr/torlauncher.properties | 14 +++---
src/chrome/locale/ja/network-settings.dtd | 4 +-
src/chrome/locale/ka/network-settings.dtd | 2 +-
src/chrome/locale/ka/torlauncher.properties | 4 +-
src/chrome/locale/mk/network-settings.dtd | 38 +++++++-------
src/chrome/locale/mk/torlauncher.properties | 58 +++++++++++-----------
src/chrome/locale/nl/network-settings.dtd | 2 +-
src/chrome/locale/nl/torlauncher.properties | 2 +-
src/chrome/locale/pl/network-settings.dtd | 34 ++++++-------
src/chrome/locale/pl/torlauncher.properties | 28 +++++------
src/chrome/locale/sv/network-settings.dtd | 4 +-
src/chrome/locale/sv/torlauncher.properties | 4 +-
src/chrome/locale/ur/network-settings.dtd | 2 +-
src/chrome/locale/ur/torlauncher.properties | 6 +--
22 files changed, 182 insertions(+), 182 deletions(-)
diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd
index 53fc3a1..1e76823 100644
--- a/src/chrome/locale/cs/network-settings.dtd
+++ b/src/chrome/locale/cs/network-settings.dtd
@@ -52,7 +52,7 @@
<!ENTITY torsettings.copyLog "Zkopírovat protokol Toru do schránky">
<!ENTITY torsettings.proxyHelpTitle "Nápověda k proxy">
-<!ENTITY torsettings.proxyHelp1 "Pří připojení skrze síť firmy, školy nebo univerzity může být potřeba lokální proxy. Pokud si nejste jisti, jestli je proxy potřeba, podívejte se do nastavení internetu jiného prohlížeče, nebo do systémového nastavení sítě.">
+<!ENTITY torsettings.proxyHelp1 "Pří připojení skrze síť firmy, školy nebo univerzity může být vyžadována lokální proxy. Pokud si nejste jisti, jestli je proxy potřeba, podívejte se do nastavení internetu jiného prohlížeče, nebo do systémového nastavení sítě.">
<!ENTITY torsettings.bridgeHelpTitle "Nápověda o mostních uzlech">
<!ENTITY torsettings.bridgeHelp1 "Mosty jsou neveřejné uzly, které znesnadňují blokování sítě Tor.  Každý typ mostu používá odlišný způsob jak zabránit cenzuře.  Obfs mosty dělají z vašich dat náhodný šum a meek mosty vytvářejí dojem, že se připojujete k dané službě a ne k Toru.">
diff --git a/src/chrome/locale/da/torlauncher.properties b/src/chrome/locale/da/torlauncher.properties
index a036c91..c959ed1 100644
--- a/src/chrome/locale/da/torlauncher.properties
+++ b/src/chrome/locale/da/torlauncher.properties
@@ -6,10 +6,10 @@ torlauncher.error_title=Tor starter
torlauncher.tor_exited_during_startup=Tor lukkede under opstart. Det kan skyldes en fejl i din torrc-fil, en fejl i Tor eller et andet program på dit system, eller hardwarefejl. Tor Browser vil ikke starte, før du løser det underliggende problem og genstarter Tor.
torlauncher.tor_exited=Tor lukkede uventet. Dette kan skyldes en fejl i selve Tor, et andet program i dit system eller en hardware-fejl. Tor Browser vil ikke være i stand til at forbinde til noget som helst websted før du genstarter Tor. Send en kopi af din Tor-log til support-teamet hvis problemet fortsætter.
torlauncher.tor_exited2=Fanebladene i din browser vil ikke blive lukket ved af at du genstarter Tor.
-torlauncher.tor_controlconn_failed=Kunne ikke forbinde til Tor kontrol-porten.
+torlauncher.tor_controlconn_failed=Kunne ikke oprette forbindelse til Tor kontrol-porten.
torlauncher.tor_failed_to_start=Tor kunne ikke starte.
torlauncher.tor_control_failed=Det lykkedes ikke at tage kontrol over Tor.
-torlauncher.tor_bootstrap_failed=Tor kunne ikke etablere forbindelse til Tor-netværket
+torlauncher.tor_bootstrap_failed=Tor kunne ikke etablere en forbindelse til Tor-netværket.
torlauncher.tor_bootstrap_failed_details=%1$S fejlede (%2$S).
torlauncher.unable_to_start_tor=Kan ikke starte Tor.\n\n%S
@@ -18,8 +18,8 @@ torlauncher.torrc_missing=torrc-filen mangler og kunne ikke dannes.
torlauncher.datadir_missing=Tor-datamappen findes ikke og kunne ikke dannes.
torlauncher.password_hash_missing=Kunne ikke finde hash-værdi af adgangskode.
-torlauncher.failed_to_get_settings=Kunne ikke læse Tor indstillingerne..⏎\n⏎\n%S
-torlauncher.failed_to_save_settings=Kunne ikke gemme Tor indstillingerne.⏎\n⏎\n%S
+torlauncher.failed_to_get_settings=Kan ikke hente Tor-indstillingerne..\n\n%S
+torlauncher.failed_to_save_settings=Kan ikke gemme Tor-indstillingerne.\n\n%S
torlauncher.ensure_tor_is_running=Kontroller venligst at Tor kører.
torlauncher.error_proxy_addr_missing=Du skal angive både IP adresse eller værts navn og en port, for at konfigurere Tor til at bruge en proxy som forbindelse til internettet.
diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd
index eacb515..a5b525b 100644
--- a/src/chrome/locale/el/network-settings.dtd
+++ b/src/chrome/locale/el/network-settings.dtd
@@ -9,7 +9,7 @@
<!-- For "first run" wizard: -->
-<!ENTITY torSettings.connectPrompt "Πατήστε "Σύνδεση" για να συνδεθείτε στο Tor">
+<!ENTITY torSettings.connectPrompt "Πατήστε "Σύνδεση" για να συνδεθείτε στο Tor.">
<!ENTITY torSettings.configurePrompt "Πατήστε "Ρύθμιση" για να προσαρμόσετε τις ρυθμίσεις δικτύου αν βρίσκεστε σε χώρα που αποκλείει το Tor (όπως η Αίγυπτος, η Κίνα, η Τουρκία) ή αν συνδέεστε από προσωπικό δίκτυο που χρειάζεται διακομιστή μεσολάβησης.">
<!ENTITY torSettings.configure "Ρύθμιση ">
<!ENTITY torSettings.connect "Σύνδεση">
@@ -39,14 +39,14 @@
<!ENTITY torsettings.firewall.checkbox "Το τείχος προστασίας μου με αφήνει να συνδέομαι μόνο σε συγκεκριμένες θύρες συστήματος">
<!ENTITY torsettings.firewall.allowedPorts "Επιτρεπόμενες Θύρες:">
<!ENTITY torsettings.useBridges.checkbox "Ο Tor είναι αποκλεισμένος στη χώρα μου">
-<!ENTITY torsettings.useBridges.default "Επιλέξτε μία ενταγμένη γέφυρα">
-<!ENTITY torsettings.useBridges.default.placeholder "Επιλέξτε μία γέφυρα">
-<!ENTITY torsettings.useBridges.bridgeDB "Αιτηθείτε μίας γέφυρας από το torproject.org">
+<!ENTITY torsettings.useBridges.default "Επιλέξτε ένα ενταγμένο bridge">
+<!ENTITY torsettings.useBridges.default.placeholder "Επιλέξτε ένα bridge">
+<!ENTITY torsettings.useBridges.bridgeDB "Αιτηθείτε ενός bridge από το torproject.org">
<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Πληκτρολογήστε τους χαρακτήρες της εικόνας">
<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Πάρτε μία νέα πρόκληση.">
<!ENTITY torsettings.useBridges.captchaSubmit "Υποβολή">
-<!ENTITY torsettings.useBridges.custom "Δώστε μου μία γέφυρα που να την γνωρίζω">
-<!ENTITY torsettings.useBridges.label "Συμπληρώστε πληροφορίες γέφυρας από έγκυρη πηγή">
+<!ENTITY torsettings.useBridges.custom "Δώστε μου ένα bridge που να το γνωρίζω">
+<!ENTITY torsettings.useBridges.label "Συμπληρώστε πληροφορίες bridge από έγκυρη πηγή.">
<!ENTITY torsettings.useBridges.placeholder "πληκτρολογήστε διεύθυνση:πύλη (μία σε κάθε σειρά)">
<!ENTITY torsettings.copyLog "Αντιγραφή στο πρόχειρο">
@@ -55,8 +55,8 @@
<!ENTITY torsettings.proxyHelp1 "Ο τοπικός διακομιστής μεσολάβησης μπορεί να χρειαστεί, όταν συνδέεστε από μία εταιρία, ένα σχολείο ή ένα δίκτυο πανεπιστημίου. Αν δεν είστε σίγουρος αν χρειάζεστε διακομιστή μεσολάβησης, ελέγξτε τις ρυθμίσεις ίντερνετ ενός άλλου περιηγητή ή τις ρυθμίσεις του δικτύου συστήματος. ">
<!ENTITY torsettings.bridgeHelpTitle "Γεφυρες αναμεταδοτων Βοηθεια">
-<!ENTITY torsettings.bridgeHelp1 "Οι γέφυρες είναι μη καταχωρημένες διευθύνσεις που κάνουν πιο δύσκολο τον αποκλεισμό της σύνδεσης στο δίκτυο Tor.  Κάθε τύπος γέφυρας χρησιμοποιεί διαφορετική μέθοδο για να αποφύγει τον αποκλεισμό.  Οι obfs κάνουν τις κινήσεις σας να μοιάζουν με τυχαίο ήχο και οι meek κάνουν τις συνδέσεις σας να μοιάζουν πως γίνονται μέσω της αντίστοιχης υπηρεσίας αντί του Tor.">
-<!ENTITY torsettings.bridgeHelp2 "Λόγω του τρόπου που προσπαθούν κάποιες χώρες να αποκλείσουν το Tor, κάποιες γέφυρες λειτουργούν σε κάποιες χώρες, ενώ άλλες όχι.  Αν δεν είστε σίγουρος για το ποιες γέφυρες λειτουργούν στη χώρα σας, επισκεφτείτε το torproject.org/about/contact.html#support">
+<!ENTITY torsettings.bridgeHelp1 "Τα bridges είναι μη καταχωρημένες διευθύνσεις που κάνουν πιο δύσκολο τον αποκλεισμό της σύνδεσης στο δίκτυο Tor.  Κάθε τύπος γέφυρας χρησιμοποιεί διαφορετική μέθοδο για να αποφύγει τον αποκλεισμό.  Οι obfs κάνουν τις κινήσεις σας να μοιάζουν με τυχαίο ήχο και οι meek κάνουν τις συνδέσεις σας να μοιάζουν πως γίνονται μέσω της αντίστοιχης υπηρεσίας αντί του Tor.">
+<!ENTITY torsettings.bridgeHelp2 "Λόγω του τρόπου που προσπαθούν κάποιες χώρες να αποκλείσουν το Tor, κάποια bridges λειτουργούν σε κάποιες χώρες, ενώ σε άλλες όχι.  Αν δεν είστε σίγουρος για το ποια bridges λειτουργούν στη χώρα σας, επισκεφτείτε το torproject.org/about/contact.html#support">
<!-- Progress -->
<!ENTITY torprogress.pleaseWait "Παρακαλώ περιμένετε καθώς δημιουργούμε σύνδεση στο δίκτυο Tor.  Αυτό μπορεί να πάρει μερικά λεπτά.">
diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties
index 365318a..31ffb6a 100644
--- a/src/chrome/locale/es/torlauncher.properties
+++ b/src/chrome/locale/es/torlauncher.properties
@@ -25,7 +25,7 @@ torlauncher.ensure_tor_is_running=Por favor, asegúrese de que Tor se está ejec
torlauncher.error_proxy_addr_missing=Tiene que especificar tanto una dirección IP o nombre de máquina ('hostname') como un número de puerto para configurar Tor para que utilice un 'proxy' para acceder a la Internet.
torlauncher.error_proxy_type_missing=Debe seleccionar el tipo de 'proxy'.
torlauncher.error_bridges_missing=Debe especificar uno o más puentes ('bridges').
-torlauncher.error_default_bridges_type_missing=Debe seleccionar un tipo de transporte para los repetidores puente ('bridges') proporcionados.
+torlauncher.error_default_bridges_type_missing=Debes seleccionar un tipo de transporte para los repetidores puente ('bridges') proporcionados.
torlauncher.error_bridgedb_bridges_missing=Por favor solicita un puente.
torlauncher.error_bridge_bad_default_type=No hay disponible ningún repetidor puente proporcionado que tenga el tipo de transporte %S. Por favor ajuste sus preferencias.
diff --git a/src/chrome/locale/fa/torlauncher.properties b/src/chrome/locale/fa/torlauncher.properties
index 533c491..169d5e2 100644
--- a/src/chrome/locale/fa/torlauncher.properties
+++ b/src/chrome/locale/fa/torlauncher.properties
@@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=شما میبایست یک آدرس آی پ
torlauncher.error_proxy_type_missing=شما باید نوع پراکسی را انتخاب کنید.
torlauncher.error_bridges_missing=شما باید یک یا پل های بیشتری را مشخص کنید.
torlauncher.error_default_bridges_type_missing=نوع انتقال باید برای پلها مشخص گردد.
-torlauncher.error_bridgedb_bridges_missing=Please request a bridge.
+torlauncher.error_bridgedb_bridges_missing=لطفا یک پل درخواست کنید.
torlauncher.error_bridge_bad_default_type=هیچ پلی از نوع %S موجود نیست. لطفا تنظیمات را اصلاح کنید.
-torlauncher.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
+torlauncher.bridge_suffix.meek-amazon=(در چین کار میکند)
+torlauncher.bridge_suffix.meek-azure=(در چین کار میکند)
-torlauncher.request_a_bridge=Request a Bridge…
-torlauncher.request_a_new_bridge=Request a New Bridge…
+torlauncher.request_a_bridge=درخواست یک پل...
+torlauncher.request_a_new_bridge=درخواست یک پل جدید...
torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait.
-torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge.
-torlauncher.bad_captcha_solution=The solution is not correct. Please try again.
+torlauncher.captcha_prompt=برای درخواست یک پل کپچا را حل کنید.
+torlauncher.bad_captcha_solution=راه حل درست نیست. لطفا دوباره تلاش کنید.
torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S
torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges.
-torlauncher.no_bridges_available=No bridges are available at this time. Sorry.
+torlauncher.no_bridges_available=متاسفم. در حال حاضر هیچ کدام از پلها در دسترس نیستند.
torlauncher.connect=اتصال
torlauncher.restart_tor=تور را ریستارت کنید.
@@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=نبود مسیر به میزبان
torlauncher.bootstrapWarning.ioerror=خطای خواندن/نوشتن
torlauncher.bootstrapWarning.pt_missing=انتقال جایگزین مفقود است.
-torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost.
-torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server.
-torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy.
+torlauncher.nsresult.NS_ERROR_NET_RESET=ارتباط با کارساز از دست رفت.
+torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=اتصال به کارساز امکان پذیر نمیباشد.
+torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=اتصال به پروکسی امکان پذیر نمیباشد.
diff --git a/src/chrome/locale/gu/torlauncher.properties b/src/chrome/locale/gu/torlauncher.properties
index 0f0bdee..f6bc2fe 100644
--- a/src/chrome/locale/gu/torlauncher.properties
+++ b/src/chrome/locale/gu/torlauncher.properties
@@ -44,7 +44,7 @@ torlauncher.no_bridges_available=No bridges are available at this time. Sorry.
torlauncher.connect=Connect
torlauncher.restart_tor=Restart Tor
torlauncher.quit=Quit
-torlauncher.quit_win=Exit
+torlauncher.quit_win=બહાર નીકળો
torlauncher.done=થઈ ગયું
torlauncher.forAssistance=For assistance, contact %S
diff --git a/src/chrome/locale/hr-HR/network-settings.dtd b/src/chrome/locale/hr-HR/network-settings.dtd
index 2c0ffd8..e4dc474 100644
--- a/src/chrome/locale/hr-HR/network-settings.dtd
+++ b/src/chrome/locale/hr-HR/network-settings.dtd
@@ -1,7 +1,7 @@
<!ENTITY torsettings.dialog.title "Postavke Tor mreže">
-<!ENTITY torsettings.wizard.title.default "Connect to Tor">
+<!ENTITY torsettings.wizard.title.default "Poveži se na Tor">
<!ENTITY torsettings.wizard.title.configure "Postavke Tor mreže">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
+<!ENTITY torsettings.wizard.title.connecting "Uspostavljanje veze">
<!-- For locale picker: -->
<!ENTITY torlauncher.localePicker.title "Jezik Tor Browsera">
@@ -9,8 +9,8 @@
<!-- For "first run" wizard: -->
-<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor.">
-<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy.">
+<!ENTITY torSettings.connectPrompt "Kliknite "Spoji" kako biste se spojili na Tor.">
+<!ENTITY torSettings.configurePrompt "Kliknite "Podesi" kako biste promijenili postavke mreže ako ste u državi koja cenzurira Tor (kao Egipat, Kina, Turska) ili ako se spajate preko privatne mreže za koju je potreban proxy.">
<!ENTITY torSettings.configure "Podesi">
<!ENTITY torSettings.connect "Spoji">
@@ -25,9 +25,9 @@
<!ENTITY torsettings.optional "Opcionalno">
-<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
+<!ENTITY torsettings.useProxy.checkbox "Koristim proxy za spajanje na Internet">
<!ENTITY torsettings.useProxy.type "Tip proxya:">
-<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
+<!ENTITY torsettings.useProxy.type.placeholder "odaberite tip proxya">
<!ENTITY torsettings.useProxy.address "Adresa:">
<!ENTITY torsettings.useProxy.address.placeholder "IP adresa ili hostname">
<!ENTITY torsettings.useProxy.port "Port:">
@@ -38,21 +38,21 @@
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
<!ENTITY torsettings.firewall.checkbox "Ovo računalo je iza vatrozida koji dopušta spajanje samo na određene portove">
<!ENTITY torsettings.firewall.allowedPorts "Dozvoljeni portovi:">
-<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
-<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
-<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
-<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org">
-<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image">
-<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge">
-<!ENTITY torsettings.useBridges.captchaSubmit "Predaj">
-<!ENTITY torsettings.useBridges.custom "Provide a bridge I know">
-<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source.">
-<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)">
+<!ENTITY torsettings.useBridges.checkbox "Tor je cenzuriran u mojoj državi">
+<!ENTITY torsettings.useBridges.default "Odaberite ugrađeni most">
+<!ENTITY torsettings.useBridges.default.placeholder "odaberite most">
+<!ENTITY torsettings.useBridges.bridgeDB "Zatražite most od torproject.org">
+<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Unesite znakove sa slike">
+<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Dobij novi izazov">
+<!ENTITY torsettings.useBridges.captchaSubmit "Pošalji">
+<!ENTITY torsettings.useBridges.custom "Pruži mi most koji poznajem">
+<!ENTITY torsettings.useBridges.label "Unesite informacije o mostu iz povjerenog izvora">
+<!ENTITY torsettings.useBridges.placeholder "vrsta adresa:port (jedan po liniji)">
<!ENTITY torsettings.copyLog "Kopiraj Tor zapisnik u međuspremnik">
-<!ENTITY torsettings.proxyHelpTitle "Proxy Help">
-<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings.">
+<!ENTITY torsettings.proxyHelpTitle "Pomoć s proxyem">
+<!ENTITY torsettings.proxyHelp1 "Ako se povezujete kroz mrežu tvrtke, škole ili sveučilišta moguće je da će vam trebati lokalni proxy. Ako niste sigurni treba li vam proxy, pregledajte postavke interneta u drugom pregledniku ili provjerite postavke mreže Vašeg sistema.">
<!ENTITY torsettings.bridgeHelpTitle "Pomoć za releje mostove">
<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor.">
diff --git a/src/chrome/locale/hr/network-settings.dtd b/src/chrome/locale/hr/network-settings.dtd
index 1c89cc2..6783163 100644
--- a/src/chrome/locale/hr/network-settings.dtd
+++ b/src/chrome/locale/hr/network-settings.dtd
@@ -1,60 +1,60 @@
-<!ENTITY torsettings.dialog.title "Postavke Tor Mreže">
+<!ENTITY torsettings.dialog.title "Postavke Tor mreže">
<!ENTITY torsettings.wizard.title.default "Spoji se na Tor">
-<!ENTITY torsettings.wizard.title.configure "Postavke Tor Mreže">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
+<!ENTITY torsettings.wizard.title.configure "Postavke Tor mreže">
+<!ENTITY torsettings.wizard.title.connecting "Uspostavljanje veze">
<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Tor Browser Language">
-<!ENTITY torlauncher.localePicker.prompt "Please select a language.">
+<!ENTITY torlauncher.localePicker.title "Jezik Tor preglednika">
+<!ENTITY torlauncher.localePicker.prompt "Odaberite jezik">
<!-- For "first run" wizard: -->
-<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor.">
-<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy.">
-<!ENTITY torSettings.configure "Konfiguriraj">
+<!ENTITY torSettings.connectPrompt "Za povezivanje s Tor-om kliknite "Poveži se"">
+<!ENTITY torSettings.configurePrompt "Ako ste u zemlji koja cenzurira Tor (kao Egipat, Kina, Turska) ili ste spojeni preko privatne mreže za koju je potrebno proxy, kliknite "Podesi" kako biste promijenili postavke mreže.">
+<!ENTITY torSettings.configure "Podesi">
<!ENTITY torSettings.connect "Poveži se">
<!-- Other: -->
-<!ENTITY torsettings.startingTor "Waiting for Tor to start…">
-<!ENTITY torsettings.restartTor "Restart Tor">
-<!ENTITY torsettings.reconfigTor "Reconfigure">
+<!ENTITY torsettings.startingTor "Čekanje na pokretanje Tor-a…">
+<!ENTITY torsettings.restartTor "Ponovno pokreni Tor">
+<!ENTITY torsettings.reconfigTor "Ponovno podesi">
<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
-<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
+<!ENTITY torsettings.discardSettings.proceed "Obriši postavke i poveži se">
-<!ENTITY torsettings.optional "Optional">
+<!ENTITY torsettings.optional "Neobavezno">
-<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
-<!ENTITY torsettings.useProxy.type "Proxy Type:">
-<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
+<!ENTITY torsettings.useProxy.checkbox "Koristim proxy za spajanje na internet">
+<!ENTITY torsettings.useProxy.type "Tip proxy-a:">
+<!ENTITY torsettings.useProxy.type.placeholder "odaberite tip proxy-a">
<!ENTITY torsettings.useProxy.address "Adresa:">
-<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">
-<!ENTITY torsettings.useProxy.port "Priključak:">
+<!ENTITY torsettings.useProxy.address.placeholder "IP adresa ili poslužitelj">
+<!ENTITY torsettings.useProxy.port "Port:">
<!ENTITY torsettings.useProxy.username "Korisničko ime:">
<!ENTITY torsettings.useProxy.password "Lozinka:">
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
-<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
-<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
-<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
-<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
-<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org">
-<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image">
-<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge">
-<!ENTITY torsettings.useBridges.captchaSubmit "Unesi">
-<!ENTITY torsettings.useBridges.custom "Provide a bridge I know">
-<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source.">
-<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)">
-
-<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
-
-<!ENTITY torsettings.proxyHelpTitle "Proxy Help">
-<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings.">
-
-<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
+<!ENTITY torsettings.firewall.checkbox "Ovo raučunalo ide kroz vatrozid koji dozvoljava veze samo preko pojedinih portova.">
+<!ENTITY torsettings.firewall.allowedPorts "Dopušteni portovi:">
+<!ENTITY torsettings.useBridges.checkbox "Tor je cenzuriran u mojoj zemlji">
+<!ENTITY torsettings.useBridges.default "Odaberite ugrađeni most">
+<!ENTITY torsettings.useBridges.default.placeholder "odaberite most">
+<!ENTITY torsettings.useBridges.bridgeDB "Zatražite most od torproject.org">
+<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Unesite znakove sa slike">
+<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Dobijte novi izazov">
+<!ENTITY torsettings.useBridges.captchaSubmit "Pošalji">
+<!ENTITY torsettings.useBridges.custom "Pružaj mi most koji poznajem">
+<!ENTITY torsettings.useBridges.label "Unesite informacije o mostu sa pouzdanog izvora.">
+<!ENTITY torsettings.useBridges.placeholder "tip adresa:port (jedna po retku)">
+
+<!ENTITY torsettings.copyLog "Kopiraj Tor zapisnik u međuspremnik">
+
+<!ENTITY torsettings.proxyHelpTitle "Pomoć s proxy-em">
+<!ENTITY torsettings.proxyHelp1 "Ako se povezujete kroz mrežu tvrtke, škole ili sveučilišta moguće je da će vam trebati lokalni proxy. Ako niste sigurni treba li vam proxy, pregledajte postavke interneta u drugom pregledniku ili provjerite postavke mreže Vašeg sistema.">
+
+<!ENTITY torsettings.bridgeHelpTitle "Pomoć s mostovima">
<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor.">
<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">
diff --git a/src/chrome/locale/hr/torlauncher.properties b/src/chrome/locale/hr/torlauncher.properties
index c6143af..1424083 100644
--- a/src/chrome/locale/hr/torlauncher.properties
+++ b/src/chrome/locale/hr/torlauncher.properties
@@ -3,12 +3,12 @@
torlauncher.error_title=Tor Launcher
-torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start.
-torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
-torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
-torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
-torlauncher.tor_failed_to_start=Tor failed to start.
-torlauncher.tor_control_failed=Failed to take control of Tor.
+torlauncher.tor_exited_during_startup=Tor je prekinut tijekom pokretanja. Ovo može biti zbog pogreške u vašoj torrc datoteci, pogreške u Tor-u ili u drugom programu na vašem sistemu, ili zbog neispravnog hardvera. Dok ne riješite temeljni problem i ponovno pokrenete Tor, Tor preglednik se neće pokrenuti.
+torlauncher.tor_exited=Tor je neočekivano prekinut. To može biti zbog greške u samom Tor-u, drugom programu na vašem sistemu ili zbog neispravnog hardvera. Dok ponovno ne pokrenete Tor, Tor preglednik neće moči pristupiti web stranicama. Ako se problem nastavi, pošaljite kopiju vašeg Tor zapisnika timu za podršku.
+torlauncher.tor_exited2=Ponovno pokretanje Tor-a neće zatvoriti vaše kartice preglednika.
+torlauncher.tor_controlconn_failed=Povezivanje na kontrolni port Tor-a nije uspjelo.
+torlauncher.tor_failed_to_start=Pokretanje Tor-a nije uspjelo.
+torlauncher.tor_control_failed=Uzimanje kontrole nad Tor-om nije uspjelo
torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -42,7 +42,7 @@ torlauncher.no_meek=This browser is not configured for meek, which is needed to
torlauncher.no_bridges_available=No bridges are available at this time. Sorry.
torlauncher.connect=Poveži se
-torlauncher.restart_tor=Restart Tor
+torlauncher.restart_tor=Ponovno pokreni Tor
torlauncher.quit=Izlaz
torlauncher.quit_win=Izlaz
torlauncher.done=Gotovo
diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd
index 4a51455..25d2d09 100644
--- a/src/chrome/locale/ja/network-settings.dtd
+++ b/src/chrome/locale/ja/network-settings.dtd
@@ -11,7 +11,7 @@
<!ENTITY torSettings.connectPrompt "「接続」をクリックすると Tor に接続します。">
<!ENTITY torSettings.configurePrompt "Tor による通信を検閲する国（エジプト、中国、トルコ等）にいる場合やプロキシを要求するプライベートネットワークから接続する場合、「設定」をクリックしてネットワーク設定を調整します。">
-<!ENTITY torSettings.configure "構成">
+<!ENTITY torSettings.configure "設定">
<!ENTITY torSettings.connect "接続">
<!-- Other: -->
@@ -52,7 +52,7 @@
<!ENTITY torsettings.copyLog "Torのログをクリップボードにコピー">
<!ENTITY torsettings.proxyHelpTitle "プロキシヘルプ">
-<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings.">
+<!ENTITY torsettings.proxyHelp1 "会社、学校、大学等のネットワークを通して接続する場合、ローカルプロクシが必要になる場合があります。 プロクシが必要であるかどうかわからない場合は、他のブラウザのインターネット設定を見るか、システムのネットワーク設定を確認してください。">
<!ENTITY torsettings.bridgeHelpTitle "ブリッジリレーのヘルプ">
<!ENTITY torsettings.bridgeHelp1 "ブリッジとはTorネットワークへの接続をブロックすることを難しくするためのリストされていないリレーです。  それぞれの種類のブリッジは検閲を避けるための異なる手法を利用しています。  obfsのものはあなたのトラフィックをランダムなノイズのように見せかけ，meekのものはあなたのトラフィックをTorではなくそのサービスへの接続であるように見せかけます。">
diff --git a/src/chrome/locale/ka/network-settings.dtd b/src/chrome/locale/ka/network-settings.dtd
index 72017f1..e1b18ac 100644
--- a/src/chrome/locale/ka/network-settings.dtd
+++ b/src/chrome/locale/ka/network-settings.dtd
@@ -49,7 +49,7 @@
<!ENTITY torsettings.useBridges.label "გადამცემი ხიდის მონაცემების მითითება სანდო წყაროდან.">
<!ENTITY torsettings.useBridges.placeholder "აკრიფეთ მისამართი:პორტი (თითო ცალკე ხაზზე)">
-<!ENTITY torsettings.copyLog "Tor-ის აღრიცხვის ჩანაწერების დაკოპირება">
+<!ENTITY torsettings.copyLog "Tor-ის აღრიცხვის ჩანაწერების ასლი">
<!ENTITY torsettings.proxyHelpTitle "პროქსი — დახმარება">
<!ENTITY torsettings.proxyHelp1 "ადგილობრივი პროქსი მაშინაა საჭირო, როცა ინტერნეტს უკავშირდებით კომპანიის, სკოლის ან უნივერსიტეტის ქსელის გავლით. თუ დარწმუნებული არ ხართ პროქსის საჭიროებაში, გადახედეთ ინტერნეტის პარამეტრებს სხვა ბრაუზერში ან იხილეთ სისტემის ქსელის პარამეტრები.">
diff --git a/src/chrome/locale/ka/torlauncher.properties b/src/chrome/locale/ka/torlauncher.properties
index 48a7acf..457c46f 100644
--- a/src/chrome/locale/ka/torlauncher.properties
+++ b/src/chrome/locale/ka/torlauncher.properties
@@ -50,7 +50,7 @@ torlauncher.done=შესრულებულია
torlauncher.forAssistance=დახმარებისთვის დაუკავშირდით %S
torlauncher.forAssistance2=დახმარებისთვის ეწვიეთ %S
-torlauncher.copiedNLogMessages=დაკოპირება დასრულებულია. %S Tor-ის აღრიცხვის ჩანაწერები მზადაა ტექსტურ რედაქტორში ან ელფოსტის წერილში ჩასასმელად.
+torlauncher.copiedNLogMessages=ასლის აღება დასრულებულია. %S Tor-ის აღრიცხვის ჩანაწერები მზადაა ტექსტურ რედაქტორში ან ელფოსტის წერილში ჩასასმელად.
torlauncher.bootstrapStatus.conn_dir=გადამცემთა ცნობართან დაკავშირება
torlauncher.bootstrapStatus.handshake_dir=დაშიფრული კავშირის დამყარება ცნობართან
@@ -68,7 +68,7 @@ torlauncher.bootstrapWarning.connectrefused=კავშირი უარყ
torlauncher.bootstrapWarning.misc=სხვადასხვა
torlauncher.bootstrapWarning.resourcelimit=არასაკმარისი რესურსები
torlauncher.bootstrapWarning.identity=მოწმობა არ ემთხვევა
-torlauncher.bootstrapWarning.timeout=კავშირის ვადა
+torlauncher.bootstrapWarning.timeout=კავშირის დაყოვნება
torlauncher.bootstrapWarning.noroute=მისამართი არაა აღნიშნული
torlauncher.bootstrapWarning.ioerror=წაკითხვა/ჩაწერის შეცდომა
torlauncher.bootstrapWarning.pt_missing=მისაერთებელი გადამყვანი ვერ მოიძებნა
diff --git a/src/chrome/locale/mk/network-settings.dtd b/src/chrome/locale/mk/network-settings.dtd
index 6885070..7a258c5 100644
--- a/src/chrome/locale/mk/network-settings.dtd
+++ b/src/chrome/locale/mk/network-settings.dtd
@@ -1,7 +1,7 @@
<!ENTITY torsettings.dialog.title "Tor мрежни поставки">
<!ENTITY torsettings.wizard.title.default "Поврзи се на Tor">
<!ENTITY torsettings.wizard.title.configure "Tor мрежни поставки">
-<!ENTITY torsettings.wizard.title.connecting "Воспоставување на конекција">
+<!ENTITY torsettings.wizard.title.connecting "Воспоставување на поврзување">
<!-- For locale picker: -->
<!ENTITY torlauncher.localePicker.title "Tor Browser јазик">
@@ -9,19 +9,19 @@
<!-- For "first run" wizard: -->
-<!ENTITY torSettings.connectPrompt "Кликнете "Конектирај" да се конектирате на Tor.">
-<!ENTITY torSettings.configurePrompt "Кликни на "Постави" да ги поставите мрежните поставки ако сте во земја која го цензурира Tor (како Египет, Кина, Турција) или ако се поврзувате од приватна мрежа која бара прокси.">
-<!ENTITY torSettings.configure "Постави">
-<!ENTITY torSettings.connect "Конектирај">
+<!ENTITY torSettings.connectPrompt "Кликнете "Поврзи" да се поврзете на Tor.">
+<!ENTITY torSettings.configurePrompt "Кликни на "Конфигурирај" да ги конфигурирате мрежните поставки ако сте во земја која го цензурира Tor (како Египет, Кина, Турција) или ако се поврзувате од приватна мрежа која бара прокси.">
+<!ENTITY torSettings.configure "Конфигурирај">
+<!ENTITY torSettings.connect "Поврзи">
<!-- Other: -->
<!ENTITY torsettings.startingTor "Почекај за стартување на Tor...">
-<!ENTITY torsettings.restartTor "Повторно стартување на Tor">
-<!ENTITY torsettings.reconfigTor "Промени поставки">
+<!ENTITY torsettings.restartTor "Рестартирај го Tor">
+<!ENTITY torsettings.reconfigTor "Пре-конфигурирај">
-<!ENTITY torsettings.discardSettings.prompt "Имате поставено Tor мостови или имате внесено локални прокси поставки.  Директно да се поврзете на Tor мрежата, овие поставки мораат да бидат избришани.">
-<!ENTITY torsettings.discardSettings.proceed "Избриши ги поставките и конектирај се">
+<!ENTITY torsettings.discardSettings.prompt "Имате конфигурирано Tor мостови или имате внесено локални прокси поставки.  За директно да се поврзете на Tor мрежата, овие поставки мораат да бидат избришани.">
+<!ENTITY torsettings.discardSettings.proceed "Избриши ги поставките и поврзи се">
<!ENTITY torsettings.optional "Опционално">
@@ -36,15 +36,15 @@
<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
-<!ENTITY torsettings.firewall.checkbox "Овој компјутер оди преку заштитен ѕид кој дозволува конекции до одредени порти">
+<!ENTITY torsettings.firewall.checkbox "Овој компјутер оди преку заштитен ѕид кој дозволува поврзувања до одредени порти">
<!ENTITY torsettings.firewall.allowedPorts "Дозволени порти:">
<!ENTITY torsettings.useBridges.checkbox "Tor е цензуриран во мојата држава">
<!ENTITY torsettings.useBridges.default "Одбери вграден мост">
<!ENTITY torsettings.useBridges.default.placeholder "одбери мост">
-<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org">
-<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image">
-<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge">
-<!ENTITY torsettings.useBridges.captchaSubmit "Submit">
+<!ENTITY torsettings.useBridges.bridgeDB "Барање за мост од torproject.org">
+<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Внесете ги карактерите од сликата">
+<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Пробајте нов предизвик">
+<!ENTITY torsettings.useBridges.captchaSubmit "Испрати">
<!ENTITY torsettings.useBridges.custom "Обезбеди мост кој го знам">
<!ENTITY torsettings.useBridges.label "Внесете информации за мост од доверлив извор.">
<!ENTITY torsettings.useBridges.placeholder "внеси адреса:порта (по една во секој ред)">
@@ -52,11 +52,11 @@
<!ENTITY torsettings.copyLog "Копирај го Tor логот за залепување">
<!ENTITY torsettings.proxyHelpTitle "Прокси помош">
-<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings.">
+<!ENTITY torsettings.proxyHelp1 "Може да ви биде потребно локално прокси кога се поврзувате преку мрежа на компанија, училиште, или универзитет. Ако не сте сигурни дали е потребно прокси, погледнете во Интернет поставки во друг прелистувач или проверете ги мрежните поставки на системот.">
-<!ENTITY torsettings.bridgeHelpTitle "Мост јазол помош">
-<!ENTITY torsettings.bridgeHelp1 "Мостовите се неизлистани јазли кои го прават потешко блокирањето на врските кон Tor мрежата.  Секој тип на мост користи различен метод за избегнување на цензурирањето.  obfs мостот го прави протокот на информации да изгледа нормален, како да е од некој стандарден прелистувач наместо од Tor.">
-<!ENTITY torsettings.bridgeHelp2 "Поради колку конкретно државите се обидуваат да го блокираат Tor, конкретни мостови работат во едни конкретни држави но не и во други.  Ако не си сигурен кои мостови работат во твојата држава, посети torproject.org/about/contact.html#support">
+<!ENTITY torsettings.bridgeHelpTitle "Помош за мост реле">
+<!ENTITY torsettings.bridgeHelp1 "Мостовите се неизлистани релеа кои го прават потешко блокирањето на поврзувањата кон Tor мрежата.  Секој тип на мост користи различен метод за избегнување на цензурирањето.  obfs мостот го прави протокот на информации да изгледа нормален, како да е од некој стандарден прелистувач наместо од Tor.">
+<!ENTITY torsettings.bridgeHelp2 "Поради тоа колку конкретно државите се обидуваат да го блокираат Tor, конкретни мостови работат во едни конкретни држави но не и во други.  Ако не си сигурен кои мостови работат во твојата држава, посети torproject.org/about/contact.html#support">
<!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Ве молиме почекајте додека се воспостави конекција со Тор мрежата.  Ова може да потрае неколку минути.">
+<!ENTITY torprogress.pleaseWait "Ве молиме почекајте додека се воспостави поврзувањето со Тор мрежата.  Ова може да потрае неколку минути.">
diff --git a/src/chrome/locale/mk/torlauncher.properties b/src/chrome/locale/mk/torlauncher.properties
index 8b065d3..8dfecbb 100644
--- a/src/chrome/locale/mk/torlauncher.properties
+++ b/src/chrome/locale/mk/torlauncher.properties
@@ -3,13 +3,13 @@
torlauncher.error_title=Tor стартувач
-torlauncher.tor_exited_during_startup=Tor се исклучи за време на вклучувањето. Ова може да е поради грашка во вашата torrc датотека, грешка во Tor или друга програма во вашиот систем, или проблем со хардеверот. Додека не го поправите проблемот кој го предизвикува ова, и повторно не го вклучите Tor, Tor Browser нема да се стартува.
-torlauncher.tor_exited=Tor неочекувано се исклучи. Ова може да е до грешка во самиот Tor, друга програма во системот, или проблем со хардверот. Додека повторно го стартувате Tor, Tor Browser нема да може да ја отвори било која веб страна. Ако проблемот остане, ве молиме испратете копија од вашиот Tor лог на тимот за поддршка.
-torlauncher.tor_exited2=Повротното старување на Tor нема да ви ги затвори табовите во вашиот прелистувач.
-torlauncher.tor_controlconn_failed=Не може да се конектира на Tor контролната порта.
+torlauncher.tor_exited_during_startup=Tor се исклучи за време на вклучувањето. Ова може да е поради грашка во вашата torrc датотека, грешка во Tor или друга програма во вашиот систем, или проблем со хардеверот. Додека не го поправите проблемот кој го предизвикува ова, и не го рестартирате Tor, Tor Browser нема да се стартува.
+torlauncher.tor_exited=Tor неочекувано се исклучи. Ова може да е до грешка во самиот Tor, друга програма во системот, или проблем со хардверот. Додека не го рестартирате Tor, Tor Browser нема да може да ја отвори било која веб страна. Ако проблемот остане, ве молиме испратете копија од вашиот Tor лог на тимот за поддршка.
+torlauncher.tor_exited2=Рестартирањето на Tor нема да ви ги затвори табовите во вашиот прелистувач.
+torlauncher.tor_controlconn_failed=Не може да се поврзе на Tor контролната порта.
torlauncher.tor_failed_to_start=Tor не успеа да се стартува.
torlauncher.tor_control_failed=Не успеа да преземе контрола врз Tor.
-torlauncher.tor_bootstrap_failed=Tor не успеа да воспостави конекција со Tor мрежата.
+torlauncher.tor_bootstrap_failed=Tor не успеа да воспостави поврзување со Tor мрежата.
torlauncher.tor_bootstrap_failed_details=%1$S не успеаа (%2$S).
torlauncher.unable_to_start_tor=Не може да се стартува Tor.\n\n%S
@@ -22,27 +22,27 @@ torlauncher.failed_to_get_settings=Невозможно е да се добиј
torlauncher.failed_to_save_settings=Невозможно е да се зачуваат Tor поставките.\n\n%S
torlauncher.ensure_tor_is_running=Проверете дали Tor е вклучен.
-torlauncher.error_proxy_addr_missing=Мора да ги посочите и IP адресите или хостовите и бројот на портата за да го поставите Tor да користи прокси за пристап на Интернет.
+torlauncher.error_proxy_addr_missing=Мора да ги посочите и IP адресите или хостовите и бројот на портата за да го конфигурирате Tor да користи прокси за пристап на Интернет.
torlauncher.error_proxy_type_missing=Морате да одберете тип на прокси.
torlauncher.error_bridges_missing=Морате да одберете еден или повеќе мостови.
torlauncher.error_default_bridges_type_missing=Мора да одберете тип на транспорт за обезбедените мостови.
-torlauncher.error_bridgedb_bridges_missing=Please request a bridge.
+torlauncher.error_bridgedb_bridges_missing=Ве молиме побарајте мост.
torlauncher.error_bridge_bad_default_type=Нема обезбедени мостови кои го имаат типот на транспорт %S а се достапни. Прилагодете ги вашите поставки.
torlauncher.bridge_suffix.meek-amazon=(работи во Кина)
torlauncher.bridge_suffix.meek-azure=(работи во Кина)
-torlauncher.request_a_bridge=Request a Bridge…
-torlauncher.request_a_new_bridge=Request a New Bridge…
-torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait.
-torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge.
-torlauncher.bad_captcha_solution=The solution is not correct. Please try again.
-torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S
-torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges.
-torlauncher.no_bridges_available=No bridges are available at this time. Sorry.
+torlauncher.request_a_bridge=Барање за мост...
+torlauncher.request_a_new_bridge=Барање за нов мост...
+torlauncher.contacting_bridgedb=Контактирање со BridgeDB. Ве молиме почекајте.
+torlauncher.captcha_prompt=Решете ја ЗАДАЧАТА за да побарате мост.
+torlauncher.bad_captcha_solution=Решението е погрешно. Ве молиме обидете се повторно.
+torlauncher.unable_to_get_bridge=Не е во можност добивањето на мост од BridgeDB.\n\n%S
+torlauncher.no_meek=Овој прелистувач не е конфигуриран за meek, кој е потребен за добивање на мостови.
+torlauncher.no_bridges_available=Нема достапни мостови во овој момент. Извинете.
-torlauncher.connect=Конектирај
-torlauncher.restart_tor=Повторно стартување на Tor
+torlauncher.connect=Поврзи
+torlauncher.restart_tor= Повторно стартување на Tor
torlauncher.quit=Прекини
torlauncher.quit_win=Излез
torlauncher.done=Завршено
@@ -52,27 +52,27 @@ torlauncher.forAssistance2=За помош, посетете %S
torlauncher.copiedNLogMessages=Копирањето е завршено. %S Tor лог пораките се подготвени да бидат залепени во уредувач на текст или во порака за е-пошта.
-torlauncher.bootstrapStatus.conn_dir=Конектирање на јазол директориум
-torlauncher.bootstrapStatus.handshake_dir=Воспоставување енкриптирана конекција со директориумот
+torlauncher.bootstrapStatus.conn_dir=Поврзување на реле директориум
+torlauncher.bootstrapStatus.handshake_dir=Воспоставување енкриптирано поврзување со директориумот
torlauncher.bootstrapStatus.requesting_status=Добивање на мрежен статус
torlauncher.bootstrapStatus.loading_status=Вчитување на мрежен статус
-torlauncher.bootstrapStatus.loading_keys=Вчитување на авторитетски сертификати
-torlauncher.bootstrapStatus.requesting_descriptors=Барање на информации за јазол
-torlauncher.bootstrapStatus.loading_descriptors=Вчитување на информации за јазол
-torlauncher.bootstrapStatus.conn_or=Конектирање на Tor мрежата
+torlauncher.bootstrapStatus.loading_keys=Вчитување на авторитетни сертификати
+torlauncher.bootstrapStatus.requesting_descriptors=Барање на информации за реле
+torlauncher.bootstrapStatus.loading_descriptors=Вчитување на информации за реле
+torlauncher.bootstrapStatus.conn_or=Поврзување на Tor мрежата
torlauncher.bootstrapStatus.handshake_or=Воспоставување на Tor круг
-torlauncher.bootstrapStatus.done=Конектирани сте на Tor мрежата!
+torlauncher.bootstrapStatus.done=Поврзани сте на Tor мрежата!
torlauncher.bootstrapWarning.done=завршено
-torlauncher.bootstrapWarning.connectrefused=конекцијата е одбиена
+torlauncher.bootstrapWarning.connectrefused=поврзувањето е одбиено
torlauncher.bootstrapWarning.misc=разно
torlauncher.bootstrapWarning.resourcelimit=недоволни ресурси
torlauncher.bootstrapWarning.identity=идентитетско несогласување
-torlauncher.bootstrapWarning.timeout=времето за конекција истече
+torlauncher.bootstrapWarning.timeout=времето за поврзување истече
torlauncher.bootstrapWarning.noroute=нема рута до хост
torlauncher.bootstrapWarning.ioerror=грешка при читање/запишување
torlauncher.bootstrapWarning.pt_missing=недостасува pluggable transport
-torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost.
-torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server.
-torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy.
+torlauncher.nsresult.NS_ERROR_NET_RESET=Поврзувањето со серверот беше изгубено.
+torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Не може да се поврзе со серверот.
+torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Не може да се поврзе со проксито.
diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd
index e8aa4eb..4dabeb6 100644
--- a/src/chrome/locale/nl/network-settings.dtd
+++ b/src/chrome/locale/nl/network-settings.dtd
@@ -52,7 +52,7 @@
<!ENTITY torsettings.copyLog "Kopieer Tor-log naar het klembord">
<!ENTITY torsettings.proxyHelpTitle "Proxy Help">
-<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings.">
+<!ENTITY torsettings.proxyHelp1 "Een lokale proxy kan nodig zijn als u verbinding maakt via het netwerk van een bedrijf, school, of universiteit. Als u niet zeker weet of een proxy nodig is, kijk dan naar de internetinstellingen in een andere browser of kijk naar de netwerkinstellingen van het systeem.">
<!ENTITY torsettings.bridgeHelpTitle "Bridge relay-hulp">
<!ENTITY torsettings.bridgeHelp1 "Bridges zijn niet vermelde relays die het moeilijk maken om verbindingen naar het Tor Network te blokkeren.  Elk van deze bridges gebruikt een andere methode om censuur te vermijden.  Degene die obfs gebruiken, zien eruit gelijk willekeurige ruis, en de andere laten uw netwerk verkeer eruit zien alsof u verbind met een andere service in plaats van met Tor.">
diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties
index 3807906..48557bb 100644
--- a/src/chrome/locale/nl/torlauncher.properties
+++ b/src/chrome/locale/nl/torlauncher.properties
@@ -38,7 +38,7 @@ torlauncher.contacting_bridgedb=Contact maken met BridgeDB. Een ogenblik.
torlauncher.captcha_prompt=Los de CAPTCHA op om een brug te verzoeken.
torlauncher.bad_captcha_solution=De oplossing is niet correct. Probeer opnieuw.
torlauncher.unable_to_get_bridge=Kan geen brug verkrijgen van BridgeDB.\n\n%S
-torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges.
+torlauncher.no_meek=Deze browser is niet geconfigureerd voor meek, wat nodig is om bridges te verkrijgen.
torlauncher.no_bridges_available=Geen bruggen zijn beschikbaar op dit moment. Sorry.
torlauncher.connect=Verbind
diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd
index a45fc68..76131f7 100644
--- a/src/chrome/locale/pl/network-settings.dtd
+++ b/src/chrome/locale/pl/network-settings.dtd
@@ -1,7 +1,7 @@
<!ENTITY torsettings.dialog.title "Ustawienia Sieci">
<!ENTITY torsettings.wizard.title.default "Połącz z siecią Tor">
<!ENTITY torsettings.wizard.title.configure "Ustawienia Sieci">
-<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">
+<!ENTITY torsettings.wizard.title.connecting "Nawiązanie połączenia">
<!-- For locale picker: -->
<!ENTITY torlauncher.localePicker.title "Język przeglądarki Tor.">
@@ -9,8 +9,8 @@
<!-- For "first run" wizard: -->
-<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor.">
-<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy.">
+<!ENTITY torSettings.connectPrompt "Kliknij "Połącz", aby połączyć się z Torem.">
+<!ENTITY torSettings.configurePrompt "Kliknij "Konfiguruj", aby dostosować ustawienia sieci, jeśli jesteś w kraju, który cenzuruje Tora (np. Egipt, Chiny, Turcja) lub jeśli łączysz się z prywatną siecią, która wymaga serwera proxy.">
<!ENTITY torSettings.configure "Konfiguruj">
<!ENTITY torSettings.connect "Połącz">
@@ -25,9 +25,9 @@
<!ENTITY torsettings.optional "(opcjonalnie)">
-<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
+<!ENTITY torsettings.useProxy.checkbox "Używam proxy do łączenia się z Internetem">
<!ENTITY torsettings.useProxy.type "Typ Proxy:">
-<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">
+<!ENTITY torsettings.useProxy.type.placeholder "wybierz typ proxy">
<!ENTITY torsettings.useProxy.address "Adres:">
<!ENTITY torsettings.useProxy.address.placeholder "Nazwa hosta lub adres IP">
<!ENTITY torsettings.useProxy.port "Port:">
@@ -39,24 +39,24 @@
<!ENTITY torsettings.firewall.checkbox "Ten komputer pozwala na połączenie z ustalonymi portami">
<!ENTITY torsettings.firewall.allowedPorts "Dozwolone porty:">
<!ENTITY torsettings.useBridges.checkbox "Tor jest ocenzurowany w moim kraju">
-<!ENTITY torsettings.useBridges.default "Select a built-in bridge">
-<!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
-<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org">
-<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image">
-<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge">
+<!ENTITY torsettings.useBridges.default "Wybierz wbudowany most">
+<!ENTITY torsettings.useBridges.default.placeholder "wybierz most">
+<!ENTITY torsettings.useBridges.bridgeDB "Zażądaj mostu od torproject.org">
+<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Wprowadź znaki z obrazka">
+<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Uzyskaj nowe wyzwanie">
<!ENTITY torsettings.useBridges.captchaSubmit "Podsumowując">
-<!ENTITY torsettings.useBridges.custom "Provide a bridge I know">
-<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source.">
-<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)">
+<!ENTITY torsettings.useBridges.custom "Dostarcz mostek, który znam">
+<!ENTITY torsettings.useBridges.label "Wprowadź informacje o mostku z zaufanego źródła.">
+<!ENTITY torsettings.useBridges.placeholder "wpisz adres:port (po jednym w linii)">
<!ENTITY torsettings.copyLog "Skopiuj log do schowka">
-<!ENTITY torsettings.proxyHelpTitle "Proxy Help">
-<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings.">
+<!ENTITY torsettings.proxyHelpTitle "Pomoc Proxy">
+<!ENTITY torsettings.proxyHelp1 "Lokalny serwer proxy może być potrzebny podczas łączenia się przez sieć firmową, szkolną lub uniwersytecką. Jeśli nie masz pewności, czy serwer proxy jest potrzebny, sprawdź ustawienia internetowe w innej przeglądarce lub sprawdź ustawienia sieciowe systemu.">
<!ENTITY torsettings.bridgeHelpTitle "Pomoc Przekaźników Mostkowych">
-<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor.">
-<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">
+<!ENTITY torsettings.bridgeHelp1 "Mosty są zastrzeżonymi przekaźnikami, które utrudniają blokowanie połączeń z siecią Tor. Każdy rodzaj mostu wykorzystuje inną metodę unikania cenzury.  Obiekty obfs sprawiają, że twój ruch wygląda jak losowy szum, a łagodne połączenia sprawiają, że twój ruch wygląda jakbyś łączył się z tą usługą zamiast z Torem.">
+<!ENTITY torsettings.bridgeHelp2 "Ze względu na to, jak niektóre kraje próbują blokować Tora, niektóre mosty działają w niektórych krajach, ale nie w innych.  Jeśli nie masz pewności, które mosty działają w Twoim kraju, odwiedź torproject.org/about/contact.html#support">
<!-- Progress -->
<!ENTITY torprogress.pleaseWait "Proszę zaczekać, aż ustanowimy połączenie do sieci Tor.  To może zająć kilka minut.">
diff --git a/src/chrome/locale/pl/torlauncher.properties b/src/chrome/locale/pl/torlauncher.properties
index 356947b..32b912a 100644
--- a/src/chrome/locale/pl/torlauncher.properties
+++ b/src/chrome/locale/pl/torlauncher.properties
@@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Musisz określić adres IP lub nazwę hosta
torlauncher.error_proxy_type_missing=Musisz wybrać typ proxy.
torlauncher.error_bridges_missing=Musisz podać jeden lub więcej mostów. (bridges)
torlauncher.error_default_bridges_type_missing=Musisz wybrać rodzaj transportu dla dostępnych mostów.
-torlauncher.error_bridgedb_bridges_missing=Please request a bridge.
+torlauncher.error_bridgedb_bridges_missing=Proszę poprosić o most.
torlauncher.error_bridge_bad_default_type=Brak dostępnych mostków, które mają typ transportu %S. Proszę zmienić swoje ustawienia.
-torlauncher.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
+torlauncher.bridge_suffix.meek-amazon=(działa w Chinach)
+torlauncher.bridge_suffix.meek-azure=(działa w Chinach)
-torlauncher.request_a_bridge=Request a Bridge…
-torlauncher.request_a_new_bridge=Request a New Bridge…
-torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait.
-torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge.
-torlauncher.bad_captcha_solution=The solution is not correct. Please try again.
-torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S
-torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges.
-torlauncher.no_bridges_available=No bridges are available at this time. Sorry.
+torlauncher.request_a_bridge=Poproś o most...
+torlauncher.request_a_new_bridge=Poproś o nowy most...
+torlauncher.contacting_bridgedb=Kontakt z BridgeDB. Proszę czekać.
+torlauncher.captcha_prompt=Rozwiąż CAPTCHA, aby poprosić o most.
+torlauncher.bad_captcha_solution=Rozwiązanie nie jest poprawne. Proszę spróbuj ponownie.
+torlauncher.unable_to_get_bridge=Nie można uzyskać mostu z BridgeDB.\n\n%S
+torlauncher.no_meek=Ta przeglądarka nie jest skonfigurowana dla połączeń, które są potrzebne do uzyskania mostów.
+torlauncher.no_bridges_available=W tej chwili nie są dostępne żadne mosty. Przepraszam.
torlauncher.connect=Połącz
torlauncher.restart_tor=Zrestartuj Tora
@@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=brak trasy do hosta
torlauncher.bootstrapWarning.ioerror=błąd zapisu/odczytu
torlauncher.bootstrapWarning.pt_missing=brak podłączanego transportu
-torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost.
-torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server.
-torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy.
+torlauncher.nsresult.NS_ERROR_NET_RESET=Połączenie z serwerem zostało utracone.
+torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Nie można połączyć się z serwerem.
+torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Nie można połączyć się z serwerem proxy.
diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv/network-settings.dtd
index 8e67127..47473df 100644
--- a/src/chrome/locale/sv/network-settings.dtd
+++ b/src/chrome/locale/sv/network-settings.dtd
@@ -4,7 +4,7 @@
<!ENTITY torsettings.wizard.title.connecting "Etablerar en anslutning">
<!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Språk i Tor-webbläsare">
+<!ENTITY torlauncher.localePicker.title "Språk i Tor Browser">
<!ENTITY torlauncher.localePicker.prompt "Välj ett språk.">
<!-- For "first run" wizard: -->
@@ -52,7 +52,7 @@
<!ENTITY torsettings.copyLog "Kopiera Tor-loggen till urklippet">
<!ENTITY torsettings.proxyHelpTitle "Proxy hjälp">
-<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings.">
+<!ENTITY torsettings.proxyHelp1 "En lokal proxy kan behövas när du ansluter via ett företag, skola eller universitetsnätverk. Om du inte är säker på om en proxy behövs, titta på internetinställningarna i en annan webbläsare eller kontrollera systemets nätverksinställningar.">
<!ENTITY torsettings.bridgeHelpTitle "Hjälp om relä bryggor">
<!ENTITY torsettings.bridgeHelp1 "Bryggor är olistade reläer som gör det svårare att blockera anslutningar till Tor nätverket.   Var typ av brygga använder sig av olika metoder för att undvika censur.   Obfs gör att din trafik ser ut som brus och meek gör att din trafik ser ut som att du ansluter till tjänsten istället för Tor.">
diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties
index 92800d7..406dfb9 100644
--- a/src/chrome/locale/sv/torlauncher.properties
+++ b/src/chrome/locale/sv/torlauncher.properties
@@ -3,8 +3,8 @@
torlauncher.error_title=Tor Launcher
-torlauncher.tor_exited_during_startup=Tor stängdes av under uppstart. Detta kan bero på ett fel i din torrc-fil, en bugg i Tor eller ett annat program på ditt system, eller ett hårdvarufel. Tills dess att du har fixat det underliggande problemet och startat om Tor, kommer Tor Browser inte starta.
-torlauncher.tor_exited=Tor stängdes oväntat ner. Det kan bero på en bugg i Tor eller i ett annat program på din dator, eller ett hårdvarufel. Tor Browser kommer inte kunna komma åt några sidor förrän du har startat om Tor. Om problemet återkommer, skicka en kopia på din Tor-logg till vår support.
+torlauncher.tor_exited_during_startup=Tor stängdes av under uppstart. Detta kan bero på ett fel i din torrc-fil, ett fel i Tor eller ett annat program på ditt system, eller ett hårdvarufel. Tills dess att du har åtgärdat det underliggande problemet och startat om Tor, kommer Tor Browser inte starta.
+torlauncher.tor_exited=Tor stängdes oväntat ner. Det kan bero på ett fel i Tor eller i ett annat program på din dator, eller ett hårdvarufel. Tor Browser kommer inte kunna komma åt några sidor förrän du har startat om Tor. Om problemet återkommer, skicka en kopia på din Tor-logg till vår support.
torlauncher.tor_exited2=Att starta om Tor kommer inte stänga några av dina flikar i webbläsaren.
torlauncher.tor_controlconn_failed=Kunde inte ansluta till Tors kontrollport.
torlauncher.tor_failed_to_start=Det gick inte att starta Tor.
diff --git a/src/chrome/locale/ur/network-settings.dtd b/src/chrome/locale/ur/network-settings.dtd
index debbd66..eeb35c3 100644
--- a/src/chrome/locale/ur/network-settings.dtd
+++ b/src/chrome/locale/ur/network-settings.dtd
@@ -23,7 +23,7 @@
<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed.">
<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect">
-<!ENTITY torsettings.optional "Optional">
+<!ENTITY torsettings.optional "اختیاری">
<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">
<!ENTITY torsettings.useProxy.type "Proxy Type:">
diff --git a/src/chrome/locale/ur/torlauncher.properties b/src/chrome/locale/ur/torlauncher.properties
index a4d097a..caf020b 100644
--- a/src/chrome/locale/ur/torlauncher.properties
+++ b/src/chrome/locale/ur/torlauncher.properties
@@ -43,9 +43,9 @@ torlauncher.no_bridges_available=No bridges are available at this time. Sorry.
torlauncher.connect=Connect
torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
+torlauncher.quit=چھوڑدیجیے (Quit)
torlauncher.quit_win=Exit
-torlauncher.done=Done
+torlauncher.done=مکمل ہوگیا
torlauncher.forAssistance=For assistance, contact %S
torlauncher.forAssistance2=For assistance, visit %S
@@ -59,7 +59,7 @@ torlauncher.bootstrapStatus.loading_status=Loading network status
torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
+torlauncher.bootstrapStatus.conn_or=ٹار نیٹ ورکس سے رابطہ بنائیں
torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
torlauncher.bootstrapStatus.done=Connected to the Tor network!
1
0
28 Nov '18
commit 3378261a8cce3a8e1d908c8b73ee448ec572bec4
Author: Georg Koppen <gk(a)torproject.org>
Date: Wed Nov 28 13:38:28 2018 +0000
Update rbm to pick up fix for #28466
---
rbm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rbm b/rbm
index 8adbc46..eb500fa 160000
--- a/rbm
+++ b/rbm
@@ -1 +1 @@
-Subproject commit 8adbc46dc9e8358abad75ac81faf4646d8165b9e
+Subproject commit eb500fa9467fb4d7229c9ca87f202ef18603d023
1
0
28 Nov '18
commit eb500fa9467fb4d7229c9ca87f202ef18603d023
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Mon Nov 26 11:49:25 2018 +0100
Bug 28466: fix issue with git submodule URL changes
We replace a call to:
git submodule update --init
with calls to:
git submodule init
git submodule sync
git submodule update
The call to `git submodule sync` is solving the issue that could occur
when a submodule URL is changing.
---
lib/RBM.pm | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/lib/RBM.pm b/lib/RBM.pm
index 8875a7c..3ef20ae 100644
--- a/lib/RBM.pm
+++ b/lib/RBM.pm
@@ -474,10 +474,12 @@ sub execute {
= capture_exec('git', 'checkout', $git_hash);
exit_error "Cannot checkout $git_hash:\n$stderr" unless $success;
if (project_config($project, 'git_submodule', $options)) {
- ($stdout, $stderr, $success, $exit_code)
- = capture_exec('git', 'submodule', 'update', '--init');
- exit_error "Error running git submodule update:\n$stderr"
- unless $success;
+ foreach my $action (qw(init sync update)) {
+ ($stdout, $stderr, $success, $exit_code)
+ = capture_exec('git', 'submodule', $action);
+ exit_error "Error running git submodule $action\n$stderr"
+ unless $success;
+ }
}
} elsif (project_config($project, 'hg_url', $options)) {
my $hg_hash = project_config($project, 'hg_hash', $options)
@@ -550,10 +552,12 @@ sub maketar {
my ($stdout, $stderr, $success, $exit_code)
= capture_exec('git', 'checkout', $commit_hash);
exit_error "Cannot checkout $commit_hash: $stderr" unless $success;
- ($stdout, $stderr, $success, $exit_code)
- = capture_exec('git', 'submodule', 'update', '--init');
- exit_error "Error running git submodule update:\n$stderr"
- unless $success;
+ foreach my $action (qw(init sync update)) {
+ ($stdout, $stderr, $success, $exit_code)
+ = capture_exec('git', 'submodule', $action);
+ exit_error "Error running git submodule $action\n$stderr"
+ unless $success;
+ }
($stdout, $stderr, $success, $exit_code)
= capture_exec('git', 'submodule', 'foreach',
"git archive --prefix=$project-$version/\$path/"
1
0
commit dc85b56f80732893cf68e8e636948d3fc187990d
Author: Georg Koppen <gk(a)torproject.org>
Date: Tue Nov 27 21:23:02 2018 +0000
Translations update
---
src/chrome/locale/ar/aboutTor.dtd | 5 +++++
src/chrome/locale/bn-BD/aboutTor.dtd | 5 +++++
src/chrome/locale/ca/aboutTor.dtd | 13 +++++++++----
src/chrome/locale/cs/aboutTor.dtd | 5 +++++
src/chrome/locale/da/aboutTor.dtd | 5 +++++
src/chrome/locale/de/aboutTor.dtd | 5 +++++
src/chrome/locale/el/aboutTor.dtd | 5 +++++
src/chrome/locale/es/aboutTor.dtd | 5 +++++
src/chrome/locale/eu/aboutTor.dtd | 5 +++++
src/chrome/locale/fa/aboutTor.dtd | 5 +++++
src/chrome/locale/fa/browserOnboarding.properties | 2 +-
src/chrome/locale/fr/aboutTor.dtd | 7 ++++++-
src/chrome/locale/fr/browserOnboarding.properties | 2 +-
src/chrome/locale/ga/aboutTor.dtd | 5 +++++
src/chrome/locale/he/aboutTor.dtd | 5 +++++
src/chrome/locale/hu/aboutTor.dtd | 5 +++++
src/chrome/locale/id/aboutTor.dtd | 5 +++++
src/chrome/locale/is/aboutTor.dtd | 5 +++++
src/chrome/locale/it/aboutTor.dtd | 5 +++++
src/chrome/locale/ja/aboutTor.dtd | 5 +++++
src/chrome/locale/ja/browserOnboarding.properties | 20 ++++++++++----------
src/chrome/locale/ka/aboutTor.dtd | 5 +++++
src/chrome/locale/ka/torbutton.properties | 4 ++--
src/chrome/locale/ko/aboutTor.dtd | 5 +++++
src/chrome/locale/nb/aboutTor.dtd | 5 +++++
src/chrome/locale/nl/aboutTor.dtd | 5 +++++
src/chrome/locale/pl/aboutTBUpdate.dtd | 4 ++--
src/chrome/locale/pl/aboutTor.dtd | 13 +++++++++----
src/chrome/locale/pl/browserOnboarding.properties | 2 +-
src/chrome/locale/pl/torbutton.dtd | 18 +++++++++---------
src/chrome/locale/pl/torbutton.properties | 6 +++---
src/chrome/locale/pt-BR/aboutTor.dtd | 5 +++++
src/chrome/locale/ru/aboutTor.dtd | 5 +++++
src/chrome/locale/sv/aboutTor.dtd | 5 +++++
src/chrome/locale/sv/torbutton.properties | 2 +-
src/chrome/locale/tr/aboutTor.dtd | 5 +++++
src/chrome/locale/vi/aboutTor.dtd | 5 +++++
src/chrome/locale/zh-CN/aboutTor.dtd | 5 +++++
src/chrome/locale/zh-TW/aboutTor.dtd | 5 +++++
39 files changed, 189 insertions(+), 39 deletions(-)
diff --git a/src/chrome/locale/ar/aboutTor.dtd b/src/chrome/locale/ar/aboutTor.dtd
index 183d47f8..7fda4740 100644
--- a/src/chrome/locale/ar/aboutTor.dtd
+++ b/src/chrome/locale/ar/aboutTor.dtd
@@ -35,8 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "احم خصوصية الملايين.">
<!ENTITY aboutTor.donationBanner.line2e "حافظ على قوة تور.">
<!ENTITY aboutTor.donationBanner.line2f "نحتاج دعمك.">
+<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
+<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
+<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019.">
<!ENTITY aboutTor.donationBanner.line3 "تبرع اليوم، وستجاريك موزيلا وتبرع بنفس المبلغ.">
+<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong.">
<!ENTITY aboutTor.donationBanner.buttonA "تبرع الآن">
<!ENTITY aboutTor.donationBanner.buttonB "سأشارك">
diff --git a/src/chrome/locale/bn-BD/aboutTor.dtd b/src/chrome/locale/bn-BD/aboutTor.dtd
index a7458617..fdac71be 100644
--- a/src/chrome/locale/bn-BD/aboutTor.dtd
+++ b/src/chrome/locale/bn-BD/aboutTor.dtd
@@ -35,8 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "লাখো লোকের ব্যক্তিগত গোপনীয়তা রক্ষা করুন। ">
<!ENTITY aboutTor.donationBanner.line2e "টরকে শক্তিশালী রাখুন। ">
<!ENTITY aboutTor.donationBanner.line2f "আপনাদের সাহায্য দরকার! ">
+<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
+<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
+<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019.">
<!ENTITY aboutTor.donationBanner.line3 "অর্থ সাহায্য করুন, এবং মজিলা সমপরিমাণ সাহায্য করবে। ">
+<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong.">
<!ENTITY aboutTor.donationBanner.buttonA "এখুনি দান করুন! ">
<!ENTITY aboutTor.donationBanner.buttonB "আমাকেও সাথে নিন">
diff --git a/src/chrome/locale/ca/aboutTor.dtd b/src/chrome/locale/ca/aboutTor.dtd
index 91132da8..878ce7ad 100644
--- a/src/chrome/locale/ca/aboutTor.dtd
+++ b/src/chrome/locale/ca/aboutTor.dtd
@@ -30,13 +30,18 @@
<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers">
<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company.">
-<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights.">
+<!ENTITY aboutTor.donationBanner.line2b "Avançats drets humans universals.">
<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom.">
-<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions.">
+<!ENTITY aboutTor.donationBanner.line2d "Protegeix la privacitat de milions.">
<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong.">
-<!ENTITY aboutTor.donationBanner.line2f "We need your support!">
+<!ENTITY aboutTor.donationBanner.line2f "Necessitem el teu suport!">
+<!ENTITY aboutTor.donationBanner.line2g "Recolça la llibertat a internet.">
+<!ENTITY aboutTor.donationBanner.line2h "Defensa la web oberta.">
+<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019.">
<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation.">
+<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong.">
<!ENTITY aboutTor.donationBanner.buttonA "Donate Now">
-<!ENTITY aboutTor.donationBanner.buttonB "Count Me In">
+<!ENTITY aboutTor.donationBanner.buttonB "Compta amb mi">
diff --git a/src/chrome/locale/cs/aboutTor.dtd b/src/chrome/locale/cs/aboutTor.dtd
index 7c5ba384..31ccf6bd 100644
--- a/src/chrome/locale/cs/aboutTor.dtd
+++ b/src/chrome/locale/cs/aboutTor.dtd
@@ -35,8 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "Chráníme soukromí milionů lidí.">
<!ENTITY aboutTor.donationBanner.line2e "Pomozte Toru sílit.">
<!ENTITY aboutTor.donationBanner.line2f "Potřebujeme vaši podporu!">
+<!ENTITY aboutTor.donationBanner.line2g "Podpořte svobodu internetu.">
+<!ENTITY aboutTor.donationBanner.line2h "Braňte otevřený web.">
+<!ENTITY aboutTor.donationBanner.line2i "Podpořte online soukromí a svobodu.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla dorovná každý příspěvek až do začátku roku 2019.">
<!ENTITY aboutTor.donationBanner.line3 "Přispějte hned a Mozilla vás dar zdvojnásobí.">
+<!ENTITY aboutTor.donationBanner.line3b "Pošlete příspěvek a ten se zdvojnásobí.">
<!ENTITY aboutTor.donationBanner.buttonA "Přispějte">
<!ENTITY aboutTor.donationBanner.buttonB "Jdu do toho">
diff --git a/src/chrome/locale/da/aboutTor.dtd b/src/chrome/locale/da/aboutTor.dtd
index 7a2df3b0..ba40ff02 100644
--- a/src/chrome/locale/da/aboutTor.dtd
+++ b/src/chrome/locale/da/aboutTor.dtd
@@ -35,8 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "Beskyt privatlivet af millioner.">
<!ENTITY aboutTor.donationBanner.line2e "Hold Tor stærk.">
<!ENTITY aboutTor.donationBanner.line2f "Vi har brug for din støtte!">
+<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
+<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
+<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019.">
<!ENTITY aboutTor.donationBanner.line3 "Giv i dag, og Mozilla vil matche din donation.">
+<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong.">
<!ENTITY aboutTor.donationBanner.buttonA "Donér nu">
<!ENTITY aboutTor.donationBanner.buttonB "Jeg er med">
diff --git a/src/chrome/locale/de/aboutTor.dtd b/src/chrome/locale/de/aboutTor.dtd
index 6c43e2c6..0ffc979f 100644
--- a/src/chrome/locale/de/aboutTor.dtd
+++ b/src/chrome/locale/de/aboutTor.dtd
@@ -35,8 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "Schütze die Privatsphäre von Millionen Menschen.">
<!ENTITY aboutTor.donationBanner.line2e "Mache Tor stark.">
<!ENTITY aboutTor.donationBanner.line2f "Wir brauchen deine Unterstützung.">
+<!ENTITY aboutTor.donationBanner.line2g "Unterstütze Internetfreiheit.">
+<!ENTITY aboutTor.donationBanner.line2h "Verteidige das offene Netz.">
+<!ENTITY aboutTor.donationBanner.line2i "Unterstütze Datenschutz und Freiheit im Internet.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla unterstützt jede Spende bis 2019.">
<!ENTITY aboutTor.donationBanner.line3 "Gib noch heute, und Mozilla wird deiner Spende entsprechen.">
+<!ENTITY aboutTor.donationBanner.line3b "Spende jetzt, und dein Geschenk wird doppelt so stark.">
<!ENTITY aboutTor.donationBanner.buttonA "Spende jetzt">
<!ENTITY aboutTor.donationBanner.buttonB "Zähl mich mit">
diff --git a/src/chrome/locale/el/aboutTor.dtd b/src/chrome/locale/el/aboutTor.dtd
index 96301e2a..d93a5a5a 100644
--- a/src/chrome/locale/el/aboutTor.dtd
+++ b/src/chrome/locale/el/aboutTor.dtd
@@ -35,8 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "Προστατέψτε την ιδιωτικότητα εκατομμυρίων.">
<!ENTITY aboutTor.donationBanner.line2e "Διατηρήστε το Tor ισχυρό.">
<!ENTITY aboutTor.donationBanner.line2f "Χρειαζόμαστε την υποστήριξη σας!">
+<!ENTITY aboutTor.donationBanner.line2g "Στηρίξτε την ελευθερία στο διαδίκτυο.">
+<!ENTITY aboutTor.donationBanner.line2h "Υπερασπιστείτε τον ανοιχτό ιστό.">
+<!ENTITY aboutTor.donationBanner.line2i "Στηρίξτε την ιδιωτικότητα και την ελευθερία στο διαδίκτυο.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019.">
<!ENTITY aboutTor.donationBanner.line3 "Δωρίστε σήμερα και το Mozilla θα δωρίσει το ίδιο ποσό!">
+<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong.">
<!ENTITY aboutTor.donationBanner.buttonA "Κάντε μια δωρεά τώρα!">
<!ENTITY aboutTor.donationBanner.buttonB "Υπολογίστε με">
diff --git a/src/chrome/locale/es/aboutTor.dtd b/src/chrome/locale/es/aboutTor.dtd
index b20f45d5..2bb31865 100644
--- a/src/chrome/locale/es/aboutTor.dtd
+++ b/src/chrome/locale/es/aboutTor.dtd
@@ -35,8 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "Protege la privacidad de millones de personas.">
<!ENTITY aboutTor.donationBanner.line2e "Mantén fuerte a Tor.">
<!ENTITY aboutTor.donationBanner.line2f "Necesitamos tu apoyo.">
+<!ENTITY aboutTor.donationBanner.line2g "Apoya la libertad en internet">
+<!ENTITY aboutTor.donationBanner.line2h "Defiende la web abierta">
+<!ENTITY aboutTor.donationBanner.line2i "Apoya la privacidad y la libertad en línea.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla donará una cantidad idéntica a cada donación hasta 2019.">
<!ENTITY aboutTor.donationBanner.line3 "Dona hoy, y Mozilla igualará tu donación.">
+<!ENTITY aboutTor.donationBanner.line3b "Dona ahora, y tu donación se duplicará.">
<!ENTITY aboutTor.donationBanner.buttonA "Dona ahora.">
<!ENTITY aboutTor.donationBanner.buttonB "Cuenta conmigo.">
diff --git a/src/chrome/locale/eu/aboutTor.dtd b/src/chrome/locale/eu/aboutTor.dtd
index 24acba36..9f1224bb 100644
--- a/src/chrome/locale/eu/aboutTor.dtd
+++ b/src/chrome/locale/eu/aboutTor.dtd
@@ -35,8 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions.">
<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong.">
<!ENTITY aboutTor.donationBanner.line2f "We need your support!">
+<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
+<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
+<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019.">
<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation.">
+<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong.">
<!ENTITY aboutTor.donationBanner.buttonA "Donate Now">
<!ENTITY aboutTor.donationBanner.buttonB "Count Me In">
diff --git a/src/chrome/locale/fa/aboutTor.dtd b/src/chrome/locale/fa/aboutTor.dtd
index da917341..2f572883 100644
--- a/src/chrome/locale/fa/aboutTor.dtd
+++ b/src/chrome/locale/fa/aboutTor.dtd
@@ -35,8 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "از حریم خصوصی میلیونها محافظت کنید">
<!ENTITY aboutTor.donationBanner.line2e "تور را محکم نگه دارید.">
<!ENTITY aboutTor.donationBanner.line2f "ما به حمایت شما نیاز داریم!">
+<!ENTITY aboutTor.donationBanner.line2g "از آزادی اینترنت پشتیبانی کنید.">
+<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
+<!ENTITY aboutTor.donationBanner.line2i "از حریم شخصی و آزادی برخط دفاع کنید.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019.">
<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation.">
+<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong.">
<!ENTITY aboutTor.donationBanner.buttonA "اکنون اهداء کنید">
<!ENTITY aboutTor.donationBanner.buttonB "روی من حساب کن">
diff --git a/src/chrome/locale/fa/browserOnboarding.properties b/src/chrome/locale/fa/browserOnboarding.properties
index 2dcbded9..3845e2ee 100644
--- a/src/chrome/locale/fa/browserOnboarding.properties
+++ b/src/chrome/locale/fa/browserOnboarding.properties
@@ -12,7 +12,7 @@ onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level.
onboarding.tour-tor-privacy.button=به شبکه تور برو
-onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network=شبکه تور
onboarding.tour-tor-network.title=Travel a decentralized network.
onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
onboarding.tour-tor-network.button=Go to Circuit Display
diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd
index 959842c6..69dcd0f8 100644
--- a/src/chrome/locale/fr/aboutTor.dtd
+++ b/src/chrome/locale/fr/aboutTor.dtd
@@ -8,7 +8,7 @@
<!ENTITY aboutTor.ready.label "Explorez, en toute confidentialité.">
<!ENTITY aboutTor.ready2.label "Vous êtes prêts pour l’expérience de navigation la plus confidentielle au monde.">
-<!ENTITY aboutTor.failure.label "Une erreur s’est produite !">
+<!ENTITY aboutTor.failure.label "Un problème est survenu !">
<!ENTITY aboutTor.failure2.label "Tor ne fonctionne pas dans ce navigateur.">
<!ENTITY aboutTor.search.label "Chercher avec DuckDuckGo">
@@ -35,8 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "Protéger la vie privée de millions de personnes.">
<!ENTITY aboutTor.donationBanner.line2e "Assurer la robustesse de Tor.">
<!ENTITY aboutTor.donationBanner.line2f "Nous avons besoin de votre soutien !">
+<!ENTITY aboutTor.donationBanner.line2g "Soutenez la liberté sur Internet.">
+<!ENTITY aboutTor.donationBanner.line2h "Défendez le web ouvert.">
+<!ENTITY aboutTor.donationBanner.line2i "Prise en charge de la vie privée et de la liberté en ligne.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla s'engage à verser un montant équivalent à chaque don jusqu'en 2019.">
<!ENTITY aboutTor.donationBanner.line3 "Faites un don aujourd’hui et Mozilla fera un don équivalent.">
+<!ENTITY aboutTor.donationBanner.line3b "Donnez maintenant, et votre don devient deux fois plus fort.">
<!ENTITY aboutTor.donationBanner.buttonA "Faites un don maintenant">
<!ENTITY aboutTor.donationBanner.buttonB "Comptez sur moi">
diff --git a/src/chrome/locale/fr/browserOnboarding.properties b/src/chrome/locale/fr/browserOnboarding.properties
index 8fe3650a..28065b44 100644
--- a/src/chrome/locale/fr/browserOnboarding.properties
+++ b/src/chrome/locale/fr/browserOnboarding.properties
@@ -27,7 +27,7 @@ onboarding.tour-tor-security.title=Choisissez votre expérience.
onboarding.tour-tor-security.description=Nous vous offrons aussi des paramètres supplémentaires pour augmenter la sécurité de votre navigateur. Nos paramètres de sécurité vous permettent de bloquer des éléments qui pourraient être utilisés pour attaquer votre ordinateur. Cliquez ci-dessous pour voir ce que les différentes options vous proposent.
onboarding.tour-tor-security.button=Passer les paramètres en revue
-onboarding.tour-tor-expect-differences=Informations concernant l’expérience
+onboarding.tour-tor-expect-differences=Conseils sur l’expérience
onboarding.tour-tor-expect-differences.title=Attendez-vous à des différences.
onboarding.tour-tor-expect-differences.description=Avec toutes les fonctions de sécurité et de confidentialité offertes par Tor, votre expérience de navigation sur Internet pourrait être un peu différente. Les choses pourraient être un peu plus lentes et selon votre niveau de sécurité, certains éléments pourraient ne pas fonctionner ou ne pas se charger. On pourrait aussi vous demander de prouver que vous êtes un humain et non un robot.
onboarding.tour-tor-expect-differences.button=Consulter les FAQ
diff --git a/src/chrome/locale/ga/aboutTor.dtd b/src/chrome/locale/ga/aboutTor.dtd
index a2c65352..1978847e 100644
--- a/src/chrome/locale/ga/aboutTor.dtd
+++ b/src/chrome/locale/ga/aboutTor.dtd
@@ -35,8 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "Cosain príobháideachas na milliún duine.">
<!ENTITY aboutTor.donationBanner.line2e "Cuir taca le Tor.">
<!ENTITY aboutTor.donationBanner.line2f "Tá do chúnamh de dhíth orainn!">
+<!ENTITY aboutTor.donationBanner.line2g "Tacaigh le saoirse ar an idirlíon.">
+<!ENTITY aboutTor.donationBanner.line2h "Seas an fód ar son an Ghréasáin oscailte">
+<!ENTITY aboutTor.donationBanner.line2i "Tacaigh le príobháideachas agus le saoirse ar líne.">
+<!ENTITY aboutTor.donationBanner.line2j "Tá Mozilla ag meaitseáil gach euro a bhronntar orainn go dtí 2019.">
<!ENTITY aboutTor.donationBanner.line3 "Tabhair síntiús airgid inniu agus tabharfaidh Mozilla an méid céanna arís dúinn.">
+<!ENTITY aboutTor.donationBanner.line3b "Beidh do bhronntanas airgid dhá uair níos láidre.">
<!ENTITY aboutTor.donationBanner.buttonA "Tabhair síntiús airgid anois">
<!ENTITY aboutTor.donationBanner.buttonB "Cuir mise san áireamh">
diff --git a/src/chrome/locale/he/aboutTor.dtd b/src/chrome/locale/he/aboutTor.dtd
index e4659b67..81a4386f 100644
--- a/src/chrome/locale/he/aboutTor.dtd
+++ b/src/chrome/locale/he/aboutTor.dtd
@@ -35,8 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "הגן על פרטיותם של מיליונים.">
<!ENTITY aboutTor.donationBanner.line2e "שמור על Tor חזק.">
<!ENTITY aboutTor.donationBanner.line2f "אנחנו צריכים את תמיכתך!">
+<!ENTITY aboutTor.donationBanner.line2g "תמוך בחירות אינטרנט.">
+<!ENTITY aboutTor.donationBanner.line2h "הגן על הרשת הפתוחה.">
+<!ENTITY aboutTor.donationBanner.line2i "תמוך בפרטיות ובחירות באופן מקוון.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla משווה כל תרומה עד 2019.">
<!ENTITY aboutTor.donationBanner.line3 "תן היום, ו־Mozilla תשווה את תרומתך.">
+<!ENTITY aboutTor.donationBanner.line3b "תן עכשיו, והמתנה שלך הופכת לחזקה פי שניים.">
<!ENTITY aboutTor.donationBanner.buttonA "תרום עכשיו">
<!ENTITY aboutTor.donationBanner.buttonB "החשב אותי">
diff --git a/src/chrome/locale/hu/aboutTor.dtd b/src/chrome/locale/hu/aboutTor.dtd
index 6ac1ae1d..cbc0c571 100644
--- a/src/chrome/locale/hu/aboutTor.dtd
+++ b/src/chrome/locale/hu/aboutTor.dtd
@@ -35,8 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "Védi milliók magánéletét.">
<!ENTITY aboutTor.donationBanner.line2e "Tartsuk a Tor-t erősnek.">
<!ENTITY aboutTor.donationBanner.line2f "Szükségünk van a támogatására!">
+<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
+<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
+<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019.">
<!ENTITY aboutTor.donationBanner.line3 "Adjon ma és a Mozilla is annyival támogat.">
+<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong.">
<!ENTITY aboutTor.donationBanner.buttonA "Támogasson most">
<!ENTITY aboutTor.donationBanner.buttonB "Számítsatok bele">
diff --git a/src/chrome/locale/id/aboutTor.dtd b/src/chrome/locale/id/aboutTor.dtd
index 7d56a131..9370e3ad 100644
--- a/src/chrome/locale/id/aboutTor.dtd
+++ b/src/chrome/locale/id/aboutTor.dtd
@@ -35,8 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions.">
<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong.">
<!ENTITY aboutTor.donationBanner.line2f "We need your support!">
+<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
+<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
+<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019.">
<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation.">
+<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong.">
<!ENTITY aboutTor.donationBanner.buttonA "Donate Now">
<!ENTITY aboutTor.donationBanner.buttonB "Count Me In">
diff --git a/src/chrome/locale/is/aboutTor.dtd b/src/chrome/locale/is/aboutTor.dtd
index cc2317c5..0fd4f643 100644
--- a/src/chrome/locale/is/aboutTor.dtd
+++ b/src/chrome/locale/is/aboutTor.dtd
@@ -35,8 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "Verndum friðhelgi milljóna manna.">
<!ENTITY aboutTor.donationBanner.line2e "Höldum Tor sterku">
<!ENTITY aboutTor.donationBanner.line2f "Við þörfnumst stuðnings þíns!">
+<!ENTITY aboutTor.donationBanner.line2g "Stattu með frelsi á netinu.">
+<!ENTITY aboutTor.donationBanner.line2h "Verðu hinn opna vef.">
+<!ENTITY aboutTor.donationBanner.line2i "Verðu rétt þinn til einkalífs og frelsis á netinu.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla jafnar upp hvert fjárframlag allt til 2019.">
<!ENTITY aboutTor.donationBanner.line3 "Gefðu í dag - og Mozilla mun jafna framlag þitt.">
+<!ENTITY aboutTor.donationBanner.line3b "Gefðu upphæð núna - og gjöfin þín mun tvöfaldast.">
<!ENTITY aboutTor.donationBanner.buttonA "Styrkja núna">
<!ENTITY aboutTor.donationBanner.buttonB "Reiknið með mér">
diff --git a/src/chrome/locale/it/aboutTor.dtd b/src/chrome/locale/it/aboutTor.dtd
index f023c259..128a95bd 100644
--- a/src/chrome/locale/it/aboutTor.dtd
+++ b/src/chrome/locale/it/aboutTor.dtd
@@ -35,8 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "Protegge la privacy di milioni.">
<!ENTITY aboutTor.donationBanner.line2e "Mantieni Tor forte.">
<!ENTITY aboutTor.donationBanner.line2f "Abbiamo bisogno del tuo supporto!">
+<!ENTITY aboutTor.donationBanner.line2g "Supporta la libertà di internet.">
+<!ENTITY aboutTor.donationBanner.line2h "Difendi il web aperto.">
+<!ENTITY aboutTor.donationBanner.line2i "Sostieni la privacy e la libertà online.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019.">
<!ENTITY aboutTor.donationBanner.line3 "Dai oggi, e Mozilla ricambierà la tua donazione.">
+<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong.">
<!ENTITY aboutTor.donationBanner.buttonA "Dona Ora">
<!ENTITY aboutTor.donationBanner.buttonB "Contami">
diff --git a/src/chrome/locale/ja/aboutTor.dtd b/src/chrome/locale/ja/aboutTor.dtd
index 19a54e77..e5c0d7ea 100644
--- a/src/chrome/locale/ja/aboutTor.dtd
+++ b/src/chrome/locale/ja/aboutTor.dtd
@@ -35,8 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions.">
<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong.">
<!ENTITY aboutTor.donationBanner.line2f "我々にはあなたのサポートが必要です!">
+<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
+<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
+<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019.">
<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation.">
+<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong.">
<!ENTITY aboutTor.donationBanner.buttonA "今すぐ寄付">
<!ENTITY aboutTor.donationBanner.buttonB "Count Me In">
diff --git a/src/chrome/locale/ja/browserOnboarding.properties b/src/chrome/locale/ja/browserOnboarding.properties
index e3f09909..230123cf 100644
--- a/src/chrome/locale/ja/browserOnboarding.properties
+++ b/src/chrome/locale/ja/browserOnboarding.properties
@@ -3,19 +3,19 @@
# vim: set sw=2 sts=2 ts=8 et:
onboarding.tour-tor-welcome=ようこそ
-onboarding.tour-tor-welcome.title=You’re ready.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
+onboarding.tour-tor-welcome.title=準備できました。
+onboarding.tour-tor-welcome.description=Torブラウザは、ウェブブラウジング中に、最高水準のプライバシーとセキュリティを提供します。あなたは現在、トラッキング、監視、および検閲から保護されています。このクイックのオンボードは方法を提示します。
onboarding.tour-tor-welcome.button=今すぐ開始
onboarding.tour-tor-privacy=プライバシー
-onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level.
-onboarding.tour-tor-privacy.button=Go to Tor Network
+onboarding.tour-tor-privacy.title=トラッカーとスヌーパーを追い払う。
+onboarding.tour-tor-privacy.description=Torブラウザは、cookieを分離し、セッション後にブラウザの履歴を削除します。これらの変更により、あなたのプライバシーとセキュリティがブラウザによって保護されます。ネットワークレベルでの保護方法については、「Torネットワーク」をクリックしてください。
+onboarding.tour-tor-privacy.button=Torネットワークへ
onboarding.tour-tor-network=Torネットワーク
onboarding.tour-tor-network.title=Travel a decentralized network.
onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.
-onboarding.tour-tor-network.button=Go to Circuit Display
+onboarding.tour-tor-network.button=次のページへ
onboarding.tour-tor-circuit-display=Circuit Display
onboarding.tour-tor-circuit-display.title=See your path.
@@ -25,17 +25,17 @@ onboarding.tour-tor-circuit-display.button=See My Path
onboarding.tour-tor-security=セキュリティ
onboarding.tour-tor-security.title=Choose your experience.
onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do.
-onboarding.tour-tor-security.button=Review Settings
+onboarding.tour-tor-security.button=設定の確認
onboarding.tour-tor-expect-differences=Experience Tips
onboarding.tour-tor-expect-differences.title=Expect some differences.
onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.
onboarding.tour-tor-expect-differences.button=よくある質問を見る
-onboarding.tour-tor-onion-services=Onion Services
-onboarding.tour-tor-onion-services.title=Be extra protected.
+onboarding.tour-tor-onion-services=Onion サービス
+onboarding.tour-tor-onion-services.title=更なる保護。
onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site.
-onboarding.tour-tor-onion-services.button=Visit an Onion
+onboarding.tour-tor-onion-services.button=Onionサイトを訪問
# Circuit Display onboarding.
onboarding.tor-circuit-display.next=次へ
diff --git a/src/chrome/locale/ka/aboutTor.dtd b/src/chrome/locale/ka/aboutTor.dtd
index f6b9dd76..3b5bdad3 100644
--- a/src/chrome/locale/ka/aboutTor.dtd
+++ b/src/chrome/locale/ka/aboutTor.dtd
@@ -35,8 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "დაიცავით მილიონობით ადამიანის პირადი მონაცემები.">
<!ENTITY aboutTor.donationBanner.line2e "შეინარჩუნეთ Tor ძლიერი.">
<!ENTITY aboutTor.donationBanner.line2f "ჩვენ გვესაჭიროება თქვენი გვერდში დგომა!">
+<!ENTITY aboutTor.donationBanner.line2g "მხარი დაუჭირეთ თავისუფალ ინტერნეტს.">
+<!ENTITY aboutTor.donationBanner.line2h "დაიცავით ინტერნეტის ღიაობა.">
+<!ENTITY aboutTor.donationBanner.line2i "მხარი დაუჭირეთ პირადი მონაცემების ხელშეუხებლობისა და თავისუფლების უზრუნველყოფას ინტერნეტსივრცეში.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla გააორმაგებს თითოეულ შემოწირულ შენატანს 2019 წლამდე.">
<!ENTITY aboutTor.donationBanner.line3 "გაეცით დღესვე და Mozilla გააორმაგებს თქვენს შემოწირულობას.">
+<!ENTITY aboutTor.donationBanner.line3b "გაეცით თანხა ახლავე და თქვენი შემოწირულობა ორჯერ მეტად მძლავრი იქნება.">
<!ENTITY aboutTor.donationBanner.buttonA "თანხის გაღება ახლავე">
<!ENTITY aboutTor.donationBanner.buttonB "ჩემი წვლილის აღნიშვნა">
diff --git a/src/chrome/locale/ka/torbutton.properties b/src/chrome/locale/ka/torbutton.properties
index cbe0d8b0..e025bfde 100644
--- a/src/chrome/locale/ka/torbutton.properties
+++ b/src/chrome/locale/ka/torbutton.properties
@@ -45,8 +45,8 @@ canvas.neverAccessKey=რ
# Profile/startup error messages. Strings are kept here for ease of translation.
# LOCALIZATION NOTE: %S is the application name.
profileProblemTitle=%S პროფილის ხარვეზი
-profileReadOnly=თქვენ ვერ შეძლებთ გაუშვათ %S მხოლოდ წაკითხვის შესაძლებლობის მქონე საფაილო სისტემიდან. გთხოვთ, გადააკოპიროთ %S სხვა ადგილზე, გამოყენებამდე.
-profileReadOnlyMac=თქვენ ვერ შეძლებთ გაუშვათ %S მხოლოდ წაკითხვის შესაძლებლობის მქონე საფაილო სისტემიდან. გთხოვთ, გადააკოპიროთ %S თქვენს მთავარ ეკრანის ან პროგრამების საქაღალდეში, მის გამოყენებამდე.
+profileReadOnly=თქვენ ვერ შეძლებთ გაუშვათ %S მხოლოდ წაკითხვის შესაძლებლობის მქონე საფაილო სისტემიდან. გთხოვთ, %S-ის ასლი შექმნათ სხვა ადგილზე, გამოყენებამდე.
+profileReadOnlyMac=თქვენ ვერ შეძლებთ გაუშვათ %S მხოლოდ წაკითხვის შესაძლებლობის მქონე საფაილო სისტემიდან. გთხოვთ, %S-ის ასლი შექმნათ თქვენს მთავარ ეკრანის ან პროგრამების საქაღალდეში, მის გამოყენებამდე.
profileAccessDenied=%S-ს არ გააჩნია პროფილთან წვდომის ნებართვა. გთხოვთ, სათანადოდ გამართოთ თქვენი საფაილო სისტემის ნებართვები და სცადოთ ხელახლა.
profileMigrationFailed=თქვენი არსებული %S პროფილის გადატანა ვერ მოხერხდა.\nგამოყენებული იქნება ახალი პარამეტრები.
diff --git a/src/chrome/locale/ko/aboutTor.dtd b/src/chrome/locale/ko/aboutTor.dtd
index 8c8065a5..cf8143ab 100644
--- a/src/chrome/locale/ko/aboutTor.dtd
+++ b/src/chrome/locale/ko/aboutTor.dtd
@@ -35,8 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions.">
<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong.">
<!ENTITY aboutTor.donationBanner.line2f "We need your support!">
+<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
+<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
+<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019.">
<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation.">
+<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong.">
<!ENTITY aboutTor.donationBanner.buttonA "Donate Now">
<!ENTITY aboutTor.donationBanner.buttonB "Count Me In">
diff --git a/src/chrome/locale/nb/aboutTor.dtd b/src/chrome/locale/nb/aboutTor.dtd
index d5899000..a5e61845 100644
--- a/src/chrome/locale/nb/aboutTor.dtd
+++ b/src/chrome/locale/nb/aboutTor.dtd
@@ -35,8 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions.">
<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong.">
<!ENTITY aboutTor.donationBanner.line2f "We need your support!">
+<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
+<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
+<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019.">
<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation.">
+<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong.">
<!ENTITY aboutTor.donationBanner.buttonA "Donate Now">
<!ENTITY aboutTor.donationBanner.buttonB "Count Me In">
diff --git a/src/chrome/locale/nl/aboutTor.dtd b/src/chrome/locale/nl/aboutTor.dtd
index 4b462d6c..8929fc65 100644
--- a/src/chrome/locale/nl/aboutTor.dtd
+++ b/src/chrome/locale/nl/aboutTor.dtd
@@ -35,8 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "Bescherm de privacy van miljoenen.">
<!ENTITY aboutTor.donationBanner.line2e "Houdt Tor sterk.">
<!ENTITY aboutTor.donationBanner.line2f "We hebben jouw ondersteuning nodig!">
+<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
+<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
+<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019.">
<!ENTITY aboutTor.donationBanner.line3 "Geef vandaag, en Mozilla geeft hetzelfde bedrag.">
+<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong.">
<!ENTITY aboutTor.donationBanner.buttonA "Geef Nu">
<!ENTITY aboutTor.donationBanner.buttonB "Ik Doe Mee">
diff --git a/src/chrome/locale/pl/aboutTBUpdate.dtd b/src/chrome/locale/pl/aboutTBUpdate.dtd
index d2900789..c227f7d1 100644
--- a/src/chrome/locale/pl/aboutTBUpdate.dtd
+++ b/src/chrome/locale/pl/aboutTBUpdate.dtd
@@ -5,6 +5,6 @@
<!ENTITY aboutTBUpdate.linkSuffix ".">
<!ENTITY aboutTBUpdate.changeLogHeading "Lista zmian:">
-<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display">
-<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display.">
+<!ENTITY aboutTBUpdate.circuitDisplayHeading "Nowy, przeprojektowany wyświetlacz obwodu">
+<!ENTITY aboutTBUpdate.circuitDisplayDescription "Wyświetlacz obwodu Tor został przeniesiony i ulepszony! Kliknij przycisk Identyfikacja strony (znajdujący się po lewej stronie paska adresu URL), aby zobaczyć nowy widok obwodu.">
<!ENTITY aboutTBUpdate.learnMore "Dowiedz się więcej">
diff --git a/src/chrome/locale/pl/aboutTor.dtd b/src/chrome/locale/pl/aboutTor.dtd
index 53d22a06..31df7d7b 100644
--- a/src/chrome/locale/pl/aboutTor.dtd
+++ b/src/chrome/locale/pl/aboutTor.dtd
@@ -6,19 +6,19 @@
<!ENTITY aboutTor.title "Informacje na temat Tor'a">
-<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready.label "Odkrywaj. Prywatnie.">
<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience.">
<!ENTITY aboutTor.failure.label "Coś poszło nie tak!">
<!ENTITY aboutTor.failure2.label "Tor nie działa w tej przeglądarce.">
-<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
+<!ENTITY aboutTor.search.label "Wyszukaj z DuckDuckGo">
<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com">
<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Pytania?">
-<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Sprawdź naszą instrukcje korzystania z przeglądarki Tor »">
<!-- The next two entities are used within the browser's Help menu. -->
<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
+<!ENTITY aboutTor.torbrowser_user_manual.label "Instrukcja korzystania z Tor Browser">
<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
<!ENTITY aboutTor.getInvolved.label "Get Involved »">
@@ -35,8 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions.">
<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong.">
<!ENTITY aboutTor.donationBanner.line2f "We need your support!">
+<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
+<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
+<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019.">
<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation.">
+<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong.">
<!ENTITY aboutTor.donationBanner.buttonA "Donate Now">
<!ENTITY aboutTor.donationBanner.buttonB "Count Me In">
diff --git a/src/chrome/locale/pl/browserOnboarding.properties b/src/chrome/locale/pl/browserOnboarding.properties
index b1c1ebd1..8c1730b0 100644
--- a/src/chrome/locale/pl/browserOnboarding.properties
+++ b/src/chrome/locale/pl/browserOnboarding.properties
@@ -3,7 +3,7 @@
# vim: set sw=2 sts=2 ts=8 et:
onboarding.tour-tor-welcome=Witamy
-onboarding.tour-tor-welcome.title=You’re ready.
+onboarding.tour-tor-welcome.title=Jesteś gotowy.
onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.
onboarding.tour-tor-welcome.button=Start Now
diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd
index 2ceab63a..7b60431c 100644
--- a/src/chrome/locale/pl/torbutton.dtd
+++ b/src/chrome/locale/pl/torbutton.dtd
@@ -35,17 +35,17 @@
<!ENTITY torbutton.prefs.sec_caption_tooltip "Suwak poziomu bezpieczeństwa pozwala na wyłączenie pewnych funkcji przeglądarki, które mogą uczynić ten program bardziej narażonym na próby ataku hakerskiego.">
<!ENTITY torbutton.prefs.sec_standard_label "Standardowy">
<!ENTITY torbutton.prefs.sec_standard_description "Wszystkie funkcje Przeglądarki Tor i strony zostały włączone.">
-<!ENTITY torbutton.prefs.sec_safer_label "Safer">
-<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
-<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
-<!ENTITY torbutton.prefs.sec_safest_label "Safest">
-<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
-<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_safer_label "Bezpieczniej">
+<!ENTITY torbutton.prefs.sec_safer_description "Wyłącza funkcje witryny, które często są niebezpieczne, co powoduje, że niektóre witryny tracą funkcjonalność.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "W bezpieczniejszych ustawieniach:">
+<!ENTITY torbutton.prefs.sec_safest_label "Najbezpieczniejszy">
+<!ENTITY torbutton.prefs.sec_safest_description "Pozwala tylko na funkcje serwisu wymagane w przypadku witryn statycznych i podstawowych usług. Te zmiany dotyczą obrazów, multimediów i skryptów.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "W najbezpieczniejszych ustawieniach:">
<!ENTITY torbutton.prefs.sec_learn_more_label "Dowiedz się więcej">
<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "Obsługa skryptów Java na stronach bez HTTPS jest wyłączona.">
<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript jest domyślnie wyłączona na wszystkich stronach.">
<!ENTITY torbutton.prefs.sec_limit_typography "Niektóre fonty i symbole są wyłączone.">
<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Niektóre fonty, ikony, symbole i obrazki są wyłączone.">
-<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
-<!ENTITY torbutton.circuit_display.title "Tor Circuit">
-<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Dźwięk i obraz (media HTML5) to "kliknij, aby odtworzyć".">
+<!ENTITY torbutton.circuit_display.title "Obwód Tor">
+<!ENTITY torbutton.circuit_display.new_circuit "Nowy obwód dla tej strony">
diff --git a/src/chrome/locale/pl/torbutton.properties b/src/chrome/locale/pl/torbutton.properties
index d08b96a8..c3983412 100644
--- a/src/chrome/locale/pl/torbutton.properties
+++ b/src/chrome/locale/pl/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.circuit_display.relay = Przekaźnik
torbutton.circuit_display.tor_bridge = Bridge
torbutton.circuit_display.unknown_country = Nieznane państwo
torbutton.circuit_display.guard = Guard
-torbutton.circuit_display.guard_note = Your [Guard] node may not change.
+torbutton.circuit_display.guard_note = Twój węzeł [Guard] może się nie zmienić.
torbutton.circuit_display.learn_more = Dowiedz się więcej
torbutton.content_sizer.margin_tooltip = Przeglądarka Tor dodaje ten margines po to, aby szerokość i wysokość okna Twojej przeglądarki była mniej charakterystyczna, dzięki temu zmniejszysz szanse śledzenia Ciebie online.
torbutton.panel.tooltip.disabled = Kliknij tutaj, aby włączyć Tora
@@ -51,5 +51,5 @@ profileAccessDenied=%S nie posiada uprawnień, aby zobaczyć ten profil. Prosimy
profileMigrationFailed=Migracja Twojego isniejącego profilu %S nie powiodła się.\nNowe ustawienia zostaną użyte.
# .Onion Page Info prompt. Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S)
-pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
+pageInfo_OnionEncryptionWithBitsAndProtocol=Połączenie zaszyfrowane (usługa Onion, %1$S, %2$S klucze bitowe, %3$S)
+pageInfo_OnionEncryption=Połączenie zaszyfrowane (usługa Onion)
diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd b/src/chrome/locale/pt-BR/aboutTor.dtd
index a90f3e1a..c137ac41 100644
--- a/src/chrome/locale/pt-BR/aboutTor.dtd
+++ b/src/chrome/locale/pt-BR/aboutTor.dtd
@@ -36,8 +36,13 @@
<!ENTITY aboutTor.donationBanner.line2d "Proteger a privacidade de milhões de pessoas.">
<!ENTITY aboutTor.donationBanner.line2e "Manter a força do Tor.">
<!ENTITY aboutTor.donationBanner.line2f "Precisamos do seu apoio!">
+<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
+<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
+<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019.">
<!ENTITY aboutTor.donationBanner.line3 "Doe hoje, e a Mozilla duplicará a sua doação.">
+<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong.">
<!ENTITY aboutTor.donationBanner.buttonA "Doar Agora">
<!ENTITY aboutTor.donationBanner.buttonB "Estou dentro">
diff --git a/src/chrome/locale/ru/aboutTor.dtd b/src/chrome/locale/ru/aboutTor.dtd
index 879d708e..1bc187b8 100644
--- a/src/chrome/locale/ru/aboutTor.dtd
+++ b/src/chrome/locale/ru/aboutTor.dtd
@@ -35,8 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "Обеспечиваем конфиденциальность миллионам людей.">
<!ENTITY aboutTor.donationBanner.line2e "Сохраните Tor сильным.">
<!ENTITY aboutTor.donationBanner.line2f "Нам нужна твоя поддержка!">
+<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
+<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
+<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019.">
<!ENTITY aboutTor.donationBanner.line3 "Пожертвуйте сегодня и Mozilla удвоит Ваше пожертвование.">
+<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong.">
<!ENTITY aboutTor.donationBanner.buttonA "Пожертвовать">
<!ENTITY aboutTor.donationBanner.buttonB "Посчитайте">
diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv/aboutTor.dtd
index 110322e4..f2938e54 100644
--- a/src/chrome/locale/sv/aboutTor.dtd
+++ b/src/chrome/locale/sv/aboutTor.dtd
@@ -35,8 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "Skydda miljontals privatliv.">
<!ENTITY aboutTor.donationBanner.line2e "Håll Tor stark.">
<!ENTITY aboutTor.donationBanner.line2f "Vi behöver ert stöd!">
+<!ENTITY aboutTor.donationBanner.line2g "Stöd internetfrihet.">
+<!ENTITY aboutTor.donationBanner.line2h "Försvara den öppna webben.">
+<!ENTITY aboutTor.donationBanner.line2i "Stöd integritet och frihet på nätet.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla matchar varje donation fram till 2019.">
<!ENTITY aboutTor.donationBanner.line3 "Ge idag, och Mozilla kommer att matcha din donation.">
+<!ENTITY aboutTor.donationBanner.line3b "Ge nu, och din gåva blir dubbelt så stark.">
<!ENTITY aboutTor.donationBanner.buttonA "Donera nu">
<!ENTITY aboutTor.donationBanner.buttonB "Räkna med mig">
diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties
index 83f5eee7..aaa6856e 100644
--- a/src/chrome/locale/sv/torbutton.properties
+++ b/src/chrome/locale/sv/torbutton.properties
@@ -24,7 +24,7 @@ torbutton.popup.dontask = Hämta hem filer automatiskt i fortsättningen
torbutton.popup.no_newnym = Torbutton kan inte säkert ge dig en ny identitet. Det har inte tillgång till Tor Control Port.\n\nKör du Tor Browser Bundle?
torbutton.security_settings.menu.title = Säkerhetsinställningar
torbutton.title.prompt_torbrowser = Viktig information om Torbutton
-torbutton.popup.prompt_torbrowser = Torbutton fungerar annorlunda nu: Du kan inte slå av den längre.\n\nVi gjorde denna förändring eftersom det inte är säkert att använda Torbutton i en webbläsare som också används för icke-Tor surfning. Det var för många buggar som vi inte kunde fixa på något annat sätt.\n\nOm du vill fortsätta använda Firefox normalt så bör du avinstallera Tor Browser och ladda ner Tor Browser Bundle. Tor Browser skyddar din integritet bättre än vanliga Firefox, även när Firefox används med Tor Button.\n\nFör att ta bort Torbutton, gå till Verktyg->Tillägg->Tillägg och klicka på Ta bort-knappen bredvid Torbutton.
+torbutton.popup.prompt_torbrowser = Torbutton fungerar annorlunda nu: Du kan inte slå av den längre.\n\nVi gjorde denna förändring eftersom det inte är säkert att använda Torbutton i en webbläsare som också används för icke-Tor surfning. Det var för många fel som vi inte kunde åtgärda på något annat sätt.\n\nOm du vill fortsätta använda Firefox normalt så bör du avinstallera Tor Browser och hämta Tor Browser Bundle. Tor Browser skyddar din integritet bättre än vanliga Firefox, även när Firefox används med Tor Button.\n\nFör att ta bort Torbutton, gå till Verktyg->Tillägg->Tillägg och klicka på Ta bort-knappen bredvid Torbutton.
torbutton.popup.short_torbrowser = Viktig information om Torbutton!\n\nTorbutton är nu alltid aktiverad.\n\nKlicka på Torbutton för mer information.
torbutton.popup.confirm_plugins = Insticksmoduler så som Flash kan äventyra din anonymitet och personliga integritet.\n\nDe kan också kringgå Tor för att avslöja var du befinner dig och vad din IP-adress är.\n\nÄr du säker på att du vill aktivera plugins?\n\n
diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd
index e4a2443d..789e3d81 100644
--- a/src/chrome/locale/tr/aboutTor.dtd
+++ b/src/chrome/locale/tr/aboutTor.dtd
@@ -35,8 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "Milyonların gizliliğini koru.">
<!ENTITY aboutTor.donationBanner.line2e "Tor uygulamasının gücünü koru.">
<!ENTITY aboutTor.donationBanner.line2f "Desteğinize ihtiyacımız var!">
+<!ENTITY aboutTor.donationBanner.line2g "İnternet özgürlüğünü destekleyin">
+<!ENTITY aboutTor.donationBanner.line2h "Açık web düşüncesini savunun.">
+<!ENTITY aboutTor.donationBanner.line2i "Kişisel gizliliği ve çevrimiçi özgürlüğü destekleyin.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla 2019 yılına kadar yapılan her bağışa karşılık veriyor.">
<!ENTITY aboutTor.donationBanner.line3 "Bugün yaptığınız her bağış kadar Mozilla da bağış yapacak.">
+<!ENTITY aboutTor.donationBanner.line3b "Bağış yapın ve hediyeniz iki kat güzel olsun.">
<!ENTITY aboutTor.donationBanner.buttonA "Şimdi Bağış Yapın">
<!ENTITY aboutTor.donationBanner.buttonB "Ben de Varım">
diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd
index 820d92c9..09c26101 100644
--- a/src/chrome/locale/vi/aboutTor.dtd
+++ b/src/chrome/locale/vi/aboutTor.dtd
@@ -35,8 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "Bảo vệ sự riêng tư của hàng triệu người.">
<!ENTITY aboutTor.donationBanner.line2e "Giữ cho Tor trở nên mạnh mẽ.">
<!ENTITY aboutTor.donationBanner.line2f "Chúng tôi cần sự hỗ trợ của bạn!">
+<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
+<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
+<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019.">
<!ENTITY aboutTor.donationBanner.line3 "Hãy đóng góp ngay hôm nay, và Mozilla sẽ đóng góp tương ứng với phần của bạn.">
+<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong.">
<!ENTITY aboutTor.donationBanner.buttonA "Đóng góp Ngay bây giờ">
<!ENTITY aboutTor.donationBanner.buttonB "Hãy cho tôi tham gia">
diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd
index f61e2a91..0ae7596e 100644
--- a/src/chrome/locale/zh-CN/aboutTor.dtd
+++ b/src/chrome/locale/zh-CN/aboutTor.dtd
@@ -35,8 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "保护数百万人的隐私。">
<!ENTITY aboutTor.donationBanner.line2e "让 Tor 网络保持健壮。">
<!ENTITY aboutTor.donationBanner.line2f "我们需要你的帮助！">
+<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
+<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
+<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019.">
<!ENTITY aboutTor.donationBanner.line3 "现在捐款， Mozilla 也能从你的捐赠中受益。">
+<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong.">
<!ENTITY aboutTor.donationBanner.buttonA "现在就捐助">
<!ENTITY aboutTor.donationBanner.buttonB "算我一个">
diff --git a/src/chrome/locale/zh-TW/aboutTor.dtd b/src/chrome/locale/zh-TW/aboutTor.dtd
index a679ed55..bcbec612 100644
--- a/src/chrome/locale/zh-TW/aboutTor.dtd
+++ b/src/chrome/locale/zh-TW/aboutTor.dtd
@@ -35,8 +35,13 @@
<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions.">
<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong.">
<!ENTITY aboutTor.donationBanner.line2f "我們需要您的支援！">
+<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom.">
+<!ENTITY aboutTor.donationBanner.line2h "Defend the open web.">
+<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online.">
+<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019.">
<!ENTITY aboutTor.donationBanner.line3 "今日您捐款，Mozilla 也會捐出相同數額。">
+<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong.">
<!ENTITY aboutTor.donationBanner.buttonA "立刻捐款">
<!ENTITY aboutTor.donationBanner.buttonB "我也要加入！">
1
0
[torbutton/master] Bug 28543: about:tor has scroll bar between widths 900px and 1000px.
by gk＠torproject.org 27 Nov '18
by gk＠torproject.org 27 Nov '18
27 Nov '18
commit 9ae78d32be280bcf58819676f700994544049ae8
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Mon Nov 26 12:04:34 2018 -0500
Bug 28543: about:tor has scroll bar between widths 900px and 1000px.
Remove unnecessary min-width from the .torcontent-container rule.
---
src/chrome/skin/aboutTor.css | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css
index cf8290c9..37fa30fe 100644
--- a/src/chrome/skin/aboutTor.css
+++ b/src/chrome/skin/aboutTor.css
@@ -51,7 +51,6 @@ body:not([initialized]) {
.torcontent-container {
margin: 40px auto 28px auto;
max-width: 1000px;
- min-width: 1000px;
}
}
1
0
[tor-browser-build/master] Bug 23384: Remove user arthuredelstein on build-sunet-a.torproject.net
by boklm＠torproject.org 27 Nov '18
by boklm＠torproject.org 27 Nov '18
27 Nov '18
commit 1aaca9195d0ba07db68ceaab1f516f91e0ee8a49
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Tue Nov 27 17:55:04 2018 +0100
Bug 23384: Remove user arthuredelstein on build-sunet-a.torproject.net
Arthur said he doesn't need access to this machine anymore, so we remove
his user account from the ansible config (the account will be removed
from the machine manually).
---
tools/ansible/roles/tbb-team/defaults/main.yml | 1 -
tools/ansible/roles/tbb-team/files/arthuredelstein.pub | 1 -
2 files changed, 2 deletions(-)
diff --git a/tools/ansible/roles/tbb-team/defaults/main.yml b/tools/ansible/roles/tbb-team/defaults/main.yml
index 8bf2e66..fa8ffa3 100644
--- a/tools/ansible/roles/tbb-team/defaults/main.yml
+++ b/tools/ansible/roles/tbb-team/defaults/main.yml
@@ -1,6 +1,5 @@
---
tbb_team_members:
- - arthuredelstein
- boklm
- brade
- gk
diff --git a/tools/ansible/roles/tbb-team/files/arthuredelstein.pub b/tools/ansible/roles/tbb-team/files/arthuredelstein.pub
deleted file mode 100644
index e7f0c39..0000000
--- a/tools/ansible/roles/tbb-team/files/arthuredelstein.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTn6K3kVN90fKK4BFC2I6wU9Ngb0v1U9JG9Ongt8UlTnbT58tLXATj65a7JwLcFHTjfTyDe2YLA5ujec2Az9LVYNezf4lIbykkDMg125En0HVhjanae9JwCWbOH9BhaEcB9ILc/gAeEXedxvZjpdTkcuJRoYem0jzyBXIm1eCb7gSbGJ5ma9JVFysOxFFor3SiOAjTDotgqVtfG3SF0ecRnViO/dfW9sCzwpTABOg0FZTKV/0AzbPoLE9w8OGe3qZU/eyK+Uw4gP/ZmF9veP1Npnvhf3wS4xkyg0zIvhIeOWQyArbir7dr0xTPhoOv3+GrDwKfCVfEvLEAwcL4TZPx arthur(a)Arthur.local
1
0
[tor-browser-build/master] Bug 28594: Remove tor browser alpha nightly builds
by boklm＠torproject.org 26 Nov '18
by boklm＠torproject.org 26 Nov '18
26 Nov '18
commit e24e2dea8ebe54b9e8ddd27044bffa21adf08c94
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Mon Nov 26 19:34:45 2018 +0100
Bug 28594: Remove tor browser alpha nightly builds
Update testsuite_git_commit to remove tor browser alpha nightly builds.
---
tools/ansible/roles/tbb-nightly-build/defaults/main.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml
index 5f04029..26820a9 100644
--- a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml
+++ b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml
@@ -5,7 +5,7 @@ nightly_build_cron_minute: 20
nightly_build_keep_builds: 2
testsuite_dir: "/home/{{ nightly_build_user }}/tbb-testsuite"
testsuite_git_url: https://git.torproject.org/user/boklm/tor-browser-bundle-testsuite.git
-testsuite_git_commit: 7b0dcd9f21bfde6b097b687c63f84fa579296804
+testsuite_git_commit: 7b1e23e06761c7336795d2b2a6fa40f5914b0aef
nightly_build_wwwdir: "/home/{{ nightly_build_user }}/www"
nightly_build_nginx_enable: true
nightly_build_nginx_listen: 127.0.0.1:80
1
0
commit 6b9a93c0517d8b11d0e843f7c17abfc9090b7332
Author: Georg Koppen <gk(a)torproject.org>
Date: Thu Nov 22 21:31:48 2018 +0000
Revert "28051"
We are not ready for that yet.
This reverts commit 8e8445c1d47644e6e34fc1b96d6934a9aa13f58b.
---
build.gradle | 4 --
mobile/android/app/000-tor-browser-android.js | 3 ++
mobile/android/app/build.gradle | 11 -----
mobile/android/base/AndroidManifest.xml.in | 1 -
.../base/java/org/mozilla/gecko/BrowserApp.java | 53 ++++++++++++----------
.../base/java/org/mozilla/gecko/GeckoApp.java | 29 ------------
.../java/org/mozilla/gecko/GeckoApplication.java | 5 --
.../java/org/mozilla/gecko/LauncherActivity.java | 18 --------
.../gecko/notifications/NotificationClient.java | 6 +--
.../gecko/notifications/NotificationHelper.java | 5 +-
mobile/android/config/proguard/proguard.cfg | 15 ------
.../java/org/mozilla/gecko/util/ProxySelector.java | 4 +-
12 files changed, 38 insertions(+), 116 deletions(-)
diff --git a/build.gradle b/build.gradle
index 6cf2d4cc0e7a..a080e15b2fac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,10 +32,6 @@ allprojects {
url repository
}
}
- // These are needed for Orbot's dependencies
- maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" }
- maven { url 'https://jitpack.io' }
- jcenter()
}
}
diff --git a/mobile/android/app/000-tor-browser-android.js b/mobile/android/app/000-tor-browser-android.js
index e7e337276acb..c329fcdee5f7 100644
--- a/mobile/android/app/000-tor-browser-android.js
+++ b/mobile/android/app/000-tor-browser-android.js
@@ -54,6 +54,9 @@ pref("media.realtime_decoder.enabled", false);
pref("general.useragent.updates.enabled", false);
pref("general.useragent.updates.url", "");
+// Override this because Orbot uses 9050 as the default
+pref("network.proxy.socks_port", 9050);
+
// Do not allow the user to install extensions from web
pref("xpinstall.enabled", false);
pref("extensions.enabledScopes", 1);
diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle
index d0060901b6b3..7c515bbe65a7 100644
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -225,9 +225,6 @@ dependencies {
implementation "com.android.support:design:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}"
implementation "com.android.support:customtabs:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}"
implementation "com.android.support:palette-v7:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}"
- implementation files('Orbot-16.0.5-RC-1-tor-0.3.4.9-fullperm-release.aar')
- implementation files('orbotservice-release.aar')
- implementation files('jsocksAndroid-release.aar')
if (mozconfig.substs.MOZ_NATIVE_DEVICES) {
implementation "com.android.support:mediarouter-v7:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}"
@@ -265,14 +262,6 @@ dependencies {
// Including the Robotium JAR directly can cause issues with dexing.
androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.5.4'
-
- // Orbot
- implementation 'com.github.delight-im:Android-Languages:v1.0.1'
- implementation 'pl.bclogic:pulsator4droid:1.0.3'
-
- // Orbotservice
- implementation 'org.torproject:tor-android-binary:0.3.4.9'
- implementation 'com.jrummyapps:android-shell:1.0.1'
}
// TODO: (bug 1261486): This impl is not robust -
diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in
index 0e5f4edaf814..c4ea9a37683e 100644
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -24,7 +24,6 @@
#include FennecManifest_permissions.xml.in
<application android:label="@string/moz_app_displayname"
- tools:replace="android:label"
android:icon="@drawable/icon"
android:logo="@drawable/logo"
android:name="@MOZ_ANDROID_APPLICATION_CLASS@"
diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
index 42b9ebd0a3f7..5efd83398775 100644
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -181,8 +181,7 @@ import org.mozilla.gecko.widget.GeckoActionProvider;
import org.mozilla.gecko.widget.SplashScreen;
import org.mozilla.geckoview.GeckoSession;
-import org.torproject.android.OrbotMainActivity;
-import org.torproject.android.service.TorServiceConstants;
+import info.guardianproject.netcipher.proxy.OrbotHelper;
import java.io.File;
import java.io.FileNotFoundException;
@@ -240,9 +239,6 @@ public class BrowserApp extends GeckoApp
public static final int ACTIVITY_REQUEST_TRIPLE_READERVIEW = 4001;
public static final int ACTIVITY_RESULT_TRIPLE_READERVIEW_ADD_BOOKMARK = 4002;
public static final int ACTIVITY_RESULT_TRIPLE_READERVIEW_IGNORE = 4003;
- public static final int ACTIVITY_RESULT_ORBOT_LAUNCH = 5001;
-
- private static boolean mOrbotRun = false;
public static final String ACTION_VIEW_MULTIPLE = AppConstants.ANDROID_PACKAGE_NAME + ".action.VIEW_MULTIPLE";
@@ -1286,26 +1282,41 @@ public class BrowserApp extends GeckoApp
@Override
public void onReceive(Context context, Intent intent) {
- if (TextUtils.equals(intent.getAction(), TorServiceConstants.ACTION_STATUS)) {
+ if (TextUtils.equals(intent.getAction(), OrbotHelper.ACTION_STATUS)) {
GeckoAppShell.setTorStatus(intent);
}
}
};
public void checkStartOrbot() {
- /* run in thread so Tor status updates will be received while the
- * Gecko event sync is blocking the main thread */
- HandlerThread handlerThread = new HandlerThread("torStatusReceiver");
- handlerThread.start();
- Looper looper = handlerThread.getLooper();
- Handler handler = new Handler(looper);
- registerReceiver(torStatusReceiver, new IntentFilter(TorServiceConstants.ACTION_STATUS),
- null, handler);
+ if (!OrbotHelper.isOrbotInstalled(this)) {
+ final Intent installOrbotIntent = OrbotHelper.getOrbotInstallIntent(this);
- if (!mOrbotRun) {
- final String orbotStartAction = "android.intent.action.MAIN";
- final Intent launchOrbot = new Intent(orbotStartAction, null, this, OrbotMainActivity.class);
- startActivityForResult(launchOrbot, ACTIVITY_RESULT_ORBOT_LAUNCH, null);
+ AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ builder.setTitle(R.string.install_orbot);
+ builder.setMessage(R.string.you_must_have_orbot);
+ builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialogInterface, int i) {
+ startActivity(installOrbotIntent);
+ }
+ });
+ builder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialogInterface, int i) {
+ }
+ });
+ builder.show();
+ } else {
+ /* run in thread so Tor status updates will be received while the
+ * Gecko event sync is blocking the main thread */
+ HandlerThread handlerThread = new HandlerThread("torStatusReceiver");
+ handlerThread.start();
+ Looper looper = handlerThread.getLooper();
+ Handler handler = new Handler(looper);
+ registerReceiver(torStatusReceiver, new IntentFilter(OrbotHelper.ACTION_STATUS),
+ null, handler);
+ OrbotHelper.requestStartTor(this);
}
}
@@ -3007,12 +3018,6 @@ public class BrowserApp extends GeckoApp
TabQueueHelper.processTabQueuePromptResponse(resultCode, this);
break;
- case ACTIVITY_RESULT_ORBOT_LAUNCH:
- final SafeIntent intent = new SafeIntent(getIntent());
- Log.d(LOGTAG, "onActivityResult: ACTIVITY_RESULT_ORBOT_LAUNCH");
- mOrbotRun = true;
- break;
-
default:
for (final BrowserAppDelegate delegate : delegates) {
delegate.onActivityResult(this, requestCode, resultCode, data);
diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
index 3741c26fe0e8..802d8adafbeb 100644
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
@@ -91,8 +91,6 @@ import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
-import org.torproject.android.service.TorService;
-
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
@@ -598,9 +596,6 @@ public abstract class GeckoApp extends GeckoActivity
EventDispatcher.getInstance().dispatch("Browser:Quit", res);
- Intent torService = new Intent(this, TorService.class);
- stopService(torService);
-
// We don't call shutdown here because this creates a race condition which
// can cause the clearing of private data to fail. Instead, we shut down the
// UI only after we're done sanitizing.
@@ -1217,30 +1212,6 @@ public abstract class GeckoApp extends GeckoActivity
}
}
}
- } else if (mIsRestoringActivity) {
- /* Synchronize Tabs state with Gecko. We're restoring the Activity, this
- * mean all of the Chrome state was lost, but the previously created
- * Tabs still exist within the Android application, because those are
- * static and the application keeps track of those (and only the Activity
- * is starting, the application was never destroyed). */
- Iterable<Tab> tabs = Tabs.getInstance().getTabsInOrder();
- Tab selectedTab = Tabs.getInstance().getSelectedTab();
- for (Tab tab : tabs) {
- GeckoBundle reloadMessage = new GeckoBundle();
- reloadMessage.putString("url", tab.getURL());
- reloadMessage.putString("engine", null);
- reloadMessage.putInt("parentId", tab.getParentId());
- reloadMessage.putBoolean("userEntered", true);
- reloadMessage.putBoolean("isPrivate", tab.isPrivate());
- reloadMessage.putBoolean("pinned", false);
- reloadMessage.putBoolean("desktopMode", tab.getDesktopMode());
- reloadMessage.putString("referrerURI", null);
- reloadMessage.putInt("tabID", tab.getId());
- reloadMessage.putBoolean("newTab", true);
- reloadMessage.putBoolean("delayLoad", selectedTab != tab);
- reloadMessage.putBoolean("selected", selectedTab == tab);
- getAppEventDispatcher().dispatch("Tab:Load", reloadMessage);
- }
}
synchronized (GeckoApp.this) {
diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
index b38e7184c798..e896134e0af9 100644
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
@@ -62,8 +62,6 @@ import java.lang.reflect.Method;
import java.net.URL;
import java.util.UUID;
-import org.torproject.android.service.util.Prefs;
-
public class GeckoApplication extends Application
implements HapticFeedbackDelegate {
private static final String LOG_TAG = "GeckoApplication";
@@ -321,9 +319,6 @@ public class GeckoApplication extends Application
"Profile:Create",
null);
- // Give Orbot the base Context
- Prefs.setContext(context);
-
super.onCreate();
}
diff --git a/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java b/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java
index 4cd94ed538c7..e8f8facc24c6 100644
--- a/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java
+++ b/mobile/android/base/java/org/mozilla/gecko/LauncherActivity.java
@@ -45,9 +45,6 @@ import static org.mozilla.gecko.deeplink.DeepLinkContract.LINK_FXA_SIGNIN;
import org.mozilla.gecko.deeplink.DeepLinkContract;
-import org.torproject.android.OrbotMainActivity;
-import org.torproject.android.service.TorServiceConstants;
-
/**
* Activity that receives incoming Intents and dispatches them to the appropriate activities (e.g. browser, custom tabs, web app).
*/
@@ -70,9 +67,6 @@ public class LauncherActivity extends Activity {
} else if (isWebAppIntent(safeIntent)) {
dispatchWebAppIntent();
- } else if (TorServiceConstants.TOR_APP_USERNAME.equals(getIntent().getAction())) {
- dispatchOrbotIntent();
-
// If it's not a view intent, it won't be a custom tabs intent either. Just launch!
} else if (!isViewIntentWithURL(safeIntent)) {
dispatchNormalIntent();
@@ -122,18 +116,6 @@ public class LauncherActivity extends Activity {
startActivity(intent);
}
- private void dispatchOrbotIntent() {
- final String orbotStartAction = "android.intent.action.MAIN";
- final Intent intent = new Intent(orbotStartAction, null, this, OrbotMainActivity.class);
-
- //When we launch Orbot, we want a new task.
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
- intent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
-
- startActivity(intent);
- }
-
private void dispatchUrlIntent(@NonNull String url) {
Intent intent = new Intent(getIntent());
intent.setData(Uri.parse(url));
diff --git a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java
index c66d67f32787..d8392a801e13 100644
--- a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java
+++ b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java
@@ -28,8 +28,6 @@ import org.mozilla.gecko.NotificationListener;
import org.mozilla.gecko.R;
import org.mozilla.gecko.util.BitmapUtils;
-import org.torproject.android.service.util.NotificationBuilderCompat;
-
/**
* Client for posting notifications.
*/
@@ -144,7 +142,7 @@ public final class NotificationClient implements NotificationListener {
private void add(final String name, final String imageUrl, final String host,
final String alertTitle, final String alertText,
final PendingIntent contentIntent, final PendingIntent deleteIntent) {
- final NotificationBuilderCompat builder = new NotificationBuilderCompat(mContext)
+ final NotificationCompat.Builder builder = new NotificationCompat.Builder(mContext)
.setContentTitle(alertTitle)
.setContentText(alertText)
.setSmallIcon(R.drawable.ic_status_logo)
@@ -152,7 +150,7 @@ public final class NotificationClient implements NotificationListener {
.setDeleteIntent(deleteIntent)
.setAutoCancel(true)
.setDefaults(Notification.DEFAULT_SOUND)
- .setStyle(new Notification.BigTextStyle()
+ .setStyle(new NotificationCompat.BigTextStyle()
.bigText(alertText)
.setSummaryText(host));
diff --git a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java
index 35366609da49..34ea99882d9a 100644
--- a/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java
+++ b/mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java
@@ -32,11 +32,10 @@ import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.graphics.Bitmap;
import android.net.Uri;
+import android.support.v4.app.NotificationCompat;
import android.support.v4.util.SimpleArrayMap;
import android.util.Log;
-import org.torproject.android.service.util.NotificationBuilderCompat;
-
public final class NotificationHelper implements BundleEventListener {
public static final String HELPER_BROADCAST_ACTION = AppConstants.ANDROID_PACKAGE_NAME + ".helperBroadcastAction";
@@ -234,7 +233,7 @@ public final class NotificationHelper implements BundleEventListener {
private void showNotification(final GeckoBundle message) {
ThreadUtils.assertOnUiThread();
- final NotificationBuilderCompat builder = new NotificationBuilderCompat(mContext);
+ final NotificationCompat.Builder builder = new NotificationCompat.Builder(mContext);
// These attributes are required
final String id = message.getString(ID_ATTR);
diff --git a/mobile/android/config/proguard/proguard.cfg b/mobile/android/config/proguard/proguard.cfg
index 3d03e3107c72..0be8a745e44b 100644
--- a/mobile/android/config/proguard/proguard.cfg
+++ b/mobile/android/config/proguard/proguard.cfg
@@ -165,21 +165,6 @@
# See: http://stackoverflow.com/questions/22441366/note-android-support-v4-text-ic…
-dontnote android.support.**
-# From https://github.com/square/okhttp/blob/master/okhttp/src/main/resources/META…
-# JSR 305 annotations are for embedding nullability information.
--dontwarn javax.annotation.**
-
-# A resource is loaded with a relative path so the package of this class must be preserved.
--keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
-
-# Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java.
--dontwarn org.codehaus.mojo.animal_sniffer.*
-
-# OkHttp platform used only on JVM and when Conscrypt dependency is available.
--dontwarn okhttp3.internal.platform.ConscryptPlatform
-
-#-keepnames class org.torproject.*
-
-include "adjust-keeps.cfg"
-include "leakcanary-keeps.cfg"
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java
index 41c2c7e705a1..f05716fe1d09 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java
@@ -30,8 +30,8 @@ import java.util.List;
public class ProxySelector {
private static final String TOR_PROXY_ADDRESS = "127.0.0.1";
- private static final int TOR_SOCKS_PROXY_PORT = 9150;
- private static final int TOR_HTTP_PROXY_PORT = 8218;
+ private static final int TOR_SOCKS_PROXY_PORT = 9050;
+ private static final int TOR_HTTP_PROXY_PORT = 8118;
public static URLConnection openConnectionWithProxy(URI uri) throws IOException {
java.net.ProxySelector ps = java.net.ProxySelector.getDefault();
1
0