- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 1474659 Part 2 - Add dedicated AllocKinds just for ArrayBufferObjects. r?sfink
by gk＠torproject.org 10 Jan '19

10 Jan '19

commit 4aa3f9efbdfa62123ed657ce27231ff27d36d9d2 Author: Matt Howell <mhowell(a)mozilla.com> Date: Tue Jan 8 09:01:25 2019 +0000 Bug 1474659 Part 2 - Add dedicated AllocKinds just for ArrayBufferObjects. r?sfink The reason for doing this is to get ArrayBufferObjects allocated into their own arenas. The specific enum values were chosen to avoid breaking assumptions about where certain values fall in the list, such as OBJECT_FIRST == FUNCTION. --- js/src/gc/AllocKind.h | 4 ++++ js/src/gc/GC.cpp | 12 ++++++++++++ js/src/gc/GCRuntime.h | 2 +- js/src/gc/ObjectKind-inl.h | 4 ++++ js/src/vm/ArrayBufferObject.cpp | 17 ++++++++++++++++- 5 files changed, 37 insertions(+), 2 deletions(-) diff --git a/js/src/gc/AllocKind.h b/js/src/gc/AllocKind.h index c4f52bc5bf41..a9cee3a34fb4 100644 --- a/js/src/gc/AllocKind.h +++ b/js/src/gc/AllocKind.h @@ -43,12 +43,16 @@ namespace gc { D(OBJECT0_BACKGROUND, Object, JSObject, JSObject_Slots0, true, true) \ D(OBJECT2, Object, JSObject, JSObject_Slots2, false, false) \ D(OBJECT2_BACKGROUND, Object, JSObject, JSObject_Slots2, true, true) \ + D(ARRAYBUFFER4, Object, JSObject, JSObject_Slots4, true, true) \ D(OBJECT4, Object, JSObject, JSObject_Slots4, false, false) \ D(OBJECT4_BACKGROUND, Object, JSObject, JSObject_Slots4, true, true) \ + D(ARRAYBUFFER8, Object, JSObject, JSObject_Slots8, true, true) \ D(OBJECT8, Object, JSObject, JSObject_Slots8, false, false) \ D(OBJECT8_BACKGROUND, Object, JSObject, JSObject_Slots8, true, true) \ + D(ARRAYBUFFER12, Object, JSObject, JSObject_Slots12, true, true) \ D(OBJECT12, Object, JSObject, JSObject_Slots12, false, false) \ D(OBJECT12_BACKGROUND, Object, JSObject, JSObject_Slots12, true, true) \ + D(ARRAYBUFFER16, Object, JSObject, JSObject_Slots16, true, true) \ D(OBJECT16, Object, JSObject, JSObject_Slots16, false, false) \ D(OBJECT16_BACKGROUND, Object, JSObject, JSObject_Slots16, true, true) diff --git a/js/src/gc/GC.cpp b/js/src/gc/GC.cpp index 8eeeb9ce72ff..27504c5e8fc6 100644 --- a/js/src/gc/GC.cpp +++ b/js/src/gc/GC.cpp @@ -467,9 +467,13 @@ static const FinalizePhase BackgroundFinalizePhases[] = { AllocKind::FUNCTION_EXTENDED, AllocKind::OBJECT0_BACKGROUND, AllocKind::OBJECT2_BACKGROUND, + AllocKind::ARRAYBUFFER4, AllocKind::OBJECT4_BACKGROUND, + AllocKind::ARRAYBUFFER8, AllocKind::OBJECT8_BACKGROUND, + AllocKind::ARRAYBUFFER12, AllocKind::OBJECT12_BACKGROUND, + AllocKind::ARRAYBUFFER16, AllocKind::OBJECT16_BACKGROUND } }, @@ -2093,12 +2097,16 @@ static const AllocKind AllocKindsToRelocate[] = { AllocKind::OBJECT0_BACKGROUND, AllocKind::OBJECT2, AllocKind::OBJECT2_BACKGROUND, + AllocKind::ARRAYBUFFER4, AllocKind::OBJECT4, AllocKind::OBJECT4_BACKGROUND, + AllocKind::ARRAYBUFFER8, AllocKind::OBJECT8, AllocKind::OBJECT8_BACKGROUND, + AllocKind::ARRAYBUFFER12, AllocKind::OBJECT12, AllocKind::OBJECT12_BACKGROUND, + AllocKind::ARRAYBUFFER16, AllocKind::OBJECT16, AllocKind::OBJECT16_BACKGROUND, AllocKind::SCRIPT, @@ -2812,12 +2820,16 @@ static const AllocKinds UpdatePhaseObjects { AllocKind::OBJECT0_BACKGROUND, AllocKind::OBJECT2, AllocKind::OBJECT2_BACKGROUND, + AllocKind::ARRAYBUFFER4, AllocKind::OBJECT4, AllocKind::OBJECT4_BACKGROUND, + AllocKind::ARRAYBUFFER8, AllocKind::OBJECT8, AllocKind::OBJECT8_BACKGROUND, + AllocKind::ARRAYBUFFER12, AllocKind::OBJECT12, AllocKind::OBJECT12_BACKGROUND, + AllocKind::ARRAYBUFFER16, AllocKind::OBJECT16, AllocKind::OBJECT16_BACKGROUND }; diff --git a/js/src/gc/GCRuntime.h b/js/src/gc/GCRuntime.h index d6ca9ddc94fc..639481fbda54 100644 --- a/js/src/gc/GCRuntime.h +++ b/js/src/gc/GCRuntime.h @@ -186,7 +186,7 @@ class ChainedIter typedef HashMap<Value*, const char*, DefaultHasher<Value*>, SystemAllocPolicy> RootedValueMap; -using AllocKinds = mozilla::EnumSet<AllocKind>; +using AllocKinds = mozilla::EnumSet<AllocKind, uint64_t>; // A singly linked list of zones. class ZoneList diff --git a/js/src/gc/ObjectKind-inl.h b/js/src/gc/ObjectKind-inl.h index d2cde1da08dc..106fbc012132 100644 --- a/js/src/gc/ObjectKind-inl.h +++ b/js/src/gc/ObjectKind-inl.h @@ -124,15 +124,19 @@ GetGCKindSlots(AllocKind thingKind) case AllocKind::OBJECT2: case AllocKind::OBJECT2_BACKGROUND: return 2; + case AllocKind::ARRAYBUFFER4: case AllocKind::OBJECT4: case AllocKind::OBJECT4_BACKGROUND: return 4; + case AllocKind::ARRAYBUFFER8: case AllocKind::OBJECT8: case AllocKind::OBJECT8_BACKGROUND: return 8; + case AllocKind::ARRAYBUFFER12: case AllocKind::OBJECT12: case AllocKind::OBJECT12_BACKGROUND: return 12; + case AllocKind::ARRAYBUFFER16: case AllocKind::OBJECT16: case AllocKind::OBJECT16_BACKGROUND: return 16; diff --git a/js/src/vm/ArrayBufferObject.cpp b/js/src/vm/ArrayBufferObject.cpp index 0a342a6850c7..ef63b046ea12 100644 --- a/js/src/vm/ArrayBufferObject.cpp +++ b/js/src/vm/ArrayBufferObject.cpp @@ -1160,6 +1160,21 @@ ArrayBufferObject::setFlags(uint32_t flags) setSlot(FLAGS_SLOT, Int32Value(flags)); } +static inline AllocKind +GetArrayBufferGCObjectKind(size_t numSlots) +{ + if (numSlots <= 4) { + return AllocKind::ARRAYBUFFER4; + } + if (numSlots <= 8) { + return AllocKind::ARRAYBUFFER8; + } + if (numSlots <= 12) { + return AllocKind::ARRAYBUFFER12; + } + return AllocKind::ARRAYBUFFER16; +} + ArrayBufferObject* ArrayBufferObject::create(JSContext* cx, uint32_t nbytes, BufferContents contents, OwnsState ownsState /* = OwnsData */, @@ -1220,7 +1235,7 @@ ArrayBufferObject::create(JSContext* cx, uint32_t nbytes, BufferContents content } MOZ_ASSERT(!(class_.flags & JSCLASS_HAS_PRIVATE)); - gc::AllocKind allocKind = GetGCObjectKind(nslots); + gc::AllocKind allocKind = GetArrayBufferGCObjectKind(nslots); AutoSetNewObjectMetadata metadata(cx); Rooted<ArrayBufferObject*> obj(cx,

1 0

[tor-browser-build/maint-8.0] Update NoScript to version 10.2.1
by gk＠torproject.org 30 Dec '18

30 Dec '18

commit b35cea6792f294d0a625fde5595f1c96a8a2a72a Author: Georg Koppen <gk(a)torproject.org> Date: Sun Dec 30 13:14:50 2018 +0000 Update NoScript to version 10.2.1 The NoScript update fixes #28873 and #28720 on our side. --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 1a37ea1..3823552 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -71,9 +71,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 23c7783eecabeb044aa1e38c93d43ce7c41957b1ea031016d39737712729c81d + sha256sum: 3c16519f834863e74711950db386f326501a4bed79b55c24cc731df130443877 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[tor-browser-build/master] Update NoScript to version 10.1.2
by gk＠torproject.org 30 Dec '18

30 Dec '18

commit b32e182633bba7733b635bc5dd0fcbd55436f4d7 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Dec 30 13:14:50 2018 +0000 Update NoScript to version 10.1.2 The NoScript update fixes #28873 and #28720 on our side. --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 6199954..c4f25ff 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -89,9 +89,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 23c7783eecabeb044aa1e38c93d43ce7c41957b1ea031016d39737712729c81d + sha256sum: 3c16519f834863e74711950db386f326501a4bed79b55c24cc731df130443877 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[tor-browser-build/master] Bug 28784: Pass --force --delete_unversioned_trees --reset to "gclient sync".
by gk＠torproject.org 20 Dec '18

20 Dec '18

commit 1b7e0de3690364bfdd29889676f5ff8ec6b1cd3b Author: David Fifield <david(a)bamsoftware.com> Date: Thu Dec 20 03:17:25 2018 +0000 Bug 28784: Pass --force --delete_unversioned_trees --reset to "gclient sync". This is supposed to remove and reset modified or unversioned files. This ought to work around the problem with versioning of src/testing/gmock and src/testing/gtest across upgrades. $ gclient help sync -f, --force force update even for unchanged modules -D, --delete_unversioned_trees Deletes from the working copy any dependencies that have been removed since the last sync, as long as there are no local modifications. When used with --force, such dependencies are removed even if they have local modifications. When used with --reset, all untracked directories are removed from the working copy, excluding those which are explicitly ignored in the repository. -R, --reset resets any local changes before updating (git only) --- projects/webrtc/config | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/projects/webrtc/config b/projects/webrtc/config index 2955095..37b4615 100644 --- a/projects/webrtc/config +++ b/projects/webrtc/config @@ -102,11 +102,8 @@ steps: git config diff.ignoreSubmodules all cd .. fi - # Delete the unversioned gmock and gtest directories, which cause "gclient sync" - # to fail when upgrading between webrtc branch-heads/58 and branch-heads/64. - rm -rf src/testing/gmock src/testing/gtest # "gclient" is part of depot_tools. This download takes a long time the first time. - gclient sync --no-history --with_branch_heads -r [% c("var/webrtc_tag") %] + gclient sync --force --delete_unversioned_trees --reset --no-history --with_branch_heads -r [% c("var/webrtc_tag") %] cd .. tar --exclude .git -czf [% dest_dir _ '/' _ c('filename') %] webrtc input_files:

1 0

[tor-browser-build/master] Bug 28752: Don't download tor-android-binary resources during build
by gk＠torproject.org 19 Dec '18

19 Dec '18

commit 9b0b7b5159e670e04d5705350f33f8b2aa056634 Author: sisbell <shane.isbell(a)gmail.com> Date: Sun Dec 16 12:57:25 2018 -0800 Bug 28752: Don't download tor-android-binary resources during build --- projects/firefox/build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index da82862..b9d9d5a 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -99,9 +99,14 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig [% IF c("var/android") %] export GRADLE_MAVEN_REPOSITORIES="file:///var/tmp/gradle-dependencies" + gradle_repo=/var/tmp/gradle-dependencies # Move Gradle Repo to hard-coded location. This location is embedded in the file # chrome/toolkit/content/global/buildconfig.html so needs to be standard for reproducibility - mv $rootdir/[% c('input_files_by_name/gradle-dependencies') %] /var/tmp/gradle-dependencies + mv $rootdir/[% c('input_files_by_name/gradle-dependencies') %] $gradle_repo + # The download script assumes the artifact package name is the complete URL path. + # In some cases this is incorrect, so copy those artifacts to the correct location + cp -r $gradle_repo/guardianproject/gpmaven/master/* $gradle_repo + # Move orbot files so they will be included in the apk during the build cp $rootdir/[% c('input_files_by_name/orbot') %]/* mobile/android/app # Prepare building the multi-locale .apk mkdir -p /var/tmp/dist/locales

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 28640 - Reload distribution preferences on update
by gk＠torproject.org 14 Dec '18

14 Dec '18

commit 3c43ec1e862040767030bb5104c41265823ec8a5 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Nov 29 20:33:14 2018 +0000 Bug 28640 - Reload distribution preferences on update --- .../mozilla/gecko/distribution/Distribution.java | 21 +++++++++++++++++++++ 1 file changed, 21 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..2e2d07d58914 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; @@ -247,6 +249,18 @@ public class Distribution { data = new GeckoBundle(1); data.putString("preferences", preferencesJSON); + // Only overwrite the current preferences if we upgraded. + // This isn't the best behavior because if the user + // changed one of the preferences, then this overwrites + // it. What we really want is a feature where we can + // set a new preference if the current value wasn't + // user-modified. This implementation doesn't support + // something like that. #28842 + final SharedPreferences settings = distribution.getSharedPreferences(); + if (!AppConstants.MOZ_APP_BUILDID.equals(settings.getString(GeckoPreferences.PREFS_APP_UPDATE_LAST_BUILD_ID, null))) { + DistroSharedPrefsImport.importPreferences(distribution.context, distribution); + } + } catch (IOException e) { Log.e(LOGTAG, "Error getting distribution descriptor file.", e); } @@ -498,6 +512,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.4.0esr-8.5-1] Bug 28640 - Try showing the homepage after the Distribution loads
by gk＠torproject.org 14 Dec '18

14 Dec '18

commit b507541d50f3831c847be2104e5baec3104df2ba 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.4.0esr-8.5-1] Bug 28507 - Don't call Push and Sync services during Sanitize
by gk＠torproject.org 14 Dec '18

14 Dec '18

commit a3754ec3a532e489207ce12781a4b6fb5a1daa37 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Nov 30 04:51:05 2018 +0000 Bug 28507 - Don't call Push and Sync services during Sanitize --- mobile/android/modules/Sanitizer.jsm | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/mobile/android/modules/Sanitizer.jsm b/mobile/android/modules/Sanitizer.jsm index 3782c92172f9..6b26e709df0a 100644 --- a/mobile/android/modules/Sanitizer.jsm +++ b/mobile/android/modules/Sanitizer.jsm @@ -124,18 +124,9 @@ Sanitizer.prototype = { sss.clearAll(); // Clear push subscriptions - yield new Promise((resolve, reject) => { - let push = Cc["@mozilla.org/push/Service;1"] - .getService(Ci.nsIPushService); - push.clearForDomain("*", status => { - if (Components.isSuccessCode(status)) { - resolve(); - } else { - reject(new Error("Error clearing push subscriptions: " + - status)); - } - }); - }); + // Avoid throwing an error because Ci.nsIPushService isn't implemented + // All other clearing actions should succeed if we arrive here. + Promise.resolve(); TelemetryStopwatch.finish("FX_SANITIZE_SITESETTINGS", refObj); }), @@ -344,11 +335,8 @@ Sanitizer.prototype = { }, canClear: function(aCallback) { - Accounts.anySyncAccountsExist().then(aCallback) - .catch(function(err) { - Cu.reportError("Java-side synced tabs clearing failed: " + err); - aCallback(false); - }); + // We can't clear syncedTabs because Sync is non-functional + aCallback(false); } }

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Revert "Bug 28640 - Push notifications are disabled, so don't clear them"
by gk＠torproject.org 14 Dec '18

14 Dec '18

commit 0b36c3e8a59bf675ac6bd1ae36d38f16c4748884 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 14 20:05:58 2018 +0000 Revert "Bug 28640 - Push notifications are disabled, so don't clear them" This reverts commit 1d5d94a68d95f675c108f377a1b9e02ee16b15bb. --- mobile/android/modules/Sanitizer.jsm | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/mobile/android/modules/Sanitizer.jsm b/mobile/android/modules/Sanitizer.jsm index 2940dd81b217..3782c92172f9 100644 --- a/mobile/android/modules/Sanitizer.jsm +++ b/mobile/android/modules/Sanitizer.jsm @@ -124,23 +124,18 @@ Sanitizer.prototype = { sss.clearAll(); // Clear push subscriptions - // Avoid throwing an error because nsIPushService isn't implemented yield new Promise((resolve, reject) => { - reject(new Error("Error clearing push subscriptions")); + let push = Cc["@mozilla.org/push/Service;1"] + .getService(Ci.nsIPushService); + push.clearForDomain("*", status => { + if (Components.isSuccessCode(status)) { + resolve(); + } else { + reject(new Error("Error clearing push subscriptions: " + + status)); + } + }); }); - - //yield new Promise((resolve, reject) => { - // let push = Cc["@mozilla.org/push/Service;1"] - // .getService(Ci.nsIPushService); - // push.clearForDomain("*", status => { - // if (Components.isSuccessCode(status)) { - // resolve(); - // } else { - // reject(new Error("Error clearing push subscriptions: " + - // status)); - // } - // }); - //}); TelemetryStopwatch.finish("FX_SANITIZE_SITESETTINGS", refObj); }),

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Revert "Bug 28640: Try showing the homepage after the distribution loads"
by gk＠torproject.org 14 Dec '18

14 Dec '18

commit 955bb4e6e38b83a474600a112182ac64ed6aba56 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 14 20:04:06 2018 +0000 Revert "Bug 28640: Try showing the homepage after the distribution loads" This reverts commit ae00e455712e51453730ced526dc71dac9893344. --- .../base/java/org/mozilla/gecko/BrowserApp.java | 23 ---------------------- 1 file changed, 23 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 9330a6ba9838..814b46f24295 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -3155,29 +3155,6 @@ 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.4.0esr-8.5-1] Revert "Bug 28640: Do not load Torbutton from the user's profile (only on Android)"
by gk＠torproject.org 14 Dec '18

14 Dec '18

commit 394819bf1afed389183714579d3d7ebafea0c0c0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 14 19:58:24 2018 +0000 Revert "Bug 28640: Do not load Torbutton from the user's profile (only on Android)" This reverts commit 228b36c63fa089ce37d2713fc7b095dacdb9b338. --- toolkit/mozapps/extensions/internal/XPIProvider.jsm | 11 ----------- toolkit/mozapps/extensions/internal/moz.build | 5 +---- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index 41391d2d6c51..ddd337038659 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -1603,17 +1603,6 @@ 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 32b75a5cef68..8661ef7125dd 100644 --- a/toolkit/mozapps/extensions/internal/moz.build +++ b/toolkit/mozapps/extensions/internal/moz.build @@ -15,11 +15,8 @@ EXTRA_JS_MODULES.addons += [ 'ProductAddonChecker.jsm', 'SpellCheckDictionaryBootstrap.js', 'XPIInstall.jsm', - 'XPIProviderUtils.js', -] - -EXTRA_PP_JS_MODULES.addons += [ 'XPIProvider.jsm', + 'XPIProviderUtils.js', ] TESTING_JS_MODULES += [

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 28640 - Uninstall torbutton in the user profile on Android
by gk＠torproject.org 14 Dec '18

14 Dec '18

commit b2148509da11c2f9188e609edbeca386880f61cc Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Nov 29 20:33:05 2018 +0000 Bug 28640 - Uninstall torbutton in the user profile on Android --- toolkit/mozapps/extensions/internal/XPIProvider.jsm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index ddd337038659..c9b01bdc7395 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -1603,6 +1603,16 @@ var XPIStates = { for (let [id, file] of location.getAddonLocations(true)) { knownIds.delete(id); + // Uninstall torbutton if it is installed in the user profile on Android + if (AppConstants.platform === "android" && + id === "torbutton(a)torproject.org" && + location.name === KEY_APP_PROFILE) { + logger.debug("Uninstalling torbutton from user profile."); + location.uninstallAddon(id); + changed = true; + continue; + } + let xpiState = loc.get(id); if (!xpiState) { logger.debug("New add-on ${id} in ${location}", {id, location: location.name});

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Revert "Bug 28640: Reload distribution preferences when a new version of the app is installed"
by gk＠torproject.org 14 Dec '18

14 Dec '18

commit 8b78836cdad4d4b81f2b76c5ac4d62c42fda8049 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 14 19:59:33 2018 +0000 Revert "Bug 28640: Reload distribution preferences when a new version of the app is installed" This reverts commit 35d8c07dbf9a8f4e78a00513374d97267b90958c. --- .../base/java/org/mozilla/gecko/distribution/Distribution.java | 10 ---------- 1 file changed, 10 deletions(-) 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 93c325e451bd..ea9534bfd741 100644 --- a/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java +++ b/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java @@ -43,9 +43,7 @@ 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; @@ -248,7 +246,6 @@ 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); @@ -501,13 +498,6 @@ 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-build/master] Bug 28850: Update some gradle dependencies URLs
by gk＠torproject.org 14 Dec '18

14 Dec '18

commit 361f30cf97228e232b45ba6ba202242405491e36 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Dec 14 11:35:23 2018 +0100 Bug 28850: Update some gradle dependencies URLs --- projects/firefox/gradle-dependencies-list.txt | 16 ++++++++-------- projects/orbot/gradle-dependencies-list.txt | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/projects/firefox/gradle-dependencies-list.txt b/projects/firefox/gradle-dependencies-list.txt index da078c0..46f12c8 100644 --- a/projects/firefox/gradle-dependencies-list.txt +++ b/projects/firefox/gradle-dependencies-list.txt @@ -8,7 +8,7 @@ d46777ad3ea8bca73491b2e02fc85b3664486abf5314cc4dc6740908bd855330 | https://jcent 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 +2ec779741f72313fc6623d0f0e42b2450dd2425dd6ad319697e658aae9ae177b | https://maven.google.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 @@ -18,7 +18,7 @@ f09330e83f0e3a3f6648ee43a6814ee3a91df699adf7446d6f1f38e95e34cd88 | https://raw.g 8c6191e0dd8bfdc862332cb79b08185ac5b63565d405dac2605be4c2b19774bd | https://jcenter.bintray.com/com/android/tools/external/lombok/lombok-ast/0.… 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/… +bede73084ec812b916f686cc6e47625bd0756154bef589a4c2b419e54a393bf5 | https://maven.google.com/com/android/tools/build/manifest-merger/26.0.1/man… 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… @@ -32,7 +32,7 @@ e824935c264b041e847b67808aee704f8cd47d698203259057e42f473e1f6f30 | https://maven 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… +b27bbb9d269a97be8ff0ac480c0f09c9a953f62e6ff05d90fcbb0ddb4de97c77 | https://maven.google.com/com/android/tools/common/26.0.1/common-26.0.1.jar 58aa4df8faae90e484c0bc47494a1ec97dc51fe53eae2b4a70d60ea7489cdf8c | https://maven.google.com/com/android/tools/external/com-intellij/intellij-c… 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… @@ -60,7 +60,7 @@ d125b3ade9f694ae60ef835f5ae000b6ba35fba8c34bafd8b40a1961375e63fa | https://jcent 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 +70c458dcf6040317b41ddf50a7d53a02b8a85b0723b36cde9562c59e3cd11dae | https://maven.google.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… @@ -193,7 +193,7 @@ f095c882716d49269a806685dcb256fa6a36389b2713ac56bb758bf8693565a2 | https://jcent 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.… +07f08b315c812406e9d497e1b592689742feb3950c1a713f95e2692d3e15b619 | https://maven.google.com/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.0.1… 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 @@ -254,7 +254,7 @@ bfadb3b40f65dd6de1666d6b29f8bb54031396c76eeef4146cf9f28255f8bf33 | https://jcent 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/… +052b0d2b58e5df4f30e4f64bdf5414473f6cfa10147f8f8d89cb0b63316ba8f3 | https://maven.google.com/com/android/tools/build/manifest-merger/26.0.1/man… 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 @@ -264,7 +264,7 @@ d135cff96dcbbc8a5fab30180e557cae620373cf26941d4c738a88896a2d98ed | https://jcent f5655d331af6afcd4dbaedaa739b889380c771a7e83f7aea5c8544a05074cf0b | https://jcenter.bintray.com/nekohtml/nekohtml/1.9.6.2/nekohtml-1.9.6.2.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… +e30f1db6058f745f26112ef309f89becb27c617c7d9e4c6e02165a7620a92e6a | https://maven.google.com/com/android/tools/common/26.0.1/common-26.0.1.pom 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… @@ -276,7 +276,7 @@ d7d77326867e6d903156ebb18c244819b26aebe3aa82a1c57081081a0b6c4f63 | https://jcent 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.… +81f73f8b25b430f5a40a39727bbcef653a1d0868cc69233b44e4282ce5a94ff9 | https://maven.google.com/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.0.1… 326ba49aa7a35e07b6cc592ad7a5b0f86f4667051a8e70e7639c54bc0c356dee | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.1.60/kotli… 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 diff --git a/projects/orbot/gradle-dependencies-list.txt b/projects/orbot/gradle-dependencies-list.txt index c0243f7..a7d14ba 100644 --- a/projects/orbot/gradle-dependencies-list.txt +++ b/projects/orbot/gradle-dependencies-list.txt @@ -80,7 +80,7 @@ d48935ae1641774e03ce24b0b3f7aeee66931a1e5d9ad4d47b5f93d237ea07fb | https://dl.go 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/… +052b0d2b58e5df4f30e4f64bdf5414473f6cfa10147f8f8d89cb0b63316ba8f3 | https://maven.google.com/com/android/tools/build/manifest-merger/26.0.1/man… 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… @@ -102,7 +102,7 @@ db3cd95bec1001605e1653f2843e8542e712fa2bb672fd9c8c1ace86c57673d1 | https://jcent 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 +70c458dcf6040317b41ddf50a7d53a02b8a85b0723b36cde9562c59e3cd11dae | https://maven.google.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… @@ -115,7 +115,7 @@ f8ab13b14be080fe2f617f90e55599760e4a1b4deeea5c595df63d0d6375ed6d | https://jcent 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 +2ec779741f72313fc6623d0f0e42b2450dd2425dd6ad319697e658aae9ae177b | https://maven.google.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 @@ -135,20 +135,20 @@ e8b4151ae1679f1abe7a14ee371ac9b3c651ae7b63290d1f586bdd0f78face9a | https://jcent 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… +e30f1db6058f745f26112ef309f89becb27c617c7d9e4c6e02165a7620a92e6a | https://maven.google.com/com/android/tools/common/26.0.1/common-26.0.1.pom 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… +b27bbb9d269a97be8ff0ac480c0f09c9a953f62e6ff05d90fcbb0ddb4de97c77 | https://maven.google.com/com/android/tools/common/26.0.1/common-26.0.1.jar 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.… +81f73f8b25b430f5a40a39727bbcef653a1d0868cc69233b44e4282ce5a94ff9 | https://maven.google.com/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.0.1… 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.… @@ -156,7 +156,7 @@ d3d96637b0e8e61046567b8c87b667dcf3cd31c7447f651cb58d6e6e744adfba | https://dl.go 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/… +bede73084ec812b916f686cc6e47625bd0756154bef589a4c2b419e54a393bf5 | https://maven.google.com/com/android/tools/build/manifest-merger/26.0.1/man… 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-… @@ -182,7 +182,7 @@ b6eb99f1362b8344ca5400d57a35c49e3504f23f3dee304fdb879d4d953f4bc6 | https://jcent 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.… +07f08b315c812406e9d497e1b592689742feb3950c1a713f95e2692d3e15b619 | https://maven.google.com/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.0.1… 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.…

1 0

[torbutton/master] Fold in stable CHANGELOG
by gk＠torproject.org 12 Dec '18

12 Dec '18

commit 5181397d7282db3ee95a2833b34b26cf5886a295 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 12 08:35:05 2018 +0000 Fold in stable CHANGELOG --- src/CHANGELOG | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index 6f5b3f3b..2c41ed83 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -5,6 +5,11 @@ * Bug 28747: Remove NoScript (XPCOM) related unused code * Translations update +2.0.9 + * Bug 28540: Use new text for 2018 donation banner + * Bug 28515: Use en-US for english Torbutton strings + * Translations update + 2.1.2 * Bug 25013: Integrate Torbutton into tor-browser for Android * Bug 27111: Update about:tor desktop version to work on mobile

1 0

[tor-browser-build/master] Fold in stable changelog
by gk＠torproject.org 12 Dec '18

12 Dec '18

commit 354dd671031b0f42e1133e70586699340f5fafed Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 12 08:33:23 2018 +0000 Fold in stable changelog --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index bf58398..bd59467 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -27,6 +27,34 @@ Tor Browser 8.5a6 -- December 11 2018 * Bug 28696: Make path to Gradle dependencies reproducible * Bug 28697: Use pregenerated keystore and fix timestamp issues +Tor Browser 8.0.4 -- December 11 2018 + * All platforms + * Update Firefox to 60.4.0esr + * Update Tor to 0.3.4.9 + * Update OpenSSL to 1.0.2q + * Update Torbutton to 2.0.9 + * Bug 28540: Use new text for 2018 donation banner + * Bug 28515: Use en-US for english Torbutton strings + * Translations update + * Update HTTPS Everywhere to 2018.10.31 + * Update NoScript to 10.2.0 + * Bug 1623: Block protocol handler enumeration (backport of fix for #680300) + * Bug 25794: Disable pointer events + * Bug 28608: Disable background HTTP response throttling + * Bug 28185: Add smallerRichard to Tor Browser + * Windows + * Bug 26381: about:tor page does not load on first start on Windows + * Bug 28657: Remove broken FTE bridge from Tor Browser + * OS X + * Bug 26263: App icon positioned incorrectly in macOS DMG installer window + * Bug 26475: Fix Stylo related reproducibility issue + * Linux + * Bug 26475: Fix Stylo related reproducibility issue + * Bug 28657: Remove broken FTE bridge from Tor Browser + * Build System + * All Platforms + * Bug 27218: Generate multiple Tor Browser bundles in parallel + Tor Browser 8.5a5 -- December 3 2018 * All Platforms * Update Torbutton to 2.1.2

1 0

[tor-browser-build/master] Changelog fixes
by gk＠torproject.org 12 Dec '18

12 Dec '18

commit b69a9169e0c2d1a8101d16450bc73ff352d8c5d5 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 12 07:25:01 2018 +0000 Changelog fixes Thanks to a cypherpunk for mentioning the missing pointer events item on the blog. --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index c1a3197..bf58398 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,7 +1,6 @@ Tor Browser 8.5a6 -- December 11 2018 * All Platforms * Update Firefox to 60.4.0esr - * Update OpenSSL to 1.0.2q * Update Torbutton to 2.1.3 * Bug 28540: Use new text for 2018 donation banner * Bug 27290: Remove WebGL pref for min capability mode @@ -12,8 +11,14 @@ Tor Browser 8.5a6 -- December 11 2018 * Bug 28695: Set default security.pki.name_matching_mode to enforce (3) * Bug 27290: Remove WebGL pref for min capability mode * Bug 27919: Backport SSL status API + * Bug 25794: Disable pointer events * Windows + * Update OpenSSL to 1.0.2q * Bug 28740: Adapt Windows navigator.platform value on 64-bit systems + * OS X + * Update OpenSSL to 1.0.2q + * Linux + * Update OpenSSL to 1.0.2q * Android * Bug 26843: Multi-locale support for Tor Browser on Android * Build System

1 0

[tor-browser-build/master] Fix typos in Changelog
by gk＠torproject.org 11 Dec '18

11 Dec '18

commit f02cc1a47652ca7429ef2819aee6068fda7ac4f4 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 11 15:34:36 2018 +0000 Fix typos in Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 13ab9c9..c1a3197 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -103,9 +103,9 @@ Tor Browser 8.5a4 -- October 23 2018 * Bug 28002: Fix the precomplete file in the en-US installer * OS X * Bug 26263: App icon positioned incorrectly in macOS DMG installer window - * Bug 26475: Fix Stylo related reproducibilitiy issue + * Bug 26475: Fix Stylo related reproducibility issue * Linux - * Bug 26475: Fix Stylo related reproducibilitiy issue + * Bug 26475: Fix Stylo related reproducibility issue * Bug 28022: Use `/usr/bin/env bash` for bash invocation * Android * Backport of fixes for bug 1448014, 1458905, 1441345, and 1448305

1 0

[tor-browser-build/maint-8.0] Fixing typos
by gk＠torproject.org 11 Dec '18

11 Dec '18

commit 36ee87d15c7d114fc801b2cd64e99a0c530cb5d8 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 11 15:32:01 2018 +0000 Fixing typos --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index d347684..156b812 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -18,9 +18,9 @@ Tor Browser 8.0.4 -- December 11 2018 * Bug 28657: Remove broken FTE bridge from Tor Browser * OS X * Bug 26263: App icon positioned incorrectly in macOS DMG installer window - * Bug 26475: Fix Stylo related reproducibilitiy issue + * Bug 26475: Fix Stylo related reproducibility issue * Linux - * Bug 26475: Fix Stylo related reproducibilitiy issue + * Bug 26475: Fix Stylo related reproducibility issue * Bug 28657: Remove broken FTE bridge from Tor Browser * Build System * All Platforms

1 0

[tor-browser-build/master] Bug 25779: Enable Rust in Tor for macOS nightlies
by boklm＠torproject.org 10 Dec '18

10 Dec '18

commit 54f63e3176ec840e37c283689746b2a0cb419f8c Author: Georg Koppen <gk(a)torproject.org> Date: Sun Dec 9 19:07:01 2018 +0000 Bug 25779: Enable Rust in Tor for macOS nightlies --- projects/tor/build | 10 +++++++--- projects/tor/config | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/projects/tor/build b/projects/tor/build index c8f63bc..e9bd326 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -11,6 +11,10 @@ mkdir -p /var/tmp/build [% END %] [% IF c("var/osx") %] + [% IF ("var/nightly") %] + # We are compiling Tor with Rust enabled for nightlies. + export TOR_RUST_TARGET=x86_64-apple-darwin + [% END %] TORBINDIR="$distdir/Contents/MacOS/Tor" TORCONFIGDIR="$distdir/Contents/Resources/TorBrowser/Tor" mkdir -p $distdir/bin @@ -20,7 +24,7 @@ mkdir -p /var/tmp/build tar -C /var/tmp/dist -xf [% c('input_files_by_name/openssl') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/libevent') %] -[% IF c("var/linux") && c("var/nightly") %] +[% IF (c("var/linux") || c("var/osx")) && c("var/nightly") %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] export PATH=/var/tmp/dist/rust/bin:$PATH [% END %] @@ -70,11 +74,11 @@ cd /var/tmp/build/[% project %]-[% c('version') %] echo '"[% c("abbrev", { abbrev_length => 16 }) %]"' > micro-revision.i ./autogen.sh find -type f -print0 | xargs -0 [% c("var/touch") %] -[% IF c("var/linux") && c("var/nightly") %]TOR_RUST_DEPENDENCIES=`pwd`/src/ext/rust/crates[% END %] ./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \ +[% IF (c("var/linux") || c("var/osx")) && c("var/nightly") %]TOR_RUST_DEPENDENCIES=`pwd`/src/ext/rust/crates[% END %] ./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \ [% IF c("var/asan") %]--enable-fragile-hardening[% END %] \ [% IF c("var/windows") %]--with-zlib-dir="$zlibdir"[% END %] \ [% IF c("var/osx") %]--enable-static-openssl[% END %] \ - [% IF c("var/linux") && c("var/nightly") %]--enable-rust[% END %] \ + [% IF (c("var/linux") || c("var/osx")) && c("var/nightly") %]--enable-rust[% END %] \ --prefix="$distdir" [% c("var/configure_opt") %] [% IF c("var/osx") || c("var/windows") -%] export LD_PRELOAD=[% c("var/faketime_path") %] diff --git a/projects/tor/config b/projects/tor/config index 4ba18d9..fe3bec9 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -65,4 +65,4 @@ input_files: input_file_var: rust_version: 1.28.0 prev_version: 1.27.2 - enable: '[% c("var/linux") && c("var/nightly") %]' + enable: '[% (c("var/linux") || c("var/osx")) && c("var/nightly") %]'

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_25779_v4'
by boklm＠torproject.org 10 Dec '18

10 Dec '18

commit 0512b59d0cc4c68952454e85551659742930cb6d Merge: e4a246e 54f63e3 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 10 16:10:11 2018 +0100 Merge remote-tracking branch 'gk/bug_25779_v4' projects/tor/build | 10 +++++++--- projects/tor/config | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-)

1 0

[tor-browser-build/master] Fix typo in changelog
by gk＠torproject.org 10 Dec '18

10 Dec '18

commit e4a246efc1cd4a7f67de440989ab0c053f302fbc Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 10 07:57:52 2018 +0000 Fix typo in changelog Thanks to a cypherpunk on our blog for spotting that one. --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 54645e8..13ab9c9 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -64,7 +64,7 @@ Tor Browser 8.5a5 -- December 3 2018 * Bug 28657: Remove broken FTE bridge from Tor Browser * Android * Bug 28051: Fix up Orbot for inclusion into Tor Browser - * Bug 26690+25765: Port padlock states for .onion serices to mobile + * Bug 26690+25765: Port padlock states for .onion services to mobile * Bug 28507: Delete private data in the browser startup * Bug 27111+25013: Configure Tor Browser for mobile to load about:tor * Bug 27256: Enable TouchEvents on Android

1 0

[tor-browser-build/master] Bug 28771: Port get_hg_hash to Path::Tiny and note JSON dependency in README.
by boklm＠torproject.org 07 Dec '18

07 Dec '18

commit 56ce89fe1a99c304b7292a7087ae8d0ad2412273 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Dec 7 03:40:56 2018 +0000 Bug 28771: Port get_hg_hash to Path::Tiny and note JSON dependency in README. --- README | 3 ++- projects/firefox-locale-bundle/get_hg_hash | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README b/README index 5fb32ba..e1e93c6 100644 --- a/README +++ b/README @@ -26,6 +26,7 @@ You also need a few perl modules installed: - Template - IO::Handle - IO::CaptureOutput +- JSON - File::Temp - Path::Tiny - File::Path @@ -40,7 +41,7 @@ If you are running Debian or Ubuntu, you can install them with: # apt-get install libyaml-libyaml-perl libtemplate-perl \ libio-handle-util-perl libio-all-perl \ - libio-captureoutput-perl libpath-tiny-perl \ + libio-captureoutput-perl libjson-perl libpath-tiny-perl \ libstring-shellquote-perl libsort-versions-perl \ libdigest-sha-perl libdata-uuid-perl libdata-dump-perl \ libfile-copy-recursive-perl git libgtk2.0-dev curl runc \ diff --git a/projects/firefox-locale-bundle/get_hg_hash b/projects/firefox-locale-bundle/get_hg_hash index 9b2b5bd..18b174e 100755 --- a/projects/firefox-locale-bundle/get_hg_hash +++ b/projects/firefox-locale-bundle/get_hg_hash @@ -1,6 +1,6 @@ #!/usr/bin/perl -w use strict; -use File::Slurp; +use Path::Tiny; use JSON; sub exit_error { @@ -11,7 +11,7 @@ sub exit_error { exit_error("Wrong number of arguments", 1) unless @ARGV == 2; my ($file, $locale) = @ARGV; -my $json_text = read_file($file); +my $json_text = path($file)->slurp_raw; exit_error("Error reading $file", 2) unless defined $json_text; my $data = decode_json($json_text);

1 0

[tor-browser-build/master] Use whitespace-safe loops over filenames in the webrtc build.
by gk＠torproject.org 07 Dec '18

07 Dec '18

commit d8db312e4527c694e8f906a5e8926d0dc0c37179 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Dec 6 07:55:25 2018 +0000 Use whitespace-safe loops over filenames in the webrtc build. --- projects/webrtc/build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/webrtc/build b/projects/webrtc/build index 5a6cece..a1abd92 100644 --- a/projects/webrtc/build +++ b/projects/webrtc/build @@ -138,7 +138,8 @@ ninja -C out/Release webrtc field_trial metrics_default pc_test_utils # like that, not necessarily of the target architecture, and anyway are not # needed. # https://bugs.torproject.org/22832 -[% IF c("var/osx") %]ZERO_AR_DATE=1 [% END %]"$AR" crs libwebrtc-magic.a $(find out/Release/obj -name '*.o' | sort) +find out/Release/obj -name '*.o' -print0 | sort -z \ + | [% IF c("var/osx") %]ZERO_AR_DATE=1 [% END %] xargs -0 -- "$AR" crs libwebrtc-magic.a mkdir -p $distdir cd $distdir @@ -146,9 +147,9 @@ mkdir -p include lib cp -f $builddir/libwebrtc-magic.a [% c("var/webrtc/lib_path") %] INCLUDE_DIR="$PWD/include" cd $builddir -for h in $(find webrtc/ -type f -name '*.h'); +find webrtc/ -type f -name '*.h' -print0 | while IFS= read -r -d '' h; do - mkdir -p "$INCLUDE_DIR/$(dirname $h)" + mkdir -p "$INCLUDE_DIR/$(dirname "$h")" cp -f "$h" "$INCLUDE_DIR/$h" done

1 0

[tor-browser-build/master] Bug 28725: Upgrade go-webrtc to dcbfc825aa33471253a5da1834d499257e05d557.
by gk＠torproject.org 07 Dec '18

07 Dec '18

commit 2e1d3917340c980026c15ed9cf10e894ec665551 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Dec 3 23:13:51 2018 +0000 Bug 28725: Upgrade go-webrtc to dcbfc825aa33471253a5da1834d499257e05d557. This necessitates an upgrade to webrtc to branch-heads/64. Compare to: https://github.com/keroserene/go-webrtc/commit/1ca4087bc01b9a6726a68c72ac54… -D_GLIBCXX_USE_CXX11_ABI=1 is no longer required, as the default has changed: https://github.com/keroserene/go-webrtc/commit/a3140c36f9933013ad2e66bc2135… I needed to add libgtk-3-dev as a build dependency for webrtc. libgtk-3-dev appears in src/build/install-build-deps.sh. I also had to upgrade depot_tools to 7d9d9233cb657e968831238346917b0b64abb4c1. I got the commit ID from src/DEPS in the webrtc source. Without upgrading depot_tools, I got this error from gclient: Error: 1> dependency url must be either a string, None, File() or From() instead of dict I needed to add a command to delete src/testing/{gmock,gtest}; otherwise "gclient sync" complains about overwriting unversioned files. https://bugs.torproject.org/25483#comment:15 https://gitweb.torproject.org/user/boklm/tor-browser-build.git/commit/?h=bu… The error is src/testing (ERROR) ---------------------------------------- [0:00:00] Started. [0:00:01] From https://chromium.googlesource.com/chromium/src/testing [0:00:01] 7d7436a8..9805faa0 master -> origin/master ---------------------------------------- Error: Command 'git checkout --quiet 60c665fffe7dc505fdd5d30f9dbcbc50dde1e017' returned non-zero exit status 1 in /home/user/tor-browser-build/gclient/webrtc/src/testing error: The following untracked working tree files would be overwritten by checkout: gmock/include/gmock/gmock-actions.h gmock/include/gmock/gmock-generated-function-mockers.h gmock/include/gmock/gmock-matchers.h gmock/include/gmock/gmock.h gtest/include/gtest/gtest-death-test.h gtest/include/gtest/gtest-message.h gtest/include/gtest/gtest-param-test.h gtest/include/gtest/gtest-spi.h gtest/include/gtest/gtest.h gtest/include/gtest/gtest_prod.h Please move or remove them before you switch branches. Aborting --- projects/depot_tools/config | 2 +- projects/go-webrtc/config | 8 +- projects/webrtc/build | 6 +- projects/webrtc/config | 6 +- projects/webrtc/webrtc-linux.patch | 12 +-- projects/webrtc/webrtc-mac.patch | 204 +++++++++++++++---------------------- 6 files changed, 99 insertions(+), 139 deletions(-) diff --git a/projects/depot_tools/config b/projects/depot_tools/config index 40a6d85..a1848dc 100644 --- a/projects/depot_tools/config +++ b/projects/depot_tools/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' -git_hash: 28216cd14b44716db5c83634afbdc6e90492652b +git_hash: 7d9d9233cb657e968831238346917b0b64abb4c1 git_url: https://chromium.googlesource.com/chromium/tools/depot_tools.git filename: '[% project %]-[% c("version") %].tar.gz' diff --git a/projects/go-webrtc/config b/projects/go-webrtc/config index 65be36f..8b171f9 100644 --- a/projects/go-webrtc/config +++ b/projects/go-webrtc/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/keroserene/go-webrtc.git -git_hash: 90ac15ae07cc6e820cd922a239dd892598986622 +git_hash: dcbfc825aa33471253a5da1834d499257e05d557 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -21,12 +21,8 @@ var: rm -rf include/ lib/ cp -a /var/tmp/dist/webrtc/{include,lib} . [% IF c("var/linux") -%] - # The go-webrtc package sets _GLIBCXX_USE_CXX11_ABI=0 for compatibility with - # the prebuilt libwebrtc-magic.a libraries. Since we build our own - # libwebrtc-magic.a with the C++11 ABI, we have to undo that setting here, - # using CGO_CXXFLAGS. # __STDC_FORMAT_MACROS is needed for a definition of PRIxPTR from inttypes.h. - export CGO_CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=1 -D__STDC_FORMAT_MACROS=1" + export CGO_CXXFLAGS="-D__STDC_FORMAT_MACROS=1" export CGO_LDFLAGS=-latomic [% END -%] [% IF c("var/osx") -%] diff --git a/projects/webrtc/build b/projects/webrtc/build index a1abd92..ecbccb3 100644 --- a/projects/webrtc/build +++ b/projects/webrtc/build @@ -101,6 +101,8 @@ GN_ARGS+=" treat_warnings_as_errors=false" GN_ARGS+=" is_component_build=false" # Do not use bundled utilities. GN_ARGS+=" is_clang=false use_sysroot=false" +# Use libstdc++, not libc++. +GN_ARGS+=" use_custom_libcxx=false" [% IF c("var/linux") -%] GN_ARGS+=" target_os=\"linux\" target_cpu=\"[% IF c("var/linux-i686") %]x86[% ELSE %]x64[% END %]\"" GN_ARGS+=" gold_path=\"$INSTDIR/binutils/bin\"" @@ -116,6 +118,8 @@ GN_ARGS+=" is_clang=false use_sysroot=false" GN_ARGS+=" target_os=\"mac\" target_cpu=\"x64\" mac_deployment_target=\"10.7\"" GN_ARGS+=" clang_use_chrome_plugins=false" GN_ARGS+=" clang_base_path=\"$clangdir\"" + # No lld in our toolchain currently. + GN_ARGS+=" use_lld=false" # Avoid some dependencies. GN_ARGS+=" rtc_include_opus=false rtc_include_ilbc=false rtc_include_internal_audio_device=false" # Tests are needed for field_trial, metrics_default, and pc_test_utils targets @@ -147,7 +151,7 @@ mkdir -p include lib cp -f $builddir/libwebrtc-magic.a [% c("var/webrtc/lib_path") %] INCLUDE_DIR="$PWD/include" cd $builddir -find webrtc/ -type f -name '*.h' -print0 | while IFS= read -r -d '' h; +find . -type f -name '*.h' -print0 | while IFS= read -r -d '' h; do mkdir -p "$INCLUDE_DIR/$(dirname "$h")" cp -f "$h" "$INCLUDE_DIR/$h" diff --git a/projects/webrtc/config b/projects/webrtc/config index da60d2d..2955095 100644 --- a/projects/webrtc/config +++ b/projects/webrtc/config @@ -5,7 +5,7 @@ filename: 'webrtc-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") var: container: use_container: 1 - webrtc_tag: c279861207c5b15fc51069e96595782350e0ac12 + webrtc_tag: 88f5d9180eae78a6162cccd78850ff416eb82483 input_files: - project: container-image @@ -33,6 +33,7 @@ targets: - libexpat1-dev - libglib2.0-dev - libgtk2.0-dev + - libgtk-3-dev - libudev-dev - libx11-dev - libxext-dev @@ -101,6 +102,9 @@ steps: git config diff.ignoreSubmodules all cd .. fi + # Delete the unversioned gmock and gtest directories, which cause "gclient sync" + # to fail when upgrading between webrtc branch-heads/58 and branch-heads/64. + rm -rf src/testing/gmock src/testing/gtest # "gclient" is part of depot_tools. This download takes a long time the first time. gclient sync --no-history --with_branch_heads -r [% c("var/webrtc_tag") %] cd .. diff --git a/projects/webrtc/webrtc-linux.patch b/projects/webrtc/webrtc-linux.patch index b1efb7a..efeebbb 100644 --- a/projects/webrtc/webrtc-linux.patch +++ b/projects/webrtc/webrtc-linux.patch @@ -1,6 +1,6 @@ -From ebc1773a92884bec7d93274b2d729ccf76050197 Mon Sep 17 00:00:00 2001 -From: David Fifield <fifield(a)eecs.berkeley.edu> -Date: Wed, 22 Mar 2017 09:53:07 -0400 +From 2d7897d479a13cbf68335140b61228cd5552dfd9 Mon Sep 17 00:00:00 2001 +From: David Fifield <david(a)bamsoftware.com> +Date: Mon, 3 Dec 2018 21:14:32 -0700 Subject: [PATCH] Disable some settings in build_overrides. --- @@ -8,10 +8,10 @@ Subject: [PATCH] Disable some settings in build_overrides. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_overrides/build.gni b/build_overrides/build.gni -index af4924d4c..ffaafdebc 100644 +index 81cb3e73ae..5304a64ce8 100644 --- a/build_overrides/build.gni +++ b/build_overrides/build.gni -@@ -14,7 +14,7 @@ mac_sdk_min_build_override = "10.11" +@@ -10,7 +10,7 @@ enable_java_templates = true # Some non-Chromium builds don't use Chromium's third_party/binutils. @@ -21,5 +21,5 @@ index af4924d4c..ffaafdebc 100644 # Variable that can be used to support multiple build scenarios, like having # Chromium specific targets in a client project's GN file etc. -- -2.12.1 +2.11.0 diff --git a/projects/webrtc/webrtc-mac.patch b/projects/webrtc/webrtc-mac.patch index 6b888bb..d1144af 100644 --- a/projects/webrtc/webrtc-mac.patch +++ b/projects/webrtc/webrtc-mac.patch @@ -1,7 +1,7 @@ -From bd27c327f72ea231353983aa35a0c3e6ae8055d5 Mon Sep 17 00:00:00 2001 +From df1a0923f1534a238e9773000dd03dd7b55e2c72 Mon Sep 17 00:00:00 2001 From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 26 Jun 2017 11:26:55 -0700 -Subject: [PATCH 1/8] Disable assertions that prevent cross-compiling for mac. +Date: Mon, 3 Dec 2018 21:03:16 -0700 +Subject: [PATCH 1/6] Disable assertions that prevent cross-compiling for mac. --- config/BUILDCONFIG.gn | 4 ++-- @@ -9,10 +9,10 @@ Subject: [PATCH 1/8] Disable assertions that prevent cross-compiling for mac. 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn -index d055e705..78a2023a 100644 +index 48ed140c7..15e06808c 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn -@@ -232,8 +232,8 @@ if (target_os == "android") { +@@ -238,8 +238,8 @@ if (target_os == "android") { } else if (target_os == "ios") { _default_toolchain = "//build/toolchain/mac:ios_clang_$target_cpu" } else if (target_os == "mac") { @@ -22,9 +22,9 @@ index d055e705..78a2023a 100644 + _default_toolchain = "//build/toolchain/mac:clang_$host_cpu" } else if (target_os == "win") { # On Windows we use the same toolchain for host and target by default. - assert(target_os == host_os, "Win cross-compiles only work on win hosts.") + # Beware, win cross builds mostly don't work yet, see docs/win_cross.md diff --git a/build/toolchain/mac/BUILD.gn b/build/toolchain/mac/BUILD.gn -index b417e76a..5f48927d 100644 +index fc113d6a3..7a0171700 100644 --- a/build/toolchain/mac/BUILD.gn +++ b/build/toolchain/mac/BUILD.gn @@ -14,7 +14,7 @@ if (is_ios) { @@ -36,13 +36,13 @@ index b417e76a..5f48927d 100644 import("//build/toolchain/cc_wrapper.gni") import("//build/toolchain/clang_static_analyzer.gni") --- +-- 2.11.0 -From a58bb43ea406939fcc978aa808714d04802074ac Mon Sep 17 00:00:00 2001 +From c9cdc59ebb986392367115105ecbc1f5b511130d Mon Sep 17 00:00:00 2001 From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 26 Jun 2017 11:29:14 -0700 -Subject: [PATCH 2/8] Hardcode cross-compiling flags in config/mac/BUILD.gn. +Date: Mon, 3 Dec 2018 21:04:26 -0700 +Subject: [PATCH 2/6] Hardcode cross-compiling flags in config/mac/BUILD.gn. The build system doesn't provide a general way to set flags externally. "No way to provide extra CFLAGS/CXXFLAGS/LDFLAGS" @@ -52,12 +52,12 @@ https://bugs.chromium.org/p/chromium/issues/detail?id=595653 1 file changed, 5 insertions(+) diff --git a/build/config/mac/BUILD.gn b/build/config/mac/BUILD.gn -index 84180e6a..2054b46f 100644 +index 4c681e88c..26fbcac2b 100644 --- a/build/config/mac/BUILD.gn +++ b/build/config/mac/BUILD.gn -@@ -83,6 +83,11 @@ config("runtime_library") { +@@ -57,6 +57,11 @@ config("runtime_library") { "-isysroot", - sysroot, + rebase_path(sysroot, root_build_dir), "-mmacosx-version-min=$mac_deployment_target", + "-target", + "x86_64-apple-darwin11", @@ -67,13 +67,47 @@ index 84180e6a..2054b46f 100644 ] asmflags = common_flags --- +-- +2.11.0 + +From 86d0882084c8b0595d693cce43e96b01182814b7 Mon Sep 17 00:00:00 2001 +From: David Fifield <david(a)bamsoftware.com> +Date: Tue, 4 Dec 2018 07:37:42 +0000 +Subject: [PATCH 3/6] Remove -instcombine-lower-dbg-declare=0 from cflags. + +Not supported in our current version of llvm: +clang (LLVM option parsing): Unknown command line argument '-instcombine-lower-dbg-declare=0'. Try: 'clang (LLVM option parsing) -help' +clang (LLVM option parsing): Did you mean '-combiner-use-tbaa=0'? +--- + config/compiler/BUILD.gn | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/config/compiler/BUILD.gn b/config/compiler/BUILD.gn +index a6ba4ea6..e775f9f5 100644 +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -427,10 +427,10 @@ config("compiler") { + if (is_clang && !is_nacl && current_toolchain == host_toolchain && + target_os != "chromeos") { + cflags += [ +- "-Xclang", +- "-mllvm", +- "-Xclang", +- "-instcombine-lower-dbg-declare=0", ++ # "-Xclang", ++ # "-mllvm", ++ # "-Xclang", ++ # "-instcombine-lower-dbg-declare=0", + ] + } + +-- 2.11.0 -From 4c57d854280a0f0a4f55cba0457ae44f6369ca08 Mon Sep 17 00:00:00 2001 +From 96d243466006263e99b08ebf8b6085c60b736ccc Mon Sep 17 00:00:00 2001 From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 26 Jun 2017 11:30:28 -0700 -Subject: [PATCH 3/8] Port build/config/mac/plist_util.py to biplist. +Date: Mon, 3 Dec 2018 21:06:06 -0700 +Subject: [PATCH 4/6] Port build/config/mac/plist_util.py to biplist. So as not to require the plutil command. plutil was only being used to convert between XML and binary plist formats, because versions of the @@ -105,7 +139,7 @@ OSError: [Errno 2] No such file or directory 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/config/mac/plist_util.py b/build/config/mac/plist_util.py -index 0928fa13..898edc1a 100644 +index bba0208a5..019dcf918 100644 --- a/build/config/mac/plist_util.py +++ b/build/config/mac/plist_util.py @@ -3,7 +3,7 @@ @@ -117,7 +151,7 @@ index 0928fa13..898edc1a 100644 import os import re import subprocess -@@ -116,6 +116,7 @@ def Interpolate(plist, substitutions): +@@ -89,6 +89,7 @@ def Interpolate(value, substitutions): def LoadPList(path): """Loads Plist at |path| and returns it as a dictionary.""" @@ -125,133 +159,55 @@ index 0928fa13..898edc1a 100644 fd, name = tempfile.mkstemp() try: subprocess.check_call(['plutil', '-convert', 'xml1', '-o', name, path]) -@@ -127,6 +128,7 @@ def LoadPList(path): +@@ -100,6 +101,7 @@ def LoadPList(path): def SavePList(path, format, data): """Saves |data| as a Plist to |path| in the specified |format|.""" + return biplist.writePlist(data, path, {"xml1": False, "binary1": True}[format]) # doesn't handle "json" format fd, name = tempfile.mkstemp() try: - with os.fdopen(fd, 'w') as f: --- -2.11.0 - -From 62a6fa6376194ce673c220eef19fefeebe58fee1 Mon Sep 17 00:00:00 2001 -From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 26 Jun 2017 11:41:16 -0700 -Subject: [PATCH 5/8] Include <sys/socket.h> in macifaddrs_converter.cc. - -Without this, when built against MacOSX10.7.sdk, there are errors: - -In file included from ../../webrtc/base/macifaddrs_converter.cc:13: -/home/debian/build/MacOSX10.7.sdk/usr/include/net/if.h:300:19: error: field has incomplete type 'struct sockaddr' - struct sockaddr ifru_addr; - -Related references: -https://trac.macports.org/ticket/49012 -https://trac.macports.org/browser/trunk/dports/gnome/gstreamer1/files/patch-struct-sockadr.diff?rev=140712 ---- - webrtc/base/macifaddrs_converter.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/webrtc/base/macifaddrs_converter.cc b/webrtc/base/macifaddrs_converter.cc -index 2ad070e8e..1995f1940 100644 ---- a/webrtc/base/macifaddrs_converter.cc -+++ b/webrtc/base/macifaddrs_converter.cc -@@ -10,6 +10,7 @@ - - #include <memory> - -+#include <sys/socket.h> - #include <net/if.h> - #include <sys/ioctl.h> - #include <unistd.h> + # "plutil" does not replace the destination file but update it in place, -- 2.11.0 - -From e6a421534723408fb1292ce25051a1970f750a4a Mon Sep 17 00:00:00 2001 -From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 26 Jun 2017 11:42:34 -0700 -Subject: [PATCH 6/8] Provide definitions of NS_ENUM and NS_OPTIONS. - ---- - webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h -index f9f15c37d..277676d85 100644 ---- a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h -+++ b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h -@@ -25,4 +25,17 @@ - #define RTC_FWD_DECL_OBJC_CLASS(classname) typedef struct objc_object classname - #endif - -+// http://iamthewalr.us/blog/2012/11/ns_enum-and-ns_options/ -+#if (__cplusplus && __cplusplus >= 201103L && (__has_extension(cxx_strong_enums) || __has_feature(objc_fixed_enum))) || (!__cplusplus && __has_feature(objc_fixed_enum)) -+#define NS_ENUM(_type, _name) enum _name : _type _name; enum _name : _type -+#if (__cplusplus) -+#define NS_OPTIONS(_type, _name) _type _name; enum : _type -+#else -+#define NS_OPTIONS(_type, _name) enum _name : _type _name; enum _name : _type -+#endif -+#else -+#define NS_ENUM(_type, _name) _type _name; enum -+#define NS_OPTIONS(_type, _name) _type _name; enum -+#endif -+ - #endif // WEBRTC_BASE_OBJC_RTC_MACROS_H_ --- -2.11.0 - - -From baf5ddbd1e1281cd7c4cdda709e2ea7e07903727 Mon Sep 17 00:00:00 2001 +From eb3787dd670900cc2c3020c9323a9d95983c8887 Mon Sep 17 00:00:00 2001 From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 26 Jun 2017 11:43:05 -0700 -Subject: [PATCH 7/8] Replace firstObject with objectAtIndex:0. - -firstObject doesn't exist in our version of the SDK. +Date: Tue, 4 Dec 2018 05:16:04 +0000 +Subject: [PATCH 5/6] Override use_system_xcode=true. -The two method calls are not exactly the same; on an empty array, -firstObject returns nil while objectAtIndex:0 raises an exception. Let's -hope that doesn't matter. --- - webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm b/webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm -index 182056228..93bea08f9 100644 ---- a/webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm -+++ b/webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm -@@ -176,7 +176,7 @@ using namespace webrtc::videocapturemodule; + build_overrides/build.gni | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/build_overrides/build.gni b/build_overrides/build.gni +index 81cb3e73ae..b683ea850c 100644 +--- a/build_overrides/build.gni ++++ b/build_overrides/build.gni +@@ -46,3 +46,5 @@ if (host_os == "mac") { + "hermetic toolchain if the minimum OS version is not met.") + use_system_xcode = _result == 0 } - - - (AVCaptureVideoDataOutput*)currentOutput { -- return [[_captureSession outputs] firstObject]; -+ return [[_captureSession outputs] objectAtIndex:0]; - } - - - (void)startCaptureInBackgroundWithOutput: ++ ++use_system_xcode = true -- 2.11.0 - -From 0b5f86af5bc4b7697ee60adf7e1e057a023438e0 Mon Sep 17 00:00:00 2001 +From 5df71ea8f31fd25a05c6b6b881c8126b25b5475c Mon Sep 17 00:00:00 2001 From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 26 Jun 2017 11:43:51 -0700 -Subject: [PATCH 8/8] Disable the desktop_capture module. +Date: Mon, 3 Dec 2018 21:11:14 -0700 +Subject: [PATCH 6/6] Disable the desktop_capture module. It's causing an error related to CoreGraphics.h and hopefully we don't need it. --- - webrtc/modules/BUILD.gn | 1 - + modules/BUILD.gn | 1 - 1 file changed, 1 deletion(-) -diff --git a/webrtc/modules/BUILD.gn b/webrtc/modules/BUILD.gn -index e750a8109..590f34275 100644 ---- a/webrtc/modules/BUILD.gn -+++ b/webrtc/modules/BUILD.gn -@@ -18,7 +18,6 @@ group("modules") { +diff --git a/modules/BUILD.gn b/modules/BUILD.gn +index 465f32d3c4..578cdbd57e 100644 +--- a/modules/BUILD.gn ++++ b/modules/BUILD.gn +@@ -17,7 +17,6 @@ group("modules") { "audio_processing", "bitrate_controller", "congestion_controller",

1 0

[tor-browser-build/master] Bug 28775: Add mercurial in tbb-build ansible role
by gk＠torproject.org 07 Dec '18

07 Dec '18

commit ea1fc73e70e73d6b930c99fdfe5a729579613002 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Dec 7 11:41:25 2018 +0100 Bug 28775: Add mercurial in tbb-build ansible role With #26843 we now require mercurial to be installed, so it should be installed by the tbb-build ansible role. --- tools/ansible/roles/tbb-builder/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/ansible/roles/tbb-builder/tasks/main.yml b/tools/ansible/roles/tbb-builder/tasks/main.yml index f27c6cf..4e84709 100644 --- a/tools/ansible/roles/tbb-builder/tasks/main.yml +++ b/tools/ansible/roles/tbb-builder/tasks/main.yml @@ -22,6 +22,7 @@ - libgtk2.0-dev - curl - runc + - mercurial - name: Install dependencies for update_responses script apt:

1 0

[tor-browser-build/master] Release preparations for 8.5a6
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit 76243271b0f02b0a965a0294ef8242c787bfc668 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 6 22:31:40 2018 +0000 Release preparations for 8.5a6 Changelog update and versions bump --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 4 ++-- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 24 ++++++++++++++++++++++ projects/torbutton/config | 2 +- rbm.conf | 5 +++-- 5 files changed, 31 insertions(+), 6 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 4e42939..04cd7dd 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index 7ffaf43..639d504 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,14 +1,14 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 60.3.0 + firefox_platform_version: 60.4.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.5 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 5c3732b..54645e8 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,27 @@ +Tor Browser 8.5a6 -- December 11 2018 + * All Platforms + * Update Firefox to 60.4.0esr + * Update OpenSSL to 1.0.2q + * Update Torbutton to 2.1.3 + * Bug 28540: Use new text for 2018 donation banner + * Bug 27290: Remove WebGL pref for min capability mode + * Bug 28075: Tone down missing SOCKS credential warning + * Bug 28747: Remove NoScript (XPCOM) related unused code + * Translations update + * Bug 28608: Disable background HTTP response throttling + * Bug 28695: Set default security.pki.name_matching_mode to enforce (3) + * Bug 27290: Remove WebGL pref for min capability mode + * Bug 27919: Backport SSL status API + * Windows + * Bug 28740: Adapt Windows navigator.platform value on 64-bit systems + * Android + * Bug 26843: Multi-locale support for Tor Browser on Android + * Build System + * Android + * Bug 25164: Add .apk to our sha256sums unsigned build file + * Bug 28696: Make path to Gradle dependencies reproducible + * Bug 28697: Use pregenerated keystore and fix timestamp issues + Tor Browser 8.5a5 -- December 3 2018 * All Platforms * Update Torbutton to 2.1.2 diff --git a/projects/torbutton/config b/projects/torbutton/config index 2e48f31..0fff877 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.1.2 +version: 2.1.3 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index f64a80b..a397752 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.5a5' - torbrowser_build: 'build2' + torbrowser_version: '8.5a6' + torbrowser_build: 'build1' torbrowser_incremental_from: - 8.5a4 + - 8.5a5 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Bug 28697: No need to specify the architecture for using Buster
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit 0a2cc62f08063cc0c91b1db57e87505c954349a9 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 6 22:06:03 2018 +0000 Bug 28697: No need to specify the architecture for using Buster --- projects/tor-browser/config | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 3a7f035..6199954 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -51,7 +51,6 @@ targets: # leads to a stalled build. Work around this by switching to Buster. container: suite: buster - arch: amd64 input_files: - project: container-image

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 1472618 - Make navigator.platform return "Win32", even on Win64 OS. r=peterv
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit a3cbc068df86e03a6420bc863be2793e35078fa3 Author: Chris Peterson <cpeterson(a)mozilla.com> Date: Mon Jul 2 11:02:23 2018 -0700 Bug 1472618 - Make navigator.platform return "Win32", even on Win64 OS. r=peterv navigator.platform returns "Win64" in 64-bit Firefox and IE, but "Win32" in 64-bit Chrome and Edge. "Win32" appears to be the de facto platform value for Windows. This change doesn't hide the OS architecture from web content because navigator.userAgent still mentions "Win64; x64" in 64-bit Firefox, Chrome, Edge, and IE. MozReview-Commit-ID: CplYnGDQgTe --HG-- extra : rebase_source : c00a1a7462ea91d44700dd0581c88c1c4cad2346 extra : source : 1976c327f251702be255a9d0769121c6bc5303a1 This fixes our bug 28740. --- .../components/resistfingerprinting/test/browser/browser_navigator.js | 2 +- dom/base/Navigator.cpp | 4 +--- toolkit/components/resistfingerprinting/nsRFPService.h | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/browser/components/resistfingerprinting/test/browser/browser_navigator.js b/browser/components/resistfingerprinting/test/browser/browser_navigator.js index e0aaf6fb27fe..3736fcd33ce5 100644 --- a/browser/components/resistfingerprinting/test/browser/browser_navigator.js +++ b/browser/components/resistfingerprinting/test/browser/browser_navigator.js @@ -24,7 +24,7 @@ const SPOOFED_APPVERSION = { }; const SPOOFED_PLATFORM = { linux: "Linux x86_64", - win: "Win64", + win: "Win32", macosx: "MacIntel", android: "Linux armv7l", other: "Linux x86_64", diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp index 33563ad65ccb..55d1f7a0474b 100644 --- a/dom/base/Navigator.cpp +++ b/dom/base/Navigator.cpp @@ -1653,9 +1653,7 @@ Navigator::GetPlatform(nsAString& aPlatform, bool aUsePrefOverriddenValue) // Sorry for the #if platform ugliness, but Communicator is likewise // hardcoded and we are seeking backward compatibility here (bug 47080). -#if defined(_WIN64) - aPlatform.AssignLiteral("Win64"); -#elif defined(WIN32) +#if defined(WIN32) aPlatform.AssignLiteral("Win32"); #elif defined(XP_MACOSX) && defined(__ppc__) aPlatform.AssignLiteral("MacPPC"); diff --git a/toolkit/components/resistfingerprinting/nsRFPService.h b/toolkit/components/resistfingerprinting/nsRFPService.h index da79da8de948..4ed0c1d4cfaf 100644 --- a/toolkit/components/resistfingerprinting/nsRFPService.h +++ b/toolkit/components/resistfingerprinting/nsRFPService.h @@ -25,7 +25,7 @@ #define SPOOFED_UA_OS "Windows NT 6.1; Win64; x64" #define SPOOFED_APPVERSION "5.0 (Windows)" #define SPOOFED_OSCPU "Windows NT 6.1; Win64; x64" -#define SPOOFED_PLATFORM "Win64" +#define SPOOFED_PLATFORM "Win32" #elif defined(XP_MACOSX) #define SPOOFED_UA_OS "Macintosh; Intel Mac OS X 10.13" #define SPOOFED_APPVERSION "5.0 (Macintosh)"

1 0

[tor-browser-build/master] Bug 25164: Add .apk to our unsigned sha256sums file
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit 3d7c32b67b25d869d94ec8f23da82e7558fb9993 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 6 19:16:16 2018 +0000 Bug 25164: Add .apk to our unsigned sha256sums file --- projects/release/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/release/build b/projects/release/build index e7c7410..cf190a6 100644 --- a/projects/release/build +++ b/projects/release/build @@ -32,7 +32,7 @@ RewriteRule ^sha256sums.txt.asc$ sha256sums-unsigned-build.txt.asc RewriteRule ^sha256sums.incrementals.txt$ sha256sums-unsigned-build.incrementals.txt RewriteRule ^sha256sums.incrementals.txt.asc$ sha256sums-unsigned-build.incrementals.txt.asc EOF -sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip *.tar.gz | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt +sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip *.tar.gz *.apk | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt [% IF c("var/sign_build") -%] gpg -abs [% c("var/sign_build_gpg_opts") %] sha256sums-unsigned-build.txt [% END -%]

1 0

[tor-browser-build/master] Bug 28750: Switch to Buster for avoiding faketime issues
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit 60163914e4f9418709bfe5b8fdc946fb56ca6e07 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 6 19:13:53 2018 +0000 Bug 28750: Switch to Buster for avoiding faketime issues If we are using faketime on Stretch when signing our debug .apk the build freezes for unknown reasons on some machines. Switching to Buster avoids that. --- projects/tor-browser/config | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 2b937bd..3a7f035 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -47,6 +47,11 @@ targets: arch_deps: - openjdk-8-jdk - faketime + # On some machines using faketime with Stretch to make the debug signature + # leads to a stalled build. Work around this by switching to Buster. + container: + suite: buster + arch: amd64 input_files: - project: container-image

1 0

[tor-browser-build/master] Bug 28697: Use pre-generated android keystore and fix timestamps on zipped archives
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit ea1d0b24448f0365b9c8ff60a6ab2c4a130ec279 Author: sisbell <shane.isbell(a)gmail.com> Date: Tue Dec 4 12:20:40 2018 -0800 Bug 28697: Use pre-generated android keystore and fix timestamps on zipped archives --- projects/tor-browser/android-qa.keystore | Bin 0 -> 2138 bytes projects/tor-browser/build.android | 6 +++--- projects/tor-browser/config | 4 ++++ projects/tor-browser/how-to-generate-keystore.txt | 3 +++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/android-qa.keystore b/projects/tor-browser/android-qa.keystore new file mode 100644 index 0000000..90cfaed Binary files /dev/null and b/projects/tor-browser/android-qa.keystore differ diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android index b623466..d56d4b5 100644 --- a/projects/tor-browser/build.android +++ b/projects/tor-browser/build.android @@ -9,10 +9,10 @@ cd /var/tmp/build mv $rootdir/[% c('input_files_by_name/https-everywhere') %] $ext_dir/https-everywhere-eff(a)eff.org.xpi mv $rootdir/[% c('input_files_by_name/noscript') %] $ext_dir/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi +[% c("var/touch") %] $ext_dir $ext_dir/* zip -d $apk META-INF/\* -zip -r $apk $ext_dir +zip -r -X $apk $ext_dir # Sign a QA build. This apk is not a debug version and doesn't contain a debug flag in the manifest -keytool -genkey -v -keystore qa.keystore -storepass android -alias androidqakey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "CN=Android Tor QA,O=Tor,C=US" -jarsigner -verbose -digestalg SHA1 -sigalg MD5withRSA -keystore qa.keystore -signedjar $qa_apk $apk androidqakey -storepass android -keypass android +[% c("var/faketime") %] jarsigner -verbose -digestalg SHA1 -sigalg MD5withRSA -keystore $rootdir/android-qa.keystore -signedjar $qa_apk $apk androidqakey -storepass android -keypass android diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 43db189..2b937bd 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -46,6 +46,7 @@ targets: var: arch_deps: - openjdk-8-jdk + - faketime input_files: - project: container-image @@ -108,3 +109,6 @@ input_files: URL: https://files.pythonhosted.org/packages/7e/9b/f99171190f04cd23768547dd34533… sha256sum: 675c35ee0e1677db9e80d2f48d8a7ff2cf38e6207e8cd5e2a2c6d126db025854 enable: '[% c("var/windows") %]' + # To generate a new keystore, see how-to-generate-keystore.txt + - filename: android-qa.keystore + enable: '[% c("var/android") %]' diff --git a/projects/tor-browser/how-to-generate-keystore.txt b/projects/tor-browser/how-to-generate-keystore.txt new file mode 100644 index 0000000..3dbe443 --- /dev/null +++ b/projects/tor-browser/how-to-generate-keystore.txt @@ -0,0 +1,3 @@ +To generate a new keystore, type the following command: + +keytool -genkey -v -keystore android-qa.keystore -storepass android -alias androidqakey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "CN=Android Tor QA,O=Tor,C=US"

1 0

[tor-browser-build/master] Bug 26843: Get l10n-changesets.json from tor-browser.git
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit bad46e532fa614ffdd3ed0e21f4b8fae3ba7793d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Dec 6 14:34:41 2018 +0000 Bug 26843: Get l10n-changesets.json from tor-browser.git The json file used by projects/firefox-locale-bundle is only available from https://product-details.mozilla.org/ after a build has been shipped, which is too late for us. However, it is also available from the firefox sources tree, so we can get it from our tor-browser.git clone instead. The format of this json file is a little different, so we also need to adapt the get_hg_hash script. --- projects/firefox-locale-bundle/build | 6 +++++- projects/firefox-locale-bundle/config | 4 ---- projects/firefox-locale-bundle/get_hg_hash | 2 +- projects/firefox/config | 2 ++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/projects/firefox-locale-bundle/build b/projects/firefox-locale-bundle/build index 3fec48e..7000300 100644 --- a/projects/firefox-locale-bundle/build +++ b/projects/firefox-locale-bundle/build @@ -2,6 +2,10 @@ [% c("var/set_default_env") -%] +cat > l10n-changesets.json << 'EOF_CHANGESETS' +[% pc('firefox', 'var/l10n-changesets.json') %] +EOF_CHANGESETS + clone_dir='[% c("basedir") %]/hg_clones/[% project %]' mkdir -p "$clone_dir" cd "$clone_dir" @@ -19,7 +23,7 @@ tmpdir=$(mktemp -d) cd [% lang %] fi hg_hash=$([% c("basedir") %]/projects/firefox-locale-bundle/get_hg_hash \ - $rootdir/[% c('input_files_by_name/firefox_json') %] \ + $rootdir/l10n-changesets.json \ [% lang %]) [% c("hg") %] archive -r "$hg_hash" -t files "$tmpdir"/[% lang %] cd .. diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config index 13c5fb8..2f4997f 100644 --- a/projects/firefox-locale-bundle/config +++ b/projects/firefox-locale-bundle/config @@ -6,7 +6,3 @@ var: use_container: 0 ff_version: '[% pc("firefox", "var/firefox_version") %]' ff_build: build1 - -input_files: - - name: firefox_json - URL: 'https://product-details.mozilla.org/1.0/l10n/Firefox-[% c("var/ff_version") %]-[% c("var/ff_build") %].json' diff --git a/projects/firefox-locale-bundle/get_hg_hash b/projects/firefox-locale-bundle/get_hg_hash index 0531113..9b2b5bd 100755 --- a/projects/firefox-locale-bundle/get_hg_hash +++ b/projects/firefox-locale-bundle/get_hg_hash @@ -16,6 +16,6 @@ exit_error("Error reading $file", 2) unless defined $json_text; my $data = decode_json($json_text); -my $changeset = $data->{locales}{$locale}{changeset}; +my $changeset = $data->{$locale}{revision}; exit_error("Can't find locale $locale in $file", 3) unless $changeset; print "$changeset\n"; diff --git a/projects/firefox/config b/projects/firefox/config index 314326f..7ffaf43 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -24,6 +24,8 @@ var: use_container: 1 # this should be updated when the list of gradle dependencies is changed gradle_dependencies_version: 3 + # used by projects/firefox-locale-bundle + l10n-changesets.json: '[% exec("cat mobile/locales/l10n-changesets.json") %]' targets: release:

1 0

[torbutton/master] Fold in maint-2.0 CHANGELOG
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit 7f3f89164b409736f4eb70019005f5f8960e906c Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 6 14:51:17 2018 +0000 Fold in maint-2.0 CHANGELOG --- src/CHANGELOG | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index 0db59514..0abd10b5 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -15,6 +15,12 @@ * Bug 28082: Add locales cs, el, hu, ka * Translations update +2.0.8 + * Bug 23925+27959: Donation banner for year end 2018 campaign + * Bug 24172: Donation banner clobbers Tor Browser version string + * Bug 27760: Use new NoScript API for IPC and fix about:blank issue + * Translations update + 2.1 * Bug 27175: Add pref to allow users to persist custom noscript settings * Bug 27760: Use new NoScript API for IPC and fix about:blank issue

1 0

[torbutton/master] Release preparations for 2.1.3
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit 61c79b29f463666548754d9a2a6b15c996df48ee Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 6 14:53:53 2018 +0000 Release preparations for 2.1.3 CHANGELOG update and version bump --- src/CHANGELOG | 7 +++++++ src/install.rdf | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 0abd10b5..6f5b3f3b 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,10 @@ +2.1.3 + * Bug 28540: Use new text for 2018 donation banner + * Bug 27290: Remove WebGL pref for min capability mode + * Bug 28075: Tone down missing SOCKS credential warning + * Bug 28747: Remove NoScript (XPCOM) related unused code + * Translations update + 2.1.2 * Bug 25013: Integrate Torbutton into tor-browser for Android * Bug 27111: Update about:tor desktop version to work on mobile diff --git a/src/install.rdf b/src/install.rdf index 45bee11a..1ece0c4c 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.2</em:version> + <em:version>2.1.3</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

[tor-browser-build/master] Bug 28696: Changing paths to Gradle dependencies are included in build
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit 9ec8d7fb09a2069ef7c79d81547040ce6661ab3b Author: sisbell <shane.isbell(a)gmail.com> Date: Tue Dec 4 12:14:39 2018 -0800 Bug 28696: Changing paths to Gradle dependencies are included in build --- projects/firefox/build | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index f631ec5..da82862 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -1,13 +1,6 @@ #!/bin/bash [% c("var/setarch") -%] [% c("var/set_default_env") -%] -[% IF c("var/android") %] - export GRADLE_MAVEN_REPOSITORIES="file://$rootdir/[% c('input_files_by_name/gradle-dependencies') %]" - # Prepare building the multi-locale .apk - mkdir -p /var/tmp/dist/locales - tar -C /var/tmp/dist/locales -xf $rootdir/[% c('input_files_by_name/firefox-locale-bundle') %] -[% END -%] - [% IF c("var/windows") -%] [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc') }) %] # We need a link to our GCC, otherwise the system cc gets used which points to @@ -105,7 +98,14 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig [% END -%] [% IF c("var/android") %] + export GRADLE_MAVEN_REPOSITORIES="file:///var/tmp/gradle-dependencies" + # Move Gradle Repo to hard-coded location. This location is embedded in the file + # chrome/toolkit/content/global/buildconfig.html so needs to be standard for reproducibility + mv $rootdir/[% c('input_files_by_name/gradle-dependencies') %] /var/tmp/gradle-dependencies cp $rootdir/[% c('input_files_by_name/orbot') %]/* mobile/android/app + # Prepare building the multi-locale .apk + mkdir -p /var/tmp/dist/locales + tar -C /var/tmp/dist/locales -xf $rootdir/[% c('input_files_by_name/firefox-locale-bundle') %] [% END %] eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] $(cat browser/config/version.txt))

1 0

[tor-browser-build/master] Bug 28573: Include all locales in Android testbuild
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit c359853bd44b320595d5a52fc4340ab3b6825d8d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Dec 6 08:42:19 2018 +0000 Bug 28573: Include all locales in Android testbuild --- README.HACKING | 10 +++++++++- projects/tor-browser/build | 6 ++++-- projects/tor-browser/config | 2 +- rbm.conf | 3 +-- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/README.HACKING b/README.HACKING index d9b0674..7634093 100644 --- a/README.HACKING +++ b/README.HACKING @@ -319,7 +319,15 @@ Types of builds: nightly, alpha, release, and testbuild The testbuild makefile target allows you to do a build quickly in the testbuild directory, skipping the generation of all the locales and the -mar files. This is useful during development. +.mar files. This is useful during development. + +In the case of Android builds, we are generating a multi-locale apk, +contrary to the desktop builds where we have one bundle for each locale. +Removing locales in a multi-locale bundle does not make a significant +difference in build time, therefore we still include all the locales in +the Android testbuild. There are also no .mar files generated in the +Android builds, so currently, in the Android case, the only difference +introduced by the testbuild target is the output directory. By default the testbuild is based on the alpha build. All the options can have a different definition for the alpha, release and nightly builds. diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 250a0e9..4661f7a 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -209,7 +209,8 @@ popd # Prepare our language packs for using the proper search engines and embed # our default bookmarks. See bugs 18915 and 21879 for more details. -[% FOREACH lang = c('var/locales') %] +[% SET locales = c("var/testbuild") ? [] : c("var/locales") -%] +[% FOREACH lang = locales %] [% SET lang = tmpl(lang); SET xpi = '$rootdir/' _ c('input_files_by_name/firefox-langpacks') _ '/' _ lang _ '.xpi'; %] @@ -325,7 +326,8 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ # If we did not create a multi-lingual package above, create a package for # each locale. [% IF ! c("var/multi_lingual") %] - [% FOREACH lang = c('var/locales') %] + [% SET locales = c("var/testbuild") ? [] : c("var/locales") -%] + [% FOREACH lang = locales %] [% SET lang = tmpl(lang); SET xpi = '$rootdir/' _ c('input_files_by_name/firefox-langpacks') _ '/' _ lang _ '.xpi'; SET tbdir = '$distdir/tor-browser_' _ lang; diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 149b800..43db189 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -58,7 +58,7 @@ input_files: enable: '[% ! c("var/android") %]' - project: firefox-langpacks name: firefox-langpacks - enable: '[% c("var/locales").size && ! c("var/android") %]' + enable: '[% ! c("var/testbuild") && ! c("var/android") %]' - project: tor-launcher name: tor-launcher enable: '[% ! c("var/android") %]' diff --git a/rbm.conf b/rbm.conf index 0d53855..f64a80b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -136,8 +136,7 @@ targets: - alpha testbuild: var: - # To make build faster, don't build any locale - locales: [] + testbuild: 1 # Don't create mar files to save time build_mar: 0

1 0

[torbutton/master] Bug 28747: Remove NoScript (XPCOM) related unused code
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit e0b17e85b5c8924e23653d863b043509a0083bf0 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 5 16:44:28 2018 +0000 Bug 28747: Remove NoScript (XPCOM) related unused code --- src/chrome/content/torbutton.js | 68 ++--------------------------------------- 1 file changed, 2 insertions(+), 66 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 6568570c..35ae2acb 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -82,7 +82,6 @@ var torbutton_unique_pref_observer = m_tb_prefs.addObserver("network.cookie", this, false); m_tb_prefs.addObserver("browser.privatebrowsing.autostart", this, false); m_tb_prefs.addObserver("javascript", this, false); - m_tb_prefs.addObserver("noscript", this, false); m_tb_prefs.addObserver("plugin.disable", this, false); m_tb_prefs.addObserver("privacy.firstparty.isolate", this, false); m_tb_prefs.addObserver("privacy.resistFingerprinting", this, false); @@ -99,7 +98,6 @@ var torbutton_unique_pref_observer = m_tb_prefs.removeObserver("network.cookie", this); m_tb_prefs.removeObserver("browser.privatebrowsing.autostart", this); m_tb_prefs.removeObserver("javascript", this); - m_tb_prefs.removeObserver("noscript", this); m_tb_prefs.removeObserver("plugin.disable", this); m_tb_prefs.removeObserver("privacy.firstparty.isolate", this); m_tb_prefs.removeObserver("privacy.resistFingerprinting", this); @@ -140,13 +138,7 @@ var torbutton_unique_pref_observer = } if (topic != "nsPref:changed") return; - // Make sure the NoScript button shows the current NoScript state. We - // don't want to run the update function, though, if just a timer gets - // updated. Fixes bug 21324. - if (data.startsWith("noscript.") && - data !== "noscript.subscription.lastCheck") { - torbutton_update_noscript_button(); - } + switch (data) { case "network.cookie.cookieBehavior": let val = m_tb_prefs.getIntPref("network.cookie.cookieBehavior"); @@ -974,18 +966,6 @@ function torbutton_do_new_identity() { torbutton_log(3, "New Identity: Emitting Private Browsing Session clear event"); obsSvc.notifyObservers(null, "browser:purge-session-history", ""); - torbutton_log(3, "New Identity: Clearing NoScript Temporary Permissions"); - - try { - if ("@maone.net/noscript-service;1" in Components.classes) { - var nsSvc = Components.classes["@maone.net/noscript-service;1"].getService().wrappedJSObject - nsSvc.eraseTemp(); - } - } catch(e) { - torbutton_log(5, "New Identity: Error clearing NoScript Temporary Permissions: "+e); - window.alert("Torbutton: Error clearing NoScript Temporary Permissions: "+e); - } - torbutton_log(3, "New Identity: Clearing HTTP Auth"); if(m_tb_prefs.getBoolPref('extensions.torbutton.clear_http_auth')) { @@ -1263,8 +1243,7 @@ function torbutton_clear_image_caches() /* Called when we switch the use_nontor_proxy pref in either direction. * - * Enables/disables domain isolation and NoScript ABE, and then does - * new identity + * Enables/disables domain isolation and then does new identity */ function torbutton_use_nontor_proxy() { @@ -1272,15 +1251,9 @@ function torbutton_use_nontor_proxy() .getService(Ci.nsISupports).wrappedJSObject; if (m_tb_prefs.getBoolPref("extensions.torbutton.use_nontor_proxy")) { - // We need to enable ABE because non-tor proxies won't reject localhost - // and RFC1918, and we should block them. (The default ABE policy does this). - m_tb_prefs.setBoolPref("noscript.ABE.enabled", true); - // Disable domain isolation domainIsolator.disableIsolation(); } else { - m_tb_prefs.setBoolPref("noscript.ABE.enabled", false); - domainIsolator.enableIsolation(); } @@ -1535,15 +1508,6 @@ function torbutton_update_disk_prefs() { m_tb_prefs.setIntPref("browser.download.manager.retention", 2); } - // If we have NoScript enabled we set `noscript.volatilePrivatePermissions` - // to `true` if we are blocking disk records and to `false` if we are - // enabling them. - try { - if ("@maone.net/noscript-service;1" in Components.classes) { - m_tb_prefs.setBoolPref("volatilePrivatePermissions", mode); - } - } catch (e) {} - // Force prefs to be synced to disk Services.prefs.savePrefFile(null); } @@ -1810,12 +1774,6 @@ function torbutton_fixup_old_prefs() m_tb_prefs.setBoolPref("intl.locale.matchOS", matchOS); } - // Prior to TBB 5.0, NoScript was allowed to update its whitelist. This caused - // odd things to appear in people's whitelists. - if (m_tb_prefs.prefHasUserValue("capability.policy.maonoscript.sites")) { - m_tb_prefs.clearUserPref("capability.policy.maonoscript.sites"); - } - // For some reason, the Share This Page button also survived the // TBB 5.0a4 update's attempt to remove it. if (m_tb_prefs.prefHasUserValue("browser.uiCustomization.state")) { @@ -2228,28 +2186,6 @@ function torbutton_is_homepage_url(aURI) return (urls.indexOf(aURI.spec) >= 0); } -// Update the NoScript button to reflect any changes to noscript prefs -function torbutton_update_noscript_button() -{ - // Make sure pref values have fully propagated inside NoScript before - // we sync the UI. - setTimeout(() => { - try { - let wm = Components.classes["@mozilla.org/appshell/window-mediator;1"] - .getService(Components.interfaces.nsIWindowMediator); - let browserEnumerator = wm.getEnumerator("navigator:browser"); - // Update every window's NoScript status... - while (browserEnumerator.hasMoreElements()) { - let win = browserEnumerator.getNext(); - //win.noscriptOverlay._syncUINow(); - } - torbutton_log(3, 'Updated NoScript status for security settings'); - } catch (e) { - torbutton_log(4, 'Failed to update NoScript status for security setings: '+e); - } - }, 0); -} - // Makes sure the item in the Help Menu and the link in about:tor // for the Tor Browser User Manual are only visible when // show_torbrowser_manual() returns true.

1 0

[tor-browser-build/master] Bug 26843: Adding multi-locale support for Tor Browser for Android
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit 524a9364ead98593507f8f881cc1aa9764945324 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 5 10:14:05 2018 +0000 Bug 26843: Adding multi-locale support for Tor Browser for Android --- projects/firefox/build | 12 +++++++++++- projects/firefox/config | 3 +++ projects/firefox/mozconfig-android-armv7 | 1 + projects/tor-browser/build.android | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index e81ecfe..f631ec5 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -3,6 +3,9 @@ [% c("var/set_default_env") -%] [% IF c("var/android") %] export GRADLE_MAVEN_REPOSITORIES="file://$rootdir/[% c('input_files_by_name/gradle-dependencies') %]" + # Prepare building the multi-locale .apk + mkdir -p /var/tmp/dist/locales + tar -C /var/tmp/dist/locales -xf $rootdir/[% c('input_files_by_name/firefox-locale-bundle') %] [% END -%] [% IF c("var/windows") -%] @@ -154,7 +157,14 @@ rm -f js/src/configure ./mach build --verbose [% IF c("var/android") %] - ./mach package + # Building a multi-locale .apk + [% FOREACH lang = c('var/locales') %] + [% SET lang = tmpl(lang) %] + ./mach build chrome-[% lang %]; + [% END %] + export MOZ_CHROME_MULTILOCALE='[% tmpl(c('var/locales').join(' ')) %]' + AB_CD=multi ./mach package + # Copy the result over and return. There is nothing more to do for mobile. cp obj-*/dist/*unsigned-unaligned.apk [% dest_dir _ '/' _ c('filename') %]/tor-browser-unsigned-unaligned.apk [% RETURN %] [% END %] diff --git a/projects/firefox/config b/projects/firefox/config index 81416a2..314326f 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -135,3 +135,6 @@ input_files: - project: orbot name: orbot enable: '[% c("var/android") %]' + - project: firefox-locale-bundle + name: firefox-locale-bundle + enable: '[% c("var/android") %]' diff --git a/projects/firefox/mozconfig-android-armv7 b/projects/firefox/mozconfig-android-armv7 index 0098ea1..8cfcc60 100644 --- a/projects/firefox/mozconfig-android-armv7 +++ b/projects/firefox/mozconfig-android-armv7 @@ -18,6 +18,7 @@ ac_add_options --with-libclang-path=/var/tmp/dist/android-toolchain/android-ndk/ ac_add_options --with-clang-path=/var/tmp/dist/android-toolchain/android-ndk/arm/bin/clang ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser +ac_add_options --with-l10n-base=/var/tmp/dist/locales if [ -z "${TB_BUILD_WITH_UPDATER}" ]; then # Because Google Play will likely be the primary distribution medium, diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android index 24bdc70..b623466 100644 --- a/projects/tor-browser/build.android +++ b/projects/tor-browser/build.android @@ -1,7 +1,7 @@ #!/bin/bash [% c("var/set_default_env") -%] ext_dir=assets/distribution/extensions -qa_apk=[% dest_dir %]/[% c('filename') %]/tor-browser-[% c("version") %]-[% c("var/osname") %]-qa.apk +qa_apk=[% dest_dir %]/[% c('filename') %]/tor-browser-[% c("version") %]-[% c("var/osname") %]-multi-qa.apk apk=$rootdir/[% c('input_files_by_name/firefox') %]/tor-browser-unsigned-unaligned.apk mkdir -p /var/tmp/build/$ext_dir [% dest_dir _ '/' _ c('filename') %]

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 1463936 - Set default security.pki.name_matching_mode to enforce (3) for all builds. r=jcj
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 2199c4be11b8f1a71403754ac771c96d507dc0b5 Author: Dipen Patel <bugzilla(a)pansara.org> Date: Mon Jun 11 14:52:07 2018 -0700 Bug 1463936 - Set default security.pki.name_matching_mode to enforce (3) for all builds. r=jcj MozReview-Commit-ID: CK3zoKfGfEr --HG-- extra : rebase_source : fe20f240a66d809177d30043fd9f41682073cd34 --- security/manager/ssl/security-prefs.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/security/manager/ssl/security-prefs.js b/security/manager/ssl/security-prefs.js index cf492478b279..72af0ee99938 100644 --- a/security/manager/ssl/security-prefs.js +++ b/security/manager/ssl/security-prefs.js @@ -90,11 +90,7 @@ pref("security.signed_app_signatures.policy", 2); // 2: fall back to the subject common name for certificates valid before 23 // August 2015 if necessary // 3: only use name information from the subject alternative name extension -#ifdef RELEASE_OR_BETA -pref("security.pki.name_matching_mode", 1); -#else -pref("security.pki.name_matching_mode", 2); -#endif +pref("security.pki.name_matching_mode", 3); // security.pki.netscape_step_up_policy controls how the platform handles the // id-Netscape-stepUp OID in extended key usage extensions of CA certificates.

1 0

[torbutton/master] Bug 27290: Remove WebGL pref for min capability mode
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 7d98f3bd4348aa79efe040118763c77c84745173 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 4 13:53:12 2018 +0000 Bug 27290: Remove WebGL pref for min capability mode In Mozilla Bug 1217290, a new WebGL mode was introduced specifically for `privacy.resistFingerprinting` set to `true`, which is supposed to give most machines the same WebGL profile. Previously, `webgl.min_capability_mode` was used for this purpose, but now that pref is intended strictly for browser testing and it overrides the `privacy.resistFingerprinting` setting. Furthermore, `webgl.min_capability_mode` can cause WebGL to fail unnecessarily. So we should not be enabling `webgl.min_capability_mode` any more in Tor Browser. This patch is the complement to a tor-browser patch which both remove that preference setting so it reverts to Firefox's default value (false). --- src/chrome/content/torbutton.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 8bd847f9..6568570c 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1551,7 +1551,6 @@ function torbutton_update_disk_prefs() { function torbutton_update_fingerprinting_prefs() { var mode = m_tb_prefs.getBoolPref("privacy.resistFingerprinting"); - m_tb_prefs.setBoolPref("webgl.min_capability_mode", mode); m_tb_prefs.setBoolPref("webgl.disable-extensions", mode); m_tb_prefs.setBoolPref("dom.network.enabled", !mode); m_tb_prefs.setBoolPref("dom.enable_performance", !mode);

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 6eadc8186a20298ed6d0469f64586d63bec1cfd1 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Sep 6 22:50:00 2018 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. In Mozilla Bug 1217290, a new WebGL mode was introduced specifically for `privacy.resistFingerprinting` set to `true`, which is supposed to give most machines the same WebGL profile. Previously, `webgl.min_capability_mode` was used for this purpose, but now that pref is intended strictly for browser testing and it overrides the `privacy.resistFingerprinting` setting. Furthermore, `webgl.min_capability_mode` can cause WebGL to fail unnecessarily. So we should not be enabling `webgl.min_capability_mode` any more in Tor Browser. This patch is the complement to a Torbutton patch which both remove that preference setting so it reverts to Firefox's default value (false). --- browser/app/profile/000-tor-browser.js | 1 - 1 file changed, 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 8f74748f2072..e19dd0dd59ae 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -113,7 +113,6 @@ pref("browser.pocket.site", ""); pref("network.http.referer.hideOnionSource", true); // Fingerprinting -pref("webgl.min_capability_mode", true); pref("webgl.disable-extensions", true); pref("webgl.disable-fail-if-major-performance-caveat", true); pref("webgl.enable-webgl2", false);

1 0

[tor-browser-build/maint-8.0] Tagging build2
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 9bdf6c739a5c1e4f2aa2eed04a5661ec122dbfe8 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 5 19:15:35 2018 +0000 Tagging build2 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 599fe5d..1df185a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0.4' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.0.3 project_name: tor-browser

1 0

[tor-browser-build/maint-8.0] Bug 28002: fix the precomplete file in the en-US installer
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 5c41fd90b0badbb79e37441bfd7a2a19ff42d0ca Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Oct 11 12:30:18 2018 +0200 Bug 28002: fix the precomplete file in the en-US installer The Windows installer for the en-US bundle was created from the $TB_STAGE_DIR instead of the $PKG_DIR where the precomplete file has been regenerated. --- projects/tor-browser/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 68050f9..1dc4188 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -292,8 +292,8 @@ cd $distdir dmg_out => '$OUTDIR/TorBrowser-' _ c("var/torbrowser_version") _ '-osx64_${PKG_LOCALE}.dmg', }) %] [% ELSIF c("var/windows") %] - find "${TB_STAGE_DIR}" -exec [% c("var/touch") %] {} \; - pushd "${TB_STAGE_DIR}" + find "$PKG_DIR" -exec [% c("var/touch") %] {} \; + pushd "$PKG_DIR" makensis torbrowser.nsi # Working around NSIS braindamage mv torbrowser-install.exe torbrowser-install-tmp.exe

1 0

[tor-browser-build/maint-8.0] Release preparations for 8.0.4
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 88491f1d51de13a2431dade85e0a18779ab7a051 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 5 09:22:41 2018 +0000 Release preparations for 8.0.4 Changelog update and versions bump --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 2 +- projects/https-everywhere/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 28 ++++++++++++++++++++++ projects/tor-browser/config | 4 ++-- projects/tor/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 4 ++-- 8 files changed, 37 insertions(+), 9 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 4e42939..04cd7dd 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index bad1ac5..831a5fb 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -7,7 +7,7 @@ git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 60.3.0 + firefox_platform_version: 60.4.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.0 torbrowser_update_channel: alpha diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index e189eb9..b0b3ce9 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2018.9.19 +version: 2018.10.31 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index b98edcb..d347684 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,31 @@ +Tor Browser 8.0.4 -- December 11 2018 + * All platforms + * Update Firefox to 60.4.0esr + * Update Tor to 0.3.4.9 + * Update OpenSSL to 1.0.2q + * Update Torbutton to 2.0.9 + * Bug 28540: Use new text for 2018 donation banner + * Bug 28515: Use en-US for english Torbutton strings + * Translations update + * Update HTTPS Everywhere to 2018.10.31 + * Update NoScript to 10.2.0 + * Bug 1623: Block protocol handler enumeration (backport of fix for #680300) + * Bug 25794: Disable pointer events + * Bug 28608: Disable background HTTP response throttling + * Bug 28185: Add smallerRichard to Tor Browser + * Windows + * Bug 26381: about:tor page does not load on first start on Windows + * Bug 28657: Remove broken FTE bridge from Tor Browser + * OS X + * Bug 26263: App icon positioned incorrectly in macOS DMG installer window + * Bug 26475: Fix Stylo related reproducibilitiy issue + * Linux + * Bug 26475: Fix Stylo related reproducibilitiy issue + * Bug 28657: Remove broken FTE bridge from Tor Browser + * Build System + * All Platforms + * Bug 27218: Generate multiple Tor Browser bundles in parallel + Tor Browser 8.0.3 -- October 23 2018 * All platforms * Update Firefox to 60.3.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index bb1c259..1a37ea1 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -71,9 +71,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: e7ec0345c2174e64c7552ab708a59c8efd7c1078fedda64d9c9ad06a899194b9 + sha256sum: 23c7783eecabeb044aa1e38c93d43ce7c41957b1ea031016d39737712729c81d - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor/config b/projects/tor/config index 1549369..5dd5206 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.4.8 +version: 0.3.4.9 git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/projects/torbutton/config b/projects/torbutton/config index df0d674..168584a 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.0.8 +version: 2.0.9 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index b4f58ed..599fe5d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.0.3' + torbrowser_version: '8.0.4' torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.0.2 + - 8.0.3 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/maint-8.0] Bug 28185: Add smallerRichard to Tor Browser
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit aeab20a433870b5c93acacfebe78666b4f7d585a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 29 16:15:07 2018 +0000 Bug 28185: Add smallerRichard to Tor Browser --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index ec76ce7..f58eb02 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -39,6 +39,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.24", "obfs4 37.218.245.14:3822 pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.26", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.27", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.28", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-build/maint-8.0] Update OpenSSL to 1.0.2q
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 54423878a373c34519f3ab621aa838306d1f3c24 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 3 08:06:40 2018 +0000 Update OpenSSL to 1.0.2q --- projects/openssl/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/openssl/config b/projects/openssl/config index d3ed959..e91e820 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.0.2p +version: 1.0.2q filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -26,4 +26,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: 50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00 + sha256sum: 5744cfcbcec2b1b48629f7354203bc1e5e9b5466998bbccc5b5fcde3b18eb684

1 0

[torbutton/maint-2.0] Release preparation for 2.0.9
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 0902153ee2fffc3fe80d03a2c25254112774c5c6 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 5 08:53:49 2018 +0000 Release preparation for 2.0.9 CHANGELOG update and version bump --- src/CHANGELOG | 5 +++++ src/install.rdf | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 91f32c9b..361795c2 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,8 @@ +2.0.9 + * Bug 28540: Use new text for 2018 donation banner + * Bug 28515: Use en-US for english Torbutton strings + * Translations update + 2.0.8 * 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 544f9468..df90703b 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.0.8</em:version> + <em:version>2.0.9</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

[torbutton/maint-2.0] Translations update
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 65b6219be53b32a58125a5a5acdccbd861702d10 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 5 08:46:22 2018 +0000 Translations update --- src/chrome/locale/ar/browserOnboarding.properties | 12 ++++++------ src/chrome/locale/pl/aboutTor.dtd | 2 +- src/chrome/locale/pl/browserOnboarding.properties | 2 +- src/chrome/locale/pt-BR/aboutTor.dtd | 4 ++-- src/chrome/locale/pt-BR/torbutton.dtd | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/chrome/locale/ar/browserOnboarding.properties b/src/chrome/locale/ar/browserOnboarding.properties index 0b04e973..448f6a61 100644 --- a/src/chrome/locale/ar/browserOnboarding.properties +++ b/src/chrome/locale/ar/browserOnboarding.properties @@ -8,12 +8,12 @@ onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard onboarding.tour-tor-welcome.button=Start Now 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=متصفح تور يعزل ملفات التعريق و يمسح ارشيف اﻹنترنت الخاص بك بعد انتهائك من التصفح. هذه التعديلات تتأكد من امانك و خصوصيتك في المتصفح. اضغط على شبكة تور لتعرف اكثر كيف نحميك على مستوى الشبكه +onboarding.tour-tor-privacy.button=اذهب الى شبكة تور -onboarding.tour-tor-network=Tor Network -onboarding.tour-tor-network.title=Travel a decentralized network. +onboarding.tour-tor-network=شبكة تور +onboarding.tour-tor-network.title=اﻹنتقال لشبكه لا مركزيه 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 @@ -23,7 +23,7 @@ onboarding.tour-tor-circuit-display.description=For each domain you visit, your 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.title=اختر مدى خبرتك 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 diff --git a/src/chrome/locale/pl/aboutTor.dtd b/src/chrome/locale/pl/aboutTor.dtd index 31df7d7b..b523d30d 100644 --- a/src/chrome/locale/pl/aboutTor.dtd +++ b/src/chrome/locale/pl/aboutTor.dtd @@ -27,7 +27,7 @@ <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> -<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> +<!ENTITY aboutTor.donationBanner.line1 "Tor: Siła w liczbach"> <!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> <!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> diff --git a/src/chrome/locale/pl/browserOnboarding.properties b/src/chrome/locale/pl/browserOnboarding.properties index 8c1730b0..f02655f4 100644 --- a/src/chrome/locale/pl/browserOnboarding.properties +++ b/src/chrome/locale/pl/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=Go to Tor Network -onboarding.tour-tor-network=Tor Network +onboarding.tour-tor-network=Sieć 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 diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd b/src/chrome/locale/pt-BR/aboutTor.dtd index 243a012b..02a848a7 100644 --- a/src/chrome/locale/pt-BR/aboutTor.dtd +++ b/src/chrome/locale/pt-BR/aboutTor.dtd @@ -39,10 +39,10 @@ <!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.line2j "A Mozilla está combinando cada doação até 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.line3b "Dê agora, e seu presente se torna duas vezes mais forte."> <!ENTITY aboutTor.donationBanner.buttonA "Doar Agora"> <!ENTITY aboutTor.donationBanner.buttonB "Estou dentro"> diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd index 415f1517..594b4a62 100644 --- a/src/chrome/locale/pt-BR/torbutton.dtd +++ b/src/chrome/locale/pt-BR/torbutton.dtd @@ -35,12 +35,12 @@ <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider possibilita que você desabilite certas funcionalidades de navegação que podem torná-la mais vulnerável a tentativas de ataque."> <!ENTITY torbutton.prefs.sec_standard_label "Padrão"> <!ENTITY torbutton.prefs.sec_standard_description "Todos os recursos do Navegador Tor e do website estão ativos."> -<!ENTITY torbutton.prefs.sec_safer_label "Mais seguro"> +<!ENTITY torbutton.prefs.sec_safer_label "Seguro"> <!ENTITY torbutton.prefs.sec_safer_description "Desativar recursos geralmente inseguros de websites, o que pode fazer com que alguns sites percam a funcionalidade."> -<!ENTITY torbutton.prefs.sec_safer_list_label "No nível mais seguro:"> -<!ENTITY torbutton.prefs.sec_safest_label "Mais seguro"> +<!ENTITY torbutton.prefs.sec_safer_list_label "No nível seguro:"> +<!ENTITY torbutton.prefs.sec_safest_label "Segurança máxima"> <!ENTITY torbutton.prefs.sec_safest_description "Apenas permitir os recursos dos websites necessários para sites estáticos e serviços básicos. Essas mudanças afetam imagens, mídias e scripts."> -<!ENTITY torbutton.prefs.sec_safest_list_label "No nível mais seguro:"> +<!ENTITY torbutton.prefs.sec_safest_list_label "No nível de segurança máxima:"> <!ENTITY torbutton.prefs.sec_learn_more_label "Aprenda mais"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript está desativado em todos os sites sem HTTPS."> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript está desativado por padrão em todos os sites.">

1 0

[torbutton/master] Translations update
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 07e7b64c89ecc70283aee75f2c4bbe479736e1a1 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 5 08:46:22 2018 +0000 Translations update --- src/chrome/locale/ar/browserOnboarding.properties | 12 ++++++------ src/chrome/locale/pl/aboutTor.dtd | 2 +- src/chrome/locale/pl/browserOnboarding.properties | 2 +- src/chrome/locale/pt-BR/aboutTor.dtd | 4 ++-- src/chrome/locale/pt-BR/torbutton.dtd | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/chrome/locale/ar/browserOnboarding.properties b/src/chrome/locale/ar/browserOnboarding.properties index 0b04e973..448f6a61 100644 --- a/src/chrome/locale/ar/browserOnboarding.properties +++ b/src/chrome/locale/ar/browserOnboarding.properties @@ -8,12 +8,12 @@ onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard onboarding.tour-tor-welcome.button=Start Now 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=متصفح تور يعزل ملفات التعريق و يمسح ارشيف اﻹنترنت الخاص بك بعد انتهائك من التصفح. هذه التعديلات تتأكد من امانك و خصوصيتك في المتصفح. اضغط على شبكة تور لتعرف اكثر كيف نحميك على مستوى الشبكه +onboarding.tour-tor-privacy.button=اذهب الى شبكة تور -onboarding.tour-tor-network=Tor Network -onboarding.tour-tor-network.title=Travel a decentralized network. +onboarding.tour-tor-network=شبكة تور +onboarding.tour-tor-network.title=اﻹنتقال لشبكه لا مركزيه 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 @@ -23,7 +23,7 @@ onboarding.tour-tor-circuit-display.description=For each domain you visit, your 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.title=اختر مدى خبرتك 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 diff --git a/src/chrome/locale/pl/aboutTor.dtd b/src/chrome/locale/pl/aboutTor.dtd index 31df7d7b..b523d30d 100644 --- a/src/chrome/locale/pl/aboutTor.dtd +++ b/src/chrome/locale/pl/aboutTor.dtd @@ -27,7 +27,7 @@ <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> -<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> +<!ENTITY aboutTor.donationBanner.line1 "Tor: Siła w liczbach"> <!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> <!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> diff --git a/src/chrome/locale/pl/browserOnboarding.properties b/src/chrome/locale/pl/browserOnboarding.properties index 8c1730b0..f02655f4 100644 --- a/src/chrome/locale/pl/browserOnboarding.properties +++ b/src/chrome/locale/pl/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=Go to Tor Network -onboarding.tour-tor-network=Tor Network +onboarding.tour-tor-network=Sieć 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 diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd b/src/chrome/locale/pt-BR/aboutTor.dtd index 243a012b..02a848a7 100644 --- a/src/chrome/locale/pt-BR/aboutTor.dtd +++ b/src/chrome/locale/pt-BR/aboutTor.dtd @@ -39,10 +39,10 @@ <!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.line2j "A Mozilla está combinando cada doação até 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.line3b "Dê agora, e seu presente se torna duas vezes mais forte."> <!ENTITY aboutTor.donationBanner.buttonA "Doar Agora"> <!ENTITY aboutTor.donationBanner.buttonB "Estou dentro"> diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd index 415f1517..594b4a62 100644 --- a/src/chrome/locale/pt-BR/torbutton.dtd +++ b/src/chrome/locale/pt-BR/torbutton.dtd @@ -35,12 +35,12 @@ <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider possibilita que você desabilite certas funcionalidades de navegação que podem torná-la mais vulnerável a tentativas de ataque."> <!ENTITY torbutton.prefs.sec_standard_label "Padrão"> <!ENTITY torbutton.prefs.sec_standard_description "Todos os recursos do Navegador Tor e do website estão ativos."> -<!ENTITY torbutton.prefs.sec_safer_label "Mais seguro"> +<!ENTITY torbutton.prefs.sec_safer_label "Seguro"> <!ENTITY torbutton.prefs.sec_safer_description "Desativar recursos geralmente inseguros de websites, o que pode fazer com que alguns sites percam a funcionalidade."> -<!ENTITY torbutton.prefs.sec_safer_list_label "No nível mais seguro:"> -<!ENTITY torbutton.prefs.sec_safest_label "Mais seguro"> +<!ENTITY torbutton.prefs.sec_safer_list_label "No nível seguro:"> +<!ENTITY torbutton.prefs.sec_safest_label "Segurança máxima"> <!ENTITY torbutton.prefs.sec_safest_description "Apenas permitir os recursos dos websites necessários para sites estáticos e serviços básicos. Essas mudanças afetam imagens, mídias e scripts."> -<!ENTITY torbutton.prefs.sec_safest_list_label "No nível mais seguro:"> +<!ENTITY torbutton.prefs.sec_safest_list_label "No nível de segurança máxima:"> <!ENTITY torbutton.prefs.sec_learn_more_label "Aprenda mais"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript está desativado em todos os sites sem HTTPS."> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript está desativado por padrão em todos os sites.">

1 0

[torbutton/maint-2.0] Translations update
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit a7b45080245dd7f4a8b5e941f26594c437aa6ccd 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

[torbutton/maint-2.0] Translations update
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit d8727045f1d289b99fac9bef2f2ac558550c095a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 25 11:22:17 2018 +0000 Translations update --- src/chrome/locale/cs/aboutDialog.dtd | 19 ++++++ src/chrome/locale/cs/aboutTBUpdate.dtd | 10 +++ src/chrome/locale/cs/aboutTor.dtd | 79 ++++++++++------------ src/chrome/locale/cs/brand.dtd | 13 +++- src/chrome/locale/cs/brand.properties | 15 ++-- src/chrome/locale/cs/browserOnboarding.properties | 54 +++++++++++++++ src/chrome/locale/cs/torbutton.dtd | 71 +++++++++++++------ src/chrome/locale/cs/torbutton.properties | 72 ++++++++++++++------ src/chrome/locale/el/aboutDialog.dtd | 19 ++++++ src/chrome/locale/el/aboutTBUpdate.dtd | 10 +++ src/chrome/locale/el/aboutTor.dtd | 79 ++++++++++------------ src/chrome/locale/el/brand.dtd | 9 ++- src/chrome/locale/el/brand.properties | 11 +-- src/chrome/locale/el/browserOnboarding.properties | 54 +++++++++++++++ src/chrome/locale/el/torbutton.dtd | 53 +++++++++++---- src/chrome/locale/el/torbutton.properties | 60 +++++++++++----- src/chrome/locale/es-AR/aboutDialog.dtd | 19 ++++++ src/chrome/locale/es-AR/aboutTBUpdate.dtd | 10 +++ src/chrome/locale/es-AR/aboutTor.dtd | 42 ++++++++++++ src/chrome/locale/es-AR/brand.dtd | 15 ++++ src/chrome/locale/es-AR/brand.properties | 16 +++++ .../locale/es-AR/browserOnboarding.properties | 54 +++++++++++++++ src/chrome/locale/es-AR/torbutton.dtd | 51 ++++++++++++++ src/chrome/locale/es-AR/torbutton.properties | 55 +++++++++++++++ src/chrome/locale/fr/browserOnboarding.properties | 2 +- src/chrome/locale/hu/aboutDialog.dtd | 19 ++++++ src/chrome/locale/hu/aboutTBUpdate.dtd | 10 +++ src/chrome/locale/hu/aboutTor.dtd | 79 ++++++++++------------ src/chrome/locale/hu/brand.dtd | 9 ++- src/chrome/locale/hu/brand.properties | 11 +-- src/chrome/locale/hu/browserOnboarding.properties | 54 +++++++++++++++ src/chrome/locale/hu/torbutton.dtd | 39 +++++++++-- src/chrome/locale/hu/torbutton.properties | 52 ++++++++++---- src/chrome/locale/ka/aboutDialog.dtd | 19 ++++++ src/chrome/locale/ka/aboutTBUpdate.dtd | 10 +++ src/chrome/locale/ka/aboutTor.dtd | 79 ++++++++++------------ src/chrome/locale/ka/brand.dtd | 15 ++-- src/chrome/locale/ka/brand.properties | 15 ++-- src/chrome/locale/ka/browserOnboarding.properties | 54 +++++++++++++++ src/chrome/locale/ka/torbutton.dtd | 73 ++++++++++++++------ src/chrome/locale/ka/torbutton.properties | 72 ++++++++++++++------ 41 files changed, 1168 insertions(+), 334 deletions(-) diff --git a/src/chrome/locale/cs/aboutDialog.dtd b/src/chrome/locale/cs/aboutDialog.dtd new file mode 100644 index 00000000..fd2f3110 --- /dev/null +++ b/src/chrome/locale/cs/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "Aplikace &brandShortName; je vyvÃjena"> + +<!ENTITY project.tpoLink "spoleÄnostÃ &vendorShortName;"> +<!ENTITY project.end ", neziskovou organizacÃ chrÃ¡nÃcÃ vaÅ¡e soukromÃ a svobodu na internetu."> + +<!ENTITY help.start "Chcete pomoci?"> + +<!ENTITY help.donateLink "PÅispÄjte"> +<!ENTITY help.or "nebo"> + +<!ENTITY help.getInvolvedLink "se zapojte"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "OtÃ¡zky?"> + +<!ENTITY bottomLinks.grow "Pomozte sÃti Tor rÅ¯st!"> + +<!ENTITY bottomLinks.license "Informace o licencÃch"> +<!ENTITY tor.TrademarkStatement ""Tor" a "Onion logo" jsou registrovanÃ© ochrannÃ© znÃ¡mky spoleÄnosti Tor Project, Inc."> diff --git a/src/chrome/locale/cs/aboutTBUpdate.dtd b/src/chrome/locale/cs/aboutTBUpdate.dtd new file mode 100644 index 00000000..5c10f2cb --- /dev/null +++ b/src/chrome/locale/cs/aboutTBUpdate.dtd @@ -0,0 +1,10 @@ +<!ENTITY aboutTBUpdate.title "Aktualizace prohlÃÅŸeÄe Tor"> +<!ENTITY aboutTBUpdate.updated "ProhlÃÅŸeÄ Tor byl aktualizovÃ¡n."> +<!ENTITY aboutTBUpdate.linkPrefix "Informace o tomto vydÃ¡nÃ najdete na "> +<!ENTITY aboutTBUpdate.linkLabel "naÅ¡i webovÃ© strÃ¡nce"> +<!ENTITY aboutTBUpdate.linkSuffix "."> +<!ENTITY aboutTBUpdate.changeLogHeading "PÅehled zmÄn:"> + +<!ENTITY aboutTBUpdate.circuitDisplayHeading "NovÃ© zobrazenÃ okruhÅ¯"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "VylepÅ¡ili jsme zobrazenÃ okruhÅ¯ Toru. Pro jeho otevÅenÃ klepnÄte na tlaÄÃtko âIdentita&160#strÃ¡nkyâ umÃstÄnÃ© v levÃ© ÄÃ¡sti adresnÃho ÅÃ¡dku."> +<!ENTITY aboutTBUpdate.learnMore "Zjistit vÃce"> diff --git a/src/chrome/locale/cs/aboutTor.dtd b/src/chrome/locale/cs/aboutTor.dtd index 9f14022b..435bdfdc 100644 --- a/src/chrome/locale/cs/aboutTor.dtd +++ b/src/chrome/locale/cs/aboutTor.dtd @@ -1,47 +1,42 @@  -<!ENTITY aboutTor.title "About Tor"> - -<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date."> -<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update."> - -<!ENTITY aboutTor.check.label "Test Tor Network Settings"> - -<!ENTITY aboutTor.success.label "Congratulations!"> -<!ENTITY aboutTor.success2.label "This browser is configured to use Tor."> -<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously."> -<!ENTITY aboutTor.failure.label "Something Went Wrong!"> -<!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> -<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact "> -<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> -<!ENTITY aboutTor.failure3suffix.label "."> - -<!ENTITY aboutTor.search.label "Search"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> -<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> - -<!ENTITY aboutTor.torInfo1.label "Additional Info:"> -<!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> -<!ENTITY aboutTor.torInfo3.label "Exit Node:"> -<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors."> -<!ENTITY aboutTor.whatnextQuestion.label "What Next?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> -<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»"> -<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.helpInfo1.label "You Can Help!"> -<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> -<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»"> -<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»"> -<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»"> -<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> - -<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy."> -<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»"> -<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> +<!ENTITY aboutTor.title "O Toru"> + +<!ENTITY aboutTor.ready.label "ProhlÃÅŸejte v soukromÃ."> +<!ENTITY aboutTor.ready2.label "VÅ¡e je pÅipraveno pro maximÃ¡lnÃ soukromÃ pro vaÅ¡e prohlÃÅŸenÃ."> +<!ENTITY aboutTor.failure.label "NÄco se nepovedlo!"> +<!ENTITY aboutTor.failure2.label "Tor v tomto prohlÃÅŸeÄi nefunguje."> + +<!ENTITY aboutTor.search.label "Vyhledejte s DuckDuckGo"> +<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> + +<!ENTITY aboutTor.torbrowser_user_manual_questions.label "OtÃ¡zky?"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "PodÃvejte se do naÅ¡Ã pÅÃruÄky k prohlÃÅŸeÄi Tor Â»"> + +<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> +<!ENTITY aboutTor.torbrowser_user_manual.label "PÅÃruÄka prohlÃÅŸeÄe Tor"> + +<!ENTITY aboutTor.tor_mission.label "Tor Project je neziskovÃ¡ organizace podle US 501(c)(3), kterÃ¡ prosazuje lidskÃ¡ prÃ¡va a svobodu vytvÃ¡ÅenÃm svobodnÃœch a otevÅenÃœch technologiÃ podporujÃcÃ anonymitu a soukromÃ, bez omezenÃ jejich dostupnosti a pouÅŸÃvÃ¡nÃ, vÄetnÄ podpory jejich vÄdeckÃ©ho a vÅ¡eobecnÃ©ho rozvoje."> +<!ENTITY aboutTor.getInvolved.label "Zapojte se Â»"> +<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer"> + +<!ENTITY aboutTor.newsletter.tagline "Nechte si posÃlat nejnovÄjÅ¡Ã informace o Toru."> +<!ENTITY aboutTor.newsletter.link_text "PÅihlaste se k odbÄru zpravodaje Toru."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: SÃla je v poÄtu"> + +<!ENTITY aboutTor.donationBanner.line2a "SpoleÄnost se zÃ¡libou v anonymitÄ."> +<!ENTITY aboutTor.donationBanner.line2b "PosÃlenÃ vÅ¡eobecnÃœch lidskÃœch prÃ¡v."> +<!ENTITY aboutTor.donationBanner.line2c "Postavte se za svobodu."> +<!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.line3 "PÅispÄjte hned a Mozilla vÃ¡s dar zdvojnÃ¡sobÃ."> + +<!ENTITY aboutTor.donationBanner.buttonA "PÅispÄjte"> +<!ENTITY aboutTor.donationBanner.buttonB "Jdu do toho"> diff --git a/src/chrome/locale/cs/brand.dtd b/src/chrome/locale/cs/brand.dtd index 59f665e8..acdcfbf6 100644 --- a/src/chrome/locale/cs/brand.dtd +++ b/src/chrome/locale/cs/brand.dtd @@ -2,7 +2,14 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "Tor Browser"> -<!ENTITY brandFullName "Tor Browser"> +<!ENTITY brandShorterName "ProhlÃÅŸeÄ Tor"> +<!ENTITY brandShortName "ProhlÃÅŸeÄ Tor"> +<!ENTITY brandFullName "ProhlÃÅŸeÄ Tor"> <!ENTITY vendorShortName "Tor Project"> -<!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> +<!ENTITY trademarkInfo.part1 "Firefox a loga Firefoxu jsou ochrannou znÃ¡mkou Mozilla Foundation."> + + +<!ENTITY plugins.installed.find "KlepnutÃm naÄtete nainstalovanÃ© systÃ©movÃ© zÃ¡suvnÃ© moduly"> +<!ENTITY plugins.installed.enable "Povolit zÃ¡suvnÃ© moduly"> +<!ENTITY plugins.installed.disable "ZakÃ¡zat zÃ¡suvnÃ© moduly"> +<!ENTITY plugins.installed.disable.tip "KlepnutÃm zabrÃ¡nÃte naÄÃtÃ¡nÃ systÃ©movÃœch zÃ¡suvnÃœch modulÅ¯"> diff --git a/src/chrome/locale/cs/brand.properties b/src/chrome/locale/cs/brand.properties index f63def38..1ac05c0b 100644 --- a/src/chrome/locale/cs/brand.properties +++ b/src/chrome/locale/cs/brand.properties @@ -2,14 +2,15 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=Tor Browser -brandFullName=Tor Browser +brandShorterName=ProhlÃÅŸeÄ Tor +brandShortName=ProhlÃÅŸeÄ Tor +brandFullName=ProhlÃÅŸeÄ Tor vendorShortName=Tor Project -homePageSingleStartMain=Firefox Start, a fast home page with built-in search -homePageImport=Import your home page from %S +homePageSingleStartMain=Firefox Start, domovskÃ¡ strÃ¡nka s vestavÄnÃœch vyhledÃ¡vaÄem +homePageImport=Importovat vaÅ¡i domovskou strÃ¡nku z aplikace %S -homePageMigrationPageTitle=Home Page Selection -homePageMigrationDescription=Please select the home page you wish to use: +homePageMigrationPageTitle=VÃœbÄr domovskÃ© strÃ¡nky +homePageMigrationDescription=Vyberte prosÃm domovskou strÃ¡nku, kterou chcete pouÅŸÃvat: -syncBrandShortName=Sync +syncBrandShortName=Synchronizace diff --git a/src/chrome/locale/cs/browserOnboarding.properties b/src/chrome/locale/cs/browserOnboarding.properties new file mode 100644 index 00000000..24234cb2 --- /dev/null +++ b/src/chrome/locale/cs/browserOnboarding.properties @@ -0,0 +1,54 @@ +# Copyright (c) 2018, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +onboarding.tour-tor-welcome=VÃtejte +onboarding.tour-tor-welcome.title=Jste pÅipraveni. +onboarding.tour-tor-welcome.description=ProhlÃÅŸeÄ Tor nabÃzÃ nejvyÅ¡Å¡Ã ÃºroveÅ soukromÃ a bezpeÄnosti pÅi prohlÃÅŸenÃ internetu. OchrÃ¡nÃ vÃ¡s pÅed sledovÃ¡nÃm i cenzurou. RychlÃœ prÅ¯vodce vÃ¡m ukÃ¡ÅŸe, jak ho pouÅŸÃvat. +onboarding.tour-tor-welcome.button=ZaÄÃt + +onboarding.tour-tor-privacy=SoukromÃ +onboarding.tour-tor-privacy.title=OdeÅŸeÅte sledovacÃ a Å¡mÃrujÃcÃ prvky. +onboarding.tour-tor-privacy.description=ProhlÃÅŸeÄ Tor izoluje cookies a smaÅŸe vaÅ¡i historii prohlÃÅŸenÃ hned po ukonÄenÃ relace. Tyto Ãºpravy vÃ¡m zajistÃ maximÃ¡lnÃ mÃru soukromÃ a bezpeÄnosti. Pro informace o ochranÄ pÅÃmo sÃtÃ Tor klepnÄte na âSÃÅ¥ Torâ. +onboarding.tour-tor-privacy.button=PÅejÃt na sÃÅ¥ Tor + +onboarding.tour-tor-network=SÃÅ¥ Tor +onboarding.tour-tor-network.title=PouÅŸÃvejte decentralizovanou sÃÅ¥. +onboarding.tour-tor-network.description=ProhlÃÅŸeÄ Tor se k internetu pÅipojuje skrze sÃÅ¥ Tor sestavenou dÃky tisÃcÅ¯m dobrovolnÃkÅ¯ po celÃ©m svÄtÄ. Na rozdÃl od VPN nemÃ¡ sÃÅ¥ Tor ÅŸÃ¡dnÃœ centrÃ¡lnÃ prvek, kterÃ©mu musÃte do rukou svÄÅit svÃ© soukromÃ. +onboarding.tour-tor-network.button=Zobrazit okruhy + +onboarding.tour-tor-circuit-display=ZobrazenÃ okruhÅ¯ +onboarding.tour-tor-circuit-display.title=PodÃvejte se na svou cestu. +onboarding.tour-tor-circuit-display.description=Pro kaÅŸdou domÃ©nu, kterou navÅ¡tÃvÃte, je vytvoÅeno Å¡ifrovanÃ© spojenÃ pÅes tÅi uzly Toru rÅ¯znÄ po svÄtÄ. ÅœÃ¡dnÃ¡ webovÃ¡ strÃ¡nka nevÃ, odkud se k nÃ pÅipojujete. NovÃ© spojenÃ si mÅ¯ÅŸete vyÅŸÃ¡dat klepnutÃm na âNovÃœ okruh pro tuto strÃ¡nkuâ v zobrazenÃ okruhÅ¯. +onboarding.tour-tor-circuit-display.button=Moje cesta + +onboarding.tour-tor-security=ZabezpeÄenÃ +onboarding.tour-tor-security.title=UrÄujte svÅ¯j proÅŸitek. +onboarding.tour-tor-security.description=K dispozici mÃ¡te rozÅ¡ÃÅenÃ¡ nastavenÃ pro dalÅ¡Ã zvÃœÅ¡enÃ zabezpeÄenÃ, napÅ. blokovÃ¡nÃ vÅ¡ech prvkÅ¯, kterÃ© mohou bÃœt potenciÃ¡lnÄ pouÅŸity k Ãºtoku na vÃ¡Å¡ poÄÃtaÄ. Pro zobrazenÃ rÅ¯znÃœch moÅŸnostÃ a jejich fungovÃ¡nÃ klepnÄte nÃÅŸe. +onboarding.tour-tor-security.button=Zkontrolovat nastavenÃ + +onboarding.tour-tor-expect-differences=Tipy +onboarding.tour-tor-expect-differences.title=OÄekÃ¡vejte rozdÃly. +onboarding.tour-tor-expect-differences.description=VÃ¡Å¡ proÅŸitek z prohlÃÅŸenÃ se dÃky vÅ¡em bezpeÄnostnÃm funkcÃm Toru mÅ¯ÅŸe liÅ¡it. StrÃ¡nky mohou bÃœt pomalejÅ¡Ã a v zÃ¡vislosti na Ãºrovni zabezpeÄenÃ nemusÃ nÄkterÃ© prvky fungovat. MÅ¯ÅŸete bÃœt takÃ© dotazovÃ¡ni na dÅ¯kaz, ÅŸe jste opravdu lidÃ© a ne roboti. +onboarding.tour-tor-expect-differences.button=Äasto kladenÃ© otÃ¡zky + +onboarding.tour-tor-onion-services=SluÅŸby Onion +onboarding.tour-tor-onion-services.title=Extra ochrana +onboarding.tour-tor-onion-services.description=SluÅŸby Onion jsou strÃ¡nky, kterÃ© konÄÃ na .onion a poskytujÃ extra ochranu pro autory i nÃ¡vÅ¡tÄvnÃky, vÄetnÄ pojistek proti cenzuÅe. UmoÅŸÅujÃ kaÅŸdÃ©mu poskytovat obsah a sluÅŸby anonymnÄ. Pro otevÅenÃ anonymnÃ onion strÃ¡nky DuckDuckGo klepnÄte nÃÅŸe. +onboarding.tour-tor-onion-services.button=NavÅ¡tÃvit Onion + +# Circuit Display onboarding. +onboarding.tor-circuit-display.next=DalÅ¡Ã +onboarding.tor-circuit-display.done=Hotovo +onboarding.tor-circuit-display.one-of-three=1 ze 3 +onboarding.tor-circuit-display.two-of-three=2 ze 3 +onboarding.tor-circuit-display.three-of-three=3 ze 3 + +onboarding.tor-circuit-display.intro.title=Jak okruhy fungujÃ? +onboarding.tor-circuit-display.intro.msg=Okruhy jsou sestaveny z nÃ¡hodnÄ vybranÃœch uzlÅ¯, poÄÃtaÄÅ¯ rozmÃstÄnÃœch po svÄtÄ a nastavenÃœch pro pÅeposÃlÃ¡nÃ toku v sÃti Tor. Okruhy vÃ¡m zajiÅ¡Å¥ujÃ soukromÃ pÅi prohlÃÅŸenÃ a spojenÃ s onion sluÅŸbami. + +onboarding.tor-circuit-display.diagram.title=ZobrazenÃ okruhÅ¯ +onboarding.tor-circuit-display.diagram.msg=Tento diagram ukazuje uzly tvoÅÃcÃ okruh pro tuto strÃ¡nku. Aby nebylo moÅŸnÃ© spojit vaÅ¡e aktivity na rÅ¯znÃœch strÃ¡nkÃ¡ch, pro kaÅŸdou je vytvoÅen okruh novÃœ. + +onboarding.tor-circuit-display.new-circuit.title=PotÅebujete novÃœ okruh? +onboarding.tor-circuit-display.new-circuit.msg=Pokud se vÃ¡m nedaÅÃ k nÄjakÃ© strÃ¡nce pÅipojit, nebo se strÃ¡nka nenaÄÃtÃ¡ sprÃ¡vnÄ, mÅ¯ÅŸete pouÅŸÃt toto tlaÄÃtko k obnovenÃ strÃ¡nky skrze novÃœ okruh. diff --git a/src/chrome/locale/cs/torbutton.dtd b/src/chrome/locale/cs/torbutton.dtd index 60b96ded..825fa309 100644 --- a/src/chrome/locale/cs/torbutton.dtd +++ b/src/chrome/locale/cs/torbutton.dtd @@ -1,22 +1,51 @@ <!ENTITY torbutton.context_menu.new_identity "Nova identita"> -<!ENTITY torbutton.context_menu.new_identity_key "S"> -<!ENTITY torbutton.context_menu.networksettings "Open Network SettingsâŠ"> -<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> -<!ENTITY torbutton.context_menu.downloadUpdate.key "A"> -<!ENTITY torbutton.context_menu.cookieProtections "Ochrana pÅed cookies"> -<!ENTITY torbutton.context_menu.cookieProtections.key "C"> -<!ENTITY torbutton.button.tooltip "KliknÄte pro inicializaci Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "PÅ¯vodnÃ nastavenÃ"> -<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> -<!ENTITY torbutton.cookiedialog.lockCol "Protected"> -<!ENTITY torbutton.cookiedialog.domainCol "Host"> -<!ENTITY torbutton.cookiedialog.nameCol "JmÃ©no"> -<!ENTITY torbutton.cookiedialog.pathCol "Path"> -<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie"> -<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie"> -<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie"> -<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> -<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> -<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> +<!ENTITY torbutton.context_menu.new_identity_key "i"> +<!ENTITY torbutton.context_menu.new_circuit "NovÃœ okruh Toru pro tuto strÃ¡nku"> +<!ENTITY torbutton.context_menu.new_circuit_key "o"> +<!ENTITY torbutton.context_menu.preferences "NastavenÃ zabezpeÄenÃâŠ"> +<!ENTITY torbutton.context_menu.preferences.key "b"> +<!ENTITY torbutton.context_menu.networksettings "NastavenÃ sÃtÄ Tor..."> +<!ENTITY torbutton.context_menu.networksettings.key "N"> +<!ENTITY torbutton.context_menu.downloadUpdate "Vyhledat aktualizace prohlÃÅŸeÄe TorâŠ"> +<!ENTITY torbutton.context_menu.downloadUpdate.key "a"> +<!ENTITY torbutton.context_menu.cookieProtections "Ochrany cookiesâŠ"> +<!ENTITY torbutton.context_menu.cookieProtections.key "c"> +<!ENTITY torbutton.button.tooltip "KlepnÄte pro inicializaci Torbutton"> +<!ENTITY torbutton.prefs.security_settings "NastavenÃ zabezpeÄenÃ prohlÃÅŸeÄe Tor"> +<!ENTITY torbutton.prefs.restore_defaults "Obnovit vÃœchozÃ"> +<!ENTITY torbutton.prefs.custom_warning "VaÅ¡e nastavenÃ prohlÃÅŸeÄe neodpovÃdÃ¡ standardnÃmu nastavenÃ zabezpeÄenÃ. Z dÅ¯vodu ochrany soukromÃ a zvÃœÅ¡enÃ bezpeÄnosti vÃ¡m doporuÄujeme vybrat si jednu z vÃœchozÃch bezpeÄnostnÃch ÃºrovnÃ."> +<!ENTITY torbutton.cookiedialog.title "SprÃ¡va ochrany cookies"> +<!ENTITY torbutton.cookiedialog.lockCol "ChrÃ¡nÄnÃ©"> +<!ENTITY torbutton.cookiedialog.domainCol "Server"> +<!ENTITY torbutton.cookiedialog.nameCol "NÃ¡zev"> +<!ENTITY torbutton.cookiedialog.pathCol "Cesta"> +<!ENTITY torbutton.cookiedialog.protectCookie "ChrÃ¡nit cookies"> +<!ENTITY torbutton.cookiedialog.removeCookie "Odstranit cookies"> +<!ENTITY torbutton.cookiedialog.unprotectCookie "PÅestat chrÃ¡nit cookies"> +<!ENTITY torbutton.cookiedialog.removeAllBut "Odstranit vÅ¡echny nechrÃ¡nÄnÃ©"> +<!ENTITY torbutton.cookiedialog.saveAllCookies "ChrÃ¡nit novÃ© cookies"> +<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "PÅestat chrÃ¡nit novÃ© cookies"> +<!ENTITY torbutton.prefs.restrict_thirdparty "Omezit cookies tÅetÃch stran a dalÅ¡Ã sledovacÃ data"> +<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "O"> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Ponechte toto pole zaÅ¡krtnutÃ© pro ochranu pÅed zneuÅŸitÃm nÄkterÃœch funkcÃ prohlÃÅŸeÄe k sledovÃ¡nÃ vaÅ¡eho prohlÃÅŸenÃ webu. ZneuÅŸitelnÃ© funkce zahrnujÃ blob URL adresy, vysÃlacÃ kanÃ¡ly, mezipamÄÅ¥ prohlÃÅŸeÄe, cookies, favicony, autorizaÄnÃ hlaviÄky HTTP, pÅednaÄÃtÃ¡nÃ odkazÅ¯, localStorage, URL adresy mediaSource, OCSP dotazy, SharedWorkers a tickety TLS relacÃ."> +<!ENTITY torbutton.prefs.resist_fingerprinting "ZmÄnit podrobnosti, kterÃ© vÃ¡s odliÅ¡ujÃ od ostatnÃch uÅŸivatelÅ¯ prohlÃÅŸeÄe Tor."> +<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Ponechte toto pole zaÅ¡krtnutÃ©, abyste pÅed webovÃœmi strÃ¡nkami skryli unikÃ¡tnÃ informace, kterÃ© vÃ¡s mohou identifikovat, napÅÃklad vÃœkon vaÅ¡eho poÄÃtaÄe, rozloÅŸenÃ klÃ¡vesnice, jazyk, umÃstÄnÃ nainstalovanÃœch zÃ¡suvnÃœch modulÅ¯ a jejich seznam, stav vaÅ¡Ã sÃtÄ, otoÄenÃ obrazovky, velikost obrazovky, ÃºrovnÄ pÅiblÃÅŸenÃ pro jednotlivÃ© strÃ¡nky, podporovanÃ© typy souborÅ¯, systÃ©movÃ© barvy a podporovanÃ© funkce WebGL."> +<!ENTITY torbutton.prefs.sec_caption "ÃroveÅ zabezpeÄenÃ"> +<!ENTITY torbutton.prefs.sec_caption_tooltip "ÃrovnÄ zabezpeÄenÃ vÃ¡m umoÅŸÅujÃ vypnout nÄkterÃ© funkce, kvÅ¯li kterÃœm mÅ¯ÅŸe bÃœt vÃ¡Å¡ prohlÃÅŸeÄ vÃce nÃ¡chylnÃœ k hackerskÃœm ÃºtokÅ¯m."> +<!ENTITY torbutton.prefs.sec_standard_label "StandardnÃ"> +<!ENTITY torbutton.prefs.sec_standard_description "VÅ¡echny funkce prohlÃÅŸeÄe Tor jsou zapnutÃ©."> +<!ENTITY torbutton.prefs.sec_safer_label "BezpeÄnÄjÅ¡Ã"> +<!ENTITY torbutton.prefs.sec_safer_description "NÄkterÃ© mÃ©nÄ bezpeÄnÃ© funkce jsou vypnuty, ale nÄkterÃ© strÃ¡nky nemusÃ fungovat."> +<!ENTITY torbutton.prefs.sec_safer_list_label "PÅi nastavenÃ bezpeÄnÄjÅ¡Ã ÃºrovnÄ:"> +<!ENTITY torbutton.prefs.sec_safest_label "NejbezpeÄnÄjÅ¡Ã"> +<!ENTITY torbutton.prefs.sec_safest_description "PovolÃ jen funkce pro zobrazenÃ statickÃœch webovÃœch strÃ¡nek a fungovÃ¡nÃ zÃ¡kladnÃch sluÅŸeb. OvlivnÄno bude zobrazenÃ obrÃ¡zkÅ¯, mÃ©diÃ a fungovÃ¡nÃ skriptÅ¯."> +<!ENTITY torbutton.prefs.sec_safest_list_label "PÅi nastavenÃ nejbezpeÄnÄjÅ¡Ã ÃºrovnÄ:"> +<!ENTITY torbutton.prefs.sec_learn_more_label "Zjistit vÃce"> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript je na strÃ¡nkÃ¡ch bez HTTPS vypnut."> +<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript je ve vÃœchozÃm nastavenÃ vypnut na vÅ¡ech strÃ¡nkÃ¡ch."> +<!ENTITY torbutton.prefs.sec_limit_typography "NÄkterÃ¡ pÃsma a matematickÃ© symboly jsou zablokovÃ¡ny."> +<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "NÄkterÃ¡ pÃsma, matematickÃ© symboly a obrÃ¡zky jsou zablokovÃ¡ny."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio a video (HTML5 mÃ©dia) se pÅehrÃ¡vajÃ po kliknutÃ."> +<!ENTITY torbutton.circuit_display.title "Tor okruh"> +<!ENTITY torbutton.circuit_display.new_circuit "NovÃœ okruh Toru pro tuto strÃ¡nku"> diff --git a/src/chrome/locale/cs/torbutton.properties b/src/chrome/locale/cs/torbutton.properties index c53d4462..ef9b8092 100644 --- a/src/chrome/locale/cs/torbutton.properties +++ b/src/chrome/locale/cs/torbutton.properties @@ -1,27 +1,55 @@ -torbutton.panel.tooltip.disabled = Klikni pro povolenÃ Tor -torbutton.panel.tooltip.enabled = Klikni pro zakÃ¡zÃ¡nÃ Tor -torbutton.panel.label.disabled = Tor Zapnut -torbutton.panel.label.enabled = Tor Vypnut -extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.external.title = NaÄÃst vnÄjÅ¡Ã obsah? -torbutton.popup.external.app = Je potÅeba vnÄjÅ¡Ã aplikace k jednÃ¡nÃ s: \n -torbutton.popup.external.note = \nPOZNÃMKA: VnÄjÅ¡Ã aplikace NEJSOU Torem zabezpeÄenÃ© a mohou odkrÃœt VaÅ¡e informace!\n -torbutton.popup.external.suggest = \nPokud tomuto souboru nevÄÅÃte, mÅ¯ÅŸete ho buÄ uloÅŸit a prohlÃ©dnout ho offline nebo ve VM, nebo zkusit pouÅŸÃt prÅ¯hlednou Tor proxy jako napÅ. Tails LiveCD nebo torsocks\n -torbutton.popup.launch = Spustit aplikaci +torbutton.circuit_display.internet = Internet +torbutton.circuit_display.ip_unknown = NeznÃ¡mÃ¡ IP adresa +torbutton.circuit_display.onion_site = Onion strÃ¡nka +torbutton.circuit_display.this_browser = Tento prohlÃÅŸeÄ +torbutton.circuit_display.relay = Uzel +torbutton.circuit_display.tor_bridge = Most +torbutton.circuit_display.unknown_country = NeznÃ¡mÃ¡ zemÄ +torbutton.circuit_display.guard = Ochrana +torbutton.circuit_display.guard_note = VÃ¡Å¡ uzel typu Ochrana se nemusÃ zmÄnit. +torbutton.circuit_display.learn_more = Zjistit vÃce +torbutton.content_sizer.margin_tooltip = ProhlÃÅŸeÄ Tor upravuje velikost vaÅ¡eho okna, aby znesnadnil moÅŸnost vaÅ¡eho vysledovÃ¡nÃ. +torbutton.panel.tooltip.disabled = KlepnÄte pro zapnutÃ Toru +torbutton.panel.tooltip.enabled = KlepnÄte pro vypnutÃ Toru +torbutton.panel.label.disabled = Tor vypnut +torbutton.panel.label.enabled = Tor zapnut +extensions.torbutton(a)torproject.org.description = TorButton je tlaÄÃtko pro nastavenÃ Toru a rychlÃ© a jednoduchÃ© smazÃ¡nÃ soukromÃœch ÃºdajÅ¯ o vaÅ¡em prohlÃÅŸenÃ. +torbutton.popup.external.title = StÃ¡hnout externÃ soubor? +torbutton.popup.external.app = ProhlÃÅŸeÄ Tor nemÅ¯ÅŸe zobrazit tento soubor. Budete ho muset otevÅÃt v jinÃ© aplikaci.\n\n +torbutton.popup.external.note = NÄkterÃ© typy souborÅ¯ mohou zpÅ¯sobit, ÅŸe se aplikace pÅipojÃ k internetu bez pouÅŸitÃ Toru.\n\n +torbutton.popup.external.suggest = Chcete-li bÃœt v bezpeÄÃ, otevÃrejte staÅŸenÃ© soubory pouze v reÅŸimu offline, nebo pouÅŸijte Tor Live CD, napÅ. Tails.\n +torbutton.popup.launch = StÃ¡hnout soubor torbutton.popup.cancel = ZruÅ¡it -torbutton.popup.dontask = OdteÄ vÅŸdy spouÅ¡tÄt aplikace -torbutton.popup.prompted_language = K poskytnutÃ vÄtÅ¡Ãho soukromÃ, Torbutton mÅ¯ÅŸe poÅŸadovat anglickou verzi internetovÃœch strÃ¡nek. StrÃ¡nky kterÃ© chcete ÄÃst ve svÃ©m jazyce se mohou zobrazit namÃsto toho v angliÄtinÄ.\n\nChtÄli byste poÅŸadovat anglicky psanÃ© strÃ¡nky pro vÄtÅ¡Ã soukromÃ? -torbutton.popup.no_newnym = Torbutton nemÅ¯ÅŸe bezpeÄnÄ poskytnout novou identitu. NemÃ¡ pÅÃstup k pÅÃstupovÃ©mu portu Tor.\n\nMÃ¡te spuÅ¡tÄn Tor Browser Bundle? -torbutton.title.prompt_torbrowser = Important Torbutton Information -torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. -torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. +torbutton.popup.dontask = Od teÄ stahovat soubory automaticky +torbutton.popup.no_newnym = Torbutton vÃ¡m nemÅ¯ÅŸe bezpeÄnÄ poskytnout novou identitu, protoÅŸe nemÃ¡ pÅÃstup ke controlnÃmu portu Tor.\n\nMÃ¡te spuÅ¡tÄn Tor Browser Bundle? +torbutton.security_settings.menu.title = NastavenÃ zabezpeÄenÃ +torbutton.title.prompt_torbrowser = DÅ¯leÅŸitÃ¡ zprÃ¡va Torbutton +torbutton.popup.prompt_torbrowser = Torbutton nynÃ pracuje jinak: nemÅ¯ÅŸete jej nynÃ vypnout.\n\nPro tuto zmÄnu jsme se rozhodli kvÅ¯li bezpeÄnosti pouÅŸÃvvÃ¡nÃ Torbutton v prohlÃÅŸeÄi. kterÃœ je zÃ¡roveÅ vyuÅŸÃvÃ¡n pro prohlÃÅŸenÃ mimo sÃÅ¥ Tor. DochÃ¡zelo kvÅ¯li tomu k pÅÃliÅ¡ mnoha chybÃ¡m, kterÃ© jsme nemohli jinak opravit.\n\nPokud chcete dÃ¡le pouÅŸÃvat Firefox bÄÅŸnÃœm zpÅ¯sobem, nainstalujte si Tor Browser Bundle. NastavenÃ soukromÃ prohlÃÅŸeÄe Tor jsou nadÅazeny tÄm ve Firefoxu, dokonce i kdyÅŸ Firefox pouÅŸÃvÃ¡te spoleÄnÄ s Torbutton. \n\nTorbutton mÅ¯ÅŸete odstranit v NÃ¡stroje > DoplÅky > RozÅ¡ÃÅenÃ a klepnutÃm na tlaÄÃtko Odebrat. +torbutton.popup.short_torbrowser = DÅ¯leÅŸitÃ¡ informace!\n\nTorbutton je nynÃ stÃ¡le aktivnÃ.\n\nPro vÃce informacÃ klepnÄte na Torbutton. -torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n -torbutton.popup.never_ask_again = Never ask me again +torbutton.popup.confirm_plugins = ZÃ¡suvnÃ© moduly, jako je tÅeba Flash, mohou naruÅ¡it vaÅ¡e soukromÃ a anonymitu.\n\nTakÃ© mohou obejÃt Tor a vyzradit vaÅ¡e umÃstÄnÃ a IP adresu.\n\nOpravdu chcete zÃ¡suvnÃ© moduly povolit?\n\n +torbutton.popup.never_ask_again = Znovu se neptat +torbutton.popup.confirm_newnym = ProhlÃÅŸeÄ Tor zavÅe vÅ¡echna okna a panely. VÅ¡echny relace budou ztraceny.\nOpravdu chcete restartovat prohlÃÅŸeÄ Tor pro resetovÃ¡nÃ vaÅ¡Ã identity?\n + +torbutton.maximize_warning = MaximalizovÃ¡nÃm prohlÃÅŸeÄe Tor dovolÃ webovÃœm strÃ¡nkÃ¡m zjistit velikost a vaÅ¡eho monitoru a pouÅŸÃt tuto informaci k vaÅ¡emu sledovÃ¡nÃ. DoporuÄujeme ponechat okno prohlÃÅŸeÄe Tor v pÅednastavenÃ© velikosti. # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time. -canvas.allow=Allow in the Future -canvas.allowAccessKey=A -canvas.never=Never for This Site +canvas.siteprompt=Server %S se pokusil zÃskat obrazovÃ¡ data HTML5 canvasu, kterÃ¡ mohou bÃœt pouÅŸita pro unikÃ¡tnÃ identifikaci vaÅ¡eho poÄÃtaÄe.\n\nChcete serveru povolit zÃskÃ¡nÃ obrazovÃœch dat HTML5 canvasu? +canvas.notNow=NynÃ ne +canvas.notNowAccessKey=N +canvas.allow=Povolit v budoucnu +canvas.allowAccessKey=P +canvas.never=Nikdy na tomto serveru (doporuÄeno) canvas.neverAccessKey=e + +# Profile/startup error messages. Strings are kept here for ease of translation. +# LOCALIZATION NOTE: %S is the application name. +profileProblemTitle=%S ProfilovÃœ problÃ©m +profileReadOnly=Aplikaci %S nelze spustit ze souborovÃ©ho systÃ©mu pouze pro ÄtenÃ. ZkopÃrujte ji prosÃm na jinÃ© mÃsto. +profileReadOnlyMac=Aplikaci %S nelze spustit ze souborovÃ©ho systÃ©mu pouze pro ÄtenÃ. ZkopÃrujte ji prosÃm na plochu nebo do sloÅŸky s aplikacemi. +profileAccessDenied=%S nemÃ¡ oprÃ¡vnÄnÃ k pÅÃstupu k profilu. Upravte prosÃm oprÃ¡vnÄnÃ vaÅ¡eho souborovÃ©ho systÃ©mu a zkuste to znovu. +profileMigrationFailed=Migrace vaÅ¡eho stÃ¡vajÃcÃho profilu se nezdaÅila.\nBude pouÅŸito novÃ© nastavenÃ. + +# .Onion Page Info prompt. Strings are kept here for ease of translation. +pageInfo_OnionEncryptionWithBitsAndProtocol=Å ifrovanÃ© spojenÃ (Onion sluÅŸba, %1$S, %2$S bitovÃ© klÃÄe, %3$S) +pageInfo_OnionEncryption=Å ifrovanÃ© spojenÃ (Onion sluÅŸba) diff --git a/src/chrome/locale/el/aboutDialog.dtd b/src/chrome/locale/el/aboutDialog.dtd new file mode 100644 index 00000000..a5c0cf69 --- /dev/null +++ b/src/chrome/locale/el/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; ÎÏÎµÎ¹ ÏÏÎ¹Î±ÏÏÎµÎ¯ Î±ÏÏ"> + +<!ENTITY project.tpoLink "Î¿ &vendorShortName;"> +<!ENTITY project.end ",ÎŒÎ¹Î± ÎŒÎ· ÎºÎµÏÎŽÎ¿ÏÎºÎ¿ÏÎ¹ÎºÎ® Î¿ÏÎ³Î¬ÎœÏÏÎ· ÏÎ¿Ï ÏÏÎµÏÎ±ÏÏÎ¯Î¶ÎµÏÎ±Î¹ ÏÎ·Îœ Î¹ÎŽÎ¹ÏÏÎ¹ÎºÏÏÎ·ÏÎ± ÎºÎ±Î¹ ÏÎ·Îœ ÎµÎ»ÎµÏÎžÎµÏÎµÎ¯Î± ÏÎ±Ï ÏÏÎ¿ ÎŽÎ¹Î±ÎŽÏÎºÏÎ¹Î¿."> + +<!ENTITY help.start "ÎÎÎ»ÎµÏÎµ ÎœÎ± Î²Î¿Î·ÎžÎ®ÏÎµÏÎµ?"> + +<!ENTITY help.donateLink "ÎÏÏÎ¯ÏÏÎµ"> +<!ENTITY help.or "Î®"> + +<!ENTITY help.getInvolvedLink "Î²Î¿Î·ÎžÎ®ÏÏÎµ"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "ÎÏÏÏÎ®ÏÎµÎ¹Ï?"> + +<!ENTITY bottomLinks.grow "ÎÎ¿Î·ÎžÎ®ÏÏÎµ ÏÎ¿ ÎÎ¯ÎºÏÏÎ¿ Tor ÎœÎ± ÎŒÎµÎ³Î±Î»ÏÏÎµÎ¹!"> + +<!ENTITY bottomLinks.license "Î Î»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ ÎÎŽÎµÎ¹Î¿ÎŽÏÏÎ·ÏÎ·Ï"> +<!ENTITY tor.TrademarkStatement "Î€Î¿ 'Tor' ÎºÎ±Î¹ ÏÎ¿ 'Onion Logo' ÎµÎ¯ÎœÎ±Î¹ ÎµÎ³Î³ÎµÎ³ÏÎ±ÎŒÎÎœÎ± Î»Î¿Î³ÏÏÏÏÎ± ÏÎ¿Ï Tor Project, Inc."> diff --git a/src/chrome/locale/el/aboutTBUpdate.dtd b/src/chrome/locale/el/aboutTBUpdate.dtd new file mode 100644 index 00000000..085896d0 --- /dev/null +++ b/src/chrome/locale/el/aboutTBUpdate.dtd @@ -0,0 +1,10 @@ +<!ENTITY aboutTBUpdate.title "ÎÎœÎ±Î²Î¬ÎžÎŒÎ¹ÏÎ· ÏÎ¿Ï Tor Browser"> +<!ENTITY aboutTBUpdate.updated "Î Tor Browser Î±ÎœÎ±Î²Î±ÎžÎŒÎ¯ÏÏÎ·ÎºÎµ."> +<!ENTITY aboutTBUpdate.linkPrefix "ÎÎ¹Î± ÏÎ¹Ï ÏÎ¹Î¿ ÏÏÏÏÏÎ±ÏÎµÏ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ Î³Î¹Î± Î±ÏÏÎ® ÏÎ·Îœ ÎÎºÎŽÎ¿ÏÎ·,"> +<!ENTITY aboutTBUpdate.linkLabel "ÎµÏÎ¹ÏÎºÎµÏÎžÎµÎ¯ÏÎµ ÏÎ·Îœ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎ± ÎŒÎ±Ï"> +<!ENTITY aboutTBUpdate.linkSuffix "."> +<!ENTITY aboutTBUpdate.changeLogHeading "ÎÎ»Î»Î±Î³ÎÏ:"> + +<!ENTITY aboutTBUpdate.circuitDisplayHeading "ÎÎÎ±, ÎµÏÎ±ÎœÎ±ÏÏÎµÎŽÎ¹Î±ÏÎŒÎÎœÎ· ÏÎ±ÏÎ¿ÏÏÎ¯Î±ÏÎ· ÎºÏÎºÎ»ÏÎŒÎ±ÏÎ¿Ï"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "Î€Î¿ ÎºÏÎºÎ»ÏÎŒÎ± ÏÎ¿Ï Tor ÎÏÎµÎ¹ Î±Î»Î»Î¬ÎŸÎµÎ¹ ÏÎ¿ÏÎ¿ÎžÎµÏÎ¯Î± ÎºÎ±Î¹ Î²ÎµÎ»ÏÎ¹ÏÎžÎ·ÎºÎµ! ÎÎ¬ÎœÏÎµ ÎºÎ»Î¹Îº ÏÏÎ· ÏÎµÎ»Î¯ÎŽÎ± ÎÎ¿ÏÎŒÏÎ¯ ÏÎ±ÏÏÏÏÎ·ÏÎ±Ï (Î²ÏÎ¯ÏÎºÎµÏÎ±Î¹ ÏÏÎ·Îœ Î±ÏÎ¹ÏÏÎµÏÎ® ÏÎ»ÎµÏÏÎ¬ ÏÎ·Ï Î³ÏÎ±ÎŒÎŒÎ®Ï ÎŽÎ¹ÎµÏÎžÏÎœÏÎ·Ï) Î³Î¹Î± ÎœÎ± ÎŽÎµÎ¯ÏÎµ ÏÎ·Îœ ÎºÎ±Î¹ÎœÎ¿ÏÏÎ¹Î± ÏÎ±ÏÎ¿ÏÏÎ¯Î±ÏÎ· ÎºÏÎºÎ»ÏÎŒÎ±ÏÎ¿Ï."> +<!ENTITY aboutTBUpdate.learnMore "ÎÎ¬ÎžÎµÏÎµ ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ±"> diff --git a/src/chrome/locale/el/aboutTor.dtd b/src/chrome/locale/el/aboutTor.dtd index 9f14022b..738b81ac 100644 --- a/src/chrome/locale/el/aboutTor.dtd +++ b/src/chrome/locale/el/aboutTor.dtd @@ -1,47 +1,42 @@  -<!ENTITY aboutTor.title "About Tor"> - -<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date."> -<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update."> - -<!ENTITY aboutTor.check.label "Test Tor Network Settings"> - -<!ENTITY aboutTor.success.label "Congratulations!"> -<!ENTITY aboutTor.success2.label "This browser is configured to use Tor."> -<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously."> -<!ENTITY aboutTor.failure.label "Something Went Wrong!"> -<!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> -<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact "> -<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> -<!ENTITY aboutTor.failure3suffix.label "."> - -<!ENTITY aboutTor.search.label "Search"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> -<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> - -<!ENTITY aboutTor.torInfo1.label "Additional Info:"> -<!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> -<!ENTITY aboutTor.torInfo3.label "Exit Node:"> -<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors."> -<!ENTITY aboutTor.whatnextQuestion.label "What Next?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> -<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»"> -<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.helpInfo1.label "You Can Help!"> -<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> -<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»"> -<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»"> -<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»"> -<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> - -<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy."> -<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»"> -<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> +<!ENTITY aboutTor.title "Î£ÏÎµÏÎ¹ÎºÎ¬ ÎŒÎµ ÏÎ¿ Tor"> + +<!ENTITY aboutTor.ready.label "ÎÎŸÎµÏÎµÏÎœÎ®ÏÏÎµ. ÎÎµ Î¹ÎŽÎ¹ÏÏÎ¹ÎºÏÏÎ·ÏÎ±."> +<!ENTITY aboutTor.ready2.label "ÎÎ¯ÏÎ±Î¹ ÎÏÎ¿Î¹ÎŒÎ¿Ï Î³Î¹Î± ÏÎ·Îœ ÏÎ¹Î¿ Î¹ÎŽÎ¹ÏÏÎ¹ÎºÎ® ÎµÎŒÏÎµÎ¹ÏÎ¯Î± ÏÎµÏÎ¹Î®Î³Î·ÏÎ·Ï."> +<!ENTITY aboutTor.failure.label "ÎÎ¬ÏÎ¹ ÏÎ®Î³Îµ ÏÏÏÎ±Î²Î¬!"> +<!ENTITY aboutTor.failure2.label "Î€Î¿ Tor ÎŽÎµÎœ Î»ÎµÎ¹ÏÎ¿ÏÏÎ³ÎµÎ¯ ÏÎµ Î±ÏÏÏÎœ ÏÎ¿Îœ browser."> + +<!ENTITY aboutTor.search.label "ÎÎ¬ÎœÎµ Î±ÎœÎ±Î¶Î®ÏÎ·ÏÎ· ÎŒÎµ ÏÎ¿ DuckDuckGo"> +<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> + +<!ENTITY aboutTor.torbrowser_user_manual_questions.label "ÎÏÏÏÎ®ÏÎµÎ¹Ï?"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "ÎÎ¿Î¹ÏÎ¬ÎŸÏÎµ ÏÎ¿ ÎµÎ³ÏÎµÎ¹ÏÎ¯ÎŽÎ¹Ï ÎŒÎ±Ï Î³Î¹Î± ÏÎ¿Îœ Tor BrowserÂ»"> + +<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> +<!ENTITY aboutTor.torbrowser_user_manual.label "ÎÎ³ÏÎµÎ¹ÏÎ¯ÎŽÎ¹Î¿ ÏÎ¿Ï Tor Browser"> + +<!ENTITY aboutTor.tor_mission.label "Î€Î¿ ÏÏÏÏÎ¶ÎµÎºÏ ÏÎ¿Ï Tor ÎµÎ¯ÎœÎ±Î¹ ÎŒÎ¯Î± US 501(c)(3) ÎŒÎ· ÎºÎµÏÎŽÎ¿ÏÎºÎ¿ÏÎ¹ÎºÎ® Î¿ÏÎ³Î¬ÎœÏÏÎ·, ÏÎ¿Ï ÏÏÎ¿ÏÎžÎµÎ¯ ÏÎ± Î±ÎœÎžÏÏÏÎ¹ÎœÎ± ÎŽÎ¹ÎºÎ±Î¹ÏÎŒÎ±ÏÎ± ÎºÎ±Î¹ ÏÎ¹Ï ÎµÎ»ÎµÏÎžÎµÏÎ¯ÎµÏ ÎŽÎ·ÎŒÎ¹Î¿ÏÏÎ³ÏÎœÏÎ±Ï ÎºÎ±Î¹ ÏÎ±ÏÎÏÎ¿ÎœÏÎ±Ï ÎŽÏÏÎµÎ¬Îœ ÎºÎ±Î¹ Î±ÎœÎ¿Î¹ÏÏÎ¬ Î±ÎœÏÎœÏÎŒÎ¯Î± ÏÎ·Î³Î®Ï ÎºÎ±Î¹ ÏÎµÏÎœÎ¿Î»Î¿Î³Î¯Î±Ï Î¹ÎŽÎ¹ÏÏÎ¹ÎºÏÏÎ·ÏÎ±Ï, ÏÏÎ¿ÏÏÎ·ÏÎ¯Î¶Î¿ÎœÏÎ±Ï ÏÎ·Îœ Î±ÏÎµÏÎ¹ÏÏÎ¹ÏÏÎ· ÏÎ±ÏÎ¿ÏÎ® ÎºÎ±Î¹ ÏÏÎ®ÏÎ· ÏÎ¿ÏÏ ÎºÎ±Î¹ ÎµÏÎµÎºÏÎµÎ¯ÎœÎ¿ÎœÏÎ±Ï ÏÎ·Îœ ÎµÏÎ¹ÏÏÎ·ÎŒÎ¿ÎœÎ¹ÎºÎ® ÎºÎ±Î¹ ÎºÎ¿Î¹ÎœÎ® ÎºÎ±ÏÎ±ÎœÏÎ·ÏÎ·."> +<!ENTITY aboutTor.getInvolved.label "ÎÎ¿Î·ÎžÎ®ÏÏÎµ ÎºÎ¹ ÎµÏÎµÎ¯Ï Â»"> +<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> + +<!ENTITY aboutTor.newsletter.tagline "ÎÎ¬Î²ÎµÏÎµ ÏÎ± ÏÎµÎ»ÎµÏÏÎ±Î¯Î± ÎœÎÎ± ÏÎ¿Ï Tor ÎºÎ±ÏÎµÏÎžÎµÎ¯Î±Îœ ÏÏÎ± ÎµÎ¹ÏÎµÏÏÏÎŒÎµÎœÎ¬ ÏÎ±Ï."> +<!ENTITY aboutTor.newsletter.link_text "ÎÎ³Î³ÏÎ±ÏÏÎµÎ¯ÏÎµ Î³Î¹Î± ÏÎ± ÎœÎÎ± ÏÎ¿Ï Tor."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Î Î¹ÏÏÏÏ ÏÏÎœ ÏÎ¿Î»Î»ÏÎœ.Â "> + +<!ENTITY aboutTor.donationBanner.line2a "Î Î±ÎœÏÎœÏÎŒÎ¯Î± Î±Î³Î±ÏÎ¬ ÏÎ·Îœ ÏÎ±ÏÎÎ±."> +<!ENTITY aboutTor.donationBanner.line2b "Î ÏÎ¿ÏÎžÎ®ÏÏÎµ ÏÎ± Î±ÎœÎžÏÏÏÎ¹ÎœÎ± ÎŽÎ¹ÎºÎ±Î¹ÏÎŒÎ±ÏÎ± ÏÎ±Î³ÎºÎ¿ÏÎŒÎ¯ÏÏ."> +<!ENTITY aboutTor.donationBanner.line2c "Î¥ÏÎµÏÎ±ÏÏÎ¹ÏÏÎµÎ¯ÏÎµ ÏÎ·Îœ ÎµÎ»ÎµÏÎžÎµÏÎ¯Î± "> +<!ENTITY aboutTor.donationBanner.line2d "Î ÏÎ¿ÏÏÎ±ÏÎÏÏÎµ ÏÎ·Îœ Î¹ÎŽÎ¹ÏÏÎ¹ÎºÏÏÎ·ÏÎ± ÎµÎºÎ±ÏÎ¿ÎŒÎŒÏÏÎ¯ÏÎœ."> +<!ENTITY aboutTor.donationBanner.line2e "ÎÎ¹Î±ÏÎ·ÏÎ®ÏÏÎµ ÏÎ¿ Tor Î¹ÏÏÏÏÏ."> +<!ENTITY aboutTor.donationBanner.line2f "Î§ÏÎµÎ¹Î±Î¶ÏÎŒÎ±ÏÏÎµ ÏÎ·Îœ ÏÏÎ¿ÏÏÎ®ÏÎ¹ÎŸÎ· ÏÎ±Ï!"> + +<!ENTITY aboutTor.donationBanner.line3 "ÎÏÏÎ¯ÏÏÎµ ÏÎ®ÎŒÎµÏÎ± ÎºÎ±Î¹ ÏÎ¿ Mozilla ÎžÎ± ÎŽÏÏÎ¯ÏÎµÎ¹ ÏÎ¿ Î¯ÎŽÎ¹Î¿ ÏÎ¿ÏÏ!"> + +<!ENTITY aboutTor.donationBanner.buttonA "ÎÎ¬ÎœÏÎµ ÎŒÎ¹Î± ÎŽÏÏÎµÎ¬ ÏÏÏÎ±!"> +<!ENTITY aboutTor.donationBanner.buttonB "Î¥ÏÎ¿Î»Î¿Î³Î¯ÏÏÎµ ÎŒÎµ"> diff --git a/src/chrome/locale/el/brand.dtd b/src/chrome/locale/el/brand.dtd index 59f665e8..65bd74eb 100644 --- a/src/chrome/locale/el/brand.dtd +++ b/src/chrome/locale/el/brand.dtd @@ -2,7 +2,14 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<!ENTITY brandShorterName "Tor Browser"> <!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> -<!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> +<!ENTITY trademarkInfo.part1 "O Firefox ÎºÎ±Î¹ ÏÎ¿ Î»Î¿Î³ÏÏÏÏÎ¿ Firefox ÎµÎ¯ÎœÎ±Î¹ ÎµÎŒÏÎ¿ÏÎ¹ÎºÎ¬ ÏÎ®ÎŒÎ±ÏÎ± ÏÎ¿Ï Mozilla Foundation."> + + +<!ENTITY plugins.installed.find "ÎÎ¬ÎœÏÎµ ÎºÎ»Î¹Îº Î³Î¹Î± ÎœÎ± ÏÎ¿ÏÏÏÏÎµÏÎµ ÎµÎ³ÎºÎ±ÏÎµÏÏÎ·ÎŒÎÎœÎ± ÏÏÏÏÎžÎµÏÎ± ÏÏÏÏÎ®ÎŒÎ±ÏÎ¿Ï"> +<!ENTITY plugins.installed.enable "ÎÎœÎµÏÎ³Î¿ÏÎ¿Î¯Î·ÏÎ· Î ÏÏÏÎžÎµÏÏÎœ"> +<!ENTITY plugins.installed.disable "ÎÏÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¯Î·ÏÎ· Î ÏÏÏÎžÎµÏÏÎœ"> +<!ENTITY plugins.installed.disable.tip "ÎÎ¬ÎœÏÎµ ÎºÎ»Î¹Îº Î³Î¹Î± ÎœÎ± ÎŒÎ·Îœ ÏÎ¿ÏÏÏÎžÎ¿ÏÎœ ÏÎ± ÏÏÏÏÎžÎµÏÎ± ÏÎ¿Ï ÏÏÏÏÎ®ÎŒÎ±ÏÎ¿Ï"> diff --git a/src/chrome/locale/el/brand.properties b/src/chrome/locale/el/brand.properties index f63def38..0d040dd6 100644 --- a/src/chrome/locale/el/brand.properties +++ b/src/chrome/locale/el/brand.properties @@ -2,14 +2,15 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +brandShorterName=Tor Browser brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project -homePageSingleStartMain=Firefox Start, a fast home page with built-in search -homePageImport=Import your home page from %S +homePageSingleStartMain=Firefox Start, ÎŒÎ¹Î± Î³ÏÎ®Î³Î¿ÏÎ· Î±ÏÏÎ¹ÎºÎ® ÏÎµÎ»Î¯ÎŽÎ± ÎŒÎµ ÎµÎœÏÏÎŒÎ±ÏÏÎŒÎÎœÎ· Î±ÎœÎ±Î¶Î®ÏÎ·ÏÎ· +homePageImport=ÎÎ¹ÏÎ±Î³ÏÎ³Î® ÏÎ·Ï Î±ÏÏÎ¹ÎºÎ®Ï ÏÎµÎ»Î¯ÎŽÎ±Ï Î±ÏÏ %S -homePageMigrationPageTitle=Home Page Selection -homePageMigrationDescription=Please select the home page you wish to use: +homePageMigrationPageTitle=ÎÏÎ¹Î»Î¿Î³Î® ÎÏÏÎ¹ÎºÎ® Î£ÎµÎ»Î¯ÎŽÎ±Ï +homePageMigrationDescription=Î Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎŒÎµ ÎµÏÎ¹Î»ÎÎŸÏÎµ ÏÎ·Îœ Î±ÏÏÎ¹ÎºÎ® ÏÎµÎ»Î¯ÎŽÎ± ÏÎ¿Ï ÎµÏÎ¹ÎžÏÎŒÎµÎ¯ÏÎµ ÎœÎ± ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹Î®ÏÎµÏÎµ: -syncBrandShortName=Sync +syncBrandShortName=Î£ÏÎ³ÏÏÎ¿ÎœÎ¹ÏÎŒÏÏ diff --git a/src/chrome/locale/el/browserOnboarding.properties b/src/chrome/locale/el/browserOnboarding.properties new file mode 100644 index 00000000..766e982a --- /dev/null +++ b/src/chrome/locale/el/browserOnboarding.properties @@ -0,0 +1,54 @@ +# Copyright (c) 2018, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +onboarding.tour-tor-welcome=ÎÎ±Î»ÏÏ Î®Î»ÎžÎ±ÏÎµ +onboarding.tour-tor-welcome.title=ÎÎ¯ÏÏÎµ ÎÏÎ¿Î¹ÎŒÎ¿Ï. +onboarding.tour-tor-welcome.description=Î Tor Browser ÏÏÎ¿ÏÏÎÏÎµÎ¹ ÏÎ± ÏÏÎ·Î»ÏÏÎµÏÎ± ÏÏÎ¬ÎœÏÎ±Ï ÏÏÎ·Îœ Î¹ÎŽÎ¹ÏÏÎ¹ÎºÏÏÎ·ÏÎ± ÎºÎ±Î¹ ÏÎ·Îœ Î±ÏÏÎ¬Î»ÎµÎ¹Î± ÎºÎ±ÏÎ¬ ÏÎ·Îœ ÏÎµÏÎ¹Î®Î³Î·ÏÎ· ÏÏÎ¿ ÎŽÎ¹Î±ÎŽÎ¯ÎºÏÏÎ¿. Î€ÏÏÎ± ÎµÎ¯ÏÏÎµ ÏÏÎ¿ÏÏÎ±ÏÎµÏÎŒÎÎœÎ¿Ï Î±ÏÏ ÏÎ¿Îœ ÎµÎœÏÎ¿ÏÎ¹ÏÎŒÏ, ÏÎ·Îœ ÎºÎ±ÏÎ±ÏÎºÎ¿ÏÎ¯Î± ÎºÎ±Î¹ ÏÎ· Î»Î¿Î³Î¿ÎºÏÎ¹ÏÎ¯Î±. ÎÎ¯Î± Î³ÏÎ®Î³Î¿ÏÎ· ÎŽÎ¿ÎºÎ¹ÎŒÎ® ÎžÎ± ÏÎ±Ï ÎŽÎµÎ¯ÎŸÎµÎ¹ ÏÏÏ. +onboarding.tour-tor-welcome.button=ÎÎµÎºÎ¹ÎœÎ®ÏÏÎµ Î€ÏÏÎ± + +onboarding.tour-tor-privacy=ÎÏÏÏÏÎ·ÏÎ¿ +onboarding.tour-tor-privacy.title=ÎÏÎ¿ÏÏÎ³ÎµÏÎµ ÎµÎœÏÎ¿ÏÎ¹ÏÏÎÏ ÎºÎ±Î¹ Î±ÎŽÎ¹Î¬ÎºÏÎ¹ÏÎ¿ÏÏ. +onboarding.tour-tor-privacy.description=Î Tor Browser Î±ÏÎ¿ÎŒÎ¿ÎœÏÎœÎµÎ¹ ÏÎ± cookies ÎºÎ±Î¹ ÎŽÎ¹Î±Î³ÏÎ¬ÏÎµÎ¹ ÏÎ¿ Î¹ÏÏÎ¿ÏÎ¹ÎºÏ ÏÎµÏÎ¹Î®Î³Î·ÏÎ·Ï ÎŒÏÎ»Î¹Ï ÎºÎ»ÎµÎ¯ÏÎµÏÎµ ÏÎ·Îœ ÎºÎ±ÏÏÎÎ»Î± ÏÎ±Ï. ÎÏÏÎÏ Î¿Î¹ ÏÏÎžÎŒÎ¯ÏÎµÎ¹Ï ÏÎ¿Ï ÎµÎŸÎ±ÏÏÎ±Î»Î¯Î¶Î¿ÏÎœ ÏÎ·Îœ Î¹ÎŽÎ¹ÏÏÎ¹ÎºÏÏÎ·ÏÎ¬ ÏÎ±Ï ÎºÎ±Î¹ ÏÎ·Îœ Î±ÏÏÎ¬Î»ÎµÎ¹Î¬ ÏÎ±Ï ÎµÎ¯ÎœÎ±Î¹ Î±ÏÎ¿ÎžÎ·ÎºÎµÏÎŒÎÎœÎµÏ ÏÏÎ¿Îœ ÏÎµÏÎ¹Î·Î³Î·ÏÎ®. ÎÏÎ¹Î»ÎÎŸÏÎµ "ÎÎ¯ÎºÏÏÎ¿ Tor" Î³Î¹Î± ÎœÎ± ÎŒÎ¬ÎžÎµÏÎµ ÏÏÏ ÏÎ±Ï ÏÏÎ¿ÏÏÎ±ÏÎµÏÎ¿ÏÎŒÎµ ÏÎµ ÎµÏÎ¯ÏÎµÎŽÎ¿ ÎŽÎ¹ÎºÏÏÎ¿Ï. +onboarding.tour-tor-privacy.button=Î Î¬ÎŒÎµ ÏÏÎ¿ ÎÎ¯ÎºÏÏÎ¿ Tor + +onboarding.tour-tor-network=ÎÎ¯ÎºÏÏÎ¿ Tor +onboarding.tour-tor-network.title=ÎÏ ÏÎ±ÎŸÎ¹ÎŽÎµÏÏÎ¿ÏÎŒÎµ ÏÎµ ÎÎœÎ± Î±ÏÎ¿ÎºÎµÎœÏÏÏÎŒÎÎœÎ¿ ÎŽÎ¯ÎºÏÏÎ¿. +onboarding.tour-tor-network.description=Î Tor Browser ÏÎ±Ï ÏÏÎœÎŽÎÎµÎ¹ ÏÏÎ¿ ÎŽÎ¯ÎºÏÏÎ¿ Tor, ÏÎ¿Ï Î»ÎµÎ¹ÏÎ¿ÏÏÎ³ÎµÎ¯ ÏÎ¬ÏÎ· ÏÎµ ÏÎ¹Î»Î¹Î¬ÎŽÎµÏ ÎµÎžÎµÎ»Î¿ÎœÏÎÏ Î±ÏÏ ÏÎ»Î¿ ÏÎ¿Îœ ÎºÏÏÎŒÎ¿. Î£Îµ Î±ÎœÏÎ¯ÎžÎµÏÎ· ÎŒÎµ ÎÎœÎ± VPN, ÎŽÎµÎœ ÏÏÎ¬ÏÏÎµÎ¹ ÎºÎ±ÎœÎÎœÎ± ÏÎ·ÎŒÎµÎ¯Î¿ Î±ÏÎ¿ÏÏÏÎ¯Î±Ï Î® ÎºÎµÎœÏÏÎ¹ÎºÎ® Î¿ÎœÏÏÏÎ·ÏÎ± ÏÎ¿Ï ÏÏÎÏÎµÎ¹ ÎœÎ± ÎµÎŒÏÎ¹ÏÏÎµÏÏÎµÎ¯ÏÎµ Î³Î¹Î± ÎœÎ± Î±ÏÎ¿Î»Î±ÏÏÎµÏÎµ ÏÎ¿ ÎŽÎ¹Î±ÎŽÎ¯ÎºÏÏÎ¿ Î¹ÎŽÎ¹ÏÏÎ¹ÎºÎ¬. +onboarding.tour-tor-network.button=Î Î¬ÎŒÎµ ÏÏÎ·Îœ ÏÏÎ¿ÎµÏÎ¹ÏÎºÏÏÎ·ÏÎ· ÎºÏÎºÎ»ÏÎŒÎ±ÏÎ¿Ï + +onboarding.tour-tor-circuit-display=Î ÏÎ¿ÎµÏÎ¹ÏÎºÏÏÎ·ÏÎ· ÎºÏÎºÎ»ÏÎŒÎ±ÏÎ¿Ï +onboarding.tour-tor-circuit-display.title=ÎÎµÎ¯ÏÎµ ÏÎ¿ ÎŒÎ¿ÎœÎ¿ÏÎ¬ÏÎ¹ ÏÎ±Ï. +onboarding.tour-tor-circuit-display.description=ÎÎ¹Î± ÎºÎ¬ÎžÎµ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎ± ÏÎ¿Ï ÎµÏÎ¹ÏÎºÎÏÏÎµÏÏÎµ Î· ÎºÎ¯ÎœÎ·ÏÎ® ÏÎ±Ï ÏÏÎœÎŽÎÎµÏÎ±Î¹ ÎºÎ±Î¹ ÎºÏÏÏÏÎ¿Î³ÏÎ±ÏÎµÎ¯ÏÎ±Î¹ ÏÎµ ÎÎœÎ± ÎºÏÎºÎ»ÏÎŒÎ± ÎµÎœÏÏÏ ÏÏÎ¹ÏÎœ ÏÏÎœÎŽÎÏÎµÏÎœ ÏÎ¿Ï Tor ÏÎµ ÏÎ»Î¿ ÏÎ¿Îœ ÎºÏÏÎŒÎ¿. ÎÏÎ¿ÏÎµÎ¯ÏÎµ ÎœÎ± Î±Î¹ÏÎ·ÎžÎµÎ¯ÏÎµ ÎºÎ±ÎœÎ¿ÏÏÎ¹Î¿Ï ÎºÏÎºÎ»ÏÎŒÎ±ÏÎ¿Ï ÎµÏÎ¹Î»ÎÎ³Î¿ÎœÏÎ±Ï "ÎÎÎ¿ ÎºÏÎºÎ»ÏÎŒÎ± Î³Î¹Î± Î±ÏÏÎ®Îœ ÏÎ· ÏÎµÎ»Î¯ÎŽÎ±" ÏÏÎ·Îœ ÏÏÎ¿ÎµÏÎ¹ÏÎºÏÏÎ·ÏÎ· ÎºÏÎºÎ»ÏÎŒÎ±ÏÏÏ ÎŒÎ±Ï. +onboarding.tour-tor-circuit-display.button=ÎÎ»ÎÏÏ ÏÎ¿ ÎŒÎ¿ÎœÎ¿ÏÎ¬ÏÎ¹ ÎŒÎ¿Ï + +onboarding.tour-tor-security=ÎÏÏÎ¬Î»ÎµÎ¹Î± +onboarding.tour-tor-security.title=ÎÏÎ¹Î»ÎÎŸÏÎµ ÏÎ·Îœ ÎµÎŒÏÎµÎ¹ÏÎ¯Î± ÏÎ±Ï. +onboarding.tour-tor-security.description=ÎÏÎ¿ÏÎ¿ÏÎŒÎµ ÎœÎ± ÏÏÎ¿ÏÏÎÏÎ¿ÏÎŒÎµ ÎµÏÎ¹ÏÏÏÏÎžÎµÏÎµÏ ÏÏÎžÎŒÎ¯ÏÎµÎ¹Ï Î³Î¹Î± ÎœÎ± ÎµÎœÎ¹ÏÏÏÏÎ¿ÏÎŒÎµ ÏÎ·Îœ Î±ÏÏÎ¬Î»ÎµÎ¹Î± ÏÎ¿Ï ÏÎµÏÎ¹Î·Î³Î·ÏÎ® ÏÎ±Ï. ÎÎ¹ Î¡ÏÎžÎŒÎ¯ÏÎµÎ¹Ï ÎÏÏÎ¬Î»ÎµÎ¹Î±Ï ÏÎ±Ï ÎµÏÎ¹ÏÏÎÏÎ¿ÏÎœ ÎœÎ± ÎŒÏÎ»Î¿ÎºÎ¬ÏÎµÎµÏÎµ ÏÏÎ¿Î¹ÏÎµÎ¯Î± ÏÎ¿Ï ÎžÎ± ÎŒÏÎ¿ÏÎ¿ÏÏÎ±Îœ ÎœÎ± ÏÏÎ·ÏÏÎ¹ÎŒÎ¿ÏÎ¿Î¹Î·ÎžÎ¿ÏÎœ Î³Î¹Î± ÎµÏÎ¹ÎžÎÏÎµÎ¹Ï ÏÏÎ¿Îœ ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÎ® ÏÎ±Ï. ÎÏÎ¯Î»ÎµÎŸÏÎµ ÏÎ±ÏÎ±ÎºÎ¬ÏÏ Î³Î¹Î± ÎœÎ± ÎŽÎµÎ¯ÏÎµ ÏÎ¹ ÎºÎ¬ÎœÎ¿ÏÎœ Î¿Î¹ ÎŽÎ¹Î±ÏÎ¿ÏÎµÏÎ¹ÎºÎÏ ÏÏÎžÎŒÎ¯ÏÎµÎ¹Ï. +onboarding.tour-tor-security.button=ÎÎ»ÎµÎ³ÏÎ¿Ï Î¡ÏÎžÎŒÎ¯ÏÎµÏÎœ + +onboarding.tour-tor-expect-differences=Î ÏÎ¿ÏÎ¬ÏÎµÎ¹Ï ÎµÎŒÏÎµÎ¹ÏÎ¯Î±Ï +onboarding.tour-tor-expect-differences.title=ÎÎ¬ÏÎ¿Î¹ÎµÏ ÎŽÎ¹Î±ÏÎ¿ÏÎÏ ÎµÎ¯ÎœÎ±Î¹ Î±ÎœÎ±ÎŒÎµÎœÏÎŒÎµÎœÎµÏ. +onboarding.tour-tor-expect-differences.description=ÎÎµ ÏÎ»Î· ÏÎ·Îœ Î±ÏÏÎ¬Î»ÎµÎ¹Î± ÎºÎ±Î¹ ÏÎ·Îœ Î¹ÎŽÎ¹ÏÏÎ¹ÎºÏÏÎ·ÏÎ± ÏÎ¿Ï ÏÎ±ÏÎÏÎµÎ¹ ÏÎ¿ Tor, Î· ÎµÎŒÏÎµÎ¹ÏÎ¯Î± ÏÎ±Ï ÎºÎ±ÏÎ¬ ÏÎ·Îœ ÏÎµÏÎ¹Î®Î³Î·ÏÎ· ÎžÎ± ÎµÎ¯ÎœÎ±Î¹ Î»Î¯Î³Î¿ ÎŽÎ¹Î±ÏÎ¿ÏÎµÏÎ¹ÎºÎ®. ÎÎ¬ÏÎ¿Î¹Î± ÏÏÎ¬Î³ÎŒÎ±ÏÎ± ÎžÎ± Î³Î¯ÎœÎ¿ÏÎœ Î»Î¯Î³Î¿ ÏÎ¹Î¿ Î±ÏÎ³Î¬ ÎºÎ±Î¹ Î±ÎœÎ¬Î»Î¿Î³Î± ÎŒÎµ ÏÎ¿ ÎµÏÎ¯ÏÎµÎŽÎ¿ Î±ÏÏÎ¬Î»ÎµÎ¹Î±Ï, ÎºÎ¬ÏÎ¿Î¹Î± ÏÏÎ¿Î¹ÏÎµÎ¯Î± ÎŒÏÎ¿ÏÎµÎ¯ ÎœÎ± ÎŒÎ·Îœ Î»ÎµÎ¹ÏÎ¿ÏÏÎ³Î¿ÏÎœ Î® ÎœÎ± ÎŒÎ·Îœ ÏÎ¿ÏÏÏÎœÎ¿ÎœÏÎ±Î¹. ÎÏÎ¯ÏÎ·Ï, ÎŒÏÎ¿ÏÎµÎ¯ ÎœÎ± ÎµÏÏÏÎ·ÎžÎµÎ¯ÏÎµ Î±Îœ ÎµÎ¯ÏÏÎµ Î¬ÎœÎžÏÏÏÎ¿Ï ÎºÎ±Î¹ ÏÏÎ¹ ÏÎ¿ÎŒÏÏÏ. +onboarding.tour-tor-expect-differences.button=ÎÎµÎ¯ÏÎµ ÏÎ¹Ï Î£ÏÏÎœÎÏ ÎÏÏÏÎ®ÏÎµÎ¹Ï + +onboarding.tour-tor-onion-services=Î¥ÏÎ·ÏÎµÏÎ¯ÎµÏ Onion +onboarding.tour-tor-onion-services.title=Î ÏÎ¿ÏÏÎ±ÏÎµÏÏÎµÎ¯ÏÎµ ÏÎ¹Î¿ ÏÎ¿Î»Ï. +onboarding.tour-tor-onion-services.description=ÎÎ¹ ÏÏÎ·ÏÎµÏÎ¯ÎµÏ ÏÎ¿Ï Onion ÎµÎ¯ÎœÎ±Î¹ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎµÏ ÏÎ¿Ï ÏÎµÎ»ÎµÎ¹ÏÎœÎ¿ÏÎœ ÏÎµ .onion ÎºÎ±Î¹ ÏÎ±ÏÎÏÎ¿ÏÎœ ÎµÏÎ¹ÏÎ»ÎÎ¿Îœ ÏÏÎ¿ÏÏÎ±ÏÎ¯Î± ÏÎµ ÏÏÎ¿ÏÏ ÎŽÎ·ÎŒÎ¿ÏÎ¹ÎµÏÎ¿ÏÎœ ÎºÎ±Î¹ ÎµÏÎ¹ÏÎºÎÏÏÎ¿ÎœÏÎ±Î¹, ÏÏÎŒÏÎµÏÎ¹Î»Î±ÎŒÎ²Î±ÎœÎ¿ÎŒÎÎœÎ¿Ï ÎºÎ±Î¹ Î±ÏÏÎ±Î»ÎµÎ¹ÏÎœ ÎµÎœÎ¬ÎœÏÎ¹Î± ÏÏÎ· Î»Î¿Î³Î¿ÎºÏÎ¹ÏÎ¯Î±. ÎÎ¹ ÏÏÎ·ÏÎµÏÎ¯ÎµÏ ÏÎ¿Ï Onion ÎµÏÎ¹ÏÏÎÏÎ¿ÏÎœ ÏÏÎ¿Îœ ÎºÎ±ÎžÎÎœÎ± ÎœÎ± ÏÎ±ÏÎ¬ÏÏÎµÎ¹ ÏÎ»Î¹ÎºÎ¬ ÎºÎ±Î¹ ÏÏÎ·ÏÎµÏÎ¯ÎµÏ Î±ÎœÏÎœÏÎŒÎ±. ÎÏÎ¹Î»ÎÎŸÏÎµ ÎºÎ¬ÏÏ Î³Î¹Î± ÎœÎ± ÎµÏÎ¹ÏÎºÎµÏÏÎµÎ¯ÏÎµ ÏÎ· ÏÎµÎ»Î¯ÎŽÎ± ÏÎ¿Ï Onion DuckDuckGo. +onboarding.tour-tor-onion-services.button=ÎÏÎ¹ÏÎºÎµÏÏÎµÎ¯ÏÎµ ÎÎœÎ± Onion + +# Circuit Display onboarding. +onboarding.tor-circuit-display.next=ÎÏÏÎŒÎµÎœÎ¿ +onboarding.tor-circuit-display.done=Î€ÎÎ»Î¿Ï +onboarding.tor-circuit-display.one-of-three=1 Î±ÏÏ 3 +onboarding.tor-circuit-display.two-of-three=2 Î±ÏÏ 3 +onboarding.tor-circuit-display.three-of-three=3 Î±ÏÏ 3 + +onboarding.tor-circuit-display.intro.title=Î ÏÏ Î»ÎµÎ¹ÏÎ¿ÏÏÎ³Î¿ÏÎœ ÏÎ± ÎºÏÎºÎ»ÏÎŒÎ±ÏÎ±; +onboarding.tor-circuit-display.intro.msg=Î€Î± ÎºÏÎºÎ»ÏÎŒÎ±ÏÎ± ÎŽÎ·ÎŒÎ¹Î¿ÏÏÎ³Î¿ÏÎœÏÎ±Î¹ ÏÎµ ÏÏÏÎ±Î¯Î± Î±ÎœÎ±ÏÎ¹ÎžÎÎŒÎµÎœÎµÏ ÏÏÎœÎŽÎÏÎµÎ¹Ï, ÏÎ¿Ï Î²ÏÎ¯ÏÎºÎ¿ÎœÏÎ±Î¹ ÏÎµ ÏÏÎ¿Î»ÏÎ³Î¹ÏÏÎµÏ ÏÎµ ÏÎ»Î¿ ÏÎ¿Îœ ÎºÏÏÎŒÎ¿ ÏÏÎžÎŒÎ¹ÏÎŒÎÎœÎ¿Î¹ ÎœÎ± ÏÏÎ¿ÏÎžÎ¿ÏÎœ ÏÎ·Îœ ÎºÎ¯ÎœÎ·ÏÎ· ÏÏÎ¿ Tor. Î€Î± ÎºÏÎºÎ»ÏÎŒÎ±ÏÎ± ÏÎ±Ï ÎµÏÎ¹ÏÏÎÏÎ¿ÏÎœ ÎœÎ± ÏÎµÏÎ¹Î·Î³Î·ÎžÎµÎ¯ÏÎµ ÎŒÎµ Î¹ÎŽÎ¹ÏÏÎ¹ÎºÏÏÎ·ÏÎ± ÎºÎ±Î¹ ÎœÎ± ÏÏÎœÎŽÎµÎžÎµÎ¯ÏÎµ ÏÎµ ÏÏÎ·ÏÎµÏÎ¯ÎµÏ ÏÎ¿Ï Tor. + +onboarding.tor-circuit-display.diagram.title=Î ÏÎ¿ÎµÏÎ¹ÏÎºÏÏÎ·ÏÎ· ÎºÏÎºÎ»ÏÎŒÎ±ÏÎ¿Ï +onboarding.tor-circuit-display.diagram.msg=ÎÏÏÏ ÏÎ¿ ÎŽÎ¹Î¬Î³ÏÎ±ÎŒÎŒÎ± ÎŽÎµÎ¯ÏÎœÎµÎ¹ ÏÎ¹Ï ÏÏÎœÎŽÎÏÎµÎ¹Ï ÏÎ¿Ï Î±ÏÎ¿ÏÎµÎ»Î¿ÏÎœ ÏÎ¿ ÎºÏÎºÎ»ÏÎŒÎ± Î³Î¹Î± Î±ÏÏÎ®Îœ ÏÎ·Îœ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎ±. ÎÎ¹Î± ÎœÎ± Î±ÏÎ¿ÏÏÎ³ÎµÏÎµ ÏÎ· ÏÏÎœÎŽÎµÏÎ· ÏÎ·Ï ÎŽÏÎ±ÏÏÎ·ÏÎ¹ÏÏÎ·ÏÎ±Ï Î±ÏÏ ÏÎµÎ»Î¯ÎŽÎ± ÏÎµ ÏÎµÎ»Î¯ÎŽÎ±, ÎºÎ¬ÎžÎµ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎ± ÏÎ±Î¯ÏÎœÎµÎ¹ ÎŽÎ¹Î±ÏÎ¿ÏÎµÏÎ¹ÎºÏ ÎºÏÎºÎ»ÏÎŒÎ±. + +onboarding.tor-circuit-display.new-circuit.title=Î§ÏÎµÎ¹Î¬Î¶ÎµÏÎ±Î¹ ÎºÎ±Î¹ÎœÎ¿ÏÏÎ¹Î¿ ÎºÏÎºÎ»ÏÎŒÎ±; +onboarding.tor-circuit-display.new-circuit.msg=ÎÎœ ÎŽÎµÎœ ÎŒÏÎ¿ÏÎµÎ¯ÏÎµ ÎœÎ± ÏÏÎœÎŽÎµÎžÎµÎ¯ÏÎµ ÏÏÎ·Îœ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎ± ÏÎ¿Ï ÏÏÎ¿ÏÏÎ±ÎžÎµÎ¯ÏÎµ ÎœÎ± ÏÏÎœÎŽÎµÎžÎµÎ¯ÏÎµ Î® Î±Îœ ÎŽÎµÎœ ÏÎ¿ÏÏÏÎœÎµÎ¹ ÏÏÏÏÎ¬, ÏÏÏÎµ ÎŒÏÎ¿ÏÎµÎ¯ÏÎµ ÎœÎ± ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹Î®ÏÎµÏÎµ Î±ÏÏÏ ÏÎ¿ ÎºÎ¿ÏÎŒÏÎ¯ Î³Î¹Î± ÎœÎ± Î±ÎœÎ±ÎœÎµÏÏÎµÏÎµ ÏÎ· ÏÎµÎ»Î¯ÎŽÎ± ÎŒÎµ ÎœÎÎ¿ ÎºÏÎºÎ»ÏÎŒÎ±. diff --git a/src/chrome/locale/el/torbutton.dtd b/src/chrome/locale/el/torbutton.dtd index 4b1bb436..96c81d34 100644 --- a/src/chrome/locale/el/torbutton.dtd +++ b/src/chrome/locale/el/torbutton.dtd @@ -1,22 +1,51 @@ <!ENTITY torbutton.context_menu.new_identity "ÎÎÎ± Î€Î±ÏÏÏÏÎ·ÏÎ±"> -<!ENTITY torbutton.context_menu.new_identity_key "Î€"> -<!ENTITY torbutton.context_menu.networksettings "Open Network SettingsâŠ"> -<!ENTITY torbutton.context_menu.downloadUpdate "ÎÏÏÎ· ÏÎ¿Ï Tor Browser Bundle Update..."> +<!ENTITY torbutton.context_menu.new_identity_key "I"> +<!ENTITY torbutton.context_menu.new_circuit "ÎÎÎ¿ ÎºÏÎºÎ»ÏÎŒÎ± Tor Î³Î¹Î± Î±ÏÏÎ®Îœ ÏÎ·Îœ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎ±"> +<!ENTITY torbutton.context_menu.new_circuit_key "C"> +<!ENTITY torbutton.context_menu.preferences "Î¡ÏÎžÎŒÎ¯ÏÎµÎ¹Ï ÎÏÏÎ±Î»ÎµÎ¯Î±Ï..."> +<!ENTITY torbutton.context_menu.preferences.key "S"> +<!ENTITY torbutton.context_menu.networksettings "Î¡ÏÎžÎŒÎ¯ÏÎµÎ¹Ï ÏÎ¿Ï ÎÎ¹ÎºÏÏÎ¿Ï Tor..."> +<!ENTITY torbutton.context_menu.networksettings.key "N"> +<!ENTITY torbutton.context_menu.downloadUpdate "ÎÎ»ÎµÎ³ÏÎ¿Ï Î³Î¹Î± ÎµÎœÎ·ÎŒÎÏÏÏÎ· ÏÎ¿Ï Tor Browser..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Î ÏÎ¿ÏÏÎ±ÏÎ¯Î± Cookies"> +<!ENTITY torbutton.context_menu.cookieProtections "Î ÏÎ¿ÏÏÎ±ÏÎ¯Î± Cookies..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> -<!ENTITY torbutton.button.tooltip "ÎÎ¬ÎœÏÎµ ÎºÎ»Î¹Îº Î³Î¹Î± ÎœÎ± ÎµÎºÎºÎ¯ÎœÎ·ÏÎ· ÏÎ¿Ï Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "ÎÏÎ¿ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· Î±ÏÏÎ¹ÎºÏÎœ ÏÏÎžÎŒÎ¯ÏÎµÏÎœ"> +<!ENTITY torbutton.button.tooltip "ÎÎ¬ÎœÏÎµ ÎºÎ»Î¹Îº Î³Î¹Î± ÎœÎ± ÎµÎºÎºÎ¹ÎœÎ®ÏÎµÏÎµ ÏÎ¿ Torbutton"> +<!ENTITY torbutton.prefs.security_settings "Î¡ÏÎžÎŒÎ¯ÏÎµÎ¹Ï Î±ÏÏÎ±Î»ÎµÎ¯Î±Ï ÏÎ¿Ï Tor Browser"> +<!ENTITY torbutton.prefs.restore_defaults "ÎÏÎ±ÎœÎ±ÏÎ¿ÏÎ¬ ÏÏÎ¿ÎµÏÎ¹Î»Î¿Î³ÏÎœ"> +<!ENTITY torbutton.prefs.custom_warning "ÎÎ¹ ÏÏÎ¿ÏÎ±ÏÎŒÎ¿ÏÎŒÎÎœÎµÏ ÏÏÎ¿ÏÎ¹ÎŒÎ®ÏÎµÎ¹Ï ÏÎ¿Ï browser ÏÎ±Ï ÎÏÎ¿ÏÎœ Î¿ÎŽÎ·Î³Î®ÏÎµÎ¹ ÏÎµ Î±ÏÏÎœÎ®ÎžÎ¹ÏÏÎµÏ ÏÏÎžÎŒÎ¯ÏÎµÎ¹Ï Î±ÏÏÎ¬Î»ÎµÎ¹Î±Ï. ÎÎ¹Î± Î»ÏÎ³Î¿ÏÏ Î±ÏÏÎ±Î»ÎµÎ¯Î±Ï ÎºÎ±Î¹ Î¹ÎŽÎ¹ÏÏÎ¹ÎºÏÏÎ·ÏÎ±Ï, ÏÏÎ¿ÏÎµÎ¯ÎœÎ¿ÏÎŒÎµ ÎœÎ± ÎµÏÎ¹Î»ÎÎŸÎµÏÎµ ÎÎœÎ± Î±ÏÏ ÏÎ± ÏÏÎ¿ÎµÏÎ¹Î»ÎµÎ³ÎŒÎÎœÎ± ÎµÏÎ¯ÏÎµÎŽÎ± Î±ÏÏÎ¬Î»ÎµÎ¹Î±Ï."> <!ENTITY torbutton.cookiedialog.title "ÎÎ¹Î±ÏÎµÎ¯ÏÎ¹ÏÎ· Î ÏÎ¿ÏÏÎ±ÏÎ¯Î±Ï Cookie"> <!ENTITY torbutton.cookiedialog.lockCol "Î ÏÎ¿ÏÏÎ±ÏÎµÏÎŒÎÎœÎ±"> <!ENTITY torbutton.cookiedialog.domainCol "ÎÎ¹ÎºÎ¿ÎŽÎµÏÏÏÏÎ·Ï"> <!ENTITY torbutton.cookiedialog.nameCol "ÎÎœÎ¿ÎŒÎ±"> <!ENTITY torbutton.cookiedialog.pathCol "ÎÎ¿ÎœÎ¿ÏÎ¬ÏÎ¹"> -<!ENTITY torbutton.cookiedialog.protectCookie "Î ÏÎ¿ÏÏÎ±ÏÎ¯Î±Ï Cookie"> +<!ENTITY torbutton.cookiedialog.protectCookie "Î ÏÎ¿ÏÏÎ±ÏÎ¯Î± Cookie"> <!ENTITY torbutton.cookiedialog.removeCookie "ÎÏÎ±Î¯ÏÎµÏÎ· Cookie"> -<!ENTITY torbutton.cookiedialog.unprotectCookie "ÎÎµÏÏÎ¿ÏÏÎ¬ÏÎµÏÏÎ· Cookie"> -<!ENTITY torbutton.cookiedialog.removeAllBut "ÎÏÎ±Î¯ÏÎµÏÎ· ÎÎ»ÏÎœ ÎÎºÏÏÏ Î±ÏÏ ÏÏÎœ Î ÏÎ¿ÏÏÎ±ÏÎµÏÎŒÎÎœÏÎœ"> -<!ENTITY torbutton.cookiedialog.saveAllCookies "Î ÏÎ¿ÏÏÎ±ÏÎ¯Î± ÎÎÏÎœ Cookie"> +<!ENTITY torbutton.cookiedialog.unprotectCookie "ÎÎºÎžÎµÏÎ· Cookie"> +<!ENTITY torbutton.cookiedialog.removeAllBut "ÎÏÎ±Î¯ÏÎµÏÎ· ÏÎ»ÏÎœ ÎµÎºÏÏÏ ÏÏÎœ ÏÏÎ¿ÏÏÎ±ÏÎµÏÎŒÎÎœÏÎœ"> +<!ENTITY torbutton.cookiedialog.saveAllCookies "Î ÏÎ¿ÏÏÎ±ÏÎ¯Î± ÎœÎÏÎœ Cookie"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ÎÎ± ÎÎ· Î³Î¯ÎœÎµÏÎ±Î¹ Î ÏÎ¿ÏÏÎ±ÏÎ¯Î± ÎÎÏÎœ Cookie"> -<!ENTITY torbutton.prefs.restrict_thirdparty "Î ÎµÏÎ¹Î¿ÏÎ¹ÏÎŒÎ¿Ï ÏÏÎœ cookies ÏÏÎ¹ÏÏÎœ ÎºÎ±Î¹ Î±Î»Î»ÏÎœ ÎŽÎµÎŽÎ¿ÎŒÎµÎœÏÎœ ÏÎ±ÏÎ±ÎºÎ¿Î»Î¿ÏÎžÎ·ÏÎ·Ï"> -<!ENTITY torbutton.prefs.resist_fingerprinting "ÎÎ»Î»Î¬ÎŸÏÎµ ÏÎ¹Ï Î»ÎµÏÏÎ¿ÎŒÎÏÎµÎ¹ÎµÏ ÏÎ¿Ï ÏÎ±Ï ÎŽÎ¹Î±ÎºÏÎ¯ÎœÎµÎ¹ Î±ÏÏ Î¬Î»Î»Î¿ÏÏ ÏÏÎ®ÏÏÎµÏ ÏÎ¿Ï Tor Browser "> +<!ENTITY torbutton.prefs.restrict_thirdparty "Î ÎµÏÎ¹Î¿ÏÎ¹ÏÎŒÎ¿Ï ÏÏÎœ cookies ÏÏÎ¯ÏÏÎœ ÎºÎ±Î¹ Î±Î»Î»ÏÎœ ÎŽÎµÎŽÎ¿ÎŒÎµÎœÏÎœ ÏÎ±ÏÎ±ÎºÎ¿Î»Î¿ÏÎžÎ·ÏÎ·Ï"> +<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R"> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "ÎÏÎ¹Î»ÎÎŸÏÎµ Î±ÏÏÏ ÏÎ¿ ÎºÎ¿ÏÏÎ¬ÎºÎ¹ Î³Î¹Î± ÎœÎ± Î±ÏÎ¿ÏÏÎ³ÎµÏÎµ ÎŽÎ¹Î¬ÏÎ¿ÏÎµÏ ÏÏÎ·ÏÎµÏÎ¯ÎµÏ browser ÎœÎ± ÎµÏÎ¹ÏÎµÎžÎ¿ÏÎœ Î³Î¹Î± ÎœÎ± ÏÎ±Ï ÎµÎœÏÎ¿ÏÎ¯ÏÎ¿ÏÎœ ÎºÎ±ÏÎ¬ ÏÎ·Îœ ÏÎµÏÎ¹Î®Î³Î·ÏÎ® ÏÎ±Ï ÏÏÎ¿ ÎŽÎ¹Î±ÎŽÎ¯ÎºÏÏÎ¿. Î€ÏÎ¿ÏÎ¿ÏÎ¿Î¹Î·ÎŒÎÎœÎµÏ ÏÏÎ·ÏÎµÏÎ¯ÎµÏ ÏÎµÏÎ¹Î»Î±ÎŒÎ²Î¬ÎœÎ¿ÏÎœ blob URLs, ÎºÎ±ÎœÎ¬Î»Î¹Î± ÏÏÎ¿Î²Î¿Î»Î®Ï, ÎŒÎœÎ®ÎŒÎ· cache, cookies, ÏÏÎœÏÎ¿ÎŒÎµÏÏÎµÎ¹Ï Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÏÎœ, ÏÎµÎ»Î¹ÎŽÎ¿ÎŽÎµÎ¯ÎºÏÎµÏ ÏÎ±ÏÏÎ¿ÏÎ¿Î¯Î·ÏÎ·Ï HTTP, ÏÏÎ¿ÏÏÎœÎŽÎÏÎµÎ¹Ï ÏÏÎœÎŽÎÏÎŒÏÎœ, ÏÎ¿ÏÎ¹ÎºÎ® Î±ÏÎ¿ÎžÎ®ÎºÎµÏÏÎ·, URLs ÏÎ·Î³ÏÎœ ÎŒÎÏÏÎœ, Î±Î¹ÏÎ®ÎŒÎ±ÏÎ± OCSP, SharedWorkers ÎºÎ±Î¹ ÎµÎ¹ÏÎ¹ÏÎ®ÏÎ¹Î± Î»ÎµÎ¹ÏÎ¿ÏÏÎ³Î¯Î±Ï TLS."> +<!ENTITY torbutton.prefs.resist_fingerprinting "ÎÎ»Î»Î¬ÎŸÏÎµ ÏÎ¹Ï Î»ÎµÏÏÎ¿ÎŒÎÏÎµÎ¹ÎµÏ ÏÎ¿Ï ÏÎ±Ï ÎŽÎ¹Î±ÎºÏÎ¯ÎœÎ¿ÏÎœ Î±ÏÏ Î¬Î»Î»Î¿ÏÏ ÏÏÎ®ÏÏÎµÏ ÏÎ¿Ï Tor Browser "> +<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "ÎÎ¹Î±ÏÎ·ÏÎ®ÏÏÎµ Î±ÏÏÏ ÏÎ¿ ÎºÎ¿ÏÏÎ¯ ÎµÏÎ¹Î»ÎµÎ³ÎŒÎÎœÎ¿ Î³Î¹Î± ÎœÎ± ÎºÏÏÏÎµÏÎµ Î±ÏÏ ÏÎ¿ÏÏ Î¹ÏÏÎ¿ÏÏÏÎ¿ÏÏ ÏÏÎ¬Î³ÎŒÎ±ÏÎ± ÏÎ¿Ï ÎžÎ± ÎŒÏÎ¿ÏÎ¿ÏÏÎ±Îœ ÎœÎ± ÎµÎ¯ÎœÎ±Î¹ ÎŒÎ¿ÎœÎ±ÎŽÎ¹ÎºÎ¬ Î³Î¹Î± ÎµÏÎ¬Ï, ÏÏÎŒÏÎµÏÎ¹Î»Î±ÎŒÎ²Î±ÎœÎ¿ÎŒÎÎœÏÎœ ÏÎ·Ï Î±ÏÏÎŽÎ¿ÏÎ·Ï ÏÎ¿Ï ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÎ®, ÏÎ·Ï ÎŽÎ¹Î¬ÏÎ±ÎŸÎ·Ï ÏÎ¿Ï ÏÎ»Î·ÎºÏÏÎ¿Î»Î¿Î³Î¯Î¿Ï, ÏÎ·Ï Î³Î»ÏÏÏÎ±Ï, ÏÎ·Ï ÏÎ¿ÏÎ¿ÎžÎµÏÎ¯Î±Ï ÏÏÎœ ÎµÎ³ÎºÎ±ÏÎµÏÏÎ·ÎŒÎÎœÏÎœ ÏÏÎ¿ÏÎžÎÏÏÎœ, ÏÎ·Ï ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï ÏÎ¿Ï ÎŽÎ¹ÎºÏÏÎ¿Ï, ÏÎ¿Ï ÏÏÎ¿ÏÎ±ÎœÎ±ÏÎ¿Î»Î¹ÏÎŒÎ¿Ï ÏÎ·Ï Î¿ÎžÏÎœÎ·Ï, ÏÎ¿Ï ÎŒÎµÎ³ÎÎžÎ¿ÏÏ ÏÎ·Ï Î¿ÎžÏÎœÎ·Ï, ÏÏÎœ ÎµÏÎ¹ÏÎÎŽÏÎœ zoom Î±ÎœÎ¬ site, ÏÏÎœ ÏÏÎ¿ÏÏÎ·ÏÎ¹Î¶ÏÎŒÎµÎœÏÎœ ÏÏÏÏÎœ Î±ÏÏÎµÎ¯ÏÎœ, ÏÏÎœ ÏÏÏÎŒÎ¬ÏÏÎœ ÏÎ¿Ï ÏÏÏÏÎ®ÎŒÎ±ÏÎ¿Ï ÎºÎ±Î¹ ÏÏÎœ ÎŽÏÎœÎ±ÏÎ¿ÏÎ®ÏÏÎœ WebGL."> +<!ENTITY torbutton.prefs.sec_caption "ÎÏÎ¯ÏÎµÎŽÎ¿ Î±ÏÏÎ¬Î»ÎµÎ¹Î±Ï"> +<!ENTITY torbutton.prefs.sec_caption_tooltip "Î€Î¿ Slider ÎÏÏÎ¬Î»ÎµÎ¹Î±Ï ÏÎ±Ï Î±ÏÎ®ÎœÎµÎ¹ ÎœÎ± Î±ÏÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ Î¿ÏÎ¹ÏÎŒÎÎœÎ± ÏÎ±ÏÎ±ÎºÏÎ·ÏÎ¹ÏÏÎ¹ÎºÎ¬ ÏÎ¿Ï ÏÏÎ»Î»Î¿ÎŒÎµÏÏÎ·ÏÎ® ÏÎ¿Ï ÎŒÏÎ¿ÏÎµÎ¯ ÎœÎ± ÏÎ¿Îœ ÎºÎ¬ÎœÎ¿ÏÎœ ÏÎ¹Î¿ ÎµÏÎ¬Î»ÏÏÎ¿ ÏÎµ ÏÏÎ¿ÏÏÎ¬ÎžÎµÎ¹ÎµÏ hacking."> +<!ENTITY torbutton.prefs.sec_standard_label "ÎÎ±ÏÎ¹ÎºÎ¬"> +<!ENTITY torbutton.prefs.sec_standard_description "ÎÎ»ÎµÏ Î¿Î¹ ÏÎ±ÏÎ¿ÏÎÏ ÏÎ¿Ï Tor Browser ÎºÎ±Î¹ ÏÎ·Ï Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎ±Ï ÎµÎ¯ÎœÎ±Î¹ ÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î·ÎŒÎÎœÎµÏ."> +<!ENTITY torbutton.prefs.sec_safer_label "ÎÏÏÎ±Î»ÎÏÏÎµÏÎ±"> +<!ENTITY torbutton.prefs.sec_safer_description "ÎÏÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹ÎµÎ¯ ÏÎ±ÏÎ¿ÏÎÏ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÏÎœ ÏÎ¿Ï ÎµÎ¯ÎœÎ±Î¹ ÎµÏÎ¹ÎºÎ¯ÎœÎŽÏÎœÎµÏ ÎºÎ±Î¹ Î¿ÎŽÎ·Î³Î¿ÏÎœ ÎºÎ¬ÏÎ¿Î¹ÎµÏ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎµÏ ÏÏÎ¿ ÎœÎ± ÏÎ¬ÎœÎ¿ÏÎœ Î»ÎµÎ¹ÏÎ¿ÏÏÎ³Î¹ÎºÏÏÎ·ÏÎ±."> +<!ENTITY torbutton.prefs.sec_safer_list_label "Î£ÏÎ·Îœ Î±ÏÏÎ±Î»ÎÏÏÎµÏÎ· ÏÏÎœÎŽÎµÏÎ·:"> +<!ENTITY torbutton.prefs.sec_safest_label "ÎÏÏÎ±Î»ÎÏÏÎ±ÏÎ¿"> +<!ENTITY torbutton.prefs.sec_safest_description "ÎÏÎ¹ÏÏÎÏÎµÎ¹ ÎŒÏÎœÎ¿ ÏÎ¹Ï ÏÎ±ÏÎ¿ÏÎÏ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎ±Ï ÏÎ¿Ï Î±ÏÎ±Î¹ÏÎ¿ÏÎœÏÎ±Î¹ Î³Î¹Î± Î²Î±ÏÎ¹ÎºÎÏ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎµÏ ÎºÎ±Î¹ ÏÏÎ·ÏÎµÏÎ¯ÎµÏ. ÎÏÏÏ ÎµÏÎ·ÏÎµÎ¬Î¶ÎµÎ¹ ÎµÎ¹ÎºÏÎœÎµÏ, ÎŒÎÏÎ± ÎºÎ±Î¹ scripts."> +<!ENTITY torbutton.prefs.sec_safest_list_label "Î£ÏÎ·Îœ ÏÎ¹Î¿ Î±ÏÏÎ±Î»Î® ÏÏÎžÎŒÎ¹ÏÎ·:"> +<!ENTITY torbutton.prefs.sec_learn_more_label "ÎÎ¬ÎžÎµÏÎµ ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ±"> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "Î JavaScript ÎµÎ¯ÎœÎ±Î¹ Î±ÏÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î·ÎŒÎÎœÎ· ÏÎµ Î¹ÏÏÏÏÎ¿ÏÎ¿ÏÏ ÏÎ¿Ï ÎŽÎµÎœ ÎµÎ¯ÎœÎ±Î¹ HTTPS."> +<!ENTITY torbutton.prefs.sec_js_disabled "Î JavaScript ÎµÎ¯ÎœÎ±Î¹ Î±ÏÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î·ÎŒÎÎœÎ· ÏÎµ ÏÎ»Î¿ÏÏ ÏÎ¿ÏÏ Î¹ÏÏÏÏÎ¿ÏÎ¿ÏÏ ÏÏ ÏÏÎ¿ÎµÏÎ¹Î»Î¿Î³Î®."> +<!ENTITY torbutton.prefs.sec_limit_typography "ÎÎµÏÎ¹ÎºÎÏ Î³ÏÎ±ÎŒÎŒÎ±ÏÎ¿ÏÎµÎ¹ÏÎÏ ÎºÎ±Î¹ ÎŒÎ±ÎžÎ·ÎŒÎ±ÏÎ¹ÎºÎ¬ ÏÏÎŒÎ²Î¿Î»Î± ÎµÎ¯ÎœÎ±Î¹ Î±ÏÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î·ÎŒÎÎœÎ±."> +<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "ÎÏÎ¹ÏÎŒÎÎœÎµÏ Î³ÏÎ±ÎŒÎŒÎ±ÏÎ¿ÏÎµÎ¹ÏÎÏ, ÎµÎ¹ÎºÎ¿ÎœÎ¯ÎŽÎ¹Î±, ÎŒÎ±ÎžÎ·ÎŒÎ±ÏÎ¹ÎºÎ¬ ÏÏÎŒÎ²Î¿Î»Î± ÎºÎ±Î¹ ÎµÎ¹ÎºÏÎœÎµÏ ÎµÎ¯ÎœÎ±Î¹ Î±ÏÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î·ÎŒÎÎœÎ±."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "ÎÏÎ¿Ï ÎºÎ±Î¹ Î²Î¯ÎœÏÎµÎ¿ (ÎŒÎÏÎ± HTML5) ÎµÎ¯ÎœÎ±Î¹ ÎºÎ»Î¯ÎºÎ±ÏÎµ-ÎºÎ±Î¹-ÏÎ±Î¯Î¶ÎµÎ¹."> +<!ENTITY torbutton.circuit_display.title "ÎÏÎºÎ»ÏÎŒÎ± Tor"> +<!ENTITY torbutton.circuit_display.new_circuit "ÎÎÎ¿ ÎºÏÎºÎ»ÏÎŒÎ± Î³Î¹Î± Î±ÏÏÎ® ÏÎ·Îœ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎ±"> diff --git a/src/chrome/locale/el/torbutton.properties b/src/chrome/locale/el/torbutton.properties index 3c68094b..9d71a2f9 100644 --- a/src/chrome/locale/el/torbutton.properties +++ b/src/chrome/locale/el/torbutton.properties @@ -1,27 +1,55 @@ +torbutton.circuit_display.internet = ÎÎœÏÎµÏÎœÎµÏ +torbutton.circuit_display.ip_unknown = ÎÎ³ÎœÏÏÏÎ· ÎŽÎ¹ÎµÏÎžÏÎœÏÎ· IP +torbutton.circuit_display.onion_site = ÎÏÏÏÏÎ¿ÏÎ¿Ï Onion +torbutton.circuit_display.this_browser = ÎÏÏÏÏ Î¿ browser +torbutton.circuit_display.relay = ÎÎœÎ±ÎŒÎµÏÎ±ÎŽÎ¿ÏÎ· +torbutton.circuit_display.tor_bridge = ÎÎÏÏÏÎ± +torbutton.circuit_display.unknown_country = ÎÎ³ÎœÏÏÏÎ· ÏÏÏÎ± +torbutton.circuit_display.guard = ÎŠÏÎ»Î±ÎºÎ±Ï +torbutton.circuit_display.guard_note = Î [ÎŠÏÎ»Î±ÎºÎ±Ï] ÎºÏÎŒÎ²Î¿Ï ÏÎ±Ï ÎŽÎµÎœ ÎŒÏÎ¿ÏÎµÎ¯ ÎœÎ± Î±Î»Î»Î¬ÎŸÎµÎ¹. +torbutton.circuit_display.learn_more = ÎÎ¬ÎžÎµÏÎµ ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ± +torbutton.content_sizer.margin_tooltip = Î Tor Browser ÏÏÎ¿ÏÎžÎÏÎµÎ¹ Î±ÏÏÏ ÏÎ¿ ÏÎµÏÎ¹ÎžÏÏÎ¹Î¿ Î³Î¹Î± ÎœÎ± ÎºÎ¬ÎœÎµÎ¹ ÏÎ¿ ÏÎ»Î¬ÏÎ¿Ï ÎºÎ±Î¹ ÏÎ¿ ÏÏÎ¿Ï ÏÎ¿Ï ÏÎ±ÏÎ±ÎžÏÏÎ¿Ï ÏÎ¿Ï Î»Î¹Î³ÏÏÎµÏÎ¿ ÎŸÎµÏÏÏÎ¹ÏÏÏ, Î¿ÏÏÏÎµ ÎŒÎµÎ¹ÏÎœÎµÏÎ±Î¹ Î· Î¹ÎºÎ±ÎœÏÏÎ·ÏÎ± ÏÏÎœ Î¬Î»Î»ÏÎœ ÎœÎ± ÏÎµ ÏÎ±ÏÎ±ÎºÎ¿Î»Î¿ÏÎžÎ¿ÏÎœ ÎŽÎ¹Î±ÎŽÎ¹ÎºÏÏÎ±ÎºÎ¬. torbutton.panel.tooltip.disabled = ÎÎ¬ÎœÏÎµ ÎºÎ»Î¹Îº Î³Î¹Î± ÎœÎ± ÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ ÏÎ¿ Tor torbutton.panel.tooltip.enabled = ÎÎ¬ÎœÏÎµ ÎºÎ»Î¹Îº Î³Î¹Î± ÎœÎ± Î±ÏÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ ÏÎ¿ Tor torbutton.panel.label.disabled = Î€Î¿ Tor ÎµÎ¯ÎœÎ±Î¹ Î±ÏÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î·ÎŒÎÎœÎ¿ torbutton.panel.label.enabled = Î€Î¿ Tor ÎµÎ¯ÎœÎ±Î¹ ÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î·ÎŒÎÎœÎ¿ extensions.torbutton(a)torproject.org.description = Î€Î¿ Torbutton ÏÏÎ¿ÏÏÎÏÎµÎ¹ ÎÎœÎ± ÎºÎ¿ÏÎŒÏÎ¯ Î³Î¹Î± ÏÎ· ÏÏÎžÎŒÎ¹ÏÎ· ÏÏÎœ ÏÎ±ÏÎ±ÎŒÎÏÏÏÎœ ÏÎ¿Ï Tor ÎºÎ±Î¹ Î³Î¹Î± ÏÎ· Î³ÏÎ®Î³Î¿ÏÎ· ÎºÎ±Î¹ ÎµÏÎºÎ¿Î»Î· ÎµÎºÎºÎ±ÎžÎ¬ÏÎ¹ÏÎ· ÏÏÎœ ÏÏÎ¿ÏÏÏÎ¹ÎºÏÎœ ÏÏÎ¿Î¹ÏÎµÎ¯ÏÎœ ÏÎµÏÎ¹Î®Î³Î·ÏÎ·Ï. -torbutton.popup.external.title = ÎÎ± ÏÎ¿ÏÏÏÎžÎµÎ¯ ÎµÎŸÏÏÎµÏÎ¹ÎºÏ ÏÎµÏÎ¹ÎµÏÏÎŒÎµÎœÎ¿; -torbutton.popup.external.app = ÎÎ¹Î± ÎµÎŸÏÏÎµÏÎ¹ÎºÎ® ÎµÏÎ±ÏÎŒÎ¿Î³Î® ÎµÎ¯ÎœÎ±Î¹ Î±ÏÎ±ÏÎ±Î¯ÏÎ·ÏÎ· Î³Î¹Î± ÏÎ¿Îœ ÏÏÏÏÏ ÏÎµÎ¹ÏÎ¹ÏÎŒÏ:\n\n -torbutton.popup.external.note = \n\nÎ£ÎÎÎÎÎ©Î£Î: ÎÎ¹ ÎµÎŸÏÏÎµÏÎ¹ÎºÎÏ ÎµÏÎ±ÏÎŒÎ¿Î³ÎÏ ÎÎÎ ÎµÎ¯ÎœÎ±Î¹ ÎµÎŸÎ¿ÏÎ¹ÏÎŒÎ¿Ï Î±ÏÏÎ±Î»Î®Ï Î³Î¹Î± ÏÎ¿ Tor ÎºÎ±Î¹ ÎŒÏÎ¿ÏÎ¿ÏÎœ ÎœÎ± ÏÎ±Ï Î±ÏÎ¿ÎºÎ±Î»ÏÏÎ¿ÏÎœ!\n -torbutton.popup.external.suggest = \nÎÎœ ÏÎ¿ Î±ÏÏÎµÎ¯Î¿ Î±ÏÏÏ ÎŽÎµÎœ ÎµÎ¯ÎœÎ±Î¹ ÎÎŒÏÎ¹ÏÏÎ¿, ÏÏÎÏÎµÎ¹ ÎœÎ± ÏÎ¿ Î±ÏÎ¿ÎžÎ·ÎºÎµÏÏÎµÏÎµ ÏÏÏÎµ ÎœÎ± ÏÎ¿ ÏÏÎ¿Î²Î¬Î»ÎµÏÎµ ÏÏÎ±Îœ ÎŽÎµÎœ ÎµÎ¯ÏÏÎµ ÏÏÎœÎŽÎµÎŽÎµÎŒÎÎœÎ¿Î¹ Î® ÎŒÎÏÏ ÎŒÎ¹Î±Ï VM,\nÎ® ÎœÎ± ÏÏÎ¿ÎœÏÎ¯ÏÎµÏÎµ ÎœÎ± ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹ÎµÎ¯ÏÎµ ÎÎœÎ±Îœ ÎŽÎ¹Î±ÏÎ±ÎœÎ® ÏÎ»Î·ÏÎµÎŸÎ¿ÏÏÎ¹Î¿ ÎŽÎ¹Î±ÎºÎ¿ÎŒÎ·ÏÏÎ® Tor ÏÏÏÏ ÏÎ¿ Tails LiveCD Î® ÏÎ¿ torsocks.\n -torbutton.popup.launch = ÎÎºÏÎÎ»ÎµÏÎ· ÎµÏÎ±ÏÎŒÎ¿Î³Î®Ï -torbutton.popup.cancel = ÎÎºÏÏÎ¿Îœ -torbutton.popup.dontask = ÎÏÏ ÏÏÏÎ± ÎºÎ±Î¹ ÏÏÎ¿ ÎµÎŸÎ®Ï ÎœÎ± ÎµÎºÏÎµÎ»Î¿ÏÎœÏÎ±Î¹ ÏÎ¬ÎœÏÎ¿ÏÎµ ÎµÏÎ±ÏÎŒÎ¿Î³ÎÏ -torbutton.popup.prompted_language = ÎÎ¹Î± ÏÎ·Îœ ÎµÎœÎ¯ÏÏÏÏÎ· ÏÎ¿Ï Î±ÏÎ¿ÏÏÎ®ÏÎ¿Ï ÏÎ±Ï ÏÎ¿ Torbutton ÎŒÏÎ¿ÏÎµÎ¯ ÎœÎ± Î¶Î·ÏÎ®ÏÎµÎ¹ ÏÎ·Îœ ÎÎºÎŽÎ¿ÏÎ· ÏÎ·Ï Î±Î³Î³Î»Î¹ÎºÎ®Ï Î³Î»ÏÏÏÎ±Ï Î³Î¹Î± ÏÎ¹Ï Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎµÏ. ÎÏÏÏ ÎŒÏÎ¿ÏÎµÎ¯ ÎœÎ± ÎÏÎµÎ¹ ÏÎ±Îœ Î±ÏÎ¿ÏÎÎ»ÎµÏÎŒÎ±, Î¿Î¹ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎµÏ ÏÎ¿Ï ÎµÏÎ¹Î»ÎÎŸÎ±ÏÎµ ÎœÎ± ÎµÎŒÏÎ±ÎœÎ¯Î¶Î¿ÎœÏÎ±Î¹ ÏÏÎ·Îœ ÎµÎžÎœÎ¹ÎºÎ® ÏÎ±Ï Î³Î»ÏÏÎ±, ÎœÎ± ÏÏÎ¿Î²Î¬Î»Î¿ÎœÏÎ±Î¹ Î±ÎœÏ' Î±ÏÏÎ®Ï ÏÏÎ·Îœ ÎÎ³Î³Î»Î¹ÎºÎ®.\n\nÎÎÎ»ÎµÏÎµ ÎœÎ± Î±Î¹ÏÎ¿ÏÎœÏÎ±Î¹ ÏÎµÎ»Î¯ÎŽÎµÏ Î³ÏÎ±ÎŒÎŒÎÎœÎµÏ ÏÏÎ± ÎÎ³Î³Î»Î¹ÎºÎ¬, Î³Î¹Î± ÏÎ·Îœ Î²ÎµÎ»ÏÎ¯ÏÏÎ· ÏÎ¿Ï Î±ÏÎ¿ÏÏÎ®ÏÎ¿Ï; -torbutton.popup.no_newnym = Î€Î¿ Torbutton ÎŽÎµÎœ ÎŒÏÎ¿ÏÎµÎ¯ ÎœÎ± ÏÎ±Ï ÎŽÏÏÎµÎ¹ ÎŒÎ¹Î± Î±ÏÏÎ±Î»Î® ÎœÎÎ± ÏÎ±ÏÏÏÏÎ·ÏÎ±, ÎŽÎ¹ÏÏÎ¹ ÎŽÎµÎœ ÎÏÎµÎ¹ ÏÏÏÏÎ²Î±ÏÎ· ÏÏÎ¿ Tor Control Port:\n\nÎ§ÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹ÎµÎ¯ÏÎµ ÏÎ¿ Î Î±ÎºÎÏÎ¿ ÎŠÏÎ»Î»Î¿ÎŒÎµÏÏÎ·ÏÎ® Tor; +torbutton.popup.external.title = ÎÎ®ÏÎ· ÎÎœÎ¿Ï ÎµÎŸÏÏÎµÏÎ¹ÎºÎ¿Ï ÏÏÏÎ¿Ï Î±ÏÏÎµÎ¯Î¿Ï; +torbutton.popup.external.app = Î Tor Browser ÎŽÎµÎœ ÎŒÏÎ¿ÏÎµÎ¯ ÎœÎ± ÎµÎŒÏÎ±ÎœÎ¯ÏÎµÎ¹ Î±ÏÏÏ ÏÎ¿ Î±ÏÏÎµÎ¯Î¿. ÎÎ± ÏÏÎµÎ¹Î±ÏÏÎµÎ¯ ÎœÎ± ÏÎ¿ Î±ÎœÎ¿Î¯ÎŸÎµÏÎµ ÎŒÎµ ÎºÎ¬ÏÎ¿Î¹Î± Î¬Î»Î»Î· ÎµÏÎ±ÏÎŒÎ¿Î³Î®.\n\n +torbutton.popup.external.note = ÎÏÎ¹ÏÎŒÎÎœÎ¿Î¹ ÏÏÏÎ¿Î¹ Î±ÏÏÎµÎ¯ÏÎœ ÎŒÏÎ¿ÏÎ¿ÏÎœ ÎœÎ± ÏÏÎ¿ÎºÎ±Î»ÎÏÎ¿ÏÎœ ÎµÏÎ±ÏÎŒÎ¿Î³ÎÏ ÎœÎ± ÏÏÎœÎŽÎµÎžÎ¿ÏÎœ ÏÏÎ¿ ÎŽÎ¹Î±ÎŽÎ¯ÎºÏÏÎ¿ ÏÏÏÎ¯Ï ÏÎ· ÏÏÎ®ÏÎ· ÏÎ¿Ï Tor.\n\n +torbutton.popup.external.suggest = ÎÎ¹Î± ÎœÎ± ÎµÎ¯ÏÏÎµ Î±ÏÏÎ±Î»ÎµÎ¯Ï, ÎžÎ± ÏÏÎÏÎµÎ¹ ÎœÎ± Î±ÎœÎ¿Î¯Î³ÎµÏÎµ ÏÎ± Î»Î·ÏÎžÎÎœÏÎ± Î±ÏÏÎµÎ¯Î± ÎŒÏÎœÎ¿ ÎµÎœÏ Î²ÏÎ¯ÏÎºÎµÏÏÎµ ÎµÎºÏÏÏ ÏÏÎœÎŽÎµÏÎ·Ï, Î® ÎœÎ± ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹Î®ÏÎµÏÎµ ÎÎœÎ± Tor Live CD, ÏÏÏÏ ÏÎ¿ Tails.\n +torbutton.popup.launch = ÎÎ®ÏÎ· Î±ÏÏÎµÎ¯Î¿Ï +torbutton.popup.cancel = ÎÎºÏÏÎ¿ +torbutton.popup.dontask = ÎÏÏÏÎŒÎ±ÏÎ· Î»Î®ÏÎ· Î±ÏÏÎµÎ¯ÏÎœ Î±ÏÏ ÏÏÏÎ± ÎºÎ±Î¹ ÏÏÎ¿ ÎµÎŸÎ®Ï +torbutton.popup.no_newnym = Î€Î¿ Torbutton ÎŽÎµÎœ ÎŒÏÎ¿ÏÎµÎ¯ ÎœÎ± ÏÎ±Ï ÎŽÏÏÎµÎ¹ ÎŒÎ¹Î± Î±ÏÏÎ±Î»Î® ÎœÎÎ± ÏÎ±ÏÏÏÏÎ·ÏÎ±, ÎŽÎ¹ÏÏÎ¹ ÎŽÎµÎœ ÎÏÎµÎ¹ ÏÏÏÏÎ²Î±ÏÎ· ÏÏÎ¿ Tor Control Port:\n\nÎ§ÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹ÎµÎ¯ÏÎµ ÏÎ¿ Î Î±ÎºÎÏÎ¿ ÏÎ¿Ï Tor Browser; +torbutton.security_settings.menu.title = Î¡ÏÎžÎŒÎ¯ÏÎµÎ¹Ï Î±ÏÏÎ±Î»ÎµÎ¯Î±Ï torbutton.title.prompt_torbrowser = Î£Î·ÎŒÎ±ÎœÏÎ¹ÎºÎÏ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ Î³Î¹Î± ÏÎ¿ Torbutton -torbutton.popup.prompt_torbrowser = Î€Î¿ Torbutton Î»ÎµÎ¹ÏÎ¿ÏÏÎ³ÎµÎ¯ ÎŽÎ¹Î±ÏÎ¿ÏÎµÏÎ¹ÎºÎ¬, ÏÏÏÎ±: ÎŽÎµÎœ ÎŒÏÎ¿ÏÎµÎ¯ÏÎµ ÏÎ»ÎÎ¿Îœ ÎœÎ± ÏÎ¿ Î±ÏÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ\n\nÎ ÏÎ¿Î²Î®ÎºÎ±ÎŒÎµ ÏÎµ Î±ÏÏÎ® ÏÎ·Îœ Î±Î»Î»Î±Î³Î® ÎŽÎ¹ÏÏÎ¹, ÎŽÎµÎœ ÎµÎ¯ÎœÎ±Î¹ Î±ÏÏÎ±Î»ÎÏ ÎœÎ± ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹ÎµÎ¯ÏÎ±Î¹ ÏÎ¿ Torbutton ÎŒÎÏÎ± Î±ÏÏ ÎÎœÎ± ÏÎµÏÎ¹Î·Î³Î·ÏÎ® Î¹ÏÏÎ¿Ï Î¿ Î¿ÏÎ¿Î¯Î¿Ï ÏÏÎ·ÏÎ¹ÎŒÎµÏÎµÎ¹ ÎºÎ±Î¹ Î³Î¹Î± ÎµÏÎ³Î±ÏÎ¯ÎµÏ ÏÏÏÎ¯Ï ÏÎ·Îœ ÏÏÎ®ÏÎ· Tor. ÎÎŒÏÎ±ÎœÎ¯Î¶Î¿ÎœÏÎ±Îœ ÎŽÎ¹Î¬ÏÎ¿ÏÎ± ÏÏÎ¬Î»ÎŒÎ±ÏÎ±-bugs ÏÎ± Î¿ÏÎ¿Î¯Î± ÎŽÎµÎœ ÎŒÏÎ¿ÏÎ¿ÏÏÎ±ÎŒÎµ ÎœÎ± ÎŽÎ¹Î¿ÏÎžÏÏÎ¿ÏÎŒÎµ.\n\nÎÎœ ÎžÎÎ»ÎµÏÎµ ÎœÎ± ÎµÎŸÎ±ÎºÎ¿Î»Î¿ÏÎžÎ®ÏÎµÏÎµ ÎœÎ± ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹ÎµÎ¯ÏÎµ ÏÎ¿Îœ Firefox ÎºÎ±ÎœÎ¿ÎœÎ¹ÎºÎ¬, ÎžÎ± ÏÏÎÏÎµÎ¹ ÎœÎ± ÎµÎ³ÎºÎ±ÏÎ±ÏÏÎ®ÏÎµÏÎµ ÏÎ¿ Torbutton ÎºÎ±Î¹ ÎœÎ± ÎºÎ¬ÎœÎµÏÎµ Î»Î®ÏÎ· ÏÎ¿Ï Î Î±ÎºÎÏÎ¿Ï ÎŠÏÎ»Î»Î¿ÎŒÎµÏÏÎ·ÏÎ® Tor. ÎÎ¹ Î¹ÎŽÎ¹ÏÏÎ·ÏÎµÏ Î¹ÎŽÎ¹ÏÏÎ¹ÎºÏÏÎ·ÏÎ±Ï ÏÎ¿Ï Î ÎµÏÎ¹Î·Î³Î·ÏÎ® Tor ÎµÎ¯ÎœÎ±Î¹ Î±ÎœÏ ÏÎµÏÎµÏ Î±ÏÏ ÎµÎºÎµÎ¯ÎœÎµÏ ÏÎ¿Ï Î±ÏÎ»Î¿Ï Firefox, Î±ÎºÏÎŒÎ· ÎºÎ±Î¹ ÏÏÎ·Îœ ÏÎµÏÎ¯ÏÏÏÏÎ· ÏÎ¿Ï Î¿ Firefox ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹ÎµÎ¯ÏÎ±Î¹ ÎŒÎ±Î¶Î¯ ÎŒÎµ ÏÎ¿ Torbutton.\n\nÎÎ¹Î± ÎœÎ± Î±ÏÎ¿ÎŒÎ±ÎºÏÏÎœÎµÏÎµ ÏÎ¿ Torbutton, ÏÎ·Î³Î±Î¯ÎœÎµÏÎµ ÎÏÎ³Î±Î»ÎµÎ¯Î±->Î ÏÏÏÎžÎµÏÎ±->Extensions ÎºÎ±Î¹ ÏÎ±ÏÎ®ÏÏÎµ ÏÎ¿ ÏÎ»Î®ÎºÏÏÎ¿ ÎÏÎ¿ÎŒÎ¬ÎºÏÏÎœÏÎ· ÏÎ¿Ï Î²ÏÎ¯ÏÎºÎµÏÎ±Î¹ ÎŽÎ¯ÏÎ»Î± Î±ÏÏ ÏÎ¿ Torbutton. -torbutton.popup.short_torbrowser = Î£Î·ÎŒÎ±ÎœÏÎ¹ÎºÎ® Î Î»Î·ÏÎ¿ÏÎ¿ÏÎ¯Î± Î³Î¹Î± ÏÎ¿ Torbutton\n\nÎ€Î¿ Torbutton ÎµÎ¯ÎœÎ±Î¹ ÏÏÏÎ± ÏÏÎœÎµÏÏÏ ÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î·ÎŒÎÎœÎ¿.\n\nÎÎ¹Î± ÏÎµÏÎ¹ÏÏÏÏÎµÏÎµÏ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ, ÎºÎ¬ÎœÎµÏÎµ ÎºÎ»Î¹Îº ÏÏÎ¿ Torbutton. +torbutton.popup.prompt_torbrowser = Î€Î¿ Torbutton Î»ÎµÎ¹ÏÎ¿ÏÏÎ³ÎµÎ¯ ÎŽÎ¹Î±ÏÎ¿ÏÎµÏÎ¹ÎºÎ¬, ÏÏÏÎ±: ÎŽÎµÎœ ÎŒÏÎ¿ÏÎµÎ¯ÏÎµ ÏÎ»ÎÎ¿Îœ ÎœÎ± ÏÎ¿ Î±ÏÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ\n\nÎ ÏÎ¿Î²Î®ÎºÎ±ÎŒÎµ ÏÎµ Î±ÏÏÎ® ÏÎ·Îœ Î±Î»Î»Î±Î³Î® ÎŽÎ¹ÏÏÎ¹, ÎŽÎµÎœ ÎµÎ¯ÎœÎ±Î¹ Î±ÏÏÎ±Î»ÎÏ ÎœÎ± ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹ÎµÎ¯ÏÎ±Î¹ ÏÎ¿ Torbutton ÎŒÎÏÎ± Î±ÏÏ ÎÎœÎ± browser Î¿ Î¿ÏÎ¿Î¯Î¿Ï ÏÏÎ·ÏÎ¹ÎŒÎµÏÎµÎ¹ ÎºÎ±Î¹ Î³Î¹Î± ÎµÏÎ³Î±ÏÎ¯ÎµÏ ÏÏÏÎ¯Ï ÏÎ· ÏÏÎ®ÏÎ· Tor. ÎÎŒÏÎ±ÎœÎ¯Î¶Î¿ÎœÏÎ±Îœ ÎŽÎ¹Î¬ÏÎ¿ÏÎ± ÏÏÎ¬Î»ÎŒÎ±ÏÎ±-bugs ÏÎ± Î¿ÏÎ¿Î¯Î± ÎŽÎµÎœ ÎŒÏÎ¿ÏÎ¿ÏÏÎ±ÎŒÎµ ÎœÎ± ÎŽÎ¹Î¿ÏÎžÏÏÎ¿ÏÎŒÎµ.\n\nÎÎœ ÎžÎÎ»ÎµÏÎµ ÎœÎ± ÎµÎŸÎ±ÎºÎ¿Î»Î¿ÏÎžÎ®ÏÎµÏÎµ ÎœÎ± ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹ÎµÎ¯ÏÎµ ÏÎ¿ Firefox ÎºÎ±ÎœÎ¿ÎœÎ¹ÎºÎ¬, ÎžÎ± ÏÏÎÏÎµÎ¹ ÎœÎ± ÎµÎ³ÎºÎ±ÏÎ±ÏÏÎ®ÏÎµÏÎµ ÏÎ¿ Torbutton ÎºÎ±Î¹ ÎœÎ± ÎºÎ¬ÎœÎµÏÎµ Î»Î®ÏÎ· ÏÎ¿Ï Î Î±ÎºÎÏÎ¿Ï Tor Browser. ÎÎ¹ Î¹ÎŽÎ¹ÏÏÎ·ÏÎµÏ Î¹ÎŽÎ¹ÏÏÎ¹ÎºÏÏÎ·ÏÎ±Ï ÏÎ¿Ï Tor Browser ÎµÎ¯ÎœÎ±Î¹ Î±ÎœÏÏÎµÏÎµÏ Î±ÏÏ ÎµÎºÎµÎ¯ÎœÎµÏ ÏÎ¿Ï Î±ÏÎ»Î¿Ï Fir efox, Î±ÎºÏÎŒÎ· ÎºÎ±Î¹ ÏÏÎ·Îœ ÏÎµÏÎ¯ÏÏÏÏÎ· ÏÎ¿Ï Î¿ Firefox ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹ÎµÎ¯ÏÎ±Î¹ ÎŒÎ±Î¶Î¯ ÎŒÎµ ÏÎ¿ Torbutton.\n\nÎÎ¹Î± ÎœÎ± Î±ÏÎ¿ÎŒÎ±ÎºÏÏÎœÎµÏÎµ ÏÎ¿ Torbutton, ÏÎ·Î³Î±Î¯ÎœÎµÏÎµ ÎÏÎ³Î±Î»ÎµÎ¯Î± -> Î ÏÏÏÎžÎµÏÎ± -> Extensions ÎºÎ±Î¹ ÏÎ±ÏÎ®ÏÏÎµ ÏÎ¿ ÏÎ»Î®ÎºÏÏÎ¿ ÎÏÎ¿ÎŒÎ¬ÎºÏÏÎœÏÎ· ÏÎ¿Ï Î²ÏÎ¯ÏÎºÎµÏÎ±Î¹ ÎŽÎ¯ÏÎ»Î± Î±ÏÏ ÏÎ¿ Torbutton. +torbutton.popup.short_torbrowser = Î£Î·ÎŒÎ±ÎœÏÎ¹ÎºÎ® Î Î»Î·ÏÎ¿ÏÎ¿ÏÎ¯Î± Î³Î¹Î± ÏÎ¿ Torbutton!\n\nÎ€Î¿ Torbutton ÎµÎ¯ÎœÎ±Î¹ ÏÏÏÎ± ÏÏÎœÎµÏÏÏ ÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î·ÎŒÎÎœÎ¿.\n\nÎÎ¹Î± ÏÎµÏÎ¹ÏÏÏÏÎµÏÎµÏ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ, ÎºÎ¬ÎœÎµÏÎµ ÎºÎ»Î¹Îº ÏÏÎ¿ Torbutton. -torbutton.popup.confirm_plugins = Plugins ÏÏÏÏ ÏÎ¿ Flash ÎŒÏÎ¿ÏÎ¿ÏÎœ ÎœÎ± Î²Î»Î¬ÏÎ¿ÏÎœ ÏÎ·Îœ ÏÏÎ¿ÏÏÎ±ÏÎ¯Î± ÏÎ·Ï Î¹ÎŽÎ¹ÏÏÎ¹ÎºÎ®Ï Î¶ÏÎ®Ï ÎºÎ±Î¹ ÏÎ·Îœ Î±ÎœÏÎœÏÎŒÎ¯Î± ÏÎ±Ï. â â ÎÏÎ¿ÏÎ¿ÏÎœ ÎµÏÎ¯ÏÎ·Ï ÎœÎ± ÏÎ±ÏÎ±ÎºÎ¬ÎŒÏÎ¿ÏÎœ ÏÎ¿ Tor Î³Î¹Î± ÎœÎ± Î±ÏÎ¿ÎºÎ±Î»ÏÏÎ¿ÏÎœ ÏÎ·Îœ ÏÏÎÏÎ¿ÏÏÎ± ÎžÎÏÎ· ÏÎ±Ï ÎºÎ±Î¹ ÏÎ· ÎŽÎ¹ÎµÏÎžÏÎœÏÎ· IP.â â ÎÎ¹ÏÏÎµ ÏÎ¹Î³Î¿ÏÏÎ¿Ï ÏÏÏ ÎžÎµÎ»ÎµÏÎµ ÎœÎ± ÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î·ÎžÎ¿ÏÎœ Î±ÏÏÎ± ÏÎ± plugins?â â\n -torbutton.popup.never_ask_again = ÎÎ±ÎŒÎŒÎ¹Î± ÎµÏÏÏÎ·ÏÎ· ÎŸÎ±ÎœÎ± +torbutton.popup.confirm_plugins = Plugins ÏÏÏÏ ÏÎ¿ Flash ÎŒÏÎ¿ÏÎ¿ÏÎœ ÎœÎ± Î²Î»Î¬ÏÎ¿ÏÎœ ÏÎ·Îœ ÏÏÎ¿ÏÏÎ±ÏÎ¯Î± ÏÎ·Ï Î¹ÎŽÎ¹ÏÏÎ¹ÎºÎ®Ï Î¶ÏÎ®Ï ÎºÎ±Î¹ ÏÎ·Îœ Î±ÎœÏÎœÏÎŒÎ¯Î± ÏÎ±Ï. \n\nÎÏÎ¿ÏÎ¿ÏÎœ ÎµÏÎ¯ÏÎ·Ï ÎœÎ± ÏÎ±ÏÎ±ÎºÎ¬ÎŒÏÎ¿ÏÎœ ÏÎ¿ Tor Î³Î¹Î± ÎœÎ± Î±ÏÎ¿ÎºÎ±Î»ÏÏÎ¿ÏÎœ ÏÎ·Îœ ÏÏÎÏÎ¿ÏÏÎ± ÎžÎÏÎ· ÏÎ±Ï ÎºÎ±Î¹ ÏÎ· ÎŽÎ¹ÎµÏÎžÏÎœÏÎ· IP.\n\nÎÎ¹ÏÏÎµ ÏÎ¹Î³Î¿ÏÏÎ¿Ï ÏÏÏ ÎžÎµÎ»ÎµÏÎµ ÎœÎ± ÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î·ÎžÎ¿ÏÎœ Î±ÏÏÎ± ÏÎ± plugins?\n\n +torbutton.popup.never_ask_again = ÎÎ± ÎŒÎ·Îœ ÎµÏÏÏÎ·ÎžÏ ÎŸÎ±ÎœÎ¬ +torbutton.popup.confirm_newnym = Î Tor Browser ÎžÎ± ÎºÎ»ÎµÎ¯ÏÎµÎ¹ ÏÎ»Î± ÏÎ± ÏÎ±ÏÎ¬ÎžÏÏÎ± ÎºÎ±Î¹ ÏÎ¹Ï ÎºÎ±ÏÏÎÎ»ÎµÏ. ÎÎ»ÎµÏ Î¿Î¹ ÏÏÎœÎµÎŽÏÎ¯ÎµÏ Î¹ÏÏÎ¿ÏÎµÎ»Î¹ÎŽÏÎœ ÎžÎ± ÏÎ±ÎžÎ¿ÏÎœ.\n\nÎÏÎ±ÎœÎµÎºÎºÎ¯ÎœÎ·ÏÎ· ÏÎ¿Ï Tor Browser Î³Î¹Î± ÎµÏÎ±ÎœÎ±ÏÎ¿ÏÎ¬ ÏÎ·Ï ÏÎ±ÏÏÏÏÎ·ÏÎ¬Ï ÏÎ¿Ï;\n\n + +torbutton.maximize_warning = ÎÎµÎ³Î¹ÏÏÎ¿ÏÎ¿Î¹ÏÎœÏÎ±Ï ÏÎ¿Îœ Tor Browser, Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎµÏ ÎŒÏÎ¿ÏÎ¿ÏÎœ ÎœÎ± ÎŽÎ¿ÏÎœ ÏÎ¹Ï ÎŽÎ¹Î±ÏÏÎ¬ÏÎµÎ¹Ï ÏÎ·Ï Î¿ÎžÏÎœÎ·Ï ÏÎ¿Ï, ÎºÎ¬ÏÎ¹ ÏÎ¿Ï ÎŒÏÎ¿ÏÎµÎ¯ ÎœÎ± ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹Î·ÎžÎµÎ¯ Î³Î¹Î± ÎœÎ± ÏÎµ ÏÎ±ÏÎ±ÎºÎ¿Î»Î¿ÏÎžÎ¿ÏÎœ. Î ÏÎ¿ÏÎµÎ¯ÎœÎ¿ÏÎŒÎµ ÎœÎ± Î±ÏÎ®ÏÎµÎ¹Ï ÏÎ± ÏÎ±ÏÎ¬ÎžÏÏÎ± ÏÎ¿Ï Tor Browser ÏÏÎ¿ ÏÏÎ¿ÎºÎ±ÎžÎ¿ÏÎ¹ÏÎŒÎÎœÎ¿ ÏÎ¿ÏÏ ÎŒÎÎ³ÎµÎžÎ¿Ï. # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=ÎÏÏÏÏ Î¿ Î¹ÏÏÏÏÎ¿ÏÎ¿Ï (%S) ÏÏÎ¿ÏÏÎ¬ÎžÎ·ÏÎµ ÎœÎ± Î±ÏÎ¿ÎºÏÎ®ÏÎ· ÏÏÏÏÎ²Î±ÏÎ· ÏÎµ ÎŽÎµÎŽÎ¿ÎŒÎÎœÎ± ÎµÎ¹ÎºÏÎœÏÎœ ÏÎ¬ÎœÏ ÏÎµ ÎÎœÎ± ÎºÎ±ÎŒÎ²Î¬. ÎÏÏ ÏÎ·Îœ ÏÏÎ¹Î³ÎŒÎ® ÏÎ¿Ï ÎŽÎµÎŽÎ¿ÎŒÎÎœÎ± ÎµÎ¹ÎºÏÎœÏÎœ ÏÎµ ÎºÎ±ÎŒÎ²Î¬ ÎŒÏÎ¿ÏÎ¿ÏÎœ ÎœÎ± ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹Î·ÎžÎ¿ÏÎœ Î³Î¹Î± ÎœÎ± Î±ÎœÎ±ÎºÎ±Î»ÏÏÎžÎ¿ÏÎœ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ ÏÏÎµÏÎ¹ÎºÎÏ ÎŒÎµ ÏÎ¿Îœ ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÎ® ÏÎ±Ï, ÎºÎµÎœÎ¬ ÎŽÎµÎŽÎ¿ÎŒÎÎœÎ± ÎµÎ¹ÎºÏÎœÎ±Ï ÎµÏÎ¹ÏÏÏÎ¬ÏÎ·ÎºÎ±Îœ Î±ÏÏÎ® ÏÎ· ÏÎ¿ÏÎ¬. -canvas.allow=ÎÎ± ÎµÏÎ¹ÏÏÎÏÎµÏÎ±Î¹ ÏÏÎ¿ ÎÎÎ»Î»Î¿Îœ +canvas.siteprompt=Î Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎ± (%S) ÏÏÎ¿ÏÏÎ¬ÎžÎ·ÏÎµ ÎœÎ± ÎµÎŸÎ¬Î³ÎµÎ¹ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ HTML5, Î¿Î¹ Î¿ÏÎ¿Î¯ÎµÏ ÎŒÏÎ¿ÏÎ¿ÏÎœ ÎœÎ± ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹Î·ÎžÎ¿ÏÎœ ÏÏÏÎµ ÎœÎ± Î±ÎœÎ±Î³ÎœÏÏÎ¹ÏÎžÎµÎ¯ Î· ÏÎ±ÏÏÏÏÎ·ÏÎ± ÏÎ¿Ï Î·Î»ÎµÎºÏÏÎ¿ÎœÎ¹ÎºÎ¿Ï ÏÎ±Ï ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÎ®.\n\nÎÎ± ÎµÏÎ¹ÏÏÎ±ÏÎµÎ¯ ÏÏÎ·Îœ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎ± Î· ÎµÎŸÎ±Î³ÏÎ³Î® ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¹ÏÎœ HTML5; +canvas.notNow=ÎÏÎ¹ ÏÏÏÎ± +canvas.notNowAccessKey=Î +canvas.allow=ÎÎ± ÎµÏÎ¹ÏÏÎÏÎµÏÎ±Î¹ ÏÏÎ¿ ÎŒÎÎ»Î»Î¿Îœ canvas.allowAccessKey=Î -canvas.never=Î Î¿ÏÎ Î³Î¹Î± Î±ÏÏÏ ÏÎ¿Îœ Î¹ÏÏÏÏÎ¿ÏÎ¿ +canvas.never=Î Î¿ÏÎ Î³Î¹Î± Î±ÏÏÏÎœ ÏÎ¿Îœ Î¹ÏÏÏÏÎ¿ÏÎ¿ (ÏÏÎœÎ¹ÏÏÎ¬ÏÎ±Î¹) 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 ÏÏÎ·Îœ ÎµÏÎ¹ÏÎ¬ÎœÎµÎ¹Î± ÎµÏÎ³Î±ÏÎ¯Î±Ï ÏÎ±Ï Î® ÏÏÎ¹Ï ÎµÏÎ±ÏÎŒÎ¿Î³ÎÏ ÏÏÎ¹Îœ ÏÏÎ¿ÏÏÎ±ÎžÎ®ÏÎµÏÎµ ÎœÎ± ÏÎ¿ ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹Î®ÏÎµÏÎµ. +profileAccessDenied=Î€Î¿ %S ÎŽÎµÎœ ÎÏÎµÎ¹ Î¬ÎŽÎµÎ¹Î± ÎœÎ± ÏÏÎ¿ÏÏÎµÎ»Î¬ÏÎµÎ¹ ÏÎ¿ ÏÏÎ¿ÏÎ¯Î». Î Î±ÏÎ±ÎºÎ±Î»Ï ÏÏÎžÎŒÎ¯ÏÏÎµ ÏÎ¹Ï Î¬ÎŽÎµÎ¹ÎµÏ ÏÎ¿Ï ÏÏÏÏÎ®ÎŒÎ±ÏÎ¿Ï Î±ÏÏÎµÎ¯ÏÎœ ÏÎ±Ï ÎºÎ±Î¹ ÏÏÎ¿ÏÏÎ±ÎžÎ®ÏÏÎµ ÎŸÎ±ÎœÎ¬. +profileMigrationFailed=Î ÎŒÎµÏÎ±ÏÎ¿ÏÎ¬ ÏÎ¿Ï ÏÏÎ¬ÏÏÎ¿ÎœÏÎ¿Ï ÏÏÎ¿ÏÎ¯Î» %S Î±ÏÎÏÏÏÎµ.\nÎÎ± ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹Î·ÎžÎ¿ÏÎœ ÎœÎÎµÏ ÏÏÎžÎŒÎ¯ÏÎµÎ¹Ï. + +# .Onion Page Info prompt. Strings are kept here for ease of translation. +pageInfo_OnionEncryptionWithBitsAndProtocol=ÎÏÏÏÏÎ¿Î³ÏÎ±ÏÎ·ÎŒÎÎœÎ· ÏÏÎœÎŽÎµÏÎ· (Î¥ÏÎ·ÏÎµÏÎ¯Î± Onion, %1$S, %2$S bit keys, %3$S) +pageInfo_OnionEncryption=ÎÏÏÏÏÎ¿Î³ÏÎ±ÏÎ·ÎŒÎÎœÎ· ÏÏÎœÎŽÎµÏÎ· (ÏÏÎ·ÏÎµÏÎ¯Î± Onion) diff --git a/src/chrome/locale/es-AR/aboutDialog.dtd b/src/chrome/locale/es-AR/aboutDialog.dtd new file mode 100644 index 00000000..a20f6218 --- /dev/null +++ b/src/chrome/locale/es-AR/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; es desarrollado por "> + +<!ENTITY project.tpoLink "el &vendorShortName;"> +<!ENTITY project.end ", un organizaciÃ³n sin fines de lucro trabajando para defender tu privacidad y libertad en lÃnea."> + +<!ENTITY help.start "Â¿QuerÃ©s ayudar?"> + +<!ENTITY help.donateLink "DonÃ¡"> +<!ENTITY help.or "o"> + +<!ENTITY help.getInvolvedLink "involucrate"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "Â¿Preguntas?"> + +<!ENTITY bottomLinks.grow "Â¡AyudÃ¡ a que la red de Tor crezca! "> + +<!ENTITY bottomLinks.license "InformaciÃ³n de la licencia"> +<!ENTITY tor.TrademarkStatement "'Tor' y el 'Onion Logo' son marcas registradas del Tor Project, Inc."> diff --git a/src/chrome/locale/es-AR/aboutTBUpdate.dtd b/src/chrome/locale/es-AR/aboutTBUpdate.dtd new file mode 100644 index 00000000..9a1c4ec4 --- /dev/null +++ b/src/chrome/locale/es-AR/aboutTBUpdate.dtd @@ -0,0 +1,10 @@ +<!ENTITY aboutTBUpdate.title "ActualizaciÃ³n del Navegador Tor"> +<!ENTITY aboutTBUpdate.updated "El Navegador Tor ha sido actualizado."> +<!ENTITY aboutTBUpdate.linkPrefix "Para la informaciÃ³n mÃ¡s actualizada sobre Ã©sta versiÃ³n,"> +<!ENTITY aboutTBUpdate.linkLabel "visitÃ¡ nuestro sitio web"> +<!ENTITY aboutTBUpdate.linkSuffix "."> +<!ENTITY aboutTBUpdate.changeLogHeading "BitÃ¡cora de cambios:"> + +<!ENTITY aboutTBUpdate.circuitDisplayHeading "Nueva visualizaciÃ³n de Circuito, rediseÃ±ada"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "Â¡La visualizaciÃ³n del Circuito Tor ha sido reubicada y mejorada! Cliquear el botÃ³n Identidad de Sitio (localizado en el lado izquierdo de la barra URL) para ver la nueva visualizaciÃ³n de circuito."> +<!ENTITY aboutTBUpdate.learnMore "AprendÃ© mÃ¡s"> diff --git a/src/chrome/locale/es-AR/aboutTor.dtd b/src/chrome/locale/es-AR/aboutTor.dtd new file mode 100644 index 00000000..fcb78004 --- /dev/null +++ b/src/chrome/locale/es-AR/aboutTor.dtd @@ -0,0 +1,42 @@ + + +<!ENTITY aboutTor.title "Acerca de Tor"> + +<!ENTITY aboutTor.ready.label "ExplorÃ¡. Privadamente."> +<!ENTITY aboutTor.ready2.label "EstÃ¡s listo para la experiencia de navegaciÃ³n mÃ¡s privada del mundo."> +<!ENTITY aboutTor.failure.label "Â¡Algo saliÃ³ mal!"> +<!ENTITY aboutTor.failure2.label "Tor no funciona en este navegador."> + +<!ENTITY aboutTor.search.label "BuscÃ¡ con DuckDuckGo"> +<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> + +<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Â¿Preguntas?"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "RevisÃ¡ nuestro manual del navegador Tor Â»"> + +<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Manual del navegador Tor"> + +<!ENTITY aboutTor.tor_mission.label "El proyecto Tor es una organizaciÃ³n sin fines de lucro bajo las provisiones de la ley EUA 501(c)(3), cuya misiÃ³n es avanzar los derechos y libertades humanas creando y desplegando tecnologÃas de anonimato y privacidad de fuente abierta, soportando su disponibilidad y uso irrestricto, y ampliando su entendimiento cientÃfico y popular."> +<!ENTITY aboutTor.getInvolved.label "Involucrate Â»"> +<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> + +<!ENTITY aboutTor.newsletter.tagline "RecibÃ las Ãºltimas noticias de Tor derecho en tu bandeja de entrada."> +<!ENTITY aboutTor.newsletter.link_text "Registrate en Tor News."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Fortaleza en Canidad"> + +<!ENTITY aboutTor.donationBanner.line2a "El anonimato ama la compaÃ±Ãa."> +<!ENTITY aboutTor.donationBanner.line2b "Avanzar los derechos humanos universales."> +<!ENTITY aboutTor.donationBanner.line2c "Plantarse por la libertad."> +<!ENTITY aboutTor.donationBanner.line2d "Proteger la privacidad de millones."> +<!ENTITY aboutTor.donationBanner.line2e "Mantener fuerte a Tor."> +<!ENTITY aboutTor.donationBanner.line2f "Â¡Necesitamos tu apoyo!"> + +<!ENTITY aboutTor.donationBanner.line3 "DÃ¡ hoy, y Mozilla emparejarÃ¡ tu donaciÃ³n."> + +<!ENTITY aboutTor.donationBanner.buttonA "DonÃ¡ ahora"> +<!ENTITY aboutTor.donationBanner.buttonB "ContÃ¡ conmigo"> diff --git a/src/chrome/locale/es-AR/brand.dtd b/src/chrome/locale/es-AR/brand.dtd new file mode 100644 index 00000000..3b423ff3 --- /dev/null +++ b/src/chrome/locale/es-AR/brand.dtd @@ -0,0 +1,15 @@ + + +<!ENTITY brandShorterName "Navegador Tor"> +<!ENTITY brandShortName "Navegador Tor"> +<!ENTITY brandFullName "Navegador Tor"> +<!ENTITY vendorShortName "Proyecto Tor"> +<!ENTITY trademarkInfo.part1 "Firefox y los logotipos de Firefox son marcas registradas de la FundaciÃ³n Mozilla."> + + +<!ENTITY plugins.installed.find "Clic para cargar complementos del sistema instalados"> +<!ENTITY plugins.installed.enable "Habilitar complementos"> +<!ENTITY plugins.installed.disable "Deshabilitar complementos"> +<!ENTITY plugins.installed.disable.tip "Clic para evitar cargar complementos del sistema"> diff --git a/src/chrome/locale/es-AR/brand.properties b/src/chrome/locale/es-AR/brand.properties new file mode 100644 index 00000000..9da5b4ce --- /dev/null +++ b/src/chrome/locale/es-AR/brand.properties @@ -0,0 +1,16 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +brandShorterName=Navegador Tor +brandShortName=Navegador Tor +brandFullName=Navegador Tor +vendorShortName=Proyecto Tor + +homePageSingleStartMain=Firefox Start, una pÃ¡gina de inicio rÃ¡pida con bÃºsqueda integrada +homePageImport=Importar tu pÃ¡gina de inicio desde %S + +homePageMigrationPageTitle=SelecciÃ³n de la pÃ¡gina de inicio +homePageMigrationDescription=Por favor, seleccionÃ¡ la pÃ¡gina de inicio que deseÃ¡s usar: + +syncBrandShortName=Sincronizar diff --git a/src/chrome/locale/es-AR/browserOnboarding.properties b/src/chrome/locale/es-AR/browserOnboarding.properties new file mode 100644 index 00000000..2422233e --- /dev/null +++ b/src/chrome/locale/es-AR/browserOnboarding.properties @@ -0,0 +1,54 @@ +# Copyright (c) 2018, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +onboarding.tour-tor-welcome=Bienvenido +onboarding.tour-tor-welcome.title=EstÃ¡s listo +onboarding.tour-tor-welcome.description=El navegador Tor ofrece el estÃ¡ndar mÃ¡s alto de privacidad y seguridad mientras estÃ¡s navegando la web. Ahora estÃ¡s protegido contra el rastreo, vigilancia y censura. Este entrenamiento rÃ¡pido te mostrarÃ¡ cÃ³mo. +onboarding.tour-tor-welcome.button=EmpezÃ¡ ahora + +onboarding.tour-tor-privacy=Privacidad +onboarding.tour-tor-privacy.title=IgnorÃ¡ a rastreadores y mirones. +onboarding.tour-tor-privacy.description=El navegador Tor aÃsla los cookies y borra tu historial de navegaciÃ³n despuÃ©s de tu sesiÃ³n. Estas modificaciones aseguran que tu privacidad y seguridad estÃ¡n protegidas en el navegador. CliqueÃ¡ 'Red de Tor' para aprender cÃ³mo te protegemos al nivel de red. +onboarding.tour-tor-privacy.button=Ir a la red de Tor + +onboarding.tour-tor-network=Red de Tor +onboarding.tour-tor-network.title=ViajÃ¡ por una red descentralizada. +onboarding.tour-tor-network.description=El navegador Tor te conecta a la red de Tor, formada por miles de voluntarios alrededor del mundo. A diferencia de una RPV, no hay un Ãºnico punto de falla o entidad central en la cual necesitÃ©s confiar de manera de disfrutar de internet privadamente. +onboarding.tour-tor-network.button=Ir a visualizaciÃ³n de Circuito + +onboarding.tour-tor-circuit-display=VisualizaciÃ³n de Circuito +onboarding.tour-tor-circuit-display.title=MirÃ¡ tu ruta +onboarding.tour-tor-circuit-display.description=Por cada dominio que visitÃ©s, tu trÃ¡fico es relevado y encriptado en un circuito a travÃ©s de tres relevos Tor alrededor del mundo. NingÃºn sitio web conoce desde donde te estÃ¡s conectando. PodÃ©s solicitar un nuevo circuito cliqueando 'Nuevo Circuito para este Sitio' en nuestra VisualizaciÃ³n de Circuito. +onboarding.tour-tor-circuit-display.button=Mirar mi ruta + +onboarding.tour-tor-security=Seguridad +onboarding.tour-tor-security.title=ElegÃ tu experiencia +onboarding.tour-tor-security.description=TambiÃ©n te proveemos con ajustes adicionales para incrementar rÃ¡pidamente la seguridad de tu navegador. Nuestros Ajustes de Seguridad te permiten bloquear elementos que podrÃan ser usados para atacar tu computadora. CliqueÃ¡ abajo para ver quÃ© es lo que hacen las diferentes opciones. +onboarding.tour-tor-security.button=Revisar ajustes + +onboarding.tour-tor-expect-differences=Consejos de Experiencia +onboarding.tour-tor-expect-differences.title=EsperÃ¡ algunas diferencias +onboarding.tour-tor-expect-differences.description=Con todas las caracterÃsticas de seguridad y privacidad provistas por Tor, tu experiencia mientras estÃ©s navegando Internet puede ser un poco diferente. Puede ser un poco mÃ¡s lenta, y dependiendo de tu nivel de seguridad, algunos elementos pueden no trabajar o cargarse. TambiÃ©n puede que te sea preguntado si sos humano, y no un robot. +onboarding.tour-tor-expect-differences.button=Mirar las Preguntas MÃ¡s Frecuentes + +onboarding.tour-tor-onion-services=Servicios Onion +onboarding.tour-tor-onion-services.title=UsÃ¡ protecciÃ³n extra. +onboarding.tour-tor-onion-services.description=Servicios Cebolla son sitios que terminan en .onion y proveen protecciÃ³n extra a editores y visitantes, incluyendo defensas adicionales contra la censura. Los servicios Cebolla le permiten a cualquiera proveer contenido y servicios anÃ³nimamente. CliqueÃ¡ abajo para visitar el sitio Cebolla de DuckDuckGo. +onboarding.tour-tor-onion-services.button=VisitÃ¡ un Cebolla + +# Circuit Display onboarding. +onboarding.tor-circuit-display.next=Siguiente +onboarding.tor-circuit-display.done=Hecho +onboarding.tor-circuit-display.one-of-three=1 de 3 +onboarding.tor-circuit-display.two-of-three=2 de 3 +onboarding.tor-circuit-display.three-of-three=3 de 3 + +onboarding.tor-circuit-display.intro.title=Â¿CÃ³mo funcionan los circuitos? +onboarding.tor-circuit-display.intro.msg=Los circuitos estÃ¡n constituidos por relevos asignados aleatoriamente, los cuales son computadoras en algÃºn lugar del mundo configuradas para redirigir trÃ¡fico Tor. Los circuitos te permiten navegar privadamente y conectarte a servicios Onion. + +onboarding.tor-circuit-display.diagram.title=VisualizaciÃ³n de Circuito +onboarding.tor-circuit-display.diagram.msg=Este diagrama muestra los relevos que constituyen el circuito para Ã©ste sitio web. Para prevenir vinculaciÃ³n de actividad a travÃ©s de diferentes sitios, cada sitio web obtiene un circuito diferente. + +onboarding.tor-circuit-display.new-circuit.title=Â¿NecesitÃ¡s un circuito nuevo? +onboarding.tor-circuit-display.new-circuit.msg=Si no sos capaz de conectarte al sitio web que estÃ¡s tratando de visitar o no se estÃ¡ cargando apropiadamente, podÃ©s usar Ã©ste botÃ³n para recargar el sitio con un nuevo circuito. diff --git a/src/chrome/locale/es-AR/torbutton.dtd b/src/chrome/locale/es-AR/torbutton.dtd new file mode 100644 index 00000000..24af2fb8 --- /dev/null +++ b/src/chrome/locale/es-AR/torbutton.dtd @@ -0,0 +1,51 @@ +<!ENTITY torbutton.context_menu.new_identity "Nueva Identidad"> +<!ENTITY torbutton.context_menu.new_identity_key "I"> +<!ENTITY torbutton.context_menu.new_circuit "Nuevo Circuito Tor para este Sitio"> +<!ENTITY torbutton.context_menu.new_circuit_key "C"> +<!ENTITY torbutton.context_menu.preferences "ConfiguraciÃ³n de Seguridad..."> +<!ENTITY torbutton.context_menu.preferences.key "S"> +<!ENTITY torbutton.context_menu.networksettings "Configuraciones de la Red de Tor"> +<!ENTITY torbutton.context_menu.networksettings.key "R"> +<!ENTITY torbutton.context_menu.downloadUpdate "Comprobar si hay ActualizaciÃ³n para el Navegador Tor"> +<!ENTITY torbutton.context_menu.downloadUpdate.key "A"> +<!ENTITY torbutton.context_menu.cookieProtections "Protecciones de CooKies"> +<!ENTITY torbutton.context_menu.cookieProtections.key "K"> +<!ENTITY torbutton.button.tooltip "CliqueÃ¡ para inicializar Torbutton"> +<!ENTITY torbutton.prefs.security_settings "ConfiguraciÃ³n de Seguridad del Navegador Tor"> +<!ENTITY torbutton.prefs.restore_defaults "Restablecer valores por defecto"> +<!ENTITY torbutton.prefs.custom_warning "Tus preferencias personalizadas del navegador han resultado en ajustes de seguridad inusuales. Por razones de seguridad y privacidad, recomendamos que elijas uno de los niveles de seguridad por defecto."> +<!ENTITY torbutton.cookiedialog.title "Manejar la ProtecciÃ³n de cookies"> +<!ENTITY torbutton.cookiedialog.lockCol "Protegido"> +<!ENTITY torbutton.cookiedialog.domainCol "Host"> +<!ENTITY torbutton.cookiedialog.nameCol "Nombre"> +<!ENTITY torbutton.cookiedialog.pathCol "Ruta"> +<!ENTITY torbutton.cookiedialog.protectCookie "Proteger Cookie"> +<!ENTITY torbutton.cookiedialog.removeCookie "Eliminar Cookie"> +<!ENTITY torbutton.cookiedialog.unprotectCookie "Desproteger Cookie"> +<!ENTITY torbutton.cookiedialog.removeAllBut "Eliminar todas salvo las protegidas "> +<!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger nuevas Cookies"> +<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "No proteger nuevas Cookies"> +<!ENTITY torbutton.prefs.restrict_thirdparty "Restringir cookies de terceros y otros datos de rastreo"> +<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R"> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "MantenÃ© esta casilla chequeada para prevenir varias caracterÃsticas del navegador de ser abusadas para rastrearte a medida que navegÃ¡s la web. CaracterÃsticas modificadas incluyen URLs tipo blob, canales de difusiÃ³n, el cachÃ© del navegador, cookies, iconos favoritos, encabezados HTTP Auth, vÃnculos de preconexiÃ³n, URLs localStorage o mediaSource, llamadas OCSP, SharedWorkers, y tiquets de sesiÃ³n TLS."> +<!ENTITY torbutton.prefs.resist_fingerprinting "Variar los detalles que te distinguen de otros usuarios del Navegador Tor"> +<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "H"> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "MantenÃ© Ã©sta casilla chequeada para ocultar de los sitios web cosas que pudieran ser Ãºnicas acerca tuyo, incluyendo el rendimiento de tu computadora, distribuciÃ³n de teclado, configuraciÃ³n regional, localizaciÃ³n de complementos instalados, lista de complementos instalados, estado de red, orientaciÃ³n de la pantalla, tamaÃ±o de la misma, niveles de zoom especÃficos por sitio, tipos de archivo soportados, colores del sistema y capacidades WebGL."> +<!ENTITY torbutton.prefs.sec_caption "Nivel de seguridad"> +<!ENTITY torbutton.prefs.sec_caption_tooltip "La regla deslizante de Seguridad te deja deshabilitar ciertas caracterÃsticas del navegador que pueden hacerlo mÃ¡s vulnerable a intentos de apropiaciÃ³n."> +<!ENTITY torbutton.prefs.sec_standard_label "EstÃ¡ndar"> +<!ENTITY torbutton.prefs.sec_standard_description "Todas las caracterÃsticas del navegador Tor y el sitio web estÃ¡n habilitadas."> +<!ENTITY torbutton.prefs.sec_safer_label "MÃ¡s seguro"> +<!ENTITY torbutton.prefs.sec_safer_description "Deshabilita caracterÃsticas del sitio web que son a menudo peligrosas, causando que algunos sitios pierdan funcionalidad."> +<!ENTITY torbutton.prefs.sec_safer_list_label "En el ajuste "MÃ¡s seguro":"> +<!ENTITY torbutton.prefs.sec_safest_label "En extremo seguro"> +<!ENTITY torbutton.prefs.sec_safest_description "SÃ³lo permite caracterÃsticas del sitio web requeridas por sitios estÃ¡ticos y servicios bÃ¡sicos. Estos cambios afectan imÃ¡genes, medios y cÃ³digo ejecutable."> +<!ENTITY torbutton.prefs.sec_safest_list_label "En el ajuste "En extremo seguro":"> +<!ENTITY torbutton.prefs.sec_learn_more_label "MÃ¡s informacion"> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript estÃ¡ deshabilitado en sitios no-HTTPS."> +<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript estÃ¡ deshabilitado por defecto en todos los sitios."> +<!ENTITY torbutton.prefs.sec_limit_typography "Algunos tipos de letra y sÃmbolos matemÃ¡ticos estÃ¡n deshabilitados."> +<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Algunos tipos de letra, iconos, sÃmbolos matemÃ¡ticos e imÃ¡genes estÃ¡n deshabilitados."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio y video (medios HTML5) son cliquear-para-reproducir."> +<!ENTITY torbutton.circuit_display.title "Circuito Tor"> +<!ENTITY torbutton.circuit_display.new_circuit "Nuevo circuito para este sitio"> diff --git a/src/chrome/locale/es-AR/torbutton.properties b/src/chrome/locale/es-AR/torbutton.properties new file mode 100644 index 00000000..181160ff --- /dev/null +++ b/src/chrome/locale/es-AR/torbutton.properties @@ -0,0 +1,55 @@ +torbutton.circuit_display.internet = Internet +torbutton.circuit_display.ip_unknown = IP desconocido +torbutton.circuit_display.onion_site = Sitio Onion +torbutton.circuit_display.this_browser = Este navegador +torbutton.circuit_display.relay = Relevo +torbutton.circuit_display.tor_bridge = Puente +torbutton.circuit_display.unknown_country = PaÃs desconocido +torbutton.circuit_display.guard = Guarda +torbutton.circuit_display.guard_note = Tu nodo [Guarda] puede no cambiar. +torbutton.circuit_display.learn_more = MÃ¡s informacion +torbutton.content_sizer.margin_tooltip = El navegador Tor aÃ±ade Ã©ste margen para hacer el ancho y alto de tu ventana menos distintivo, y de Ã©sta manera reduce la habilidad de cualquiera para rastrearte en lÃnea. +torbutton.panel.tooltip.disabled = Cliquear para habilitar Tor +torbutton.panel.tooltip.enabled = Cliquear para deshabilitar Tor +torbutton.panel.label.disabled = Tor deshabilitado +torbutton.panel.label.enabled = Tor habilitado +extensions.torbutton(a)torproject.org.description = Torbutton provee un botÃ³n para configurar ajustes de Tor, y rÃ¡pida y fÃ¡cilmente eliminar los datos de navegaciÃ³n privados. +torbutton.popup.external.title = Â¿Descargar un tipo de archivo externo? +torbutton.popup.external.app = Tor Browser no puede mostrar este archivo. Vas a tener que abrirlo con otra aplicaciÃ³n.\n\n +torbutton.popup.external.note = Algunos tipos de archivos pueden hacer que las aplicaciones se conecten a Internet sin usar Tor.\n\n +torbutton.popup.external.suggest = Para estar seguro, deberÃas abrir los archivos descargados mientras estÃ¡s fuera de lÃnea, o usar un Live CD de Tor, como Tails.\n +torbutton.popup.launch = Descargar archivo +torbutton.popup.cancel = Cancelar +torbutton.popup.dontask = Descargar automÃ¡ticamente los archivos a partir de ahora +torbutton.popup.no_newnym = El botÃ³n Tor no puede darte una nueva identidad en forma segura. No tiene acceso al puerto de control Tor.\n\nÂ¿EstÃ¡s corriendo el conjunto de programas del navegador Tor? +torbutton.security_settings.menu.title = ConfiguraciÃ³n de seguridad +torbutton.title.prompt_torbrowser = InformaciÃ³n importante del botÃ³n Tor +torbutton.popup.prompt_torbrowser = El botÃ³n Tor trabaja ahora en forma diferente: no podÃ©s desactivarlo mÃ¡s.\n\nHicimos Ã©ste cambio porque no es seguro usar el botÃ³n Tor en un navegador que tambiÃ©n es usado para navegaciÃ³n no-Tor. HabÃa demasiados errores, que no pudimos arreglar de ninguna otra manera.\n\nSi querÃ©s seguir usando Firefox normalmente, deberÃas desinstalar el botÃ³n Tor y descargar el conjunto de programas del navegador Tor. Las propiedades de privacidad del navegador Tor tambiÃ©n son superiores a aquellas del Firefox normal, aÃºn cuando Firefox es usado con el botÃ³n Tor.\n\nPara remover el botÃ³n Tor, andÃ¡ a Herramientas->Adiciones->Extensiones y luego cliqueÃ¡ el botÃ³n Remover al lado del botÃ³n Tor. +torbutton.popup.short_torbrowser = Â¡InformaciÃ³n importante del botÃ³n Tor!\n\nEl botÃ³n Tor ahora estÃ¡ siempre habilitado.\n\nCliqueÃ¡ en el botÃ³n Tor para mÃ¡s informaciÃ³n. + +torbutton.popup.confirm_plugins = Complementos tales como Flash pueden daÃ±ar tu privacidad y anonimato.\n\nTambiÃ©n pueden evitar Tor para revelar tu localizaciÃ³n corriente y direcciÃ³n IP.\n\nÂ¿EstÃ¡s seguro que querÃ©s habilitar complementos?\n\n +torbutton.popup.never_ask_again = No preguntarme de nuevo +torbutton.popup.confirm_newnym = El navegador Tor cerrarÃ¡ todas las ventanas y pestaÃ±as. Todas las sesiones en algÃºn sitio web se perderÃ¡n.\n\nÂ¿Reiniciar el navegador Tor ahora para renovar tu identidad?\n\n + +torbutton.maximize_warning = Maximizando el navegador Tor puede permitir que un sitio web determine el tamaÃ±o de tu monitor, lo cual puede ser usado para rastrearte. Te recomendamos que dejes las ventanas del navegador Tor en su tamaÃ±o original por defecto. + +# Canvas permission prompt. Strings are kept here for ease of translation. +canvas.siteprompt=Este sitio web (%S) intentÃ³ extraer datos de una regiÃ³n de imagen HTML5, los cuÃ¡les pueden ser usados para identificar Ãºnicamente tu computadora.\n\nÂ¿Debiera el navegador Tor permitir a Ã©ste sitio web extraer datos de regiÃ³n de imagen HTML5? +canvas.notNow=Ahora no +canvas.notNowAccessKey=N +canvas.allow=Permitir en el futuro +canvas.allowAccessKey=P +canvas.never=Nunca para este sitio (recomendado) +canvas.neverAccessKey=e + +# Profile/startup error messages. Strings are kept here for ease of translation. +# LOCALIZATION NOTE: %S is the application name. +profileProblemTitle=Problema de perfil %S +profileReadOnly=No podÃ©s correr %S desde un sistema de archivos de sÃ³lo lectura. Por favor copiÃ¡ %S a otra ubicaciÃ³n antes de tratar de usarlo. +profileReadOnlyMac=No podÃ©s correr %S desde un sistema de archivos de sÃ³lo lectura. Por favor copiÃ¡ %S a tu Escritorio o carpeta Aplicaciones antes de tratar de usarlo. +profileAccessDenied=%S no tiene permiso para acceder al perfil. Por favor ajustÃ¡ los permisos de tu sistema de archivos y tratÃ¡ de nuevo. +profileMigrationFailed=La migraciÃ³n de tu perfil existente de %S fallÃ³.\nSerÃ¡n usados nuevos ajustes. + +# .Onion Page Info prompt. Strings are kept here for ease of translation. +pageInfo_OnionEncryptionWithBitsAndProtocol=ConexiÃ³n encriptada (Servicio Onion, %1$S, claves de %2$S bits, %3$S) +pageInfo_OnionEncryption=ConexiÃ³n encriptada (Servicio Onion) diff --git a/src/chrome/locale/fr/browserOnboarding.properties b/src/chrome/locale/fr/browserOnboarding.properties index ad6ca038..8fe3650a 100644 --- a/src/chrome/locale/fr/browserOnboarding.properties +++ b/src/chrome/locale/fr/browserOnboarding.properties @@ -50,5 +50,5 @@ onboarding.tor-circuit-display.intro.msg=Les circuits sont composÃ©s de relais a onboarding.tor-circuit-display.diagram.title=Affichage des circuits onboarding.tor-circuit-display.diagram.msg=Ce diagramme affiche les relais qui composent le circuit de ce site Web. Pour empÃªcher de relier lâactivitÃ© dâun site Ã lâautre, chaque site Web obtient un circuit diffÃ©rent. -onboarding.tor-circuit-display.new-circuit.title=Avez-vous besoin d'un nouveau circuitâ? +onboarding.tor-circuit-display.new-circuit.title=Avez-vous besoin dâun nouveau circuitâ? onboarding.tor-circuit-display.new-circuit.msg=Si vous nâarrivez pas Ã vous connecter au site Web que vous essayez de visiter ou sâil ne se charge pas correctement, vous pouvez alors utiliser ce bouton pour recharger le site avec un nouveau circuit. diff --git a/src/chrome/locale/hu/aboutDialog.dtd b/src/chrome/locale/hu/aboutDialog.dtd new file mode 100644 index 00000000..b42d3365 --- /dev/null +++ b/src/chrome/locale/hu/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; fejlesztve Ã¡ltala: "> + +<!ENTITY project.tpoLink "a &vendorShortName;"> +<!ENTITY project.end ", egy nonprofit szervezet az online magÃ¡nÃ©let Ã©s szabadsÃ¡g vÃ©delmÃ©re."> + +<!ENTITY help.start "Akarsz segÃteni?"> + +<!ENTITY help.donateLink "TÃ¡mogatÃ¡s"> +<!ENTITY help.or "vagy"> + +<!ENTITY help.getInvolvedLink "rÃ©szvÃ©tel"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "KÃ©rdÃ©sek?"> + +<!ENTITY bottomLinks.grow "SegÃts a Tor hÃ¡lÃ³zat nÃ¶vekedÃ©sÃ©ben!"> + +<!ENTITY bottomLinks.license "Licensz informÃ¡ciÃ³k"> +<!ENTITY tor.TrademarkStatement "A 'Tor' Ã©s az 'Onion Logo' a Tor Project, Inc. bejegyzett vÃ©djegyei."> diff --git a/src/chrome/locale/hu/aboutTBUpdate.dtd b/src/chrome/locale/hu/aboutTBUpdate.dtd new file mode 100644 index 00000000..f8378a24 --- /dev/null +++ b/src/chrome/locale/hu/aboutTBUpdate.dtd @@ -0,0 +1,10 @@ +<!ENTITY aboutTBUpdate.title "Tor BÃ¶ngÃ©szÅ FrissÃtÃ©s"> +<!ENTITY aboutTBUpdate.updated "Tor BÃ¶ngÃ©szÅ frissÃtve."> +<!ENTITY aboutTBUpdate.linkPrefix "Az errÅl a kiadÃ¡srÃ³l szÃ³lÃ³ legfrissebb informÃ¡ciÃ³kÃ©rt"> +<!ENTITY aboutTBUpdate.linkLabel "lÃ¡togassa meg weboldalunkat"> +<!ENTITY aboutTBUpdate.linkSuffix "."> +<!ENTITY aboutTBUpdate.changeLogHeading "VÃ¡ltozÃ¡sok listÃ¡ja:"> + +<!ENTITY aboutTBUpdate.circuitDisplayHeading "Ãj, Ã¡ttervezett Ã¡ramkÃ¶r megjelenÃtÃ©s"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "A Tor Ã¡ramkÃ¶r megjelenÃtÃ©s Ã¡thelyezÃ©sre Ã©s fejlesztÃ©sre kerÃŒlt. Kattintson az Oldal IdentitÃ¡s gombra (az URL sÃ¡v bal oldalÃ¡nÃ¡l) az Ãºj Ã¡ramkÃ¶r megjelenÃtÃ©s megtekintÃ©sÃ©hez."> +<!ENTITY aboutTBUpdate.learnMore "Tudjon meg tÃ¶bbet"> diff --git a/src/chrome/locale/hu/aboutTor.dtd b/src/chrome/locale/hu/aboutTor.dtd index 9f14022b..6ac1ae1d 100644 --- a/src/chrome/locale/hu/aboutTor.dtd +++ b/src/chrome/locale/hu/aboutTor.dtd @@ -1,47 +1,42 @@  -<!ENTITY aboutTor.title "About Tor"> - -<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date."> -<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update."> - -<!ENTITY aboutTor.check.label "Test Tor Network Settings"> - -<!ENTITY aboutTor.success.label "Congratulations!"> -<!ENTITY aboutTor.success2.label "This browser is configured to use Tor."> -<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously."> -<!ENTITY aboutTor.failure.label "Something Went Wrong!"> -<!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> -<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact "> -<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> -<!ENTITY aboutTor.failure3suffix.label "."> - -<!ENTITY aboutTor.search.label "Search"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> -<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> - -<!ENTITY aboutTor.torInfo1.label "Additional Info:"> -<!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> -<!ENTITY aboutTor.torInfo3.label "Exit Node:"> -<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors."> -<!ENTITY aboutTor.whatnextQuestion.label "What Next?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> -<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»"> -<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.helpInfo1.label "You Can Help!"> -<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> -<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»"> -<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»"> -<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»"> -<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> - -<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy."> -<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»"> -<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> +<!ENTITY aboutTor.title "A Tor-rÃ³l"> + +<!ENTITY aboutTor.ready.label "Fedezzen fel. PrivÃ¡tan."> +<!ENTITY aboutTor.ready2.label "KÃ©szen Ã¡ll a vilÃ¡g legprivÃ¡tabb bÃ¶ngÃ©szÃ©si Ã©lmÃ©nyÃ©re."> +<!ENTITY aboutTor.failure.label "Valami nem jÃ³l mÅ±kÃ¶dik!"> +<!ENTITY aboutTor.failure2.label "A tor nem mÅ±kÃ¶dik ebben a bÃ¶ngÃ©szÅben."> + +<!ENTITY aboutTor.search.label "Keressen a DuckDuckGo-val"> +<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> + +<!ENTITY aboutTor.torbrowser_user_manual_questions.label "KÃ©rdÃ©sek?"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Tekintse meg a Tor BÃ¶ngÃ©szÅ ÃtmutatÃ³nkat"> + +<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor BÃ¶ngÃ©szÅ ÃtmutatÃ³"> + +<!ENTITY aboutTor.tor_mission.label "A Tor Project egy a US 501(c)(3) szerinti non-profit szervezet, amely az emberi jogokÃ©rt Ã©s szabadsÃ¡gÃ©rt harcol, nyÃlt forrÃ¡skÃ³dÃº anonimitÃ¡s Ã©s adatvÃ©delmi technolÃ³giÃ¡k fejlesztÃ©sÃ©vel Ã©s terjesztÃ©sÃ©vel, tÃ¡mogatva azok korlÃ¡tlan elÃ©rhetÅsÃ©gÃ©t Ã©s hasznÃ¡latÃ¡t, tÃ¡mogassÃ¡k a tudomÃ¡nyos Ã¡s Ã¡ltalÃ¡nos megÃ©rtÃ©sÃŒket."> +<!ENTITY aboutTor.getInvolved.label "Vegyen rÃ©szt"> +<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> + +<!ENTITY aboutTor.newsletter.tagline "Kapja meg a legfrissebb Tor hÃreket kÃ¶zvetlenÃŒl email fiÃ³kjÃ¡ba."> +<!ENTITY aboutTor.newsletter.link_text "Iratkozzon fel a Tor hÃrekhez."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: ErÅssÃ©g a szÃ¡mokban"> + +<!ENTITY aboutTor.donationBanner.line2a "Az anonimitÃ¡s szereti a cÃ©geket."> +<!ENTITY aboutTor.donationBanner.line2b "ÃltalÃ¡nosan nÃ¶veli az emberi jogokat."> +<!ENTITY aboutTor.donationBanner.line2c "KiÃ¡ll a szabadsÃ¡gÃ©rt."> +<!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.line3 "Adjon ma Ã©s a Mozilla is annyival tÃ¡mogat."> + +<!ENTITY aboutTor.donationBanner.buttonA "TÃ¡mogasson most"> +<!ENTITY aboutTor.donationBanner.buttonB "SzÃ¡mÃtsatok bele"> diff --git a/src/chrome/locale/hu/brand.dtd b/src/chrome/locale/hu/brand.dtd index 59f665e8..229ff97e 100644 --- a/src/chrome/locale/hu/brand.dtd +++ b/src/chrome/locale/hu/brand.dtd @@ -2,7 +2,14 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<!ENTITY brandShorterName "Tor Browser"> <!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> -<!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> +<!ENTITY trademarkInfo.part1 "A Firefox Ã©s a Firefox logÃ³ a Mozilla Foundation vÃ©djegyei."> + + +<!ENTITY plugins.installed.find "Kattintson telepÃtett bÃ¶ngÃ©szÅ pluginek betltÃ©sÃ©hez"> +<!ENTITY plugins.installed.enable "BeÃ©pÃŒlÅ modulok engedÃ©lyezÃ©se"> +<!ENTITY plugins.installed.disable "BeÃ©pÃŒlÅ modulok tiltÃ¡sa "> +<!ENTITY plugins.installed.disable.tip "Kattintson a rendszer beÃ©pÃŒlÅ modulok betÃ¶ltÃ©sÃ©nek megakadÃ¡lyozÃ¡sÃ¡hoz."> diff --git a/src/chrome/locale/hu/brand.properties b/src/chrome/locale/hu/brand.properties index f63def38..93001e71 100644 --- a/src/chrome/locale/hu/brand.properties +++ b/src/chrome/locale/hu/brand.properties @@ -2,14 +2,15 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +brandShorterName=Tor Browser brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project -homePageSingleStartMain=Firefox Start, a fast home page with built-in search -homePageImport=Import your home page from %S +homePageSingleStartMain=Firefox Start, egy gyors weboldal beÃ©pÃtett keresÅvel +homePageImport=KezdÅlap importÃ¡lÃ¡sa a %S termÃ©kbÅl -homePageMigrationPageTitle=Home Page Selection -homePageMigrationDescription=Please select the home page you wish to use: +homePageMigrationPageTitle=KezdÅlap vÃ¡lasztÃ¡s +homePageMigrationDescription=KÃ©rjÃŒk vÃ¡lassza ki a hasznÃ¡landÃ³ kezdÅlapot: -syncBrandShortName=Sync +syncBrandShortName=SzinkronizÃ¡lÃ¡s diff --git a/src/chrome/locale/hu/browserOnboarding.properties b/src/chrome/locale/hu/browserOnboarding.properties new file mode 100644 index 00000000..ee790662 --- /dev/null +++ b/src/chrome/locale/hu/browserOnboarding.properties @@ -0,0 +1,54 @@ +# Copyright (c) 2018, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +onboarding.tour-tor-welcome=KÃ¶szÃ¶ntjÃŒk +onboarding.tour-tor-welcome.title=KÃ©szen van. +onboarding.tour-tor-welcome.description=A Tor BÃ¶ngÃ©szÅ a legmagasabb adatvÃ©delmet Ã©s biztonÃ¡got adja, mikÃ¶zben bÃ¶ngÃ©szik. Most vÃ©dett a kÃ¶vetÃ©stÅl, megfigyelÃ©stÅl Ã©s cenzorÃ¡lÃ¡stÃ³l. Ez a rÃ¶vid Ã¡ttekintÃ©s megmutatja, hogyan. +onboarding.tour-tor-welcome.button=IndÃtÃ¡s most + +onboarding.tour-tor-privacy=AdatvÃ©delem +onboarding.tour-tor-privacy.title=snub kÃ¶vetÅk Ã©s figyelÅk. +onboarding.tour-tor-privacy.description=A Tor BÃ¶ngÃ©szÅ elszigeteli a sÃŒtiket Ã©s tÃ¶rli az elÅzmÃ©nyeket az alkalom vÃ©gÃ©n. Ezek a mÃ³dosÃtÃ¡sok biztosÃtjÃ¡k adatvÃ©delmÃ©t Ã©s biztonsÃ¡gÃ¡t a bÃ¶ngÃ©szÅben. Kattintson a 'Tor hÃ¡lÃ³zat' pontra, hogy megismerhesse a vÃ©delmet hÃ¡lÃ³zati szinten. +onboarding.tour-tor-privacy.button=IrÃ¡ny a Tor HÃ¡lÃ³zat + +onboarding.tour-tor-network=Tor HÃ¡lÃ³zat +onboarding.tour-tor-network.title=Utazzon egy decentralizÃ¡lt hÃ¡lÃ³zaton. +onboarding.tour-tor-network.description=A Tor BÃ¶ngÃ©szÅ Ã¶sszekÃ¶ti Ãnt Ã©s a Tor hÃ¡lÃ³zatÃ¡t Ã¶nkÃ©ntesek ezreivel a vilÃ¡gon. A VPN-nel ellentÃ©tben nincs egypontos hibalehetÅsÃ©g vagy kÃ¶zpontosÃtott entitÃ¡s amiben bÃznia kell, ahhoz, hogy az internetet privÃ¡t hasznÃ¡lja. +onboarding.tour-tor-network.button=UgrÃ¡s az ÃramkÃ¶r megjelenÃtÃ©shez + +onboarding.tour-tor-circuit-display=ÃramkÃ¶r megjelenÃtÅ +onboarding.tour-tor-circuit-display.title=Tekintse meg ÃºtvonalÃ¡t. +onboarding.tour-tor-circuit-display.description=Minden meglÃ¡togatott domainhez, a forgalma titkosÃtva tovÃ¡bbÃtÃ¡sra hÃ¡rom a vilÃ¡gban talÃ¡lhatÃ³ Tor relÃ©n. Semmilyen weboldal nem fogja tudni honnan kapcsolÃ³dott. KÃ©rhet Ãºj Ã¡ramkÃ¶rt az 'Ãj Ã¡ramkÃ¶r ehhez a site-hoz"-ra kattintva az ÃramkÃ¶r megjelenÃtÅn. +onboarding.tour-tor-circuit-display.button=Megtekintem az Ãºtvonalam + +onboarding.tour-tor-security=BiztonsÃ¡g +onboarding.tour-tor-security.title=VÃ¡lassza ki Ã©lmÃ©nyÃ©t +onboarding.tour-tor-security.description=TovÃ¡bbi beÃ¡llÃtÃ¡si lehetÅsÃ©geket biztosÃtunk a bÃ¶ngÃ©szÅ biztonsÃ¡g nÃ¶velÃ©se Ã©rdekÃ©ben. A BiztonsÃ¡gi beÃ¡llÃtÃ¡saink lehetÅvÃ© teszik, hogy blokkoljon olyan elemeket, amelyekkel tÃ¡madhatÃ³ a szÃ¡mÃtÃ³gÃ©pe. Kattintson alÃ¡bb, hogy lÃ¡ssa, mely lehetÅsÃ©gek mit csinÃ¡lnak. +onboarding.tour-tor-security.button=BeÃ¡llÃtÃ¡sok Ã¡ttekintÃ©se + +onboarding.tour-tor-expect-differences=Tapasztalati tippek +onboarding.tour-tor-expect-differences.title=SzÃ¡mÃtson kÃŒlÃ¶nbsÃ©gekre. +onboarding.tour-tor-expect-differences.description=Minden biztonsÃ¡gi Ã©s adatvÃ©delmi lehetÅsÃ©ggel amit a Tor biztosÃt, a tapasztalatai az internet bÃ¶ngÃ©szÃ©srÅl eltÃ©rÅek lehetnek. A dolgok egy kicsit lassabbak, a beÃ¡llÃtott biztonsÃ¡gi szintjÃ©tÅl, nÃ©hÃ¡ny elem nem mÅ±kÃ¶dik vagy tÃ¶lt be. ElkÃ©pzelhetÅ, hogy rÃ¡kÃ©rdeznek arra, hogy ember vagy robot kÃ©rdÃ©st kap. +onboarding.tour-tor-expect-differences.button=LÃ¡sd GYIK + +onboarding.tour-tor-onion-services=Onion szolgÃ¡ltatÃ¡sok +onboarding.tour-tor-onion-services.title=Legyen extra vÃ©dett. +onboarding.tour-tor-onion-services.description=Az Onion szolgÃ¡ltatÃ¡sok olyan oldalak, amelyek .onion-ra vÃ©gzÅdnek, Ã©s extra vÃ©delmet adnak a fenntartÃ³juknak Ã©s lÃ¡togatÃ³iknak, beleÃ©rtve a a cenzÃºra ellenes funkciÃ³kat is. Az Onion szolgÃ¡ltatÃ¡sok lehetÅvÃ© teszik bÃ¡rkinek, hogy tartalmat Ã©s szolgÃ¡ltatÃ¡sokat nyÃºjtson nÃ©vtelenÃŒl. \nKattintson alÃ¡bb a DuckDuckGo onion oldal meglÃ¡togatÃ¡sÃ¡hoz. +onboarding.tour-tor-onion-services.button=LÃ¡togasson meg egy Onion-t + +# Circuit Display onboarding. +onboarding.tor-circuit-display.next=KÃ¶vetkezÅ +onboarding.tor-circuit-display.done=KÃ©sz +onboarding.tor-circuit-display.one-of-three=1 a 3-bÃ³l +onboarding.tor-circuit-display.two-of-three=2 a 3-bÃ³l +onboarding.tor-circuit-display.three-of-three=3 a 3-bÃ³l + +onboarding.tor-circuit-display.intro.title=Hogyan mÅ±kÃ¶dnek az Ã¡ramkÃ¶rÃ¶k? +onboarding.tor-circuit-display.intro.msg=Az Ã¡ramkÃ¶rÃ¶k vÃ©letlenÃŒl hozzÃ¡rendelt relÃ©kbÅl Ã¡llnak, amik olyan szÃ¡mÃtÃ³gÃ©pek, amik tovÃ¡bbÃtjÃ¡k a Tor forgalmat. Az Ã¡ramkÃ¶rÃ¶k teszik lehetÅÃ©v hogy privÃ¡t bÃ¶ngÃ©sszen Ã©s onion szolgÃ¡ltatÃ¡shoz csatlakozzon. + +onboarding.tor-circuit-display.diagram.title=ÃramkÃ¶r megjelenÃtÅ +onboarding.tor-circuit-display.diagram.msg=A diagram azt mutatja milyen relÃ©k alkotjÃ¡k az oldal Ã¡ramkÃ¶rÃ©t. AzÃ©rt, hogy megakadÃ¡lyozza a keresztoldalas hivatkozÃ¡st, minden oldal kÃŒlÃ¶n Ã¡ramkÃ¶rt kap. + +onboarding.tor-circuit-display.new-circuit.title=SzÃŒksÃ©ge van egy Ã¡ramkÃ¶rre? +onboarding.tor-circuit-display.new-circuit.msg=Ha nem sikerÃŒl meglÃ¡togatni egy oldalt vagy nem tÃ¶lt be megfelelÅen, akkor hasznÃ¡lhatja ezt a gombot egy mÃ¡sik Ã¡ramkÃ¶rÃ¶n keresztÃŒli ÃºjratÃ¶ltÃ©shez. diff --git a/src/chrome/locale/hu/torbutton.dtd b/src/chrome/locale/hu/torbutton.dtd index f0fa66e2..ecab5ecf 100644 --- a/src/chrome/locale/hu/torbutton.dtd +++ b/src/chrome/locale/hu/torbutton.dtd @@ -1,12 +1,19 @@ <!ENTITY torbutton.context_menu.new_identity "Ãj szemÃ©lyazonossÃ¡g"> <!ENTITY torbutton.context_menu.new_identity_key "S"> -<!ENTITY torbutton.context_menu.networksettings "HÃ¡lÃ³zati beÃ¡llÃtÃ¡sok megnyitÃ¡sa"> -<!ENTITY torbutton.context_menu.downloadUpdate "Tor BÃ¶ngÃ©szÅ csomag frissÃtÃ©sÃ©nek letÃ¶ltÃ©se"> +<!ENTITY torbutton.context_menu.new_circuit "Ãj Tor Ã¡ramkÃ¶r ehhez az oldalhoz"> +<!ENTITY torbutton.context_menu.new_circuit_key "S"> +<!ENTITY torbutton.context_menu.preferences "BiztonsÃ¡gi beÃ¡llÃtÃ¡sok..."> +<!ENTITY torbutton.context_menu.preferences.key "S"> +<!ENTITY torbutton.context_menu.networksettings "Tor hÃ¡lÃ³zati beÃ¡llÃtÃ¡sok"> +<!ENTITY torbutton.context_menu.networksettings.key "N"> +<!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser frissÃtÃ©sek keresÃ©se"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "SÃŒti vÃ©delem"> +<!ENTITY torbutton.context_menu.cookieProtections "SÃŒti vÃ©delmek..."> <!ENTITY torbutton.context_menu.cookieProtections.key "S"> <!ENTITY torbutton.button.tooltip "Kattintson a Torbutton inicializÃ¡lÃ¡sÃ¡hoz"> -<!ENTITY torbutton.prefs.restore_defaults "AlapÃ©rtÃ©kek visszaÃ¡llÃtÃ¡sa"> +<!ENTITY torbutton.prefs.security_settings "Tor Browser biztonsÃ¡gi beÃ¡llÃtÃ¡sok"> +<!ENTITY torbutton.prefs.restore_defaults "AlapÃ©rtelmezÃ©sek visszaÃ¡llÃtÃ¡sa"> +<!ENTITY torbutton.prefs.custom_warning "Az Ã¡ltalad eszkÃ¶zÃ¶lt egyÃ©ni bÃ¶ngÃ©szÅi beÃ¡llÃtÃ¡sok eredmÃ©nyekÃ©pp biztonsÃ¡gi kockÃ¡zatok merÃŒlhetnek fel. BiztonsÃ¡gi Ã©s adatvÃ©delmi szempontokbÃ³l kÃ©rjÃŒk vÃ¡lassz az alapÃ©rtelmezett biztonsÃ¡gi szintek kÃ¶zÃŒl."> <!ENTITY torbutton.cookiedialog.title "SÃŒti vÃ©delem kezelÃ©se"> <!ENTITY torbutton.cookiedialog.lockCol "VÃ©dett"> <!ENTITY torbutton.cookiedialog.domainCol "ÃllomÃ¡s"> @@ -19,4 +26,26 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "VÃ©dje az Ãºj sÃŒtiket"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne vÃ©dje az Ãºj sÃŒtiket"> <!ENTITY torbutton.prefs.restrict_thirdparty "A harmadik fÃ©ltÅl szÃ¡rmazÃ³ sÃŒtik Ã©s nyomkÃ¶vetÃ©si adatok korlÃ¡tozÃ¡sa"> -<!ENTITY torbutton.prefs.resist_fingerprinting "VÃ¡ltoztassa meg a rÃ©szleteket, amik megkÃŒlÃ¶nbÃ¶ztetik a tÃ¶bbi Tor bÃ¶ngÃ©szÅ felhasznÃ¡lÃ³tÃ³l"> +<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R"> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Hagyja ezt a gombot bejelÃ¶lve, hogy megakadÃ¡lyozza, hogy kÃŒlÃ¶nbÃ¶zÅ bÃ¶ngÃ©szÅ lehetÅsÃ©gek eltÃ©rÃtÃ©sre kerÃŒlhessenek a webes nyomon kÃ¶vethetÅsÃ©ge Ã©rdekÃ©ben. A mÃ³dosÃtott szolgÃ¡ltatÃ¡sok tÃ¶bbek kÃ¶zÃ¶tt, blob URL, broadcast csatornÃ¡k, bÃ¶ngÃ©szÅ cache, sÃŒtik, favikonok, HTTP Auth fejlÃ©cek, link elÅcsatlakozÃ¡sok, localStorage, mediaSource URL-ek, OCSP kÃ©rÃ©sek, SharedWorkers-ek, Ã©s TLS session ticketek."> +<!ENTITY torbutton.prefs.resist_fingerprinting "VÃ¡ltoztassa meg a rÃ©szleteket, amik megkÃŒlÃ¶nbÃ¶ztetik a tÃ¶bbi Tor Browser felhasznÃ¡lÃ³tÃ³l"> +<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Hagyja ezt a gombot bejelÃ¶lve, hogy elrejtsen dolgokat weboldalak elÅl, amik egyedivÃ© tehetik, mint elem Ã¡llapot, szÃ¡mÃtÃ³gÃ©p teljesÃtmÃ©ny, billentyÅ±zet kiosztÃ¡s, hely, a telepÃtett pluginek helye, a telepÃtett pluginek listÃ¡ja, hÃ¡lÃ³zati Ã¡llapota, kÃ©pernyÅ irÃ¡nyÃtottsÃ¡ga, oldal specifikus nagyÃtÃ¡s szintek, tÃ¡mogatott fÃ¡jltÃpusok, rendszerszÃnek, Ã©s WebGL kÃ©pessÃ©gek,"> +<!ENTITY torbutton.prefs.sec_caption "BiztonsÃ¡gi szint"> +<!ENTITY torbutton.prefs.sec_caption_tooltip "A BiztonsÃ¡gi CsÃºszÃ³ka lehetÅvÃ© tesz, hogy kikapcsoljon olyan bÃ¶ngÃ©szÅ funkcionalitÃ¡sokat, amik sebezhetÅvÃ© teszik a tÃ¶rÃ©si kÃsÃ©rletekben."> +<!ENTITY torbutton.prefs.sec_standard_label "NormÃ¡l"> +<!ENTITY torbutton.prefs.sec_standard_description "Minden Tor BÃ¶ngÃ©szÅ Ã©s weboldal szolgÃ¡ltatÃ¡s engedÃ©lyezve."> +<!ENTITY torbutton.prefs.sec_safer_label "BiztonsÃ¡gosabb"> +<!ENTITY torbutton.prefs.sec_safer_description "Azon weboldal szolgÃ¡ltatÃ¡sok tiltÃ¡sa, amelyek tÃ¶bbnyire veszÃ©lyesek, ami nÃ©hÃ¡ny oldal mÅ±kÃ¶dÃ©sÃ©nek problÃ©mÃ¡it okozhatja."> +<!ENTITY torbutton.prefs.sec_safer_list_label "A biztonsÃ¡gosabb beÃ¡llÃtÃ¡s utÃ¡n_"> +<!ENTITY torbutton.prefs.sec_safest_label "LegbiztonsÃ¡gosabb"> +<!ENTITY torbutton.prefs.sec_safest_description "Csak azon weboldal szolgÃ¡ltatÃ¡sok engedÃ©lyezÃ©se, amelyek a statikus, vagy alap szolgÃ¡ltatÃ¡sokhoz szÃŒksÃ©gesek. Ezek a beÃ¡llÃtÃ¡sok Ã©rintik a kÃ©peket, mÃ©diÃ¡kat Ã©s scripteket."> +<!ENTITY torbutton.prefs.sec_safest_list_label "A biztonsÃ¡gosabb beÃ¡llÃtÃ¡s utÃ¡n:"> +<!ENTITY torbutton.prefs.sec_learn_more_label "TovÃ¡bbi informÃ¡ciÃ³"> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "A JavaScript tiltott a nem-HTTPS oldalkon."> +<!ENTITY torbutton.prefs.sec_js_disabled "A JavaScript alapÃ©rtelmezetten tiltott minden oldalon."> +<!ENTITY torbutton.prefs.sec_limit_typography "NÃ©hÃ¡ny betÅ±tÃpus Ã©s matematikai szimbÃ³lum tiltÃ¡sra kerÃŒlt."> +<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "NÃ©hÃ¡ny betÅ±tÃpus, ikon Ã©s matematikai szimbÃ³lum Ã©s a kÃ©pek tiltÃ¡sra kerÃŒltek."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "AudiÃ³ Ã©s videÃ³ (HTML5 mÃ©dia) kattintÃ¡sra indul."> +<!ENTITY torbutton.circuit_display.title "Tor Ã¡ramkÃ¶r"> +<!ENTITY torbutton.circuit_display.new_circuit "Ãj Tor Ã¡ramkÃ¶r ehhez az oldalhoz"> diff --git a/src/chrome/locale/hu/torbutton.properties b/src/chrome/locale/hu/torbutton.properties index 722f45ee..9f851da7 100644 --- a/src/chrome/locale/hu/torbutton.properties +++ b/src/chrome/locale/hu/torbutton.properties @@ -1,27 +1,55 @@ +torbutton.circuit_display.internet = Internet +torbutton.circuit_display.ip_unknown = IP cÃm ismeretlen +torbutton.circuit_display.onion_site = Onion oldal +torbutton.circuit_display.this_browser = Ez a bÃ¶ngÃ©szÅ +torbutton.circuit_display.relay = ElosztÃ³ +torbutton.circuit_display.tor_bridge = HÃd +torbutton.circuit_display.unknown_country = Ismeretlen orszÃ¡g +torbutton.circuit_display.guard = År +torbutton.circuit_display.guard_note = Az [Guard] csomÃ³pont nem vÃ¡ltozik. +torbutton.circuit_display.learn_more = TovÃ¡bbi informÃ¡ciÃ³ +torbutton.content_sizer.margin_tooltip = A Tor Browser ezt a margÃ³t adja hozzÃ¡, hogy a magassÃ¡ga Ã©s a szÃ©lessÃ©ge az ablaknak kevÃ©sbÃ© eltÃ©rÅ legyen, Ãgy csÃ¶kkenti az online tevÃ©kenysÃ©gÃ©nek nyomon kÃ¶vethetÅsÃ©gÃ©t. torbutton.panel.tooltip.disabled = Kattintson rÃ¡ a Tor bekapcsolÃ¡sÃ¡hoz torbutton.panel.tooltip.enabled = Kattintson rÃ¡ a Tor kikapcsolÃ¡sÃ¡hoz torbutton.panel.label.disabled = Tor kikapcsolva torbutton.panel.label.enabled = Tor bekapcsolva extensions.torbutton(a)torproject.org.description = A Torbutton egy gombot biztosÃt a Tor beÃ¡llÃtÃ¡sok mÃ³dosÃtÃ¡sÃ¡hoz Ã©s a gyors Ã©s kÃ¶nnyÅ± takarÃtÃ¡sÃ¡hoz a privÃ¡t bÃ¶ngÃ©szÃ©si adatoknak. -torbutton.popup.external.title = KÃŒlsÅ tartalom betÃ¶ltÃ©se? -torbutton.popup.external.app = Egy kÃŒlsÅ alkalmazÃ¡s szÃŒksÃ©ges a kezelÃ©shez:\n -torbutton.popup.external.note = \nMEGJEGYZÃS: A kÃŒlsÅ alkalmazÃ¡sok alaphelyzetben NEM biztonsÃ¡gosak Ã©s felfedhetik kilÃ©tÃ©t.\n -torbutton.popup.external.suggest = \nHa ez a fÃ¡jl nem megbÃzhatÃ³, akkor jobb, ha lementi Ã©s megtekinti hÃ¡lÃ³zati kapcsolat nÃ©lkÃŒl vagy egy virtuÃ¡lis gÃ©pben, vagy Ãºgy is dÃ¶nthet, hogy egy Ã¡tlÃ¡tszÃ³ Tor proxy-t hasznÃ¡l, mint pÃ©ldÃ¡ul a Tails LiveCD vagy a torsocks.\n -torbutton.popup.launch = AlkalmazÃ¡s indÃtÃ¡sa +torbutton.popup.external.title = TÃ¶ltse le a kÃŒlsÅ fÃ¡jl tÃpust? +torbutton.popup.external.app = A Tor Browser nem tudja megjelenÃteni ezt a fÃ¡jlt. Egy mÃ¡sik alkalmazÃ¡ssal kell megnyitnod.\n\n +torbutton.popup.external.note = NÃ©hÃ¡ny fÃ¡jl kÃ©pes alkalmazÃ¡sokat az internethez kapcsÃ³dtatni Tor hasznlÃ¡lata nÃ©lkÃŒl.\n\n +torbutton.popup.external.suggest = Hogy biztonsÃ¡gban legyen, a letÃ¶ltÃ¶tt fÃ¡jlokat Csak offlinekÃ©nt vagy Tor Live CD-ami olyan mint a Tail- hasznÃ¡latÃ¡val nyissa meg.\n +torbutton.popup.launch = FÃ¡jl letÃ¶ltÃ©se torbutton.popup.cancel = MÃ©gse -torbutton.popup.dontask = Mindig indÃtsa az alkalmazÃ¡sokat mostantÃ³l -torbutton.popup.prompted_language = A mÃ©g tÃ¶bb adatvÃ©delem Ã©rdekÃ©ben a Torbutton kÃ©rheti a weboldaltÃ³l, hogy angol nyelvÅ± oldalt szolgÃ¡ljon ki. Ez azt jelenti, hogy a sajÃ¡t nyelve helyet az oldal angolul jelenhet meg.\n\nSzeretnÃ© kÃ©rni a magasabb biztonsÃ¡g Ã©rdekÃ©ben az angol nyelvÅ± oldalak lekÃ©rÃ©sÃ©t? -torbutton.popup.no_newnym = A Torbutton nem tud biztonsÃ¡gosan Ãj szemÃ©lyazonossÃ¡got adni. Nincs hozzÃ¡fÃ©rÃ©se a Tor vezÃ©rlÅ porthoz.\n\nNem a Tor bÃ¶ngÃ©szÅ csomagot hasznÃ¡lja? +torbutton.popup.dontask = Automatikusan letÃ¶lti a fÃ¡jlt most innen +torbutton.popup.no_newnym = A Torbutton nem tud biztonsÃ¡gosan Ãj szemÃ©lyazonossÃ¡got adni. Nincs hozzÃ¡fÃ©rÃ©se a Tor vezÃ©rlÅ porthoz.\n\nNem a Tor Browser csomagot hasznÃ¡lja? +torbutton.security_settings.menu.title = BiztonsÃ¡gi beÃ¡llÃtÃ¡sok torbutton.title.prompt_torbrowser = Fontos Torbutton informÃ¡ciÃ³ -torbutton.popup.prompt_torbrowser = A Torbutton most mÃ¡r mÃ¡skÃ©pp mÅ±kÃ¶dik: nem kapcsolhatÃ³ ki tÃ¶bbÃ©.\n\nAzÃ©rt hoztok ezt a dÃ¶ntÃ©st, mert nem biztonsÃ¡gos egy olyan bÃ¶ngÃ©szÅbÅl Torbuttont hasznÃ¡lni, amely Tor hasznÃ¡latÃ¡n kÃvÃŒli is bÃ¶ngÃ©szÃ©sre hasznÃ¡lt. TÃºl soh hiba tÃ¶rtÃ©nhet, amit mÃ¡skÃ©pp nem tudunk javÃtani.\n\nHa szeretnÃ© a Firefox-ot normÃ¡lisan hasznÃ¡lni, akkor a Torbutton-t el kell tÃ¡volÃtania, Ã©s helyette letÃ¶lteni a Tor BÃ¶ngÃ©szÅ Csomagot. Az adatvÃ©delmi beÃ¡llÃtÃ¡sai a Tor BÃ¶ngÃ©szÅnek tovÃ¡bbÃ¡ magasabbak, mint a normÃ¡lis Firefox-nak, mÃ©g akkor is, ha a Firefox Torbutton-nal kerÃŒlt egyÃŒtt felhasznÃ¡lÃ¡sra.\n\nA Torbutton eltÃ¡volÃtÃ¡sÃ¡hoz navigÃ¡ljon az EszkÃ¶zÃ¶k>KiegÃ©szÃtÅk>KiterjesztÃ©sek menÃŒpontba., majd nyomja meg az EltÃ¡volÃtÃ¡s gombot a Torbutton mellett. +torbutton.popup.prompt_torbrowser = A Torbutton most mÃ¡r mÃ¡skÃ©pp mÅ±kÃ¶dik: nem kapcsolhatÃ³ ki tÃ¶bbÃ©.\n\nAzÃ©rt hoztok ezt a dÃ¶ntÃ©st, mert nem biztonsÃ¡gos egy olyan bÃ¶ngÃ©szÅbÅl Torbuttont hasznÃ¡lni, amely Tor hasznÃ¡latÃ¡n kÃvÃŒli is bÃ¶ngÃ©szÃ©sre hasznÃ¡lt. TÃºl soh hiba tÃ¶rtÃ©nhet, amit mÃ¡skÃ©pp nem tudunk javÃtani.\n\nHa szeretnÃ© a Firefox-ot normÃ¡lisan hasznÃ¡lni, akkor a Torbutton-t el kell tÃ¡volÃtania, Ã©s helyette letÃ¶lteni a Tor Browser Csomagot. Az adatvÃ©delmi beÃ¡llÃtÃ¡sai a Tor Browser-nek tovÃ¡bbÃ¡ magasabbak, mint a normÃ¡lis Firefox-nak, mÃ©g akkor is, ha a Firefox Torbutton-nal kerÃŒlt egyÃŒtt felhasznÃ¡lÃ¡sra.\n\nA Torbutton eltÃ¡volÃtÃ¡sÃ¡hoz navigÃ¡ljon az EszkÃ¶zÃ¶k>KiegÃ©szÃtÅk>KiterjesztÃ©sek menÃŒpontba., majd nyomja meg az EltÃ¡volÃtÃ¡s gombot a Torbutton mellett. torbutton.popup.short_torbrowser = Fontos Torbutton informÃ¡ciÃ³!\n\na Torbutton most mÃ¡r mindig engedÃ©lyezett.\n\nKattintson a Torbutton-ra tovÃ¡bbi informÃ¡ciÃ³kÃ©rt. torbutton.popup.confirm_plugins = A kiegÃ©szÃtÅk, , mint a Flash sÃ©rthetik az anonimitÃ¡st Ã©s az adatbiztonsÃ¡got.\n\nEzek ezenkÃvÃŒl megkerÃŒlhetik a Tor-t, hogy felfedjÃ©k az aktuÃ¡lis helyÃ©t Ã©s IP cÃmÃ©t.\n\nBiztos, hogy szeretnÃ© engedÃ©lyezni ezeket a kiegÃ©szÃtÅket?\n torbutton.popup.never_ask_again = Ne kÃ©rdezze tÃ¶bbÃ© +torbutton.popup.confirm_newnym = A Tor Browser becsukja az Ã¶sszes ablakot Ã©s fÃŒlet. Minden weboldalkapcsolat megszakad.\n\nÃjraindÃtsuk a Tor Browser-t, hogy alaphelyzetbe Ã¡llÃtsuk szemÃ©lyazonossÃ¡gÃ¡t?\n\n + +torbutton.maximize_warning = A Tor Browser teljes mÃ©retÅ±vÃ© Ã¡llÃtÃ¡sa engedÃ©lyt adhat a weboldalaknak arra, hogy megÃ¡llapÃtsÃ¡k a monitor mÃ©retÃ©t, amit felhasznÃ¡lhatnak az Ãn kÃ¶vetÃ©sÃ©hez. Azt javasoljuk, hogy tartsa meg a Tor Browser alapÃ©rtelmezett ablakmÃ©retÃ©t. # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=Ez a weboldal (%S) megprÃ³bÃ¡l egy kÃ©p adatot elÃ©rni egy rÃ©tegen. Mivel a rÃ©teg kÃ©p hasznÃ¡lhatÃ³ a szÃ¡mÃtÃ³gÃ©p felderÃtÃ©sÃ©re, ÃŒres kÃ©p adat lett visszakÃŒldve ez alkalommal. -canvas.allow=A jÃ¶vÅben engedÃ©lyez +canvas.siteprompt=Ez az oldal (%S) megprÃ³bÃ¡l HTML5 kÃ©pvÃ¡szon adatokat kicsomagolni, ami a szÃ¡mÃtÃ³gÃ©pe egyedi azonosÃtÃ¡sÃ¡ra lehet alkalmas.\n\nMegengedje a Tor Browser a HTML5 vÃ¡szon kÃ©p informÃ¡ciÃ³k kiemelÃ©sÃ©t? +canvas.notNow=Most nem +canvas.notNowAccessKey=N +canvas.allow=Megengedi a jÃ¶vÅbe canvas.allowAccessKey=J -canvas.never=Soha ennÃ©l az oldalnÃ¡l +canvas.never=Soha ehhez az oldalhoz (ajÃ¡nlott) canvas.neverAccessKey=S + +# Profile/startup error messages. Strings are kept here for ease of translation. +# LOCALIZATION NOTE: %S is the application name. +profileProblemTitle=%S Profile problÃ©ma +profileReadOnly=Nem tudja futtatni a %S -t csak olvashatÃ³ fÃ¡jlrendszerrÅl. KÃ©rem mÃ¡solja %S-t egy mÃ¡sik helyre, mielÅtt hasznÃ¡lja. +profileReadOnlyMac=Nem tudja futtatni a %S -t csak olvashatÃ³ fÃ¡jlrendszerrÅl. KÃ©rem mÃ¡solja %S-t az Asztalra, vagy az AlkalmazÃ¡sok mappÃ¡ba, mielÅtt hasznÃ¡lja. +profileAccessDenied=%S nem rendelkezik jogosultsÃ¡ggal a profil elÃ©rÃ©sÃ©hez. KÃ©rem Ã¡llÃtsa be a fÃ¡jl rendsze jogosultsÃ¡gokat, majd prÃ³bÃ¡lja Ãºjra. +profileMigrationFailed=%S lÃ©tezÅ profil migrÃ¡ciÃ³ja nem sikerÃŒlt.\nÃj beÃ¡llÃtÃ¡sokat fogunk hasznÃ¡lni. + +# .Onion Page Info prompt. Strings are kept here for ease of translation. +pageInfo_OnionEncryptionWithBitsAndProtocol=TitkosÃtott kapcsolat (Onion szolgÃ¡ltatÃ¡s, %1$S, %2$S bites kulcsok, %3$S) +pageInfo_OnionEncryption=TitkosÃtott kapcsolat (Onion szolgÃ¡ltatÃ¡s) diff --git a/src/chrome/locale/ka/aboutDialog.dtd b/src/chrome/locale/ka/aboutDialog.dtd new file mode 100644 index 00000000..a4879555 --- /dev/null +++ b/src/chrome/locale/ka/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName;-áá¡ ášááá¥áááááá"> + +<!ENTITY project.tpoLink "&vendorShortName;"> +<!ENTITY project.end ", á§áááááááá á ááááááá¡ áááŠáááá¡ ááá áášá, ááá¢áá ááá¢ášá áá¥áááá ááá ááá£ááááá¡á áá ááááá¡á£á€ááááá¡ á£áá á£ááááá¡áá§áá€áá."> + +<!ENTITY help.start "ááá®ááá ááá ááá¡áááá ááááá?"> + +<!ENTITY help.donateLink "ááááŠáá ášáááá¬áá á£áááá"> +<!ENTITY help.or "áá"> + +<!ENTITY help.getInvolvedLink "ášáááááááá áááá"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "áááá®áááá ááá¥áá?"> + +<!ENTITY bottomLinks.grow "áááá®ááá áá Tor á¥á¡ááá¡ ááá€áá áááááášá!"> + +<!ENTITY bottomLinks.license "á¡ááááªááááá áááááªááááá"> +<!ENTITY tor.TrademarkStatement "âTorâ áá âOnion Logoâ á¬áá áááááááá¡ Tor Project Inc-áá¡ áá£ááááá á¡ááááá á ááášáááá¡."> diff --git a/src/chrome/locale/ka/aboutTBUpdate.dtd b/src/chrome/locale/ka/aboutTBUpdate.dtd new file mode 100644 index 00000000..f8852666 --- /dev/null +++ b/src/chrome/locale/ka/aboutTBUpdate.dtd @@ -0,0 +1,10 @@ +<!ENTITY aboutTBUpdate.title "Tor-áá áá£ááá áá¡ ááááá®áááá"> +<!ENTITY aboutTBUpdate.updated "Tor-áá áá£ááá á ááááá®áááá£ááá."> +<!ENTITY aboutTBUpdate.linkPrefix "áá ááááášááááá¡ ášáá¡áá®áá á£áá®ááá¡á ááá€áá áááªááá¡ ááá¡ááŠáááá,"> +<!ENTITY aboutTBUpdate.linkLabel "áá¬áááá á©áááá¡ áááá¡ááá¢á¡"> +<!ENTITY aboutTBUpdate.linkSuffix "."> +<!ENTITY aboutTBUpdate.changeLogHeading "áªááááááááá:"> + +<!ENTITY aboutTBUpdate.circuitDisplayHeading "áááášáá áá¡ á¬á áááá¡ áá á ááááá®áááá£áá ááá á¡áá®áá"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "Tor-áá¡ áááášáá áá¡ á¬á áááá¡ áá áá áááááá ášáááªáááá áá ááá¢áá ááá£áá¯áááá¡áá! ááá¬ááááá á¡ááá¢áá¡ ááááááááááá¡ á¡áááá®áá (ááá¡áááá ááááá¡ ááááá¡ ááá áªá®ááá ááááááá¡ááá£á) áŠáááááá, ááááá®áááá£áá á¬á áááá¡ áá áá¡ ááááá¡áá©áááá."> +<!ENTITY aboutTBUpdate.learnMore "áá®áááá áá áªááá"> diff --git a/src/chrome/locale/ka/aboutTor.dtd b/src/chrome/locale/ka/aboutTor.dtd index 9f14022b..f232c0ba 100644 --- a/src/chrome/locale/ka/aboutTor.dtd +++ b/src/chrome/locale/ka/aboutTor.dtd @@ -1,47 +1,42 @@  -<!ENTITY aboutTor.title "About Tor"> - -<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date."> -<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update."> - -<!ENTITY aboutTor.check.label "Test Tor Network Settings"> - -<!ENTITY aboutTor.success.label "Congratulations!"> -<!ENTITY aboutTor.success2.label "This browser is configured to use Tor."> -<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously."> -<!ENTITY aboutTor.failure.label "Something Went Wrong!"> -<!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> -<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact "> -<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> -<!ENTITY aboutTor.failure3suffix.label "."> - -<!ENTITY aboutTor.search.label "Search"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> -<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> - -<!ENTITY aboutTor.torInfo1.label "Additional Info:"> -<!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> -<!ENTITY aboutTor.torInfo3.label "Exit Node:"> -<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors."> -<!ENTITY aboutTor.whatnextQuestion.label "What Next?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> -<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous Â»"> -<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.helpInfo1.label "You Can Help!"> -<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> -<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node Â»"> -<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services Â»"> -<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "Make a Donation Â»"> -<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> - -<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy."> -<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project Â»"> -<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> +<!ENTITY aboutTor.title "Tor-áá¡ ášáá¡áá®áá"> + +<!ENTITY aboutTor.ready.label "áááááá®á£ááá. á£á¡áá€á áá®áá."> +<!ENTITY aboutTor.ready2.label "áá¥ááá áááá á®áá á áá¡áá€áááášá á§áááá ááá¢áá á£á¡áá€á áá®á áá ááá ááá áá áá£ááá áá¡ ááááá§áááááá¡áááá¡."> +<!ENTITY aboutTor.failure.label "á ááŠááª á áááá ááá áá!"> +<!ENTITY aboutTor.failure2.label "Tor áá áá£ášáááá¡ áá áá áá£ááá ášá."> + +<!ENTITY aboutTor.search.label " á«áááá DuckDuckGo-áá"> +<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> + +<!ENTITY aboutTor.torbrowser_user_manual_questions.label "áááá®áááá ááá¥áá?"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "ááááªáááá Tor-áá áá£ááá áá¡ á¡áá®áááá«áŠááááááá¡ Â»"> + +<!ENTITY aboutTor.torbrowser_user_manual.accesskey "á®"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor-áá áá£ááá áá¡ á¡áá®áááá«áŠáááááá"> + +<!ENTITY aboutTor.tor_mission.label "Tor-áá ááá¥á¢á á¬áá áááááááá¡ 501(c)(3) áá áááááááááá áá áááááááªááá¡, á ááááááª á®ááá¡ á£á¬á§ááá¡ ááááááááá¡ á£á€ááááááá¡ áááªááá¡á áá ááááá¡á£á€ááááá¡ á®áá áá¡á®áá¡ ááá£áá¯áááá¡áááá¡, á£á€áá¡á áá áŠáá á¬á§áá áá¡ áá¥ááá, áááááááá¡á áá ááá ááá áááááªáááááá¡ áááááŠááááááá¡ááá áááªá£áá á¢áá¥áááááááááá¡ ášáá¥ááááá áá ášááá£ášáááááá, áááááá ášáá£ááŠá£áááá á¬áááááá¡á áá ááááá§áááááá¡ á£áá á£ááááá§áá€áá, ášááááááá áááááááááá áá áá£ášááááá , á¡ááááááááááá¡ áªáááááá áááá¡ ááááá¡ áá¡ááááŠáááááá."> +<!ENTITY aboutTor.getInvolved.label "ášáááááááá áááá Â»"> +<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> + +<!ENTITY aboutTor.newsletter.tagline "ááááŠáá á¡ááá®ááááá Tor-áá¡ááá, ááá ááááá áá¥áááá¡ á¡áá€áá¡á¢á á§á£áášá."> +<!ENTITY aboutTor.newsletter.link_text "áááááá¬áá áá Tor-áá¡ á¡ááá®ááááá."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: á¡áá«áááá á áªáá€á ááášá"> + +<!ENTITY aboutTor.donationBanner.line2a "áááááááá¡ áááááŠááááááá¡ááá áááªáá á¡áááá áááá¡ á®ááá®áá¡ á¡ááá ááááá¡."> +<!ENTITY aboutTor.donationBanner.line2b "áááá£áá¯áááá¡áá ááááááááá¡ á£á€ááááááá¡ áááªáá."> +<!ENTITY aboutTor.donationBanner.line2c "áá®áá á ááá£ááá áá ááááá¡á£á€ááááá¡."> +<!ENTITY aboutTor.donationBanner.line2d "ááááªáááá áááááááááá ááááááááá¡ ááá ááá áááááªááááá."> +<!ENTITY aboutTor.donationBanner.line2e "ášááááá á©á£ááá Tor á«áááá á."> +<!ENTITY aboutTor.donationBanner.line2f "á©ááá áááá¡áááá áááá áá¥áááá áááá áášá ááááá!"> + +<!ENTITY aboutTor.donationBanner.line3 "ááááªáá ááŠáá¡áá áá Mozilla ááááá áááááá¡ áá¥áááá¡ ášáááá¬áá á£ááááá¡."> + +<!ENTITY aboutTor.donationBanner.buttonA "áááá®áá¡ áááŠááá áá®áááá"> +<!ENTITY aboutTor.donationBanner.buttonB "á©ááá á¬áááááá¡ ááŠááášááá"> diff --git a/src/chrome/locale/ka/brand.dtd b/src/chrome/locale/ka/brand.dtd index 59f665e8..28e23451 100644 --- a/src/chrome/locale/ka/brand.dtd +++ b/src/chrome/locale/ka/brand.dtd @@ -2,7 +2,14 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "Tor Browser"> -<!ENTITY brandFullName "Tor Browser"> -<!ENTITY vendorShortName "Tor Project"> -<!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> +<!ENTITY brandShorterName "Tor-áá áá£ááá á"> +<!ENTITY brandShortName "Tor-áá áá£ááá á"> +<!ENTITY brandFullName "Tor-áá áá£ááá á"> +<!ENTITY vendorShortName "Tor-áá ááá¥á¢á"> +<!ENTITY trademarkInfo.part1 "Firefox áá ááá¡á ááááááá á¬áá áááááááá¡ Mozilla-á¡ á€ááááá¡ á¡ááááá á ááášáááá¡."> + + +<!ENTITY plugins.installed.find "áááá¬ááááá ááá§ááááá£áá á¡áá¡á¢ááá£á á áááá£ááááá¡ á©áá¡áá¢ááá ááá"> +<!ENTITY plugins.installed.enable "áááá£ááááá¡ á©áá ááá"> +<!ENTITY plugins.installed.disable "áááá£ááááá¡ ááááá ááá"> +<!ENTITY plugins.installed.disable.tip "áááá¬ááááá á¡áá¡á¢ááá£á á áááá£ááááá¡ á©áá¢ááá áááá¡ áá¡áá ááááááá"> diff --git a/src/chrome/locale/ka/brand.properties b/src/chrome/locale/ka/brand.properties index f63def38..b825e912 100644 --- a/src/chrome/locale/ka/brand.properties +++ b/src/chrome/locale/ka/brand.properties @@ -2,14 +2,15 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=Tor Browser -brandFullName=Tor Browser -vendorShortName=Tor Project +brandShorterName=Tor-áá áá£ááá á +brandShortName=Tor-áá áá£ááá á +brandFullName=Tor-áá áá£ááá á +vendorShortName=Tor-áá ááá¥á¢á -homePageSingleStartMain=Firefox Start, a fast home page with built-in search -homePageImport=Import your home page from %S +homePageSingleStartMain=Firefox Start, á¡á¬á áá€á á¡áá¬á§áá¡á áááá áá á©áášááááá£áá á«ááááá¡ ááááá +homePageImport=ááááááá¢áááá áá¥áááá á¡áá¬á§áá¡á áááá áá %S-áááá -homePageMigrationPageTitle=Home Page Selection -homePageMigrationDescription=Please select the home page you wish to use: +homePageMigrationPageTitle=á¡áá¬á§áá¡á áááá ááá¡ áá á©ááá +homePageMigrationDescription=ááá®ááá ááá á©ááá á¡áá¡á£á áááá á¡áá¬á§áá¡á áááá áá: syncBrandShortName=Sync diff --git a/src/chrome/locale/ka/browserOnboarding.properties b/src/chrome/locale/ka/browserOnboarding.properties new file mode 100644 index 00000000..2490b234 --- /dev/null +++ b/src/chrome/locale/ka/browserOnboarding.properties @@ -0,0 +1,54 @@ +# Copyright (c) 2018, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +onboarding.tour-tor-welcome=ááááá¡ááááááá +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=ááááªáááá ááááááá§á£á áááá áá áªááááá¡ááá§ááá áááá +onboarding.tour-tor-privacy.description=Tor-áá áá£ááá á ááªáááááááá¡ á¡ááá¢áá¡ á€á£ááá£ášááá¡ áá ášááá¡ ááááá®á£áááá£áá áááá ááááá¡ áá¡á¢áá ááá¡ ááá®á£á ááá¡áááááá. áá¡áááá¡á ááááá¢ááá£áá áªááááááááá á£áá á£ááááá§áá€á¡ ááá ááá áááááªáááááá¡ áááªááá¡á áá á£á¡áá€á áá®ááááá¡ áááŠáá á®áá áá¡á®á¡ áá áá£ááá ášá. ááá¬ááááá âTor-á¥á¡áááâ áá áá®áááá, áá£ á áááá á®áááá áááªáá á¥á¡áááá¡ áááááá. +onboarding.tour-tor-privacy.button=Tor-á¥á¡ááášá ášáá¡ááá + +onboarding.tour-tor-network=Tor-á¥á¡ááá +onboarding.tour-tor-network.title=áá¡áá áááááá ááááá£áááááááá, áá áááá áááá£áá áááá áááááááá¡ááá áááªá£áá á¥á¡áááá. +onboarding.tour-tor-network.description=Tor-áá áá£ááá áá á£áááášáá ááááá Tor-á¥á¡ááá¡, á ááááá¡ áá£ášááááá¡ááª á£áá á£ááááá§áá€á¡ áááá¡áááá ááá®áááá¡á, ááááá áá¡áá€áááá¡ ááá¡ášá¢áááá. áááá¡á®ááááááá VPN-áá¡ááá, áá ášáááá®ááááášá áá ááá¬ááá áªááááá£áá ááá áá¡ áá áá ááá£ááá¡ ááááá áá áá áááá¡áá á®áá á áááááááááá£áá, áááá ááááá¡ áááááááá¡ ááá£áááŠáááááááá ááááá®á£ááááá¡áá¡. +onboarding.tour-tor-network.button=á¬á áááá¡ á¡áá©ááááááá áá ááá ááááá¡ááá + +onboarding.tour-tor-circuit-display=á¬á áááá¡ á¡áá©áááááááá áá á +onboarding.tour-tor-circuit-display.title=áá®áááá áá¥áááá áá á®á. +onboarding.tour-tor-circuit-display.description=áááááá£á ááá¡áááá ááá ááááá¡áááá¡áá¡, áááááªááááá áááááªááááá á¡á á£ááá ááá áááá¥ááááá áá áášáá€á ááá, áá¡áá€áááá¡ ááááá¡áááá á¬áá á¢áááááá ášáááá®ááááá ášáá á©áá£áá á¡ááá Tor-ááááááªáááá ášáá¥áááá á¬á ááášá. áááá¡ááá¢ááá¡ áá ášáá£á«áááá ááááááááá, á¡ááááá á£áááášáá ááááá. áá®ááá á¬á áááá¡ áááá®ááááá¡áááá¡, á¬á áááá¡ áá áášá ááá¬ááááá âáá®ááá á¬á ááá áá á¡ááá¢áá¡áááá¡â. +onboarding.tour-tor-circuit-display.button=áá á®áá¡ ááá®áá + +onboarding.tour-tor-security=á£á¡áá€á áá®áááá +onboarding.tour-tor-security.title=áááá ááá á¡ááá£ááá áááá®áááááááááá¡ +onboarding.tour-tor-security.description=á©ááá áá¡ááá ááááááááá ááááá¢áááá ááá áááá¢á ááá¡, áá áá£ááá áá¡ á£á¡áá€á áá®ááááá¡ ááááá á£á€á á ááá¢áá áá¡ááááŠáááááá. á©áááá á£á¡áá€á áá®ááááá¡ ááá áááá¢á ááá, á¡áášá£áááááá¡ ááá«áááá ášáááŠá£ááá áááá ááá¡ áá¡ ááá¬ááááá, á áááááááª áá¥áááá¡ áááááá£á¢áá áá ášáá¢áááá¡áááá¡ ášááá«áááá áááááá§áááá. ááá¬ááááá á¥ááááá áá áá®áááá áá ááá áááá¢á áááá¡ ášáá¡áá®áá áá áªááá. +onboarding.tour-tor-security.button=ááá áááá¢á áááá¡ ááááá®áááá + +onboarding.tour-tor-expect-differences=ááááá§áááááá¡ááá áááááášáá ááá£áá á¡ááááá®ááá +onboarding.tour-tor-expect-differences.title=ááá¡áááááááá áªááááááááá. +onboarding.tour-tor-expect-differences.description=Tor-áá¡ áááá ášááááááááááá£áá á£á¡áá€á áá®ááááá¡á áá ááá ááá áááááªáááááá¡ áááªááá¡ á¡áášá£áááááááá, ášáá¡áá«ááá ááªáá á áªááááááááá áááááá¬áááá¡ áááá ááááá¡ ááááá®á£ááááá¡áá¡. áááááá áá á áá áªáá¢á ášáááááááá áá áá¥ááá áááá ášáá á©áá£áá á£á¡áá€á áá®ááááá¡ ááááááá áááááááááá á, áááá ááááá¡ áªááááá£áá ááá¬ááááá áá ááá£ášááááá¡ áá áá á©ááá¢ááá áááá. áááá¡ááá, á¡ááá¢áááá¡ ááá¬áááá, ášáá¡áá«ááá á®ášáá áá ááááá¬ááá áááá¡ áá ááá¡á¢á£á ááá á áá áááááááá á®áá á áá áá á á áááá¢á. +onboarding.tour-tor-expect-differences.button=áá®áááá á®.á.á. + +onboarding.tour-tor-onion-services=Onion-áááá¡áá®á£á ááááá +onboarding.tour-tor-onion-services.title=áá§áááá ááá¢áá-áááªá£áá. +onboarding.tour-tor-onion-services.description=Onion-áááá¡áá®á£á ááááá á¬áá áááááááá¡ á¡ááá¢ááá¡ .onion áááááááááá, á ááááááª áááá¡ááá£áá ááá£ááá áááŠáá á£á¡áá€á áá®ááááá¡ ááááá¡ á¡áááááááá¡ ááá¡áááááá¡ áááááááá¡áááááá¡ááª áá áááá®áááááá¡ááª, ááá ášáá áá¡ áªáááá£á áá¡ááá ááááá¡ áá áááááá¡ ááááá¢áááá ášáá¡áá«ááááááááá¡. Onion-áááá¡áá®á£á ááááá á¡áášá£áááááá¡ áá«áááá¡ ááááá¡áááá á¡, ášáááááá¡á áá áááá¡áá®á£á ááááá áááá®ááá áááááá¡ áááá¬áááá¡ áááááááá¡ ááá£áá®áááá. ááá¬ááááá á¥á áááá, DuckDuckGo-á¡ onion-áááá ááá¡ ááá¡áááá®á£áááááá. +onboarding.tour-tor-onion-services.button=áá¬áááá Onion-á¡ + +# Circuit Display onboarding. +onboarding.tor-circuit-display.next=ášáááááá +onboarding.tor-circuit-display.done=áááááá +onboarding.tor-circuit-display.one-of-three=1 â 3 +onboarding.tor-circuit-display.two-of-three=2 â 3 +onboarding.tor-circuit-display.three-of-three=3 â 3 + +onboarding.tor-circuit-display.intro.title=á áááá áá£ášáááá¡ á¬á ááááá? +onboarding.tor-circuit-display.intro.msg=á¬á ááááá áá¥ááááá ášáááá®ááááá ášáá á©áá£áá ááááááªáááááá, á áááááá¡ááª á¬áá áááááááá¡ áááá áá¡áá€áááášá áááááá£áá áááááá£á¢áá ááá, ááááá áá£ááá á¡ááááááááá Tor-á¥á¡áááá¡ áááááªáááááá¡ ááá¡áá¢áá ááááá. á¬á ááááá á¡áášá£áááááá¡ ááá«áááá, áááááá®á£ááá áááá áááá ááá ááá áááááªáááááá¡ áááªááá áá á¬ááááá ááááŠáá Onion-áááá¡áá®á£á ááááááá. + +onboarding.tor-circuit-display.diagram.title=á¬á áááá¡ áá á +onboarding.tor-circuit-display.diagram.msg=á¡á¥ááááá áááªááá£ááá ááááááªááááá, á áááááááª á¥áááá¡ á¬á ááá¡ áá á¡ááá¢áá¡ ááá¡áááá®á£áááááá. á¡á®ááááá¡á®áá á¡ááá¢áááá ááá¥áááááááá¡ ášáá áá¡ á£á áááá ááááášáá áá¡ áááááááá¡ áá¡áá ááááááá, áááááá£á á¡ááá¢áá á¬áááááá¡áááá¡ áááá¡á®áááááá£áá á¬á ááá áááááá§ááááá. + +onboarding.tor-circuit-display.new-circuit.title=áá®ááá á¬á ááá ááá¡áááá ááááá? +onboarding.tor-circuit-display.new-circuit.msg=áá£ ááá áá®áá á®ááá áááááášáá áááá¡ á¡ááá¢ááá, á ááááá¡ ááá®áááª áá¡á£á á áá ááááá áá áá¡áááááááá á©ááá¢ááá áá, ááášáá ášáááá«áááá áá áŠáááááá¡ ááááá§áááááá á®áááá®áá á©áá¢ááá ááá á¡ááá¢á áá®ááá á¬á áááá. diff --git a/src/chrome/locale/ka/torbutton.dtd b/src/chrome/locale/ka/torbutton.dtd index d8d88e49..1c5635af 100644 --- a/src/chrome/locale/ka/torbutton.dtd +++ b/src/chrome/locale/ka/torbutton.dtd @@ -1,22 +1,51 @@ -<!ENTITY torbutton.context_menu.new_identity "New Identity"> -<!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.networksettings "Open Network SettingsâŠ"> -<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> -<!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> -<!ENTITY torbutton.context_menu.cookieProtections.key "C"> -<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> -<!ENTITY torbutton.cookiedialog.lockCol "Protected"> -<!ENTITY torbutton.cookiedialog.domainCol "Host"> -<!ENTITY torbutton.cookiedialog.nameCol "Name"> -<!ENTITY torbutton.cookiedialog.pathCol "Path"> -<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie"> -<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie"> -<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie"> -<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> -<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> -<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> +<!ENTITY torbutton.context_menu.new_identity "áá®ááá ááááááá"> +<!ENTITY torbutton.context_menu.new_identity_key "á"> +<!ENTITY torbutton.context_menu.new_circuit "áá®ááá Tor-á¬á ááá áá á¡ááá¢áá¡áááá¡"> +<!ENTITY torbutton.context_menu.new_circuit_key "á¬"> +<!ENTITY torbutton.context_menu.preferences "á£á¡áá€á áá®ááááá¡ ááá áááá¢á ááá"> +<!ENTITY torbutton.context_menu.preferences.key "á£"> +<!ENTITY torbutton.context_menu.networksettings "Tor-á¥á¡áááá¡ ááá áááá¢á ááá..."> +<!ENTITY torbutton.context_menu.networksettings.key "á¥"> +<!ENTITY torbutton.context_menu.downloadUpdate "Tor-áá áá£ááá áá¡ ááááá®ááááááá ášáááá¬áááá..."> +<!ENTITY torbutton.context_menu.downloadUpdate.key "á"> +<!ENTITY torbutton.context_menu.cookieProtections "á€á£ááá£ášáááá¡ áááªáá..."> +<!ENTITY torbutton.context_menu.cookieProtections.key "á€"> +<!ENTITY torbutton.button.tooltip "áááá¬ááááá Torbutton-áá¡ ááá¡áášááááá"> +<!ENTITY torbutton.prefs.security_settings "Tor-áá áá£ááá áá¡ á£á¡áá€á áá®ááááá¡ ááá áááá¢á ááá"> +<!ENTITY torbutton.prefs.restore_defaults "áááá£ááá¡á®ááááá¡ ááŠááááá"> +<!ENTITY torbutton.prefs.custom_warning "áá¥ááá áááá áááááááá£áá ááá áááá¢á ááá áá áá£ááá ášá, áá áá ááá¡ááŠááá á£á¡áá€á áá®ááááá¡áááá¡. ááá ááá áááááªáááááá¡ á¡áááááááá áááªááá¡ á£áá á£ááááá¡áá§áá€áá, ááá á©ááá ášááá á©ááá á£á¡áá€á áá®ááááá¡ áááá£ááá¡á®áááá áááááááááá á ááááááá."> +<!ENTITY torbutton.cookiedialog.title "á€á£ááá£ášáááá¡ á£á¡áá€á áá®ááááá¡ ááá ááá"> +<!ENTITY torbutton.cookiedialog.lockCol "áááªá£ááá"> +<!ENTITY torbutton.cookiedialog.domainCol "ááá¡áááá áá"> +<!ENTITY torbutton.cookiedialog.nameCol "á¡áá®ááá"> +<!ENTITY torbutton.cookiedialog.pathCol "áááááá áááá"> +<!ENTITY torbutton.cookiedialog.protectCookie "á€á£ááá£ášáá¡ áááªáá"> +<!ENTITY torbutton.cookiedialog.removeCookie "á€á£ááá£ášáá¡ áááªááááá"> +<!ENTITY torbutton.cookiedialog.unprotectCookie "á€á£ááá£ášáá¡ áááªááá¡ ááá®á¡áá"> +<!ENTITY torbutton.cookiedialog.removeAllBut "á§ááááá¡ áááªááááá áááªá£ááááá¡ ááá áá"> +<!ENTITY torbutton.cookiedialog.saveAllCookies "áá®ááá á€á£ááá£ášáááá¡ áááªáá"> +<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "áá®ááá á€á£ááá£ášáááá¡ áááªááá¡ ášáá©áá ááá"> +<!ENTITY torbutton.prefs.restrict_thirdparty "ááá¡ááá áá®áá áá¡ á€á£ááá£ášáááá¡á áá á¡á®áá ááááááá§á£á ááááá¡ ášáááŠá£ááá"> +<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "á"> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "ááá¢áááá áá¡ á£á¯á á ááááášáá£áá, áá áá£ááá áá¡ áªááááá£áá ášáá¡áá«áááááááááá¡ áááá , áá¥ááááá á£ááááá ááá áááááááááá¡ áá¡áá ááááááá, ááááááá ááááá¡ ááááá®á£ááááá¡áá¡. ášááªááááá ášáá¡áá«ááááááááá ááááªááá¡ Blob-ááá£áááá¡, áááááªáááá¡ áá á®ááá¡, áá áá£ááá áá¡ ááášá¡, á€á£ááá£ášááá¡, á¡ááá¢áá¡ á®áá¢á£áááá¡, HTTP-áááá¡áá áááá¡, ááá£ááá¡ á¬áááá¡á¬áá ášááá áááááá¡, áááááááá áá á¡ááªááá¡, á€ááááá¡ á¬á§áá áá¡ URL-ááá¡, OCSP-áááá®áááááá¡, SharedWorker-ááá¡á á á TLS-á¡áááá¡áá¡ áááááªá®ááááá¡."> +<!ENTITY torbutton.prefs.resist_fingerprinting "áªááááá£áá á¬áá ááááááááá¡ ášááªááá, á áááááááª áááááá¡á®áááááá Tor-áá áá£ááá áá¡ á¡á®áá áááá®ááá ááááááá¡ááá"> +<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "áª"> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "ááá¢áááá áá¡ á£á¯á á ááááášáá£áá, áá¡ááá áááááªáááááá¡ ááá¡áá€áá áá, á ááááá¡ á¡áášá£ááááááááª, á¡ááá¢ááá¡ ášááá«ááááá áá¥áááá á¡á®ááááá¡ááá ááááá á©ááá, ááá ášáá áá¡áá áááááá£á¢áá áá¡ á¬áá áááááá, ááááááá¢á£á áá¡ ááááááááá, áááá¡ ááá áááá¢á ááá, ááá§ááááá£áá áááá£ááááá¡ á©áááááááááá áá áááá ááááááááááá áááá, á¥á¡áááá¡ ááááááá áááá, ááá áááá¡ ááááááá áááá áá áááááá, á¡ááá¢áá¡ ášáááááá¡áá¡ áááááá, á€ááááá¡ áá®áá áá ááá ááá á¡áá®áááá, á¡áá¡á¢áááá¡ á€áá ááá, WebGL-ášáá¡áá«ááááááááá."> +<!ENTITY torbutton.prefs.sec_caption "á£á¡áá€á áá®ááááá¡ áááá"> +<!ENTITY torbutton.prefs.sec_caption_tooltip "á£á¡áá€á áá®ááááá¡ áá¡áá á©ááá á ááá, á¡áášá£áááááá¡ ááá«áááá ááááášáá áá áá£ááá áá¡ ášáá¡áá«áááááááááá¡ ááá¬ááá, á£ááááá ááá ášááŠá¬áááá¡ ááªááááááááá¡ááá á£ááá áááááá¡ááªáááá."> +<!ENTITY torbutton.prefs.sec_standard_label "á©ááá£áááá ááá"> +<!ENTITY torbutton.prefs.sec_standard_description "Tor-áá áá£ááá áá¡á áá áááá¡ááá¢áá¡ á§áááá ášáá¡áá«ááááááá á©áá áá£ááá."> +<!ENTITY torbutton.prefs.sec_safer_label "ááá¢áá áááªá£áá"> +<!ENTITY torbutton.prefs.sec_safer_description "áááááášááá áááá¡ááá¢áá¡ á¡áá€á áá®áá¡ášáááªáááá ášáá¡áá«ááááááááá, á¡áááá áá£ááá á¡ááá¢áááá¡ ááá¬ááá ááá ááá£ášááááá¡ ááááá áá£ááá."> +<!ENTITY torbutton.prefs.sec_safer_list_label "ááá¢áá áááªá£áá ááá áááá¢á áááá¡áá¡:"> +<!ENTITY torbutton.prefs.sec_safest_label "á¡á á£áááá áááªá£áá"> +<!ENTITY torbutton.prefs.sec_safest_description "ááášáááá£ááá áá®áááá áá¡ ášáá¡áá«ááááááááá, á áááááá¡ááª á¡áááá áááá¡ á£áªááááá ášáááááá¡áá¡ áá¥ááá á¡ááá¢ááá áá á«áá ááááá áááá¡áá®á£á ááááá. áªááááááááá ášááá®ááá á¡á£á ááááá¡, á€áááááá¡á áá á¡áá ááá¢ááá¡."> +<!ENTITY torbutton.prefs.sec_safest_list_label "á¡á á£áááá áááªá£áá ááá áááá¢á áááá¡áá¡:"> +<!ENTITY torbutton.prefs.sec_learn_more_label "áá®áááá áá áªááá"> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript ááááášá£ááá HTTPS-á¡ áá áá¥ááá á§áááá á¡ááá¢áá."> +<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript ááááášá£ááá á§áááá á¡ááá¢áá áááá£ááá¡á®ááááá."> +<!ENTITY torbutton.prefs.sec_limit_typography "ášá áá€á¢áááá¡á áá ááááááá¢ááá£á á á¡áááááááááá¡ ááá¬ááá ááááášá£ááá."> +<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "ášá áá€á¢áááá¡, á®áá¢á£ááááá¡, ááááááá¢ááá£á á á¡áááááááááá¡á áá á¡á£á áááááá¡ ááá¬ááá ááááášá£ááá."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "á®áááááá áá áááááá€áááááá (HTML5) áášáááá áá®áááá ááá¬ááááááá."> +<!ENTITY torbutton.circuit_display.title "Tor-á¬á ááá"> +<!ENTITY torbutton.circuit_display.new_circuit "áá®ááá á¬á ááá áá á¡ááá¢áá¡áááá¡"> diff --git a/src/chrome/locale/ka/torbutton.properties b/src/chrome/locale/ka/torbutton.properties index ee5b1f95..21d96e32 100644 --- a/src/chrome/locale/ka/torbutton.properties +++ b/src/chrome/locale/ka/torbutton.properties @@ -1,27 +1,55 @@ -torbutton.panel.tooltip.disabled = Click to enable Tor -torbutton.panel.tooltip.enabled = Click to disable Tor -torbutton.panel.label.disabled = Tor Disabled -torbutton.panel.label.enabled = Tor Enabled -extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.external.title = Load external content? -torbutton.popup.external.app = An external application is needed to handle:\n\n -torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n -torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n -torbutton.popup.launch = Launch application -torbutton.popup.cancel = Cancel -torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? -torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.title.prompt_torbrowser = Important Torbutton Information +torbutton.circuit_display.internet = ááá¢áá ááá¢á +torbutton.circuit_display.ip_unknown = á£áªáááá IP-ááá¡áááá áá +torbutton.circuit_display.onion_site = Onion-á¡ááá¢á +torbutton.circuit_display.this_browser = áá¡ áá áá£ááá á +torbutton.circuit_display.relay = ááááááªááá +torbutton.circuit_display.tor_bridge = á®ááá +torbutton.circuit_display.unknown_country = á£áªáááá á¥ááá§ááá +torbutton.circuit_display.guard = ááªáááá +torbutton.circuit_display.guard_note = áá¥áááá [Guard] ááááá«á ášáá¡áá«ááá áá ášáááªááááá¡. +torbutton.circuit_display.learn_more = áá®áááá áá áªááá +torbutton.content_sizer.margin_tooltip = Tor-áá áá£ááá á áááá¢ááá¡ áááááá ááá¡ áááááááá, á áá áá¥áááá á€ááá¯á áá¡ á¡ááááá áá á¡ááááŠáá áááááááá ááááá á©áá£áá áá ášáá¡ááá©áááá áá§áá¡, á ááª ášáá£ááªáá ááá¡ á¡á®áááá¡, ááá¢áá ááá¢ášá áá¥áááá áááááá¡ ášáá¡áá«ááááááááá¡. +torbutton.panel.tooltip.disabled = áááááááá Tor-áá¡ á©áá¡áá ááááá +torbutton.panel.tooltip.enabled = áááááááá Tor-áá¡ ááááá¡áá ááááá +torbutton.panel.label.disabled = Tor ááááá áá£ááá +torbutton.panel.label.enabled = Tor á©áá áá£ááá +extensions.torbutton(a)torproject.org.description = Torbutton á¡áášá£áááááá¡ ááá«áááá áá áá áŠáááááá ááááá ááá Tor-áá¡ ááá áááá¢á ááá áá á¡á¬á áá€áá áááá¡á£á€ááááá ááááá®á£áááá£áá áááá ááááá¡ áááááªááááá. +torbutton.popup.external.title = á©ááááá¢ááá ááá¡ áªááááá£áá á¡áá®áá¡ á€áááá? +torbutton.popup.external.app = Tor-áá áá£ááá áá ááá á®áá á®áááá áá á€ááááá¡ ááá®á¡áá. á¡á®áá áá ááá áááá á¡áááá á ááá¡ ááá¡áá®á¡ááááá.\n\n +torbutton.popup.external.note = áááááá áá á¡áá®áá¡ á€ááááá, ášáá¡áá«ááá Tor-áá¡ áááá ááá¡ ááááá ááááááášáá áá¡ á¡á®áá áá ááá ááá ááá¢áá ááá¢ááá.\n +torbutton.popup.external.suggest = á£á¡áá€á áá®ááááá¡áááá¡, á¡áá¡á£á ááááá á©áááá¢ááá áá£áá á€ááááá¡ ááá®á¡áá, áááášáá ááá áášáá á§áá€ááá¡áá¡ áá Tor-áá¡ ááá ááááá ááá¡áášáááá ááá á¡ááá¡ ááááá§ááááá, á áááá ááªáá Tails.\n +torbutton.popup.launch = á©áááá¢ááá ááá +torbutton.popup.cancel = ááá£á¥áááá +torbutton.popup.dontask = ááá¢áááá¢á£á áá á©ááááá¢ááá ááá¡ á€áááááá ááááá áááá +torbutton.popup.no_newnym = Torbutton ááá áá®áá á®ááá¡ áá®ááá áááááááá¡ á£á¡áá€á áá®áá ááááááááá¡. á¬ááááá áá áá¥áá¡ á¬ááááá Tor-áá¡ ááá áááá¡ ááá á¢ááá.\n\nAre you running Tor Browser Bundle? +torbutton.security_settings.menu.title = á£á¡áá€á áá®ááááá¡ ááá áááá¢á ááá +torbutton.title.prompt_torbrowser = áááášááááááááá ááá€áá áááªáá Torbutton-áá¡ ášáá¡áá®áá torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. -torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n -torbutton.popup.never_ask_again = Never ask me again +torbutton.popup.confirm_plugins = áááá£áááá¡, á áááá ááªáá Flash ášáá£á«ááá á¡áá€á áá®áá¡ á¥áááš áááá§áááá¡ áá¥áááá ááá ááá áááááªááááá áá áááááááá¡ ááá£áá®ááááá.\n\náááá á¡áášá£áááááá, ášáá¡áá«ááááááá Tor-áá¡ áááá ááá¡ ááááá ááááááááá¡ áá¥áááá áááááá áááá áá IP-ááá¡áááá áá.\n\nááááááááá áá¡á£á á áááá£ááááá¡ á©áá ááá?\n\n +torbutton.popup.never_ask_again = áááááááášá ášááááá®ááá¡ ááá áášá +torbutton.popup.confirm_newnym = Tor-áá áá£ááá á ááá®á£á ááá¡ á§áááá á€ááá¯áá áá¡á áá á©áááá áá¡. á§áááá áááá¡ááá¢áá¡ á¡áááá¡á ášáá¬á§áááá.\n\náááášááá¡ á®áááá®áá Tor-áá áá£ááá á áá®ááá áááááááá¡ ááá¡ááŠáááá?\n\n + +torbutton.maximize_warning = Tor-áá áá£ááá áá¡ á¡á á£á ááá áááá ááášáá, á¡ááá¢ááá¡ á¡áášá£áááááá¡ ááá¡áªááá¡ ááááááááá áá¥áááá ááá áááá¡ áááááá, á ááª ášááá«áááá áááááá§áááá áá¥áááá¡ áááá¡ááªááááá. á©ááá ááá á©ááá ááá¢áááá Tor-áá áá£ááá áá¡ á€ááá¯áá á, áá á¡ááá£á áááááášá. # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time. -canvas.allow=Allow in the Future -canvas.allowAccessKey=A -canvas.never=Never for This Site -canvas.neverAccessKey=e +canvas.siteprompt=áááá¡ááá¢á (%S) áªáááááá¡ HTML5-áá¡ áá áá€ááá£áá ááááá¡áá®á£ááááá¡ áááááªáááááá¡ áááŠáááá¡, á ááª ášáá¡áá«ááá ááááá§ááááá£áá áá§áá¡ áá¥áááá áááááá£á¢áá áá¡ áááá¡ááªááááá.\n\nááá¡áªáá¡ Tor-áá áá£ááá áá á£á€áááá áá áááá¡ááá¢á¡, ááááŠáá¡ HTML5-áá¡ áá áá€ááá£áá ááááá¡áá®á£ááááá¡ áááááªááááá? +canvas.notNow=áá®áá áá á +canvas.notNowAccessKey=á +canvas.allow=ááášáááá áááááááášá +canvas.allowAccessKey=á +canvas.never=áá áá¡áá áá¡ áá á¡ááá¢áá (á¡áá¡á£á ááááá) +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 áá¥áááá¡ áááááá ááá áááá¡ áá áá ááá áááááá¡ á¡áá¥ááŠááááášá, ááá¡ ááááá§áááááááá. +profileAccessDenied=%S-á¡ áá áááá©ááá áá áá€ááááá á¬áááááá¡ ááááá ááá. ááá®ááá, á¡áááááááá ááááá ááá áá¥áááá á¡áá€áááá á¡áá¡á¢áááá¡ ááááá ááááá áá á¡áªáááá á®áááá®áá. +profileMigrationFailed=áá¥áááá áá á¡ááá£áá %S áá áá€áááá¡ ááááá¢ááá ááá ááá®áá á®áá.\nááááá§ááááá£áá áá¥áááá áá®ááá ááá áááá¢á ááá. + +# .Onion Page Info prompt. Strings are kept here for ease of translation. +pageInfo_OnionEncryptionWithBitsAndProtocol=áááášáá á ááášáá€á á£ááá (Onion-áááá¡áá®á£á ááá, %1$S, %2$S ááá¢áááá ááá¡ááŠááááá, %3$S) +pageInfo_OnionEncryption=áááášáá á ááášáá€á á£ááá (Onion-áááá¡áá®á£á ááá)

1 0

[torbutton/maint-2.0] Bug 28540: Use new text for 2018 donation banner
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 905d12774d553372d8db617b7fcfd9cdc91e78d6 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Nov 20 17:25:48 2018 -0800 Bug 28540: Use new text for 2018 donation banner --- src/chrome/content/aboutTor/aboutTor-content.js | 2 +- src/chrome/content/aboutTor/aboutTor.xhtml | 24 +++++++++++++++--------- src/chrome/content/torbutton.js | 2 +- src/defaults/preferences/preferences.js | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index e8f5ffa2..ccb9139d 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -72,7 +72,7 @@ var AboutTorListener = { sendAsyncMessage(that.kAboutTorHideDonationBanner); }); }); - bindPrefAndInit("extensions.torbutton.donation_banner_countdown", + bindPrefAndInit("extensions.torbutton.donation_banner_countdown2", countdown => { if (content.document && content.document.body) { content.document.body.setAttribute( diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 9256748e..52fab695 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -36,15 +36,17 @@ window.addEventListener("pageshow", function() { <div id="donation-banner-lines"> <div id="donation-banner-line1">&aboutTor.donationBanner.line1;</div> <div id="donation-banner-line2" - data-0="&aboutTor.donationBanner.line2a;" - data-1="&aboutTor.donationBanner.line2b;" - data-2="&aboutTor.donationBanner.line2c;" - data-3="&aboutTor.donationBanner.line2d;" - data-4="&aboutTor.donationBanner.line2e;" - data-5="&aboutTor.donationBanner.line2f;"> - &aboutTor.donationBanner.line2a; + data-6="&aboutTor.donationBanner.line2e;" + data-7="&aboutTor.donationBanner.line2f;" + data-8="&aboutTor.donationBanner.line2g;" + data-9="&aboutTor.donationBanner.line2h;" + data-10="&aboutTor.donationBanner.line2i;" + data-11="&aboutTor.donationBanner.line2j;"> + &aboutTor.donationBanner.line2e; </div> - <div id="donation-banner-line3">&aboutTor.donationBanner.line3;</div> + <div id="donation-banner-line3" + data-b="&aboutTor.donationBanner.line3b;"> + &aboutTor.donationBanner.line3;</div> <a id="donation-banner-button" href="https://www.torproject.org/donate/donate-sin-tbd0-0" type="button" @@ -57,13 +59,17 @@ window.addEventListener("pageshow", function() { </div> <script type="text/javascript"> <![CDATA[ - let lineChoice = Math.floor(Math.random() * 6); + let lineChoice = 6 + Math.floor(Math.random() * 6); let line2 = document.getElementById("donation-banner-line2"); let line2text = line2.getAttribute(`data-${lineChoice}`); let line2pieces = line2text.split(" "); let line2end = '<span>' + line2pieces.pop() + '</span>'; line2pieces.push(line2end); line2.innerHTML = line2pieces.join(" "); + line3 = document.getElementById("donation-banner-line3"); + if (lineChoice === 11) { + line3.innerHTML = line3.getAttribute("data-b"); + } let buttonChoice = Math.floor(Math.random() * 2); let button = document.getElementById("donation-banner-button"); button.innerHTML = button.getAttribute(`data-${buttonChoice}`); diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index fc1a38d8..864d1d2e 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -19,7 +19,7 @@ const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion" const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed"; -const k_tb_donation_banner_countdown = "extensions.torbutton.donation_banner_countdown"; +const k_tb_donation_banner_countdown = "extensions.torbutton.donation_banner_countdown2"; var m_tb_prefs = Services.prefs; diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index e9496c08..b991a3ae 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -6,7 +6,7 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglo pref("extensions.torbutton.display_circuit", true); pref("extensions.torbutton(a)torproject.org.description", "chrome://torbutton/locale/torbutton.properties"); pref("extensions.torbutton.updateNeeded", false); -pref("extensions.torbutton.donation_banner_countdown", 12); +pref("extensions.torbutton.donation_banner_countdown2", 12); // Tor check and proxy prefs pref("extensions.torbutton.test_enabled",true);

1 0

[torbutton/maint-2.0] Bug 28515: Use en-US for english Torbutton strings
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 9abd346f924c8340856c06039876d900a1ca5ac8 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 19 09:20:09 2018 +0000 Bug 28515: Use en-US for english Torbutton strings There is no `en` in Mozilla's universe and we need `en-US` for Torbutton integration into `tor-browser` (see: #25013). Thus, switch our locale code for english in Torbutton accordingly. The server-side of this switch got done in #28261 and the workaround for that, which was symlinking `en` to `en-US`, is not needed anymore. --- makexpi.sh | 4 ++-- src/chrome.manifest | 2 +- src/chrome/locale/en | 1 - trans_tools/import-translations.sh | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/makexpi.sh b/makexpi.sh index aa3e665b..243fbd6b 100755 --- a/makexpi.sh +++ b/makexpi.sh @@ -20,8 +20,8 @@ echo ---------- create $APP_NAME.xpi ---------- # create the pkg directory if it doesn't exist yet mkdir -p pkg cd src -echo zip -X -9r ../pkg/$XPI_NAME ./ -x "chrome/*" -x "*.diff" -x "*.svn/*" -x "chrome/locale/en-US/*" -zip -X -9r ../pkg/$XPI_NAME ./ -x "*.svn/*" -x "*.diff" -x "chrome/locale/en-US/*" #-x "chrome/*" +echo zip -X -9r ../pkg/$XPI_NAME ./ -x "chrome/*" -x "*.diff" -x "*.svn/*" +zip -X -9r ../pkg/$XPI_NAME ./ -x "*.svn/*" -x "*.diff" #-x "chrome/*" #mv ../$APP_NAME.jar ./chrome #zip -9m ../pkg/$XPI_NAME chrome/$APP_NAME.jar cd .. diff --git a/src/chrome.manifest b/src/chrome.manifest index 18c5f5b9..33199ccf 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -45,7 +45,7 @@ locale torbutton da chrome/locale/da/ locale torbutton de chrome/locale/de/ locale torbutton dz chrome/locale/dz/ locale torbutton el chrome/locale/el/ -locale torbutton en chrome/locale/en/ +locale torbutton en chrome/locale/en-US/ locale torbutton eo chrome/locale/eo/ locale torbutton es chrome/locale/es/ locale torbutton et chrome/locale/et/ diff --git a/src/chrome/locale/en b/src/chrome/locale/en deleted file mode 120000 index f2b0341f..00000000 --- a/src/chrome/locale/en +++ /dev/null @@ -1 +0,0 @@ -en-US \ No newline at end of file diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index d13f8259..c7fa152e 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -28,7 +28,7 @@ FILEMAP=( "aboutDialog.dtd:torbutton-aboutdialogdtd" # Verify that the FILEMAP contains an entry for each Torbutton file. FILES_ARE_MISSING=0 -for DEST_PATH in $LOCALE_DIR/en/*.dtd $LOCALE_DIR/en/*.properties; +for DEST_PATH in $LOCALE_DIR/en-US/*.dtd $LOCALE_DIR/en-US/*.properties; do IS_FILE_IN_MAP=0 DEST_FILE=${DEST_PATH##*/}

1 0

[torbutton/maint-2.0] Translations updates
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit c4843b42c0ae483877fec38527c1d295a139d6ff Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 20 09:29:37 2018 +0000 Translations updates --- src/chrome/locale/fa/aboutTor.dtd | 2 +- src/chrome/locale/fa/browserOnboarding.properties | 16 ++++++++-------- src/chrome/locale/fa/torbutton.properties | 4 ++-- src/chrome/locale/ja/torbutton.dtd | 4 ++-- src/chrome/locale/ka/aboutTor.dtd | 2 +- src/chrome/locale/sv/aboutTBUpdate.dtd | 2 +- src/chrome/locale/sv/aboutTor.dtd | 4 ++-- src/chrome/locale/sv/brand.dtd | 6 +++--- src/chrome/locale/sv/brand.properties | 6 +++--- src/chrome/locale/sv/browserOnboarding.properties | 6 +++--- src/chrome/locale/sv/torbutton.dtd | 4 ++-- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/chrome/locale/fa/aboutTor.dtd b/src/chrome/locale/fa/aboutTor.dtd index be1440b7..da917341 100644 --- a/src/chrome/locale/fa/aboutTor.dtd +++ b/src/chrome/locale/fa/aboutTor.dtd @@ -7,7 +7,7 @@ <!ENTITY aboutTor.title "درباره‌ی تور"> <!ENTITY aboutTor.ready.label "کاوش. خصوصی."> -<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> +<!ENTITY aboutTor.ready2.label "شما برای تجربه خصوصی‌ترین مرور اینترنت در جهان آماده هستید."> <!ENTITY aboutTor.failure.label "خطایی پیش آمده است!"> <!ENTITY aboutTor.failure2.label "تور با این مرورگر کار نمی‌کند."> diff --git a/src/chrome/locale/fa/browserOnboarding.properties b/src/chrome/locale/fa/browserOnboarding.properties index e0ab4338..2dcbded9 100644 --- a/src/chrome/locale/fa/browserOnboarding.properties +++ b/src/chrome/locale/fa/browserOnboarding.properties @@ -3,14 +3,14 @@ # 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.button=Start Now +onboarding.tour-tor-welcome.title=شما آماده هستید. +onboarding.tour-tor-welcome.description=مرورگر تور در هنگام مرورگری وب بالاترین استاندارد در حریم شخصی و امنیت را به شما ارائه می‌دهد. شما حالا در برابر ردیابی, زیرنظر داشتن و سانسور محافظت می‌شوید. چگونگی این امر توسط این پذیرش سازمانی سریع به شما نشان داده خواهد شد. +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.button=به شبکه تور برو onboarding.tour-tor-network=Tor Network onboarding.tour-tor-network.title=Travel a decentralized network. @@ -30,7 +30,7 @@ onboarding.tour-tor-security.button=Review Settings 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=See FAQs +onboarding.tour-tor-expect-differences.button=مشاهده پرسشگان onboarding.tour-tor-onion-services=خدمات پیازی onboarding.tour-tor-onion-services.title=Be extra protected. @@ -40,9 +40,9 @@ onboarding.tour-tor-onion-services.button=Visit an Onion # Circuit Display onboarding. onboarding.tor-circuit-display.next=بعدی onboarding.tor-circuit-display.done=انجام شد -onboarding.tor-circuit-display.one-of-three=1 of 3 -onboarding.tor-circuit-display.two-of-three=2 of 3 -onboarding.tor-circuit-display.three-of-three=3 of 3 +onboarding.tor-circuit-display.one-of-three=۱ از ۳ +onboarding.tor-circuit-display.two-of-three=۲ از ۳ +onboarding.tor-circuit-display.three-of-three=۳ از ۳ onboarding.tor-circuit-display.intro.title=How do circuits work? onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. diff --git a/src/chrome/locale/fa/torbutton.properties b/src/chrome/locale/fa/torbutton.properties index a239e685..3f90df0c 100644 --- a/src/chrome/locale/fa/torbutton.properties +++ b/src/chrome/locale/fa/torbutton.properties @@ -5,7 +5,7 @@ torbutton.circuit_display.this_browser = این مرورگر torbutton.circuit_display.relay = بازپخش torbutton.circuit_display.tor_bridge = پل torbutton.circuit_display.unknown_country = کشور ناشناخته -torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard = محافظ torbutton.circuit_display.guard_note = Your [Guard] node may not change. torbutton.circuit_display.learn_more = اطلاعات بیشتر torbutton.content_sizer.margin_tooltip = مرورگر Tor اضافه می کند این حاشیه را به عرض و ارتفاع پنجره شما که کمتر مشخص شود، و در نتیجه باعث کاهش توانایی به ردیابی آنلاین شما شود. @@ -52,4 +52,4 @@ profileMigrationFailed=مهاجرت ناموفق از پروفایل %S.\nتنظ # .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_OnionEncryption=ارتباط رمزگذاری شد (سرویس پیازی) diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd index 359dcf48..65368394 100644 --- a/src/chrome/locale/ja/torbutton.dtd +++ b/src/chrome/locale/ja/torbutton.dtd @@ -47,5 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "いくつかのフォントと数学記号が無効化されます。"> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "いくつかのアイコン、数学記号および画像が無効化されます。"> <!ENTITY torbutton.prefs.sec_click_to_play_media "オーディオとビデオ(HTML5メディア)はクリックすると再生されます。"> -<!ENTITY torbutton.circuit_display.title "Tor Circuit"> -<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> +<!ENTITY torbutton.circuit_display.title "Tor サーキット"> +<!ENTITY torbutton.circuit_display.new_circuit "このサイトに新しいサーキットを使用する"> diff --git a/src/chrome/locale/ka/aboutTor.dtd b/src/chrome/locale/ka/aboutTor.dtd index f232c0ba..f6b9dd76 100644 --- a/src/chrome/locale/ka/aboutTor.dtd +++ b/src/chrome/locale/ka/aboutTor.dtd @@ -20,7 +20,7 @@ <!ENTITY aboutTor.torbrowser_user_manual.accesskey "ხ"> <!ENTITY aboutTor.torbrowser_user_manual.label "Tor-ბრაუზერის სახელმძღვანელო"> -<!ENTITY aboutTor.tor_mission.label "Tor-პროექტი წარმოადგენს 501(c)(3) არამომგებიან ორგანიზაციას, რომელიც ხელს უწყობს ადამიანის უფლებების დაცვისა და თავისუფლების ხარისხის გაუმჯობესებას, უფასო და ღია წყაროს მქონე, ვინაობისა და პირადი მონაცემების გამჟღავნებისგან დაცული ტექნოლოგიების შექმნითა და შემუშავებით, მათთან შეუზღუდავი წვდომისა და გამოყენების უზრუნველყოფით, შემდგომი კვლევებითა და მუშაობით , საზოგადოების ცნობიერების დონის ასამაღლებლად."> +<!ENTITY aboutTor.tor_mission.label "Tor-პროექტი წარმოადგენს 501(c)(3) არამომგებიან ორგანიზაციას, რომელიც ხელს უწყობს ადამიანის უფლებების დაცვისა და თავისუფლების ხარისხის გაუმჯობესებას, უფასო და ღია წყაროს მქონე, ვინაობისა და პირადი მონაცემების გამჟღავნებისგან ასარიდებელი საშუალებების შექმნითა და გავრცელებით, მათზე შეუზღუდავი წვდომისა და გამოყენების უზრუნველყოფით, შემდგომ კი მათთან დაკავშირებ ით მეცნიერული გაგებისა და საზოგადოების ცნობიერების დონის ამაღლებით."> <!ENTITY aboutTor.getInvolved.label "შემოგვიერთდით »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> diff --git a/src/chrome/locale/sv/aboutTBUpdate.dtd b/src/chrome/locale/sv/aboutTBUpdate.dtd index 7b757280..781f545a 100644 --- a/src/chrome/locale/sv/aboutTBUpdate.dtd +++ b/src/chrome/locale/sv/aboutTBUpdate.dtd @@ -1,5 +1,5 @@ <!ENTITY aboutTBUpdate.title "Tor Browser-uppdatering"> -<!ENTITY aboutTBUpdate.updated "Tor-webbläsaren har uppdaterats."> +<!ENTITY aboutTBUpdate.updated "Tor Browser har uppdaterats."> <!ENTITY aboutTBUpdate.linkPrefix "För den senaste information om den här versionen,"> <!ENTITY aboutTBUpdate.linkLabel "besök vår hemsida"> <!ENTITY aboutTBUpdate.linkSuffix "."> diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv/aboutTor.dtd index 76dcfa01..110322e4 100644 --- a/src/chrome/locale/sv/aboutTor.dtd +++ b/src/chrome/locale/sv/aboutTor.dtd @@ -15,10 +15,10 @@ <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Frågor?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Kolla in bruksanvisning för Tor-webbläsaren »"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Kolla in bruksanvisning för Tor Browser »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Bruksanvisning för Tor-webbläsaren"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Bruksanvisning för Tor Browser"> <!ENTITY aboutTor.tor_mission.label "Tor-projektet är en amerikansk 501(c)(3) ideell organisation som främjar mänskliga rättigheter och friheter genom att skapa och distribuera anonymitets- och sekretessteknik med fri och öppen källkod, stödja deras obegränsade tillgänglighet och användning och främja deras vetenskapliga och populära förståelse."> <!ENTITY aboutTor.getInvolved.label "Engagera dig »"> diff --git a/src/chrome/locale/sv/brand.dtd b/src/chrome/locale/sv/brand.dtd index 43a95e12..797bdb92 100644 --- a/src/chrome/locale/sv/brand.dtd +++ b/src/chrome/locale/sv/brand.dtd @@ -2,9 +2,9 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShorterName "Tor-webbläsaren"> -<!ENTITY brandShortName "Tor-webbläsaren"> -<!ENTITY brandFullName "Tor-webbläsare"> +<!ENTITY brandShorterName "Tor Browser"> +<!ENTITY brandShortName "Tor Browser"> +<!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor-projektet"> <!ENTITY trademarkInfo.part1 "Firefox och Firefox-logotyperna är varumärken som tillhör Mozilla Foundation."> diff --git a/src/chrome/locale/sv/brand.properties b/src/chrome/locale/sv/brand.properties index 7c215e54..555e01e6 100644 --- a/src/chrome/locale/sv/brand.properties +++ b/src/chrome/locale/sv/brand.properties @@ -2,9 +2,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShorterName=Tor webbläsaren -brandShortName=Tor webbläsaren -brandFullName=Tor webbläsaren +brandShorterName=Tor Browser +brandShortName=Tor Browser +brandFullName=Tor Browser vendorShortName=Tor-projektet homePageSingleStartMain=Firefox Start, en snabb hemsida med inbyggd sökfunktion diff --git a/src/chrome/locale/sv/browserOnboarding.properties b/src/chrome/locale/sv/browserOnboarding.properties index 779564db..8cc7e3f1 100644 --- a/src/chrome/locale/sv/browserOnboarding.properties +++ b/src/chrome/locale/sv/browserOnboarding.properties @@ -4,17 +4,17 @@ onboarding.tour-tor-welcome=Välkommen onboarding.tour-tor-welcome.title=Du är redo. -onboarding.tour-tor-welcome.description=Tor-webbläsaren erbjuder högsta standard för integritet och säkerhet när du surfar på webben. Du är nu skyddad mot spårning, övervakning och censur. Denna snabba introduktion kommer att visa dig hur. +onboarding.tour-tor-welcome.description=Tor Browser erbjuder högsta standard för integritet och säkerhet när du surfar på webben. Du är nu skyddad mot spårning, övervakning och censur. Denna snabba introduktion kommer att visa dig hur. onboarding.tour-tor-welcome.button=Börja nu onboarding.tour-tor-privacy=Sekretess onboarding.tour-tor-privacy.title=Avvisa bevakare och snokare. -onboarding.tour-tor-privacy.description=Tor-webbläsaren isolerar kakor och tar bort din webbläsarhistorik efter din session. Dessa ändringar säkerställa din integritet och säkerhet skyddas i webbläsaren. Klicka på "Tor-nätverk" för att lära dig hur vi skyddar dig på nätverksnivå. +onboarding.tour-tor-privacy.description=Tor Browser isolerar kakor och tar bort din webbläsarhistorik efter din session. Dessa ändringar säkerställa din integritet och säkerhet skyddas i webbläsaren. Klicka på "Tor-nätverk" för att lära dig hur vi skyddar dig på nätverksnivå. onboarding.tour-tor-privacy.button=Gå till Tor-nätverket onboarding.tour-tor-network=Tor-nätverk onboarding.tour-tor-network.title=Res ett decentraliserat nätverk. -onboarding.tour-tor-network.description=Tor-webbläsaren ansluter dig till Tor-nätverket som drivs av tusentals volontärer runt om i världen. Till skillnad från en VPN, det finns ingen punkt av misslyckande eller centraliserad enhet du behöver lita på för att njuta av internet privat. +onboarding.tour-tor-network.description=Tor Browser ansluter dig till Tor-nätverket som drivs av tusentals volontärer runt om i världen. Till skillnad från en VPN, det finns ingen punkt av misslyckande eller centraliserad enhet du behöver lita på för att njuta av internet privat. onboarding.tour-tor-network.button=Gå till kretsvisning onboarding.tour-tor-circuit-display=Kretsvisning diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd index 4bbc35a8..067b45b3 100644 --- a/src/chrome/locale/sv/torbutton.dtd +++ b/src/chrome/locale/sv/torbutton.dtd @@ -6,12 +6,12 @@ <!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Tor-nätverksinställningar..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> -<!ENTITY torbutton.context_menu.downloadUpdate "Sök efter uppdateringar för Tor webbläsare..."> +<!ENTITY torbutton.context_menu.downloadUpdate "Sök efter uppdateringar för Tor Browser..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Skydd mot Cookies..."> <!ENTITY torbutton.context_menu.cookieProtections.key "S"> <!ENTITY torbutton.button.tooltip "Klicka för att initialisera Torbutton"> -<!ENTITY torbutton.prefs.security_settings "Tor-webbläsares säkerhetsinställningar"> +<!ENTITY torbutton.prefs.security_settings "Säkerhetsinställningar i Tor Browser"> <!ENTITY torbutton.prefs.restore_defaults "Återställ standard"> <!ENTITY torbutton.prefs.custom_warning "Dina anpassade webbläsarinställningar har resulterat i ovanliga säkerhetsinställningar. Av säkerhets- och integritetsskäl rekommenderar vi att du använder en av de fördefinierade säkerhetsnivåerna."> <!ENTITY torbutton.cookiedialog.title "Hantera Cookies skydd">

1 0

[torbutton/maint-2.0] Bug 28540: New text for 2018 donation banner
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 207e78133408f4839f81322a5839163cb90a7223 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Nov 20 13:52:47 2018 -0800 Bug 28540: New text for 2018 donation banner --- src/chrome/locale/en-US/aboutTor.dtd | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/chrome/locale/en-US/aboutTor.dtd b/src/chrome/locale/en-US/aboutTor.dtd index 6efb202e..a36d812c 100644 --- a/src/chrome/locale/en-US/aboutTor.dtd +++ b/src/chrome/locale/en-US/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">

1 0

[torbutton/maint-2.0] Update translations
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 4926069914cb048c4c8c70de6e71a9988c4ef607 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Oct 24 09:44:57 2018 +0000 Update translations --- src/chrome/locale/fr/aboutTor.dtd | 20 +++++++++---------- src/chrome/locale/he/browserOnboarding.properties | 2 +- src/chrome/locale/ru/aboutTor.dtd | 2 +- src/chrome/locale/ru/browserOnboarding.properties | 2 +- src/chrome/locale/vi/aboutTor.dtd | 24 +++++++++++------------ src/chrome/locale/zh-TW/aboutTor.dtd | 16 +++++++-------- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd index 52c4d062..f373d753 100644 --- a/src/chrome/locale/fr/aboutTor.dtd +++ b/src/chrome/locale/fr/aboutTor.dtd @@ -27,16 +27,16 @@ <!ENTITY aboutTor.newsletter.tagline "Obtenez les dernières nouvelles au sujet de Tor directement dans votre boîte de réception."> <!ENTITY aboutTor.newsletter.link_text "Inscrivez-vous aux nouvelles de Tor"> -<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> +<!ENTITY aboutTor.donationBanner.line1 "Tor : l’union fait la force"> -<!ENTITY aboutTor.donationBanner.line2a "L’anonymat adore la compagnie"> -<!ENTITY aboutTor.donationBanner.line2b "Améliorer les droits de la personne."> -<!ENTITY aboutTor.donationBanner.line2c "Se lever pour la liberté."> -<!ENTITY aboutTor.donationBanner.line2d "Protéger la confidentialité de millions de personnes."> -<!ENTITY aboutTor.donationBanner.line2e "Garder Tor robuste."> -<!ENTITY aboutTor.donationBanner.line2f "On a besoin de votre soutien !"> +<!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.line2f "Nous avons besoin de votre soutien !"> -<!ENTITY aboutTor.donationBanner.line3 "Donnez aujourd'hui, et Mozilla recevra votre donation."> +<!ENTITY aboutTor.donationBanner.line3 "Faites un don aujourd’hui et Mozilla fera un don équivalent."> -<!ENTITY aboutTor.donationBanner.buttonA "Donnez dès maintenant"> -<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> +<!ENTITY aboutTor.donationBanner.buttonA "Faites un don maintenant"> +<!ENTITY aboutTor.donationBanner.buttonB "Comptez sur moi"> diff --git a/src/chrome/locale/he/browserOnboarding.properties b/src/chrome/locale/he/browserOnboarding.properties index 8865f0c8..13cb89ab 100644 --- a/src/chrome/locale/he/browserOnboarding.properties +++ b/src/chrome/locale/he/browserOnboarding.properties @@ -34,7 +34,7 @@ onboarding.tour-tor-expect-differences.button=ראה שאלות נפוצות onboarding.tour-tor-onion-services=שירותי בצל onboarding.tour-tor-onion-services.title=הייה אקסטרה מוגן. -onboarding.tour-tor-onion-services.description=שירותי בצל הם אתרים המסתיימים עם .onion המספק הגנות אקסטרה אל מפרסמים ומבקרים, כולל אמצעיי הגנה שהתווספו נגד צנזורה. שירותי בצל מתירים לכל אחד לספק תוכן ושירותים באופן אלמוני. לחץ למטה כדי לבקר באתר הבצל DuckDuckGo. +onboarding.tour-tor-onion-services.description=שירותי בצל הם אתרים המסתיימים עם .onion המספקים הגנות אקסטרה אל מפרסמים ומבקרים, כולל אמצעיי הגנה שהתווספו נגד צנזורה. שירותי בצל מתירים לכל אחד לספק תוכן ושירותים באופן אלמוני. לחץ למטה כדי לבקר באתר הבצל DuckDuckGo. onboarding.tour-tor-onion-services.button=בקר בבצל # Circuit Display onboarding. diff --git a/src/chrome/locale/ru/aboutTor.dtd b/src/chrome/locale/ru/aboutTor.dtd index 30da9663..879d708e 100644 --- a/src/chrome/locale/ru/aboutTor.dtd +++ b/src/chrome/locale/ru/aboutTor.dtd @@ -39,4 +39,4 @@ <!ENTITY aboutTor.donationBanner.line3 "Пожертвуйте сегодня и Mozilla удвоит Ваше пожертвование."> <!ENTITY aboutTor.donationBanner.buttonA "Пожертвовать"> -<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> +<!ENTITY aboutTor.donationBanner.buttonB "Посчитайте"> diff --git a/src/chrome/locale/ru/browserOnboarding.properties b/src/chrome/locale/ru/browserOnboarding.properties index 1833487f..4e8e4a4a 100644 --- a/src/chrome/locale/ru/browserOnboarding.properties +++ b/src/chrome/locale/ru/browserOnboarding.properties @@ -23,7 +23,7 @@ onboarding.tour-tor-circuit-display.description=Для каждого посещ onboarding.tour-tor-circuit-display.button=Ваш цикл onboarding.tour-tor-security=Безопасность -onboarding.tour-tor-security.title=Choose your experience. +onboarding.tour-tor-security.title=Выберете свой опыт. onboarding.tour-tor-security.description=Мы также предоставляем вам дополнительные настройки для повышения безопасности вашего браузера. Наши Параметры Безопасности позволяют блокировать элементы, которые могут быть использованы для атаки вашего компьютера. Нажмите ниже, чтобы посмотреть, что делают разные функции. onboarding.tour-tor-security.button=Настройки Просмотра diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd index b087f9ea..820d92c9 100644 --- a/src/chrome/locale/vi/aboutTor.dtd +++ b/src/chrome/locale/vi/aboutTor.dtd @@ -6,7 +6,7 @@ <!ENTITY aboutTor.title "Thông tin về Tor"> -<!ENTITY aboutTor.ready.label "Khám phá. Riêng tư."> +<!ENTITY aboutTor.ready.label "Truy cập Internet. Một cách riêng tư."> <!ENTITY aboutTor.ready2.label "Bạn đã sẵn sàng cho trải nghiệm duyệt web riêng tư nhất trên thế giới."> <!ENTITY aboutTor.failure.label "Có Lỗi Xảy Ra!"> <!ENTITY aboutTor.failure2.label "Tor không hoạt động trên trình duyệt này."> @@ -15,28 +15,28 @@ <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Những câu hỏi?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Xem qua Hướng dẫn Trình duyệt Tor »"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Xem qua Hướng dẫn sử dụng trình duyệt Tor »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Hướng dẫn Trình duyệt Tor"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Hướng dẫn sử dụng trình duyệt Tor"> -<!ENTITY aboutTor.tor_mission.label "The Tor Project là một tổ chức phi lợi nhuận US 501(c)(3) của Hoa Kỳ thúc đẩy quyền con người và tự do bằng cách tạo và triển khai các công nghệ bảo mật và ẩn danh miễn phí và mã nguồn mở, hỗ trợ tính sẵn có và sử dụng không hạn chế của chúng và nâng cao hiểu biết khoa học và phổ biến của họ."> +<!ENTITY aboutTor.tor_mission.label "The Tor Project là một tổ chức phi lợi nhuận 501(c)(3) của Hoa Kỳ nhằm thúc đẩy quyền con người và tự do bằng cách tạo và triển khai các công nghệ đảm bảo quyền riêng tư và ẩn danh miễn phí và dựa trên mã nguồn mở, hỗ trợ tính sẵn có và sử dụng không hạn chế của chúng, và giúp phổ biến hơn nữa sự hiểu biết về tính khoa học của những công nghệ này đối với cộng đồng."> <!ENTITY aboutTor.getInvolved.label "Tham gia »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Nhận thông tin mói nhất từ Tor vào hộp thư của bạn."> +<!ENTITY aboutTor.newsletter.tagline "Nhận thông tin mới nhất từ Tor được gửi tới hộp thư của bạn."> <!ENTITY aboutTor.newsletter.link_text "Đăng kí nhận tin tức từ Tor."> -<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> +<!ENTITY aboutTor.donationBanner.line1 "Tor: Sức mạnh nằm ở Số lượng người tham gia mạng lưới"> -<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> -<!ENTITY aboutTor.donationBanner.line2b "Nâng cao nhân quyền phổ thông."> +<!ENTITY aboutTor.donationBanner.line2a "Việc ẩn danh cần sự đồng hành của cộng đồng"> +<!ENTITY aboutTor.donationBanner.line2b "Nâng cao phổ biến nhân quyền."> <!ENTITY aboutTor.donationBanner.line2c "Đứng lên vì tự do."> <!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 toi cần sự hỗ trợ của bạn!"> +<!ENTITY aboutTor.donationBanner.line2f "Chúng tôi cần sự hỗ trợ của bạn!"> -<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> +<!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.buttonA "Donate Ngay bây giờ"> -<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> +<!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-TW/aboutTor.dtd b/src/chrome/locale/zh-TW/aboutTor.dtd index b08ffa26..a679ed55 100644 --- a/src/chrome/locale/zh-TW/aboutTor.dtd +++ b/src/chrome/locale/zh-TW/aboutTor.dtd @@ -4,14 +4,14 @@ - vim: set sw=2 sts=2 ts=8 et syntax=xml: --> -<!ENTITY aboutTor.title "關於洋蔥路由"> +<!ENTITY aboutTor.title "關於 Tor"> -<!ENTITY aboutTor.ready.label "Explore. Privately."> +<!ENTITY aboutTor.ready.label "探索。隱密。"> <!ENTITY aboutTor.ready2.label "您已準備好使用全世界最私密的瀏覽體驗。"> <!ENTITY aboutTor.failure.label "發生錯誤！"> -<!ENTITY aboutTor.failure2.label "洋蔥路由無法在此瀏覽器中運作。"> +<!ENTITY aboutTor.failure2.label "Tor 無法在此瀏覽器中運作。"> -<!ENTITY aboutTor.search.label "用 DuckDuckGo 搜尋"> +<!ENTITY aboutTor.search.label "使用 DuckDuckGo 搜尋"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "有什麼問題？"> @@ -25,7 +25,7 @@ <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> <!ENTITY aboutTor.newsletter.tagline "將 Tor 的最新消息直接傳送到您的收件匣。"> -<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> +<!ENTITY aboutTor.newsletter.link_text "訂閱 Tor 的新資訊。"> <!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> @@ -34,9 +34,9 @@ <!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> <!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> <!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> -<!ENTITY aboutTor.donationBanner.line2f "我們需要您的支持"> +<!ENTITY aboutTor.donationBanner.line2f "我們需要您的支援！"> -<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> +<!ENTITY aboutTor.donationBanner.line3 "今日您捐款，Mozilla 也會捐出相同數額。"> <!ENTITY aboutTor.donationBanner.buttonA "立刻捐款"> -<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> +<!ENTITY aboutTor.donationBanner.buttonB "我也要加入！">

1 0

[torbutton/maint-2.0] bug 25013: Create symlink to en locale folder following mozilla standard naming
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit cb295fbf921cec708d5cc1bc9c4d4f386fb6b624 Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon Nov 12 02:12:53 2018 -0200 bug 25013: Create symlink to en locale folder following mozilla standard naming Additionally, remove it when using the makexpi to create a xpi package. XPI packages are using the chrome.manifest and they support multi lang bundle. --- makexpi.sh | 4 ++-- src/chrome/locale/en-US | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/makexpi.sh b/makexpi.sh index 243fbd6b..aa3e665b 100755 --- a/makexpi.sh +++ b/makexpi.sh @@ -20,8 +20,8 @@ echo ---------- create $APP_NAME.xpi ---------- # create the pkg directory if it doesn't exist yet mkdir -p pkg cd src -echo zip -X -9r ../pkg/$XPI_NAME ./ -x "chrome/*" -x "*.diff" -x "*.svn/*" -zip -X -9r ../pkg/$XPI_NAME ./ -x "*.svn/*" -x "*.diff" #-x "chrome/*" +echo zip -X -9r ../pkg/$XPI_NAME ./ -x "chrome/*" -x "*.diff" -x "*.svn/*" -x "chrome/locale/en-US/*" +zip -X -9r ../pkg/$XPI_NAME ./ -x "*.svn/*" -x "*.diff" -x "chrome/locale/en-US/*" #-x "chrome/*" #mv ../$APP_NAME.jar ./chrome #zip -9m ../pkg/$XPI_NAME chrome/$APP_NAME.jar cd .. diff --git a/src/chrome/locale/en-US b/src/chrome/locale/en-US new file mode 120000 index 00000000..2c4c454f --- /dev/null +++ b/src/chrome/locale/en-US @@ -0,0 +1 @@ +en \ No newline at end of file

1 0

[torbutton/maint-2.0] Translations update
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 2300f79f6f6f9d990a578bf32d359817af6b1303 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 12 13:24:11 2018 +0000 Translations update --- src/chrome/locale/ar/aboutTBUpdate.dtd | 2 +- src/chrome/locale/cs/aboutTor.dtd | 4 +- src/chrome/locale/cs/brand.properties | 4 +- src/chrome/locale/cs/torbutton.properties | 4 +- src/chrome/locale/da/torbutton.properties | 2 +- src/chrome/locale/el/aboutDialog.dtd | 2 +- src/chrome/locale/el/aboutTor.dtd | 8 +-- src/chrome/locale/el/browserOnboarding.properties | 8 +-- src/chrome/locale/fr/aboutDialog.dtd | 2 +- src/chrome/locale/fr/aboutTor.dtd | 2 +- src/chrome/locale/fr/brand.dtd | 2 +- src/chrome/locale/ja/aboutTBUpdate.dtd | 2 +- src/chrome/locale/ja/aboutTor.dtd | 14 ++--- src/chrome/locale/ja/browserOnboarding.properties | 8 +-- src/chrome/locale/ka/torbutton.properties | 2 +- src/chrome/locale/sv/aboutTBUpdate.dtd | 6 +- src/chrome/locale/sv/aboutTor.dtd | 38 ++++++------- src/chrome/locale/sv/browserOnboarding.properties | 68 +++++++++++------------ src/chrome/locale/sv/torbutton.properties | 4 +- src/chrome/locale/tr/browserOnboarding.properties | 2 +- src/chrome/locale/tr/torbutton.dtd | 2 +- src/chrome/locale/zh-CN/aboutTor.dtd | 20 +++---- 22 files changed, 103 insertions(+), 103 deletions(-) diff --git a/src/chrome/locale/ar/aboutTBUpdate.dtd b/src/chrome/locale/ar/aboutTBUpdate.dtd index eee3db56..0c25a117 100644 --- a/src/chrome/locale/ar/aboutTBUpdate.dtd +++ b/src/chrome/locale/ar/aboutTBUpdate.dtd @@ -6,5 +6,5 @@ <!ENTITY aboutTBUpdate.changeLogHeading "سجل التغييرات:"> <!ENTITY aboutTBUpdate.circuitDisplayHeading "تصميم جديد لطريقة عرض الدوائر"> -<!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.circuitDisplayDescription "عرض دوائر تور نقل إلى مكان آخر وخضع للتحسين. انقر على زر «هوية الموقع» (تجده يمين شريط العنوانين) لترى العرض الجديد."> <!ENTITY aboutTBUpdate.learnMore "إعرف/ي أكثر "> diff --git a/src/chrome/locale/cs/aboutTor.dtd b/src/chrome/locale/cs/aboutTor.dtd index 435bdfdc..7c5ba384 100644 --- a/src/chrome/locale/cs/aboutTor.dtd +++ b/src/chrome/locale/cs/aboutTor.dtd @@ -7,8 +7,8 @@ <!ENTITY aboutTor.title "O Toru"> <!ENTITY aboutTor.ready.label "Prohlížejte v soukromí."> -<!ENTITY aboutTor.ready2.label "Vše je připraveno pro maximální soukromí pro vaše prohlížení."> -<!ENTITY aboutTor.failure.label "Něco se nepovedlo!"> +<!ENTITY aboutTor.ready2.label "Vše je připraveno pro maximální soukromí Vašeho prohlížení."> +<!ENTITY aboutTor.failure.label "Něco se pokazilo!"> <!ENTITY aboutTor.failure2.label "Tor v tomto prohlížeči nefunguje."> <!ENTITY aboutTor.search.label "Vyhledejte s DuckDuckGo"> diff --git a/src/chrome/locale/cs/brand.properties b/src/chrome/locale/cs/brand.properties index 1ac05c0b..7a8228a1 100644 --- a/src/chrome/locale/cs/brand.properties +++ b/src/chrome/locale/cs/brand.properties @@ -7,10 +7,10 @@ brandShortName=Prohlížeč Tor brandFullName=Prohlížeč Tor vendorShortName=Tor Project -homePageSingleStartMain=Firefox Start, domovská stránka s vestavěných vyhledávačem +homePageSingleStartMain=Firefox Start, domovská stránka s vestavěným vyhledávačem homePageImport=Importovat vaši domovskou stránku z aplikace %S homePageMigrationPageTitle=Výběr domovské stránky -homePageMigrationDescription=Vyberte prosím domovskou stránku, kterou chcete používat: +homePageMigrationDescription=Vyberte prosím domovskou stránku, kterou si přejete používat: syncBrandShortName=Synchronizace diff --git a/src/chrome/locale/cs/torbutton.properties b/src/chrome/locale/cs/torbutton.properties index ef9b8092..acbe680a 100644 --- a/src/chrome/locale/cs/torbutton.properties +++ b/src/chrome/locale/cs/torbutton.properties @@ -21,10 +21,10 @@ torbutton.popup.external.suggest = Chcete-li být v bezpečí, otevírejte staž torbutton.popup.launch = Stáhnout soubor torbutton.popup.cancel = Zrušit torbutton.popup.dontask = Od teď stahovat soubory automaticky -torbutton.popup.no_newnym = Torbutton vám nemůže bezpečně poskytnout novou identitu, protože nemá přístup ke controlnímu portu Tor.\n\nMáte spuštěn Tor Browser Bundle? +torbutton.popup.no_newnym = Torbutton vám nemůže bezpečně poskytnout novou identitu, protože nemá přístup ke kontrolnímu portu Tor.\n\nMáte spuštěn Tor Browser Bundle? torbutton.security_settings.menu.title = Nastavení zabezpečení torbutton.title.prompt_torbrowser = Důležitá zpráva Torbutton -torbutton.popup.prompt_torbrowser = Torbutton nyní pracuje jinak: nemůžete jej nyní vypnout.\n\nPro tuto změnu jsme se rozhodli kvůli bezpečnosti používvání Torbutton v prohlížeči. který je zároveň využíván pro prohlížení mimo síť Tor. Docházelo kvůli tomu k příliš mnoha chybám, které jsme nemohli jinak opravit.\n\nPokud chcete dále používat Firefox běžným způsobem, nainstalujte si Tor Browser Bundle. Nastavení soukromí prohlížeče Tor jsou nadřazeny těm ve Firefoxu, dokonce i když Firefox používáte společně s Torbutton. \n\nTorbutton můžete odstranit v Nástroje > Doplňky > Rozšíření a klepnutím na tlačítko Odebrat. +torbutton.popup.prompt_torbrowser = Torbutton nyní pracuje jinak: nemůžete jej nyní vypnout.\n\nPro tuto změnu jsme se rozhodli kvůli bezpečnosti používání Torbutton v prohlížeči. který je zároveň využíván pro prohlížení mimo síť Tor. Docházelo kvůli tomu k příliš mnoha chybám, které jsme nemohli jinak opravit.\n\nPokud chcete dále používat Firefox běžným způsobem, nainstalujte si Tor Browser Bundle. Nastavení soukromí prohlížeče Tor jsou nadřazeny těm ve Firefoxu, dokonce i když Firefox používáte společně s Torbutton. \n\nTorbutton můžete odstranit v Nástroje > Doplňky > Rozšíření a klepnutím na tlačítko Odebrat. torbutton.popup.short_torbrowser = Důležitá informace!\n\nTorbutton je nyní stále aktivní.\n\nPro více informací klepněte na Torbutton. torbutton.popup.confirm_plugins = Zásuvné moduly, jako je třeba Flash, mohou narušit vaše soukromí a anonymitu.\n\nTaké mohou obejít Tor a vyzradit vaše umístění a IP adresu.\n\nOpravdu chcete zásuvné moduly povolit?\n\n diff --git a/src/chrome/locale/da/torbutton.properties b/src/chrome/locale/da/torbutton.properties index eaf46742..ef2e85a9 100644 --- a/src/chrome/locale/da/torbutton.properties +++ b/src/chrome/locale/da/torbutton.properties @@ -16,7 +16,7 @@ torbutton.panel.label.enabled = Tor aktiveret extensions.torbutton(a)torproject.org.description = Torbutton tilbyder en knap, der konfigurerer Tor-indstillinger, samt hurtigt og nemt fjerner private data browsing-data. torbutton.popup.external.title = Download en ekstern filtype? torbutton.popup.external.app = Tor Browser kan ikke vis denne file. Du skal derfor åbne den med et andet program.\n\n -torbutton.popup.external.note = Nogle filtyper kan lede programmer til at forbinde til internettet uden at bruge Tor.\n\n +torbutton.popup.external.note = Nogle filtyper kan lede programmer til at oprette forbindelse til internettet uden at bruge Tor.\n\n torbutton.popup.external.suggest = For at være sikker bør du kun åbne downloade filer mens du er offline, eller bruge en Tor Live CD såsom Tails.\n torbutton.popup.launch = Download fil torbutton.popup.cancel = Annuller diff --git a/src/chrome/locale/el/aboutDialog.dtd b/src/chrome/locale/el/aboutDialog.dtd index a5c0cf69..d75b039e 100644 --- a/src/chrome/locale/el/aboutDialog.dtd +++ b/src/chrome/locale/el/aboutDialog.dtd @@ -1,7 +1,7 @@ <!ENTITY project.start "&brandShortName; έχει φτιαχτεί από">  <!ENTITY project.tpoLink "ο &vendorShortName;"> -<!ENTITY project.end ",μια μη κερδοσκοπική οργάνωση που υπερασπίζεται την ιδιωτικότητα και την ελευθερεία σας στο διαδύκτιο."> +<!ENTITY project.end ", μια μη κερδοσκοπική οργάνωση που υπερασπίζεται την ιδιωτικότητα και την ελευθερία σας στο διαδίκτυο."> <!ENTITY help.start "Θέλετε να βοηθήσετε?">  diff --git a/src/chrome/locale/el/aboutTor.dtd b/src/chrome/locale/el/aboutTor.dtd index 738b81ac..96301e2a 100644 --- a/src/chrome/locale/el/aboutTor.dtd +++ b/src/chrome/locale/el/aboutTor.dtd @@ -7,7 +7,7 @@ <!ENTITY aboutTor.title "Σχετικά με το Tor"> <!ENTITY aboutTor.ready.label "Εξερευνήστε. Με ιδιωτικότητα."> -<!ENTITY aboutTor.ready2.label "Είσαι έτοιμος για την πιο ιδιωτική εμπειρία περιήγησης."> +<!ENTITY aboutTor.ready2.label "Είστε έτοιμος για την πιο ιδιωτική εμπειρία περιήγησης."> <!ENTITY aboutTor.failure.label "Κάτι πήγε στραβά!"> <!ENTITY aboutTor.failure2.label "Το Tor δεν λειτουργεί σε αυτόν τον browser."> @@ -15,7 +15,7 @@ <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Ερωτήσεις?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Κοιτάξτε το εγχειρίδιό μας για τον Tor Browser»"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Κοιτάξτε το εγχειρίδιο μας για τον Tor Browser »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> <!ENTITY aboutTor.torbrowser_user_manual.label "Εγχειρίδιο του Tor Browser"> @@ -24,10 +24,10 @@ <!ENTITY aboutTor.getInvolved.label "Βοηθήστε κι εσείς »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Λάβετε τα τελευταία νέα του Tor κατευθείαν στα εισερχόμενά σας."> +<!ENTITY aboutTor.newsletter.tagline "Λάβετε τα τελευταία νέα του Tor κατευθείαν στα εισερχόμενα σας."> <!ENTITY aboutTor.newsletter.link_text "Εγγραφτείτε για τα νέα του Tor."> -<!ENTITY aboutTor.donationBanner.line1 "Tor: Η ισχύς των πολλών. "> +<!ENTITY aboutTor.donationBanner.line1 "Tor: Ισχύς εν τη ενώσει."> <!ENTITY aboutTor.donationBanner.line2a "Η ανωνυμία αγαπά την παρέα."> <!ENTITY aboutTor.donationBanner.line2b "Προωθήστε τα ανθρώπινα δικαιώματα παγκοσμίως."> diff --git a/src/chrome/locale/el/browserOnboarding.properties b/src/chrome/locale/el/browserOnboarding.properties index 766e982a..680a904d 100644 --- a/src/chrome/locale/el/browserOnboarding.properties +++ b/src/chrome/locale/el/browserOnboarding.properties @@ -13,7 +13,7 @@ onboarding.tour-tor-privacy.description=Ο Tor Browser απομονώνει τα onboarding.tour-tor-privacy.button=Πάμε στο Δίκτυο Tor onboarding.tour-tor-network=Δίκτυο Tor -onboarding.tour-tor-network.title=Ας ταξιδεύσουμε σε ένα αποκεντρωμένο δίκτυο. +onboarding.tour-tor-network.title=Ας ταξιδέψουμε σε ένα αποκεντρωμένο δίκτυο. onboarding.tour-tor-network.description=Ο Tor Browser σας συνδέει στο δίκτυο Tor, που λειτουργεί χάρη σε χιλιάδες εθελοντές από όλο τον κόσμο. Σε αντίθεση με ένα VPN, δεν υπάρχει κανένα σημείο αποτυχίας ή κεντρική οντότητα που πρέπει να εμπιστευτείτε για να απολαύσετε το διαδίκτυο ιδιωτικά. onboarding.tour-tor-network.button=Πάμε στην προεπισκόπηση κυκλώματος @@ -24,7 +24,7 @@ onboarding.tour-tor-circuit-display.button=Βλέπω το μονοπάτι μο onboarding.tour-tor-security=Ασφάλεια onboarding.tour-tor-security.title=Επιλέξτε την εμπειρία σας. -onboarding.tour-tor-security.description=Μπορούμε να προσφέρουμε επιπρόσθετες ρυθμίσεις για να ενισχύσουμε την ασφάλεια του περιηγητή σας. Οι Ρυθμίσεις Ασφάλειας σας επιτρέπουν να μπλοκάρεετε στοιχεία που θα μπορούσαν να χρηστιμοποιηθούν για επιθέσεις στον υπολογιστή σας. Επίλεξτε παρακάτω για να δείτε τι κάνουν οι διαφορετικές ρυθμίσεις. +onboarding.tour-tor-security.description=Μπορούμε να προσφέρουμε επιπρόσθετες ρυθμίσεις για να ενισχύσουμε την ασφάλεια του περιηγητή σας. Οι Ρυθμίσεις Ασφαλείας σας επιτρέπουν να μπλοκάρεετε στοιχεία που θα μπορούσαν να χρησιμοποιηθούν για επιθέσεις στον υπολογιστή σας. Επίλεξτε παρακάτω για να δείτε τι κάνουν οι διαφορετικές ρυθμίσεις. onboarding.tour-tor-security.button=Έλεγχος Ρυθμίσεων onboarding.tour-tor-expect-differences=Προτάσεις εμπειρίας @@ -34,7 +34,7 @@ onboarding.tour-tor-expect-differences.button=Δείτε τις Συχνές Ε onboarding.tour-tor-onion-services=Υπηρεσίες Onion onboarding.tour-tor-onion-services.title=Προστατευτείτε πιο πολύ. -onboarding.tour-tor-onion-services.description=Οι υπηρεσίες του Onion είναι ιστοσελίδες που τελειώνουν σε .onion και παρέχουν επιπλέον προστασία σε όσους δημοσιεύουν και επισκέπτονται, συμπεριλαμβανομένου και ασφαλειών ενάντια στη λογοκρισία. Οι υπηρεσίες του Onion επιτρέπουν στον καθένα να παράσχει υλικά και υπηρεσίες ανώνυμα. Επιλέξτε κάτω για να επισκεφτείτε τη σελίδα του Onion DuckDuckGo. +onboarding.tour-tor-onion-services.description=Οι υπηρεσίες του Onion είναι ιστοσελίδες που τελειώνουν σε .onion και παρέχουν επιπλέον προστασία στους δημοσιευτές και τους επισκέπτες, συμπεριλαμβανομένων και μέτρων ασφάλειας ενάντια στη λογοκρισία. Οι υπηρεσίες του Onion επιτρέπουν στον καθένα να παράσχει υλικά και υπηρεσίες ανώνυμα. Επιλέξτε κάτω για να επισκεφτείτε τη σελίδα του Onion DuckDuckGo. onboarding.tour-tor-onion-services.button=Επισκεφτείτε ένα Onion # Circuit Display onboarding. @@ -50,5 +50,5 @@ onboarding.tor-circuit-display.intro.msg=Τα κυκλώματα δημιουρ onboarding.tor-circuit-display.diagram.title=Προεπισκόπηση κυκλώματος onboarding.tor-circuit-display.diagram.msg=Αυτό το διάγραμμα δείχνει τις συνδέσεις που αποτελούν το κύκλωμα για αυτήν την ιστοσελίδα. Για να αποφύγετε τη σύνδεση της δραστηριότητας από σελίδα σε σελίδα, κάθε ιστοσελίδα παίρνει διαφορετικό κύκλωμα. -onboarding.tor-circuit-display.new-circuit.title=Χρειάζεσαι καινούριο κύκλωμα; +onboarding.tor-circuit-display.new-circuit.title=Χρειάζεστε καινούριο κύκλωμα; onboarding.tor-circuit-display.new-circuit.msg=Αν δεν μπορείτε να συνδεθείτε στην ιστοσελίδα που προσπαθείτε να συνδεθείτε ή αν δεν φορτώνει σωστά, τότε μπορείτε να χρησιμοποιήσετε αυτό το κουμπί για να ανανεώσετε τη σελίδα με νέο κύκλωμα. diff --git a/src/chrome/locale/fr/aboutDialog.dtd b/src/chrome/locale/fr/aboutDialog.dtd index a6d1ec4b..f67c4434 100644 --- a/src/chrome/locale/fr/aboutDialog.dtd +++ b/src/chrome/locale/fr/aboutDialog.dtd @@ -16,4 +16,4 @@ <!ENTITY bottomLinks.grow "Aidez à la croissance du réseau Tor !">  <!ENTITY bottomLinks.license "Informations de licence"> -<!ENTITY tor.TrademarkStatement "« Tor » et le « logo Oignon » sont des marques déposées de « The Tor Project, Inc. »"> +<!ENTITY tor.TrademarkStatement "« Tor » et le « logo Oignon » sont des marques de commerce de « The Tor Project, Inc. »"> diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd index f373d753..959842c6 100644 --- a/src/chrome/locale/fr/aboutTor.dtd +++ b/src/chrome/locale/fr/aboutTor.dtd @@ -20,7 +20,7 @@ <!ENTITY aboutTor.torbrowser_user_manual.accesskey "G"> <!ENTITY aboutTor.torbrowser_user_manual.label "Guide d’utilisation du Navigateur Tor"> -<!ENTITY aboutTor.tor_mission.label "Le Projet Tor est une organisation sans but lucratif US 501(c)(3) qui fait progresser les droits de la personne et les libertés en créant et en déployant des technologies d’anonymat et de confidentialité gratuites et à code source ouvert. Nous soutenons leur disponibilité et leur utilisation sans restriction, et promouvons une meilleure compréhension scientifique et populaire."> +<!ENTITY aboutTor.tor_mission.label "Le Projet Tor est une organisation sans but lucratif US 501(c)(3) qui fait progresser les droits de la personne et les libertés en créant et en déployant des technologies d’anonymat et de confidentialité gratuites et à code source ouvert. Nous soutenons leur disponibilité et leur utilisation sans restriction, et promouvons une meilleure compréhension scientifique et populaire."> <!ENTITY aboutTor.getInvolved.label "Impliquez-vous »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html"> diff --git a/src/chrome/locale/fr/brand.dtd b/src/chrome/locale/fr/brand.dtd index b3fe3f1c..a55f3014 100644 --- a/src/chrome/locale/fr/brand.dtd +++ b/src/chrome/locale/fr/brand.dtd @@ -6,7 +6,7 @@ <!ENTITY brandShortName "Navigateur Tor"> <!ENTITY brandFullName "Navigateur Tor"> <!ENTITY vendorShortName "Projet Tor"> -<!ENTITY trademarkInfo.part1 "Firefox et les logos de Firefox sont des marques déposées de la Fondation Mozilla."> +<!ENTITY trademarkInfo.part1 "Firefox et les logos de Firefox sont des marques de commerce de la Fondation Mozilla.">  <!ENTITY plugins.installed.find "Cliquer pour charger les greffons système installés"> diff --git a/src/chrome/locale/ja/aboutTBUpdate.dtd b/src/chrome/locale/ja/aboutTBUpdate.dtd index 4ded2bf7..8be08aa4 100644 --- a/src/chrome/locale/ja/aboutTBUpdate.dtd +++ b/src/chrome/locale/ja/aboutTBUpdate.dtd @@ -7,4 +7,4 @@ <!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.learnMore "Learn More"> +<!ENTITY aboutTBUpdate.learnMore "さらに詳しく"> diff --git a/src/chrome/locale/ja/aboutTor.dtd b/src/chrome/locale/ja/aboutTor.dtd index 8c573564..19a54e77 100644 --- a/src/chrome/locale/ja/aboutTor.dtd +++ b/src/chrome/locale/ja/aboutTor.dtd @@ -6,19 +6,19 @@ <!ENTITY aboutTor.title "Torについて"> -<!ENTITY aboutTor.ready.label "Explore. Privately."> -<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> +<!ENTITY aboutTor.ready.label "探索する。プライベートに。"> +<!ENTITY aboutTor.ready2.label "世界で最もプライベートなブラウジングを体験する準備が整いました。"> <!ENTITY aboutTor.failure.label "何かが間違っています！"> <!ENTITY aboutTor.failure2.label "Torは、このブラウザでは動作しません。"> -<!ENTITY aboutTor.search.label "Search with DuckDuckGo"> +<!ENTITY aboutTor.search.label "DuckDuckGoで検索"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "質問がありますか？"> <!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual"> +<!ENTITY aboutTor.torbrowser_user_manual.label "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 »"> @@ -31,12 +31,12 @@ <!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> <!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> -<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2c "自由のために立ち上がる。"> <!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.line2f "我々にはあなたのサポートが必要です!"> <!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> -<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> +<!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 2261c993..e3f09909 100644 --- a/src/chrome/locale/ja/browserOnboarding.properties +++ b/src/chrome/locale/ja/browserOnboarding.properties @@ -5,14 +5,14 @@ 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.button=Start Now +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-network=Tor Network +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 @@ -30,7 +30,7 @@ onboarding.tour-tor-security.button=Review Settings 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=See FAQs +onboarding.tour-tor-expect-differences.button=よくある質問を見る onboarding.tour-tor-onion-services=Onion Services onboarding.tour-tor-onion-services.title=Be extra protected. @@ -50,5 +50,5 @@ onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assign onboarding.tor-circuit-display.diagram.title=Circuit Display onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? +onboarding.tor-circuit-display.new-circuit.title=新しいサーキットが必要ですか? onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. diff --git a/src/chrome/locale/ka/torbutton.properties b/src/chrome/locale/ka/torbutton.properties index 21d96e32..cbe0d8b0 100644 --- a/src/chrome/locale/ka/torbutton.properties +++ b/src/chrome/locale/ka/torbutton.properties @@ -24,7 +24,7 @@ torbutton.popup.dontask = ავტომატურად ჩამოიტ torbutton.popup.no_newnym = Torbutton ვერ ახერხებს ახალი ვინაობის უსაფრთხოდ მონიჭებას. წვდომა არ აქვს წვდომა Tor-ის მართვის პორტთან.\n\nAre you running Tor Browser Bundle? torbutton.security_settings.menu.title = უსაფრთხოების პარამეტრები torbutton.title.prompt_torbrowser = მნიშვნელოვანი ინფორმაცია Torbutton-ის შესახებ -torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. +torbutton.popup.prompt_torbrowser = Torbutton ახლა უკვე სხვანაირად მუშაობს: მისი გამორთვა აღარ შეგიძლიათ.\n\nეს ცვლილება იმიტომ გავაკეთეთ, რომ არაა უსაფრთხო Torbutton-ის იმ ბრაუზერში გამოყენება, რომელიც Tor-ის გარეშეც მუშაობს. ამ ყველაფერს უამრავი ხარვეზი ახლავს თან, რომელთა მოგვარებაც სხვა გზით ვერ მოვახერხებთ.\n\nთუ გსურთ განაგრძოთ Firefox-ის ჩვეულებრივ გამოყენება, უნდა ამოშალოთ Torbutton და ჩამოტვირთოთ Tor-ბრაუზერის კრებ ული. პირადი მონაცემების დაცვის შესაძლებლობები გაცილებით უკეთესია Tor-ბრაუზერში, ვიდრე ჩვეულებრივ Firefox-ში, მისი Torbutton-თან ერთად გამოყენების შემთხვევაშიც კი.\n\nTorbutton-ის წასაშლელად, გადადით ხელსაწყოები->დამატებები->გაფართოებები და შემდეგ დააწკაპეთ ამოშლის ღილაკს Torbutton-ის გვერდით. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. torbutton.popup.confirm_plugins = მოდულობს, როგორიცაა Flash შეუძლია საფრთხის ქვეშ დააყენოს თქვენი პირადი მონაცემები და ვინაობის გაუმხელობა.\n\nმათი საშუალებით, შესაძლებელია Tor-ის გვერდის ავლით დადგინდეს თქვენი მდებარეობა და IP-მისამართი.\n\nნამდვილად გსურთ მოდულების ჩართვა?\n\n diff --git a/src/chrome/locale/sv/aboutTBUpdate.dtd b/src/chrome/locale/sv/aboutTBUpdate.dtd index 02a58303..7b757280 100644 --- a/src/chrome/locale/sv/aboutTBUpdate.dtd +++ b/src/chrome/locale/sv/aboutTBUpdate.dtd @@ -5,6 +5,6 @@ <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Ändringslogg:"> -<!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.learnMore "Learn More"> +<!ENTITY aboutTBUpdate.circuitDisplayHeading "Ny, omformad kretsrutan"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "Tor-kretsrutan har flyttats och förbättrats! Klicka på webbplatsen Identitetsknapp (ligger på vänster sida av webbadressfältet) för att se den nya kretsrutan."> +<!ENTITY aboutTBUpdate.learnMore "Läs mer"> diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv/aboutTor.dtd index 94cea14a..76dcfa01 100644 --- a/src/chrome/locale/sv/aboutTor.dtd +++ b/src/chrome/locale/sv/aboutTor.dtd @@ -6,37 +6,37 @@ <!ENTITY aboutTor.title "Om Tor"> -<!ENTITY aboutTor.ready.label "Explore. Privately."> -<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> +<!ENTITY aboutTor.ready.label "Utforska. Privat."> +<!ENTITY aboutTor.ready2.label "Du är redo för världens mest privata surfupplevelse."> <!ENTITY aboutTor.failure.label "Någonting gick fel!"> <!ENTITY aboutTor.failure2.label "Tor fungerar inte i den här webbläsaren."> -<!ENTITY aboutTor.search.label "Search with DuckDuckGo"> +<!ENTITY aboutTor.search.label "Sök med DuckDuckGo"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Frågor?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Kolla in bruksanvisning för Tor-webbläsaren »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Bruksanvisning för Tor-webbläsaren"> -<!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 »"> +<!ENTITY aboutTor.tor_mission.label "Tor-projektet är en amerikansk 501(c)(3) ideell organisation som främjar mänskliga rättigheter och friheter genom att skapa och distribuera anonymitets- och sekretessteknik med fri och öppen källkod, stödja deras obegränsade tillgänglighet och användning och främja deras vetenskapliga och populära förståelse."> +<!ENTITY aboutTor.getInvolved.label "Engagera dig »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> -<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> +<!ENTITY aboutTor.newsletter.tagline "Få de senaste nyheterna från Tor direkt till din inkorg."> +<!ENTITY aboutTor.newsletter.link_text "Anmäl dig till Tor-nyheter."> -<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> +<!ENTITY aboutTor.donationBanner.line1 "Tor: Styrka i antal"> -<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> -<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> -<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> -<!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.line2a "Anonymitet älskar sällskap."> +<!ENTITY aboutTor.donationBanner.line2b "Främja universella mänskliga rättigheter."> +<!ENTITY aboutTor.donationBanner.line2c "Stå upp för frihet."> +<!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.line3 "Give today, and Mozilla will match your donation."> +<!ENTITY aboutTor.donationBanner.line3 "Ge idag, och Mozilla kommer att matcha din donation."> -<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> -<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> +<!ENTITY aboutTor.donationBanner.buttonA "Donera nu"> +<!ENTITY aboutTor.donationBanner.buttonB "Räkna med mig"> diff --git a/src/chrome/locale/sv/browserOnboarding.properties b/src/chrome/locale/sv/browserOnboarding.properties index 847225d6..779564db 100644 --- a/src/chrome/locale/sv/browserOnboarding.properties +++ b/src/chrome/locale/sv/browserOnboarding.properties @@ -2,53 +2,53 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -onboarding.tour-tor-welcome=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.button=Start Now +onboarding.tour-tor-welcome=Välkommen +onboarding.tour-tor-welcome.title=Du är redo. +onboarding.tour-tor-welcome.description=Tor-webbläsaren erbjuder högsta standard för integritet och säkerhet när du surfar på webben. Du är nu skyddad mot spårning, övervakning och censur. Denna snabba introduktion kommer att visa dig hur. +onboarding.tour-tor-welcome.button=Börja nu onboarding.tour-tor-privacy=Sekretess -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=Avvisa bevakare och snokare. +onboarding.tour-tor-privacy.description=Tor-webbläsaren isolerar kakor och tar bort din webbläsarhistorik efter din session. Dessa ändringar säkerställa din integritet och säkerhet skyddas i webbläsaren. Klicka på "Tor-nätverk" för att lära dig hur vi skyddar dig på nätverksnivå. +onboarding.tour-tor-privacy.button=Gå till Tor-nätverket -onboarding.tour-tor-network=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 +onboarding.tour-tor-network=Tor-nätverk +onboarding.tour-tor-network.title=Res ett decentraliserat nätverk. +onboarding.tour-tor-network.description=Tor-webbläsaren ansluter dig till Tor-nätverket som drivs av tusentals volontärer runt om i världen. Till skillnad från en VPN, det finns ingen punkt av misslyckande eller centraliserad enhet du behöver lita på för att njuta av internet privat. +onboarding.tour-tor-network.button=Gå till kretsvisning -onboarding.tour-tor-circuit-display=Circuit Display -onboarding.tour-tor-circuit-display.title=See your path. -onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. -onboarding.tour-tor-circuit-display.button=See My Path +onboarding.tour-tor-circuit-display=Kretsvisning +onboarding.tour-tor-circuit-display.title=Se din väg. +onboarding.tour-tor-circuit-display.description=För varje domän du besöker förmedlas din trafik och krypteras i en krets över tre tor-reläer runt om i världen. Ingen webbplats vet var du ansluter från. Du kan begära en ny krets genom att klicka på "ny krets för denna webbplats" på vår kretsvisning. +onboarding.tour-tor-circuit-display.button=Se Min väg onboarding.tour-tor-security=Säkerhet -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.title=Välj din upplevelse. +onboarding.tour-tor-security.description=Vi ger dig också ytterligare inställningar för att stöta upp din webbläsares säkerhet. Våra säkerhetsinställningar kan du blockera element som kan användas för att attackera din dator. Klicka nedan för att se vad de olika alternativen gör. +onboarding.tour-tor-security.button=Granska Inställningar -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=See FAQs +onboarding.tour-tor-expect-differences=Erfarenhets tips +onboarding.tour-tor-expect-differences.title=Förvänta dig vissa skillnader. +onboarding.tour-tor-expect-differences.description=Med alla säkerhets- och sekretessfunktioner som Tor tillhandahåller kan din upplevelse när du surfar på internet vara lite annorlunda. Saker kan vara lite långsammare, och beroende på din säkerhetsnivå, vissa element kanske inte fungerar eller ladda. Du kan också bli ombedd att bevisa att du är en människa och inte en robot. +onboarding.tour-tor-expect-differences.button=Se Vanliga frågor onboarding.tour-tor-onion-services=Onion tjänster -onboarding.tour-tor-onion-services.title=Be extra protected. -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.title=Var extra skyddad. +onboarding.tour-tor-onion-services.description=Onion-tjänster är webbplatser som slutar med en .onion som ger extra skydd till utgivare och besökare, inklusive extra garantier mot censur. Onion-tjänster tillåter alla att tillhandahålla innehåll och tjänster anonymt. Klicka nedan för att besöka DuckDuckGo-onion webbplatsen. +onboarding.tour-tor-onion-services.button=Besök en Onion # Circuit Display onboarding. onboarding.tor-circuit-display.next=Nästa onboarding.tor-circuit-display.done=Färdig -onboarding.tor-circuit-display.one-of-three=1 of 3 -onboarding.tor-circuit-display.two-of-three=2 of 3 -onboarding.tor-circuit-display.three-of-three=3 of 3 +onboarding.tor-circuit-display.one-of-three=1 av 3 +onboarding.tor-circuit-display.two-of-three=2 av 3 +onboarding.tor-circuit-display.three-of-three=3 av 3 -onboarding.tor-circuit-display.intro.title=How do circuits work? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.title=Hur fungerar kretsar? +onboarding.tor-circuit-display.intro.msg=Kretsar består av slumpmässigt tilldelade reläer, som är datorer runt om i världen konfigurerade för att vidarebefordra Tor-trafik. Kretsar kan du bläddra privat och ansluta till onion-tjänster. -onboarding.tor-circuit-display.diagram.title=Circuit Display -onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. +onboarding.tor-circuit-display.diagram.title=Kretsvisning +onboarding.tor-circuit-display.diagram.msg=Detta diagram visar reläer som utgör kretsen för denna webbplats. För att förhindra länkning av aktivitet över olika platser, varje webbplats får en annan krets. -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? -onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. +onboarding.tor-circuit-display.new-circuit.title=Behöver du en ny krets? +onboarding.tor-circuit-display.new-circuit.msg=Om du inte kan ansluta till webbplatsen du försöker besöka eller det inte laddas ordentligt, kan du använda den här knappen för att ladda om webbplatsen med en ny krets. diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties index 5069c79e..83f5eee7 100644 --- a/src/chrome/locale/sv/torbutton.properties +++ b/src/chrome/locale/sv/torbutton.properties @@ -51,5 +51,5 @@ profileAccessDenied=%S har inte rättighet att använda profilen. Vänligen änd profileMigrationFailed=Migrering av din befintliga %S profil misslyckades.\nNya inställningar kommer att användas. # .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=Anslutning krypterad (Onion-tjänst, %1$S, %2$S bit nycklar, %3$S) +pageInfo_OnionEncryption=Anslutning krypterad (Onion-tjänst) diff --git a/src/chrome/locale/tr/browserOnboarding.properties b/src/chrome/locale/tr/browserOnboarding.properties index 219f3037..1b10fd9a 100644 --- a/src/chrome/locale/tr/browserOnboarding.properties +++ b/src/chrome/locale/tr/browserOnboarding.properties @@ -9,7 +9,7 @@ onboarding.tour-tor-welcome.button=Başlayın onboarding.tour-tor-privacy=Kişisel Gizlilik onboarding.tour-tor-privacy.title=İzleyenlere ve meraklılara hadlerini bildirin. -onboarding.tour-tor-privacy.description=Tor Browser çerezleri yalıtır ve kapattıığınızda web tarayıcı geçmişinizi siler. Bu değişiklikler web tarayıcı üzerinde kişisel gizliliğinizin ve güvenliğinizin korunmasını sağlar. Ağ düzeyinde nasıl koruma sağladığımızı öğrenmek için 'Tor Ağo' üzerine tıklayın. +onboarding.tour-tor-privacy.description=Tor Browser çerezleri yalıtır ve kapattığınızda web tarayıcı geçmişinizi siler. Bu değişiklikler web tarayıcı üzerinde kişisel gizliliğinizin ve güvenliğinizin korunmasını sağlar. Ağ düzeyinde nasıl koruma sağladığımızı öğrenmek için 'Tor Ağı' üzerine tıklayın. onboarding.tour-tor-privacy.button=Tor Ağına Geç onboarding.tour-tor-network=Tor Ağı diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index e349d913..358a958a 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -42,7 +42,7 @@ <!ENTITY torbutton.prefs.sec_safest_description "Yalnız durağan siteler ve temel hizmetler için gerekli web sitesi özelliklerine izin verilir. Bu değişiklikler görselleri, ortamları ve betikleri etkiler."> <!ENTITY torbutton.prefs.sec_safest_list_label "En güvenli ayarlar kullanıldığında:"> <!ENTITY torbutton.prefs.sec_learn_more_label "Ayrıntılı bilgi alın"> -<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript,,HTTPS kullanmayan sitelerde devre dışı bırakılır."> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript, HTTPS kullanmayan sitelerde devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript betikleri tüm sitelerde varsayılan olarak devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_limit_typography "Bazı yazı türleri ve matematik simgeleri devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Bazı yazı türleri, simgeler, matematik simgeleri ve görseller devre dışı bırakılır."> diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd index 502cbb8c..f61e2a91 100644 --- a/src/chrome/locale/zh-CN/aboutTor.dtd +++ b/src/chrome/locale/zh-CN/aboutTor.dtd @@ -27,16 +27,16 @@ <!ENTITY aboutTor.newsletter.tagline "通过邮件获取 Tor 的最新消息。"> <!ENTITY aboutTor.newsletter.link_text "注册 Tor 新闻列表"> -<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> +<!ENTITY aboutTor.donationBanner.line1 "Tor：众人拾柴火焰高"> -<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> -<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> -<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> -<!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.line2a "匿名的表示对公司的爱意。"> +<!ENTITY aboutTor.donationBanner.line2b "推进基本人权。"> +<!ENTITY aboutTor.donationBanner.line2c "为自由呐喊。"> +<!ENTITY aboutTor.donationBanner.line2d "保护数百万人的隐私。"> +<!ENTITY aboutTor.donationBanner.line2e "让 Tor 网络保持健壮。"> +<!ENTITY aboutTor.donationBanner.line2f "我们需要你的帮助！"> -<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> +<!ENTITY aboutTor.donationBanner.line3 "现在捐款， Mozilla 也能从你的捐赠中受益。"> -<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> -<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> +<!ENTITY aboutTor.donationBanner.buttonA "现在就捐助"> +<!ENTITY aboutTor.donationBanner.buttonB "算我一个">

1 0

[torbutton/maint-2.0] Bug 25013: Make `en` a symlink of `en-US` instead
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 35112aa867b4657dc5cc0658c673293d6ca08054 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 12 13:14:25 2018 +0000 Bug 25013: Make `en` a symlink of `en-US` instead --- src/chrome/locale/en | 1 + src/chrome/locale/en-US | 1 - src/chrome/locale/{en => en-US}/aboutDialog.dtd | 0 src/chrome/locale/{en => en-US}/aboutTBUpdate.dtd | 0 src/chrome/locale/{en => en-US}/aboutTor.dtd | 0 src/chrome/locale/{en => en-US}/brand.dtd | 0 src/chrome/locale/{en => en-US}/brand.properties | 0 src/chrome/locale/{en => en-US}/browserOnboarding.properties | 0 src/chrome/locale/{en => en-US}/torbutton.dtd | 0 src/chrome/locale/{en => en-US}/torbutton.properties | 0 10 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en b/src/chrome/locale/en new file mode 120000 index 00000000..f2b0341f --- /dev/null +++ b/src/chrome/locale/en @@ -0,0 +1 @@ +en-US \ No newline at end of file diff --git a/src/chrome/locale/en-US b/src/chrome/locale/en-US deleted file mode 120000 index 2c4c454f..00000000 --- a/src/chrome/locale/en-US +++ /dev/null @@ -1 +0,0 @@ -en \ No newline at end of file diff --git a/src/chrome/locale/en/aboutDialog.dtd b/src/chrome/locale/en-US/aboutDialog.dtd similarity index 100% rename from src/chrome/locale/en/aboutDialog.dtd rename to src/chrome/locale/en-US/aboutDialog.dtd diff --git a/src/chrome/locale/en/aboutTBUpdate.dtd b/src/chrome/locale/en-US/aboutTBUpdate.dtd similarity index 100% rename from src/chrome/locale/en/aboutTBUpdate.dtd rename to src/chrome/locale/en-US/aboutTBUpdate.dtd diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en-US/aboutTor.dtd similarity index 100% rename from src/chrome/locale/en/aboutTor.dtd rename to src/chrome/locale/en-US/aboutTor.dtd diff --git a/src/chrome/locale/en/brand.dtd b/src/chrome/locale/en-US/brand.dtd similarity index 100% rename from src/chrome/locale/en/brand.dtd rename to src/chrome/locale/en-US/brand.dtd diff --git a/src/chrome/locale/en/brand.properties b/src/chrome/locale/en-US/brand.properties similarity index 100% rename from src/chrome/locale/en/brand.properties rename to src/chrome/locale/en-US/brand.properties diff --git a/src/chrome/locale/en/browserOnboarding.properties b/src/chrome/locale/en-US/browserOnboarding.properties similarity index 100% rename from src/chrome/locale/en/browserOnboarding.properties rename to src/chrome/locale/en-US/browserOnboarding.properties diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en-US/torbutton.dtd similarity index 100% rename from src/chrome/locale/en/torbutton.dtd rename to src/chrome/locale/en-US/torbutton.dtd diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en-US/torbutton.properties similarity index 100% rename from src/chrome/locale/en/torbutton.properties rename to src/chrome/locale/en-US/torbutton.properties

1 0

[torbutton/maint-2.0] Translations update
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 58b0cc18ebfb78ea2012d38baac34fcf4ffa42fb Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 14 15:11:31 2018 +0000 Translations update --- src/chrome/locale/de/browserOnboarding.properties | 16 ++++++++-------- src/chrome/locale/ko/torbutton.dtd | 22 +++++++++++----------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/chrome/locale/de/browserOnboarding.properties b/src/chrome/locale/de/browserOnboarding.properties index 1243128c..d57b3f15 100644 --- a/src/chrome/locale/de/browserOnboarding.properties +++ b/src/chrome/locale/de/browserOnboarding.properties @@ -15,11 +15,11 @@ onboarding.tour-tor-privacy.button=Öffne Tor-Netzwerk onboarding.tour-tor-network=Tor-Netzwerk onboarding.tour-tor-network.title=Bereise ein dezentrales Netzwerk. onboarding.tour-tor-network.description=Der Tor Browser verbindet sich mit dem Tor-Netzwerk, das von tausenden Freiwilligen betrieben wird. Anders als bei einem VPN gibt es keinen zentralen Punkt, dem vertraut werden muss, um das Internet privat zu nutzen. -onboarding.tour-tor-network.button=Circuit-Ansicht öffnen +onboarding.tour-tor-network.button=Kanal-Ansicht öffnen -onboarding.tour-tor-circuit-display=Circuit-Ansicht +onboarding.tour-tor-circuit-display=Kanal-Ansicht onboarding.tour-tor-circuit-display.title=Zeige deinen Pfad -onboarding.tour-tor-circuit-display.description=Für jede Webseite wandern Anfragen und Antworten mehrfach verschlüsselt über drei Server (Relays) um die Welt. Keine Webseite weiß, woher die Verbindung ursprünglich kommt. Um eine Webseite über einen neuen Pfad erneut zu laden, klicke auf das Informations-Symbol in der Adressleiste und wähle "Neuer Pfad für diese Seite". +onboarding.tour-tor-circuit-display.description=Für jede Webseite wandern Anfragen und Antworten mehrfach verschlüsselt über drei Server (Relays) um die Welt. Keine Webseite weiß, woher die Verbindung ursprünglich kommt. Um eine Webseite über einen neuen Kanal erneut zu laden, öffne die Kanal-Ansicht und klicke "Neuer Kanal für diese Seite". onboarding.tour-tor-circuit-display.button=Meinen Pfad sehen onboarding.tour-tor-security=Sicherheit @@ -44,11 +44,11 @@ onboarding.tor-circuit-display.one-of-three=1 von 3 onboarding.tor-circuit-display.two-of-three=2 von 3 onboarding.tor-circuit-display.three-of-three=3 von 3 -onboarding.tor-circuit-display.intro.title=Wie funktionieren Circuits? -onboarding.tor-circuit-display.intro.msg=Circuits bestehen aus zufällig zugeordneten Relays, d.h. Computern auf der ganzen Welt, die konfiguriert sind, um Torverkehr weiterzuleiten. Circuits ermöglichen es Ihnen, privat zu surfen und sich mit Onion-Diensten zu verbinden.\n +onboarding.tor-circuit-display.intro.title=Wie funktionieren Kanäle? +onboarding.tor-circuit-display.intro.msg=Kanäle bestehen aus zufällig zugeordneten Relays, d.h. Server auf der ganzen Welt, die konfiguriert sind, um Torverkehr weiterzuleiten. Kanäle ermöglichen es Ihnen, privat zu surfen und sich mit Onion-Diensten zu verbinden.\n -onboarding.tor-circuit-display.diagram.title=Circuit-Ansicht -onboarding.tor-circuit-display.diagram.msg=Dieses Diagramm zeigt die Relays, aus denen die Circuits für diese Website besteht. Um zu verhindern, dass Aktivitäten zwischen verschiedenen Standorten verlinkt werden, erhält jede Website einen anderen Circuit. +onboarding.tor-circuit-display.diagram.title=Kanal-Ansicht +onboarding.tor-circuit-display.diagram.msg=Dieses Diagramm zeigt die Relays, die den Kanal für diese Website bilden. Um zu verhindern, dass Aktivitäten zwischen verschiedenen Standorten verlinkt werden, nutzt Tor Browser für jede Website einen eigenen Kanal. onboarding.tor-circuit-display.new-circuit.title=Brauchen Sie einen neuen Circuit? -onboarding.tor-circuit-display.new-circuit.msg=Wenn Sie keine Verbindung zu der Website herstellen können, die Sie besuchen möchten, oder wenn sie nicht richtig geladen wird, können Sie diese Schaltfläche verwenden, um die Website über einen neuen Circuit zu laden. +onboarding.tor-circuit-display.new-circuit.msg=Wenn Sie keine Verbindung zu der Website herstellen können, die Sie besuchen möchten, oder wenn sie nicht richtig geladen wird, können Sie diese Schaltfläche verwenden, um die Website über einen neuen Kanal zu laden. diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd index 5daf9f14..b23701b2 100644 --- a/src/chrome/locale/ko/torbutton.dtd +++ b/src/chrome/locale/ko/torbutton.dtd @@ -34,18 +34,18 @@ <!ENTITY torbutton.prefs.sec_caption "보안 등급"> <!ENTITY torbutton.prefs.sec_caption_tooltip "보안 슬라이더를 사용하면 특정 브라우저 기능이 비활성화 되어 브라우저가 해킹 시도에 취약해질 수 있습니다."> <!ENTITY torbutton.prefs.sec_standard_label "표준"> -<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled."> -<!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_standard_description "모든 Tor 브라우저와 웹사이트의 기능들이 활성화 됩니다."> +<!ENTITY torbutton.prefs.sec_safer_label "더 안전합니다"> +<!ENTITY torbutton.prefs.sec_safer_description "이 설정으로 흔히 위험한 웹사이트의 기능이 비활성화하면 일부의 사이트의 기능들을 사용 할 수 없습니다."> +<!ENTITY torbutton.prefs.sec_safer_list_label "더 안전한 설정을 선택하고 있습니다:"> +<!ENTITY torbutton.prefs.sec_safest_label "제일 안전합니다"> +<!ENTITY torbutton.prefs.sec_safest_description "정적 사이트와 기본 서비스에 필요한 기능이만 용남합니다. 그 변경들은 사진이며 메디아며 스크립트를 영향할 것입니다."> +<!ENTITY torbutton.prefs.sec_safest_list_label "제일 안전한 설정을 선택하고 있습니다:"> <!ENTITY torbutton.prefs.sec_learn_more_label "더 알아보기"> -<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites."> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript가 HTTPS을 적용되지 않은 사이트에서 비활성화 됩니다."> <!ENTITY torbutton.prefs.sec_js_disabled "자바 스크립트는 기본 설정으로 모든 사이트에서 비활성화 되어 있습니다."> -<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled."> -<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled."> +<!ENTITY torbutton.prefs.sec_limit_typography "일부 글꼴이며 수학기호가 비활성화 됩니다."> +<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "일부 글꼴이며 상징이며 수학기호며 사진이 비활성화 됩니다."> <!ENTITY torbutton.prefs.sec_click_to_play_media "오디오와 동영상(HTML5 media) 보려면 누르십시오."> <!ENTITY torbutton.circuit_display.title "토르 서킷"> -<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> +<!ENTITY torbutton.circuit_display.new_circuit "이 사이트에서 새로운 서킷을 재구축">

1 0

[torbutton/maint-2.0] Translations update
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 88217558dfd94569b492a4c15190bc14da6d04e4 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 »">  <!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

[tor-browser/tor-browser-60.3.0esr-8.0-1] Bug 680300 - Part 1: Stopping reporting errors when loading an unknown external protocol. r=smaug
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit d0571f8b98a5a98e59974b4868c0fcccaea17748 Author: Tim Huang <tihuang(a)mozilla.com> Date: Tue Sep 25 07:50:28 2018 +0000 Bug 680300 - Part 1: Stopping reporting errors when loading an unknown external protocol. r=smaug This patch makes the docshell not to report an error if it is a unknown protocol error. However, we will still display the error page in this case. Differential Revision: https://phabricator.services.mozilla.com/D3492 --HG-- extra : moz-landing-system : lando --- docshell/base/nsDocShell.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 120b8c8b880b..e95855dd3e9f 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -10486,6 +10486,13 @@ nsDocShell::InternalLoad(nsIURI* aURI, (aFlags & LOAD_FLAGS_ERROR_LOAD_CHANGES_RV) != 0) { return NS_ERROR_LOAD_SHOWED_ERRORPAGE; } + + // We won't report any error if this is an unknown protocol error. The reason + // behind this is that it will allow enumeration of external protocols if + // we report an error for each unknown protocol. + if (NS_ERROR_UNKNOWN_PROTOCOL == rv) { + return NS_OK; + } } return rv;

1 0

[tor-browser/tor-browser-60.3.0esr-8.0-1] Bug 680300 - Part 2: Add a test case for ensuring no error reporting when loading an unknown protocol. r=smaug
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 818556471232f9a9a4caebc3c37cae387a43bbd7 Author: Tim Huang <tihuang(a)mozilla.com> Date: Sun Sep 23 22:24:05 2018 +0000 Bug 680300 - Part 2: Add a test case for ensuring no error reporting when loading an unknown protocol. r=smaug This test case will try to navigate an iframe to an unknown protocol and check whether no errors been reported. Differential Revision: https://phabricator.services.mozilla.com/D3493 --HG-- extra : moz-landing-system : lando --- uriloader/exthandler/tests/mochitest/mochitest.ini | 1 + .../test_unknown_ext_protocol_handlers.html | 28 ++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/uriloader/exthandler/tests/mochitest/mochitest.ini b/uriloader/exthandler/tests/mochitest/mochitest.ini index 266d783e569b..12ffa16a4233 100644 --- a/uriloader/exthandler/tests/mochitest/mochitest.ini +++ b/uriloader/exthandler/tests/mochitest/mochitest.ini @@ -8,5 +8,6 @@ support-files = [test_handlerApps.xhtml] skip-if = (toolkit == 'android' || os == 'mac') || e10s # OS X: bug 786938 scheme = https +[test_unknown_ext_protocol_handlers.html] [test_unsafeBidiChars.xhtml] [test_web_protocol_handlers.html] diff --git a/uriloader/exthandler/tests/mochitest/test_unknown_ext_protocol_handlers.html b/uriloader/exthandler/tests/mochitest/test_unknown_ext_protocol_handlers.html new file mode 100644 index 000000000000..9a399e486257 --- /dev/null +++ b/uriloader/exthandler/tests/mochitest/test_unknown_ext_protocol_handlers.html @@ -0,0 +1,28 @@ +<!DOCTYPE html> +<html> +<head> + <title>Test for no error reporting for unknown external protocols</title> + <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> + <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> +</head> +<body> +<iframe id="testFrame"></iframe> +<script type="text/javascript"> + +SimpleTest.waitForExplicitFinish(); + +window.onload = () => { + let testFrame = document.getElementById("testFrame"); + + try { + testFrame.contentWindow.location.href = "unknownextproto:"; + ok(true, "There is no error reporting for unknown external protocol navigation."); + } catch (e) { + ok(false, "There should be no error reporting for unknown external protocol navigation."); + } + + SimpleTest.finish(); +} +</script> +</body> +</html>

1 0

[tor-browser/tor-browser-60.3.0esr-8.0-1] Bug 680300 - Part 3: Make the client.navigate() not to reference the baseURL if it navigates to a view-source URL r=asuth
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit bec054919416df19648702f2af0b9a0be1c384b8 Author: Tim Huang <tihuang(a)mozilla.com> Date: Mon Sep 24 18:22:26 2018 +0000 Bug 680300 - Part 3: Make the client.navigate() not to reference the baseURL if it navigates to a view-source URL r=asuth The suppressing of the error NS_ERROR_UNKNOWN_PROTOCOL will break the web-platform-test 'windowclient-navigate.https.html' since navigating to an invalid view-source url through the client API won't receive any error due to the suppressing. So the test will time-out since it waits for an error. While navigating to an invalid view-source url with its inner url as relative, this will pass the validity check we have right now and do the navigation because of it takes account the baseURL while doing the check. The invalid view-source url will be resolved into a valid view-source url in the case. Fortunately, we won't encounter any issue in the test in the past since the docShell will block this loading because it's loading a view-source url inside an iframe and reports a NS_ERROR_UNKNOWN_PROTOCOL error. But, we should faild with a NS_ERROR_MALFORMED_URI error when doing the URL validity check. For addressing this, this patch makes the client.navigate to not take the baseURL into account if it is a view-source URL. Differential Revision: https://phabricator.services.mozilla.com/D6587 --HG-- extra : moz-landing-system : lando --- dom/clients/manager/ClientNavigateOpChild.cpp | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dom/clients/manager/ClientNavigateOpChild.cpp b/dom/clients/manager/ClientNavigateOpChild.cpp index b6a8e70b7356..1e6cc50da41d 100644 --- a/dom/clients/manager/ClientNavigateOpChild.cpp +++ b/dom/clients/manager/ClientNavigateOpChild.cpp @@ -15,6 +15,7 @@ #include "nsIWebProgressListener.h" #include "nsNetUtil.h" #include "nsPIDOMWindow.h" +#include "nsURLHelper.h" namespace mozilla { namespace dom { @@ -185,8 +186,24 @@ ClientNavigateOpChild::DoNavigate(const ClientNavigateOpConstructorArgs& aArgs) return ref.forget(); } + // There is an edge case for view-source url here. According to the wpt test + // windowclient-navigate.https.html, a view-source URL with a relative inner + // URL should be treated as an invalid URL. However, we will still resolve it + // into a valid view-source URL since the baseURL is involved while creating + // the URI. So, an invalid view-source URL will be treated as a valid URL + // in this case. To address this, we should not take the baseURL into account + // for the view-source URL. + bool shouldUseBaseURL = true; + nsAutoCString scheme; + if (NS_SUCCEEDED(net_ExtractURLScheme(aArgs.url(), scheme)) && + scheme.LowerCaseEqualsLiteral("view-source")) { + shouldUseBaseURL = false; + } + nsCOMPtr<nsIURI> url; - rv = NS_NewURI(getter_AddRefs(url), aArgs.url(), nullptr, baseURL); + rv = NS_NewURI(getter_AddRefs(url), aArgs.url(), + nullptr, shouldUseBaseURL ? baseURL.get() + : nullptr); if (NS_FAILED(rv)) { ref = ClientOpPromise::CreateAndReject(rv, __func__); return ref.forget();

1 0

[tor-browser-build/maint-8.0] Bug 26263: app icon positioned incorrectly in macOS DMG installer window
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit cb37fc36ffb8d21c99e90a61b6a31a8981b64e41 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Oct 16 17:29:59 2018 +0000 Bug 26263: app icon positioned incorrectly in macOS DMG installer window Use a new .DS_Store file that has the correct app icon position. Incorporate a new background image with updated Tor Browser branding, including @1x and @2x (Retina) images. Remove the .fseventsd/ directory, which is not needed in a DMG. These changes also fix bug 25151: Update Tor Browser branding on installation. --- .../Bundle-Data/mac-applications.dmg/.DS_Store | Bin 12292 -> 15365 bytes .../mac-applications.dmg/.background/background.png | Bin 50020 -> 0 bytes .../.background/background.tiff | Bin 0 -> 36170 bytes .../.fseventsd/0000000000400c60 | Bin 173 -> 0 bytes .../mac-applications.dmg/.fseventsd/fseventsd-uuid | 1 - 5 files changed, 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.DS_Store b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.DS_Store index aeb3104..deb29a7 100644 Binary files a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.DS_Store and b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.DS_Store differ diff --git a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.background/background.png b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.background/background.png deleted file mode 100644 index 94e4584..0000000 Binary files a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.background/background.png and /dev/null differ diff --git a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.background/background.tiff b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.background/background.tiff new file mode 100644 index 0000000..5d28d71 Binary files /dev/null and b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.background/background.tiff differ diff --git a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 deleted file mode 100644 index e21068d..0000000 Binary files a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 and /dev/null differ diff --git a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid deleted file mode 100644 index 538367d..0000000 --- a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid +++ /dev/null @@ -1 +0,0 @@ -B29020CB-1603-4E1C-8C56-5C8A4434D120 \ No newline at end of file

1 0

[tor-browser-build/maint-8.0] Bug 27218: generate multiple bundles in parallel
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 2d129f5c6b282c6e9e915339f7b4dfb0f54b5a80 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Oct 10 01:33:59 2018 +0200 Bug 27218: generate multiple bundles in parallel --- projects/tor-browser/build | 28 ++++++++++++++++++++++------ projects/tor-browser/config | 16 ++++++++++------ projects/tor-browser/ddmg.sh | 10 +++++----- projects/tor-browser/run_scripts | 30 ++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 17 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 4d51ec6..68050f9 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -5,6 +5,9 @@ export TORBROWSER_VERSION='[% c("version") %]' mkdir -p $distdir +scripts_dir=/var/tmp/build_scripts +mkdir -p "$scripts_dir" + OUTDIR='[% dest_dir _ "/" _ c("filename") %]' mkdir -p $OUTDIR @@ -252,8 +255,6 @@ popd mv $distdir/tbb-windows-installer ${TB_STAGE_DIR} [% END %] -cp -a ${TB_STAGE_DIR} $distdir/$PKG_DIR - [% IF c("var/windows") %] TBDIR="$distdir/$PKG_DIR/Tor Browser/Browser" [% ELSIF c("var/osx") %] @@ -262,6 +263,11 @@ cp -a ${TB_STAGE_DIR} $distdir/$PKG_DIR TBDIR="$distdir/$PKG_DIR/Browser" [% END %] +cat > "$scripts_dir/create-$PKG_DIR" << SCRIPT_EOF +#!/bin/bash +set -e +cp -a ${TB_STAGE_DIR} $distdir/$PKG_DIR + pushd "$TBDIR[% IF c("var/osx") %]/Contents/Resources/[% END %]" rm -f precomplete python $MARTOOLS/createprecomplete.py @@ -271,8 +277,8 @@ cd $distdir [% IF c("var/build_mar") -%] # Create full MAR file and compressed package. - MAR_FILE=tor-browser-[% c("var/mar_osname") %]-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.mar - MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "$TBDIR" + [% SET mar_file = 'tor-browser-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_${PKG_LOCALE}.mar' %] + MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/[% mar_file %] "$TBDIR" [% END -%] [% IF c("var/linux") %] @@ -298,6 +304,7 @@ cd $distdir popd [% END %] rm -rf $distdir/${PKG_DIR} +SCRIPT_EOF cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% IF c("var/linux-x86_64") -%] @@ -314,6 +321,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% SET lang = tmpl(lang); SET xpi = '$rootdir/' _ c('input_files_by_name/firefox-langpacks') _ '/' _ lang _ '.xpi'; SET tbdir = '$distdir/tor-browser_' _ lang; + SET mar_file = 'tor-browser-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_' _ lang _ '.mar'; IF c("var/osx"); SET browserdir = tbdir _ '/Tor Browser.app'; ELSIF c("var/windows"); @@ -322,6 +330,9 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ SET browserdir = tbdir _ '/Browser'; END; %] + cat > "$scripts_dir/create-tor-browser_[% lang %]" << SCRIPT_EOF +#!/bin/bash + set -e cp -a ${TB_STAGE_DIR} [% tbdir %] cp [% xpi %] "[% browserdir %]/$EXTSPATH/langpack-[% lang %](a)firefox.mozilla.org.xpi" @@ -349,9 +360,10 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ python $MARTOOLS/createprecomplete.py popd + cd $distdir + # Create full MAR file and compressed package for this locale. - MAR_FILE=tor-browser-[% c("var/mar_osname") %]-[% c("var/torbrowser_version") %]_[% lang %].mar - MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "[% browserdir %]" + MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/[% mar_file %] "[% browserdir %]" [% IF c("var/linux") %] [% SET tardir = 'tor-browser_' _ lang; c('tar', { @@ -380,5 +392,9 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ popd [% END %] rm -rf [% tbdir %] +SCRIPT_EOF [% END %] [% END %] + +chmod 775 $rootdir/run_scripts "$scripts_dir"/* +$rootdir/run_scripts [% c("buildconf/num_procs") %] "$scripts_dir" diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 50d67e0..bb1c259 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -6,6 +6,14 @@ var: container: use_container: 1 ddmg: '[% INCLUDE ddmg.sh %]' + deps: + - python + - libparallel-forkmanager-perl + - libfile-slurp-perl + - zip + - unzip + - bzip2 + - xz-utils targets: linux-i686: @@ -17,14 +25,9 @@ targets: osx-x86_64: var: mar_osname: osx64 - deps: + arch_deps: - genisoimage - - zip - - unzip - - python - - bzip2 - faketime - - xz-utils windows: var: arch_deps: @@ -41,6 +44,7 @@ targets: input_files: - project: container-image + - filename: run_scripts - project: firefox name: firefox - project: tor diff --git a/projects/tor-browser/ddmg.sh b/projects/tor-browser/ddmg.sh index a715300..97fddb1 100755 --- a/projects/tor-browser/ddmg.sh +++ b/projects/tor-browser/ddmg.sh @@ -4,8 +4,8 @@ find [% src %] ! -executable -exec chmod 0644 {} \; find [% src %] -exec [% c("var/touch") %] {} \; -dmg_tmpdir=$(mktemp -d) -[% SET filelist = '"$dmg_tmpdir/filelist.txt"' %] +dmg_tmpdir=\$(mktemp -d) +[% SET filelist = '"\$dmg_tmpdir/filelist.txt"' %] pushd [% src %] find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > [% filelist %] find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> [% filelist %] @@ -13,9 +13,9 @@ find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> [% filelis export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" -genisoimage -D -V "Tor Browser" -no-pad -R -apple -o "$dmg_tmpdir/tbb-uncompressed.dmg" -path-list [% filelist %] -graft-points -gid 20 -dir-mode 0755 -new-dir-mode 0755 +genisoimage -D -V "Tor Browser" -no-pad -R -apple -o "\$dmg_tmpdir/tbb-uncompressed.dmg" -path-list [% filelist %] -graft-points -gid 20 -dir-mode 0755 -new-dir-mode 0755 -dmg dmg "$dmg_tmpdir/tbb-uncompressed.dmg" [% c('dmg_out', { error_if_undef => 1 }) %] +dmg dmg "\$dmg_tmpdir/tbb-uncompressed.dmg" [% c('dmg_out', { error_if_undef => 1 }) %] popd -rm -Rf "$dmg_tmpdir" +rm -Rf "\$dmg_tmpdir" diff --git a/projects/tor-browser/run_scripts b/projects/tor-browser/run_scripts new file mode 100755 index 0000000..4b85b50 --- /dev/null +++ b/projects/tor-browser/run_scripts @@ -0,0 +1,30 @@ +#!/usr/bin/perl -w +use strict; + +use Parallel::ForkManager; +use File::Slurp; + +sub exit_error { + print STDERR "Error: ", $_[0], "\n"; + chdir '/'; + exit (exists $_[1] ? $_[1] : 1); +} + +exit_error "Wrong number of arguments" unless @ARGV == 2; +my ($nb_threads, $scripts_dir) = @ARGV; +exit_error "Could not enter $scripts_dir" unless chdir $scripts_dir; +my $pm = Parallel::ForkManager->new($nb_threads); +$pm->run_on_finish( + sub { + my ($pid, $exit, $id) = @_; + exit_error "Error running $id" unless $exit == 0; + print "Finished $id\n"; + } +); +foreach my $script (sort(read_dir($scripts_dir))) { + $pm->start($script) and next; + print "Running $script\n"; + exit_error "Error running $script" unless system("./$script") == 0; + $pm->finish; +} +$pm->wait_all_children;

1 0

[tor-browser/tor-browser-60.3.0esr-8.0-1] Bug 26381: about:tor page does not load on first start on Windows
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit dcf7cc2acd095e27d82b16424d4d23fb9b5d7559 Author: Richard Pospesel <richard(a)torproject.org> Date: Sat Sep 15 04:01:17 2018 +0000 Bug 26381: about:tor page does not load on first start on Windows Child content processes require certain directories to be marked as readable or writeable when Sandboxing is enabled. The directories to be whitelisted are saved in static variables in sandboxBroker.cpp and are initialized in SandboxBroker::GeckoDependentInitialize(). Any child content process which is created before these directories are saved will be unable to read or write to them. The tor-launcher extension triggers the creation of a content process which hosts the tor network configuration settings window. This process is created before the whitelisted directories are saved. The network settings process doesn't need access to these directories to function, but subsequent content processes which are created once the settings window exits do need these directories to function. Sometimes, the creation of these subsequent processes is slow enough for the parent process to 'catch up' and create the whitelist resulting in the broken about:tor tab or broken white tab. A previous iteration of this patch moved the GeckoDependentInitialize() call directly above the call to DoStartup(). However, Mozilla dev Bob Owen objected to this since this places the call before various services are initialized which the SandboxBroker may depend on. Some experimentation would seem to confirm his objections: placing the whitelist init just prior to DoStartup() results in an empty value for the profile directory which prevents child processes reading the chrome and extensions directory. This patch inserts the GeckoDependentInitialize() call into DoStartup() just after the profile directory is known and queryable by the SandboxBroker, and before the 'profile-after-change' notification is fired. It also reverts the temp fix which reduced the sandbox level to 2 on windows. --- browser/app/profile/000-tor-browser.js | 5 ----- toolkit/xre/nsAppRunner.cpp | 6 ------ toolkit/xre/nsXREDirProvider.cpp | 19 +++++++++++++++++++ 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 07005f326580..8f74748f2072 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -330,11 +330,6 @@ pref("browser.onboarding.newtour", "welcome,privacy,tor-network,circuit-display, pref("browser.onboarding.updatetour", "welcome,privacy,tor-network,circuit-display,security,expect-differences,onion-services"); pref("browser.onboarding.skip-tour-button.hide", true); -#ifdef XP_WIN -// For now, reduce sandboxing level to 2 (see #26381). -pref("security.sandbox.content.level", 2); -#endif - #ifdef TOR_BROWSER_VERSION #expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); #endif diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 1000014aedd0..7889919ca677 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -5249,12 +5249,6 @@ XREMain::XRE_mainRun() // We intentionally leak the string here since it is required by PR_SetEnv. PR_SetEnv(saved.release()); } - -#if defined(MOZ_SANDBOX) - // Call SandboxBroker to initialize things that depend on Gecko machinery like - // the directory provider. - SandboxBroker::GeckoDependentInitialize(); -#endif #endif SaveStateForAppInitiatedRestart(); diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp index b54985292e81..72545d0eb422 100644 --- a/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp @@ -66,6 +66,10 @@ #include "UIKitDirProvider.h" #endif +#if defined(MOZ_SANDBOX) && defined(XP_WIN) +#include "sandboxBroker.h" +#endif + #if defined(MOZ_CONTENT_SANDBOX) #include "mozilla/SandboxSettings.h" #include "nsIUUIDGenerator.h" @@ -1003,6 +1007,21 @@ nsXREDirProvider::DoStartup() policies->Observe(nullptr, "policies-startup", nullptr); } + #if defined(MOZ_SANDBOX) && defined(XP_WIN) + // Call SandboxBroker to initialize things that depend on Gecko machinery like + // the directory provider. + + // We insert this initialization code here so that any child content processes spawned by + // extensions (such as tor-launcher launching the network configuration window) will have + // all the requisite directories white-listed for read/write access + + // It's inserted here (rather than in XREMain::XRE_mainRun) because we need + // NS_APP_USER_PROFILE_50_DIR to be known + + // See tor bug #26381 and mozilla bug #1485836 + SandboxBroker::GeckoDependentInitialize(); + #endif + // Init the Extension Manager nsCOMPtr<nsIObserver> em = do_GetService("@mozilla.org/addons/integration;1"); if (em) {

1 0

[tor-browser-build/maint-8.0] Bug 26475: Disable building Rust with Thin LTO
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit dd1d00a2fed85c8bb22c4f85bbc45da00d0e8c05 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 15 09:48:59 2018 +0000 Bug 26475: Disable building Rust with Thin LTO Building Rust with Thin LTO enabled leads to Tor Browser builds on macOS and probably Linux not being reproducible. The exact reason for that is unknown at the moment, although it seems fixed testing nightly Rust source tarballs as of mid-September 2018. We therefore disable Thin LTO for now by setting `codegen-units` to `1`. --- projects/firefox/mozconfig-osx-x86_64 | 3 --- projects/rust/build | 10 ++++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 7ff17e1..1e30084 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -48,9 +48,6 @@ ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests -# We need to disable for Stylo right now, as we have reproducibility issues on -# macOS with it enabled, see: #26475. -ac_add_options --disable-stylo # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme # ac_add_options --disable-ctypes diff --git a/projects/rust/build b/projects/rust/build index 936f49f..61a5d50 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -65,6 +65,16 @@ cd /var/tmp/build/rustc-[% c('version') %]-src mkdir build cd build ../configure --prefix=$distdir [% c("var/configure_opt") %] + +# We need to disable Thin LTO due to reproducibility issues on macOS and +# probably Linux. Alas, there is no direct option available in the config.toml +# in 1.26.1 yet, so we need to toggle this indirectly via `codegen-units`. +[% IF c("var/osx") || c("var/linux") %] + # It seems hard to pass the proper value via ./configure so we resort to our + # old friend `sed`. + sed -i 's/#codegen-units = 1/codegen-units = 1/' config.toml +[% END %] + make -j[% c("buildconf/num_procs") %] make install cd /var/tmp/dist

1 0

[tor-browser-build/maint-8.0] Update rbm to pick up fix for #28466
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 316463d531d66b0d8d5978fcaaa06f5d3eed0de7 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

[torbutton/master] Bug 28075: Tone down missing SOCKS credential warning
by gk＠torproject.org 04 Dec '18

04 Dec '18

commit 0b60f61087b514f74ea21513f14e691c2bd30493 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Oct 17 06:48:20 2018 +0000 Bug 28075: Tone down missing SOCKS credential warning --- src/chrome/content/tor-circuit-display.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index 6105fea1..5fc92e48 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -310,7 +310,7 @@ let updateCircuitDisplay = function () { (nodeData[0].type === "bridge") ? "none" : "block"; } else { // Only show the Tor circuit if we have credentials and node data. - logger.eclog(5, "no SOCKS credentials found for current document."); + logger.eclog(4, "no SOCKS credentials found for current document."); } showCircuitDisplay(domain && nodeData); };

1 0

[tor-browser/tor-browser-60.3.0esr-8.0-1] Bug 1503354 - Disable background HTTP response throttling for causing visible regressions. r=dragana, a=pascalc
by gk＠torproject.org 04 Dec '18

04 Dec '18

commit d69efa2fe8f1fcb625d74251283cfa0e4f25cc01 Author: Honza Bambas <honzab.moz(a)firemni.cz> Date: Wed Oct 31 02:13:00 2018 -0400 Bug 1503354 - Disable background HTTP response throttling for causing visible regressions. r=dragana, a=pascalc --HG-- extra : source : 1ed273626bbd38cde17d7610ac5d7dad0aca91c1 extra : intermediate-source : c89f12000b079c50362ce52e661e3c5e24836a11 This backport fixes our bug 28608. --- modules/libpref/init/all.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index f5a2ec47593a..e358cfcfcb2d 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -2275,9 +2275,9 @@ pref("network.auth.non-web-content-triggered-resources-http-auth-allow", false); // in that case default credentials will always be used. pref("network.auth.private-browsing-sso", false); -// Control how throttling of http responses works - number of ms that each -// suspend and resume period lasts (prefs named appropriately) -pref("network.http.throttle.enable", true); +// This feature is occasionally causing visible regressions (download too slow for +// too long time, jitter in video/audio in background tabs...) +pref("network.http.throttle.enable", false); pref("network.http.throttle.version", 1); // V1 prefs

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 1503354 - Disable background HTTP response throttling for causing visible regressions. r=dragana, a=pascalc
by gk＠torproject.org 04 Dec '18

04 Dec '18

commit 2789cecf98cd603f835711378d76ed06b4369609 Author: Honza Bambas <honzab.moz(a)firemni.cz> Date: Wed Oct 31 02:13:00 2018 -0400 Bug 1503354 - Disable background HTTP response throttling for causing visible regressions. r=dragana, a=pascalc --HG-- extra : source : 1ed273626bbd38cde17d7610ac5d7dad0aca91c1 extra : intermediate-source : c89f12000b079c50362ce52e661e3c5e24836a11 This backport fixes our bug 28608. --- modules/libpref/init/all.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index f5a2ec47593a..e358cfcfcb2d 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -2275,9 +2275,9 @@ pref("network.auth.non-web-content-triggered-resources-http-auth-allow", false); // in that case default credentials will always be used. pref("network.auth.private-browsing-sso", false); -// Control how throttling of http responses works - number of ms that each -// suspend and resume period lasts (prefs named appropriately) -pref("network.http.throttle.enable", true); +// This feature is occasionally causing visible regressions (download too slow for +// too long time, jitter in video/audio in background tabs...) +pref("network.http.throttle.enable", false); pref("network.http.throttle.version", 1); // V1 prefs

1 0

[tor-browser/tor-browser-60.3.0esr-8.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 04 Dec '18

04 Dec '18

commit 3c03aad30d2b2b0e92359f15a1a95cfb2354544e Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 21 10:02:20 2018 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Bug 25794 deals with pointer events and associated fingerprinting risks. There are patches we can backport from Mozilla, but they are not small and we should give them some baking time. Thus, let's disable pointer events for now. --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index bc7c4b05e3a1..07005f326580 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -150,6 +150,7 @@ pref("media.webspeech.synth.enabled", false); // Bug 10283: Disable SpeechSynthe pref("dom.webaudio.enabled", false); // Bug 13017: Disable Web Audio API pref("dom.maxHardwareConcurrency", 1); // Bug 21675: Spoof single-core cpu pref("dom.w3c_touch_events.enabled", 0); // Bug 10286: Always disable Touch API +pref("dom.w3c_pointer_events.enabled", false); pref("dom.vr.enabled", false); // Bug 21607: Disable WebVR for now // Disable randomised Firefox HTTP cache decay user test groups (Bug: 13575) pref("security.webauth.webauthn", false); // Bug 26614: Disable Web Authentication API for now

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 04 Dec '18

04 Dec '18

commit c20210b1a017c4e94157c1acfbef18e878202ff4 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 21 10:02:20 2018 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Bug 25794 deals with pointer events and associated fingerprinting risks. There are patches we can backport from Mozilla, but they are not small and we should give them some baking time. Thus, let's disable pointer events for now. --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 38f72579760a..8f74748f2072 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -150,6 +150,7 @@ pref("media.webspeech.synth.enabled", false); // Bug 10283: Disable SpeechSynthe pref("dom.webaudio.enabled", false); // Bug 13017: Disable Web Audio API pref("dom.maxHardwareConcurrency", 1); // Bug 21675: Spoof single-core cpu pref("dom.w3c_touch_events.enabled", 0); // Bug 10286: Always disable Touch API +pref("dom.w3c_pointer_events.enabled", false); pref("dom.vr.enabled", false); // Bug 21607: Disable WebVR for now // Disable randomised Firefox HTTP cache decay user test groups (Bug: 13575) pref("security.webauth.webauthn", false); // Bug 26614: Disable Web Authentication API for now

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 27762: Remove workarounds that allowed torbutton extension to load
by gk＠torproject.org 04 Dec '18

04 Dec '18

commit 057daaf3fa81f46d4a3653115990b462fe7b2551 Author: Igor Oliveira <igt0(a)torproject.org> Date: Tue Dec 4 07:18:46 2018 -0200 Bug 27762: Remove workarounds that allowed torbutton extension to load Since torbutton became a system extension, those workarounds (implemented in #27220 and #27271+#27763) are not needed anymore. --- mobile/android/app/000-tor-browser-android.js | 5 ----- toolkit/mozapps/extensions/internal/XPIInstall.jsm | 5 ----- 2 files changed, 10 deletions(-) diff --git a/mobile/android/app/000-tor-browser-android.js b/mobile/android/app/000-tor-browser-android.js index e7e337276acb..de51ec125406 100644 --- a/mobile/android/app/000-tor-browser-android.js +++ b/mobile/android/app/000-tor-browser-android.js @@ -54,10 +54,5 @@ pref("media.realtime_decoder.enabled", false); pref("general.useragent.updates.enabled", false); pref("general.useragent.updates.url", ""); -// Do not allow the user to install extensions from web -pref("xpinstall.enabled", false); -pref("extensions.enabledScopes", 1); -pref("extensions.autoDisableScopes", 1); - // Enable touch events on Android (highlighting text, etc) pref("dom.w3c_touch_events.enabled", 2); diff --git a/toolkit/mozapps/extensions/internal/XPIInstall.jsm b/toolkit/mozapps/extensions/internal/XPIInstall.jsm index 40b3b1d6434e..f97669951710 100644 --- a/toolkit/mozapps/extensions/internal/XPIInstall.jsm +++ b/toolkit/mozapps/extensions/internal/XPIInstall.jsm @@ -1029,11 +1029,6 @@ function getSignedStatus(aRv, aCert, aAddonID) { } function shouldVerifySignedState(aAddon) { - if (AppConstants.platform === "android" && - aAddon.id === "torbutton(a)torproject.org") { - return false; - } - // Updated system add-ons should always have their signature checked if (aAddon._installLocation.name == KEY_APP_SYSTEM_ADDONS) return true;

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 1322748 add ability to get registered channelwrappers, r=kmag
by gk＠torproject.org 03 Dec '18

03 Dec '18

commit c1774ae7fc74bef7956caca4fe1b8de1365f5d48 Author: Shane Caraveo <scaraveo(a)mozilla.com> Date: Tue May 22 14:19:57 2018 -0400 Bug 1322748 add ability to get registered channelwrappers, r=kmag MozReview-Commit-ID: SphwWjzQuo --HG-- extra : rebase_source : 0b5193d7f4e9e7f27f9a7d622699b673781c3dd4 --- dom/chrome-webidl/ChannelWrapper.webidl | 8 ++++++++ .../extensions/webrequest/ChannelWrapper.cpp | 18 ++++++++++++++++++ .../components/extensions/webrequest/ChannelWrapper.h | 2 +- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dom/chrome-webidl/ChannelWrapper.webidl b/dom/chrome-webidl/ChannelWrapper.webidl index b8d921cea58d..2777aab65c8e 100644 --- a/dom/chrome-webidl/ChannelWrapper.webidl +++ b/dom/chrome-webidl/ChannelWrapper.webidl @@ -49,6 +49,14 @@ interface ChannelWrapper : EventTarget { static ChannelWrapper get(MozChannel channel); /** + * Returns the wrapper instance for the given channel. The same wrapper is + * always returned for a given channel. + */ + static ChannelWrapper getRegisteredChannel(unsigned long long aChannelId, + WebExtensionPolicy extension, + TabParent? tabParent); + + /** * A unique ID for for the requests which remains constant throughout the * redirect chain. */ diff --git a/toolkit/components/extensions/webrequest/ChannelWrapper.cpp b/toolkit/components/extensions/webrequest/ChannelWrapper.cpp index de4a7fee1a2a..52508f0f24ed 100644 --- a/toolkit/components/extensions/webrequest/ChannelWrapper.cpp +++ b/toolkit/components/extensions/webrequest/ChannelWrapper.cpp @@ -78,6 +78,24 @@ ChannelWrapper::Get(const GlobalObject& global, nsIChannel* channel) return wrapper.forget(); } +already_AddRefed<ChannelWrapper> +ChannelWrapper::GetRegisteredChannel(const GlobalObject& global, uint64_t aChannelId, const WebExtensionPolicy& aAddon, nsITabParent* aTabParent) +{ + nsIContentParent* contentParent = nullptr; + if (TabParent* parent = static_cast<TabParent*>(aTabParent)) { + contentParent = static_cast<nsIContentParent*>(parent->Manager()); + } + + auto& webreq = WebRequestService::GetSingleton(); + + nsCOMPtr<nsITraceableChannel> channel = webreq.GetTraceableChannel(aChannelId, aAddon.Id(), contentParent); + if (!channel) { + return nullptr; + } + nsCOMPtr<nsIChannel> chan(do_QueryInterface(channel)); + return ChannelWrapper::Get(global, chan); +} + void ChannelWrapper::SetChannel(nsIChannel* aChannel) { diff --git a/toolkit/components/extensions/webrequest/ChannelWrapper.h b/toolkit/components/extensions/webrequest/ChannelWrapper.h index 8ba238991070..750aed434f6a 100644 --- a/toolkit/components/extensions/webrequest/ChannelWrapper.h +++ b/toolkit/components/extensions/webrequest/ChannelWrapper.h @@ -121,7 +121,7 @@ public: NS_DECLARE_STATIC_IID_ACCESSOR(NS_CHANNELWRAPPER_IID) static already_AddRefed<extensions::ChannelWrapper> Get(const dom::GlobalObject& global, nsIChannel* channel); - + static already_AddRefed<extensions::ChannelWrapper> GetRegisteredChannel(const dom::GlobalObject& global, uint64_t aChannelId, const WebExtensionPolicy& aAddon, nsITabParent* aTabParent); uint64_t Id() const { return mId; }

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 1474626 - fix timestamp test and values, r=rpl
by gk＠torproject.org 03 Dec '18

03 Dec '18

commit b3d74f7db1cc0ddf54771e3e9e5de4b8549b0c88 Author: Shane Caraveo <scaraveo(a)mozilla.com> Date: Wed Jul 11 14:54:03 2018 -0300 Bug 1474626 - fix timestamp test and values, r=rpl The test was incorrect and the timestamp should be milliseconds, not microseconds. MozReview-Commit-ID: 2d79r6PHH4Z --HG-- extra : rebase_source : edd97899f0646f2cae2fbf119206ec470a6b97a0 --- .../extensions/test/mochitest/test_ext_webrequest_hsts.html | 6 +++++- toolkit/modules/addons/SecurityInfo.jsm | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html index df8b541808f9..b8385ca08843 100644 --- a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html +++ b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html @@ -38,7 +38,11 @@ function getExtension() { browser.test.assertTrue(securityInfo.certificates.length == 1, "no certificate chain"); } let cert = securityInfo.certificates[0]; - browser.test.assertTrue(cert.validity.start < Date.now() < cert.validity.end, "cert validity is correct"); + let now = Date.now(); + browser.test.assertTrue(Number.isInteger(cert.validity.start), "cert start is integer"); + browser.test.assertTrue(Number.isInteger(cert.validity.end), "cert end is integer"); + browser.test.assertTrue(cert.validity.start < now, "cert start validity is correct"); + browser.test.assertTrue(now < cert.validity.end, "cert end validity is correct"); if (options.rawDER) { for (let cert of securityInfo.certificates) { browser.test.assertTrue(cert.rawDER.length > 0, "have rawDER"); diff --git a/toolkit/modules/addons/SecurityInfo.jsm b/toolkit/modules/addons/SecurityInfo.jsm index a931602b517a..de0084398aa6 100644 --- a/toolkit/modules/addons/SecurityInfo.jsm +++ b/toolkit/modules/addons/SecurityInfo.jsm @@ -214,8 +214,8 @@ const SecurityInfo = { subject: cert.subjectName, issuer: cert.issuerName, validity: { - start: cert.validity.notBefore, - end: cert.validity.notAfter, + start: cert.validity.notBefore ? Math.trunc(cert.validity.notBefore / 1000) : 0, + end: cert.validity.notAfter ? Math.trunc(cert.validity.notAfter / 1000) : 0, }, fingerprint: { sha1: cert.sha1Fingerprint,

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 1471959 - leave keaGroupName and signatureSchemeName undefined if value is none, r=rpl
by gk＠torproject.org 03 Dec '18

03 Dec '18

commit b81fe53f5fe1ecd749ca900ccfc1a00ae1fd9328 Author: Shane Caraveo <scaraveo(a)mozilla.com> Date: Fri Jul 6 09:41:56 2018 -0300 Bug 1471959 - leave keaGroupName and signatureSchemeName undefined if value is none, r=rpl MozReview-Commit-ID: 2Ca7xCMOPAH --HG-- extra : rebase_source : 2fa9d6b80c9ead0d90927878ce10390791cbadd9 --- toolkit/components/extensions/schemas/web_request.json | 10 ++++++++++ toolkit/modules/addons/SecurityInfo.jsm | 8 ++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/toolkit/components/extensions/schemas/web_request.json b/toolkit/components/extensions/schemas/web_request.json index 508ca8b05f8f..6fe12f7b6ca5 100644 --- a/toolkit/components/extensions/schemas/web_request.json +++ b/toolkit/components/extensions/schemas/web_request.json @@ -269,6 +269,16 @@ "description": "The cipher suite used in this request if state is \"secure\".", "optional": true }, + "keaGroupName": { + "type": "string", + "description": "The key exchange algorithm used in this request if state is \"secure\".", + "optional": true + }, + "signatureSchemeName": { + "type": "string", + "description": "The signature scheme used in this request if state is \"secure\".", + "optional": true + }, "certificates": { "description": "Certificate data if state is \"secure\". Will only contain one entry unless <code>certificateChain</code> is passed as an option.", "type": "array", diff --git a/toolkit/modules/addons/SecurityInfo.jsm b/toolkit/modules/addons/SecurityInfo.jsm index 8c5cef18754d..a931602b517a 100644 --- a/toolkit/modules/addons/SecurityInfo.jsm +++ b/toolkit/modules/addons/SecurityInfo.jsm @@ -137,10 +137,14 @@ const SecurityInfo = { info.cipherSuite = SSLStatus.cipherName; // Key exchange group name. - info.keaGroupName = SSLStatus.keaGroupName; + if (SSLStatus.keaGroupName !== "none") { + info.keaGroupName = SSLStatus.keaGroupName; + } // Certificate signature scheme. - info.signatureSchemeName = SSLStatus.signatureSchemeName; + if (SSLStatus.signatureSchemeName !== "none") { + info.signatureSchemeName = SSLStatus.signatureSchemeName; + } info.isDomainMismatch = SSLStatus.isDomainMismatch; info.isExtendedValidation = SSLStatus.isExtendedValidation;

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 1470516 - remove or fix localized values in securityInfo, r=rpl
by gk＠torproject.org 03 Dec '18

03 Dec '18

commit 05cbc6e53b30707e32af750eb082a90f715cbf95 Author: Shane Caraveo <scaraveo(a)mozilla.com> Date: Mon Jul 2 15:45:18 2018 -0300 Bug 1470516 - remove or fix localized values in securityInfo, r=rpl MozReview-Commit-ID: 3xURSfbPTmS --HG-- extra : rebase_source : aeb333a0c72120724a5a7d988f460e3c703b09c3 --- toolkit/components/extensions/schemas/web_request.json | 9 +++------ .../extensions/test/mochitest/test_ext_webrequest_hsts.html | 2 ++ toolkit/modules/addons/SecurityInfo.jsm | 5 ++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/toolkit/components/extensions/schemas/web_request.json b/toolkit/components/extensions/schemas/web_request.json index ed1840cabe2a..508ca8b05f8f 100644 --- a/toolkit/components/extensions/schemas/web_request.json +++ b/toolkit/components/extensions/schemas/web_request.json @@ -189,10 +189,10 @@ }, "validity": { "type": "object", - "description": "Contains start and end dates in GMT.", + "description": "Contains start and end timestamps.", "properties": { - "startGMT": { "type": "string" }, - "endGMT": { "type": "string" } + "start": { "type": "integer" }, + "end": { "type": "integer" } } }, "fingerprint": { @@ -214,9 +214,6 @@ "sha256": { "type": "string" } } }, - "keyUsages": { - "type": "string" - }, "rawDER": { "optional": true, "type": "array", diff --git a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html index 849527ea4a80..df8b541808f9 100644 --- a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html +++ b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html @@ -37,6 +37,8 @@ function getExtension() { } else { browser.test.assertTrue(securityInfo.certificates.length == 1, "no certificate chain"); } + let cert = securityInfo.certificates[0]; + browser.test.assertTrue(cert.validity.start < Date.now() < cert.validity.end, "cert validity is correct"); if (options.rawDER) { for (let cert of securityInfo.certificates) { browser.test.assertTrue(cert.rawDER.length > 0, "have rawDER"); diff --git a/toolkit/modules/addons/SecurityInfo.jsm b/toolkit/modules/addons/SecurityInfo.jsm index 4984f76dd463..8c5cef18754d 100644 --- a/toolkit/modules/addons/SecurityInfo.jsm +++ b/toolkit/modules/addons/SecurityInfo.jsm @@ -210,8 +210,8 @@ const SecurityInfo = { subject: cert.subjectName, issuer: cert.issuerName, validity: { - startGMT: cert.validity.notBeforeGMT, - endGMT: cert.validity.notAfterGMT, + start: cert.validity.notBefore, + end: cert.validity.notAfter, }, fingerprint: { sha1: cert.sha1Fingerprint, @@ -222,7 +222,6 @@ const SecurityInfo = { subjectPublicKeyInfoDigest: { sha256: cert.sha256SubjectPublicKeyInfoDigest, }, - keyUsages: cert.keyUsages, }; if (options.rawDER) { certData.rawDER = cert.getRawDER({});

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 1322748 add securityInfo to webRequest listeners, r=keeler, rpl
by gk＠torproject.org 03 Dec '18

03 Dec '18

commit 1935dcf38ca112f9fbc9fe42c2289d77e4f95932 Author: Shane Caraveo <scaraveo(a)mozilla.com> Date: Wed May 23 14:36:19 2018 -0400 Bug 1322748 add securityInfo to webRequest listeners, r=keeler,rpl MozReview-Commit-ID: Hen1tl1RWTC --HG-- extra : rebase_source : e5dae021438ece0477d89e1d4e91eaaf2ebfd06e --- toolkit/components/extensions/ext-webRequest.js | 8 + .../components/extensions/schemas/web_request.json | 171 ++++++++++++ .../test/mochitest/test_ext_webrequest_hsts.html | 28 +- toolkit/modules/addons/SecurityInfo.jsm | 297 +++++++++++++++++++++ toolkit/modules/addons/WebRequest.jsm | 21 +- toolkit/modules/moz.build | 1 + 6 files changed, 516 insertions(+), 10 deletions(-) diff --git a/toolkit/components/extensions/ext-webRequest.js b/toolkit/components/extensions/ext-webRequest.js index f953be4a6e40..19306816adc3 100644 --- a/toolkit/components/extensions/ext-webRequest.js +++ b/toolkit/components/extensions/ext-webRequest.js @@ -102,6 +102,14 @@ this.webRequest = class extends ExtensionAPI { onResponseStarted: new WebRequestEventManager(context, "onResponseStarted").api(), onErrorOccurred: new WebRequestEventManager(context, "onErrorOccurred").api(), onCompleted: new WebRequestEventManager(context, "onCompleted").api(), + getSecurityInfo: function(requestId, options = {}) { + return WebRequest.getSecurityInfo({ + id: requestId, + extension: context.extension.policy, + tabParent: context.xulBrowser.frameLoader.tabParent, + options, + }); + }, handlerBehaviorChanged: function() { // TODO: Flush all caches. }, diff --git a/toolkit/components/extensions/schemas/web_request.json b/toolkit/components/extensions/schemas/web_request.json index 97badfc797b9..ed1840cabe2a 100644 --- a/toolkit/components/extensions/schemas/web_request.json +++ b/toolkit/components/extensions/schemas/web_request.json @@ -177,6 +177,148 @@ } }, { + "id": "CertificateInfo", + "type": "object", + "description": "Contains the certificate properties of the request if it is a secure request.", + "properties": { + "subject": { + "type": "string" + }, + "issuer": { + "type": "string" + }, + "validity": { + "type": "object", + "description": "Contains start and end dates in GMT.", + "properties": { + "startGMT": { "type": "string" }, + "endGMT": { "type": "string" } + } + }, + "fingerprint": { + "type": "object", + "properties": { + "sha1": { "type": "string" }, + "sha256": { "type": "string" } + } + }, + "serialNumber": { + "type": "string" + }, + "isBuiltInRoot": { + "type": "boolean" + }, + "subjectPublicKeyInfoDigest": { + "type": "object", + "properties": { + "sha256": { "type": "string" } + } + }, + "keyUsages": { + "type": "string" + }, + "rawDER": { + "optional": true, + "type": "array", + "items": { + "type": "integer" + } + } + } + }, + { + "id": "CertificateTransparencyStatus", + "type": "string", + "enum": ["not_applicable", "policy_compliant", "policy_not_enough_scts", "policy_not_diverse_scts"] + }, + { + "id": "TransportWeaknessReasons", + "type": "string", + "enum": ["cipher"] + }, + { + "id": "SecurityInfo", + "type": "object", + "description": "Contains the security properties of the request (ie. SSL/TLS information).", + "properties": { + "state": { + "type": "string", + "enum": [ + "insecure", + "weak", + "broken", + "secure" + ] + }, + "errorMessage": { + "type": "string", + "description": "Error message if state is \"broken\"", + "optional": true + }, + "protocolVersion": { + "type": "string", + "description": "Protocol version if state is \"secure\"", + "enum": [ + "TLSv1", + "TLSv1.1", + "TLSv1.2", + "TLSv1.3", + "unknown" + ], + "optional": true + }, + "cipherSuite": { + "type": "string", + "description": "The cipher suite used in this request if state is \"secure\".", + "optional": true + }, + "certificates": { + "description": "Certificate data if state is \"secure\". Will only contain one entry unless <code>certificateChain</code> is passed as an option.", + "type": "array", + "items": { "$ref": "CertificateInfo" } + }, + "isDomainMismatch": { + "description": "The domain name does not match the certificate domain.", + "type": "boolean", + "optional": true + }, + "isExtendedValidation": { + "type": "boolean", + "optional": true + }, + "isNotValidAtThisTime": { + "description": "The certificate is either expired or is not yet valid. See <code>CertificateInfo.validity</code> for start and end dates.", + "type": "boolean", + "optional": true + }, + "isUntrusted": { + "type": "boolean", + "optional": true + }, + "certificateTransparencyStatus": { + "description": "Certificate transparency compliance per RFC 6962. See <code>https://www.certificate-transparency.org/what-is-ct</code> for more information.", + "$ref": "CertificateTransparencyStatus", + "optional": true + }, + "hsts": { + "type": "boolean", + "description": "True if host uses Strict Transport Security and state is \"secure\".", + "optional": true + }, + "hpkp": { + "type": "string", + "description": "True if host uses Public Key Pinning and state is \"secure\".", + "optional": true + }, + "weaknessReasons": { + "type": "array", + "items": { "$ref": "TransportWeaknessReasons" }, + "description": "list of reasons that cause the request to be considered weak, if state is \"weak\"", + "optional": true + } + } + }, + { "id": "UploadData", "type": "object", "properties": { @@ -225,6 +367,35 @@ "additionalProperties": {"type": "any"}, "isInstanceOf": "StreamFilter" } + }, + { + "name": "getSecurityInfo", + "type": "function", + "async": true, + "description": "Retrieves the security information for the request. Returns a promise that will resolve to a SecurityInfo object.", + "parameters": [ + { + "name": "requestId", + "type": "string" + }, + { + "name": "options", + "optional": true, + "type": "object", + "properties": { + "certificateChain": { + "type": "boolean", + "description": "Include the entire certificate chain.", + "optional": true + }, + "rawDER": { + "type": "boolean", + "description": "Include raw certificate data for processing by the extension.", + "optional": true + } + } + } + ] } ], "events": [ diff --git a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html index 4dce90cd377e..ad4d4f32a657 100644 --- a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html +++ b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html @@ -25,9 +25,35 @@ function getExtension() { browser.webRequest.onSendHeaders.addListener(details => { browser.test.assertEq(expect.shift(), "onSendHeaders"); }, {urls}, ["requestHeaders"]); - browser.webRequest.onHeadersReceived.addListener(details => { + + async function testSecurityInfo(details, options) { + let securityInfo = await browser.webRequest.getSecurityInfo(details.requestId, options); + browser.test.assertTrue(securityInfo && securityInfo.state == "secure", + "security info reflects https"); + + if (options.certificateChain) { + // Some of the tests here only produce a single cert in the chain. + browser.test.assertTrue(securityInfo.certificates.length >= 1, "have certificate chain"); + } else { + browser.test.assertTrue(securityInfo.certificates.length == 1, "no certificate chain"); + } + if (options.rawDER) { + for (let cert of securityInfo.certificates) { + browser.test.assertTrue(cert.rawDER.length > 0, "have rawDER"); + } + } + } + + browser.webRequest.onHeadersReceived.addListener(async (details) => { browser.test.assertEq(expect.shift(), "onHeadersReceived"); + // We exepect all requests to have been upgraded at this point. + browser.test.assertTrue(details.url.startsWith("https"), "connection is https"); + await testSecurityInfo(details, {}); + await testSecurityInfo(details, {certificateChain: true}); + await testSecurityInfo(details, {rawDER: true}); + await testSecurityInfo(details, {certificateChain: true, rawDER: true}); + let headers = details.responseHeaders || []; for (let header of headers) { if (header.name.toLowerCase() === "strict-transport-security") { diff --git a/toolkit/modules/addons/SecurityInfo.jsm b/toolkit/modules/addons/SecurityInfo.jsm new file mode 100644 index 000000000000..4984f76dd463 --- /dev/null +++ b/toolkit/modules/addons/SecurityInfo.jsm @@ -0,0 +1,297 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +"use strict"; + +const EXPORTED_SYMBOLS = ["SecurityInfo"]; + +ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); + +const wpl = Ci.nsIWebProgressListener; +XPCOMUtils.defineLazyServiceGetter(this, "NSSErrorsService", + "@mozilla.org/nss_errors_service;1", + "nsINSSErrorsService"); +XPCOMUtils.defineLazyServiceGetter(this, "sss", + "@mozilla.org/ssservice;1", + "nsISiteSecurityService"); + +// NOTE: SecurityInfo is largely reworked from the devtools NetworkHelper with changes +// to better support the WebRequest api. The objects returned are formatted specifically +// to pass through as part of a response to webRequest listeners. + +const SecurityInfo = { + /** + * Extracts security information from nsIChannel.securityInfo. + * + * @param {nsIChannel} channel + * If null channel is assumed to be insecure. + * @param {Object} options + * + * @returns {Object} + * Returns an object containing following members: + * - state: The security of the connection used to fetch this + * request. Has one of following string values: + * * "insecure": the connection was not secure (only http) + * * "weak": the connection has minor security issues + * * "broken": secure connection failed (e.g. expired cert) + * * "secure": the connection was properly secured. + * If state == broken: + * - errorMessage: full error message from + * nsITransportSecurityInfo. + * If state == secure: + * - protocolVersion: one of TLSv1, TLSv1.1, TLSv1.2, TLSv1.3. + * - cipherSuite: the cipher suite used in this connection. + * - cert: information about certificate used in this connection. + * See parseCertificateInfo for the contents. + * - hsts: true if host uses Strict Transport Security, + * false otherwise + * - hpkp: true if host uses Public Key Pinning, false otherwise + * If state == weak: Same as state == secure and + * - weaknessReasons: list of reasons that cause the request to be + * considered weak. See getReasonsForWeakness. + */ + getSecurityInfo(channel, options = {}) { + const info = { + state: "insecure", + }; + + /** + * Different scenarios to consider here and how they are handled: + * - request is HTTP, the connection is not secure + * => securityInfo is null + * => state === "insecure" + * + * - request is HTTPS, the connection is secure + * => .securityState has STATE_IS_SECURE flag + * => state === "secure" + * + * - request is HTTPS, the connection has security issues + * => .securityState has STATE_IS_INSECURE flag + * => .errorCode is an NSS error code. + * => state === "broken" + * + * - request is HTTPS, the connection was terminated before the security + * could be validated + * => .securityState has STATE_IS_INSECURE flag + * => .errorCode is NOT an NSS error code. + * => .errorMessage is not available. + * => state === "insecure" + * + * - request is HTTPS but it uses a weak cipher or old protocol, see + * https://hg.mozilla.org/mozilla-central/annotate/def6ed9d1c1a/ + * security/manager/ssl/nsNSSCallbacks.cpp#l1233 + * - request is mixed content (which makes no sense whatsoever) + * => .securityState has STATE_IS_BROKEN flag + * => .errorCode is NOT an NSS error code + * => .errorMessage is not available + * => state === "weak" + */ + + let securityInfo = channel.securityInfo; + if (!securityInfo) { + return info; + } + + securityInfo.QueryInterface(Ci.nsITransportSecurityInfo); + securityInfo.QueryInterface(Ci.nsISSLStatusProvider); + + const SSLStatus = securityInfo.SSLStatus; + if (NSSErrorsService.isNSSErrorCode(securityInfo.errorCode)) { + // The connection failed. + info.state = "broken"; + info.errorMessage = securityInfo.errorMessage; + if (options.certificateChain && SSLStatus.failedCertChain) { + info.certificates = this.getCertificateChain(SSLStatus.failedCertChain, options); + } + return info; + } + + const state = securityInfo.securityState; + + let uri = channel.URI; + if (uri && !uri.schemeIs("https") && !uri.schemeIs("wss")) { + // it is not enough to look at the transport security info - + // schemes other than https and wss are subject to + // downgrade/etc at the scheme level and should always be + // considered insecure. + // Leave info.state = "insecure"; + } else if (state & wpl.STATE_IS_SECURE) { + // The connection is secure if the scheme is sufficient + info.state = "secure"; + } else if (state & wpl.STATE_IS_BROKEN) { + // The connection is not secure, there was no error but there's some + // minor security issues. + info.state = "weak"; + info.weaknessReasons = this.getReasonsForWeakness(state); + } else if (state & wpl.STATE_IS_INSECURE) { + // This was most likely an https request that was aborted before + // validation. Return info as info.state = insecure. + return info; + } else { + // No known STATE_IS_* flags. + return info; + } + + // Cipher suite. + info.cipherSuite = SSLStatus.cipherName; + + // Key exchange group name. + info.keaGroupName = SSLStatus.keaGroupName; + + // Certificate signature scheme. + info.signatureSchemeName = SSLStatus.signatureSchemeName; + + info.isDomainMismatch = SSLStatus.isDomainMismatch; + info.isExtendedValidation = SSLStatus.isExtendedValidation; + info.isNotValidAtThisTime = SSLStatus.isNotValidAtThisTime; + info.isUntrusted = SSLStatus.isUntrusted; + + info.certificateTransparencyStatus = this.getTransparencyStatus(SSLStatus.certificateTransparencyStatus); + + // Protocol version. + info.protocolVersion = this.formatSecurityProtocol(SSLStatus.protocolVersion); + + if (options.certificateChain && SSLStatus.succeededCertChain) { + info.certificates = this.getCertificateChain(SSLStatus.succeededCertChain, options); + } else { + info.certificates = [this.parseCertificateInfo(SSLStatus.serverCert, options)]; + } + + // HSTS and HPKP if available. + if (uri && uri.host) { + // SiteSecurityService uses different storage if the channel is + // private. Thus we must give isSecureURI correct flags or we + // might get incorrect results. + let flags = 0; + if (channel instanceof Ci.nsIPrivateBrowsingChannel && channel.isChannelPrivate) { + flags = Ci.nsISocketProvider.NO_PERMANENT_STORAGE; + } + + info.hsts = sss.isSecureURI(sss.HEADER_HSTS, uri, flags); + info.hpkp = sss.isSecureURI(sss.HEADER_HPKP, uri, flags); + } else { + info.hsts = false; + info.hpkp = false; + } + + return info; + }, + + getCertificateChain(certChain, options = {}) { + let certificates = []; + for (let cert of XPCOMUtils.IterSimpleEnumerator(certChain.getEnumerator(), Ci.nsIX509Cert)) { + certificates.push(this.parseCertificateInfo(cert, options)); + } + return certificates; + }, + + /** + * Takes an nsIX509Cert and returns an object with certificate information. + * + * @param {nsIX509Cert} cert + * The certificate to extract the information from. + * @param {Object} options + * @returns {Object} + * An object with following format: + * { + * subject: subjectName, + * issuer: issuerName, + * validity: { start, end }, + * fingerprint: { sha1, sha256 } + * } + */ + parseCertificateInfo(cert, options = {}) { + if (!cert) { + return {}; + } + + let certData = { + subject: cert.subjectName, + issuer: cert.issuerName, + validity: { + startGMT: cert.validity.notBeforeGMT, + endGMT: cert.validity.notAfterGMT, + }, + fingerprint: { + sha1: cert.sha1Fingerprint, + sha256: cert.sha256Fingerprint, + }, + serialNumber: cert.serialNumber, + isBuiltInRoot: cert.isBuiltInRoot, + subjectPublicKeyInfoDigest: { + sha256: cert.sha256SubjectPublicKeyInfoDigest, + }, + keyUsages: cert.keyUsages, + }; + if (options.rawDER) { + certData.rawDER = cert.getRawDER({}); + } + return certData; + }, + + // Bug 1355903 Transparency is currently disabled using security.pki.certificate_transparency.mode + getTransparencyStatus(status) { + switch (status) { + case Ci.nsISSLStatus.CERTIFICATE_TRANSPARENCY_NOT_APPLICABLE: + return "not_applicable"; + case Ci.nsISSLStatus.CERTIFICATE_TRANSPARENCY_POLICY_COMPLIANT: + return "policy_compliant"; + case Ci.nsISSLStatus.CERTIFICATE_TRANSPARENCY_POLICY_NOT_ENOUGH_SCTS: + return "policy_not_enough_scts"; + case Ci.nsISSLStatus.CERTIFICATE_TRANSPARENCY_POLICY_NOT_DIVERSE_SCTS: + return "policy_not_diverse_scts"; + } + return "unknown"; + }, + + /** + * Takes protocolVersion of SSLStatus object and returns human readable + * description. + * + * @param {number} version + * One of nsISSLStatus version constants. + * @returns {string} + * One of TLSv1, TLSv1.1, TLSv1.2, TLSv1.3 if version + * is valid, Unknown otherwise. + */ + formatSecurityProtocol(version) { + switch (version) { + case Ci.nsISSLStatus.TLS_VERSION_1: + return "TLSv1"; + case Ci.nsISSLStatus.TLS_VERSION_1_1: + return "TLSv1.1"; + case Ci.nsISSLStatus.TLS_VERSION_1_2: + return "TLSv1.2"; + case Ci.nsISSLStatus.TLS_VERSION_1_3: + return "TLSv1.3"; + } + return "unknown"; + }, + + /** + * Takes the securityState bitfield and returns reasons for weak connection + * as an array of strings. + * + * @param {number} state + * nsITransportSecurityInfo.securityState. + * + * @returns {array<string>} + * List of weakness reasons. A subset of { cipher } where + * * cipher: The cipher suite is consireded to be weak (RC4). + */ + getReasonsForWeakness(state) { + // If there's non-fatal security issues the request has STATE_IS_BROKEN + // flag set. See https://hg.mozilla.org/mozilla-central/file/44344099d119 + // /security/manager/ssl/nsNSSCallbacks.cpp#l1233 + let reasons = []; + + if (state & wpl.STATE_IS_BROKEN) { + if (state & wpl.STATE_USES_WEAK_CRYPTO) { + reasons.push("cipher"); + } + } + + return reasons; + }, +}; diff --git a/toolkit/modules/addons/WebRequest.jsm b/toolkit/modules/addons/WebRequest.jsm index 786a2d5dbe91..a4c9e9859a21 100644 --- a/toolkit/modules/addons/WebRequest.jsm +++ b/toolkit/modules/addons/WebRequest.jsm @@ -15,14 +15,12 @@ const {nsIHttpActivityObserver, nsISocketTransport} = Ci; ChromeUtils.import("resource://gre/modules/Services.jsm"); ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); -ChromeUtils.defineModuleGetter(this, "ExtensionUtils", - "resource://gre/modules/ExtensionUtils.jsm"); -ChromeUtils.defineModuleGetter(this, "WebRequestCommon", - "resource://gre/modules/WebRequestCommon.jsm"); -ChromeUtils.defineModuleGetter(this, "WebRequestUpload", - "resource://gre/modules/WebRequestUpload.jsm"); - -XPCOMUtils.defineLazyGetter(this, "ExtensionError", () => ExtensionUtils.ExtensionError); +XPCOMUtils.defineLazyModuleGetters(this, { + ExtensionUtils: "resource://gre/modules/ExtensionUtils.jsm", + WebRequestCommon: "resource://gre/modules/WebRequestCommon.jsm", + WebRequestUpload: "resource://gre/modules/WebRequestUpload.jsm", + SecurityInfo: "resource://gre/modules/SecurityInfo.jsm", +}); function runLater(job) { Services.tm.dispatchToMainThread(job); @@ -41,7 +39,7 @@ function parseExtra(extra, allowed = [], optionsObj = {}) { if (extra) { for (let ex of extra) { if (!allowed.includes(ex)) { - throw new ExtensionError(`Invalid option ${ex}`); + throw new ExtensionUtils.ExtensionError(`Invalid option ${ex}`); } } } @@ -1011,6 +1009,11 @@ var WebRequest = { // nsIHttpActivityObserver. onErrorOccurred: onErrorOccurred, + + getSecurityInfo: (details) => { + let channel = ChannelWrapper.getRegisteredChannel(details.id, details.extension, details.tabParent); + return SecurityInfo.getSecurityInfo(channel.channel, details.options); + }, }; Services.ppmm.loadProcessScript("resource://gre/modules/WebRequestContent.js", true); diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build index 110fff7737f2..0a1e48b964c1 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build @@ -167,6 +167,7 @@ with Files('docs/**'): EXTRA_JS_MODULES += [ 'addons/MatchURLFilters.jsm', + 'addons/SecurityInfo.jsm', 'addons/WebNavigation.jsm', 'addons/WebNavigationContent.js', 'addons/WebNavigationFrames.jsm',

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 1464481 - fix and test crash when getting registered channelwrapper, r=kmag
by gk＠torproject.org 03 Dec '18

03 Dec '18

commit 1305066f21439675842aad91844e6b490df8c3e0 Author: Shane Caraveo <scaraveo(a)mozilla.com> Date: Fri May 25 16:41:19 2018 -0400 Bug 1464481 - fix and test crash when getting registered channelwrapper, r=kmag MozReview-Commit-ID: LEGojHEb742 --HG-- extra : rebase_source : 7018cfef6b7415ea275dc2c3e414586396a9e2be --- dom/chrome-webidl/ChannelWrapper.webidl | 2 +- .../test/mochitest/test_ext_webrequest_hsts.html | 25 ++++++++++++++++++++++ toolkit/modules/addons/WebRequest.jsm | 4 +++- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dom/chrome-webidl/ChannelWrapper.webidl b/dom/chrome-webidl/ChannelWrapper.webidl index 2777aab65c8e..bc959d30d043 100644 --- a/dom/chrome-webidl/ChannelWrapper.webidl +++ b/dom/chrome-webidl/ChannelWrapper.webidl @@ -52,7 +52,7 @@ interface ChannelWrapper : EventTarget { * Returns the wrapper instance for the given channel. The same wrapper is * always returned for a given channel. */ - static ChannelWrapper getRegisteredChannel(unsigned long long aChannelId, + static ChannelWrapper? getRegisteredChannel(unsigned long long aChannelId, WebExtensionPolicy extension, TabParent? tabParent); diff --git a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html index ad4d4f32a657..849527ea4a80 100644 --- a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html +++ b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html @@ -185,6 +185,31 @@ add_task(async function test_hsts_header() { await extension.unload(); }); + +add_task(async function test_nonBlocking_securityInfo() { + let extension = ExtensionTestUtils.loadExtension({ + manifest: { + "permissions": [ + "webRequest", + "<all_urls>", + ], + }, + async background() { + let tab; + browser.webRequest.onHeadersReceived.addListener(async (details) => { + let securityInfo = await browser.webRequest.getSecurityInfo(details.requestId, {}); + browser.test.assertTrue(!securityInfo, "securityInfo undefined on http request"); + browser.tabs.remove(tab.id); + browser.test.notifyPass("success"); + }, {urls: ["<all_urls>"], types: ["main_frame"]}); + tab = await browser.tabs.create({url: "https://example.org/tests/toolkit/components/extensions/test/mochitest/file…"}); + }, + }); + await extension.startup(); + + await extension.awaitFinish("success"); + await extension.unload(); +}); </script> </head> <body> diff --git a/toolkit/modules/addons/WebRequest.jsm b/toolkit/modules/addons/WebRequest.jsm index a4c9e9859a21..6a95182a3876 100644 --- a/toolkit/modules/addons/WebRequest.jsm +++ b/toolkit/modules/addons/WebRequest.jsm @@ -1012,7 +1012,9 @@ var WebRequest = { getSecurityInfo: (details) => { let channel = ChannelWrapper.getRegisteredChannel(details.id, details.extension, details.tabParent); - return SecurityInfo.getSecurityInfo(channel.channel, details.options); + if (channel) { + return SecurityInfo.getSecurityInfo(channel.channel, details.options); + } }, };

1 0

[torbutton/master] Bug 28540: Use new text for 2018 donation banner
by gk＠torproject.org 03 Dec '18

03 Dec '18

commit 4ad39b362dd7692b5e24841c616f63a5ca2bc67a Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Nov 20 17:25:48 2018 -0800 Bug 28540: Use new text for 2018 donation banner --- src/chrome/content/aboutTor/aboutTor-content.js | 2 +- src/chrome/content/aboutTor/aboutTor.xhtml | 24 +++++++++++++++--------- src/chrome/content/torbutton.js | 2 +- src/defaults/preferences/preferences.js | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index d34bbe5c..e53266bd 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -72,7 +72,7 @@ var AboutTorListener = { sendAsyncMessage(that.kAboutTorHideDonationBanner); }); }); - bindPrefAndInit("extensions.torbutton.donation_banner_countdown", + bindPrefAndInit("extensions.torbutton.donation_banner_countdown2", countdown => { if (content.document && content.document.body) { content.document.body.setAttribute( diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 94dd13f3..5f5fccdc 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -37,15 +37,17 @@ window.addEventListener("pageshow", function() { <div id="donation-banner-lines"> <div id="donation-banner-line1">&aboutTor.donationBanner.line1;</div> <div id="donation-banner-line2" - data-0="&aboutTor.donationBanner.line2a;" - data-1="&aboutTor.donationBanner.line2b;" - data-2="&aboutTor.donationBanner.line2c;" - data-3="&aboutTor.donationBanner.line2d;" - data-4="&aboutTor.donationBanner.line2e;" - data-5="&aboutTor.donationBanner.line2f;"> - &aboutTor.donationBanner.line2a; + data-6="&aboutTor.donationBanner.line2e;" + data-7="&aboutTor.donationBanner.line2f;" + data-8="&aboutTor.donationBanner.line2g;" + data-9="&aboutTor.donationBanner.line2h;" + data-10="&aboutTor.donationBanner.line2i;" + data-11="&aboutTor.donationBanner.line2j;"> + &aboutTor.donationBanner.line2e; </div> - <div id="donation-banner-line3">&aboutTor.donationBanner.line3;</div> + <div id="donation-banner-line3" + data-b="&aboutTor.donationBanner.line3b;"> + &aboutTor.donationBanner.line3;</div> <a id="donation-banner-button" href="https://www.torproject.org/donate/donate-sin-tbd0-0" type="button" @@ -58,13 +60,17 @@ window.addEventListener("pageshow", function() { </div> <script type="text/javascript"> <![CDATA[ - let lineChoice = Math.floor(Math.random() * 6); + let lineChoice = 6 + Math.floor(Math.random() * 6); let line2 = document.getElementById("donation-banner-line2"); let line2text = line2.getAttribute(`data-${lineChoice}`); let line2pieces = line2text.split(" "); let line2end = '<span>' + line2pieces.pop() + '</span>'; line2pieces.push(line2end); line2.innerHTML = line2pieces.join(" "); + line3 = document.getElementById("donation-banner-line3"); + if (lineChoice === 11) { + line3.innerHTML = line3.getAttribute("data-b"); + } let buttonChoice = Math.floor(Math.random() * 2); let button = document.getElementById("donation-banner-button"); button.innerHTML = button.getAttribute(`data-${buttonChoice}`); diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index ee13f461..8bd847f9 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -17,7 +17,7 @@ const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion" const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed"; -const k_tb_donation_banner_countdown = "extensions.torbutton.donation_banner_countdown"; +const k_tb_donation_banner_countdown = "extensions.torbutton.donation_banner_countdown2"; var m_tb_prefs = Services.prefs; diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 9beb3993..eb055a65 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -6,7 +6,7 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglo pref("extensions.torbutton.display_circuit", true); pref("extensions.torbutton(a)torproject.org.description", "chrome://torbutton/locale/torbutton.properties"); pref("extensions.torbutton.updateNeeded", false); -pref("extensions.torbutton.donation_banner_countdown", 12); +pref("extensions.torbutton.donation_banner_countdown2", 12); // Tor check and proxy prefs pref("extensions.torbutton.test_enabled",true);

1 0

[tor-browser-build/master] Update OpenSSL to 1.0.2q
by gk＠torproject.org 03 Dec '18

03 Dec '18

commit 30c764db2bbbde93ebee67e2b190a4d9c88873b9 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 3 08:06:40 2018 +0000 Update OpenSSL to 1.0.2q --- projects/openssl/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/openssl/config b/projects/openssl/config index d3ed959..e91e820 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.0.2p +version: 1.0.2q filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -26,4 +26,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: 50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00 + sha256sum: 5744cfcbcec2b1b48629f7354203bc1e5e9b5466998bbccc5b5fcde3b18eb684

1 0

[tor-browser-build/master] Tagging build2
by gk＠torproject.org 01 Dec '18

01 Dec '18

commit c1667c29be45ba7296dae3e268115137c4f687a5 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Dec 1 13:50:15 2018 +0000 Tagging build2 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 5d1d861..0d53855 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.5a5' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.5a4 project_name: tor-browser

1 0

[tor-browser-build/master] Bug 28677: Copy all the bundles for our releases
by gk＠torproject.org 01 Dec '18

01 Dec '18

commit e9a2fc5a9d9ee5571ca6daf94ac367e14732cd50 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Dec 1 13:33:54 2018 +0000 Bug 28677: Copy all the bundles for our releases --- projects/release/build | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/release/build b/projects/release/build index 2c9912f..e7c7410 100644 --- a/projects/release/build +++ b/projects/release/build @@ -6,7 +6,6 @@ destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]" mkdir -p "$destdir" [% IF c("var/torbrowser-android-armv7") -%] mv [% c('input_files_by_name/android-armv7') %]/* "$destdir"/ - [% RETURN %] [% END -%] [% IF c("var/torbrowser-windows-i686") -%] mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/

1 0

[tor-browser-build/master] Bug 28185: Add smallerRichard to Tor Browser
by gk＠torproject.org 30 Nov '18

30 Nov '18

commit 03883ab8278cbc49deee0ee3285a2de4d215a929 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 29 16:15:07 2018 +0000 Bug 28185: Add smallerRichard to Tor Browser --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index ec76ce7..f58eb02 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -39,6 +39,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.24", "obfs4 37.218.245.14:3822 pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.26", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.27", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.28", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-build/master] Release preparations for 8.5a5
by gk＠torproject.org 30 Nov '18

30 Nov '18

commit 7b2b5ae4bac7863075fac61259328c9577e87475 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 30 07:28:43 2018 +0000 Release preparations for 8.5a5 Versions bump and Changelog update --- projects/firefox/config | 2 +- projects/https-everywhere/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 58 ++++++++++++++++++++++ projects/tor-browser/config | 4 +- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 6 +-- 8 files changed, 68 insertions(+), 10 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 68918d9..81416a2 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index e189eb9..b0b3ce9 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2018.9.19 +version: 2018.10.31 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 3bd05ed..5c3732b 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,61 @@ +Tor Browser 8.5a5 -- December 3 2018 + * All Platforms + * Update Torbutton to 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 + * Update Tor Launcher to 0.2.18 + * Bug 28039: Enable dump() if log method is 0 + * Translations update + * Update HTTPS Everywhere to 2018.10.31 + * Update NoScript to 10.2.0 + * Bug 22343: Make 'Save Page As' obey first-party isolation + * Bug 26540: Enabling pdfjs disableRange option prevents pdfs from loading + * Windows + * Update Tor to 0.3.5.5-alpha + * Bug 28310: Don't build obfs4 with module versioning support + * Bug 27827: Update Go to 1.11.1 + * Bug 28185: Add smallerRichard to Tor Browser + * Bug 28657: Remove broken FTE bridge from Tor Browser + * OS X + * Update Tor to 0.3.5.5-alpha + * Bug 28310: Don't build obfs4 with module versioning support + * Bug 27827: Update Go to 1.11.1 + * Bug 27827: Build snowflake reproducibly + * Bug 28258: Don't look for webrtc headers under talk/ + * Bug 28185: Add smallerRichard to Tor Browser + * Linux + * Update Tor to 0.3.5.5-alpha + * Bug 28310: Don't build obfs4 with module versioning support + * Bug 27827: Update Go to 1.11.1 + * Bug 27827: Build snowflake reproducibly + * Bug 28258: Don't look for webrtc headers under talk/ + * Bug 28185: Add smallerRichard to Tor Browser + * Bug 28657: Remove broken FTE bridge from Tor Browser + * Android + * Bug 28051: Fix up Orbot for inclusion into Tor Browser + * Bug 26690+25765: Port padlock states for .onion serices to mobile + * Bug 28507: Delete private data in the browser startup + * Bug 27111+25013: Configure Tor Browser for mobile to load about:tor + * Bug 27256: Enable TouchEvents on Android + * Bug 28640: Use system add-on and distributed preferences + * Build System + * Bug 27977: Build Orbot inside tor-browser-build + * Bug 27443: Update Firefox RBM config and build for Android + * Bug 27439: Add android target for rust compiler + * Bug 28469: Fix unsupported libbacktrace in Rust 1.26 + * Bug 28468: Modify Android toolchain to support Orbot + * Bug 28483: Modify Android Toolchain API Version + * Bug 28472: Add Android Makefile Rules + * Bug 28470: Add fetch gradle dependency script to common project + * Bug 28144: Update projects/tor-browser for Android + Tor Browser 8.5a4 -- October 23 2018 * All Platforms * Update Firefox to 60.3.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index e4e3a03..149b800 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -84,9 +84,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: e7ec0345c2174e64c7552ab708a59c8efd7c1078fedda64d9c9ad06a899194b9 + sha256sum: 23c7783eecabeb044aa1e38c93d43ce7c41957b1ea031016d39737712729c81d - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index ff5b387..4f2d2b7 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.17 +version: 0.2.18 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index cc6df23..4ba18d9 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.5.3-alpha +version: 0.3.5.5-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/projects/torbutton/config b/projects/torbutton/config index b4d50be..2e48f31 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.1.1 +version: 2.1.2 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 87fe179..5d1d861 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.5a4' - torbrowser_build: 'build2' + torbrowser_version: '8.5a5' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.5a3 + - 8.5a4 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Picking up latest Torbutton commits
by gk＠torproject.org 30 Nov '18

30 Nov '18

commit 8bc2ca14f51f4b57efcadd6f7405e0a4d48f2204 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 30 07:22:59 2018 +0000 Picking up latest Torbutton commits --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index a41034ced7a6..68ad9e3d555d 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit a41034ced7a6c0fe590320d9da61d15df1fef42f +Subproject commit 68ad9e3d555d18d894c2ae0a1e8b3e797642ff54

1 0

[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

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

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 - Push notifications are disabled, so don't clear them
by gk＠torproject.org 30 Nov '18

30 Nov '18

commit 10ca4718681668db7b0bdba0e3dd207dbe352cd8 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Nov 30 04:51:05 2018 +0000 Bug 28640 - Push notifications are disabled, so don't clear them This is a result of 28507. The new logic caused the stack trace: : ************************* : A coding exception was thrown and uncaught in a Task. : : Full message: TypeError: Cc['@mozilla.org/push/Service;1'] is undefined : Full stack: Sanitizer.prototype.items.siteSettings.clear</<@resource://gre/modules/Sanitizer.jsm:128:15 : Sanitizer.prototype.items.siteSettings.clear<@resource://gre/modules/Sanitizer.jsm:127:15 : TaskImpl_run@resource://gre/modules/Task.jsm:326:42 : TaskImpl@resource://gre/modules/Task.jsm:275:3 : asyncFunction@resource://gre/modules/Task.jsm:247:14 : _clear@resource://gre/modules/Sanitizer.jsm:59:14 : clearItem@resource://gre/modules/Sanitizer.jsm:40:14 : sanitize@chrome://browser/content/browser.js:1566:25 : onEvent@chrome://browser/content/browser.js:1787:9 : : ************************* --- mobile/android/modules/Sanitizer.jsm | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/mobile/android/modules/Sanitizer.jsm b/mobile/android/modules/Sanitizer.jsm index 3782c92172f9..2940dd81b217 100644 --- a/mobile/android/modules/Sanitizer.jsm +++ b/mobile/android/modules/Sanitizer.jsm @@ -124,18 +124,23 @@ Sanitizer.prototype = { sss.clearAll(); // Clear push subscriptions + // Avoid throwing an error because nsIPushService isn't implemented yield new Promise((resolve, reject) => { - let push = Cc["@mozilla.org/push/Service;1"] - .getService(Ci.nsIPushService); - push.clearForDomain("*", status => { - if (Components.isSuccessCode(status)) { - resolve(); - } else { - reject(new Error("Error clearing push subscriptions: " + - status)); - } - }); + reject(new Error("Error clearing push subscriptions")); }); + + //yield new Promise((resolve, reject) => { + // let push = Cc["@mozilla.org/push/Service;1"] + // .getService(Ci.nsIPushService); + // push.clearForDomain("*", status => { + // if (Components.isSuccessCode(status)) { + // resolve(); + // } else { + // reject(new Error("Error clearing push subscriptions: " + + // status)); + // } + // }); + //}); TelemetryStopwatch.finish("FX_SANITIZE_SITESETTINGS", refObj); }),

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

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

[torbutton/master] Translations update
by gk＠torproject.org 29 Nov '18

29 Nov '18

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

[torbutton/master] Release preparations for 2.1.2
by gk＠torproject.org 29 Nov '18

29 Nov '18

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

[tor-launcher/master] Version bump (0.2.18)
by gk＠torproject.org 29 Nov '18

29 Nov '18

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

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

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

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" /> + ++  ++  + <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"> ++  + <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> + +  ++  + <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" /> ++  + <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> ++  + <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> + ++  + <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> ++  + <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"/> ++  ++  + <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> + ++  + <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.BridgeWizardActivity"/> + ++  + <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> + ++  + <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> + ++  + <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> +  +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> +  +  +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> +  +- <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> +  + <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> +  + <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

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