- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-68.9.0esr-10.0-1] squash! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens
by sysrqb＠torproject.org 29 May '20

29 May '20

commit 002d35ffa55518c5517c2be746da2678a70da47a Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 8 06:31:09 2020 +0000 squash! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens Bug 30318: Integrate snowflake into mobile Tor Browser --- .../res/layout/preference_tor_network_select_bridge_type.xml | 11 +++++++++++ .../java/org/mozilla/gecko/torbootstrap/TorPreferences.java | 7 ++++++- mobile/android/base/locales/en-US/torbrowser_strings.dtd | 1 + mobile/android/base/strings.xml.in | 1 + 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/mobile/android/app/src/main/res/layout/preference_tor_network_select_bridge_type.xml b/mobile/android/app/src/main/res/layout/preference_tor_network_select_bridge_type.xml index 4ef5925e233d..6108819430d3 100644 --- a/mobile/android/app/src/main/res/layout/preference_tor_network_select_bridge_type.xml +++ b/mobile/android/app/src/main/res/layout/preference_tor_network_select_bridge_type.xml @@ -74,6 +74,17 @@ android:textSize="16sp" android:text="@string/pref_bridges_type_meek_azure"/> <include layout="@xml/separator" /> + <RadioButton android:id="@+id/radio_pref_bridges_snowflake" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="10sp" + android:layout_marginBottom="10sp" + android:buttonTint="@color/tor_bridges_select_builtin" + android:fontFamily="Roboto-Regular" + android:textColor="#DE000000" + android:textSize="16sp" + android:text="@string/pref_bridges_type_snowflake"/> + <include layout="@xml/separator" /> </RadioGroup> </LinearLayout> diff --git a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java index cb37f3867ca4..66473529c069 100644 --- a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java +++ b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java @@ -679,6 +679,9 @@ public class TorPreferences extends AppCompatPreferenceActivity { case "meek": buttonId = R.id.radio_pref_bridges_meek_azure; break; + case "snowflake": + buttonId = R.id.radio_pref_bridges_snowflake; + break; } if (buttonId != -1) { @@ -730,11 +733,13 @@ public class TorPreferences extends AppCompatPreferenceActivity { // // Similarly, if meek-azure is chosen, substitute it with "meek" // (tor-android-service only handles these keywords specially if - // they are less than 5 characters). + // they are less than 10 characters). if (bridgesType.contains("obfs4")) { bridgesType = "obfs4"; } else if (bridgesType.contains("meek-azure")) { bridgesType = "meek"; + } else if (bridgesType.contains("snowflake")) { + bridgesType = "snowflake"; } Preference bridgesTypePref = findPreference(PREFS_BRIDGES_TYPE); diff --git a/mobile/android/base/locales/en-US/torbrowser_strings.dtd b/mobile/android/base/locales/en-US/torbrowser_strings.dtd index 8d000f90d561..d4009b272ce9 100644 --- a/mobile/android/base/locales/en-US/torbrowser_strings.dtd +++ b/mobile/android/base/locales/en-US/torbrowser_strings.dtd @@ -54,6 +54,7 @@  <!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)"> <!ENTITY pref_bridges_type_meek_azure "meek-azure"> +<!ENTITY pref_bridges_type_snowflake "snowflake"> <!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change"> <!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change"> <!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges."> diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in index 5a6c14bb4331..2dc7c6650880 100644 --- a/mobile/android/base/strings.xml.in +++ b/mobile/android/base/strings.xml.in @@ -102,6 +102,7 @@ <string name="pref_choice_tor_bridges_enabled_summary">&pref_choice_tor_bridges_enabled_summary;</string> <string name="pref_bridges_type_obfs4">&pref_bridges_type_obfs4;</string> <string name="pref_bridges_type_meek_azure">&pref_bridges_type_meek_azure;</string> + <string name="pref_bridges_type_snowflake">&pref_bridges_type_snowflake;</string> <string name="pref_tor_bridges_provide_manual_button_title">&pref_tor_bridges_provide_manual_button_title;</string> <string name="pref_tor_bridges_provide_select_text_title">&pref_tor_bridges_provide_select_text_title;</string>

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] fixup! Bug 34321 - Add Learn More onboarding item
by sysrqb＠torproject.org 29 May '20

29 May '20

commit c64571e507f1d6868f6a08d807489d6b34063af1 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 13:24:39 2020 +0000 fixup! Bug 34321 - Add Learn More onboarding item --- browser/extensions/onboarding/content/Onboarding.jsm | 2 -- 1 file changed, 2 deletions(-) diff --git a/browser/extensions/onboarding/content/Onboarding.jsm b/browser/extensions/onboarding/content/Onboarding.jsm index 2115b2bd9d27..b411a3039a3e 100644 --- a/browser/extensions/onboarding/content/Onboarding.jsm +++ b/browser/extensions/onboarding/content/Onboarding.jsm @@ -124,7 +124,6 @@ var onboardingTourset = { "tor-network-9.0": { id: "onboarding-tour-tor-network-9-0", tourNameId: "onboarding.tour-tor-network", - highlightId: "onboarding.tour-tor-update.prefix-new", getPage(win) { let div = win.document.createElement("div"); @@ -249,7 +248,6 @@ var onboardingTourset = { "toolbar-update-9.0": { id: "onboarding-tour-tor-toolbar-update-9-0", tourNameId: "onboarding.tour-tor-toolbar", - highlightId: "onboarding.tour-tor-update.prefix-updated", getPage(win) { let div = win.document.createElement("div");

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] Merge branch 'bug34347_00' into tor-browser-68.9.0esr-10.0-1
by sysrqb＠torproject.org 29 May '20

29 May '20

commit 0d7f107b512ba82d57cc20c791aea402a499b584 Merge: 62b2d85bf2b2 c64571e507f1 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 19:57:29 2020 +0000 Merge branch 'bug34347_00' into tor-browser-68.9.0esr-10.0-1 browser/extensions/onboarding/content/Onboarding.jsm | 2 -- 1 file changed, 2 deletions(-)

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] Merge remote-tracking branch 'bradetpo/bug34315-01' into tor-browser-68.9.0esr-10.0-1
by sysrqb＠torproject.org 29 May '20

29 May '20

commit 62b2d85bf2b29f90f554fb53079d30fd692e6d64 Merge: b53e2d8fb7fa 686bbbd739c9 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 19:38:39 2020 +0000 Merge remote-tracking branch 'bradetpo/bug34315-01' into tor-browser-68.9.0esr-10.0-1 .../components/enterprisepolicies/EnterprisePolicies.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] squash! Bug 32418: Allow updates to be disabled via an enterprise policy.
by sysrqb＠torproject.org 29 May '20

29 May '20

commit 686bbbd739c930ee49f6d4ba3909628c22340385 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu May 28 10:14:55 2020 -0400 squash! Bug 32418: Allow updates to be disabled via an enterprise policy. On Linux, avoid reading policies from /etc/firefox/policies/policies.json --- .../components/enterprisepolicies/EnterprisePolicies.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/toolkit/components/enterprisepolicies/EnterprisePolicies.js b/toolkit/components/enterprisepolicies/EnterprisePolicies.js index 5276725703f6..afbfadffbf29 100644 --- a/toolkit/components/enterprisepolicies/EnterprisePolicies.js +++ b/toolkit/components/enterprisepolicies/EnterprisePolicies.js @@ -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/. */ -// To avoid accessing the Windows Registry or macOS' file system attributes, -// Tor Browser only supports policies.json. -#define JSON_POLICIES_ONLY MOZ_PROXY_BYPASS_PROTECTION +// To ensure that policies intended for Firefox or another browser will not +// be used, Tor Browser only looks for policies in ${InstallDir}/distribution +#define AVOID_SYSTEM_POLICIES MOZ_PROXY_BYPASS_PROTECTION const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" @@ -15,7 +15,7 @@ const { AppConstants } = ChromeUtils.import( ); XPCOMUtils.defineLazyModuleGetters(this, { -#ifndef JSON_POLICIES_ONLY +#ifndef AVOID_SYSTEM_POLICIES WindowsGPOParser: "resource://gre/modules/policies/WindowsGPOParser.jsm", macOSPoliciesParser: "resource://gre/modules/policies/macOSPoliciesParser.jsm", @@ -117,7 +117,7 @@ EnterprisePoliciesManager.prototype = { _chooseProvider() { let provider = null; -#ifndef JSON_POLICIES_ONLY +#ifndef AVOID_SYSTEM_POLICIES if (AppConstants.platform == "win") { provider = new WindowsGPOPoliciesProvider(); } else if (AppConstants.platform == "macosx") { @@ -481,6 +481,7 @@ class JSONPoliciesProvider { _getConfigurationFile() { let configFile = null; +#ifndef AVOID_SYSTEM_POLICIES if (AppConstants.platform == "linux") { let systemConfigFile = Cc["@mozilla.org/file/local;1"].createInstance( Ci.nsIFile @@ -493,6 +494,7 @@ class JSONPoliciesProvider { return systemConfigFile; } } +#endif try { configFile = Services.dirsvc.get("XREAppDist", Ci.nsIFile); @@ -569,7 +571,7 @@ class JSONPoliciesProvider { } } -#ifndef JSON_POLICIES_ONLY +#ifndef AVOID_SYSTEM_POLICIES class WindowsGPOPoliciesProvider { constructor() { this._policies = null;

1 0

[tor-browser-build/master] Bug 34202: Remove unused xz project
by sysrqb＠torproject.org 29 May '20

29 May '20

commit 28172b36ac6442b10985e818f6bd96f2623d093a Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 13 08:40:29 2020 +0000 Bug 34202: Remove unused xz project --- projects/xz/build | 16 ---------------- projects/xz/config | 23 ----------------------- 2 files changed, 39 deletions(-) diff --git a/projects/xz/build b/projects/xz/build deleted file mode 100644 index 4ef654c..0000000 --- a/projects/xz/build +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -distdir=/var/tmp/dist/[% project %] -mkdir -p $distdir -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz -cd /var/tmp/build/[% project %]-[% c('version') %] -./autogen.sh -./configure [% c("var/configure_opt") %] --prefix=$distdir -make -j[% c("buildconf/num_procs") %] install -cd /var/tmp/dist -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/xz/config b/projects/xz/config deleted file mode 100644 index eac35e1..0000000 --- a/projects/xz/config +++ /dev/null @@ -1,23 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 5.2.4 -git_url: https://git.tukaani.org/xz.git -git_hash: 'v[% c("version") %]' -tag_gpg_id: 1 -gpg_keyring: xz.gpg -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 - -targets: - android: - var: - arch_deps: - - autopoint - configure_opt_project: --disable-shared --disable-xz --disable-xzdec --disable-lzmadec --disable-lzmainfo --disable-lzma-links --disable-scripts --disable-doc - -input_files: - - project: container-image - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]'

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gktpo/bug_34202'
by sysrqb＠torproject.org 29 May '20

29 May '20

commit aa0a75cb536fe257bc3c74f694fa362ff6194b57 Merge: ede6ffb 28172b3 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 19:09:46 2020 +0000 Merge remote-tracking branch 'gktpo/bug_34202' projects/xz/build | 16 ---------------- projects/xz/config | 23 ----------------------- 2 files changed, 39 deletions(-)

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gktpo/bug_34219'
by sysrqb＠torproject.org 29 May '20

29 May '20

commit ede6ffb414a8684f5dab8615836504acf2774734 Merge: e1accd2 40809c5 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 17:16:29 2020 +0000 Merge remote-tracking branch 'gktpo/bug_34219' projects/tor/build | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor-browser-build/master] Bug 34219: Enable ZSTD support on Android
by sysrqb＠torproject.org 29 May '20

29 May '20

commit 40809c54c2e198cbe11d0d4f19bc9fd7c242166b Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 14 13:29:38 2020 +0000 Bug 34219: Enable ZSTD support on Android --- projects/tor/build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/tor/build b/projects/tor/build index 30ecc7e..7747549 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -8,6 +8,10 @@ mkdir -p /var/tmp/build TORCONFIGDIR="$distdir/assets/common" libsdir=$distdir/jniLibs/[% c("var/abi") %] mkdir -p $libsdir $TORCONFIGDIR "$distdir/Tor" + # We need to make sure our ZSTD dependencey is properly picked up. + # --enable-zstd is not enough. + export ZSTD_CFLAGS=-I/var/tmp/dist/zstd/include + export ZSTD_LIBS=/var/tmp/dist/zstd/lib/libzstd.a [% END %] [% IF c("var/linux") || c("var/windows") %]

1 0

[tor-android-service/master] Bug 30318: Add snowflake support
by sysrqb＠torproject.org 29 May '20

29 May '20

commit ecc251d0a73f7e2034a271efd28036a0108b8688 Author: Georg Koppen <gk(a)torproject.org> Date: Sat May 9 19:33:18 2020 +0000 Bug 30318: Add snowflake support --- service/src/main/assets/common/bridges.txt | 2 ++ .../torproject/android/service/CustomTorInstaller.java | 18 ++++++++++++------ .../org/torproject/android/service/TorService.java | 8 +++++--- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/service/src/main/assets/common/bridges.txt b/service/src/main/assets/common/bridges.txt index 9ab9098..a913c11 100644 --- a/service/src/main/assets/common/bridges.txt +++ b/service/src/main/assets/common/bridges.txt @@ -13,3 +13,5 @@ obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcU obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0 obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0 meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com + +snowflake 0.0.3.0:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72 diff --git a/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java b/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java index 198c981..52bc4fe 100644 --- a/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java +++ b/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java @@ -40,14 +40,17 @@ public class CustomTorInstaller extends TorInstaller { @Override public InputStream openBridgesStream() throws IOException { /* - BridgesList is an overloaded field, which can cause some confusion. The list can be: - 1) a filter like obfs4 or meek OR 2) it can be a custom bridge - For (1), we just pass back all bridges, the filter will occur elsewhere in the library. - For (2) we return the bridge list as a raw stream - If length is greater than 5, then we know this is a custom bridge + BridgesList is an overloaded field, which can cause some confusion. + The list can be: + 1) a filter like obfs4, meek, or snowflake OR + 2) it can be a custom bridge + For (1), we just pass back all bridges, the filter will occur + elsewhere in the library. + For (2) we return the bridge list as a raw stream. + If length is greater than 9, then we know this is a custom bridge */ String userDefinedBridgeList = Prefs.getBridgesList(); - byte bridgeType = (byte) (userDefinedBridgeList.length() > 5 ? 1 : 0); + byte bridgeType = (byte) (userDefinedBridgeList.length() > 9 ? 1 : 0); // Terrible hack. Must keep in sync with topl::addBridgesFromResources. if (bridgeType == 0) { switch (userDefinedBridgeList) { @@ -57,6 +60,9 @@ public class CustomTorInstaller extends TorInstaller { case "meek": bridgeType = 3; break; + case "snowflake": + bridgeType = 4; + break; } } diff --git a/service/src/main/java/org/torproject/android/service/TorService.java b/service/src/main/java/org/torproject/android/service/TorService.java index 16d2537..971c2e9 100644 --- a/service/src/main/java/org/torproject/android/service/TorService.java +++ b/service/src/main/java/org/torproject/android/service/TorService.java @@ -368,10 +368,12 @@ public final class TorService extends Service implements TorServiceConstants, Or //Check bridges to see if we need this File nativeDir = new File(getApplicationInfo().nativeLibraryDir); - File pluggableTransport = new File(nativeDir, "libObfs4proxy.so"); - if(!pluggableTransport.canExecute()) pluggableTransport.setExecutable(true); + File pluggableTransportObfs = new File(nativeDir, "libObfs4proxy.so"); + if(!pluggableTransportObfs.canExecute()) pluggableTransportObfs.setExecutable(true); + File pluggableTransportSnow = new File(nativeDir, "libSnowflake.so"); + if(!pluggableTransportSnow.canExecute()) pluggableTransportSnow.setExecutable(true); - builder.configurePluggableTransportsFromSettings(pluggableTransport); + builder.configurePluggableTransportsFromSettings(pluggableTransportObfs, pluggableTransportSnow); mDataService.updateConfigBuilder(builder); onionProxyManager.getTorInstaller().updateTorConfigCustom (builder.asString());

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] Revert "Bug 1633568 - Introduce a installation ping. r=Grisha, a=RyanVM"
by sysrqb＠torproject.org 29 May '20

29 May '20

commit 163e227bffddc187ee1588bd4802c67991f145a3 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 17:27:59 2020 +0000 Revert "Bug 1633568 - Introduce a installation ping. r=Grisha, a=RyanVM" This reverts commit 7163fd7d989bcf114b43cba342f48639024d1141. --- .../base/java/org/mozilla/gecko/BrowserApp.java | 5 +- .../TelemetryInstallationPingDelegate.java | 128 -------------- .../TelemetryInstallationPingBuilder.java | 186 --------------------- .../stores/TelemetryInstallationPingStore.java | 102 ----------- 4 files changed, 1 insertion(+), 420 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 6ce56bcc7e68..2efae19ca7c5 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -146,7 +146,6 @@ import org.mozilla.gecko.tabs.TabHistoryFragment; import org.mozilla.gecko.tabs.TabHistoryPage; import org.mozilla.gecko.tabs.TabsPanel; import org.mozilla.gecko.telemetry.TelemetryCorePingDelegate; -import org.mozilla.gecko.telemetry.TelemetryInstallationPingDelegate; import org.mozilla.gecko.telemetry.TelemetryUploadService; import org.mozilla.gecko.telemetry.measurements.SearchCountMeasurements; import org.mozilla.gecko.telemetry.TelemetryActivationPingDelegate; @@ -336,7 +335,6 @@ public class BrowserApp extends GeckoApp private final TelemetryCorePingDelegate mTelemetryCorePingDelegate = new TelemetryCorePingDelegate(); private final TelemetryActivationPingDelegate mTelemetryActivationPingDelegate = new TelemetryActivationPingDelegate(); - private final TelemetryInstallationPingDelegate mTelemetryInstallationPingDelegate = new TelemetryInstallationPingDelegate(); private final List<BrowserAppDelegate> delegates = Collections.unmodifiableList(Arrays.asList( new ScreenshotDelegate(), @@ -344,9 +342,8 @@ public class BrowserApp extends GeckoApp new ReaderViewBookmarkPromotion(), mTelemetryCorePingDelegate, mTelemetryActivationPingDelegate, - mTelemetryInstallationPingDelegate, new OfflineTabStatusDelegate(), - new AdjustBrowserAppDelegate(mTelemetryCorePingDelegate, mTelemetryInstallationPingDelegate) + new AdjustBrowserAppDelegate(mTelemetryCorePingDelegate) )); @NonNull diff --git a/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryInstallationPingDelegate.java b/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryInstallationPingDelegate.java deleted file mode 100644 index 55657a0d0efa..000000000000 --- a/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryInstallationPingDelegate.java +++ /dev/null @@ -1,128 +0,0 @@ -/* - * 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/. - */ - -package org.mozilla.gecko.telemetry; - -import android.support.annotation.NonNull; -import android.util.Log; - -import com.adjust.sdk.AdjustAttribution; - -import org.mozilla.gecko.BrowserApp; -import org.mozilla.gecko.GeckoAppShell; -import org.mozilla.gecko.adjust.AttributionHelperListener; -import org.mozilla.gecko.delegates.BrowserAppDelegate; -import org.mozilla.gecko.telemetry.pingbuilders.TelemetryInstallationPingBuilder; -import org.mozilla.gecko.telemetry.pingbuilders.TelemetryInstallationPingBuilder.PingReason; -import org.mozilla.gecko.telemetry.schedulers.TelemetryUploadAllPingsImmediatelyScheduler; -import org.mozilla.gecko.telemetry.stores.TelemetryInstallationPingStore; -import org.mozilla.gecko.util.ThreadUtils; - -import java.io.IOException; - -public class TelemetryInstallationPingDelegate - extends BrowserAppDelegate - implements AttributionHelperListener { - - private static final String LOGTAG = "InstallPingDelegate"; - - @Override - public void onStart(BrowserApp browserApp) { - if (!TelemetryUploadService.isUploadEnabledByAppConfig(browserApp)) { - return; - } - - // Keep everything off of main thread. Don't need to burden it with telemetry. - ThreadUtils.postToBackgroundThread(() -> { - TelemetryInstallationPingStore store; - try { - store = new TelemetryInstallationPingStore(); - } catch (IllegalStateException e) { - // The store constructor might throw an IllegalStateException if it cannot access - // the store directory. - // This has been observed on CI mochitests, not sure about if this would also reproduce - // in the real world. - // We'll retry at the next app start. - Log.w(LOGTAG, "Cannot access ping's storage directory. Will retry later"); - return; - } - - // First allow for stored pings to be re-uploaded if the previous upload did not succeed. - // (A successful upload would delete the pings persisted to disk) - if (store.getCount() != 0) { - store.queuePingsForUpload(new TelemetryUploadAllPingsImmediatelyScheduler()); - } - - // Only need one of each pings. Check if we should create a new one. - if (!TelemetryInstallationPingStore.hasLightPingBeenQueuedForUpload()) { - TelemetryOutgoingPing ping = new TelemetryInstallationPingBuilder() - .setReason(PingReason.APP_STARTED) - .build(); - - try { - store.storePing(ping); - store.queuePingsForUpload(new TelemetryUploadAllPingsImmediatelyScheduler()); - store.setLightPingQueuedForUpload(); - } catch (IOException e) { - // #storePing() might throw in the process of persisting to disk. - // Nothing to do. At the next app start we'll try again to create a new ping, - // store and upload that. - Log.w(LOGTAG, "Could not store ping. Will try again later"); - } - } - }); - } - - @Override - public void onAttributionChanged(@NonNull final AdjustAttribution attribution) { - if (!TelemetryUploadService.isUploadEnabledByAppConfig(GeckoAppShell.getApplicationContext())) { - return; - } - - // Keep everything off of main thread. Don't need to burden it with telemetry. - ThreadUtils.postToBackgroundThread(() -> { - TelemetryInstallationPingStore store; - try { - store = new TelemetryInstallationPingStore(); - } catch (IllegalStateException e) { - // The store constructor might throw an IllegalStateException if it cannot access - // the store directory. - // This has been observed on CI mochitests, not sure about if this would also reproduce - // in the real world. - // Since the attributionChanged callback only fire once IRL this would mean we won't - // be sending the "adjust-available" ping. - Log.w(LOGTAG, "Cannot access ping's storage directory. " + - "Cannot send the \"adjust-available\" ping"); - return; - } - - // First allow for stored pings to be re-uploaded if the previous upload did not succeed. - // (A successful upload would delete the pings persisted to disk) - if (store.getCount() != 0) { - store.queuePingsForUpload(new TelemetryUploadAllPingsImmediatelyScheduler()); - } - - // It may be possible that in the app's lifetime Adjust campaigns are changed. - // Sanity check that the "adjust-available" ping has not yet been send. - if (!TelemetryInstallationPingStore.hasFullPingBeenQueuedForUpload()) { - TelemetryOutgoingPing ping = new TelemetryInstallationPingBuilder() - .setReason(PingReason.ADJUST_AVAILABLE) - .setAdjustProperties(attribution) - .build(); - - try { - store.storePing(ping); - store.queuePingsForUpload(new TelemetryUploadAllPingsImmediatelyScheduler()); - store.setFullPingQueuedForUpload(); - } catch (IOException e) { - // #storePing() might throw in the process of persisting to disk. - // Nothing we can do. The "adjust-available" ping is lost. - Log.w(LOGTAG, "Could not store the \"adjust-available\" ping"); - } - } - }); - } -} diff --git a/mobile/android/base/java/org/mozilla/gecko/telemetry/pingbuilders/TelemetryInstallationPingBuilder.java b/mobile/android/base/java/org/mozilla/gecko/telemetry/pingbuilders/TelemetryInstallationPingBuilder.java deleted file mode 100644 index 24f94c1d06a3..000000000000 --- a/mobile/android/base/java/org/mozilla/gecko/telemetry/pingbuilders/TelemetryInstallationPingBuilder.java +++ /dev/null @@ -1,186 +0,0 @@ -/* - * 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/. - */ - -package org.mozilla.gecko.telemetry.pingbuilders; - -import android.content.Context; -import android.content.SharedPreferences; -import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.util.Log; - -import com.adjust.sdk.AdjustAttribution; - -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.GeckoAppShell; -import org.mozilla.gecko.GeckoSharedPrefs; -import org.mozilla.gecko.GeckoThread; -import org.mozilla.gecko.Locales; -import org.mozilla.gecko.util.DateUtil; -import org.mozilla.gecko.util.HardwareUtils; - -import java.lang.reflect.Method; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.Locale; - -public class TelemetryInstallationPingBuilder extends TelemetryPingBuilder { - private static final String LOGTAG = "InstallPingBuilder"; - - public enum PingReason { - APP_STARTED("app-started"), - ADJUST_AVAILABLE("adjust-available"); - - PingReason(String reason) { - this.value = reason; - } - - public final String value; - } - - private static final String PING_TYPE = "installation"; - private static final int PING_FORMAT_VERSION = 1; - - private static final String PREF_KEY_SEQ_NUMBER = "installationPingSeqNumber"; - - private static final String PING_VERSION = "v"; - private static final String REASON = "reason"; - private static final String PING_QUEUED_TIMES = "seq"; - private static final String CLIENT_ID = "client_id"; - private static final String DEVICE_ID = "device_id"; - private static final String LOCALE = "locale"; - private static final String OS_NAME = "os"; - private static final String OS_VERSION = "osversion"; - private static final String DEVICE_MANUFACTURER = "manufacturer"; - private static final String DEVICE_MODEL = "model"; - private static final String DEVICE_ABI = "arch"; - private static final String PROFILE_DATE = "profile_date"; - private static final String PING_CREATION_TIME = "created"; - private static final String TIMEZONE_OFFSET = "tz"; - private static final String APP_NAME = "app_name"; - private static final String RELEASE_CHANNEL = "channel"; - private static final String ADJUST_CAMPAIGN = "campaign"; - private static final String ADJUST_ADGROUP = "adgroup"; - private static final String ADJUST_CREATIVE = "creative"; - private static final String ADJUST_NETWORK = "network"; - - public TelemetryInstallationPingBuilder() { - super(UNIFIED_TELEMETRY_VERSION, false); - setPayloadConstants(); - } - - @Override - public String getDocType() { - return PING_TYPE; - } - - @Override - public String[] getMandatoryFields() { - return new String[]{ - PING_VERSION, - REASON, - PING_QUEUED_TIMES, - CLIENT_ID, - DEVICE_ID, - LOCALE, - OS_NAME, - OS_VERSION, - DEVICE_MANUFACTURER, - DEVICE_MODEL, - DEVICE_ABI, - PROFILE_DATE, - PING_CREATION_TIME, - TIMEZONE_OFFSET, - APP_NAME, - RELEASE_CHANNEL, - }; - } - - public @NonNull TelemetryInstallationPingBuilder setReason(@NonNull PingReason reason) { - payload.put(REASON, reason.value); - - return this; - } - - public @NonNull TelemetryInstallationPingBuilder setAdjustProperties(@NonNull final AdjustAttribution attribution) { - payload.put(ADJUST_CAMPAIGN, attribution.campaign); - payload.put(ADJUST_ADGROUP, attribution.adgroup); - payload.put(ADJUST_CREATIVE, attribution.creative); - payload.put(ADJUST_NETWORK, attribution.network); - - return this; - } - - private void setPayloadConstants() { - payload.put(PING_VERSION, PING_FORMAT_VERSION); - payload.put(PING_QUEUED_TIMES, incrementAndGetQueueTimes()); - payload.put(CLIENT_ID, getGeckoClientID()); - payload.put(DEVICE_ID, getAdvertisingId()); - payload.put(LOCALE, Locales.getLanguageTag(Locale.getDefault())); - payload.put(OS_NAME, TelemetryPingBuilder.OS_NAME); - payload.put(OS_VERSION, Integer.toString(Build.VERSION.SDK_INT)); - payload.put(DEVICE_MANUFACTURER, Build.MANUFACTURER); - payload.put(DEVICE_MODEL, Build.MODEL); - payload.put(DEVICE_ABI, HardwareUtils.getRealAbi()); - payload.put(PROFILE_DATE, getGeckoProfileCreationDate()); - payload.put(PING_CREATION_TIME, new SimpleDateFormat("yyyy-MM-dd", Locale.US).format(new Date())); - payload.put(TIMEZONE_OFFSET, DateUtil.getTimezoneOffsetInMinutesForGivenDate(Calendar.getInstance())); - payload.put(APP_NAME, AppConstants.MOZ_APP_BASENAME); - payload.put(RELEASE_CHANNEL, AppConstants.MOZ_UPDATE_CHANNEL); - } - - private @Nullable String getGeckoClientID() { - // zero-ed Gecko profile that respects the expected format "8-4-4-4-12" chars - String clientID = "00000000-0000-0000-0000-000000000000"; - try { - clientID = GeckoThread.getActiveProfile().getClientId(); - } catch (Exception e) { - Log.w(LOGTAG, "Could not get Gecko Client ID", e); - } - - return clientID; - } - - private @Nullable String getAdvertisingId() { - String advertisingId = null; - try { - final Class<?> clazz = Class.forName("org.mozilla.gecko.advertising.AdvertisingUtil"); - final Method getAdvertisingId = clazz.getMethod("getAdvertisingId", Context.class); - advertisingId = (String) getAdvertisingId.invoke(clazz, GeckoAppShell.getApplicationContext()); - } catch (Exception e) { - Log.w(LOGTAG, "Could not get advertising ID", e); - } - - return advertisingId; - } - - // Ensure sequential increment and return in all instances. - private static synchronized int incrementAndGetQueueTimes() { - final SharedPreferences sharedPrefs = GeckoSharedPrefs.forProfile(GeckoAppShell.getApplicationContext()); - - // 1-based, always incremented - final int incrementedSeqNumber = sharedPrefs.getInt(PREF_KEY_SEQ_NUMBER, 0) + 1; - sharedPrefs.edit().putInt(PREF_KEY_SEQ_NUMBER, incrementedSeqNumber).apply(); - - return incrementedSeqNumber; - } - - private int getGeckoProfileCreationDate() { - // The method returns days since epoch. An int is enough. - int date = 0; - try { - date = TelemetryActivationPingBuilder.getProfileCreationDate( - GeckoAppShell.getApplicationContext(), - GeckoThread.getActiveProfile()).intValue(); - } catch (NullPointerException e) { - Log.w(LOGTAG, "Could not get Gecko profile creation date", e); - } - - return date; - } -} diff --git a/mobile/android/base/java/org/mozilla/gecko/telemetry/stores/TelemetryInstallationPingStore.java b/mobile/android/base/java/org/mozilla/gecko/telemetry/stores/TelemetryInstallationPingStore.java deleted file mode 100644 index c6aacab25e73..000000000000 --- a/mobile/android/base/java/org/mozilla/gecko/telemetry/stores/TelemetryInstallationPingStore.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * 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/. - */ - -package org.mozilla.gecko.telemetry.stores; - -import android.content.SharedPreferences; -import android.os.Parcel; -import android.os.Parcelable; -import android.support.annotation.NonNull; - -import org.mozilla.gecko.GeckoAppShell; -import org.mozilla.gecko.GeckoSharedPrefs; -import org.mozilla.gecko.GeckoThread; -import org.mozilla.gecko.telemetry.schedulers.TelemetryUploadAllPingsImmediatelyScheduler; - -import java.io.File; - -public class TelemetryInstallationPingStore extends TelemetryJSONFilePingStore { - private static final String PREF_KEY_WAS_LIGHT_PING_STORED = "wasLightInstallationPingStored"; - private static final String PREF_KEY_WAS_FULL_PING_STORED = "wasFullInstallationPingStored"; - private static final String INSTALLATION_PING_STORE_DIR = "installation_ping"; - private static final String DEFAULT_PROFILE = "default"; - - public TelemetryInstallationPingStore() { - super(getInstallationPingStoreDir(), getCurrentProfileName()); - } - - public TelemetryInstallationPingStore(@NonNull final File storeDir, @NonNull final String profileName) { - super(storeDir, profileName); - } - - @Override - public void maybePrunePings() { - // no-op - // Successfully uploaded pings will be deleted in onUploadAttemptComplete(..). - } - - public void queuePingsForUpload(@NonNull final TelemetryUploadAllPingsImmediatelyScheduler scheduler) { - scheduler.scheduleUpload(GeckoAppShell.getApplicationContext(), this); - } - - public static boolean hasLightPingBeenQueuedForUpload() { - return getSharedPrefs().getBoolean(PREF_KEY_WAS_LIGHT_PING_STORED, false); - } - - public static boolean hasFullPingBeenQueuedForUpload() { - return getSharedPrefs().getBoolean(PREF_KEY_WAS_FULL_PING_STORED, false); - } - - public void setLightPingQueuedForUpload() { - getSharedPrefs().edit().putBoolean(PREF_KEY_WAS_LIGHT_PING_STORED, true).apply(); - } - - public void setFullPingQueuedForUpload() { - getSharedPrefs().edit().putBoolean(PREF_KEY_WAS_FULL_PING_STORED, true).apply(); - } - - private static @NonNull SharedPreferences getSharedPrefs() { - return GeckoSharedPrefs.forProfile(GeckoAppShell.getApplicationContext()); - } - - private static @NonNull File getInstallationPingStoreDir() { - return GeckoAppShell.getApplicationContext().getFileStreamPath(INSTALLATION_PING_STORE_DIR); - } - - private static @NonNull String getCurrentProfileName() { - return GeckoThread.getActiveProfile() != null ? - GeckoThread.getActiveProfile().getName() : - DEFAULT_PROFILE; - } - - - // Class needs to be Parcelable as it will be passed through Intents - public static final Parcelable.Creator<TelemetryInstallationPingStore> CREATOR = - new Parcelable.Creator<TelemetryInstallationPingStore>() { - - @Override - public TelemetryInstallationPingStore createFromParcel(final Parcel source) { - final String storeDirPath = source.readString(); - final String profileName = source.readString(); - return new TelemetryInstallationPingStore(new File(storeDirPath), profileName); - } - - @Override - public TelemetryInstallationPingStore[] newArray(final int size) { - return new TelemetryInstallationPingStore[size]; - } - }; - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(final Parcel dest, final int flags) { - super.writeToParcel(dest, flags); - } -}

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] Revert "Bug 1633568 - AdjustHelper can inform more listeners about Attribution changes. r=Grisha, a=RyanVM"
by sysrqb＠torproject.org 29 May '20

29 May '20

commit b53e2d8fb7fa0c5dc6c7f98bb57a71b24c033c00 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 17:28:34 2020 +0000 Revert "Bug 1633568 - AdjustHelper can inform more listeners about Attribution changes. r=Grisha, a=RyanVM" This reverts commit 4d64699b7d664a70793431effc2f4e054ebf9230. --- .../org/mozilla/gecko/adjust/AdjustBrowserAppDelegate.java | 8 ++++---- .../base/java/org/mozilla/gecko/adjust/AdjustHelper.java | 14 ++++++-------- .../org/mozilla/gecko/adjust/AdjustHelperInterface.java | 2 +- .../mozilla/gecko/adjust/AttributionHelperListener.java | 11 ++--------- .../java/org/mozilla/gecko/adjust/StubAdjustHelper.java | 2 +- .../mozilla/gecko/telemetry/TelemetryCorePingDelegate.java | 7 ++----- 6 files changed, 16 insertions(+), 28 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustBrowserAppDelegate.java b/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustBrowserAppDelegate.java index f160e971def3..aee0bba63a8a 100644 --- a/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustBrowserAppDelegate.java +++ b/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustBrowserAppDelegate.java @@ -13,18 +13,18 @@ import org.mozilla.gecko.util.IntentUtils; public class AdjustBrowserAppDelegate extends BrowserAppDelegate { private final AdjustHelperInterface adjustHelper; - private final AttributionHelperListener[] attributionHelperListeners; + private final AttributionHelperListener attributionHelperListener; - public AdjustBrowserAppDelegate(AttributionHelperListener... attributionHelperListeners) { + public AdjustBrowserAppDelegate(AttributionHelperListener attributionHelperListener) { this.adjustHelper = AdjustConstants.getAdjustHelper(); - this.attributionHelperListeners = attributionHelperListeners; + this.attributionHelperListener = attributionHelperListener; } @Override public void onCreate(BrowserApp browserApp, Bundle savedInstanceState) { adjustHelper.onCreate(browserApp, AdjustConstants.MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN, - attributionHelperListeners); + attributionHelperListener); final boolean isInAutomation = IntentUtils.getIsInAutomationFromEnvironment( new SafeIntent(browserApp.getIntent())); diff --git a/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelper.java b/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelper.java index 410a172e7750..19399e735bb5 100644 --- a/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelper.java +++ b/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelper.java @@ -21,9 +21,9 @@ import org.mozilla.gecko.AppConstants; public class AdjustHelper implements AdjustHelperInterface, OnAttributionChangedListener { private static final String LOGTAG = AdjustHelper.class.getSimpleName(); - private AttributionHelperListener[] attributionListeners; + private AttributionHelperListener attributionListener; - public void onCreate(final Context context, final String maybeAppToken, final AttributionHelperListener... listeners) { + public void onCreate(final Context context, final String maybeAppToken, final AttributionHelperListener listener) { final String environment; final LogLevel logLevel; if (AppConstants.MOZILLA_OFFICIAL) { @@ -37,7 +37,7 @@ public class AdjustHelper implements AdjustHelperInterface, OnAttributionChanged // We've got install tracking turned on -- we better have a token! throw new IllegalArgumentException("maybeAppToken must not be null"); } - attributionListeners = listeners; + attributionListener = listener; AdjustConfig config = new AdjustConfig(context, maybeAppToken, environment); config.setLogLevel(logLevel); config.setOnAttributionChangedListener(this); @@ -62,16 +62,14 @@ public class AdjustHelper implements AdjustHelperInterface, OnAttributionChanged @Override public void onAttributionChanged(AdjustAttribution attribution) { - if (attributionListeners == null) { + if (attributionListener == null) { throw new IllegalStateException("Expected non-null attribution listener."); } if (attribution == null) { - Log.e(LOGTAG, "Adjust attribution is null. Skipping informing listeners about this."); + Log.e(LOGTAG, "Adjust attribution is null; skipping campaign id retrieval."); return; } - for (AttributionHelperListener listener: attributionListeners) { - listener.onAttributionChanged(attribution); - } + attributionListener.onCampaignIdChanged(attribution.campaign); } } diff --git a/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelperInterface.java b/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelperInterface.java index 0e4b9ff6455c..aeb7b4334e9f 100644 --- a/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelperInterface.java +++ b/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelperInterface.java @@ -13,7 +13,7 @@ public interface AdjustHelperInterface { * Register the Application with the Adjust SDK. * @param appToken the (secret!) Adjust SDK per-application token to register with; may be null. */ - void onCreate(final Context context, final String appToken, final AttributionHelperListener... listener); + void onCreate(final Context context, final String appToken, final AttributionHelperListener listener); void onPause(); void onResume(); diff --git a/mobile/android/base/java/org/mozilla/gecko/adjust/AttributionHelperListener.java b/mobile/android/base/java/org/mozilla/gecko/adjust/AttributionHelperListener.java index ada55838707a..6dadd2261d7a 100644 --- a/mobile/android/base/java/org/mozilla/gecko/adjust/AttributionHelperListener.java +++ b/mobile/android/base/java/org/mozilla/gecko/adjust/AttributionHelperListener.java @@ -5,20 +5,13 @@ package org.mozilla.gecko.adjust; -import android.support.annotation.NonNull; - -import com.adjust.sdk.AdjustAttribution; - /** * Because of how our build module dependencies are structured, we aren't able to use * the {@link com.adjust.sdk.OnAttributionChangedListener} directly outside of {@link AdjustHelper}. * If the Adjust SDK is enabled, this listener should be notified when {@link com.adjust.sdk.OnAttributionChangedListener} * is fired (i.e. this listener would be daisy-chained to the Adjust one). The listener also - * inherits thread-safety from GeckoSharedPrefs which is used to store the attribution. + * inherits thread-safety from GeckoSharedPrefs which is used to store the campaign ID. */ public interface AttributionHelperListener { - /** - * @param attribution - new Adjust attribution configuration. - */ - void onAttributionChanged(@NonNull final AdjustAttribution attribution); + void onCampaignIdChanged(String campaignId); } diff --git a/mobile/android/base/java/org/mozilla/gecko/adjust/StubAdjustHelper.java b/mobile/android/base/java/org/mozilla/gecko/adjust/StubAdjustHelper.java index 386bd97c05e2..ddfed84bd73b 100644 --- a/mobile/android/base/java/org/mozilla/gecko/adjust/StubAdjustHelper.java +++ b/mobile/android/base/java/org/mozilla/gecko/adjust/StubAdjustHelper.java @@ -9,7 +9,7 @@ import android.content.Context; import android.content.Intent; public class StubAdjustHelper implements AdjustHelperInterface { - public void onCreate(final Context context, final String appToken, final AttributionHelperListener... listeners) { + public void onCreate(final Context context, final String appToken, final AttributionHelperListener listener) { // Do nothing. } diff --git a/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryCorePingDelegate.java b/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryCorePingDelegate.java index 5b54657d319c..fa00a37a7c16 100644 --- a/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryCorePingDelegate.java +++ b/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryCorePingDelegate.java @@ -9,14 +9,11 @@ package org.mozilla.gecko.telemetry; import android.accessibilityservice.AccessibilityServiceInfo; import android.content.Context; import android.content.SharedPreferences; -import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.WorkerThread; import android.util.Log; import android.view.accessibility.AccessibilityManager; -import com.adjust.sdk.AdjustAttribution; - import org.json.JSONArray; import org.json.JSONException; import org.mozilla.gecko.BrowserApp; @@ -276,7 +273,7 @@ public class TelemetryCorePingDelegate extends BrowserAppDelegateWithReference } @Override - public void onAttributionChanged(@NonNull final AdjustAttribution attribution) { - CampaignIdMeasurements.updateCampaignIdPref(getBrowserApp(), attribution.campaign); + public void onCampaignIdChanged(String campaignId) { + CampaignIdMeasurements.updateCampaignIdPref(getBrowserApp(), campaignId); } }

1 0

[tor-browser-build/master] Bug 31128: Move Windows containers to Debian 10
by sysrqb＠torproject.org 29 May '20

29 May '20

commit e1accd273fd41b6ede9a3690d1a7b5206a5edb5d Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 15 07:07:42 2020 +0000 Bug 31128: Move Windows containers to Debian 10 --- projects/firefox/config | 5 ----- rbm.conf | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index b6a8440..272634d 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -107,11 +107,6 @@ targets: # We need this to install wine32 dpkg --add-architecture i386 [% END -%] - echo 'deb http://ftp.debian.org/debian stretch-backports main' >> /etc/apt/sources.list - post_pkginst: | - # We need to have at least 3.0.3 which Mozilla is using in the - # mingw-w64/clang build process - apt-get -y -t stretch-backports install wine[% IF c("var/windows-i686") %]32[% END %] compiler: mingw-w64-clang windows-i686: diff --git a/rbm.conf b/rbm.conf index 592c265..ba1cc23 100644 --- a/rbm.conf +++ b/rbm.conf @@ -350,7 +350,7 @@ targets: var: windows: 1 container: - suite: stretch + suite: buster arch: amd64 configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]" [% c("var/configure_opt_project") %]' CFLAGS: '-fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security [% c("var/flag_mwindows") %]'

1 0

[tor-browser-build/master] Bug 31129: Move macOS containers to Debian 10
by sysrqb＠torproject.org 29 May '20

29 May '20

commit 96c528a80b689becbd8faca040db15c48543ce8f Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 14 10:24:07 2020 +0000 Bug 31129: Move macOS containers to Debian 10 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 628e33d..592c265 100644 --- a/rbm.conf +++ b/rbm.conf @@ -378,7 +378,7 @@ targets: osx: 1 osname: osx-x86_64 container: - suite: stretch + suite: buster arch: amd64 compiler: 'macosx-toolchain' configure_opt: '--host=x86_64-apple-darwin11 CC="x86_64-apple-darwin11-clang [% c("var/FLAGS") %]" CXX="x86_64-apple-darwin11-clang++ [% c("var/FLAGS") %]" [% c("var/configure_opt_project") %]'

1 0

[tor-browser-build/maint-9.5] Pickup -build2 for fixing Android build failure
by sysrqb＠torproject.org 28 May '20

28 May '20

commit 7e2d338211b0dfc9a74e0dee955b81ec47f7e211 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu May 28 17:59:17 2020 +0000 Pickup -build2 for fixing Android build failure --- projects/firefox/config | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 6459294..012f82a 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/rbm.conf b/rbm.conf index cb492cf..77d8e56 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.5' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 9.0.10 project_name: tor-browser

1 0

[tor-browser/tor-browser-68.9.0esr-9.5-1] Revert "Bug 1633568 - AdjustHelper can inform more listeners about Attribution changes. r=Grisha, a=RyanVM"
by sysrqb＠torproject.org 28 May '20

28 May '20

commit 6421b707dd0a0cfcde4c2c45a8747dfd2ca89c49 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu May 28 17:55:11 2020 +0000 Revert "Bug 1633568 - AdjustHelper can inform more listeners about Attribution changes. r=Grisha, a=RyanVM" This reverts commit 4d64699b7d664a70793431effc2f4e054ebf9230. --- .../org/mozilla/gecko/adjust/AdjustBrowserAppDelegate.java | 8 ++++---- .../base/java/org/mozilla/gecko/adjust/AdjustHelper.java | 14 ++++++-------- .../org/mozilla/gecko/adjust/AdjustHelperInterface.java | 2 +- .../mozilla/gecko/adjust/AttributionHelperListener.java | 11 ++--------- .../java/org/mozilla/gecko/adjust/StubAdjustHelper.java | 2 +- .../mozilla/gecko/telemetry/TelemetryCorePingDelegate.java | 7 ++----- 6 files changed, 16 insertions(+), 28 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustBrowserAppDelegate.java b/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustBrowserAppDelegate.java index f160e971def3..aee0bba63a8a 100644 --- a/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustBrowserAppDelegate.java +++ b/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustBrowserAppDelegate.java @@ -13,18 +13,18 @@ import org.mozilla.gecko.util.IntentUtils; public class AdjustBrowserAppDelegate extends BrowserAppDelegate { private final AdjustHelperInterface adjustHelper; - private final AttributionHelperListener[] attributionHelperListeners; + private final AttributionHelperListener attributionHelperListener; - public AdjustBrowserAppDelegate(AttributionHelperListener... attributionHelperListeners) { + public AdjustBrowserAppDelegate(AttributionHelperListener attributionHelperListener) { this.adjustHelper = AdjustConstants.getAdjustHelper(); - this.attributionHelperListeners = attributionHelperListeners; + this.attributionHelperListener = attributionHelperListener; } @Override public void onCreate(BrowserApp browserApp, Bundle savedInstanceState) { adjustHelper.onCreate(browserApp, AdjustConstants.MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN, - attributionHelperListeners); + attributionHelperListener); final boolean isInAutomation = IntentUtils.getIsInAutomationFromEnvironment( new SafeIntent(browserApp.getIntent())); diff --git a/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelper.java b/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelper.java index 410a172e7750..19399e735bb5 100644 --- a/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelper.java +++ b/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelper.java @@ -21,9 +21,9 @@ import org.mozilla.gecko.AppConstants; public class AdjustHelper implements AdjustHelperInterface, OnAttributionChangedListener { private static final String LOGTAG = AdjustHelper.class.getSimpleName(); - private AttributionHelperListener[] attributionListeners; + private AttributionHelperListener attributionListener; - public void onCreate(final Context context, final String maybeAppToken, final AttributionHelperListener... listeners) { + public void onCreate(final Context context, final String maybeAppToken, final AttributionHelperListener listener) { final String environment; final LogLevel logLevel; if (AppConstants.MOZILLA_OFFICIAL) { @@ -37,7 +37,7 @@ public class AdjustHelper implements AdjustHelperInterface, OnAttributionChanged // We've got install tracking turned on -- we better have a token! throw new IllegalArgumentException("maybeAppToken must not be null"); } - attributionListeners = listeners; + attributionListener = listener; AdjustConfig config = new AdjustConfig(context, maybeAppToken, environment); config.setLogLevel(logLevel); config.setOnAttributionChangedListener(this); @@ -62,16 +62,14 @@ public class AdjustHelper implements AdjustHelperInterface, OnAttributionChanged @Override public void onAttributionChanged(AdjustAttribution attribution) { - if (attributionListeners == null) { + if (attributionListener == null) { throw new IllegalStateException("Expected non-null attribution listener."); } if (attribution == null) { - Log.e(LOGTAG, "Adjust attribution is null. Skipping informing listeners about this."); + Log.e(LOGTAG, "Adjust attribution is null; skipping campaign id retrieval."); return; } - for (AttributionHelperListener listener: attributionListeners) { - listener.onAttributionChanged(attribution); - } + attributionListener.onCampaignIdChanged(attribution.campaign); } } diff --git a/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelperInterface.java b/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelperInterface.java index 0e4b9ff6455c..aeb7b4334e9f 100644 --- a/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelperInterface.java +++ b/mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelperInterface.java @@ -13,7 +13,7 @@ public interface AdjustHelperInterface { * Register the Application with the Adjust SDK. * @param appToken the (secret!) Adjust SDK per-application token to register with; may be null. */ - void onCreate(final Context context, final String appToken, final AttributionHelperListener... listener); + void onCreate(final Context context, final String appToken, final AttributionHelperListener listener); void onPause(); void onResume(); diff --git a/mobile/android/base/java/org/mozilla/gecko/adjust/AttributionHelperListener.java b/mobile/android/base/java/org/mozilla/gecko/adjust/AttributionHelperListener.java index ada55838707a..6dadd2261d7a 100644 --- a/mobile/android/base/java/org/mozilla/gecko/adjust/AttributionHelperListener.java +++ b/mobile/android/base/java/org/mozilla/gecko/adjust/AttributionHelperListener.java @@ -5,20 +5,13 @@ package org.mozilla.gecko.adjust; -import android.support.annotation.NonNull; - -import com.adjust.sdk.AdjustAttribution; - /** * Because of how our build module dependencies are structured, we aren't able to use * the {@link com.adjust.sdk.OnAttributionChangedListener} directly outside of {@link AdjustHelper}. * If the Adjust SDK is enabled, this listener should be notified when {@link com.adjust.sdk.OnAttributionChangedListener} * is fired (i.e. this listener would be daisy-chained to the Adjust one). The listener also - * inherits thread-safety from GeckoSharedPrefs which is used to store the attribution. + * inherits thread-safety from GeckoSharedPrefs which is used to store the campaign ID. */ public interface AttributionHelperListener { - /** - * @param attribution - new Adjust attribution configuration. - */ - void onAttributionChanged(@NonNull final AdjustAttribution attribution); + void onCampaignIdChanged(String campaignId); } diff --git a/mobile/android/base/java/org/mozilla/gecko/adjust/StubAdjustHelper.java b/mobile/android/base/java/org/mozilla/gecko/adjust/StubAdjustHelper.java index 386bd97c05e2..ddfed84bd73b 100644 --- a/mobile/android/base/java/org/mozilla/gecko/adjust/StubAdjustHelper.java +++ b/mobile/android/base/java/org/mozilla/gecko/adjust/StubAdjustHelper.java @@ -9,7 +9,7 @@ import android.content.Context; import android.content.Intent; public class StubAdjustHelper implements AdjustHelperInterface { - public void onCreate(final Context context, final String appToken, final AttributionHelperListener... listeners) { + public void onCreate(final Context context, final String appToken, final AttributionHelperListener listener) { // Do nothing. } diff --git a/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryCorePingDelegate.java b/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryCorePingDelegate.java index 5b54657d319c..fa00a37a7c16 100644 --- a/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryCorePingDelegate.java +++ b/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryCorePingDelegate.java @@ -9,14 +9,11 @@ package org.mozilla.gecko.telemetry; import android.accessibilityservice.AccessibilityServiceInfo; import android.content.Context; import android.content.SharedPreferences; -import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.WorkerThread; import android.util.Log; import android.view.accessibility.AccessibilityManager; -import com.adjust.sdk.AdjustAttribution; - import org.json.JSONArray; import org.json.JSONException; import org.mozilla.gecko.BrowserApp; @@ -276,7 +273,7 @@ public class TelemetryCorePingDelegate extends BrowserAppDelegateWithReference } @Override - public void onAttributionChanged(@NonNull final AdjustAttribution attribution) { - CampaignIdMeasurements.updateCampaignIdPref(getBrowserApp(), attribution.campaign); + public void onCampaignIdChanged(String campaignId) { + CampaignIdMeasurements.updateCampaignIdPref(getBrowserApp(), campaignId); } }

1 0

[tor-browser/tor-browser-68.9.0esr-9.5-1] Revert "Bug 1633568 - Introduce a installation ping. r=Grisha, a=RyanVM"
by sysrqb＠torproject.org 28 May '20

28 May '20

commit 7f05e7ab2f1badfd0108d9bf0a6ef34d28a62b87 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu May 28 17:55:04 2020 +0000 Revert "Bug 1633568 - Introduce a installation ping. r=Grisha, a=RyanVM" This reverts commit 7163fd7d989bcf114b43cba342f48639024d1141. --- .../base/java/org/mozilla/gecko/BrowserApp.java | 5 +- .../TelemetryInstallationPingDelegate.java | 128 -------------- .../TelemetryInstallationPingBuilder.java | 186 --------------------- .../stores/TelemetryInstallationPingStore.java | 102 ----------- 4 files changed, 1 insertion(+), 420 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 6ce56bcc7e68..2efae19ca7c5 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -146,7 +146,6 @@ import org.mozilla.gecko.tabs.TabHistoryFragment; import org.mozilla.gecko.tabs.TabHistoryPage; import org.mozilla.gecko.tabs.TabsPanel; import org.mozilla.gecko.telemetry.TelemetryCorePingDelegate; -import org.mozilla.gecko.telemetry.TelemetryInstallationPingDelegate; import org.mozilla.gecko.telemetry.TelemetryUploadService; import org.mozilla.gecko.telemetry.measurements.SearchCountMeasurements; import org.mozilla.gecko.telemetry.TelemetryActivationPingDelegate; @@ -336,7 +335,6 @@ public class BrowserApp extends GeckoApp private final TelemetryCorePingDelegate mTelemetryCorePingDelegate = new TelemetryCorePingDelegate(); private final TelemetryActivationPingDelegate mTelemetryActivationPingDelegate = new TelemetryActivationPingDelegate(); - private final TelemetryInstallationPingDelegate mTelemetryInstallationPingDelegate = new TelemetryInstallationPingDelegate(); private final List<BrowserAppDelegate> delegates = Collections.unmodifiableList(Arrays.asList( new ScreenshotDelegate(), @@ -344,9 +342,8 @@ public class BrowserApp extends GeckoApp new ReaderViewBookmarkPromotion(), mTelemetryCorePingDelegate, mTelemetryActivationPingDelegate, - mTelemetryInstallationPingDelegate, new OfflineTabStatusDelegate(), - new AdjustBrowserAppDelegate(mTelemetryCorePingDelegate, mTelemetryInstallationPingDelegate) + new AdjustBrowserAppDelegate(mTelemetryCorePingDelegate) )); @NonNull diff --git a/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryInstallationPingDelegate.java b/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryInstallationPingDelegate.java deleted file mode 100644 index 55657a0d0efa..000000000000 --- a/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryInstallationPingDelegate.java +++ /dev/null @@ -1,128 +0,0 @@ -/* - * 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/. - */ - -package org.mozilla.gecko.telemetry; - -import android.support.annotation.NonNull; -import android.util.Log; - -import com.adjust.sdk.AdjustAttribution; - -import org.mozilla.gecko.BrowserApp; -import org.mozilla.gecko.GeckoAppShell; -import org.mozilla.gecko.adjust.AttributionHelperListener; -import org.mozilla.gecko.delegates.BrowserAppDelegate; -import org.mozilla.gecko.telemetry.pingbuilders.TelemetryInstallationPingBuilder; -import org.mozilla.gecko.telemetry.pingbuilders.TelemetryInstallationPingBuilder.PingReason; -import org.mozilla.gecko.telemetry.schedulers.TelemetryUploadAllPingsImmediatelyScheduler; -import org.mozilla.gecko.telemetry.stores.TelemetryInstallationPingStore; -import org.mozilla.gecko.util.ThreadUtils; - -import java.io.IOException; - -public class TelemetryInstallationPingDelegate - extends BrowserAppDelegate - implements AttributionHelperListener { - - private static final String LOGTAG = "InstallPingDelegate"; - - @Override - public void onStart(BrowserApp browserApp) { - if (!TelemetryUploadService.isUploadEnabledByAppConfig(browserApp)) { - return; - } - - // Keep everything off of main thread. Don't need to burden it with telemetry. - ThreadUtils.postToBackgroundThread(() -> { - TelemetryInstallationPingStore store; - try { - store = new TelemetryInstallationPingStore(); - } catch (IllegalStateException e) { - // The store constructor might throw an IllegalStateException if it cannot access - // the store directory. - // This has been observed on CI mochitests, not sure about if this would also reproduce - // in the real world. - // We'll retry at the next app start. - Log.w(LOGTAG, "Cannot access ping's storage directory. Will retry later"); - return; - } - - // First allow for stored pings to be re-uploaded if the previous upload did not succeed. - // (A successful upload would delete the pings persisted to disk) - if (store.getCount() != 0) { - store.queuePingsForUpload(new TelemetryUploadAllPingsImmediatelyScheduler()); - } - - // Only need one of each pings. Check if we should create a new one. - if (!TelemetryInstallationPingStore.hasLightPingBeenQueuedForUpload()) { - TelemetryOutgoingPing ping = new TelemetryInstallationPingBuilder() - .setReason(PingReason.APP_STARTED) - .build(); - - try { - store.storePing(ping); - store.queuePingsForUpload(new TelemetryUploadAllPingsImmediatelyScheduler()); - store.setLightPingQueuedForUpload(); - } catch (IOException e) { - // #storePing() might throw in the process of persisting to disk. - // Nothing to do. At the next app start we'll try again to create a new ping, - // store and upload that. - Log.w(LOGTAG, "Could not store ping. Will try again later"); - } - } - }); - } - - @Override - public void onAttributionChanged(@NonNull final AdjustAttribution attribution) { - if (!TelemetryUploadService.isUploadEnabledByAppConfig(GeckoAppShell.getApplicationContext())) { - return; - } - - // Keep everything off of main thread. Don't need to burden it with telemetry. - ThreadUtils.postToBackgroundThread(() -> { - TelemetryInstallationPingStore store; - try { - store = new TelemetryInstallationPingStore(); - } catch (IllegalStateException e) { - // The store constructor might throw an IllegalStateException if it cannot access - // the store directory. - // This has been observed on CI mochitests, not sure about if this would also reproduce - // in the real world. - // Since the attributionChanged callback only fire once IRL this would mean we won't - // be sending the "adjust-available" ping. - Log.w(LOGTAG, "Cannot access ping's storage directory. " + - "Cannot send the \"adjust-available\" ping"); - return; - } - - // First allow for stored pings to be re-uploaded if the previous upload did not succeed. - // (A successful upload would delete the pings persisted to disk) - if (store.getCount() != 0) { - store.queuePingsForUpload(new TelemetryUploadAllPingsImmediatelyScheduler()); - } - - // It may be possible that in the app's lifetime Adjust campaigns are changed. - // Sanity check that the "adjust-available" ping has not yet been send. - if (!TelemetryInstallationPingStore.hasFullPingBeenQueuedForUpload()) { - TelemetryOutgoingPing ping = new TelemetryInstallationPingBuilder() - .setReason(PingReason.ADJUST_AVAILABLE) - .setAdjustProperties(attribution) - .build(); - - try { - store.storePing(ping); - store.queuePingsForUpload(new TelemetryUploadAllPingsImmediatelyScheduler()); - store.setFullPingQueuedForUpload(); - } catch (IOException e) { - // #storePing() might throw in the process of persisting to disk. - // Nothing we can do. The "adjust-available" ping is lost. - Log.w(LOGTAG, "Could not store the \"adjust-available\" ping"); - } - } - }); - } -} diff --git a/mobile/android/base/java/org/mozilla/gecko/telemetry/pingbuilders/TelemetryInstallationPingBuilder.java b/mobile/android/base/java/org/mozilla/gecko/telemetry/pingbuilders/TelemetryInstallationPingBuilder.java deleted file mode 100644 index 24f94c1d06a3..000000000000 --- a/mobile/android/base/java/org/mozilla/gecko/telemetry/pingbuilders/TelemetryInstallationPingBuilder.java +++ /dev/null @@ -1,186 +0,0 @@ -/* - * 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/. - */ - -package org.mozilla.gecko.telemetry.pingbuilders; - -import android.content.Context; -import android.content.SharedPreferences; -import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.util.Log; - -import com.adjust.sdk.AdjustAttribution; - -import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.GeckoAppShell; -import org.mozilla.gecko.GeckoSharedPrefs; -import org.mozilla.gecko.GeckoThread; -import org.mozilla.gecko.Locales; -import org.mozilla.gecko.util.DateUtil; -import org.mozilla.gecko.util.HardwareUtils; - -import java.lang.reflect.Method; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.Locale; - -public class TelemetryInstallationPingBuilder extends TelemetryPingBuilder { - private static final String LOGTAG = "InstallPingBuilder"; - - public enum PingReason { - APP_STARTED("app-started"), - ADJUST_AVAILABLE("adjust-available"); - - PingReason(String reason) { - this.value = reason; - } - - public final String value; - } - - private static final String PING_TYPE = "installation"; - private static final int PING_FORMAT_VERSION = 1; - - private static final String PREF_KEY_SEQ_NUMBER = "installationPingSeqNumber"; - - private static final String PING_VERSION = "v"; - private static final String REASON = "reason"; - private static final String PING_QUEUED_TIMES = "seq"; - private static final String CLIENT_ID = "client_id"; - private static final String DEVICE_ID = "device_id"; - private static final String LOCALE = "locale"; - private static final String OS_NAME = "os"; - private static final String OS_VERSION = "osversion"; - private static final String DEVICE_MANUFACTURER = "manufacturer"; - private static final String DEVICE_MODEL = "model"; - private static final String DEVICE_ABI = "arch"; - private static final String PROFILE_DATE = "profile_date"; - private static final String PING_CREATION_TIME = "created"; - private static final String TIMEZONE_OFFSET = "tz"; - private static final String APP_NAME = "app_name"; - private static final String RELEASE_CHANNEL = "channel"; - private static final String ADJUST_CAMPAIGN = "campaign"; - private static final String ADJUST_ADGROUP = "adgroup"; - private static final String ADJUST_CREATIVE = "creative"; - private static final String ADJUST_NETWORK = "network"; - - public TelemetryInstallationPingBuilder() { - super(UNIFIED_TELEMETRY_VERSION, false); - setPayloadConstants(); - } - - @Override - public String getDocType() { - return PING_TYPE; - } - - @Override - public String[] getMandatoryFields() { - return new String[]{ - PING_VERSION, - REASON, - PING_QUEUED_TIMES, - CLIENT_ID, - DEVICE_ID, - LOCALE, - OS_NAME, - OS_VERSION, - DEVICE_MANUFACTURER, - DEVICE_MODEL, - DEVICE_ABI, - PROFILE_DATE, - PING_CREATION_TIME, - TIMEZONE_OFFSET, - APP_NAME, - RELEASE_CHANNEL, - }; - } - - public @NonNull TelemetryInstallationPingBuilder setReason(@NonNull PingReason reason) { - payload.put(REASON, reason.value); - - return this; - } - - public @NonNull TelemetryInstallationPingBuilder setAdjustProperties(@NonNull final AdjustAttribution attribution) { - payload.put(ADJUST_CAMPAIGN, attribution.campaign); - payload.put(ADJUST_ADGROUP, attribution.adgroup); - payload.put(ADJUST_CREATIVE, attribution.creative); - payload.put(ADJUST_NETWORK, attribution.network); - - return this; - } - - private void setPayloadConstants() { - payload.put(PING_VERSION, PING_FORMAT_VERSION); - payload.put(PING_QUEUED_TIMES, incrementAndGetQueueTimes()); - payload.put(CLIENT_ID, getGeckoClientID()); - payload.put(DEVICE_ID, getAdvertisingId()); - payload.put(LOCALE, Locales.getLanguageTag(Locale.getDefault())); - payload.put(OS_NAME, TelemetryPingBuilder.OS_NAME); - payload.put(OS_VERSION, Integer.toString(Build.VERSION.SDK_INT)); - payload.put(DEVICE_MANUFACTURER, Build.MANUFACTURER); - payload.put(DEVICE_MODEL, Build.MODEL); - payload.put(DEVICE_ABI, HardwareUtils.getRealAbi()); - payload.put(PROFILE_DATE, getGeckoProfileCreationDate()); - payload.put(PING_CREATION_TIME, new SimpleDateFormat("yyyy-MM-dd", Locale.US).format(new Date())); - payload.put(TIMEZONE_OFFSET, DateUtil.getTimezoneOffsetInMinutesForGivenDate(Calendar.getInstance())); - payload.put(APP_NAME, AppConstants.MOZ_APP_BASENAME); - payload.put(RELEASE_CHANNEL, AppConstants.MOZ_UPDATE_CHANNEL); - } - - private @Nullable String getGeckoClientID() { - // zero-ed Gecko profile that respects the expected format "8-4-4-4-12" chars - String clientID = "00000000-0000-0000-0000-000000000000"; - try { - clientID = GeckoThread.getActiveProfile().getClientId(); - } catch (Exception e) { - Log.w(LOGTAG, "Could not get Gecko Client ID", e); - } - - return clientID; - } - - private @Nullable String getAdvertisingId() { - String advertisingId = null; - try { - final Class<?> clazz = Class.forName("org.mozilla.gecko.advertising.AdvertisingUtil"); - final Method getAdvertisingId = clazz.getMethod("getAdvertisingId", Context.class); - advertisingId = (String) getAdvertisingId.invoke(clazz, GeckoAppShell.getApplicationContext()); - } catch (Exception e) { - Log.w(LOGTAG, "Could not get advertising ID", e); - } - - return advertisingId; - } - - // Ensure sequential increment and return in all instances. - private static synchronized int incrementAndGetQueueTimes() { - final SharedPreferences sharedPrefs = GeckoSharedPrefs.forProfile(GeckoAppShell.getApplicationContext()); - - // 1-based, always incremented - final int incrementedSeqNumber = sharedPrefs.getInt(PREF_KEY_SEQ_NUMBER, 0) + 1; - sharedPrefs.edit().putInt(PREF_KEY_SEQ_NUMBER, incrementedSeqNumber).apply(); - - return incrementedSeqNumber; - } - - private int getGeckoProfileCreationDate() { - // The method returns days since epoch. An int is enough. - int date = 0; - try { - date = TelemetryActivationPingBuilder.getProfileCreationDate( - GeckoAppShell.getApplicationContext(), - GeckoThread.getActiveProfile()).intValue(); - } catch (NullPointerException e) { - Log.w(LOGTAG, "Could not get Gecko profile creation date", e); - } - - return date; - } -} diff --git a/mobile/android/base/java/org/mozilla/gecko/telemetry/stores/TelemetryInstallationPingStore.java b/mobile/android/base/java/org/mozilla/gecko/telemetry/stores/TelemetryInstallationPingStore.java deleted file mode 100644 index c6aacab25e73..000000000000 --- a/mobile/android/base/java/org/mozilla/gecko/telemetry/stores/TelemetryInstallationPingStore.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * 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/. - */ - -package org.mozilla.gecko.telemetry.stores; - -import android.content.SharedPreferences; -import android.os.Parcel; -import android.os.Parcelable; -import android.support.annotation.NonNull; - -import org.mozilla.gecko.GeckoAppShell; -import org.mozilla.gecko.GeckoSharedPrefs; -import org.mozilla.gecko.GeckoThread; -import org.mozilla.gecko.telemetry.schedulers.TelemetryUploadAllPingsImmediatelyScheduler; - -import java.io.File; - -public class TelemetryInstallationPingStore extends TelemetryJSONFilePingStore { - private static final String PREF_KEY_WAS_LIGHT_PING_STORED = "wasLightInstallationPingStored"; - private static final String PREF_KEY_WAS_FULL_PING_STORED = "wasFullInstallationPingStored"; - private static final String INSTALLATION_PING_STORE_DIR = "installation_ping"; - private static final String DEFAULT_PROFILE = "default"; - - public TelemetryInstallationPingStore() { - super(getInstallationPingStoreDir(), getCurrentProfileName()); - } - - public TelemetryInstallationPingStore(@NonNull final File storeDir, @NonNull final String profileName) { - super(storeDir, profileName); - } - - @Override - public void maybePrunePings() { - // no-op - // Successfully uploaded pings will be deleted in onUploadAttemptComplete(..). - } - - public void queuePingsForUpload(@NonNull final TelemetryUploadAllPingsImmediatelyScheduler scheduler) { - scheduler.scheduleUpload(GeckoAppShell.getApplicationContext(), this); - } - - public static boolean hasLightPingBeenQueuedForUpload() { - return getSharedPrefs().getBoolean(PREF_KEY_WAS_LIGHT_PING_STORED, false); - } - - public static boolean hasFullPingBeenQueuedForUpload() { - return getSharedPrefs().getBoolean(PREF_KEY_WAS_FULL_PING_STORED, false); - } - - public void setLightPingQueuedForUpload() { - getSharedPrefs().edit().putBoolean(PREF_KEY_WAS_LIGHT_PING_STORED, true).apply(); - } - - public void setFullPingQueuedForUpload() { - getSharedPrefs().edit().putBoolean(PREF_KEY_WAS_FULL_PING_STORED, true).apply(); - } - - private static @NonNull SharedPreferences getSharedPrefs() { - return GeckoSharedPrefs.forProfile(GeckoAppShell.getApplicationContext()); - } - - private static @NonNull File getInstallationPingStoreDir() { - return GeckoAppShell.getApplicationContext().getFileStreamPath(INSTALLATION_PING_STORE_DIR); - } - - private static @NonNull String getCurrentProfileName() { - return GeckoThread.getActiveProfile() != null ? - GeckoThread.getActiveProfile().getName() : - DEFAULT_PROFILE; - } - - - // Class needs to be Parcelable as it will be passed through Intents - public static final Parcelable.Creator<TelemetryInstallationPingStore> CREATOR = - new Parcelable.Creator<TelemetryInstallationPingStore>() { - - @Override - public TelemetryInstallationPingStore createFromParcel(final Parcel source) { - final String storeDirPath = source.readString(); - final String profileName = source.readString(); - return new TelemetryInstallationPingStore(new File(storeDirPath), profileName); - } - - @Override - public TelemetryInstallationPingStore[] newArray(final int size) { - return new TelemetryInstallationPingStore[size]; - } - }; - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(final Parcel dest, final int flags) { - super.writeToParcel(dest, flags); - } -}

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] Bug 34321 - Add Learn More onboarding item
by sysrqb＠torproject.org 28 May '20

28 May '20

commit d9016507dc5dd4910023b29df339aff63fd5d9a1 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue May 19 15:38:20 2020 +0000 Bug 34321 - Add Learn More onboarding item --- browser/app/profile/000-tor-browser.js | 6 +- browser/extensions/onboarding/api.js | 1 + .../extensions/onboarding/content/Onboarding.jsm | 67 +++++++++++++++++----- .../extensions/onboarding/content/onboarding.css | 5 +- 4 files changed, 60 insertions(+), 19 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 0176e8feb64d..27b7c7972df8 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -296,9 +296,9 @@ pref("browser.download.panel.shown", true); pref("dom.securecontext.whitelist_onions", true); // Onboarding. -pref("browser.onboarding.tourset-version", 4); -pref("browser.onboarding.newtour", "welcome,privacy,tor-network-9.0,circuit-display,security,expect-differences,onion-services"); -pref("browser.onboarding.updatetour", "toolbar-update-9.0,tor-network-9.0"); +pref("browser.onboarding.tourset-version", 5); +pref("browser.onboarding.newtour", "welcome,privacy,tor-network-9.0,circuit-display,security,expect-differences,onion-services,learn-more"); +pref("browser.onboarding.updatetour", "learn-more"); pref("browser.onboarding.skip-tour-button.hide", true); // prefs to disable jump-list entries in the taskbar on Windows (see bug #12885) diff --git a/browser/extensions/onboarding/api.js b/browser/extensions/onboarding/api.js index 29b6f68a7914..d7dffaaaac19 100644 --- a/browser/extensions/onboarding/api.js +++ b/browser/extensions/onboarding/api.js @@ -45,6 +45,7 @@ const PREF_WHITELIST = [ "onboarding-tour-tor-expect-differences", "onboarding-tour-tor-onion-services", "onboarding-tour-tor-toolbar-update-9-0", + "onboarding-tour-tor-learn-more", #if 0 // Firefox tours. To reduce conflicts when rebasing against newer Firefox // code, we use the preprocessor to omit this code block. diff --git a/browser/extensions/onboarding/content/Onboarding.jsm b/browser/extensions/onboarding/content/Onboarding.jsm index 4d991acf869d..2115b2bd9d27 100644 --- a/browser/extensions/onboarding/content/Onboarding.jsm +++ b/browser/extensions/onboarding/content/Onboarding.jsm @@ -14,6 +14,7 @@ const ONBOARDING_CSS_URL = "resource://onboarding/onboarding.css"; const TORBUTTON_BUNDLE_URI = "chrome://torbutton/locale/browserOnboarding.properties"; const TORBROWSER_WELCOME_TOUR_NAME_KEY = "onboarding.tour-tor-welcome"; const BUNDLE_URI = "chrome://torbutton/locale/onboarding.properties"; +const BROWSER_BUNDLE_URI = "chrome://browser/locale/browser.properties"; const UITOUR_JS_URI = "resource://onboarding/lib/UITour-lib.js"; const TOUR_AGENT_JS_URI = "resource://onboarding/onboarding-tour-agent.js"; const BRAND_SHORT_NAME = Services.strings @@ -235,6 +236,15 @@ var onboardingTourset = { return div; }, }, + "learn-more": { + id: "onboarding-tour-tor-learn-more", + // Re-use "Learn More" string from Firefox langpacks + tourNameId: "getUserMedia.shareScreen.learnMoreLabel", + highlightId: "onboarding.tour-tor-update.prefix-new", + getPage(win) { + return win.document.createElement("div"); + }, + }, // Tour items for users who have updated their Tor Browser: "toolbar-update-9.0": { id: "onboarding-tour-tor-toolbar-update-9-0", @@ -901,20 +911,29 @@ class Onboarding { } const kOnionURL = "https://3g2upl4pq6kufc4m.onion/"; // DuckDuckGo + const kLearnMore = "https://www.torproject.org/releases/tor-browser-95/"; let handledTourActionClick = false; switch (id) { case "onboarding-overlay-button-icon": case "onboarding-overlay-button": - this.telemetry({ - type: "onboarding-logo-click", - bubble_state: this._bubbleState, - logo_state: this._logoState, - notification_state: this._notificationState, - session_key: this._session_key, - width: this._windowWidthRounded, - }); - this.showOverlay(); - this.gotoPage(this._firstUncompleteTour.id); + // If this instance upgraded, then directly open the release notes + // when the bubble is clicked. + if (this._tourType === "update") { + this.sendMessageToChrome("tor-open-tab", {url: kLearnMore}); + // Mark item as complete + this.setToursCompleted(["onboarding-tour-tor-learn-more"]); + } else { + this.telemetry({ + type: "onboarding-logo-click", + bubble_state: this._bubbleState, + logo_state: this._logoState, + notification_state: this._notificationState, + session_key: this._session_key, + width: this._windowWidthRounded, + }); + this.showOverlay(); + this.gotoPage(this._firstUncompleteTour.id); + } break; case "onboarding-skip-tour-button": this.hideNotification(); @@ -977,7 +996,6 @@ class Onboarding { case "onboarding-tour-tor-circuit-display-next-button": case "onboarding-tour-tor-security-next-button": case "onboarding-tour-tor-expect-differences-next-button": - case "onboarding-tour-tor-onion-services-next-button": case "onboarding-tour-tor-toolbar-next-button": this.gotoNextTourItem(); handledTourActionClick = true; @@ -994,6 +1012,14 @@ class Onboarding { case "onboarding-tour-tor-onion-services-button": this.sendMessageToChrome("tor-open-tab", {url: kOnionURL}); break; + // Open the Release Notes webpage and hide the overlay. + case "onboarding-tour-tor-onion-services-next-button": + case "onboarding-tour-tor-learn-more": + this.sendMessageToChrome("tor-open-tab", {url: kLearnMore}); + this.hideOverlay(); + // Mark item as complete + this.setToursCompleted(["onboarding-tour-tor-learn-more"]); + break; } if (classList.contains("onboarding-tour-item")) { this.telemetry({ @@ -1852,9 +1878,11 @@ class Onboarding { // _TorOnboardingStringBundle implements the subset of the nsIStringBundle // that is used by the code in this file. It checks first for strings inside // Torbutton's browserOnboarding.properties file and secondarily in Firefox's -// onboarding.properties file. +// onboarding.properties file. Finally, it looks for the string within +// browser.properties. class _TorOnboardingStringBundle { constructor() { + this._mBrowserBundle = Services.strings.createBundle(BROWSER_BUNDLE_URI); this._mFirefoxBundle = Services.strings.createBundle(BUNDLE_URI); this._mTorButtonBundle = Services.strings.createBundle(TORBUTTON_BUNDLE_URI); @@ -1872,7 +1900,11 @@ class _TorOnboardingStringBundle { try { result = this._mTorButtonBundle.GetStringFromName(aName); } catch (e) { - result = this._mFirefoxBundle.GetStringFromName(aName); + try { + result = this._mFirefoxBundle.GetStringFromName(aName); + } catch (e) { + result = this._mBrowserBundle.GetStringFromName(aName); + } } return result; } @@ -1883,8 +1915,13 @@ class _TorOnboardingStringBundle { result = this._mTorButtonBundle.formatStringFromName(aName, aParams, aLength); } catch (e) { - result = this._mFirefoxBundle.formatStringFromName(aName, aParams, - aLength); + try { + result = this._mFirefoxBundle.formatStringFromName(aName, aParams, + aLength); + } catch (e) { + result = this._mBrowserBundle.formatStringFromName(aName, aParams, + aLength); + } } return result; } diff --git a/browser/extensions/onboarding/content/onboarding.css b/browser/extensions/onboarding/content/onboarding.css index eb214de5e254..431b73bd148e 100644 --- a/browser/extensions/onboarding/content/onboarding.css +++ b/browser/extensions/onboarding/content/onboarding.css @@ -167,7 +167,7 @@ #onboarding-overlay.onboarding-opened > #onboarding-overlay-dialog { width: 960px; - height: 510px; + height: 540px; background: #fff; border: 1px solid rgba(9, 6, 13, 0.2); /* #09060D, 0.2 opacity */ border-radius: 3px; @@ -538,6 +538,9 @@ a#onboarding-tour-tor-expect-differences-button:visited, a#onboarding-tour-tor-onion-services-button, a#onboarding-tour-tor-onion-services-button:hover, a#onboarding-tour-tor-onion-services-button:visited, +a#onboarding-tour-tor-learn-more-button, +a#onboarding-tour-tor-learn-more-button:hover, +a#onboarding-tour-tor-learn-more-button:visited, a#onboarding-tour-screenshots-button, a#onboarding-tour-screenshots-button:hover, a#onboarding-tour-screenshots-button:visited {

1 0

[tor-browser/tor-browser-68.9.0esr-9.5-1] Bug 34321 - Add Learn More onboarding item
by sysrqb＠torproject.org 28 May '20

28 May '20

commit db3ccb2a11256421f5d8db7caad10a5a2c98def5 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue May 19 15:38:20 2020 +0000 Bug 34321 - Add Learn More onboarding item --- browser/app/profile/000-tor-browser.js | 6 +- browser/extensions/onboarding/api.js | 1 + .../extensions/onboarding/content/Onboarding.jsm | 67 +++++++++++++++++----- .../extensions/onboarding/content/onboarding.css | 5 +- 4 files changed, 60 insertions(+), 19 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 0176e8feb64d..27b7c7972df8 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -296,9 +296,9 @@ pref("browser.download.panel.shown", true); pref("dom.securecontext.whitelist_onions", true); // Onboarding. -pref("browser.onboarding.tourset-version", 4); -pref("browser.onboarding.newtour", "welcome,privacy,tor-network-9.0,circuit-display,security,expect-differences,onion-services"); -pref("browser.onboarding.updatetour", "toolbar-update-9.0,tor-network-9.0"); +pref("browser.onboarding.tourset-version", 5); +pref("browser.onboarding.newtour", "welcome,privacy,tor-network-9.0,circuit-display,security,expect-differences,onion-services,learn-more"); +pref("browser.onboarding.updatetour", "learn-more"); pref("browser.onboarding.skip-tour-button.hide", true); // prefs to disable jump-list entries in the taskbar on Windows (see bug #12885) diff --git a/browser/extensions/onboarding/api.js b/browser/extensions/onboarding/api.js index 29b6f68a7914..d7dffaaaac19 100644 --- a/browser/extensions/onboarding/api.js +++ b/browser/extensions/onboarding/api.js @@ -45,6 +45,7 @@ const PREF_WHITELIST = [ "onboarding-tour-tor-expect-differences", "onboarding-tour-tor-onion-services", "onboarding-tour-tor-toolbar-update-9-0", + "onboarding-tour-tor-learn-more", #if 0 // Firefox tours. To reduce conflicts when rebasing against newer Firefox // code, we use the preprocessor to omit this code block. diff --git a/browser/extensions/onboarding/content/Onboarding.jsm b/browser/extensions/onboarding/content/Onboarding.jsm index 4d991acf869d..2115b2bd9d27 100644 --- a/browser/extensions/onboarding/content/Onboarding.jsm +++ b/browser/extensions/onboarding/content/Onboarding.jsm @@ -14,6 +14,7 @@ const ONBOARDING_CSS_URL = "resource://onboarding/onboarding.css"; const TORBUTTON_BUNDLE_URI = "chrome://torbutton/locale/browserOnboarding.properties"; const TORBROWSER_WELCOME_TOUR_NAME_KEY = "onboarding.tour-tor-welcome"; const BUNDLE_URI = "chrome://torbutton/locale/onboarding.properties"; +const BROWSER_BUNDLE_URI = "chrome://browser/locale/browser.properties"; const UITOUR_JS_URI = "resource://onboarding/lib/UITour-lib.js"; const TOUR_AGENT_JS_URI = "resource://onboarding/onboarding-tour-agent.js"; const BRAND_SHORT_NAME = Services.strings @@ -235,6 +236,15 @@ var onboardingTourset = { return div; }, }, + "learn-more": { + id: "onboarding-tour-tor-learn-more", + // Re-use "Learn More" string from Firefox langpacks + tourNameId: "getUserMedia.shareScreen.learnMoreLabel", + highlightId: "onboarding.tour-tor-update.prefix-new", + getPage(win) { + return win.document.createElement("div"); + }, + }, // Tour items for users who have updated their Tor Browser: "toolbar-update-9.0": { id: "onboarding-tour-tor-toolbar-update-9-0", @@ -901,20 +911,29 @@ class Onboarding { } const kOnionURL = "https://3g2upl4pq6kufc4m.onion/"; // DuckDuckGo + const kLearnMore = "https://www.torproject.org/releases/tor-browser-95/"; let handledTourActionClick = false; switch (id) { case "onboarding-overlay-button-icon": case "onboarding-overlay-button": - this.telemetry({ - type: "onboarding-logo-click", - bubble_state: this._bubbleState, - logo_state: this._logoState, - notification_state: this._notificationState, - session_key: this._session_key, - width: this._windowWidthRounded, - }); - this.showOverlay(); - this.gotoPage(this._firstUncompleteTour.id); + // If this instance upgraded, then directly open the release notes + // when the bubble is clicked. + if (this._tourType === "update") { + this.sendMessageToChrome("tor-open-tab", {url: kLearnMore}); + // Mark item as complete + this.setToursCompleted(["onboarding-tour-tor-learn-more"]); + } else { + this.telemetry({ + type: "onboarding-logo-click", + bubble_state: this._bubbleState, + logo_state: this._logoState, + notification_state: this._notificationState, + session_key: this._session_key, + width: this._windowWidthRounded, + }); + this.showOverlay(); + this.gotoPage(this._firstUncompleteTour.id); + } break; case "onboarding-skip-tour-button": this.hideNotification(); @@ -977,7 +996,6 @@ class Onboarding { case "onboarding-tour-tor-circuit-display-next-button": case "onboarding-tour-tor-security-next-button": case "onboarding-tour-tor-expect-differences-next-button": - case "onboarding-tour-tor-onion-services-next-button": case "onboarding-tour-tor-toolbar-next-button": this.gotoNextTourItem(); handledTourActionClick = true; @@ -994,6 +1012,14 @@ class Onboarding { case "onboarding-tour-tor-onion-services-button": this.sendMessageToChrome("tor-open-tab", {url: kOnionURL}); break; + // Open the Release Notes webpage and hide the overlay. + case "onboarding-tour-tor-onion-services-next-button": + case "onboarding-tour-tor-learn-more": + this.sendMessageToChrome("tor-open-tab", {url: kLearnMore}); + this.hideOverlay(); + // Mark item as complete + this.setToursCompleted(["onboarding-tour-tor-learn-more"]); + break; } if (classList.contains("onboarding-tour-item")) { this.telemetry({ @@ -1852,9 +1878,11 @@ class Onboarding { // _TorOnboardingStringBundle implements the subset of the nsIStringBundle // that is used by the code in this file. It checks first for strings inside // Torbutton's browserOnboarding.properties file and secondarily in Firefox's -// onboarding.properties file. +// onboarding.properties file. Finally, it looks for the string within +// browser.properties. class _TorOnboardingStringBundle { constructor() { + this._mBrowserBundle = Services.strings.createBundle(BROWSER_BUNDLE_URI); this._mFirefoxBundle = Services.strings.createBundle(BUNDLE_URI); this._mTorButtonBundle = Services.strings.createBundle(TORBUTTON_BUNDLE_URI); @@ -1872,7 +1900,11 @@ class _TorOnboardingStringBundle { try { result = this._mTorButtonBundle.GetStringFromName(aName); } catch (e) { - result = this._mFirefoxBundle.GetStringFromName(aName); + try { + result = this._mFirefoxBundle.GetStringFromName(aName); + } catch (e) { + result = this._mBrowserBundle.GetStringFromName(aName); + } } return result; } @@ -1883,8 +1915,13 @@ class _TorOnboardingStringBundle { result = this._mTorButtonBundle.formatStringFromName(aName, aParams, aLength); } catch (e) { - result = this._mFirefoxBundle.formatStringFromName(aName, aParams, - aLength); + try { + result = this._mFirefoxBundle.formatStringFromName(aName, aParams, + aLength); + } catch (e) { + result = this._mBrowserBundle.formatStringFromName(aName, aParams, + aLength); + } } return result; } diff --git a/browser/extensions/onboarding/content/onboarding.css b/browser/extensions/onboarding/content/onboarding.css index eb214de5e254..431b73bd148e 100644 --- a/browser/extensions/onboarding/content/onboarding.css +++ b/browser/extensions/onboarding/content/onboarding.css @@ -167,7 +167,7 @@ #onboarding-overlay.onboarding-opened > #onboarding-overlay-dialog { width: 960px; - height: 510px; + height: 540px; background: #fff; border: 1px solid rgba(9, 6, 13, 0.2); /* #09060D, 0.2 opacity */ border-radius: 3px; @@ -538,6 +538,9 @@ a#onboarding-tour-tor-expect-differences-button:visited, a#onboarding-tour-tor-onion-services-button, a#onboarding-tour-tor-onion-services-button:hover, a#onboarding-tour-tor-onion-services-button:visited, +a#onboarding-tour-tor-learn-more-button, +a#onboarding-tour-tor-learn-more-button:hover, +a#onboarding-tour-tor-learn-more-button:visited, a#onboarding-tour-screenshots-button, a#onboarding-tour-screenshots-button:hover, a#onboarding-tour-screenshots-button:visited {

1 0

[tor-browser/tor-browser-68.9.0esr-9.5-1] fixup! Pick up latest Torbutton code
by sysrqb＠torproject.org 28 May '20

28 May '20

commit 4fc0f2f46f1863e653279e455f1e0290b76d1c0e Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu May 28 15:00:03 2020 +0000 fixup! Pick up latest Torbutton code --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 83bc9c956c3b..0b6562dfffd0 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 83bc9c956c3be091c421521fcf05c3cdc393e870 +Subproject commit 0b6562dfffd0e032ea0051a8c09069fba37d4838

1 0

[torbutton/master] Translations update
by sysrqb＠torproject.org 28 May '20

28 May '20

commit 0b6562dfffd0e032ea0051a8c09069fba37d4838 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu May 28 14:57:21 2020 +0000 Translations update --- chrome/locale/ar/aboutTor.dtd | 2 +- chrome/locale/ar/torbutton.dtd | 4 +-- chrome/locale/ar/torbutton.properties | 51 ++++++++++++++------------- chrome/locale/bn-BD/torbutton.properties | 1 + chrome/locale/ca/torbutton.properties | 13 +++---- chrome/locale/cs/torbutton.properties | 1 + chrome/locale/da/torbutton.properties | 1 + chrome/locale/de/torbutton.properties | 1 + chrome/locale/el/torbutton.properties | 1 + chrome/locale/es-AR/torbutton.properties | 1 + chrome/locale/es-ES/torbutton.properties | 1 + chrome/locale/eu/torbutton.properties | 1 + chrome/locale/fa/torbutton.properties | 1 + chrome/locale/fr/torbutton.properties | 1 + chrome/locale/ga-IE/torbutton.properties | 1 + chrome/locale/he/torbutton.properties | 1 + chrome/locale/hu/brand.properties | 6 ++-- chrome/locale/hu/browserOnboarding.properties | 4 +-- chrome/locale/hu/torbutton.dtd | 6 ++-- chrome/locale/hu/torbutton.properties | 45 +++++++++++------------ chrome/locale/id/torbutton.properties | 1 + chrome/locale/is/torbutton.properties | 1 + chrome/locale/it/torbutton.properties | 1 + chrome/locale/ja/torbutton.properties | 1 + chrome/locale/ka/torbutton.properties | 1 + chrome/locale/ko/torbutton.properties | 1 + chrome/locale/lt/torbutton.properties | 1 + chrome/locale/mk/torbutton.properties | 1 + chrome/locale/ms/torbutton.properties | 1 + chrome/locale/nb-NO/torbutton.properties | 1 + chrome/locale/nl/torbutton.properties | 1 + chrome/locale/pl/torbutton.properties | 1 + chrome/locale/pt-BR/torbutton.properties | 1 + chrome/locale/ro/torbutton.properties | 1 + chrome/locale/ru/torbutton.properties | 1 + chrome/locale/sv-SE/torbutton.properties | 1 + chrome/locale/th/torbutton.properties | 1 + chrome/locale/tr/torbutton.properties | 1 + chrome/locale/vi/torbutton.properties | 1 + chrome/locale/zh-CN/torbutton.properties | 47 ++++++++++++------------ chrome/locale/zh-TW/torbutton.properties | 1 + 41 files changed, 123 insertions(+), 87 deletions(-) diff --git a/chrome/locale/ar/aboutTor.dtd b/chrome/locale/ar/aboutTor.dtd index f4b18c3a..2ad75578 100644 --- a/chrome/locale/ar/aboutTor.dtd +++ b/chrome/locale/ar/aboutTor.dtd @@ -27,5 +27,5 @@ <!ENTITY aboutTor.newsletter.tagline "احصل على آخر أخبار تور مباشرة على بريدك"> <!ENTITY aboutTor.newsletter.link_text "اشترك للحصول على أخبار تور."> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> +<!ENTITY aboutTor.donationBanner.freeToUse "تور متاح مجاناً بفضل التبرعات من الأشخاص مثلك"> <!ENTITY aboutTor.donationBanner.buttonA "تبرع الآن"> diff --git a/chrome/locale/ar/torbutton.dtd b/chrome/locale/ar/torbutton.dtd index bf8a43a3..c5f101e5 100644 --- a/chrome/locale/ar/torbutton.dtd +++ b/chrome/locale/ar/torbutton.dtd @@ -49,5 +49,5 @@ <!ENTITY torbutton.circuit_display.new_circuit "دائرة تور جديدة لهذا الموقع">  -<!ENTITY torbutton.onionServices.authPrompt.tooltip "فتح مُنبّه استيثاق على عميل خدمة البصلة أو Onion Service"> -<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> +<!ENTITY torbutton.onionServices.authPrompt.tooltip "فتح نافذة عميل توثيق لخدمة Onion"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "تذكر هذا المفتاح"> diff --git a/chrome/locale/ar/torbutton.properties b/chrome/locale/ar/torbutton.properties index e29e29ca..80a2f37a 100644 --- a/chrome/locale/ar/torbutton.properties +++ b/chrome/locale/ar/torbutton.properties @@ -8,8 +8,8 @@ torbutton.circuit_display.unknown_country = بلد غير معروف torbutton.circuit_display.guard = حارس torbutton.circuit_display.guard_note = لا يمكن تغيير العقدة الخارسة torbutton.circuit_display.learn_more = تعرّف على المزيد -torbutton.circuit_display.click_to_copy = Click to Copy -torbutton.circuit_display.copied = Copied! +torbutton.circuit_display.click_to_copy = انقر للنسخ +torbutton.circuit_display.copied = تم النسخ! torbutton.content_sizer.margin_tooltip = يضيف متصفح تور هذا الهامش لجعل عرض وارتفاع نافذتك غير مميزين، لتقليل إمكانية اقتفاء أثرك عبر الإنترنت. torbutton.panel.tooltip.disabled = انقر لتفعيل تور torbutton.panel.tooltip.enabled = انقر لتعطيل تور @@ -60,51 +60,52 @@ updateDownloadingPanelUILabel=جاري تحميل S% من التحديث # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=الاتصال معمى (خدمة بصلة، %1$S، مفاتيح %2$S بتة، %3$S) pageInfo_OnionEncryption=الاتصال معمى (خدمة بصلة) +pageInfo_OnionName=Onion Name: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=تعرف على المزيد onionServices.errorPage.browser=المتصفح onionServices.errorPage.network=الشبكة -onionServices.errorPage.onionSite=Onionsite +onionServices.errorPage.onionSite=موقع Onion # LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with # an error code, e.g., 0xF3. # Tor SOCKS error 0xF0: -onionServices.descNotFound.pageTitle=Problem Loading Onionsite +onionServices.descNotFound.pageTitle=حدثت مشكلة أثناء تحميل موقع Onion onionServices.descNotFound.header=Onionsite Not Found onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. # Tor SOCKS error 0xF1: -onionServices.descInvalid.pageTitle=Problem Loading Onionsite -onionServices.descInvalid.header=Onionsite Cannot Be Reached +onionServices.descInvalid.pageTitle=حدثت مشكلة أثناء تحميل موقع Onion +onionServices.descInvalid.header=ﻻ يمكن الوصول إلى موقع Onion onionServices.descInvalid=The onionsite is unreachable due an internal error. onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed. # Tor SOCKS error 0xF2: -onionServices.introFailed.pageTitle=Problem Loading Onionsite -onionServices.introFailed.header=Onionsite Has Disconnected +onionServices.introFailed.pageTitle=حدثت مشكلة أثناء تحميل موقع Onion +onionServices.introFailed.header=موقع Onion قطع الاتصال. onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. # Tor SOCKS error 0xF3: -onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite -onionServices.rendezvousFailed.header=Unable to Connect to Onionsite +onionServices.rendezvousFailed.pageTitle=حدثت مشكلة أثناء تحميل موقع Onion +onionServices.rendezvousFailed.header=ﻻ يمكن الاتصال بموقع Onion onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later. onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. # Tor SOCKS error 0xF4: -onionServices.clientAuthMissing.pageTitle=Authorization Required -onionServices.clientAuthMissing.header=Onionsite Requires Authentication +onionServices.clientAuthMissing.pageTitle=التحقق مطلوب +onionServices.clientAuthMissing.header=يتطلب موقع Onion هذا المصادقة onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided. onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing. # Tor SOCKS error 0xF5: -onionServices.clientAuthIncorrect.pageTitle=Authorization Failed +onionServices.clientAuthIncorrect.pageTitle=فشل التحقق onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator. onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. # Tor SOCKS error 0xF6: -onionServices.badAddress.pageTitle=Problem Loading Onionsite -onionServices.badAddress.header=Invalid Onionsite Address +onionServices.badAddress.pageTitle=حدثت مشكلة أثناء تحميل موقع Onion +onionServices.badAddress.header=عنوان Onion غير صالح onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly. onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. # Tor SOCKS error 0xF7: -onionServices.introTimedOut.pageTitle=Problem Loading Onionsite +onionServices.introTimedOut.pageTitle=حدثت مشكلة أثناء تحميل موقع Onion onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection. onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. @@ -118,15 +119,15 @@ onionServices.authPrompt.invalidKey=يرجى إدخال مفتاح صالح (ق onionServices.authPrompt.failedToSetKey=لا يمكن إعدادا تور باستخدام مفتاحكم onionServices.authPreferences.header=Onion Services Authentication onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. -onionServices.authPreferences.savedKeys=Saved Keys… +onionServices.authPreferences.savedKeys=تم حفظ المفاتيح onionServices.authPreferences.dialogTitle=Onion Service Keys onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer -onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionSite=موقع Onion onionServices.authPreferences.onionKey=مفتاح onionServices.authPreferences.remove=حذف -onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.removeAll=حذف الكل onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor -onionServices.authPreferences.failedToRemoveKey=Unable to remove key +onionServices.authPreferences.failedToRemoveKey=لا يمكن حذف المفتاح # Onion-Location strings. onionLocation.alwaysPrioritize=Always Prioritize Onions @@ -134,10 +135,10 @@ onionLocation.alwaysPrioritizeAccessKey=خ onionLocation.notNow=في وقت آخر onionLocation.notNowAccessKey=ا onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship. -onionLocation.tryThis=Try Onion Services -onionLocation.onionAvailable=.onion available -onionLocation.learnMore=Learn more… +onionLocation.tryThis=جرب خدمة Onion +onionLocation.onionAvailable=.onion متوفر +onionLocation.learnMore=إطلع على المزيد... onionLocation.always=دائماً -onionLocation.askEverytime=Ask every time -onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. +onionLocation.askEverytime=إسأل كل مرة +onionLocation.prioritizeOnionsDescription=إعطاء الأولوية لمواقع .onion إذا توفرت onionLocation.onionServicesTitle=خدمات البصلة diff --git a/chrome/locale/bn-BD/torbutton.properties b/chrome/locale/bn-BD/torbutton.properties index f385c124..68a14850 100644 --- a/chrome/locale/bn-BD/torbutton.properties +++ b/chrome/locale/bn-BD/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=ডাউনলোড হচ্ছে %S আধু # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=সংযোগ এনক্রিপ্ট (Onion Service, %1$S, %2$S bit keys, %3$S) pageInfo_OnionEncryption=সংযোগ এনক্রিপ্ট (Onion Service) +pageInfo_OnionName=Onion Name: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=আরও জানুন diff --git a/chrome/locale/ca/torbutton.properties b/chrome/locale/ca/torbutton.properties index a3a6a6eb..6b31ae30 100644 --- a/chrome/locale/ca/torbutton.properties +++ b/chrome/locale/ca/torbutton.properties @@ -8,8 +8,8 @@ torbutton.circuit_display.unknown_country = País desconegut torbutton.circuit_display.guard = Guarda torbutton.circuit_display.guard_note = El vostre node de [Guarda] pot no canviar. torbutton.circuit_display.learn_more = Apreneu-ne més -torbutton.circuit_display.click_to_copy = Click to Copy -torbutton.circuit_display.copied = Copied! +torbutton.circuit_display.click_to_copy = Feu clic per a copiar +torbutton.circuit_display.copied = S'ha copiat! torbutton.content_sizer.margin_tooltip = El navegador Tor afegeix aquest marge per a minorar la diferència de alçada i amplada de la finestra, això fa reduir la capacitat de rastrejar-te. torbutton.panel.tooltip.disabled = Feu clic per activar Tor torbutton.panel.tooltip.enabled = Feu clic per desactivar Tor @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=S'està baixant l'actualització %S # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Connexió xifrada (Onion Service, %1$S, claus de %2$S bits, %3$S) pageInfo_OnionEncryption=Connexió xifrada (Onion Service) +pageInfo_OnionName=Onion Name: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Més informació @@ -94,7 +95,7 @@ onionServices.clientAuthMissing.header=Onionsite Requires Authentication onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided. onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing. # Tor SOCKS error 0xF5: -onionServices.clientAuthIncorrect.pageTitle=Authorization Failed +onionServices.clientAuthIncorrect.pageTitle=Ha fallat l'autorització onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator. onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. @@ -136,8 +137,8 @@ onionLocation.notNowAccessKey=p onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship. onionLocation.tryThis=Try Onion Services onionLocation.onionAvailable=.onion available -onionLocation.learnMore=Learn more… -onionLocation.always=Always -onionLocation.askEverytime=Ask every time +onionLocation.learnMore=Més informació... +onionLocation.always=Sempre +onionLocation.askEverytime=Demana-ho cada vegada onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. onionLocation.onionServicesTitle=Serveis Onion diff --git a/chrome/locale/cs/torbutton.properties b/chrome/locale/cs/torbutton.properties index 2138982f..6c86b1fb 100644 --- a/chrome/locale/cs/torbutton.properties +++ b/chrome/locale/cs/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=Stahování aktualizace pro %S # .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) +pageInfo_OnionName=Onion Name: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Zjistit více diff --git a/chrome/locale/da/torbutton.properties b/chrome/locale/da/torbutton.properties index 92e3d8d4..30d4e0fc 100644 --- a/chrome/locale/da/torbutton.properties +++ b/chrome/locale/da/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=Downloader %S opdatering # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Forbindelsen er krypteret (oniontjeneste, %1$S, %2$S-bit nøgler, %3$S) pageInfo_OnionEncryption=Forbindelsen er krypteret (oniontjeneste) +pageInfo_OnionName=Onionnavn: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Lær mere diff --git a/chrome/locale/de/torbutton.properties b/chrome/locale/de/torbutton.properties index 1fec9665..50cac4ab 100644 --- a/chrome/locale/de/torbutton.properties +++ b/chrome/locale/de/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=%S Aktualisierung wird heruntergeladen # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Verbindung verschlüsselt (Onion-Dienst, %1$S, %2$S bit Schlüssel, %3$S) pageInfo_OnionEncryption=Verbindung verschlüsselt (Onion-Dienst) +pageInfo_OnionName=Onion Name: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Mehr erfahren diff --git a/chrome/locale/el/torbutton.properties b/chrome/locale/el/torbutton.properties index f26c6bf7..72518d1c 100644 --- a/chrome/locale/el/torbutton.properties +++ b/chrome/locale/el/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=Λήψη %S ενημερώσεων # .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) +pageInfo_OnionName=Onion Name: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Μάθετε περισσότερα diff --git a/chrome/locale/es-AR/torbutton.properties b/chrome/locale/es-AR/torbutton.properties index 85007515..ab1c0be4 100644 --- a/chrome/locale/es-AR/torbutton.properties +++ b/chrome/locale/es-AR/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=Descargando actualización %S # .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) +pageInfo_OnionName=Onion Name: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Aprendé más diff --git a/chrome/locale/es-ES/torbutton.properties b/chrome/locale/es-ES/torbutton.properties index 689380c2..aada4fc7 100644 --- a/chrome/locale/es-ES/torbutton.properties +++ b/chrome/locale/es-ES/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=Descargando %S de la actualización # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Conexión cifrada (Servicio cebolla, %1$S, %2$S bit keys, %3$S) pageInfo_OnionEncryption=Conexión cifrada (Servicio cebolla) +pageInfo_OnionName=Nombre de la cebolla: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Conocer más diff --git a/chrome/locale/eu/torbutton.properties b/chrome/locale/eu/torbutton.properties index a0e096c4..1c95aeff 100644 --- a/chrome/locale/eu/torbutton.properties +++ b/chrome/locale/eu/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=%S eguneraketa deskargatzen # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Enkriptatutako konexioa (Onion zerbitzua, %1$S, %2$S biteko gakoak, %3$S) pageInfo_OnionEncryption=Enkriptatutako konexioa (Onion zerbitzua) +pageInfo_OnionName=Onion Name: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Gehiago jakin diff --git a/chrome/locale/fa/torbutton.properties b/chrome/locale/fa/torbutton.properties index 1abf5548..02668325 100644 --- a/chrome/locale/fa/torbutton.properties +++ b/chrome/locale/fa/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=در حال دانلود %S بروز رسانی # .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=ارتباط رمزگذاری شد (سرویس پیازی) +pageInfo_OnionName=نام پیاز: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=اطلاعات بیشتر diff --git a/chrome/locale/fr/torbutton.properties b/chrome/locale/fr/torbutton.properties index 0fa18876..33327e63 100644 --- a/chrome/locale/fr/torbutton.properties +++ b/chrome/locale/fr/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=Téléchargement de la mise à jour de %S # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=La connexion est chiffrée (service onion, %1$S, clés %2$S bits, %3$S) pageInfo_OnionEncryption=La connexion est chiffrée (service onion) +pageInfo_OnionName=Nom de l’onion : # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=En savoir plus diff --git a/chrome/locale/ga-IE/torbutton.properties b/chrome/locale/ga-IE/torbutton.properties index 7ab6b4c8..9a7b9822 100644 --- a/chrome/locale/ga-IE/torbutton.properties +++ b/chrome/locale/ga-IE/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=Nuashonrú %S á íoslódáil # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Ceangal Criptithe (Seirbhís Onion, %1$S, eochracha %2$S giotán, %3$S) pageInfo_OnionEncryption=Ceangal Criptithe (Seirbhís Onion) +pageInfo_OnionName=Onion Name: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Tuilleadh eolais diff --git a/chrome/locale/he/torbutton.properties b/chrome/locale/he/torbutton.properties index 91249590..b3ac76ab 100644 --- a/chrome/locale/he/torbutton.properties +++ b/chrome/locale/he/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=מוריד עדכון %S # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=חיבור הוצפן (שירות בצל, %1$S, מפתחות %2$S סיביות, %3$S) pageInfo_OnionEncryption=חיבור הוצפן (שירות בצל) +pageInfo_OnionName=שם בצל: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=למד עוד diff --git a/chrome/locale/hu/brand.properties b/chrome/locale/hu/brand.properties index 93001e71..5dd9d906 100644 --- a/chrome/locale/hu/brand.properties +++ b/chrome/locale/hu/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 Browser -brandShortName=Tor Browser -brandFullName=Tor Browser +brandShorterName=Tor Böngésző +brandShortName=Tor Böngésző +brandFullName=Tor Böngésző vendorShortName=Tor Project homePageSingleStartMain=Firefox Start, egy gyors weboldal beépített keresővel diff --git a/chrome/locale/hu/browserOnboarding.properties b/chrome/locale/hu/browserOnboarding.properties index 830547f9..cb7791a1 100644 --- a/chrome/locale/hu/browserOnboarding.properties +++ b/chrome/locale/hu/browserOnboarding.properties @@ -4,12 +4,12 @@ onboarding.tour-tor-welcome=Köszöntjük onboarding.tour-tor-welcome.title=Készen van. -onboarding.tour-tor-welcome.description=A Tor Browser a legmagasabb adatvédelmet és biztonságot adja, miközben böngészik. Most védett a követéstől, megfigyeléstől és cenzúrázástól. Ez a rövid áttekintés megmutatja, hogyan. +onboarding.tour-tor-welcome.description=A Tor Böngésző a legmagasabb adatvédelmet és biztonságot adja, miközben böngészik. Most védett a követéstől, megfigyeléstől és cenzúrázástól. Ez a rövid áttekintés megmutatja, hogyan. onboarding.tour-tor-welcome.next-button=Ugrás az Adatvédelemre 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 Browser 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.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 diff --git a/chrome/locale/hu/torbutton.dtd b/chrome/locale/hu/torbutton.dtd index 2a0687a3..69aa373d 100644 --- a/chrome/locale/hu/torbutton.dtd +++ b/chrome/locale/hu/torbutton.dtd @@ -4,12 +4,12 @@ <!ENTITY torbutton.context_menu.new_circuit_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 "Tor Böngésző frissítések keresése"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!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.security_settings "Tor Browser biztonsági beállítások"> +<!ENTITY torbutton.prefs.security_settings "Tor Böngésző biztonsági beállítások"> <!ENTITY torbutton.cookiedialog.title "Süti védelem kezelése"> <!ENTITY torbutton.cookiedialog.lockCol "Védett"> <!ENTITY torbutton.cookiedialog.domainCol "Állomás"> @@ -24,7 +24,7 @@ <!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 Browser és weboldal szolgáltatás engedélyezve."> +<!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_"> diff --git a/chrome/locale/hu/torbutton.properties b/chrome/locale/hu/torbutton.properties index 833edaef..79572816 100644 --- a/chrome/locale/hu/torbutton.properties +++ b/chrome/locale/hu/torbutton.properties @@ -8,35 +8,35 @@ 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.circuit_display.click_to_copy = Kattintson a msoláshoz +torbutton.circuit_display.click_to_copy = Kattintson a másoláshoz torbutton.circuit_display.copied = Másolva! -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.content_sizer.margin_tooltip = A Tor Böngésző 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 = 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 megnyitnia.\n\n +torbutton.popup.external.app = A Tor Böngésző nem tudja megjeleníteni ezt a fájlt. Egy másik alkalmazással kell megnyitnia.\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 = 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.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.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 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.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 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.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.popup.confirm_newnym = A Tor Böngésző becsukja az összes ablakot és fület. Minden weboldalkapcsolat megszakad.\n\nÚjraindítsuk a Tor Böngésző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. +torbutton.maximize_warning = A Tor Böngésző 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 Böngésző alapértelmezett ablakméretét. # Canvas permission prompt. Strings are kept here for ease of translation. -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.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 Böngésző 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 @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=%S frissítés letöltése # .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) +pageInfo_OnionName=Onion Name: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=További információ @@ -72,7 +73,7 @@ onionServices.errorPage.onionSite=Onionsite onionServices.descNotFound.pageTitle=Probléma az Onionsite betöltésekor onionServices.descNotFound.header=Onionsite nem található onionServices.descNotFound=A leggyakoribb oka, hogy az onionsite kikapcsolt. Vegye fel a kapcsolatot az onionsite adminisztrátorával. -onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. +onionServices.descNotFound.longDescription=Részletek: %S — A kért onion szolgáltatás leíró nem található a hashringen, így nem elérhető a kliens számára. # Tor SOCKS error 0xF1: onionServices.descInvalid.pageTitle=Probléma az Onionsite betöltésekor onionServices.descInvalid.header=Az Onionsite nem elérhető @@ -82,42 +83,42 @@ onionServices.descInvalid.longDescription=Részletek: %S — A kért onion szolg onionServices.introFailed.pageTitle=Probléma az Onionsite betöltésekor onionServices.introFailed.header=Az Onionsite lecsallakoztatva onionServices.introFailed=A leggyakoribb oka, hogy az onionsite kikapcsolt. Vegye fel a kapcsolatot az onionsite adminisztrátorával. -onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. +onionServices.introFailed.longDescription=Részletek: %S — Bemutatkozás sikertelen, ami azt jelenti, hogy a leíró megtalálható volt, de a szolgáltatás nem csatlakozik a bemutatkozási pontjához. Valószínű, hogy a szolgáltatás megváltoztatta leíróját, vagy nem fut. # Tor SOCKS error 0xF3: onionServices.rendezvousFailed.pageTitle=Probléma az Onionsite betöltésekor onionServices.rendezvousFailed.header=Sikertelen csatlakozás az Onionsite-hoz onionServices.rendezvousFailed=Az onionsite elfoglalt vagy a Tor hálózat túlterhelt. Kérjük próbálja később. -onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. +onionServices.rendezvousFailed.longDescription=Részletek: %S — a kliensnek nem sikerült randevúznia a szolgáltatással, ami azt jelenti, hogy a kliensnek nem sikerült véglegesítenie a kapcsolatot. # Tor SOCKS error 0xF4: onionServices.clientAuthMissing.pageTitle=Hitelesítés szükséges onionServices.clientAuthMissing.header=Az Onionsite hitelesítést kér onionServices.clientAuthMissing=Az onionsite hozzáféréshez kulcs szükséges, de nem került beküldésre egy sem. -onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing. +onionServices.clientAuthMissing.longDescription=Részletek: %S — A kliens letöltötte a szükséges onion szolgáltatás leírót, de nem sikerült dekódolni,a, mert a kliens hitelesítési információ hiányzik # Tor SOCKS error 0xF5: onionServices.clientAuthIncorrect.pageTitle=Hitelesítés sikertelen -onionServices.clientAuthIncorrect.header=Onionsite authentikáció sikertelen -onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator. -onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. +onionServices.clientAuthIncorrect.header=Onionsite hitelesítés sikertelen +onionServices.clientAuthIncorrect=A megadott kulcs inkorrekt vagy visszavont. Vegye fel a kapcsolatot az onionsite adminisztrátorával. +onionServices.clientAuthIncorrect.longDescription=Részletek: %S — A kliens letöltötte a szükséges onion szolgáltatás leírót, de nem sikerült dekódolni a kliens által biztosított hitelesítési információval. Ez azt jelentheti, hogy a hozzáférés visszavont. # Tor SOCKS error 0xF6: onionServices.badAddress.pageTitle=Probléma az Onionsite betöltésekor onionServices.badAddress.header=Érvénytelen Onionsite cím onionServices.badAddress=A megadott onionsite cím érvénytelen. Kérjük ellenőrizze megfelelően adta-e meg. -onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. +onionServices.badAddress.longDescription=Részletek: %S — A megadott .onion cím érvénytelen. Ez a hiba a következő okokból érkezhetett:\nA cím ellenőrző összege nem egyezik az ed25519 publikus kulcs érvénytelen vagy a kódolása érvénytelen. # Tor SOCKS error 0xF7: onionServices.introTimedOut.pageTitle=Probléma az Onionsite betöltésekor onionServices.introTimedOut.header=Onionsite áramkör létrehozás időtúllépés onionServices.introTimedOut=Sikertelen a csatlakozás az onionsite-hoz, feltehetően a gyenge hálózati kapcsolat miatt. -onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. +onionServices.introTimedOut.longDescription=Részletek: %S — A kapcsolat a kért opnion szolgáltatás felé időtúllépésre futott, miközben randevúzni próbált az áramkörrel. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. onionServices.authPrompt.description=%S kéri a privát kulcsát. onionServices.authPrompt.keyPlaceholder=Adja meg privát kulcsát ehhez az onion szolgáltatáshoz -onionServices.authPrompt.done=Kész +onionServices.authPrompt.done=Kész onionServices.authPrompt.doneAccessKey=a -onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) +onionServices.authPrompt.invalidKey=Kérjük adjon meg egy érvényes kulcsot (52 db base36 karakter vagy 44 db base64 karakter) onionServices.authPrompt.failedToSetKey=Nem lehetséges a Tor konfigurálása a kulcsa nélkül onionServices.authPreferences.header=Onion szolgáltatások autentikáció -onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.overview=Néhány onion szolgáltatás igényelheti az azonosítását valamilyen módon (valamilyen jelszóval) mielőtt elérhetné őket. onionServices.authPreferences.savedKeys=Mentett kulcsok... onionServices.authPreferences.dialogTitle=Onion szolgáltatás kulcsok onionServices.authPreferences.dialogIntro=A következő onionsite-okhoz tároltak a kulcsok az Ön számítógépén @@ -130,10 +131,10 @@ onionServices.authPreferences.failedToRemoveKey=Nem lehetséges a kulcs eltávol # Onion-Location strings. onionLocation.alwaysPrioritize=Mindig priorizálja az Onionokat -onionLocation.alwaysPrioritizeAccessKey=n +onionLocation.alwaysPrioritizeAccessKey=m onionLocation.notNow=Most nem onionLocation.notNowAccessKey=n -onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship. +onionLocation.description=Egy sokkal privátabb és biztonságosabb verziója érhető el ennek az oldalnak a Tor hálózaton keresztül, onion szolgáltatásként. Az Onion szolgáltatások segítik a weboldal készítőket, hogy látogatóik kikerüljék a megfigyelést és a cenzúrát. onionLocation.tryThis=Próbálja ki az Onion szolgáltatásokat onionLocation.onionAvailable=.onion elérhető onionLocation.learnMore=Tudjon meg többet... diff --git a/chrome/locale/id/torbutton.properties b/chrome/locale/id/torbutton.properties index f70f53a4..9acf6b7c 100644 --- a/chrome/locale/id/torbutton.properties +++ b/chrome/locale/id/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=Mengunduh %S pembaruan # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Koneksi terenkripsi (Layanan Onion, %1$S, %2$S bit kunci, %3$S) pageInfo_OnionEncryption=Koneksi terenkripsi (Layanan Onion) +pageInfo_OnionName=Onion Name: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Pelajari Selengkapnya diff --git a/chrome/locale/is/torbutton.properties b/chrome/locale/is/torbutton.properties index 71e3278f..1b67d3d8 100644 --- a/chrome/locale/is/torbutton.properties +++ b/chrome/locale/is/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=Downloading %S update # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Dulrituð tenging (Onion-þjónusta, %1$S, %2$S bita dulritunarlyklar, %3$S) pageInfo_OnionEncryption=Dulrituð tenging (Onion-þjónusta) +pageInfo_OnionName=Onion Name: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Fræðast frekar diff --git a/chrome/locale/it/torbutton.properties b/chrome/locale/it/torbutton.properties index 37ac5478..3096214a 100644 --- a/chrome/locale/it/torbutton.properties +++ b/chrome/locale/it/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=Scaricamento aggiornamento %S # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Connessione cifrata (Servizio onion, %1$S, chiavi %2$S bit, %3$S) pageInfo_OnionEncryption=Connessione cifrata (Servizio onion) +pageInfo_OnionName=Nome Onion # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Per saperne di più diff --git a/chrome/locale/ja/torbutton.properties b/chrome/locale/ja/torbutton.properties index 524a18c7..e0bf1baa 100644 --- a/chrome/locale/ja/torbutton.properties +++ b/chrome/locale/ja/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=%S 更新をダウンロードしています # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=接続が暗号化されています (Onion サービス、%1$S、鍵長 %2$S bit、%3$S) pageInfo_OnionEncryption=接続が暗号化されています (Onion サービス) +pageInfo_OnionName=Onion Name: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=詳細情報 diff --git a/chrome/locale/ka/torbutton.properties b/chrome/locale/ka/torbutton.properties index 44ec2210..26323e15 100644 --- a/chrome/locale/ka/torbutton.properties +++ b/chrome/locale/ka/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=ჩამოიტვირთება %S გა # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=კავშირი დაშიფრულია (Onion-მომსახურება, %1$S, %2$S ბიტიანი გასაღებები, %3$S) pageInfo_OnionEncryption=კავშირი დაშიფრულია (Onion-მომსახურება) +pageInfo_OnionName=Onion Name: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=იხილეთ ვრცლად diff --git a/chrome/locale/ko/torbutton.properties b/chrome/locale/ko/torbutton.properties index b49ac0ee..4cb39034 100644 --- a/chrome/locale/ko/torbutton.properties +++ b/chrome/locale/ko/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=업데이트 %S 다운로드 중 # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=연결은 암호화했습니다 (Onion 서비스, %1$S, %2$S 비트 키들, %3$S) pageInfo_OnionEncryption=연결은 암호화했습니다 (Onion 서비스) +pageInfo_OnionName=Onion Name: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=더 알아보기 diff --git a/chrome/locale/lt/torbutton.properties b/chrome/locale/lt/torbutton.properties index 1b6b087c..60e04704 100644 --- a/chrome/locale/lt/torbutton.properties +++ b/chrome/locale/lt/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=Atsisiunčiamas %S atnaujinimas # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Šifruotas ryšys (Onion paslauga, %1$S, %2$S bitų raktai, %3$S) pageInfo_OnionEncryption=Šifruotas ryšys (Onion paslauga) +pageInfo_OnionName=Onion Name: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Sužinoti daugiau diff --git a/chrome/locale/mk/torbutton.properties b/chrome/locale/mk/torbutton.properties index 60412498..52d1dc98 100644 --- a/chrome/locale/mk/torbutton.properties +++ b/chrome/locale/mk/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=Преземање %S ажурирање # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Енкриптирано поврзување (Onion Услуга, %1$S, %2$S битни клучеви, %3$S) pageInfo_OnionEncryption=Енкриптирано поврзување (Onion Услуга) +pageInfo_OnionName=Onion Име: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Научете повеќе diff --git a/chrome/locale/ms/torbutton.properties b/chrome/locale/ms/torbutton.properties index 66fe5f78..e2993528 100644 --- a/chrome/locale/ms/torbutton.properties +++ b/chrome/locale/ms/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=Memuat turun %S kemaskini # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Sambungan Tersulit (Perkhidmatan Onion, %1$S, %2$S bit kunci, %3$S) pageInfo_OnionEncryption=Sambungan Tersulit (Perkhidmatan Onion) +pageInfo_OnionName=Onion Name: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Ketahui lebih lanjut diff --git a/chrome/locale/nb-NO/torbutton.properties b/chrome/locale/nb-NO/torbutton.properties index b200606a..9f50f211 100644 --- a/chrome/locale/nb-NO/torbutton.properties +++ b/chrome/locale/nb-NO/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=Laster ned %S oppdatering # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Tilkobling kryptert (Løk Tjeneste, %1$S, %2$S bits nøkler, %3$S) pageInfo_OnionEncryption=Tilkobling kryptert (Løk Tjeneste) +pageInfo_OnionName=Onion Name: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Lær mer diff --git a/chrome/locale/nl/torbutton.properties b/chrome/locale/nl/torbutton.properties index d063cb04..8036f020 100644 --- a/chrome/locale/nl/torbutton.properties +++ b/chrome/locale/nl/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=%S-update downloaden # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Verbinding versleuteld (Onion-service, %1$S, %2$S-bits sleutels, %3$S) pageInfo_OnionEncryption=Verbinding versleuteld (Onion-service) +pageInfo_OnionName=Onion-naam: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Meer info diff --git a/chrome/locale/pl/torbutton.properties b/chrome/locale/pl/torbutton.properties index 7d179996..8500181e 100644 --- a/chrome/locale/pl/torbutton.properties +++ b/chrome/locale/pl/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=Pobieranie aktualizacji %S # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Połączenie zaszyfrowane (usługa Onion, %1$S, %2$S klucze bitowe, %3$S) pageInfo_OnionEncryption=Połączenie zaszyfrowane (usługa Onion) +pageInfo_OnionName=Onion Name: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Dowiedz się więcej diff --git a/chrome/locale/pt-BR/torbutton.properties b/chrome/locale/pt-BR/torbutton.properties index f032c795..ed63bc4d 100644 --- a/chrome/locale/pt-BR/torbutton.properties +++ b/chrome/locale/pt-BR/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=Baixando a atualização %S # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Conexão criptografada (Serviço Onion, %1$S, %2$S bit keys, %3$S) pageInfo_OnionEncryption=Conexão criptografada (Serviço Onion) +pageInfo_OnionName=Nome Onion: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Saber mais diff --git a/chrome/locale/ro/torbutton.properties b/chrome/locale/ro/torbutton.properties index b5daca68..facd8c8b 100644 --- a/chrome/locale/ro/torbutton.properties +++ b/chrome/locale/ro/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=Se descarcă actualizarea %S # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Conexiune Criptată (Serviciu Onion, %1$S, cheie pe %2$S biți, %3$S) pageInfo_OnionEncryption=Conexiune Criptată (Serviciu Onion) +pageInfo_OnionName=Onion Name: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Află mai mult diff --git a/chrome/locale/ru/torbutton.properties b/chrome/locale/ru/torbutton.properties index 63f8e911..4ed30459 100644 --- a/chrome/locale/ru/torbutton.properties +++ b/chrome/locale/ru/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=Загружается обновление: %S # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Соединение зашифровано (Onion Service, %1$S, %2$S битные ключи, %3$S) pageInfo_OnionEncryption=Соединение зашифровано (Onion Service) +pageInfo_OnionName=Onion Name: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Узнать больше diff --git a/chrome/locale/sv-SE/torbutton.properties b/chrome/locale/sv-SE/torbutton.properties index 78fff3a9..abed60df 100644 --- a/chrome/locale/sv-SE/torbutton.properties +++ b/chrome/locale/sv-SE/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=Hämtar %S-uppdatering # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Anslutning krypterad (Onion-tjänst, %1$S, %2$S bit nycklar, %3$S) pageInfo_OnionEncryption=Anslutning krypterad (Onion-tjänst) +pageInfo_OnionName=Onion-namn: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Läs mer diff --git a/chrome/locale/th/torbutton.properties b/chrome/locale/th/torbutton.properties index 5d0d83c1..50b66318 100644 --- a/chrome/locale/th/torbutton.properties +++ b/chrome/locale/th/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=กำลังดาวน์โหลดอั # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=การเชื่อมต่อเข้ารหัสลับ (Onion Service, %1$S, %2$S bit keys, %3$S) pageInfo_OnionEncryption=การเชื่อมต่อเข้ารหัสลับ (Onion Service) +pageInfo_OnionName=Onion Name: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=เรียนรู้เพิ่มเติม diff --git a/chrome/locale/tr/torbutton.properties b/chrome/locale/tr/torbutton.properties index ddf3af56..499e043a 100644 --- a/chrome/locale/tr/torbutton.properties +++ b/chrome/locale/tr/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=%S güncellemesi indiriliyor # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Bağlantı Şifreli (Onion Hizmeti, %1$S, %2$S bit anahtarlar, %3$S) pageInfo_OnionEncryption=Bağlantı Şifreli (Onion Hizmeti) +pageInfo_OnionName=Onion Adı: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Ayrıntılı bilgi alın diff --git a/chrome/locale/vi/torbutton.properties b/chrome/locale/vi/torbutton.properties index dc0f9c52..ca81bcbe 100644 --- a/chrome/locale/vi/torbutton.properties +++ b/chrome/locale/vi/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=Downloading %S update # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Đã mã hóa kết nối (Onion Service, %1$S, %2$S bit keys, %3$S) pageInfo_OnionEncryption=Đã mã hóa kết nối (Onion Service) +pageInfo_OnionName=Onion Name: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Biết thêm diff --git a/chrome/locale/zh-CN/torbutton.properties b/chrome/locale/zh-CN/torbutton.properties index 3d93b07c..45384ca7 100644 --- a/chrome/locale/zh-CN/torbutton.properties +++ b/chrome/locale/zh-CN/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=正下载 %S 更新 # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=连接已经被加密（洋葱服务，%1$S，%2$S 位密钥，%3$S） pageInfo_OnionEncryption=连接已经被加密（洋葱服务） +pageInfo_OnionName=Onion Name: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=更多详情 @@ -69,44 +70,44 @@ onionServices.errorPage.onionSite=洋葱站点 # LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with # an error code, e.g., 0xF3. # Tor SOCKS error 0xF0: -onionServices.descNotFound.pageTitle=洋葱页加载问题 -onionServices.descNotFound.header=找不到洋葱页面 -onionServices.descNotFound=最有可能的原因是该洋葱页面已下线。联系洋葱页面管理员。 +onionServices.descNotFound.pageTitle=洋葱站点加载问题 +onionServices.descNotFound.header=找不到洋葱站点 +onionServices.descNotFound=最有可能的原因是该洋葱站点已下线。请联系洋葱站点管理员。 onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. # Tor SOCKS error 0xF1: -onionServices.descInvalid.pageTitle=洋葱页加载问题 -onionServices.descInvalid.header=洋葱页面不可达 -onionServices.descInvalid=洋葱页面由于内部错误不可达。 +onionServices.descInvalid.pageTitle=洋葱站点加载问题 +onionServices.descInvalid.header=洋葱站点不可达 +onionServices.descInvalid=洋葱站点由于内部错误无法浏览。 onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed. # Tor SOCKS error 0xF2: -onionServices.introFailed.pageTitle=洋葱页加载问题 -onionServices.introFailed.header=洋葱页面已断开连接 -onionServices.introFailed=最有可能的原因是该洋葱页面已下线。联系洋葱页面管理员。 +onionServices.introFailed.pageTitle=洋葱站点加载问题 +onionServices.introFailed.header=洋葱站点已断开连接 +onionServices.introFailed=最有可能的原因是该洋葱站点已下线。联系洋葱站点管理员。 onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. # Tor SOCKS error 0xF3: -onionServices.rendezvousFailed.pageTitle=洋葱页加载问题 -onionServices.rendezvousFailed.header=无法连接洋葱网页 -onionServices.rendezvousFailed=洋葱网页忙碌或过载。请稍后尝试。 +onionServices.rendezvousFailed.pageTitle=洋葱站点加载问题 +onionServices.rendezvousFailed.header=无法连接洋葱站点 +onionServices.rendezvousFailed=洋葱站点忙碌或过载。请稍后尝试。 onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. # Tor SOCKS error 0xF4: onionServices.clientAuthMissing.pageTitle=需要验证 -onionServices.clientAuthMissing.header=洋葱网页需要验证 -onionServices.clientAuthMissing=访问洋葱网页需要一个密钥但未提供。 +onionServices.clientAuthMissing.header=洋葱站点需要验证 +onionServices.clientAuthMissing=访问洋葱站点需要一个密钥但未提供。 onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing. # Tor SOCKS error 0xF5: onionServices.clientAuthIncorrect.pageTitle=验证失败 -onionServices.clientAuthIncorrect.header=洋葱网页认证失败 +onionServices.clientAuthIncorrect.header=洋葱站点认证失败 onionServices.clientAuthIncorrect=提供的密钥不正确或已被吊销。请与洋葱网站管理员联系。 onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. # Tor SOCKS error 0xF6: -onionServices.badAddress.pageTitle=洋葱页加载问题 -onionServices.badAddress.header=无效洋葱页面地址 -onionServices.badAddress=提供的洋葱网页地址无效。请检查是否正确输入。 +onionServices.badAddress.pageTitle=洋葱站点加载问题 +onionServices.badAddress.header=无效洋葱站点地址 +onionServices.badAddress=提供的洋葱站点地址无效。请检查是否正确输入。 onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. # Tor SOCKS error 0xF7: -onionServices.introTimedOut.pageTitle=洋葱页加载问题 -onionServices.introTimedOut.header=洋葱网页链路创建超时 -onionServices.introTimedOut=洋葱网页连接失败，可能是由于网络连接较差。 +onionServices.introTimedOut.pageTitle=洋葱站点加载问题 +onionServices.introTimedOut.header=洋葱站点链路创建超时 +onionServices.introTimedOut=洋葱站点连接失败，可能是由于网络连接较差。 onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. @@ -133,9 +134,9 @@ onionLocation.alwaysPrioritize=Always Prioritize Onions onionLocation.alwaysPrioritizeAccessKey=a onionLocation.notNow=暂不 onionLocation.notNowAccessKey=n -onionLocation.description=该网站还有一个更私密、更安全的版本，可以通过洋葱服务通过Tor网络访问。洋葱服务帮助网站发布者和他们的访问者战胜监控和审查。 +onionLocation.description=该网站还有一个更私密、更安全的版本，可以通过洋葱服务通过 Tor 网络访问。洋葱服务帮助网站发布者和他们的访问者抵抗监控和审查。 onionLocation.tryThis=尝试洋葱服务 -onionLocation.onionAvailable=.onion 可用 +onionLocation.onionAvailable=可用的 .onion onionLocation.learnMore=详细了解…… onionLocation.always=始终 onionLocation.askEverytime=每次询问 diff --git a/chrome/locale/zh-TW/torbutton.properties b/chrome/locale/zh-TW/torbutton.properties index 0e56f64d..2c31f7bf 100644 --- a/chrome/locale/zh-TW/torbutton.properties +++ b/chrome/locale/zh-TW/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=正在下載 %S 更新 # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=連線已加密 (洋蔥服務, %1$S, %2$S 位元金鑰, %3$S) pageInfo_OnionEncryption=連接加密（洋蔥服務） +pageInfo_OnionName=Onion Name: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=了解更多

1 0

[tor-launcher/master] Release preparations for 0.2.21.8
by sysrqb＠torproject.org 28 May '20

28 May '20

commit 4f593816e87010cc81a6b924f3f14deac5d4977d Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu May 28 14:49:07 2020 +0000 Release preparations for 0.2.21.8 Translations update and version bump --- src/chrome/locale/fa/network-settings.dtd | 2 +- src/chrome/locale/hi-IN/network-settings.dtd | 2 +- src/chrome/locale/hu/network-settings.dtd | 2 +- src/chrome/locale/hu/torlauncher.properties | 4 ++-- src/chrome/locale/sl/network-settings.dtd | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd index fb7561c..4b5b317 100644 --- a/src/chrome/locale/fa/network-settings.dtd +++ b/src/chrome/locale/fa/network-settings.dtd @@ -55,7 +55,7 @@ <!ENTITY torsettings.proxyHelp1 "اگر از طریق شبکه‌ی یک شرکت، مدرسه، یا دانشگاه به اینترنت متصل می‌شوید، ممکن است احتیاج به یک پروکسی داخلی داشته باشید. اگر از احتیاج به پروکسی داخلی مطمئن نیستید، به تنظیمات شبکه یک مرورگر دیگر یا تنظیمات شبکه سیستم خود نگاه کنید."> <!ENTITY torsettings.bridgeHelpTitle "کمک برای پل ارتباطی"> -<!ENTITY torsettings.bridgeHelp1 "پل‌ها رله‌هایی فهرست نشده هستند که مسدودیت ارتباط به شبکه Tor را سخت‌تر می‌کنند.  هر نوعی از پل از روش مختلفی برای مقابله با سانسور استفاده می‌کند.  نوع obgs ترافیک شما را شبیه نویزهای راندوم نشان می‌دهند و نوع meek ترافیک شما را به جای اتصال به Tor، در حال اتصال به آن خدمات نشان می‌دهد."> +<!ENTITY torsettings.bridgeHelp1 "پل‌ها رله‌هایی فهرست نشده هستند که مسدودیت ارتباط به شبکه Tor را سخت‌تر می‌کنند.  هر نوعی از پل از روش مختلفی برای مقابله با سانسور استفاده می‌کند.  نوع obfs ترافیک شما را شبیه نویزهای راندوم نشان می‌دهند و نوع meek ترافیک شما را به جای اتصال به Tor، در حال اتصال به آن خدمات نشان می‌دهد."> <!ENTITY torsettings.bridgeHelp2 "به دلیل اینکه بعضی کشورها سعی بر مسدودسازی Tor دارند، بعضی از پل‌ها فقط در این کشورها کار می‌کنند.  اگر مطمئن نیستید که کدام پل‌ها در کشور شما کار می‌کنند، اینجا را ببینید torproject.org/about/contact.html#support">  diff --git a/src/chrome/locale/hi-IN/network-settings.dtd b/src/chrome/locale/hi-IN/network-settings.dtd index 07cacdb..27e53bf 100644 --- a/src/chrome/locale/hi-IN/network-settings.dtd +++ b/src/chrome/locale/hi-IN/network-settings.dtd @@ -28,7 +28,7 @@ <!ENTITY torsettings.useProxy.checkbox "मैं इंटरनेट से कनेक्ट करने के लिए प्रॉक्सी का उपयोग करता हूं"> <!ENTITY torsettings.useProxy.type "प्रॉक्सी प्रकार"> <!ENTITY torsettings.useProxy.type.placeholder "प्रॉक्सी प्रकार का चयन करें"> -<!ENTITY torsettings.useProxy.address "Address"> +<!ENTITY torsettings.useProxy.address "पता"> <!ENTITY torsettings.useProxy.address.placeholder "IP पता या मेजबाननाम"> <!ENTITY torsettings.useProxy.port "Port"> <!ENTITY torsettings.useProxy.username "Username"> diff --git a/src/chrome/locale/hu/network-settings.dtd b/src/chrome/locale/hu/network-settings.dtd index 4dd51db..f3f84ab 100644 --- a/src/chrome/locale/hu/network-settings.dtd +++ b/src/chrome/locale/hu/network-settings.dtd @@ -4,7 +4,7 @@ <!ENTITY torsettings.wizard.title.connecting "Kapcsolat létrehozása">  -<!ENTITY torlauncher.localePicker.title "Tor Browser nyelv"> +<!ENTITY torlauncher.localePicker.title "Tor Böngésző nyelv"> <!ENTITY torlauncher.localePicker.prompt "Kérjük válasszon egy nyelvet.">  diff --git a/src/chrome/locale/hu/torlauncher.properties b/src/chrome/locale/hu/torlauncher.properties index 744e62f..3ac1c88 100644 --- a/src/chrome/locale/hu/torlauncher.properties +++ b/src/chrome/locale/hu/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Tor Indító -torlauncher.tor_exited_during_startup=A Tor kilépett indulásnál. Ez lehet egy hiba miatt a torrc fájlodban, a Tor vagy másik program hibája miatt a rendszereden, vagy hibás hardver miatt. Amíg nem javítja ki a mögöttes problémát és indítja újra a Tor-t, addig a Tor Browser nem fog elindulni. -torlauncher.tor_exited=A Tor váratlanul kilépett. Ez bekövetkezhet a Tor-ban található hibából, egy a rendszeren található másik programból, vagy hibás hardverből. Amíg nem indítja újra a tor-t addig a Tor Browser nem ér el semmilyen oldalt. Ha a hiba folyamatosan fennáll, kérjük küldje le a Tor Log-ot a támogatási csoportnak. +torlauncher.tor_exited_during_startup=A Tor kilépett indulásnál. Ez lehet egy hiba miatt a torrc fájlodban, a Tor vagy másik program hibája miatt a rendszereden, vagy hibás hardver miatt. Amíg nem javítja ki a mögöttes problémát és indítja újra a Tor-t, addig a Tor Böngésző nem fog elindulni. +torlauncher.tor_exited=A Tor váratlanul kilépett. Ez bekövetkezhet a Tor-ban található hibából, egy a rendszeren található másik programból, vagy hibás hardverből. Amíg nem indítja újra a tor-t addig a Tor Böngésző nem ér el semmilyen oldalt. Ha a hiba folyamatosan fennáll, kérjük küldje le a Tor Log-ot a támogatási csoportnak. torlauncher.tor_exited2=A Tor újraindítása nem fogja bezárni a böngésző füleket. torlauncher.tor_controlconn_failed=Nem lehetséges csatlakozni a Tor vezérlő portjára torlauncher.tor_failed_to_start=Nem sikerült elindulnia a Tor-nak. diff --git a/src/chrome/locale/sl/network-settings.dtd b/src/chrome/locale/sl/network-settings.dtd index 4dae490..f71684b 100644 --- a/src/chrome/locale/sl/network-settings.dtd +++ b/src/chrome/locale/sl/network-settings.dtd @@ -28,7 +28,7 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address"> +<!ENTITY torsettings.useProxy.address "Naslov"> <!ENTITY torsettings.useProxy.address.placeholder "IP naslov ali ime domene"> <!ENTITY torsettings.useProxy.port "Vrata"> <!ENTITY torsettings.useProxy.username "Username">

1 0

[tor-browser/tor-browser-68.9.0esr-9.5-1] Revert "Bug 1469629 - Read system level policies on Linux if available. r=stransky a=pascalc"
by sysrqb＠torproject.org 28 May '20

28 May '20

commit eb40e93b79f13752b0bc0901986a0c7aabe8cadb Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu May 28 13:44:45 2020 +0000 Revert "Bug 1469629 - Read system level policies on Linux if available. r=stransky a=pascalc" This reverts commit c67b847fd43d97bcfe03ac455adbdb283b4872a1. Bug 34315: avoid reading policies from /etc/firefox on Linux --- .../components/enterprisepolicies/EnterprisePolicies.js | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/toolkit/components/enterprisepolicies/EnterprisePolicies.js b/toolkit/components/enterprisepolicies/EnterprisePolicies.js index 5276725703f6..bc0171867dfa 100644 --- a/toolkit/components/enterprisepolicies/EnterprisePolicies.js +++ b/toolkit/components/enterprisepolicies/EnterprisePolicies.js @@ -480,20 +480,6 @@ class JSONPoliciesProvider { _getConfigurationFile() { let configFile = null; - - if (AppConstants.platform == "linux") { - let systemConfigFile = Cc["@mozilla.org/file/local;1"].createInstance( - Ci.nsIFile - ); - systemConfigFile.initWithPath( - "/etc/" + Services.appinfo.name.toLowerCase() + "/policies" - ); - systemConfigFile.append(POLICIES_FILENAME); - if (systemConfigFile.exists()) { - return systemConfigFile; - } - } - try { configFile = Services.dirsvc.get("XREAppDist", Ci.nsIFile); configFile.append(POLICIES_FILENAME);

1 0

[tor-browser-build/master] The new locales got backed out for Tor Launcher 0.2.20.5
by gk＠torproject.org 27 May '20

27 May '20

commit 6a253c23baddb4289af38dd1bf030ba545bee5c0 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 27 08:00:19 2020 +0000 The new locales got backed out for Tor Launcher 0.2.20.5 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 4a0f3fa..ab1c7b8 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -249,6 +249,7 @@ Tor Browser 9.0.3 -- January 7 2020 * Bump Tor to 0.4.2.5 * Update Tor Launcher to 0.2.20.5 * Bug 32636: Clean up locales shipped with Tor Launcher + * Revert bug 30786, 30787, and 30788 * Android * Bug 32405: Crash immediately after bootstrap on Android * Build System

1 0

[tor-browser-build/master] Move ticket entry in 9.5a12 changelog
by sysrqb＠torproject.org 26 May '20

26 May '20

commit 8867e44fa82162b529d8cc2cb24462db12bc1ec7 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue May 26 18:05:28 2020 +0000 Move ticket entry in 9.5a12 changelog --- 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 969203c..4a0f3fa 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -28,13 +28,13 @@ Tor Browser 9.5a12 -- May 7 2020 * Bug 33630: Remove noisebridge01 default bridge * Bug 33726: Fix patch for #23247: Communicating security expectations for .onion * Bug 34017: Bump openssl version to 1.1.1g - * Bug 33698: Update "About Tor Browser" links in Tor Browser * Windows + OS X + Linux * Update Tor Launcher to 0.2.21.6 * Translations update * Bug 33576: Update pion-webrtc version to 2.2.3 * Bug 32418: Allow updates to be disabled via an enterprise policy. * Bug 34032: Use Securedrop's Official https-everywhere ruleset + * Bug 33698: Update "About Tor Browser" links in Tor Browser * Windows * Bug 29614: Use SHA-256 algorithm for Windows timestamping * Android

1 0