- tbb-commits - lists.torproject.org

[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

[tor-browser-build/master] Small Changelog fixups
by gk＠torproject.org 26 May '20

26 May '20

commit b7f2deae207b9bb42c49b67c0e575fcc41ad2c8f Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 26 10:05:24 2020 +0000 Small Changelog fixups --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index aadb432..969203c 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -14,6 +14,7 @@ Tor Browser 9.5a13 -- May 20 2020 * Build System * All Platforms * Bump Go to 1.13.11 + * Linux * Bug 34242: Fix creation of Linux containers Tor Browser 9.5a12 -- May 7 2020 @@ -174,7 +175,7 @@ Tor Browser 9.5a5 -- February 12 2020 * Bug 32470: Backport fix for bug 1590538 * Bug 32414: Make Services.search.addEngine obey FPI * Bug 32948: Make referer behavior consistent regardless of private browing mode status - * Bug 461204: Improve the random number generator for the boundaries in multipart/form-data + * Bug 22919: Improve the random number generator for the boundaries in multipart/form-data * Windows + OS X + Linux * Update Tor to 0.4.3.2-alpha * Update Tor Launcher to 0.2.21.1

1 0

[tor-browser-build/master] Change Firefox version and tag build2
by sysrqb＠torproject.org 19 May '20

19 May '20

commit 3fb287a4669f623fae41d40de9e0552f1e40b0bc Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue May 19 19:58:42 2020 +0000 Change Firefox version and tag build2 --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 - rbm.conf | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 5618abb..b6a8440 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") %]-2-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 168a021..aadb432 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,6 +1,5 @@ Tor Browser 9.5a13 -- May 20 2020 * All Platforms - * Update Firefox to 68.8.1esr * Bump NoScript to 11.0.26 * Bump Tor to 0.4.3.5 * Translations update diff --git a/rbm.conf b/rbm.conf index 131845c..628e33d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.5a13' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 9.5a12 project_name: tor-browser

1 0

[tor-browser-build/master] Use the new rebased Firefox branch
by sysrqb＠torproject.org 19 May '20

19 May '20

commit 56e47ec447286e7d104e72813f1f21970a4e4493 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue May 19 19:08:48 2020 +0000 Use the new rebased Firefox branch --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index d51181f..5618abb 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") %]-2-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1

1 0

[tor-browser-build/master] Release preparations for 9.5a13
by sysrqb＠torproject.org 19 May '20

19 May '20

commit 47985cd6e593c633419313ecc0965901290a538e Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue May 19 18:56:16 2020 +0000 Release preparations for 9.5a13 Versions bump and Changelog update. --- projects/go/config | 4 ++-- projects/tba-translation/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 19 +++++++++++++++++++ projects/tor-browser/config | 4 ++-- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- rbm.conf | 6 +++--- 7 files changed, 29 insertions(+), 10 deletions(-) diff --git a/projects/go/config b/projects/go/config index 509c6da..c0e3ee5 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.13.10 +version: 1.13.11 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -118,7 +118,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: eb9ccc8bf59ed068e7eff73e154e4f5ee7eec0a47a610fb864e3332a2fdc8b8c + sha256sum: 89ed1abce25ad003521c125d6583c93c1280de200ad221f961085200a6c00679 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 diff --git a/projects/tba-translation/config b/projects/tba-translation/config index 911d0ae..29388a4 100644 --- a/projects/tba-translation/config +++ b/projects/tba-translation/config @@ -3,5 +3,5 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/translation.git # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. -git_hash: 40d0ed51f51c7e42b9753b22292f35be5c30163d +git_hash: d3df6cc6e1797733ebca5b370f0f6915f490666f version: '[% c("abbrev") %]' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index a4b0f8a..168a021 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,22 @@ +Tor Browser 9.5a13 -- May 20 2020 + * All Platforms + * Update Firefox to 68.8.1esr + * Bump NoScript to 11.0.26 + * Bump Tor to 0.4.3.5 + * Translations update + * Bug 34157: Backport fix for Mozilla Bug 1511941 + * Windows + OS X + Linux + * Update Tor Launcher to 0.2.21.7 + * Translations update + * Bug 34196: Update site info URL with the onion name + * Bug 34043: Update snowflake to persist sessions across proxies + * Windows + * Bug 33113: Bump NSIS version to 3.05 + * Build System + * All Platforms + * Bump Go to 1.13.11 + * Bug 34242: Fix creation of Linux containers + Tor Browser 9.5a12 -- May 7 2020 * All Platforms * Update Firefox to 68.8.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 33f0cd9..3f41ed2 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -73,9 +73,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 2e55cf6dc6d0f6012e2f0328ecfec182a4f02c94e2fc40818af41f610ebd6668 + sha256sum: 99a70a78733fe7e21852f67bde090f6a57b5bdbd34ecbbdfcf481dc861965fd8 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 2b28a77..eb4dc24 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.21.6 +version: 0.2.21.7 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index 70395fa..912f839 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.4.3.4-rc +version: 0.4.3.5 git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index 8e46c7f..131845c 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.5a12' - torbrowser_build: 'build3' + torbrowser_version: '9.5a13' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.5a11 + - 9.5a12 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

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

19 May '20

commit 287da89a5296e94f6aaf873e55084c8f24395cea Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue May 19 17:50:25 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 96321fdd1715..83bc9c956c3b 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 96321fdd1715f52cab00f6654ebc8fb420a5489d +Subproject commit 83bc9c956c3be091c421521fcf05c3cdc393e870

1 0

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

19 May '20

commit 60c2bd8b58ff17db869041d74f64140cf4270af4 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue May 19 17:56:56 2020 +0000 Release preparations for 0.2.21.7 Translations update and version bump --- src/chrome/locale/bs/network-settings.dtd | 2 +- src/chrome/locale/es-AR/network-settings.dtd | 2 +- src/chrome/locale/es-AR/torlauncher.properties | 2 +- src/chrome/locale/hu/torlauncher.properties | 38 +++++++++++++------------- src/chrome/locale/nb-NO/network-settings.dtd | 10 +++---- src/install.rdf | 2 +- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/chrome/locale/bs/network-settings.dtd b/src/chrome/locale/bs/network-settings.dtd index 1b3f713..97a628f 100644 --- a/src/chrome/locale/bs/network-settings.dtd +++ b/src/chrome/locale/bs/network-settings.dtd @@ -11,7 +11,7 @@ <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> <!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> -<!ENTITY torSettings.configure "Configure"> +<!ENTITY torSettings.configure "Konfigurirajte"> <!ENTITY torSettings.connect "Connect">  diff --git a/src/chrome/locale/es-AR/network-settings.dtd b/src/chrome/locale/es-AR/network-settings.dtd index 002de49..1c353d2 100644 --- a/src/chrome/locale/es-AR/network-settings.dtd +++ b/src/chrome/locale/es-AR/network-settings.dtd @@ -79,5 +79,5 @@ <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solucioná el CAPTCHA para solicitar un puente."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "La solución no es correcta. Por favor intentá de nuevo."> <!ENTITY torPreferences.viewTorLogs "Ver la bitácora sucesos de Tor."> -<!ENTITY torPreferences.viewLogs "View Logs…"> +<!ENTITY torPreferences.viewLogs "Ver bitácora de sucesos"> <!ENTITY torPreferences.torLogsDialogTitle "Bitácora de eventos de Tor"> diff --git a/src/chrome/locale/es-AR/torlauncher.properties b/src/chrome/locale/es-AR/torlauncher.properties index 4669458..154120f 100644 --- a/src/chrome/locale/es-AR/torlauncher.properties +++ b/src/chrome/locale/es-AR/torlauncher.properties @@ -16,7 +16,7 @@ torlauncher.unable_to_start_tor=No se puede iniciar Tor.\n\n%S torlauncher.tor_missing=No se encuentra el archivo ejecutable de Tor. torlauncher.torrc_missing=No se encuentra el archivo torrc y no pudo ser creado. torlauncher.datadir_missing=El directorio de datos de Tor no existe y no pudo ser creado. -torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. +torlauncher.onionauthdir_missing=El directorio de autenticación Tor onion no existe y no se pudo crear. torlauncher.password_hash_missing=Falló al conseguir contraseñas encriptadas. torlauncher.failed_to_get_settings=No se pudo acceder a las configuraciones de Tor.\n\n%S diff --git a/src/chrome/locale/hu/torlauncher.properties b/src/chrome/locale/hu/torlauncher.properties index f21ba76..744e62f 100644 --- a/src/chrome/locale/hu/torlauncher.properties +++ b/src/chrome/locale/hu/torlauncher.properties @@ -16,7 +16,7 @@ torlauncher.unable_to_start_tor=Nem sikerült a Tor-t elindítani.\n\n%S torlauncher.tor_missing=A Tor futtatható állomány hiányzik. torlauncher.torrc_missing=A torrc fájl hiányzik és nem lehet létrehozni. torlauncher.datadir_missing=A Tor data könyvtár nem létezik és nem lehet létrehozni. -torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. +torlauncher.onionauthdir_missing=A Tor onion autentikációs könyvtár nem létezik és nem létrehozható. torlauncher.password_hash_missing=Nem sikerült megszerezni a hash-elt jelszót. torlauncher.failed_to_get_settings=Sikertelen a Tor beállítások lekérése.\n\n%S @@ -54,30 +54,30 @@ torlauncher.forAssistance2=Segítségért látogassa meg: %S torlauncher.copiedNLogMessages=Másolás kész. %S Tor naplóüzenet áll készen a beillesztésre egy szövegszerkesztőbe vagy egy email üzenetbe. torlauncher.bootstrapStatus.starting=Indítás -torlauncher.bootstrapStatus.conn_pt=Connecting to bridge -torlauncher.bootstrapStatus.conn_done_pt=Connected to bridge -torlauncher.bootstrapStatus.conn_proxy=Connecting to proxy -torlauncher.bootstrapStatus.conn_done_proxy=Connected to proxy -torlauncher.bootstrapStatus.conn=Connecting to a Tor relay -torlauncher.bootstrapStatus.conn_done=Connected to a Tor relay -torlauncher.bootstrapStatus.handshake=Negotiating with a Tor relay -torlauncher.bootstrapStatus.handshake_done=Finished negotiating with a Tor relay +torlauncher.bootstrapStatus.conn_pt=Kapcsolódás hídhoz +torlauncher.bootstrapStatus.conn_done_pt=Kapcsolódva hídhoz +torlauncher.bootstrapStatus.conn_proxy=Kapcsolódás proxyhoz +torlauncher.bootstrapStatus.conn_done_proxy=Kapcsolódva proxyhoz +torlauncher.bootstrapStatus.conn=Kapcsolódás egy Tor reléhez +torlauncher.bootstrapStatus.conn_done=Kapcsolódva egy Tor reléhez +torlauncher.bootstrapStatus.handshake=Egyeztetés egy Tor relével +torlauncher.bootstrapStatus.handshake_done=Egyeztetés egy Tor relével befejezve torlauncher.bootstrapStatus.onehop_create=Titkosított címtárkapcsolat létrehozása torlauncher.bootstrapStatus.requesting_status=Hálózat státuszának lekérdezése torlauncher.bootstrapStatus.loading_status=Hálózat státuszának betöltése torlauncher.bootstrapStatus.loading_keys=Tanúsítványkiadó tanúsítványok betöltése torlauncher.bootstrapStatus.requesting_descriptors=Elosztási adatok lekérdezése torlauncher.bootstrapStatus.loading_descriptors=Elosztási adatok betöltése -torlauncher.bootstrapStatus.enough_dirinfo=Finished loading relay information -torlauncher.bootstrapStatus.ap_conn_pt=Building circuits: Connecting to bridge -torlauncher.bootstrapStatus.ap_conn_done_pt=Building circuits: Connected to bridge -torlauncher.bootstrapStatus.ap_conn_proxy=Building circuits: Connecting to proxy -torlauncher.bootstrapStatus.ap_conn_done_proxy=Building circuits: Connected to proxy -torlauncher.bootstrapStatus.ap_conn=Building circuits: Connecting to a Tor relay -torlauncher.bootstrapStatus.ap_conn_done=Building circuits: Connected to a Tor relay -torlauncher.bootstrapStatus.ap_handshake=Building circuits: Negotiating with a Tor relay -torlauncher.bootstrapStatus.ap_handshake_done=Building circuits: Finished negotiating with a Tor relay -torlauncher.bootstrapStatus.circuit_create=Building circuits: Establishing a Tor circuit +torlauncher.bootstrapStatus.enough_dirinfo=Relé információk betöltése befejezve +torlauncher.bootstrapStatus.ap_conn_pt=Áramkörök felépítése: Kapcsolódás hídhoz +torlauncher.bootstrapStatus.ap_conn_done_pt=Áramkörök felépítése: Kapcsolódva hídhoz +torlauncher.bootstrapStatus.ap_conn_proxy=Áramkörök felépítése: Kapcsolódás proxyhoz +torlauncher.bootstrapStatus.ap_conn_done_proxy=Áramkörök felépítése: Kapcsolódva proxyhoz +torlauncher.bootstrapStatus.ap_conn=Áramkörök felépítése: Kapcsolódás egy Tor reléhez +torlauncher.bootstrapStatus.ap_conn_done=Áramkörök felépítése: Kapcsolódva egy Tor reléhez +torlauncher.bootstrapStatus.ap_handshake=Áramkörök felépítése: Egyeztetés egy Tor relével +torlauncher.bootstrapStatus.ap_handshake_done=Áramkörök felépítése: Egyeztetés egy Tor relével befejezve +torlauncher.bootstrapStatus.circuit_create=Áramkörök felépítése: egy Tor áramkör létesítése torlauncher.bootstrapStatus.done=Kapcsolódva a Tor hálózathoz! torlauncher.bootstrapWarning.done=kész diff --git a/src/chrome/locale/nb-NO/network-settings.dtd b/src/chrome/locale/nb-NO/network-settings.dtd index fc60f3b..97ac494 100644 --- a/src/chrome/locale/nb-NO/network-settings.dtd +++ b/src/chrome/locale/nb-NO/network-settings.dtd @@ -4,7 +4,7 @@ <!ENTITY torsettings.wizard.title.connecting "Etablering av tilkobling">  -<!ENTITY torlauncher.localePicker.title "Tor Nettleser Språk"> +<!ENTITY torlauncher.localePicker.title "Språk i Tor-nettleseren"> <!ENTITY torlauncher.localePicker.prompt "Vennligst velg et språk">  @@ -25,7 +25,7 @@ <!ENTITY torsettings.optional "Valgfritt"> -<!ENTITY torsettings.useProxy.checkbox "Jeg bruker en mellomtjener for å koble til Internett"> +<!ENTITY torsettings.useProxy.checkbox "Jeg bruker en mellomtjener, for å koble til Internett"> <!ENTITY torsettings.useProxy.type "Mellomtjener-type"> <!ENTITY torsettings.useProxy.type.placeholder "velg en mellomtjener-type"> <!ENTITY torsettings.useProxy.address " Adresse"> @@ -54,7 +54,7 @@ <!ENTITY torsettings.proxyHelpTitle "Mellomtjenerhjelp"> <!ENTITY torsettings.proxyHelp1 "En lokal mellomtjener kan være nødvendig når du kobler deg gjennom et firma, skole eller universitet nettverk.  Hvis du ikke er sikker på om en mellomtjener er nødvendig, kan du se på Internett-innstillingene i en annen nettleser eller kontrollere systemets nettverksinnstillinger."> -<!ENTITY torsettings.bridgeHelpTitle "Hjelp med Bro-rutingsstafettoppsett"> +<!ENTITY torsettings.bridgeHelpTitle "Hjelp med Bro-reléoppsett"> <!ENTITY torsettings.bridgeHelp1 "Broer er ulistede rutingstafettoppsett som gjør det vanskeligere å blokkere tilkoblinger til Tor-nettverket.  Hver type bro bruker en egen måte å unngå sensur.  Obfs-broene får trafikken din til å se ut som tilfeldig støy, og de ydmyke broene får broene til å se ut som de kobler til en annen tjeneste enn Tor."> <!ENTITY torsettings.bridgeHelp2 "På grunn av hvordan noen land prøver å blokkere Tor, fungerer noen broer i noen land, men ikke i andre.. Hvis du er usikker på hvilke broer som fungerer i ditt land, besøk torproject.org/about/contact.html#support"> @@ -63,7 +63,7 @@  <!ENTITY torPreferences.categoryTitle "Tor"> -<!ENTITY torPreferences.torSettings "Tor Innstillinger"> +<!ENTITY torPreferences.torSettings "Tor-innstillinger"> <!ENTITY torPreferences.torSettingsDescription "Tor Browser dirigerer trafikken din over Tor-nettverket, drevet av tusenvis av frivillige rundt om i verden." > <!ENTITY torPreferences.learnMore "Lær mer"> <!ENTITY torPreferences.bridges "Broer"> @@ -80,4 +80,4 @@ <!ENTITY torPreferences.requestBridgeErrorBadSolution "Løsningen er ikke riktig. Vær så snill, prøv på nytt."> <!ENTITY torPreferences.viewTorLogs "Se Tor-loggene."> <!ENTITY torPreferences.viewLogs "Vis logger..."> -<!ENTITY torPreferences.torLogsDialogTitle "Tor logger"> +<!ENTITY torPreferences.torLogsDialogTitle "Tor-logger"> diff --git a/src/install.rdf b/src/install.rdf index 4cae1e1..a967343 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.21.6</em:version> + <em:version>0.2.21.7</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

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

19 May '20

commit 83bc9c956c3be091c421521fcf05c3cdc393e870 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue May 19 17:48:05 2020 +0000 Translations update --- chrome/locale/es-AR/aboutTor.dtd | 2 +- chrome/locale/es-AR/browserOnboarding.properties | 10 +- chrome/locale/es-AR/torbutton.dtd | 4 +- chrome/locale/es-AR/torbutton.properties | 112 +++++++++++------------ chrome/locale/fr/torbutton.properties | 2 +- chrome/locale/hu/aboutTor.dtd | 2 +- chrome/locale/hu/browserOnboarding.properties | 10 +- chrome/locale/hu/torbutton.properties | 84 ++++++++--------- chrome/locale/lt/torbutton.properties | 74 +++++++-------- chrome/locale/zh-CN/torbutton.properties | 18 ++-- 10 files changed, 159 insertions(+), 159 deletions(-) diff --git a/chrome/locale/es-AR/aboutTor.dtd b/chrome/locale/es-AR/aboutTor.dtd index c4e3e6be..f1332912 100644 --- a/chrome/locale/es-AR/aboutTor.dtd +++ b/chrome/locale/es-AR/aboutTor.dtd @@ -27,5 +27,5 @@ <!ENTITY aboutTor.newsletter.tagline "Recibí las últimas noticias de Tor derecho en tu bandeja de entrada."> <!ENTITY aboutTor.newsletter.link_text "Registrate en Tor News."> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> +<!ENTITY aboutTor.donationBanner.freeToUse "Tor es de uso gratuito gracias a las donaciones de personas como usted."> <!ENTITY aboutTor.donationBanner.buttonA "Doná ahora"> diff --git a/chrome/locale/es-AR/browserOnboarding.properties b/chrome/locale/es-AR/browserOnboarding.properties index 2808fa7f..e02ed823 100644 --- a/chrome/locale/es-AR/browserOnboarding.properties +++ b/chrome/locale/es-AR/browserOnboarding.properties @@ -16,7 +16,7 @@ onboarding.tour-tor-network=Red de Tor onboarding.tour-tor-network.title=Viajá por una red descentralizada. onboarding.tour-tor-network.description=El Navegador Tor te conecta a la red Tor, formada por miles de voluntarios alrededor del mundo. A diferencia de una RPV, no hay un único punto de falla o entidad central en la cual necesités confiar de manera de disfrutar de internet privadamente. onboarding.tour-tor-network.description-para2=NOVEDAD: La configuración de la red Tor. Incluyendo posibilidad de solicitar puentes para donde Tor esta bloqueado, fue movida a Preferencias. -onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings +onboarding.tour-tor-network.action-button=Ajusta la configuración de tu red Tor onboarding.tour-tor-network.button=Ir a visualización de Circuito onboarding.tour-tor-circuit-display=Visualización de Circuito @@ -49,10 +49,10 @@ onboarding.tour-tor-update.prefix-new=Nuevo onboarding.tour-tor-update.prefix-updated=Actualizado onboarding.tour-tor-toolbar=Barra de herramientas -onboarding.tour-tor-toolbar-update-9.0.title=Goodbye Onion Button. -onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser. -onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu. -onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity +onboarding.tour-tor-toolbar-update-9.0.title=Adios botón Onion +onboarding.tour-tor-toolbar-update-9.0.description=Queremos que su experiencia con Tor se integre completamente en el navegador Tor. +onboarding.tour-tor-toolbar-update-9.0.description-para2=Es por eso que ahora, en lugar de usar el botón Onion, puedes ver tu Circuito Tor a través de [i] en la barra de URL y solicitar una Nueva Identidad usando el botón de la barra de herramientas o el menú [≡]. +onboarding.tour-tor-toolbar-update-9.0.button=Cómo solicitar una nueva identidad onboarding.tour-tor-toolbar-update-9.0.next-button=Ir a la red Tor # Circuit Display onboarding. diff --git a/chrome/locale/es-AR/torbutton.dtd b/chrome/locale/es-AR/torbutton.dtd index 757cca3e..a139246c 100644 --- a/chrome/locale/es-AR/torbutton.dtd +++ b/chrome/locale/es-AR/torbutton.dtd @@ -49,5 +49,5 @@ <!ENTITY torbutton.circuit_display.new_circuit "Nuevo circuito para este sitio">  -<!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> -<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> +<!ENTITY torbutton.onionServices.authPrompt.tooltip "Solicitud de autenticación de cliente del servicio abierto de Onion"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Recuerda esta llave"> diff --git a/chrome/locale/es-AR/torbutton.properties b/chrome/locale/es-AR/torbutton.properties index 6ae1121a..85007515 100644 --- a/chrome/locale/es-AR/torbutton.properties +++ b/chrome/locale/es-AR/torbutton.properties @@ -8,8 +8,8 @@ torbutton.circuit_display.unknown_country = País desconocido torbutton.circuit_display.guard = Guarda torbutton.circuit_display.guard_note = Tu nodo [Guarda] puede no cambiar. torbutton.circuit_display.learn_more = Más informacion -torbutton.circuit_display.click_to_copy = Click to Copy -torbutton.circuit_display.copied = Copied! +torbutton.circuit_display.click_to_copy = Cliquear para copiar +torbutton.circuit_display.copied = Copiado! torbutton.content_sizer.margin_tooltip = El Navegador Tor añade éste margen para hacer el ancho y alto de tu ventana menos distintivo, y de ésta manera reduce la habilidad de cualquiera para rastrearte en línea. torbutton.panel.tooltip.disabled = Cliquear para habilitar Tor torbutton.panel.tooltip.enabled = Cliquear para deshabilitar Tor @@ -65,79 +65,79 @@ pageInfo_OnionEncryption=Conexión encriptada (Servicio Onion) onionServices.learnMore=Aprendé más onionServices.errorPage.browser=Navegador onionServices.errorPage.network=Red -onionServices.errorPage.onionSite=Onionsite +onionServices.errorPage.onionSite=Sitio 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.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. +onionServices.descNotFound.pageTitle=Problema al cargar el sitio Onion +onionServices.descNotFound.header=Sitio Onion no encontrado +onionServices.descNotFound=La causa más probable es que el sitio Onion está fuera de línea. Póngase en contacto con el administrador del sitio Onion. +onionServices.descNotFound.longDescription=Detalles:% S — El descriptor del servicio Onion solicitado no se puede encontrar en el hashring y, por lo tanto, el cliente no puede acceder al servicio. # Tor SOCKS error 0xF1: -onionServices.descInvalid.pageTitle=Problem Loading Onionsite -onionServices.descInvalid.header=Onionsite Cannot Be Reached -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. +onionServices.descInvalid.pageTitle=Problema al cargar el sitio Onion +onionServices.descInvalid.header=No se puede acceder al sitio onion +onionServices.descInvalid=No se puede acceder al sitio Onion debido a un error interno. +onionServices.descInvalid.longDescription= Detalles:% S — El descriptor del servicio de cebolla solicitado no se puede analizar o la validación de firma falló. # Tor SOCKS error 0xF2: -onionServices.introFailed.pageTitle=Problem Loading Onionsite -onionServices.introFailed.header=Onionsite Has Disconnected -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. +onionServices.introFailed.pageTitle=Problema al cargar el sitio Onion +onionServices.introFailed.header=El sitio Onion se ha desconectado +onionServices.introFailed=La causa más probable es que el sitio Onion está fuera de línea. Póngase en contacto con el administrador del sitio Onion. +onionServices.introFailed.longDescription=Detalles:%S — Falló la introducción, lo que significa que se encontró el descriptor pero el servicio ya no está conectado al punto de introducción. Es probable que el servicio haya cambiado su descriptor o que no se esté ejecutando. # Tor SOCKS error 0xF3: -onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite -onionServices.rendezvousFailed.header=Unable to Connect to Onionsite -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. +onionServices.rendezvousFailed.pageTitle=Problema al cargar el sitio Onion +onionServices.rendezvousFailed.header=No se puede conectar al sitio Onio +onionServices.rendezvousFailed=El sitio Onion está ocupado o la red Tor está sobrecargada. Intenta nuevamente más tarde. +onionServices.rendezvousFailed.longDescription=Detalles:% S — El cliente no se pudo reunir con el servicio, lo que significa que el cliente no pudo finalizar la conexión. # Tor SOCKS error 0xF4: -onionServices.clientAuthMissing.pageTitle=Authorization Required -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. +onionServices.clientAuthMissing.pageTitle=Autorización requerida +onionServices.clientAuthMissing.header=El sitio Onion requiere autenticación +onionServices.clientAuthMissing=El acceso al sitio Onion requiere una clave, pero no se proporcionó ninguna. +onionServices.clientAuthMissing.longDescription=Detalles:% S — El descriptor del servicio Onion solicitado no se puede analizar o la validación de firma falló. # Tor SOCKS error 0xF5: -onionServices.clientAuthIncorrect.pageTitle=Authorization Failed -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. +onionServices.clientAuthIncorrect.pageTitle=Autorización fallida +onionServices.clientAuthIncorrect.header=Autenticación del sitio Onion fallida +onionServices.clientAuthIncorrect=La clave proporcionada es incorrecta o ha sido revocada. Póngase en contacto con el administrador del sitio Onion. +onionServices.clientAuthIncorrect.longDescription=Detalles:% S — El cliente pudo descargar el descriptor del servicio de Onion solicitado, pero no pudo descifrar su contenido utilizando la información de autorización del cliente proporcionada. Esto puede significar que el acceso ha sido revocado. # Tor SOCKS error 0xF6: -onionServices.badAddress.pageTitle=Problem Loading Onionsite -onionServices.badAddress.header=Invalid Onionsite Address -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. +onionServices.badAddress.pageTitle=Problema al cargar el sitio Onion +onionServices.badAddress.header=Dirección de sitio Onion no válida +onionServices.badAddress=La dirección del sitio Onion proporcionada no es válida. Por favor verifique que lo haya ingresado correctamente. +onionServices.badAddress.longDescription=Detalles:% S — La dirección .onion proporcionada no es válida. Este error se devuelve debido a uno de los siguientes motivos: la suma de verificación de la dirección no coincide, la clave pública ed25519 no es válida o la codificación no es válida. # Tor SOCKS error 0xF7: -onionServices.introTimedOut.pageTitle=Problem Loading Onionsite -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. +onionServices.introTimedOut.pageTitle=Problema al cargar sitio Onion +onionServices.introTimedOut.header=El tiempo de creación del circuito de sitio Onion se agotó +onionServices.introTimedOut=No se pudo conectar al sitio Onion, posiblemente debido a una mala conexión de red. +onionServices.introTimedOut.longDescription=Detalles: %S — El tiempo de espera de conexión al servicio Onion solicitado se agotó al intentar construir el circuito de encuentro. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S is requesting your private key. -onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service +onionServices.authPrompt.description=%S está solicitando su clave privada. +onionServices.authPrompt.keyPlaceholder=Ingrese su clave privada para este servicio Onion onionServices.authPrompt.done=Hecho onionServices.authPrompt.doneAccessKey=d -onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) -onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key -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.dialogTitle=Onion Service Keys -onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer -onionServices.authPreferences.onionSite=Onionsite +onionServices.authPrompt.invalidKey=Ingrese una clave válida (52 Base32 caracteres o 44 Base64 caracteres) +onionServices.authPrompt.failedToSetKey=No se puede configurar Tor con tu clave +onionServices.authPreferences.header=Autenticación de servicios Onion +onionServices.authPreferences.overview=Algunos servicios Onion requieren que se identifique con una clave (un tipo de contraseña) antes de poder acceder a ellos. +onionServices.authPreferences.savedKeys=Claves guardadas ... +onionServices.authPreferences.dialogTitle=Claves de servicio Onion +onionServices.authPreferences.dialogIntro=Las claves para los siguientes sitios Onion se almacenan en su computadora +onionServices.authPreferences.onionSite=Sitio Onion onionServices.authPreferences.onionKey=Clave criptográfica onionServices.authPreferences.remove=Remover -onionServices.authPreferences.removeAll=Remove All -onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor -onionServices.authPreferences.failedToRemoveKey=Unable to remove key +onionServices.authPreferences.removeAll=Remover todo +onionServices.authPreferences.failedToGetKeys=No se puede recuperar claves de Tor +onionServices.authPreferences.failedToRemoveKey=No se puede eliminar la clave # Onion-Location strings. -onionLocation.alwaysPrioritize=Always Prioritize Onions +onionLocation.alwaysPrioritize=Siempre priorice las Onions onionLocation.alwaysPrioritizeAccessKey=a onionLocation.notNow=Ahora no onionLocation.notNowAccessKey=j -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.prioritizeOnionsDescription=Prioritize .onion sites when known. +onionLocation.description=Hay una versión más privada y segura de este sitio disponible en la red Tor a través de servicios Onion. Los servicios Onion ayudan a los editores de sitios web y a sus visitantes a vencer la vigilancia y la censura. +onionLocation.tryThis=Prueba los servicios Onion +onionLocation.onionAvailable=.onion disponible +onionLocation.learnMore=Aprende más… +onionLocation.always=Siempre +onionLocation.askEverytime=Pregunta cuando quieras +onionLocation.prioritizeOnionsDescription=Pregunta cuando quieras onionLocation.onionServicesTitle=Servicios Onion diff --git a/chrome/locale/fr/torbutton.properties b/chrome/locale/fr/torbutton.properties index 13970d82..0fa18876 100644 --- a/chrome/locale/fr/torbutton.properties +++ b/chrome/locale/fr/torbutton.properties @@ -91,7 +91,7 @@ onionServices.rendezvousFailed.longDescription=Détails : %S – Échec de renc # Tor SOCKS error 0xF4: onionServices.clientAuthMissing.pageTitle=Une autorisation est exigée onionServices.clientAuthMissing.header=Le site onion exige une authentification -onionServices.clientAuthMissing=Le site onion exige une clé, mais aucune n'a été indiquée. +onionServices.clientAuthMissing=Le site onion exige une clé, mais aucune n'a été indiquée. onionServices.clientAuthMissing.longDescription=Détails : %S – Le client a téléchargé le descripteur du site demandé, mais n’a pas réussi à déchiffrer son contenu, car il manque les renseignements d’autorisation du client. # Tor SOCKS error 0xF5: onionServices.clientAuthIncorrect.pageTitle=Échec d’autorisation diff --git a/chrome/locale/hu/aboutTor.dtd b/chrome/locale/hu/aboutTor.dtd index c7f145e3..6682d2ff 100644 --- a/chrome/locale/hu/aboutTor.dtd +++ b/chrome/locale/hu/aboutTor.dtd @@ -27,5 +27,5 @@ <!ENTITY aboutTor.newsletter.tagline "Kapja meg a legfrissebb Tor híreket közvetlenül email fiókjába."> <!ENTITY aboutTor.newsletter.link_text "Iratkozzon fel a Tor hírekhez."> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> +<!ENTITY aboutTor.donationBanner.freeToUse "A Tor ingyenes az Önhöz hasonló személyek támogatásai miatt."> <!ENTITY aboutTor.donationBanner.buttonA "Támogasson most"> diff --git a/chrome/locale/hu/browserOnboarding.properties b/chrome/locale/hu/browserOnboarding.properties index f3c81141..830547f9 100644 --- a/chrome/locale/hu/browserOnboarding.properties +++ b/chrome/locale/hu/browserOnboarding.properties @@ -15,7 +15,7 @@ onboarding.tour-tor-privacy.button=Irány a Tor Hálózat onboarding.tour-tor-network=Tor Hálózat onboarding.tour-tor-network.title=Utazzon egy decentralizált hálózaton. onboarding.tour-tor-network.description=A Tor Böngésző összeköti Önt és a Tor hálózatát önkéntesek ezreivel a világon. A VPN-nel ellentétben nincs egypontos hibalehetőség vagy központosított entitás amiben bíznia kell, ahhoz, hogy az internetet privát használja. -onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences. +onboarding.tour-tor-network.description-para2=ÚJ: A Tor hálózati beállítások, beleértve a lehetőséget, hogy hidakat kérjünk, ott ahol a Tor blokkolt, most már a Beállításoknál találja, onboarding.tour-tor-network.action-button=A Tor hálózati beállítások módosítása onboarding.tour-tor-network.button=Ugrás az Áramkör megjelenítéshez @@ -28,7 +28,7 @@ onboarding.tour-tor-circuit-display.next-button=Ugrás a Biztonságra onboarding.tour-tor-security=Biztonság onboarding.tour-tor-security.title=Válassza ki élményét onboarding.tour-tor-security.description=További beállítási lehetőségeket biztosítunk a böngésző biztonság növelése érdekében. A Biztonsági beállításaink lehetővé teszik, hogy blokkoljon olyan elemeket, amelyekkel támadható a számítógépe. Kattintson alább, hogy lássa, mely lehetőségek mit csinálnak. -onboarding.tour-tor-security.description-suffix=Note: By default, NoScript and HTTPS Everywhere are not included on the toolbar, but you can customize your toolbar to add them. +onboarding.tour-tor-security.description-suffix=Megjegyzés: Alaphelyzetben a NoScript és a HTTPS Everywhere nincs az eszköztáron, e testre szabhatja az eszköztárat hozzá adásukkal. onboarding.tour-tor-security-level.button=Biztonsági szintjének megtekintése onboarding.tour-tor-security-level.next-button=Ugrás a Tapasztalati tippekre @@ -50,9 +50,9 @@ onboarding.tour-tor-update.prefix-updated=Frissített onboarding.tour-tor-toolbar=Eszköztár onboarding.tour-tor-toolbar-update-9.0.title=Viszlát Hagyma gomb -onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser. -onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu. -onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity +onboarding.tour-tor-toolbar-update-9.0.description=Az szeretnénk, hogy a Tor élmény amit tapasztal, teljesen integrált legyen a Tor Böngészővel. +onboarding.tour-tor-toolbar-update-9.0.description-para2=Ezért most a hagyma gomb helyet a Tor áramkörét az [i] gombbal tudja megtekinteni a címsorban, és új identitást kérhet az eszköztár vagy a [≡] menü segítségével.. +onboarding.tour-tor-toolbar-update-9.0.button=Hogyan kérjen új identitást onboarding.tour-tor-toolbar-update-9.0.next-button=Irány a Tor Hálózat # Circuit Display onboarding. diff --git a/chrome/locale/hu/torbutton.properties b/chrome/locale/hu/torbutton.properties index 6323aefc..833edaef 100644 --- a/chrome/locale/hu/torbutton.properties +++ b/chrome/locale/hu/torbutton.properties @@ -8,8 +8,8 @@ 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 = Click to Copy -torbutton.circuit_display.copied = Copied! +torbutton.circuit_display.click_to_copy = Kattintson a msolá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.panel.tooltip.disabled = Kattintson rá a Tor bekapcsolásához torbutton.panel.tooltip.enabled = Kattintson rá a Tor kikapcsolásához @@ -69,75 +69,75 @@ onionServices.errorPage.onionSite=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=Problem Loading Onionsite -onionServices.descNotFound.header=Onionsite Not Found -onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +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. # Tor SOCKS error 0xF1: -onionServices.descInvalid.pageTitle=Problem Loading Onionsite -onionServices.descInvalid.header=Onionsite Cannot Be Reached -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. +onionServices.descInvalid.pageTitle=Probléma az Onionsite betöltésekor +onionServices.descInvalid.header=Az Onionsite nem elérhető +onionServices.descInvalid=Az onionsite nem elérhető belső hiba miatt. +onionServices.descInvalid.longDescription=Részletek: %S — A kért onion szolgáltatás leíró nem értelmezhető, vagy az aláírás ellenőrzés sikertelen. # Tor SOCKS error 0xF2: -onionServices.introFailed.pageTitle=Problem Loading Onionsite -onionServices.introFailed.header=Onionsite Has Disconnected -onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +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. # Tor SOCKS error 0xF3: -onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite -onionServices.rendezvousFailed.header=Unable to Connect to Onionsite -onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later. +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. # Tor SOCKS error 0xF4: -onionServices.clientAuthMissing.pageTitle=Authorization Required -onionServices.clientAuthMissing.header=Onionsite Requires Authentication -onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided. +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. # Tor SOCKS error 0xF5: -onionServices.clientAuthIncorrect.pageTitle=Authorization Failed -onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed +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. # Tor SOCKS error 0xF6: -onionServices.badAddress.pageTitle=Problem Loading Onionsite -onionServices.badAddress.header=Invalid Onionsite Address -onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly. +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. # Tor SOCKS error 0xF7: -onionServices.introTimedOut.pageTitle=Problem Loading Onionsite -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.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. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S is requesting your private key. -onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service +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.doneAccessKey=a onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) -onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key -onionServices.authPreferences.header=Onion Services Authentication +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.savedKeys=Saved Keys… -onionServices.authPreferences.dialogTitle=Onion Service Keys -onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +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 onionServices.authPreferences.onionSite=Onionsite onionServices.authPreferences.onionKey=Kulcs onionServices.authPreferences.remove=Eltávolít -onionServices.authPreferences.removeAll=Remove All -onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor -onionServices.authPreferences.failedToRemoveKey=Unable to remove key +onionServices.authPreferences.removeAll=Mindent eltávolít +onionServices.authPreferences.failedToGetKeys=Sikertelen a kulcsok lekérése a tor-ról +onionServices.authPreferences.failedToRemoveKey=Nem lehetséges a kulcs eltávolítása # Onion-Location strings. -onionLocation.alwaysPrioritize=Always Prioritize Onions +onionLocation.alwaysPrioritize=Mindig priorizálja az Onionokat onionLocation.alwaysPrioritizeAccessKey=n 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.tryThis=Try Onion Services -onionLocation.onionAvailable=.onion available -onionLocation.learnMore=Learn more… +onionLocation.tryThis=Próbálja ki az Onion szolgáltatásokat +onionLocation.onionAvailable=.onion elérhető +onionLocation.learnMore=Tudjon meg többet... onionLocation.always=Mindig -onionLocation.askEverytime=Ask every time -onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. +onionLocation.askEverytime=Kérdezze mindig +onionLocation.prioritizeOnionsDescription=Priorizálja a .oinion oldalt, ha ismert. onionLocation.onionServicesTitle=Onion Szolgáltatások diff --git a/chrome/locale/lt/torbutton.properties b/chrome/locale/lt/torbutton.properties index bf209881..1b6b087c 100644 --- a/chrome/locale/lt/torbutton.properties +++ b/chrome/locale/lt/torbutton.properties @@ -65,48 +65,48 @@ pageInfo_OnionEncryption=Šifruotas ryšys (Onion paslauga) onionServices.learnMore=Sužinoti daugiau onionServices.errorPage.browser=Naršyklė onionServices.errorPage.network=Tinklas -onionServices.errorPage.onionSite=Onionsite +onionServices.errorPage.onionSite=Onion svetainės # 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.header=Onionsite Not Found -onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +onionServices.descNotFound.pageTitle=Problema įkeliant onion svetainę +onionServices.descNotFound.header=Onion svetainė nerasta +onionServices.descNotFound=Labiausiai tikėtina priežastis ta, kad onion svetainė yra nepasiekiama. Susisiekite su onion svetainės administratoriumi. 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=The onionsite is unreachable due an internal error. +onionServices.descInvalid.pageTitle=Problema įkeliant onion svetainę +onionServices.descInvalid.header=Onion svetainė nepasiekiama +onionServices.descInvalid=Onion svetainė nepasiekiama dėl vidinės klaidos. 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=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +onionServices.introFailed.pageTitle=Problema įkeliant onion svetainę +onionServices.introFailed.header=Onion svetainė atsijungė +onionServices.introFailed=Labiausiai tikėtina priežastis ta, kad onion svetainė yra nepasiekiama. Susisiekite su onion svetainės administratoriumi. 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=The onionsite is busy or the Tor network is overloaded. Try again later. +onionServices.rendezvousFailed.pageTitle=Problema įkeliant onion svetainę +onionServices.rendezvousFailed.header=Nepavyko prisijungti prie onion svetainės +onionServices.rendezvousFailed=Onion svetainė užimta arba Tor tinklas perkrautas. Pabandykite dar kartą vėliau. 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=Access to the onionsite requires a key but none was provided. +onionServices.clientAuthMissing.pageTitle=Reikalingas įgaliojimas +onionServices.clientAuthMissing.header=Onion svetainėje reikalaujamas atpažinimas +onionServices.clientAuthMissing=Norint pasiekti onion svetainę reikalingas raktas, tačiau jis nebuvo suteiktas. 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.header=Onionsite Authentication Failed -onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator. +onionServices.clientAuthIncorrect.pageTitle=Įgaliojimas nepavyko +onionServices.clientAuthIncorrect.header=Onion svetainės atpažinimas nepavyko +onionServices.clientAuthIncorrect=Pateiktas raktas neteisingas arba buvo panaikintas. Susisiekite su onion svetainės administratoriumi. 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=The provided onionsite address is invalid. Please check that you entered it correctly. +onionServices.badAddress.pageTitle=Problema įkeliant onion svetainę +onionServices.badAddress.header=Neteisingas onion svetainės adresas +onionServices.badAddress=Pateiktas onion svetainės adresas neteisingas. Įsitikinkite, kad jį įvedėte teisingai. 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.header=Onionsite Circuit Creation Timed Out -onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection. +onionServices.introTimedOut.pageTitle=Problema įkeliant onion svetainę +onionServices.introTimedOut.header=Baigėsi onion grandinės kūrimui skirtas laikas +onionServices.introTimedOut=Nepavyko prisijungti prie onion svetainės, galbūt dėl silpno tinklo ryšio. 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. @@ -117,27 +117,27 @@ onionServices.authPrompt.doneAccessKey=u onionServices.authPrompt.invalidKey=Įveskite galiojantį raktą (52 base32 arba 44 base64 simbolius) onionServices.authPrompt.failedToSetKey=Nepavyko konfigūruoti Tor naudojant jūsų raktą onionServices.authPreferences.header=Onion paslaugų tapatybės nustatymas -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=Norėdami pasiekti kai kurias onion paslaugas turite nustatyti savo tapatybę su raktu (tam tikru slaptažodžiu). onionServices.authPreferences.savedKeys=Įrašyti raktai… onionServices.authPreferences.dialogTitle=Onion paslaugos raktai -onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer -onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.dialogIntro=Šių onion svetainių raktai saugomi jūsų kompiuteryje +onionServices.authPreferences.onionSite=Onion svetainė onionServices.authPreferences.onionKey=Raktas onionServices.authPreferences.remove=Šalinti -onionServices.authPreferences.removeAll=Remove All -onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.removeAll=Šalinti visus +onionServices.authPreferences.failedToGetKeys=Nepavyko gauti raktų iš Tor onionServices.authPreferences.failedToRemoveKey=Nepavyko pašalinti raktą # Onion-Location strings. -onionLocation.alwaysPrioritize=Always Prioritize Onions +onionLocation.alwaysPrioritize=Visada teikti pirmenybę Onions onionLocation.alwaysPrioritizeAccessKey=p onionLocation.notNow=Ne dabar onionLocation.notNowAccessKey=g -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.description=Prieinama privatesnė ir saugesnė šios svetainės versija per Tor tinklo onion paslaugas. Naudodami onion paslaugas svetainių leidėjai ir jų lankytojai nugali stebėjimą ir cenzūrą. +onionLocation.tryThis=Išbandyti onion paslaugas +onionLocation.onionAvailable=.onion prieinama +onionLocation.learnMore=Sužinoti daugiau... onionLocation.always=Visada -onionLocation.askEverytime=Ask every time -onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. +onionLocation.askEverytime=Klausti kiekvieną kartą +onionLocation.prioritizeOnionsDescription=Teikti pirmenybę .onion svetainėms, kai žinoma. onionLocation.onionServicesTitle=Onion paslaugos diff --git a/chrome/locale/zh-CN/torbutton.properties b/chrome/locale/zh-CN/torbutton.properties index da5b345c..3d93b07c 100644 --- a/chrome/locale/zh-CN/torbutton.properties +++ b/chrome/locale/zh-CN/torbutton.properties @@ -85,28 +85,28 @@ 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=Unable to Connect to Onionsite -onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later. +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=Onionsite Requires Authentication -onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided. +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=Onionsite Authentication Failed -onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator. +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=The provided onionsite address is invalid. Please check that you entered it correctly. +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=Onionsite Circuit Creation Timed Out -onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection. +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.

1 0

[tor-browser-build/master] Bug 34242: Fix creation of Linux containers
by sysrqb＠torproject.org 18 May '20

18 May '20

commit e9fa09b87bd633f10cfeca2797839662138d5d39 Author: Georg Koppen <gk(a)torproject.org> Date: Sun May 17 18:59:06 2020 +0000 Bug 34242: Fix creation of Linux containers `0.9.7.9+deb7u8` is not available anymore for `apt`. Take `0.9.7.9+deb7u9` from now on. --- projects/debootstrap-image/config | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index f7b9e57..8e83d81 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -39,17 +39,17 @@ pre: | targets: wheezy-amd64: var: - minimal_apt_version: '0.9.7.9+deb7u8' + minimal_apt_version: '0.9.7.9+deb7u9' # https://deb.freexian.com/extended-lts/updates/ela-76-1-apt/ apt_packages_baseurl: http://deb.freexian.com/extended-lts/pool/main/a/apt - apt_package_filename: apt_0.9.7.9+deb7u8_amd64.deb - apt_package_sha256sum: 83dcdb3f9c11df28b30b85bbb9dec341effbf36ee881a04dece3390082080761 - apt_utils_package_filename: apt-utils_0.9.7.9+deb7u8_amd64.deb - apt_utils_package_sha256sum: 91a4d0ec92a32f13e3acb37f71546d48c51a0df25f3b9eb6a96b73dfc93a11ed - libapt_inst_package_filename: libapt-inst1.5_0.9.7.9+deb7u8_amd64.deb - libapt_inst_package_sha256sum: 181c9c21e1b33496b251fc76ba8ed04acbb8e23006909d27795bbc287eddd027 - libapt_pkg_package_filename: libapt-pkg4.12_0.9.7.9+deb7u8_amd64.deb - libapt_pkg_package_sha256sum: b360dfb5a65ac2f7b81a2551d8a520ba2265785537d6d669869a159888b81999 + apt_package_filename: apt_0.9.7.9+deb7u9_amd64.deb + apt_package_sha256sum: b8a218da2ae21979323dd02551d983938d94308ac56930a2d238e822f062dc61 + apt_utils_package_filename: apt-utils_0.9.7.9+deb7u9_amd64.deb + apt_utils_package_sha256sum: d635a166aae03b24cdabe277bb46d584156836637c0b9bef2220fb0bc0928e40 + libapt_inst_package_filename: libapt-inst1.5_0.9.7.9+deb7u9_amd64.deb + libapt_inst_package_sha256sum: 332083172e00d39e55dec4c7078c3522989e45e12b0a1306889e90b8e2c0a0db + libapt_pkg_package_filename: libapt-pkg4.12_0.9.7.9+deb7u9_amd64.deb + libapt_pkg_package_sha256sum: c3ae83c4ea691074250bf6fb175e71042c4bb7418bf19779ceda0a53eea0a257 container: suite: wheezy

1 0

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

18 May '20

commit e202334a89191016e6419fe5cbedd965727b3103 Merge: 2c48c71 e9fa09b Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon May 18 19:28:48 2020 +0000 Merge remote-tracking branch 'gktpo/bug_34242' projects/debootstrap-image/config | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)

1 0

[tor-browser/tor-browser-68.8.0esr-9.5-1] Merge remote-tracking branch 'acatgh/34196+2' into tor-browser-68.8.0esr-9.5-1
by sysrqb＠torproject.org 18 May '20

18 May '20

commit a87a532c070322f8ba252da6a577c872d07d53b3 Merge: 6d7f6ea31a76 052d8a452a92 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon May 18 17:51:04 2020 +0000 Merge remote-tracking branch 'acatgh/34196+2' into tor-browser-68.8.0esr-9.5-1 browser/base/content/pageinfo/pageInfo.js | 2 +- browser/base/content/pageinfo/pageInfo.xul | 6 ++++++ browser/base/content/pageinfo/security.js | 17 ++++++++++++++++- 3 files changed, 23 insertions(+), 2 deletions(-)

1 0

[tor-browser/tor-browser-68.8.0esr-9.5-1] fixup! Bug 34196: Update site info URL with the onion name
by sysrqb＠torproject.org 18 May '20

18 May '20

commit 052d8a452a92a97b77130e60e28c1c02076d9db3 Author: Alex Catarineu <acat(a)torproject.org> Date: Fri May 15 10:46:58 2020 +0200 fixup! Bug 34196: Update site info URL with the onion name --- browser/base/content/pageinfo/pageInfo.js | 2 +- browser/base/content/pageinfo/pageInfo.xul | 6 ++++++ browser/base/content/pageinfo/security.js | 17 ++++++++++++++++- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/browser/base/content/pageinfo/pageInfo.js b/browser/base/content/pageinfo/pageInfo.js index ae228fb9bd61..c30c74dab752 100644 --- a/browser/base/content/pageinfo/pageInfo.js +++ b/browser/base/content/pageinfo/pageInfo.js @@ -412,7 +412,7 @@ function loadPageInfo(frameOuterWindowID, imageElement, browser) { ); } onLoadPermission(uri, principal); - securityOnLoad(uri, windowInfo); + securityOnLoad(uri, windowInfo, browser.currentOnionAliasURI); }); // Get the media elements from content script to setup the media tab. diff --git a/browser/base/content/pageinfo/pageInfo.xul b/browser/base/content/pageinfo/pageInfo.xul index c7de71c23048..9fbd8e54379a 100644 --- a/browser/base/content/pageinfo/pageInfo.xul +++ b/browser/base/content/pageinfo/pageInfo.xul @@ -294,6 +294,12 @@ control="security-identity-domain-value"/> <textbox id="security-identity-domain-value" readonly="true"/> </row> +  + <row id="security-view-identity-onionalias-row"> + <label id="security-view-identity-onionalias" + control="security-view-identity-onionalias-value"/> + <textbox id="security-view-identity-onionalias-value" readonly="true"/> + </row>  <row> <label id="security-identity-owner-label" diff --git a/browser/base/content/pageinfo/security.js b/browser/base/content/pageinfo/security.js index a0336a67ee42..555fd538d3a2 100644 --- a/browser/base/content/pageinfo/security.js +++ b/browser/base/content/pageinfo/security.js @@ -227,7 +227,7 @@ var security = { _cert: null, }; -function securityOnLoad(uri, windowInfo) { +function securityOnLoad(uri, windowInfo, onionAliasURI) { security.init(uri, windowInfo); var info = security._getSecurityInfo(); @@ -240,6 +240,21 @@ function securityOnLoad(uri, windowInfo) { } document.getElementById("securityTab").hidden = false; + if (onionAliasURI) { + setText( + "security-view-identity-onionalias", + gTorButtonBundle.GetStringFromName("pageInfo_OnionName") + ); + setText("security-view-identity-onionalias-value", onionAliasURI.host); + document.getElementById( + "security-view-identity-onionalias-row" + ).hidden = false; + } else { + document.getElementById( + "security-view-identity-onionalias-row" + ).hidden = true; + } + /* Set Identity section text */ setText("security-identity-domain-value", info.hostName);

1 0

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

18 May '20

commit 8311c085334bb50cb58d0b60f8d0d987b5f111c5 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon May 18 17:53:26 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 36f8182a2581..96321fdd1715 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 36f8182a25818548d62b7fbc6be4d2472773b820 +Subproject commit 96321fdd1715f52cab00f6654ebc8fb420a5489d

1 0

[torbutton/master] Merge remote-tracking branch 'acat/34196'
by sysrqb＠torproject.org 18 May '20

18 May '20

commit 96321fdd1715f52cab00f6654ebc8fb420a5489d Merge: 36f8182a 62a78acd Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon May 18 17:49:40 2020 +0000 Merge remote-tracking branch 'acat/34196' chrome/locale/en-US/torbutton.properties | 1 + 1 file changed, 1 insertion(+)

1 0

[torbutton/master] Bug 34196: add page info string for Onion Name
by sysrqb＠torproject.org 18 May '20

18 May '20

commit 62a78acdf5517c3cc5a08d9f419a5d3d3131cb44 Author: Alex Catarineu <acat(a)torproject.org> Date: Fri May 15 10:29:07 2020 +0200 Bug 34196: add page info string for Onion Name --- chrome/locale/en-US/torbutton.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/chrome/locale/en-US/torbutton.properties b/chrome/locale/en-US/torbutton.properties index 507fa8d9..7b6c2d65 100644 --- a/chrome/locale/en-US/torbutton.properties +++ b/chrome/locale/en-US/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=Downloading %S update # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S) pageInfo_OnionEncryption=Connection Encrypted (Onion Service) +pageInfo_OnionName=Onion Name: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Learn more

1 0

[tor-browser-build/master] Bug 34247: Update and fix errors in README
by gk＠torproject.org 18 May '20

18 May '20

commit 2c48c7178644bc4ba219791ed56e4078ed9e9d18 Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 18 07:22:16 2020 +0000 Bug 34247: Update and fix errors in README --- README | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/README b/README index 8e97e2f..a95f466 100644 --- a/README +++ b/README @@ -5,9 +5,7 @@ Installing build dependencies ----------------------------- To build Tor Browser, you need a Linux distribution that has support -for runc (such as Debian jessie, Ubuntu 16.04, Fedora 20, etc ...). -On Debian jessie, the runc package is available in backports. On Debian -stretch, the runc package is available in the main repository. +for runc (such as Debian Buster, Ubuntu 16.04, Fedora 30, etc ...). Your user account should have sudo access, which is required to be able to extract container file systems, start containers and copy files to and @@ -71,6 +69,7 @@ name to the makefile target: $ make nightly-linux-x86_64 $ make nightly-linux-i686 $ make nightly-windows-i686 + $ make nightly-windows-x86_64 $ make nightly-osx-x86_64 $ make nightly-android-armv7 $ make nightly-android-aarch64 @@ -81,13 +80,15 @@ When you want to quickly do a build to test a change, you can use the testbuild makefile target, and find the build in the testbuild directory. The build will be the same as regular alpha builds, except that in order to make the build faster, only the en-US locale will be built, and no -mar file will be created. +mar file will be created. If you want to base your testbuild on the latest +nightly code insted, rename rbm.local.conf.example to rbm.local.conf +and adapt the torbrowser-testbuild option accordingly. Updating git sources -------------------- -You can run "make fetch" to fetch the latest sources from git for all +You can run `make fetch` to fetch the latest sources from git for all components included in Tor Browser. You should run this if you want to make a nightly build with the latest commits, and you disabled automatic fetching of new commits for nightly builds in rbm.local.conf. @@ -122,14 +123,14 @@ option. You can look at the Makefile to find the rbm command for what you want to build, and add the --output-dir option. For example, if you want to build Tor Browser nightly for linux-x86_64: - ./rbm/rbm build release --output-dir=/var/builds/nightly/2017-01-23 \ + ./rbm/rbm build release --output-dir=/var/builds/nightly/2020-05-23 \ --target nightly --target torbrowser-linux-x86_64 The files will be put in the directory selected by --output-dir in a subdirectory named as the version number (or current date for nightly). To remove this version subdirectory, add the noversiondir target: - ./rbm/rbm build release --output-dir=/var/builds/nightly/2017-01-23 \ + ./rbm/rbm build release --output-dir=/var/builds/nightly/2020-05-23 \ --target nightly --target torbrowser-linux-x86_64 \ --target noversiondir @@ -166,14 +167,14 @@ in the rbm.local.conf file. Cleaning obsolete files and containers images --------------------------------------------- -You can run 'make clean' to clean old build files and containers that +You can run `make clean` to clean old build files and containers that are no longer used in current builds. Before doing that, you need to configure the branches and build targets you are using in the rbm.local.conf file. The cleaning script will check out all the configured branches to create a list of used build files, and delete the files from the 'out' directory that are not used. If you want to see the list of files and containers that would be removed without doing it, you can -use 'make clean-dry-run'. +use `make clean-dry-run`. Building without containers (Android builds only) @@ -181,12 +182,10 @@ Building without containers (Android builds only) By default the build is done inside containers. Adding the no_containers target will disable the use of containers. The following commands can -be used to build the alpha version for android-armv7 and android-x86: +be used to build the alpha version for e.g. android-armv7: ./rbm/rbm build release --target no_containers --target testbuild \ --target torbrowser-android-armv7 - ./rbm/rbm build release --target no_containers --target testbuild \ - --target torbrowser-android-x86 Note: the logs will still show the use and creation of a container image called "containers_disabled". This is due to the way we disable the use @@ -198,7 +197,7 @@ builds, and will require that you run Debian Stretch and install build dependencies for all the components that are built. This can be done with the following command: - # apt-get install build-essential python automake libtool zip unzip + # apt-get install build-essential python automake libtool zip unzip \ autoconf2.13 openjdk-8-jdk gettext-base autotools-dev \ automake autoconf libtool autopoint libssl-dev \ pkg-config zlib1g-dev libparallel-forkmanager-perl \ @@ -218,9 +217,10 @@ Hacking on the Tor Browser build The file README.HACKING tries to list the main things to know when making changes to the Tor Browser build. + Description of makefile rules ----------------------------- -You can find a description of the makefile rules in the README.MAKEFILE +You can find a description of the Makefile rules in the README.MAKEFILE file.

1 0

[tor-browser-build/master] Bug 33113: Bump NSIS version to 3.05
by sysrqb＠torproject.org 15 May '20

15 May '20

commit c6ef475b9388e935d77722a4d5fec860b372a6a5 Author: Georg Koppen <gk(a)torproject.org> Date: Sat May 2 09:36:54 2020 +0000 Bug 33113: Bump NSIS version to 3.05 --- projects/nsis/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/nsis/config b/projects/nsis/config index 0e6f7ad..ed9823d 100644 --- a/projects/nsis/config +++ b/projects/nsis/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 3.04 +version: 3.05 filename: 'nsis-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: container: @@ -16,7 +16,7 @@ input_files: - project: container-image - filename: 'nsis-[% c("version") %].tar.bz2' URL: 'https://downloads.sourceforge.net/nsis/nsis-[% c("version") %]-src.tar.bz2' - sha256sum: 609536046c50f35cfd909dd7df2ab38f2e835d0da3c1048aa0d48c59c5a4f4f5 + sha256sum: b6e1b309ab907086c6797618ab2879cb95387ec144dab36656b0b5fb77e97ce9 - filename: no-insert-timestamp.patch - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]'

1 0

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

15 May '20

commit a4bf4b8a4fee918852c098edde7c89f784720d5b Merge: 8547db1 c6ef475 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 15 23:27:50 2020 +0000 Merge remote-tracking branch 'gktpo/bug_33113_v2' projects/nsis/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor-browser/tor-browser-68.8.0esr-9.5-1] (ESR68) Bug 1511941 - Don't expose PerformanceNavigationTiming in RFP mode
by sysrqb＠torproject.org 15 May '20

15 May '20

commit 6d7f6ea31a7629d3df6fd09fc579b5a60e599c35 Author: sanketh <sgmenda(a)uwaterloo.ca> Date: Sun May 10 16:50:41 2020 +0000 (ESR68) Bug 1511941 - Don't expose PerformanceNavigationTiming in RFP mode In RFP mode, we do not support PerformanceNavigationTiming, so don't expose it. In particular, window.PerformanceNavigationTiming should return undefined. Added a new method PerformanceNavigationTiming::Enabled which when used with the WebIDL Func attribute allows us to toggle whether window.PerformanceNavigationTiming is exposed. Created dom/tests/mochitest/general/test_toggling_performance_navigation_timing.html to test whether the toggling works. Updated browser/components/resistfingerprinting/test/browser/browser_performanceAPI.js to create a new window each time privacy.resistFingerprinting is flipped so this behavior does not leak into other tests. --- .../test/browser/browser_performanceAPI.js | 62 ++++++++-------------- dom/performance/PerformanceMainThread.cpp | 3 +- dom/performance/PerformanceNavigationTiming.cpp | 6 +++ dom/performance/PerformanceNavigationTiming.h | 6 +++ dom/tests/mochitest/general/mochitest.ini | 1 + ...est_toggling_performance_navigation_timing.html | 47 ++++++++++++++++ dom/webidl/PerformanceNavigationTiming.webidl | 2 + 7 files changed, 85 insertions(+), 42 deletions(-) diff --git a/browser/components/resistfingerprinting/test/browser/browser_performanceAPI.js b/browser/components/resistfingerprinting/test/browser/browser_performanceAPI.js index b4c6b4f9d461..eb51a98e7364 100644 --- a/browser/components/resistfingerprinting/test/browser/browser_performanceAPI.js +++ b/browser/components/resistfingerprinting/test/browser/browser_performanceAPI.js @@ -78,7 +78,6 @@ let isRounded = (x, expectedPrecision) => { }; let setupTest = async function( - tab, resistFingerprinting, reduceTimerPrecision, expectedPrecision, @@ -95,6 +94,13 @@ let setupTest = async function( ], ], }); + + let win = await BrowserTestUtils.openNewBrowserWindow(); + let tab = await BrowserTestUtils.openNewForegroundTab( + win.gBrowser, + TEST_PATH + "file_dummy.html" + ); + // No matter what we set the precision to, if we're in ResistFingerprinting mode // we use the larger of the precision pref and the constant 100ms if (resistFingerprinting) { @@ -110,15 +116,11 @@ let setupTest = async function( }, runTests ); + await BrowserTestUtils.closeWindow(win); }; // ================================================================================================ // ================================================================================================ add_task(async function runRPTests() { - let tab = await BrowserTestUtils.openNewForegroundTab( - gBrowser, - TEST_PATH + "file_dummy.html" - ); - let runTests = async function(data) { let timerlist = data.list; let expectedPrecision = data.precision; @@ -165,21 +167,14 @@ add_task(async function runRPTests() { ); }; - await setupTest(tab, true, true, 100, runTests); - await setupTest(tab, true, false, 13, runTests); - await setupTest(tab, true, false, 0.13, runTests); - - BrowserTestUtils.removeTab(tab); + await setupTest(true, true, 100, runTests); + await setupTest(true, false, 13, runTests); + await setupTest(true, false, 0.13, runTests); }); // ================================================================================================ // ================================================================================================ add_task(async function runRTPTests() { - let tab = await BrowserTestUtils.openNewForegroundTab( - gBrowser, - TEST_PATH + "file_dummy.html" - ); - let runTests = async function(data) { let timerlist = data.list; let expectedPrecision = data.precision; @@ -215,6 +210,7 @@ add_task(async function runRTPTests() { content.performance.getEntries().length, 4, "For reduceTimerPrecision, there should be 4 entries for performance.getEntries()" + // PerformanceNavigationTiming, PerformanceMark, PerformanceMark, PerformanceMeasure ); for (var i = 0; i < 4; i++) { let startTime = content.performance.getEntries()[i].startTime; @@ -253,11 +249,9 @@ add_task(async function runRTPTests() { content.performance.clearResourceTimings(); }; - await setupTest(tab, false, true, 100, runTests); - await setupTest(tab, false, true, 13, runTests); - await setupTest(tab, false, true, 0.13, runTests); - - BrowserTestUtils.removeTab(tab); + await setupTest(false, true, 100, runTests); + await setupTest(false, true, 13, runTests); + await setupTest(false, true, 0.13, runTests); }); // ================================================================================================ @@ -284,27 +278,13 @@ let runWorkerTest = async function(data) { }; add_task(async function runRPTestsForWorker() { - let tab = await BrowserTestUtils.openNewForegroundTab( - gBrowser, - TEST_PATH + "file_dummy.html" - ); - - await setupTest(tab, true, true, 100, runWorkerTest, "runRPTests"); - await setupTest(tab, true, false, 13, runWorkerTest, "runRPTests"); - await setupTest(tab, true, true, 0.13, runWorkerTest, "runRPTests"); - - BrowserTestUtils.removeTab(tab); + await setupTest(true, true, 100, runWorkerTest, "runRPTests"); + await setupTest(true, false, 13, runWorkerTest, "runRPTests"); + await setupTest(true, true, 0.13, runWorkerTest, "runRPTests"); }); add_task(async function runRTPTestsForWorker() { - let tab = await BrowserTestUtils.openNewForegroundTab( - gBrowser, - TEST_PATH + "file_dummy.html" - ); - - await setupTest(tab, false, true, 100, runWorkerTest, "runRTPTests"); - await setupTest(tab, false, true, 13, runWorkerTest, "runRTPTests"); - await setupTest(tab, false, true, 0.13, runWorkerTest, "runRTPTests"); - - BrowserTestUtils.removeTab(tab); + await setupTest(false, true, 100, runWorkerTest, "runRTPTests"); + await setupTest(false, true, 13, runWorkerTest, "runRTPTests"); + await setupTest(false, true, 0.13, runWorkerTest, "runRTPTests"); }); diff --git a/dom/performance/PerformanceMainThread.cpp b/dom/performance/PerformanceMainThread.cpp index 7c39b9350646..bfcbea4e1148 100644 --- a/dom/performance/PerformanceMainThread.cpp +++ b/dom/performance/PerformanceMainThread.cpp @@ -305,7 +305,8 @@ DOMHighResTimeStamp PerformanceMainThread::CreationTime() const { void PerformanceMainThread::CreateNavigationTimingEntry() { MOZ_ASSERT(!mDocEntry, "mDocEntry should be null."); - if (!StaticPrefs::dom_enable_performance_navigation_timing()) { + if (!StaticPrefs::dom_enable_performance_navigation_timing() || + StaticPrefs::privacy_resistFingerprinting()) { return; } diff --git a/dom/performance/PerformanceNavigationTiming.cpp b/dom/performance/PerformanceNavigationTiming.cpp index dbc6aa78c4d5..fb18b91aabe6 100644 --- a/dom/performance/PerformanceNavigationTiming.cpp +++ b/dom/performance/PerformanceNavigationTiming.cpp @@ -6,6 +6,7 @@ #include "mozilla/dom/PerformanceNavigationTiming.h" #include "mozilla/dom/PerformanceNavigationTimingBinding.h" +#include "mozilla/StaticPrefs.h" using namespace mozilla::dom; @@ -138,3 +139,8 @@ void PerformanceNavigationTiming::UpdatePropertiesFromHttpChannel( nsIHttpChannel* aHttpChannel, nsITimedChannel* aChannel) { mTimingData->SetPropertiesFromHttpChannel(aHttpChannel, aChannel); } + +bool PerformanceNavigationTiming::Enabled(JSContext* aCx, JSObject* aGlobal) { + return (StaticPrefs::dom_enable_performance_navigation_timing() && + !StaticPrefs::privacy_resistFingerprinting()); +} diff --git a/dom/performance/PerformanceNavigationTiming.h b/dom/performance/PerformanceNavigationTiming.h index 8ef79999a1bc..7bf76ee3d670 100644 --- a/dom/performance/PerformanceNavigationTiming.h +++ b/dom/performance/PerformanceNavigationTiming.h @@ -65,6 +65,12 @@ class PerformanceNavigationTiming final : public PerformanceResourceTiming { void UpdatePropertiesFromHttpChannel(nsIHttpChannel* aHttpChannel, nsITimedChannel* aChannel); + /* + * For use with the WebIDL Func attribute to determine whether + * window.PerformanceNavigationTiming is exposed. + */ + static bool Enabled(JSContext* aCx, JSObject* aGlobal); + private: ~PerformanceNavigationTiming() {} }; diff --git a/dom/tests/mochitest/general/mochitest.ini b/dom/tests/mochitest/general/mochitest.ini index cb233881397d..36f955500c09 100644 --- a/dom/tests/mochitest/general/mochitest.ini +++ b/dom/tests/mochitest/general/mochitest.ini @@ -141,6 +141,7 @@ skip-if = toolkit == 'android' # bug 1230232 - Mouse doesn't select in the same [test_storagePermissionsReject.html] [test_storagePermissionsRejectForeign.html] [test_stylesheetPI.html] +[test_toggling_performance_navigation_timing.html] [test_vibrator.html] [test_WebKitCSSMatrix.html] [test_windowedhistoryframes.html] diff --git a/dom/tests/mochitest/general/test_toggling_performance_navigation_timing.html b/dom/tests/mochitest/general/test_toggling_performance_navigation_timing.html new file mode 100644 index 000000000000..88f7154286cd --- /dev/null +++ b/dom/tests/mochitest/general/test_toggling_performance_navigation_timing.html @@ -0,0 +1,47 @@ +<!DOCTYPE HTML> +<html> +<head> + <meta charset="utf-8"> + <title>Test for Bug 1511941 - Don't expose PerformanceNavigationTiming when it is disabled</title> + <script src="/tests/SimpleTest/SimpleTest.js"></script> + <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> +</head> +<body> + <div id="content"> </div> + <script type="application/javascript"> + async function testWhetherExposed(resistFingerprinting, enable_performance_navigation_timing) { + await SpecialPowers.pushPrefEnv({ + "set": [["privacy.resistFingerprinting", resistFingerprinting], + ["dom.enable_performance_navigation_timing", enable_performance_navigation_timing]], + }); + var iframe = document.createElement("iframe"); + document.body.append(iframe); + var p = iframe.contentWindow.PerformanceNavigationTiming; + if (resistFingerprinting) + is(p, undefined, "window.PerformanceNavigationTiming should not be exposed when" + + " dom.enable_performance_navigation_timing=" + enable_performance_navigation_timing + + " and privacy.resistFingerprinting="+ resistFingerprinting +"."); + if (!enable_performance_navigation_timing) + is(p, undefined, "window.PerformanceNavigationTiming should not be exposed when" + + " dom.enable_performance_navigation_timing=" + enable_performance_navigation_timing + + " and privacy.resistFingerprinting="+ resistFingerprinting +"."); + if (enable_performance_navigation_timing && !resistFingerprinting) { + isnot(p, undefined, "window.PerformanceNavigationTiming should be exposed when" + + " dom.enable_performance_navigation_timing=" + enable_performance_navigation_timing + + " and privacy.resistFingerprinting="+ resistFingerprinting +"."); + } + } + + async function start() { + await testWhetherExposed(true,true); + await testWhetherExposed(true,false); + await testWhetherExposed(false,true); + await testWhetherExposed(false,false); + SimpleTest.finish(); + } + + SimpleTest.waitForExplicitFinish(); + start(); + </script> +</body> +</html> diff --git a/dom/webidl/PerformanceNavigationTiming.webidl b/dom/webidl/PerformanceNavigationTiming.webidl index b26e1c18f688..cf029972304f 100644 --- a/dom/webidl/PerformanceNavigationTiming.webidl +++ b/dom/webidl/PerformanceNavigationTiming.webidl @@ -17,6 +17,8 @@ enum NavigationType { "prerender" }; +[Exposed=Window, + Func="mozilla::dom::PerformanceNavigationTiming::Enabled"] interface PerformanceNavigationTiming : PerformanceResourceTiming { readonly attribute DOMHighResTimeStamp unloadEventStart; readonly attribute DOMHighResTimeStamp unloadEventEnd;

1 0

[tor-browser/tor-browser-68.8.0esr-9.5-1] Bug 34196: Update site info URL with the onion name
by sysrqb＠torproject.org 14 May '20

14 May '20

commit 00f5a4c995a911423e10af5a2bbeceef1ae76be6 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed May 13 11:13:24 2020 +0200 Bug 34196: Update site info URL with the onion name --- browser/base/content/browser-siteIdentity.js | 12 +++++++----- browser/base/content/browser.js | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/browser/base/content/browser-siteIdentity.js b/browser/base/content/browser-siteIdentity.js index 32e939787fb7..d1cbf8708dfc 100644 --- a/browser/base/content/browser-siteIdentity.js +++ b/browser/base/content/browser-siteIdentity.js @@ -464,13 +464,13 @@ var gIdentityHandler = { * nsIURI for which the identity UI should be displayed, already * processed by nsIURIFixup.createExposableURI. */ - updateIdentity(state, uri) { + updateIdentity(state, uri, onionAliasURI) { let shouldHidePopup = this._uri && this._uri.spec != uri.spec; this._state = state; // Firstly, populate the state properties required to display the UI. See // the documentation of the individual properties for details. - this.setURI(uri); + this.setURI(uri, onionAliasURI); this._secInfo = gBrowser.securityUI.secInfo; // Then, update the user interface with the available data. @@ -549,17 +549,18 @@ var gIdentityHandler = { * Attempt to provide proper IDN treatment for host names */ getEffectiveHost() { + let uri = this._onionAliasURI || this._uri; if (!this._IDNService) { this._IDNService = Cc["@mozilla.org/network/idn-service;1"].getService( Ci.nsIIDNService ); } try { - return this._IDNService.convertToDisplayIDN(this._uri.host, {}); + return this._IDNService.convertToDisplayIDN(uri.host, {}); } catch (e) { // If something goes wrong (e.g. host is an IP address) just fail back // to the full domain. - return this._uri.host; + return uri.host; } }, @@ -984,8 +985,9 @@ var gIdentityHandler = { ContentBlocking.toggleReportBreakageButton(); }, - setURI(uri) { + setURI(uri, onionAliasURI) { this._uri = uri; + this._onionAliasURI = onionAliasURI; try { // Account for file: urls and catch when "" is the value diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 67a1977fef6a..251b11dda03f 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -6083,6 +6083,7 @@ var XULBrowserWindow = { // Don't need to do anything if the data we use to update the UI hasn't // changed let uri = gBrowser.currentURI; + let onionAliasURI = gBrowser.selectedBrowser.currentOnionAliasURI; let spec = uri.spec; if (this._state == aState && this._lastLocation == spec) { // Switching to a tab of the same URL doesn't change most security @@ -6100,7 +6101,7 @@ var XULBrowserWindow = { try { uri = Services.uriFixup.createExposableURI(uri); } catch (e) {} - gIdentityHandler.updateIdentity(this._state, uri); + gIdentityHandler.updateIdentity(this._state, uri, onionAliasURI); }, // simulate all change notifications after switching tabs

1 0

[tor-browser/tor-browser-68.8.0esr-9.5-1] Merge remote-tracking branch 'acatgh/34196+1' into tor-browser-68.8.0esr-9.5-1
by sysrqb＠torproject.org 14 May '20

14 May '20

commit 2e16915ff1a6933090dfb47e6fc876ea056cf07c Merge: 4acec7610371 00f5a4c995a9 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu May 14 22:55:43 2020 +0000 Merge remote-tracking branch 'acatgh/34196+1' into tor-browser-68.8.0esr-9.5-1 browser/base/content/browser-siteIdentity.js | 12 +++++++----- browser/base/content/browser.js | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-)

1 0

Requesting feature for tor browser
by Keifer Bly 14 May '20

14 May '20

Hello, Is this the correct list to request features for tor browser? It would cool if there was an option to update tor browser automatically on start. Thanks very much. --Keifer

2 2

[tor-browser-build/master] Bug 34043: Update snowflake to persist sessions across proxies
by gk＠torproject.org 13 May '20

13 May '20

commit 8547db1c629adf1bbdabcb44e2245944920472e6 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Feb 10 16:06:08 2020 -0700 Bug 34043: Update snowflake to persist sessions across proxies This brings in changes related to #33745 Merge a turbotunnel branch #33897 Remove buffering from WebRTCPeer #34042 Reduce DataChannelTimeout The new dependencies kcp-go and smux form the new inner session layer. There's a patch to kcp-go to remove dependencies required for features we don't use. --- projects/goxnet/config | 2 + projects/kcp-go/config | 24 + projects/kcp-go/remove-crypt-fec.patch | 1019 ++++++++++++++++++++++++++++++++ projects/smux/config | 16 + projects/snowflake/build | 3 + projects/snowflake/config | 6 +- 6 files changed, 1069 insertions(+), 1 deletion(-) diff --git a/projects/goxnet/config b/projects/goxnet/config index 5394875..7656795 100644 --- a/projects/goxnet/config +++ b/projects/goxnet/config @@ -11,6 +11,8 @@ var: use_container: 1 go_lib: golang.org/x/net go_lib_install: + - golang.org/x/net/ipv4 + - golang.org/x/net/ipv6 - golang.org/x/net/proxy - golang.org/x/net/dns/dnsmessage go_lib_deps: diff --git a/projects/kcp-go/config b/projects/kcp-go/config new file mode 100644 index 0000000..7551a5e --- /dev/null +++ b/projects/kcp-go/config @@ -0,0 +1,24 @@ +version: '[% c("abbrev") %]' +git_url: https://github.com/xtaci/kcp-go +git_hash: 831b5b267373f6fbd3548849a3925c4e70806de2 # v5.5.11 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/xtaci/kcp-go + go_lib_deps: + - goerrors + - goxnet + +input_files: + - project: container-image + - name: go + project: go + - name: goerrors + project: goerrors + - name: goxnet + project: goxnet + - filename: remove-crypt-fec.patch diff --git a/projects/kcp-go/remove-crypt-fec.patch b/projects/kcp-go/remove-crypt-fec.patch new file mode 100644 index 0000000..5693ac5 --- /dev/null +++ b/projects/kcp-go/remove-crypt-fec.patch @@ -0,0 +1,1019 @@ +From 0b9d0759f979a5d828b747ea51771f307c53d221 Mon Sep 17 00:00:00 2001 +From: David Fifield <david(a)bamsoftware.com> +Date: Thu, 9 Apr 2020 11:27:44 -0600 +Subject: [PATCH] Remove crypt and FEC dependencies. + +--- + crypt.go | 618 ----------------------------------------------------- + fec.go | 337 ----------------------------- + removed.go | 29 +++ + 3 files changed, 29 insertions(+), 955 deletions(-) + delete mode 100644 crypt.go + delete mode 100644 fec.go + create mode 100644 removed.go + +diff --git a/crypt.go b/crypt.go +deleted file mode 100644 +index d882852..0000000 +--- a/crypt.go ++++ /dev/null +@@ -1,618 +0,0 @@ +-package kcp +- +-import ( +- "crypto/aes" +- "crypto/cipher" +- "crypto/des" +- "crypto/sha1" +- "unsafe" +- +- xor "github.com/templexxx/xorsimd" +- "github.com/tjfoc/gmsm/sm4" +- +- "golang.org/x/crypto/blowfish" +- "golang.org/x/crypto/cast5" +- "golang.org/x/crypto/pbkdf2" +- "golang.org/x/crypto/salsa20" +- "golang.org/x/crypto/tea" +- "golang.org/x/crypto/twofish" +- "golang.org/x/crypto/xtea" +-) +- +-var ( +- initialVector = []byte{167, 115, 79, 156, 18, 172, 27, 1, 164, 21, 242, 193, 252, 120, 230, 107} +- saltxor = `sH3CIVoF#rWLtJo6` +-) +- +-// BlockCrypt defines encryption/decryption methods for a given byte slice. +-// Notes on implementing: the data to be encrypted contains a builtin +-// nonce at the first 16 bytes +-type BlockCrypt interface { +- // Encrypt encrypts the whole block in src into dst. +- // Dst and src may point at the same memory. +- Encrypt(dst, src []byte) +- +- // Decrypt decrypts the whole block in src into dst. +- // Dst and src may point at the same memory. +- Decrypt(dst, src []byte) +-} +- +-type salsa20BlockCrypt struct { +- key [32]byte +-} +- +-// NewSalsa20BlockCrypt https://en.wikipedia.org/wiki/Salsa20 +-func NewSalsa20BlockCrypt(key []byte) (BlockCrypt, error) { +- c := new(salsa20BlockCrypt) +- copy(c.key[:], key) +- return c, nil +-} +- +-func (c *salsa20BlockCrypt) Encrypt(dst, src []byte) { +- salsa20.XORKeyStream(dst[8:], src[8:], src[:8], &c.key) +- copy(dst[:8], src[:8]) +-} +-func (c *salsa20BlockCrypt) Decrypt(dst, src []byte) { +- salsa20.XORKeyStream(dst[8:], src[8:], src[:8], &c.key) +- copy(dst[:8], src[:8]) +-} +- +-type sm4BlockCrypt struct { +- encbuf [sm4.BlockSize]byte // 64bit alignment enc/dec buffer +- decbuf [2 * sm4.BlockSize]byte +- block cipher.Block +-} +- +-// NewSM4BlockCrypt https://github.com/tjfoc/gmsm/tree/master/sm4 +-func NewSM4BlockCrypt(key []byte) (BlockCrypt, error) { +- c := new(sm4BlockCrypt) +- block, err := sm4.NewCipher(key) +- if err != nil { +- return nil, err +- } +- c.block = block +- return c, nil +-} +- +-func (c *sm4BlockCrypt) Encrypt(dst, src []byte) { encrypt(c.block, dst, src, c.encbuf[:]) } +-func (c *sm4BlockCrypt) Decrypt(dst, src []byte) { decrypt(c.block, dst, src, c.decbuf[:]) } +- +-type twofishBlockCrypt struct { +- encbuf [twofish.BlockSize]byte +- decbuf [2 * twofish.BlockSize]byte +- block cipher.Block +-} +- +-// NewTwofishBlockCrypt https://en.wikipedia.org/wiki/Twofish +-func NewTwofishBlockCrypt(key []byte) (BlockCrypt, error) { +- c := new(twofishBlockCrypt) +- block, err := twofish.NewCipher(key) +- if err != nil { +- return nil, err +- } +- c.block = block +- return c, nil +-} +- +-func (c *twofishBlockCrypt) Encrypt(dst, src []byte) { encrypt(c.block, dst, src, c.encbuf[:]) } +-func (c *twofishBlockCrypt) Decrypt(dst, src []byte) { decrypt(c.block, dst, src, c.decbuf[:]) } +- +-type tripleDESBlockCrypt struct { +- encbuf [des.BlockSize]byte +- decbuf [2 * des.BlockSize]byte +- block cipher.Block +-} +- +-// NewTripleDESBlockCrypt https://en.wikipedia.org/wiki/Triple_DES +-func NewTripleDESBlockCrypt(key []byte) (BlockCrypt, error) { +- c := new(tripleDESBlockCrypt) +- block, err := des.NewTripleDESCipher(key) +- if err != nil { +- return nil, err +- } +- c.block = block +- return c, nil +-} +- +-func (c *tripleDESBlockCrypt) Encrypt(dst, src []byte) { encrypt(c.block, dst, src, c.encbuf[:]) } +-func (c *tripleDESBlockCrypt) Decrypt(dst, src []byte) { decrypt(c.block, dst, src, c.decbuf[:]) } +- +-type cast5BlockCrypt struct { +- encbuf [cast5.BlockSize]byte +- decbuf [2 * cast5.BlockSize]byte +- block cipher.Block +-} +- +-// NewCast5BlockCrypt https://en.wikipedia.org/wiki/CAST-128 +-func NewCast5BlockCrypt(key []byte) (BlockCrypt, error) { +- c := new(cast5BlockCrypt) +- block, err := cast5.NewCipher(key) +- if err != nil { +- return nil, err +- } +- c.block = block +- return c, nil +-} +- +-func (c *cast5BlockCrypt) Encrypt(dst, src []byte) { encrypt(c.block, dst, src, c.encbuf[:]) } +-func (c *cast5BlockCrypt) Decrypt(dst, src []byte) { decrypt(c.block, dst, src, c.decbuf[:]) } +- +-type blowfishBlockCrypt struct { +- encbuf [blowfish.BlockSize]byte +- decbuf [2 * blowfish.BlockSize]byte +- block cipher.Block +-} +- +-// NewBlowfishBlockCrypt https://en.wikipedia.org/wiki/Blowfish_(cipher) +-func NewBlowfishBlockCrypt(key []byte) (BlockCrypt, error) { +- c := new(blowfishBlockCrypt) +- block, err := blowfish.NewCipher(key) +- if err != nil { +- return nil, err +- } +- c.block = block +- return c, nil +-} +- +-func (c *blowfishBlockCrypt) Encrypt(dst, src []byte) { encrypt(c.block, dst, src, c.encbuf[:]) } +-func (c *blowfishBlockCrypt) Decrypt(dst, src []byte) { decrypt(c.block, dst, src, c.decbuf[:]) } +- +-type aesBlockCrypt struct { +- encbuf [aes.BlockSize]byte +- decbuf [2 * aes.BlockSize]byte +- block cipher.Block +-} +- +-// NewAESBlockCrypt https://en.wikipedia.org/wiki/Advanced_Encryption_Standard +-func NewAESBlockCrypt(key []byte) (BlockCrypt, error) { +- c := new(aesBlockCrypt) +- block, err := aes.NewCipher(key) +- if err != nil { +- return nil, err +- } +- c.block = block +- return c, nil +-} +- +-func (c *aesBlockCrypt) Encrypt(dst, src []byte) { encrypt(c.block, dst, src, c.encbuf[:]) } +-func (c *aesBlockCrypt) Decrypt(dst, src []byte) { decrypt(c.block, dst, src, c.decbuf[:]) } +- +-type teaBlockCrypt struct { +- encbuf [tea.BlockSize]byte +- decbuf [2 * tea.BlockSize]byte +- block cipher.Block +-} +- +-// NewTEABlockCrypt https://en.wikipedia.org/wiki/Tiny_Encryption_Algorithm +-func NewTEABlockCrypt(key []byte) (BlockCrypt, error) { +- c := new(teaBlockCrypt) +- block, err := tea.NewCipherWithRounds(key, 16) +- if err != nil { +- return nil, err +- } +- c.block = block +- return c, nil +-} +- +-func (c *teaBlockCrypt) Encrypt(dst, src []byte) { encrypt(c.block, dst, src, c.encbuf[:]) } +-func (c *teaBlockCrypt) Decrypt(dst, src []byte) { decrypt(c.block, dst, src, c.decbuf[:]) } +- +-type xteaBlockCrypt struct { +- encbuf [xtea.BlockSize]byte +- decbuf [2 * xtea.BlockSize]byte +- block cipher.Block +-} +- +-// NewXTEABlockCrypt https://en.wikipedia.org/wiki/XTEA +-func NewXTEABlockCrypt(key []byte) (BlockCrypt, error) { +- c := new(xteaBlockCrypt) +- block, err := xtea.NewCipher(key) +- if err != nil { +- return nil, err +- } +- c.block = block +- return c, nil +-} +- +-func (c *xteaBlockCrypt) Encrypt(dst, src []byte) { encrypt(c.block, dst, src, c.encbuf[:]) } +-func (c *xteaBlockCrypt) Decrypt(dst, src []byte) { decrypt(c.block, dst, src, c.decbuf[:]) } +- +-type simpleXORBlockCrypt struct { +- xortbl []byte +-} +- +-// NewSimpleXORBlockCrypt simple xor with key expanding +-func NewSimpleXORBlockCrypt(key []byte) (BlockCrypt, error) { +- c := new(simpleXORBlockCrypt) +- c.xortbl = pbkdf2.Key(key, []byte(saltxor), 32, mtuLimit, sha1.New) +- return c, nil +-} +- +-func (c *simpleXORBlockCrypt) Encrypt(dst, src []byte) { xor.Bytes(dst, src, c.xortbl) } +-func (c *simpleXORBlockCrypt) Decrypt(dst, src []byte) { xor.Bytes(dst, src, c.xortbl) } +- +-type noneBlockCrypt struct{} +- +-// NewNoneBlockCrypt does nothing but copying +-func NewNoneBlockCrypt(key []byte) (BlockCrypt, error) { +- return new(noneBlockCrypt), nil +-} +- +-func (c *noneBlockCrypt) Encrypt(dst, src []byte) { copy(dst, src) } +-func (c *noneBlockCrypt) Decrypt(dst, src []byte) { copy(dst, src) } +- +-// packet encryption with local CFB mode +-func encrypt(block cipher.Block, dst, src, buf []byte) { +- switch block.BlockSize() { +- case 8: +- encrypt8(block, dst, src, buf) +- case 16: +- encrypt16(block, dst, src, buf) +- default: +- panic("unsupported cipher block size") +- } +-} +- +-// optimized encryption for the ciphers which works in 8-bytes +-func encrypt8(block cipher.Block, dst, src, buf []byte) { +- tbl := buf[:8] +- block.Encrypt(tbl, initialVector) +- n := len(src) / 8 +- base := 0 +- repeat := n / 8 +- left := n % 8 +- ptr_tbl := (*uint64)(unsafe.Pointer(&tbl[0])) +- +- for i := 0; i < repeat; i++ { +- s := src[base:][0:64] +- d := dst[base:][0:64] +- // 1 +- *(*uint64)(unsafe.Pointer(&d[0])) = *(*uint64)(unsafe.Pointer(&s[0])) ^ *ptr_tbl +- block.Encrypt(tbl, d[0:8]) +- // 2 +- *(*uint64)(unsafe.Pointer(&d[8])) = *(*uint64)(unsafe.Pointer(&s[8])) ^ *ptr_tbl +- block.Encrypt(tbl, d[8:16]) +- // 3 +- *(*uint64)(unsafe.Pointer(&d[16])) = *(*uint64)(unsafe.Pointer(&s[16])) ^ *ptr_tbl +- block.Encrypt(tbl, d[16:24]) +- // 4 +- *(*uint64)(unsafe.Pointer(&d[24])) = *(*uint64)(unsafe.Pointer(&s[24])) ^ *ptr_tbl +- block.Encrypt(tbl, d[24:32]) +- // 5 +- *(*uint64)(unsafe.Pointer(&d[32])) = *(*uint64)(unsafe.Pointer(&s[32])) ^ *ptr_tbl +- block.Encrypt(tbl, d[32:40]) +- // 6 +- *(*uint64)(unsafe.Pointer(&d[40])) = *(*uint64)(unsafe.Pointer(&s[40])) ^ *ptr_tbl +- block.Encrypt(tbl, d[40:48]) +- // 7 +- *(*uint64)(unsafe.Pointer(&d[48])) = *(*uint64)(unsafe.Pointer(&s[48])) ^ *ptr_tbl +- block.Encrypt(tbl, d[48:56]) +- // 8 +- *(*uint64)(unsafe.Pointer(&d[56])) = *(*uint64)(unsafe.Pointer(&s[56])) ^ *ptr_tbl +- block.Encrypt(tbl, d[56:64]) +- base += 64 +- } +- +- switch left { +- case 7: +- *(*uint64)(unsafe.Pointer(&dst[base])) = *(*uint64)(unsafe.Pointer(&src[base])) ^ *ptr_tbl +- block.Encrypt(tbl, dst[base:]) +- base += 8 +- fallthrough +- case 6: +- *(*uint64)(unsafe.Pointer(&dst[base])) = *(*uint64)(unsafe.Pointer(&src[base])) ^ *ptr_tbl +- block.Encrypt(tbl, dst[base:]) +- base += 8 +- fallthrough +- case 5: +- *(*uint64)(unsafe.Pointer(&dst[base])) = *(*uint64)(unsafe.Pointer(&src[base])) ^ *ptr_tbl +- block.Encrypt(tbl, dst[base:]) +- base += 8 +- fallthrough +- case 4: +- *(*uint64)(unsafe.Pointer(&dst[base])) = *(*uint64)(unsafe.Pointer(&src[base])) ^ *ptr_tbl +- block.Encrypt(tbl, dst[base:]) +- base += 8 +- fallthrough +- case 3: +- *(*uint64)(unsafe.Pointer(&dst[base])) = *(*uint64)(unsafe.Pointer(&src[base])) ^ *ptr_tbl +- block.Encrypt(tbl, dst[base:]) +- base += 8 +- fallthrough +- case 2: +- *(*uint64)(unsafe.Pointer(&dst[base])) = *(*uint64)(unsafe.Pointer(&src[base])) ^ *ptr_tbl +- block.Encrypt(tbl, dst[base:]) +- base += 8 +- fallthrough +- case 1: +- *(*uint64)(unsafe.Pointer(&dst[base])) = *(*uint64)(unsafe.Pointer(&src[base])) ^ *ptr_tbl +- block.Encrypt(tbl, dst[base:]) +- base += 8 +- fallthrough +- case 0: +- xorBytes(dst[base:], src[base:], tbl) +- } +-} +- +-// optimized encryption for the ciphers which works in 16-bytes +-func encrypt16(block cipher.Block, dst, src, buf []byte) { +- tbl := buf[:16] +- block.Encrypt(tbl, initialVector) +- n := len(src) / 16 +- base := 0 +- repeat := n / 8 +- left := n % 8 +- for i := 0; i < repeat; i++ { +- s := src[base:][0:128] +- d := dst[base:][0:128] +- // 1 +- xor.Bytes16Align(d[0:16], s[0:16], tbl) +- block.Encrypt(tbl, d[0:16]) +- // 2 +- xor.Bytes16Align(d[16:32], s[16:32], tbl) +- block.Encrypt(tbl, d[16:32]) +- // 3 +- xor.Bytes16Align(d[32:48], s[32:48], tbl) +- block.Encrypt(tbl, d[32:48]) +- // 4 +- xor.Bytes16Align(d[48:64], s[48:64], tbl) +- block.Encrypt(tbl, d[48:64]) +- // 5 +- xor.Bytes16Align(d[64:80], s[64:80], tbl) +- block.Encrypt(tbl, d[64:80]) +- // 6 +- xor.Bytes16Align(d[80:96], s[80:96], tbl) +- block.Encrypt(tbl, d[80:96]) +- // 7 +- xor.Bytes16Align(d[96:112], s[96:112], tbl) +- block.Encrypt(tbl, d[96:112]) +- // 8 +- xor.Bytes16Align(d[112:128], s[112:128], tbl) +- block.Encrypt(tbl, d[112:128]) +- base += 128 +- } +- +- switch left { +- case 7: +- xor.Bytes16Align(dst[base:], src[base:], tbl) +- block.Encrypt(tbl, dst[base:]) +- base += 16 +- fallthrough +- case 6: +- xor.Bytes16Align(dst[base:], src[base:], tbl) +- block.Encrypt(tbl, dst[base:]) +- base += 16 +- fallthrough +- case 5: +- xor.Bytes16Align(dst[base:], src[base:], tbl) +- block.Encrypt(tbl, dst[base:]) +- base += 16 +- fallthrough +- case 4: +- xor.Bytes16Align(dst[base:], src[base:], tbl) +- block.Encrypt(tbl, dst[base:]) +- base += 16 +- fallthrough +- case 3: +- xor.Bytes16Align(dst[base:], src[base:], tbl) +- block.Encrypt(tbl, dst[base:]) +- base += 16 +- fallthrough +- case 2: +- xor.Bytes16Align(dst[base:], src[base:], tbl) +- block.Encrypt(tbl, dst[base:]) +- base += 16 +- fallthrough +- case 1: +- xor.Bytes16Align(dst[base:], src[base:], tbl) +- block.Encrypt(tbl, dst[base:]) +- base += 16 +- fallthrough +- case 0: +- xorBytes(dst[base:], src[base:], tbl) +- } +-} +- +-// decryption +-func decrypt(block cipher.Block, dst, src, buf []byte) { +- switch block.BlockSize() { +- case 8: +- decrypt8(block, dst, src, buf) +- case 16: +- decrypt16(block, dst, src, buf) +- default: +- panic("unsupported cipher block size") +- } +-} +- +-// decrypt 8 bytes block, all byte slices are supposed to be 64bit aligned +-func decrypt8(block cipher.Block, dst, src, buf []byte) { +- tbl := buf[0:8] +- next := buf[8:16] +- block.Encrypt(tbl, initialVector) +- n := len(src) / 8 +- base := 0 +- repeat := n / 8 +- left := n % 8 +- ptr_tbl := (*uint64)(unsafe.Pointer(&tbl[0])) +- ptr_next := (*uint64)(unsafe.Pointer(&next[0])) +- +- for i := 0; i < repeat; i++ { +- s := src[base:][0:64] +- d := dst[base:][0:64] +- // 1 +- block.Encrypt(next, s[0:8]) +- *(*uint64)(unsafe.Pointer(&d[0])) = *(*uint64)(unsafe.Pointer(&s[0])) ^ *ptr_tbl +- // 2 +- block.Encrypt(tbl, s[8:16]) +- *(*uint64)(unsafe.Pointer(&d[8])) = *(*uint64)(unsafe.Pointer(&s[8])) ^ *ptr_next +- // 3 +- block.Encrypt(next, s[16:24]) +- *(*uint64)(unsafe.Pointer(&d[16])) = *(*uint64)(unsafe.Pointer(&s[16])) ^ *ptr_tbl +- // 4 +- block.Encrypt(tbl, s[24:32]) +- *(*uint64)(unsafe.Pointer(&d[24])) = *(*uint64)(unsafe.Pointer(&s[24])) ^ *ptr_next +- // 5 +- block.Encrypt(next, s[32:40]) +- *(*uint64)(unsafe.Pointer(&d[32])) = *(*uint64)(unsafe.Pointer(&s[32])) ^ *ptr_tbl +- // 6 +- block.Encrypt(tbl, s[40:48]) +- *(*uint64)(unsafe.Pointer(&d[40])) = *(*uint64)(unsafe.Pointer(&s[40])) ^ *ptr_next +- // 7 +- block.Encrypt(next, s[48:56]) +- *(*uint64)(unsafe.Pointer(&d[48])) = *(*uint64)(unsafe.Pointer(&s[48])) ^ *ptr_tbl +- // 8 +- block.Encrypt(tbl, s[56:64]) +- *(*uint64)(unsafe.Pointer(&d[56])) = *(*uint64)(unsafe.Pointer(&s[56])) ^ *ptr_next +- base += 64 +- } +- +- switch left { +- case 7: +- block.Encrypt(next, src[base:]) +- *(*uint64)(unsafe.Pointer(&dst[base])) = *(*uint64)(unsafe.Pointer(&src[base])) ^ *(*uint64)(unsafe.Pointer(&tbl[0])) +- tbl, next = next, tbl +- base += 8 +- fallthrough +- case 6: +- block.Encrypt(next, src[base:]) +- *(*uint64)(unsafe.Pointer(&dst[base])) = *(*uint64)(unsafe.Pointer(&src[base])) ^ *(*uint64)(unsafe.Pointer(&tbl[0])) +- tbl, next = next, tbl +- base += 8 +- fallthrough +- case 5: +- block.Encrypt(next, src[base:]) +- *(*uint64)(unsafe.Pointer(&dst[base])) = *(*uint64)(unsafe.Pointer(&src[base])) ^ *(*uint64)(unsafe.Pointer(&tbl[0])) +- tbl, next = next, tbl +- base += 8 +- fallthrough +- case 4: +- block.Encrypt(next, src[base:]) +- *(*uint64)(unsafe.Pointer(&dst[base])) = *(*uint64)(unsafe.Pointer(&src[base])) ^ *(*uint64)(unsafe.Pointer(&tbl[0])) +- tbl, next = next, tbl +- base += 8 +- fallthrough +- case 3: +- block.Encrypt(next, src[base:]) +- *(*uint64)(unsafe.Pointer(&dst[base])) = *(*uint64)(unsafe.Pointer(&src[base])) ^ *(*uint64)(unsafe.Pointer(&tbl[0])) +- tbl, next = next, tbl +- base += 8 +- fallthrough +- case 2: +- block.Encrypt(next, src[base:]) +- *(*uint64)(unsafe.Pointer(&dst[base])) = *(*uint64)(unsafe.Pointer(&src[base])) ^ *(*uint64)(unsafe.Pointer(&tbl[0])) +- tbl, next = next, tbl +- base += 8 +- fallthrough +- case 1: +- block.Encrypt(next, src[base:]) +- *(*uint64)(unsafe.Pointer(&dst[base])) = *(*uint64)(unsafe.Pointer(&src[base])) ^ *(*uint64)(unsafe.Pointer(&tbl[0])) +- tbl, next = next, tbl +- base += 8 +- fallthrough +- case 0: +- xorBytes(dst[base:], src[base:], tbl) +- } +-} +- +-func decrypt16(block cipher.Block, dst, src, buf []byte) { +- tbl := buf[0:16] +- next := buf[16:32] +- block.Encrypt(tbl, initialVector) +- n := len(src) / 16 +- base := 0 +- repeat := n / 8 +- left := n % 8 +- for i := 0; i < repeat; i++ { +- s := src[base:][0:128] +- d := dst[base:][0:128] +- // 1 +- block.Encrypt(next, s[0:16]) +- xor.Bytes16Align(d[0:16], s[0:16], tbl) +- // 2 +- block.Encrypt(tbl, s[16:32]) +- xor.Bytes16Align(d[16:32], s[16:32], next) +- // 3 +- block.Encrypt(next, s[32:48]) +- xor.Bytes16Align(d[32:48], s[32:48], tbl) +- // 4 +- block.Encrypt(tbl, s[48:64]) +- xor.Bytes16Align(d[48:64], s[48:64], next) +- // 5 +- block.Encrypt(next, s[64:80]) +- xor.Bytes16Align(d[64:80], s[64:80], tbl) +- // 6 +- block.Encrypt(tbl, s[80:96]) +- xor.Bytes16Align(d[80:96], s[80:96], next) +- // 7 +- block.Encrypt(next, s[96:112]) +- xor.Bytes16Align(d[96:112], s[96:112], tbl) +- // 8 +- block.Encrypt(tbl, s[112:128]) +- xor.Bytes16Align(d[112:128], s[112:128], next) +- base += 128 +- } +- +- switch left { +- case 7: +- block.Encrypt(next, src[base:]) +- xor.Bytes16Align(dst[base:], src[base:], tbl) +- tbl, next = next, tbl +- base += 16 +- fallthrough +- case 6: +- block.Encrypt(next, src[base:]) +- xor.Bytes16Align(dst[base:], src[base:], tbl) +- tbl, next = next, tbl +- base += 16 +- fallthrough +- case 5: +- block.Encrypt(next, src[base:]) +- xor.Bytes16Align(dst[base:], src[base:], tbl) +- tbl, next = next, tbl +- base += 16 +- fallthrough +- case 4: +- block.Encrypt(next, src[base:]) +- xor.Bytes16Align(dst[base:], src[base:], tbl) +- tbl, next = next, tbl +- base += 16 +- fallthrough +- case 3: +- block.Encrypt(next, src[base:]) +- xor.Bytes16Align(dst[base:], src[base:], tbl) +- tbl, next = next, tbl +- base += 16 +- fallthrough +- case 2: +- block.Encrypt(next, src[base:]) +- xor.Bytes16Align(dst[base:], src[base:], tbl) +- tbl, next = next, tbl +- base += 16 +- fallthrough +- case 1: +- block.Encrypt(next, src[base:]) +- xor.Bytes16Align(dst[base:], src[base:], tbl) +- tbl, next = next, tbl +- base += 16 +- fallthrough +- case 0: +- xorBytes(dst[base:], src[base:], tbl) +- } +-} +- +-// per bytes xors +-func xorBytes(dst, a, b []byte) int { +- n := len(a) +- if len(b) < n { +- n = len(b) +- } +- if n == 0 { +- return 0 +- } +- +- for i := 0; i < n; i++ { +- dst[i] = a[i] ^ b[i] +- } +- return n +-} +diff --git a/fec.go b/fec.go +deleted file mode 100644 +index 97cd40b..0000000 +--- a/fec.go ++++ /dev/null +@@ -1,337 +0,0 @@ +-package kcp +- +-import ( +- "encoding/binary" +- "sync/atomic" +- +- "github.com/klauspost/reedsolomon" +-) +- +-const ( +- fecHeaderSize = 6 +- fecHeaderSizePlus2 = fecHeaderSize + 2 // plus 2B data size +- typeData = 0xf1 +- typeParity = 0xf2 +- fecExpire = 60000 +-) +- +-// fecPacket is a decoded FEC packet +-type fecPacket []byte +- +-func (bts fecPacket) seqid() uint32 { return binary.LittleEndian.Uint32(bts) } +-func (bts fecPacket) flag() uint16 { return binary.LittleEndian.Uint16(bts[4:]) } +-func (bts fecPacket) data() []byte { return bts[6:] } +- +-// fecElement has auxcilliary time field +-type fecElement struct { +- fecPacket +- ts uint32 +-} +- +-// fecDecoder for decoding incoming packets +-type fecDecoder struct { +- rxlimit int // queue size limit +- dataShards int +- parityShards int +- shardSize int +- rx []fecElement // ordered receive queue +- +- // caches +- decodeCache [][]byte +- flagCache []bool +- +- // zeros +- zeros []byte +- +- // RS decoder +- codec reedsolomon.Encoder +-} +- +-func newFECDecoder(rxlimit, dataShards, parityShards int) *fecDecoder { +- if dataShards <= 0 || parityShards <= 0 { +- return nil +- } +- if rxlimit < dataShards+parityShards { +- return nil +- } +- +- dec := new(fecDecoder) +- dec.rxlimit = rxlimit +- dec.dataShards = dataShards +- dec.parityShards = parityShards +- dec.shardSize = dataShards + parityShards +- codec, err := reedsolomon.New(dataShards, parityShards) +- if err != nil { +- return nil +- } +- dec.codec = codec +- dec.decodeCache = make([][]byte, dec.shardSize) +- dec.flagCache = make([]bool, dec.shardSize) +- dec.zeros = make([]byte, mtuLimit) +- return dec +-} +- +-// decode a fec packet +-func (dec *fecDecoder) decode(in fecPacket) (recovered [][]byte) { +- // insertion +- n := len(dec.rx) - 1 +- insertIdx := 0 +- for i := n; i >= 0; i-- { +- if in.seqid() == dec.rx[i].seqid() { // de-duplicate +- return nil +- } else if _itimediff(in.seqid(), dec.rx[i].seqid()) > 0 { // insertion +- insertIdx = i + 1 +- break +- } +- } +- +- // make a copy +- pkt := fecPacket(xmitBuf.Get().([]byte)[:len(in)]) +- copy(pkt, in) +- elem := fecElement{pkt, currentMs()} +- +- // insert into ordered rx queue +- if insertIdx == n+1 { +- dec.rx = append(dec.rx, elem) +- } else { +- dec.rx = append(dec.rx, fecElement{}) +- copy(dec.rx[insertIdx+1:], dec.rx[insertIdx:]) // shift right +- dec.rx[insertIdx] = elem +- } +- +- // shard range for current packet +- shardBegin := pkt.seqid() - pkt.seqid()%uint32(dec.shardSize) +- shardEnd := shardBegin + uint32(dec.shardSize) - 1 +- +- // max search range in ordered queue for current shard +- searchBegin := insertIdx - int(pkt.seqid()%uint32(dec.shardSize)) +- if searchBegin < 0 { +- searchBegin = 0 +- } +- searchEnd := searchBegin + dec.shardSize - 1 +- if searchEnd >= len(dec.rx) { +- searchEnd = len(dec.rx) - 1 +- } +- +- // re-construct datashards +- if searchEnd-searchBegin+1 >= dec.dataShards { +- var numshard, numDataShard, first, maxlen int +- +- // zero caches +- shards := dec.decodeCache +- shardsflag := dec.flagCache +- for k := range dec.decodeCache { +- shards[k] = nil +- shardsflag[k] = false +- } +- +- // shard assembly +- for i := searchBegin; i <= searchEnd; i++ { +- seqid := dec.rx[i].seqid() +- if _itimediff(seqid, shardEnd) > 0 { +- break +- } else if _itimediff(seqid, shardBegin) >= 0 { +- shards[seqid%uint32(dec.shardSize)] = dec.rx[i].data() +- shardsflag[seqid%uint32(dec.shardSize)] = true +- numshard++ +- if dec.rx[i].flag() == typeData { +- numDataShard++ +- } +- if numshard == 1 { +- first = i +- } +- if len(dec.rx[i].data()) > maxlen { +- maxlen = len(dec.rx[i].data()) +- } +- } +- } +- +- if numDataShard == dec.dataShards { +- // case 1: no loss on data shards +- dec.rx = dec.freeRange(first, numshard, dec.rx) +- } else if numshard >= dec.dataShards { +- // case 2: loss on data shards, but it's recoverable from parity shards +- for k := range shards { +- if shards[k] != nil { +- dlen := len(shards[k]) +- shards[k] = shards[k][:maxlen] +- copy(shards[k][dlen:], dec.zeros) +- } else if k < dec.dataShards { +- shards[k] = xmitBuf.Get().([]byte)[:0] +- } +- } +- if err := dec.codec.ReconstructData(shards); err == nil { +- for k := range shards[:dec.dataShards] { +- if !shardsflag[k] { +- // recovered data should be recycled +- recovered = append(recovered, shards[k]) +- } +- } +- } +- dec.rx = dec.freeRange(first, numshard, dec.rx) +- } +- } +- +- // keep rxlimit +- if len(dec.rx) > dec.rxlimit { +- if dec.rx[0].flag() == typeData { // track the unrecoverable data +- atomic.AddUint64(&DefaultSnmp.FECShortShards, 1) +- } +- dec.rx = dec.freeRange(0, 1, dec.rx) +- } +- +- // timeout policy +- current := currentMs() +- numExpired := 0 +- for k := range dec.rx { +- if _itimediff(current, dec.rx[k].ts) > fecExpire { +- numExpired++ +- continue +- } +- break +- } +- if numExpired > 0 { +- dec.rx = dec.freeRange(0, numExpired, dec.rx) +- } +- return +-} +- +-// free a range of fecPacket +-func (dec *fecDecoder) freeRange(first, n int, q []fecElement) []fecElement { +- for i := first; i < first+n; i++ { // recycle buffer +- xmitBuf.Put([]byte(q[i].fecPacket)) +- } +- +- if first == 0 && n < cap(q)/2 { +- return q[n:] +- } +- copy(q[first:], q[first+n:]) +- return q[:len(q)-n] +-} +- +-// release all segments back to xmitBuf +-func (dec *fecDecoder) release() { +- if n := len(dec.rx); n > 0 { +- dec.rx = dec.freeRange(0, n, dec.rx) +- } +-} +- +-type ( +- // fecEncoder for encoding outgoing packets +- fecEncoder struct { +- dataShards int +- parityShards int +- shardSize int +- paws uint32 // Protect Against Wrapped Sequence numbers +- next uint32 // next seqid +- +- shardCount int // count the number of datashards collected +- maxSize int // track maximum data length in datashard +- +- headerOffset int // FEC header offset +- payloadOffset int // FEC payload offset +- +- // caches +- shardCache [][]byte +- encodeCache [][]byte +- +- // zeros +- zeros []byte +- +- // RS encoder +- codec reedsolomon.Encoder +- } +-) +- +-func newFECEncoder(dataShards, parityShards, offset int) *fecEncoder { +- if dataShards <= 0 || parityShards <= 0 { +- return nil +- } +- enc := new(fecEncoder) +- enc.dataShards = dataShards +- enc.parityShards = parityShards +- enc.shardSize = dataShards + parityShards +- enc.paws = 0xffffffff / uint32(enc.shardSize) * uint32(enc.shardSize) +- enc.headerOffset = offset +- enc.payloadOffset = enc.headerOffset + fecHeaderSize +- +- codec, err := reedsolomon.New(dataShards, parityShards) +- if err != nil { +- return nil +- } +- enc.codec = codec +- +- // caches +- enc.encodeCache = make([][]byte, enc.shardSize) +- enc.shardCache = make([][]byte, enc.shardSize) +- for k := range enc.shardCache { +- enc.shardCache[k] = make([]byte, mtuLimit) +- } +- enc.zeros = make([]byte, mtuLimit) +- return enc +-} +- +-// encodes the packet, outputs parity shards if we have collected quorum datashards +-// notice: the contents of 'ps' will be re-written in successive calling +-func (enc *fecEncoder) encode(b []byte) (ps [][]byte) { +- // The header format: +- // | FEC SEQID(4B) | FEC TYPE(2B) | SIZE (2B) | PAYLOAD(SIZE-2) | +- // |<-headerOffset |<-payloadOffset +- enc.markData(b[enc.headerOffset:]) +- binary.LittleEndian.PutUint16(b[enc.payloadOffset:], uint16(len(b[enc.payloadOffset:]))) +- +- // copy data from payloadOffset to fec shard cache +- sz := len(b) +- enc.shardCache[enc.shardCount] = enc.shardCache[enc.shardCount][:sz] +- copy(enc.shardCache[enc.shardCount][enc.payloadOffset:], b[enc.payloadOffset:]) +- enc.shardCount++ +- +- // track max datashard length +- if sz > enc.maxSize { +- enc.maxSize = sz +- } +- +- // Generation of Reed-Solomon Erasure Code +- if enc.shardCount == enc.dataShards { +- // fill '0' into the tail of each datashard +- for i := 0; i < enc.dataShards; i++ { +- shard := enc.shardCache[i] +- slen := len(shard) +- copy(shard[slen:enc.maxSize], enc.zeros) +- } +- +- // construct equal-sized slice with stripped header +- cache := enc.encodeCache +- for k := range cache { +- cache[k] = enc.shardCache[k][enc.payloadOffset:enc.maxSize] +- } +- +- // encoding +- if err := enc.codec.Encode(cache); err == nil { +- ps = enc.shardCache[enc.dataShards:] +- for k := range ps { +- enc.markParity(ps[k][enc.headerOffset:]) +- ps[k] = ps[k][:enc.maxSize] +- } +- } +- +- // counters resetting +- enc.shardCount = 0 +- enc.maxSize = 0 +- } +- +- return +-} +- +-func (enc *fecEncoder) markData(data []byte) { +- binary.LittleEndian.PutUint32(data, enc.next) +- binary.LittleEndian.PutUint16(data[4:], typeData) +- enc.next++ +-} +- +-func (enc *fecEncoder) markParity(data []byte) { +- binary.LittleEndian.PutUint32(data, enc.next) +- binary.LittleEndian.PutUint16(data[4:], typeParity) +- // sequence wrap will only happen at parity shard +- enc.next = (enc.next + 1) % enc.paws +-} +diff --git a/removed.go b/removed.go +new file mode 100644 +index 0000000..5ecf446 +--- /dev/null ++++ b/removed.go +@@ -0,0 +1,29 @@ ++package kcp ++ ++// Dummy implementations for types from crypt.go and fec.go, removed to reduce ++// dependencies. ++ ++const ( ++ fecHeaderSize = 6 ++ fecHeaderSizePlus2 = fecHeaderSize + 2 ++ typeData = 0xf1 ++ typeParity = 0xf2 ++) ++ ++type ( ++ BlockCrypt interface { ++ Encrypt(_, _ []byte) ++ Decrypt(_, _ []byte) ++ } ++ fecDecoder struct{} ++ fecEncoder struct{} ++ fecPacket []byte ++) ++ ++func newFECDecoder(rxlimit, dataShards, parityShards int) *fecDecoder { return nil } ++func newFECEncoder(dataShards, parityShards, offset int) *fecEncoder { return nil } ++ ++func (_ *fecDecoder) decode(in fecPacket) [][]byte { panic("disabled") } ++func (_ *fecDecoder) release() { panic("disabled") } ++func (_ *fecEncoder) encode(b []byte) [][]byte { panic("disabled") } ++func (_ fecPacket) flag() uint16 { panic("disabled") } +-- +2.20.1 + diff --git a/projects/smux/config b/projects/smux/config new file mode 100644 index 0000000..54d2a11 --- /dev/null +++ b/projects/smux/config @@ -0,0 +1,16 @@ +version: '[% c("abbrev") %]' +git_url: https://github.com/xtaci/smux +git_hash: c6969d8a76874342611f4b544d05b1590f1a76b1 # v1.5.12 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/xtaci/smux + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/snowflake/build b/projects/snowflake/build index 1aede45..2724dd9 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -8,6 +8,8 @@ mkdir -p $PTDIR $DOCSDIR tar -C /var/tmp/dist -xf [% c('input_files_by_name/uniuri') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/pion-webrtc') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/kcp-go') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/smux') %] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz @@ -18,6 +20,7 @@ ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/snowflake.git # Fix gopath location of versioned dependencies ln -sf "$GOPATH/src/github.com/pion/webrtc" "$GOPATH/src/github.com/pion/webrtc/v2" ln -sf "$GOPATH/src/github.com/pion/sdp" "$GOPATH/src/github.com/pion/sdp/v2" +ln -sf "$GOPATH/src/github.com/xtaci/kcp-go" "$GOPATH/src/github.com/xtaci/kcp-go/v5" cd client go build -ldflags '-s' diff --git a/projects/snowflake/config b/projects/snowflake/config index b81f1f5..efd0707 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://git.torproject.org/pluggable-transports/snowflake.git -git_hash: ea01bf41c3011590938b079ed96c7b35cb40588b +git_hash: 7043a055f9fb0680281ecffd7d458a43f2ce65b5 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -18,3 +18,7 @@ input_files: project: goptlib - name: pion-webrtc project: pion-webrtc + - name: kcp-go + project: kcp-go + - name: smux + project: smux

1 0

[tor-browser-build/master] Typo fix, spotted by a cypherpunk, thanks!
by gk＠torproject.org 08 May '20

08 May '20

commit fab8c5736378dfba4b8524e72f3796ffcf732a6d Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 8 07:34:10 2020 +0000 Typo fix, spotted by a cypherpunk, thanks! --- 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 eaf2df8..a4b0f8a 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -13,7 +13,7 @@ Tor Browser 9.5a12 -- May 7 2020 * Windows + OS X + Linux * Update Tor Launcher to 0.2.21.6 * Translations update - * Bug 33573: Update pion-webrtc version to 2.2.3 + * 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 * Windows

1 0

[tor-browser-spec/master] Bug 29614: Take SHA-256 timestamping into account
by sysrqb＠torproject.org 07 May '20

07 May '20

commit 26d833f346d9d7bf795fe1cec819555595d739f1 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 20 15:00:42 2020 +0000 Bug 29614: Take SHA-256 timestamping into account --- processes/AuthenticodeSigning | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/processes/AuthenticodeSigning b/processes/AuthenticodeSigning index 7829ef9..69b73f2 100644 --- a/processes/AuthenticodeSigning +++ b/processes/AuthenticodeSigning @@ -56,6 +56,7 @@ Signing and timestamping - path/to/osslsigncode -pkcs11engine /usr/lib/engines/engine_pkcs11.so \ -pkcs11module /usr/lib/libeTPkcs11.so \ + -h sha256 \ -certs tpo_cert.crt \ -key 29643b7ac0003d8a882f8a4a6e064110d96b980b \ torbrowser-install-XXX.exe tb-XXX-signed.exe @@ -65,13 +66,16 @@ process by using `-pass $pass` as an additional commandline parameter 4) Timestamping the executable(s): -- path/to/osslsigncode add -t http://timestamp.digicert.com \ +- path/to/osslsigncode add -ts http://timestamp.digicert.com \ + -h sha256 \ -p socks://127.0.0.1:9050 \ torbrowser-install-XXX.exe tb-XXX-timestamped.exe Note: the current tip of osslsigncode's master branch does not allow the decoupling of signing and timestamping. In order to do so one needs to apply -the following patch: +the following patches: + +1. From 28b384e77fa0d4dd38751a0c72ab5976d2e38f75 Mon Sep 17 00:00:00 2001 From: Georg Koppen <gk(a)torproject.org> @@ -107,4 +111,29 @@ index 32e37c8..2978c02 100644 -- 2.7.0 +2. + +From 8159546dfa270da0e3512dcba983ce15029111d0 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Sat, 11 Apr 2020 05:50:36 +0000 +Subject: [PATCH] fixup! Allow timestamping with the 'add' command + + +diff --git a/osslsigncode.c b/osslsigncode.c +index 3797458..4f4b897 100644 +--- a/osslsigncode.c ++++ b/osslsigncode.c +@@ -2447,7 +2447,7 @@ int main(int argc, char **argv) + } else if ((cmd == CMD_SIGN) && !strcmp(*argv, "-n")) { + if (--argc < 1) usage(argv0); + desc = *(++argv); +- } else if ((cmd == CMD_SIGN) && !strcmp(*argv, "-h")) { ++ } else if ((cmd == CMD_SIGN || cmd == CMD_ADD) && !strcmp(*argv, "-h")) { + if (--argc < 1) usage(argv0); + ++argv; + if (!strcmp(*argv, "md5")) { +-- +2.26.0 +For compilation against OpenSSL 1.1.x see the patch(es) at: +https://sourceforge.net/p/osslsigncode/patches/10/

1 0

[tor-browser-spec/master] Merge remote-tracking branch 'gktpo/bug_29614'
by sysrqb＠torproject.org 07 May '20

07 May '20

commit f07e8109ef72e895fd87b83413743828cfa180cc Merge: 99878a9 26d833f Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu May 7 20:54:33 2020 +0000 Merge remote-tracking branch 'gktpo/bug_29614' processes/AuthenticodeSigning | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-)

1 0

[tor-browser-build/master] Another ChangeLog fixup - SHA-256 timestamping is only for Windows
by sysrqb＠torproject.org 07 May '20

07 May '20

commit 2cc80f56d3bd78d9f0970202c055ca45324e1272 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu May 7 20:35:14 2020 +0000 Another ChangeLog fixup - SHA-256 timestamping is only for Windows --- 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 c1a27c0..eaf2df8 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -16,6 +16,7 @@ Tor Browser 9.5a12 -- May 7 2020 * Bug 33573: 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 + * Windows * Bug 29614: Use SHA-256 algorithm for Windows timestamping * Android * Bug 33359: Use latest Version of TOPL and Remove Patches

1 0

[tor-browser-build/master] Fixup 9.5a12 changelog a little
by sysrqb＠torproject.org 07 May '20

07 May '20

commit e2e14150f79debbc1742ef2267d8f4ce9abcc9d4 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu May 7 20:30:55 2020 +0000 Fixup 9.5a12 changelog a little --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index e3af2f6..c1a27c0 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,14 +1,14 @@ -Tor Browser 9.5a12 -- May 6 2020 +Tor Browser 9.5a12 -- May 7 2020 * All Platforms * Update Firefox to 68.8.0esr * Bump NoScript to 11.0.25 * Bump Tor to 0.4.3.4-rc * Translations update * Bug 31499: Update libevent to 2.1.11-stable + * Bug 33877: Disable Samples and Regression tests For Libevent Build * 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 33877: Disable Samples and Regression tests For Libevent Build * Bug 33698: Update "About Tor Browser" links in Tor Browser * Windows + OS X + Linux * Update Tor Launcher to 0.2.21.6 @@ -16,6 +16,7 @@ Tor Browser 9.5a12 -- May 6 2020 * Bug 33573: 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 29614: Use SHA-256 algorithm for Windows timestamping * Android * Bug 33359: Use latest Version of TOPL and Remove Patches * Bug 33931: obfs4 bridges are used instead of meek if meek is selected in Tor Browser for Android alpha

1 0

[tor-browser-build/master] Fold in 9.0.10 changelog and clean-up
by gk＠torproject.org 06 May '20

06 May '20

commit c81a03c0bd7617fa2f235387cfa19c5b45bc6ab7 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 6 06:24:36 2020 +0000 Fold in 9.0.10 changelog and clean-up --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 4eacc5a..e3af2f6 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -30,6 +30,13 @@ Tor Browser 9.5a12 -- May 6 2020 * Windows * Bug 33802: --enable-secure-api is not supported anymore in mingw-w64 +Tor Browser 9.0.10 -- May 5 2020 + * All Platforms + * Update Firefox to 68.8.0esr + * Bump NoScript to 11.0.25 + * Windows + OS X + Linux + * Bug 34017: Bump openssl version to 1.1.1g + Tor Browser 9.5a11 -- April 8 2020 * All Platforms * Update Firefox to 68.7.0esr @@ -38,8 +45,6 @@ Tor Browser 9.5a11 -- April 8 2020 * Translations update * Bug 33342: Avoid disconnect search addon error after removal * Bug 33482: Update about:tor donate string - * Android - * Translations update * Windows + OS X + Linux * Bug 19251: Show improved error pages for onion service errors * Bug 21952: Implement Onion-Location @@ -49,6 +54,8 @@ Tor Browser 9.5a11 -- April 8 2020 * Bug 33723: Bump openssl version to 1.1.1f * Bug 33761: Remove unnecessary snowflake dependencies * Bug 33771: Update some existing licenses and add Libevent license + * Android + * Translations update * Build System * Windows * Bug 33805: Remove escape-openssldir.patch @@ -148,8 +155,6 @@ Tor Browser 9.5a5 -- February 12 2020 * Bug 32414: Make Services.search.addEngine obey FPI * Bug 32948: Make referer behavior consistent regardless of private browing mode status * Bug 461204: Improve the random number generator for the boundaries in multipart/form-data - * Android - * Bug 30767: Custom obfs4 bridge does not work on Tor Browser for Android * Windows + OS X + Linux * Update Tor to 0.4.3.2-alpha * Update Tor Launcher to 0.2.21.1 @@ -158,6 +163,8 @@ Tor Browser 9.5a5 -- February 12 2020 * Bug 32870: Update version of pion-webrtc * Bug 32767: Remove Disconnect search * Bug 30237: Add v3 onion services client authentication prompt + * Android + * Bug 30767: Custom obfs4 bridge does not work on Tor Browser for Android * Build System * Linux * Bug 32976: Build and bundle geckodriver

1 0

[tor-browser-build/master] Reorganize ChangeLog, pick up new tor, and tag build3
by sysrqb＠torproject.org 03 May '20

03 May '20

commit 0e040219888a2b5998bd5811b2a80f49cea64a51 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sun May 3 01:43:40 2020 +0000 Reorganize ChangeLog, pick up new tor, and tag build3 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 16 +++++++--------- projects/tor/config | 2 +- rbm.conf | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index a9ef63d..4eacc5a 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -2,25 +2,23 @@ Tor Browser 9.5a12 -- May 6 2020 * All Platforms * Update Firefox to 68.8.0esr * Bump NoScript to 11.0.25 + * Bump Tor to 0.4.3.4-rc * Translations update - * Bug 34017: Bump openssl version to 1.1.1g - * Bug 33630: Remove noisebridge01 default bridge * Bug 31499: Update libevent to 2.1.11-stable + * 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 33877: Disable Samples and Regression tests For Libevent Build * Bug 33698: Update "About Tor Browser" links in Tor Browser - * Android - * Translations update - * Bump Tor to 0.4.3.3-alpha - * Bug 33359: Use latest Version of TOPL and Remove Patches - * Bug 33931: obfs4 bridges are used instead of meek if meek is selected in Tor Browser for Android alpha * Windows + OS X + Linux - * Translations update * Update Tor Launcher to 0.2.21.6 * Translations update * Bug 33573: Update pion-webrtc version to 2.2.3 - * Bug 33726: Fix patch for #23247: Communicating security expectations for .onion * Bug 32418: Allow updates to be disabled via an enterprise policy. * Bug 34032: Use Securedrop's Official https-everywhere ruleset + * Android + * Bug 33359: Use latest Version of TOPL and Remove Patches + * Bug 33931: obfs4 bridges are used instead of meek if meek is selected in Tor Browser for Android alpha * Build System * All Platforms * Bug 32027: Bump Go to 1.13.10 diff --git a/projects/tor/config b/projects/tor/config index 3bd3999..70395fa 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.4.3.3-alpha +version: 0.4.3.4-rc git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index fb5873f..8e46c7f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.5a12' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 9.5a11 project_name: tor-browser

1 0

[tor-browser-build/master] Fix typo - tor-browser is on build1 tag
by sysrqb＠torproject.org 02 May '20

02 May '20

commit e1972a1d0b8d48ebaa2f49e75b35f5e1861cff28 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sat May 2 17:53:10 2020 +0000 Fix typo - tor-browser is on build1 tag --- 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 b6a8440..d51181f 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-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index bf0d7d2..fb5873f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.5a12' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 9.5a11 project_name: tor-browser

1 0

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

02 May '20

commit 4acec7610371d2c7bae5509cedaa92a360930259 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sat May 2 17:45:13 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 5905be86c2ce..36f8182a2581 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 5905be86c2ced627e9dcbac1fe005a524ade7b4e +Subproject commit 36f8182a25818548d62b7fbc6be4d2472773b820

1 0

[tor-browser-build/master] Release preparations for 9.5a12
by sysrqb＠torproject.org 02 May '20

02 May '20

commit e75d59018ee6cd5a92def62999d719af2cf52418 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sat May 2 17:25:05 2020 +0000 Release preparations for 9.5a12 Versions bump and Changelog update. --- projects/firefox-langpacks/config | 2 +- projects/firefox-locale-bundle/config | 2 +- projects/firefox/config | 2 +- projects/openssl/config | 4 +-- projects/tba-translation/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 34 ++++++++++++++++++++-- projects/tor-browser/config | 4 +-- projects/tor-launcher/config | 2 +- rbm.conf | 7 ++--- 9 files changed, 44 insertions(+), 15 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 2d55896..17a707a 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build3 + ff_build: build2 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' targets: diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config index b2d33a8..2ea6db6 100644 --- a/projects/firefox-locale-bundle/config +++ b/projects/firefox-locale-bundle/config @@ -5,4 +5,4 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: use_container: 0 ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build3 + ff_build: build2 diff --git a/projects/firefox/config b/projects/firefox/config index f03c110..b6a8440 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.7.0 + firefox_platform_version: 68.8.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 9.5 branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha' diff --git a/projects/openssl/config b/projects/openssl/config index 179c2d5..7399c0a 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.1.1f +version: 1.1.1g filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -31,6 +31,6 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: 186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35 + sha256sum: ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46 - filename: use-SOURCE_DATE_EPOCH.patch enable: '[% c("var/windows") %]' diff --git a/projects/tba-translation/config b/projects/tba-translation/config index 3b46b94..911d0ae 100644 --- a/projects/tba-translation/config +++ b/projects/tba-translation/config @@ -3,5 +3,5 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/translation.git # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. -git_hash: 922fec4c767aad5efb7411c2430f2b197b921045 +git_hash: 40d0ed51f51c7e42b9753b22292f35be5c30163d version: '[% c("abbrev") %]' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 7f826ee..a9ef63d 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,6 +1,36 @@ -Tor Browser 9.5a12 -- April XX 2020 +Tor Browser 9.5a12 -- May 6 2020 * All Platforms - Bug 33630: Remove noisebridge01 default bridge + * Update Firefox to 68.8.0esr + * Bump NoScript to 11.0.25 + * Translations update + * Bug 34017: Bump openssl version to 1.1.1g + * Bug 33630: Remove noisebridge01 default bridge + * Bug 31499: Update libevent to 2.1.11-stable + * Bug 33877: Disable Samples and Regression tests For Libevent Build + * Bug 33698: Update "About Tor Browser" links in Tor Browser + * Android + * Translations update + * Bump Tor to 0.4.3.3-alpha + * Bug 33359: Use latest Version of TOPL and Remove Patches + * Bug 33931: obfs4 bridges are used instead of meek if meek is selected in Tor Browser for Android alpha + * Windows + OS X + Linux + * Translations update + * Update Tor Launcher to 0.2.21.6 + * Translations update + * Bug 33573: Update pion-webrtc version to 2.2.3 + * Bug 33726: Fix patch for #23247: Communicating security expectations for .onion + * Bug 32418: Allow updates to be disabled via an enterprise policy. + * Bug 34032: Use Securedrop's Official https-everywhere ruleset + * Build System + * All Platforms + * Bug 32027: Bump Go to 1.13.10 + * Android + * Bug 28765: LibEvent Build for Android + * Bug 28766: Tor Build for Android + * Bug 32993: Package Tor With Tor Android Service Project + * Bug 33685: Add Support for Building zlib for Android + * Windows + * Bug 33802: --enable-secure-api is not supported anymore in mingw-w64 Tor Browser 9.5a11 -- April 8 2020 * All Platforms diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 1e93680..33f0cd9 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -73,9 +73,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 3f046da13f487392f34858f8a5e2fc24d7d87ff19e98a3a7907f59baff8a3705 + sha256sum: 2e55cf6dc6d0f6012e2f0328ecfec182a4f02c94e2fc40818af41f610ebd6668 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index e0f0113..2b28a77 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.21.5 +version: 0.2.21.6 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 819a257..bf0d7d2 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,11 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.5a11' - torbrowser_build: 'build2' + torbrowser_version: '9.5a12' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.5a9 - - 9.5a10 + - 9.5a11 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

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

02 May '20

commit 7e77a32bd84b942e8c0f39f20a57edb46772343c Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Mar 23 16:10:10 2020 +0000 Release preparations for 0.2.21.5 Translations update and version bump --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index b329c7c..b8e379b 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.21.4</em:version> + <em:version>0.2.21.5</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

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

02 May '20

commit 7ce65a542bce4997ee7a9ca9d4ea838411bc7b69 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sat May 2 16:59:45 2020 +0000 Release preparations for 0.2.21.6 Translations update and version bump --- src/chrome/locale/ca/torlauncher.properties | 2 +- src/chrome/locale/da/network-settings.dtd | 8 +-- src/chrome/locale/da/torlauncher.properties | 52 +++++++------- src/chrome/locale/et/network-settings.dtd | 8 +-- src/chrome/locale/et/torlauncher.properties | 4 +- src/chrome/locale/fr/network-settings.dtd | 2 +- src/chrome/locale/hr/network-settings.dtd | 88 +++++++++++------------ src/chrome/locale/hr/torlauncher.properties | 96 +++++++++++++------------- src/chrome/locale/kk/torlauncher.properties | 2 +- src/chrome/locale/nb-NO/network-settings.dtd | 14 ++-- src/chrome/locale/nb-NO/torlauncher.properties | 14 ++-- src/chrome/locale/pl/network-settings.dtd | 46 ++++++------ src/chrome/locale/pl/torlauncher.properties | 22 +++--- src/chrome/locale/ru/torlauncher.properties | 2 +- src/chrome/locale/sv-SE/network-settings.dtd | 10 +-- src/chrome/locale/sv-SE/torlauncher.properties | 22 +++--- src/chrome/locale/zh-CN/network-settings.dtd | 2 +- src/chrome/locale/zh-CN/torlauncher.properties | 4 +- src/install.rdf | 2 +- 19 files changed, 200 insertions(+), 200 deletions(-) diff --git a/src/chrome/locale/ca/torlauncher.properties b/src/chrome/locale/ca/torlauncher.properties index b0d10b2..ad1a2ba 100644 --- a/src/chrome/locale/ca/torlauncher.properties +++ b/src/chrome/locale/ca/torlauncher.properties @@ -16,7 +16,7 @@ torlauncher.unable_to_start_tor=No s'ha pogut iniciar Tor.\n%S torlauncher.tor_missing=Falta l'executable de Tor. torlauncher.torrc_missing=El fitxer torrc no hi és i no s'ha pogut crear. torlauncher.datadir_missing=La carpeta de dades de Tor no existeix i no s'ha pogut crear. -torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. +torlauncher.onionauthdir_missing=El directori d'autenticació Tor onion no existeix o no s'ha pogut crear. torlauncher.password_hash_missing=Ha fallat l'obtenció de la contrasenya hash. torlauncher.failed_to_get_settings=No s'ha pogut obtenir la configuració de Tor\n%S diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd index f7d7111..7c46734 100644 --- a/src/chrome/locale/da/network-settings.dtd +++ b/src/chrome/locale/da/network-settings.dtd @@ -4,7 +4,7 @@ <!ENTITY torsettings.wizard.title.connecting "Etablerer en forbindelse">  -<!ENTITY torlauncher.localePicker.title "Tor Browser-sprog"> +<!ENTITY torlauncher.localePicker.title "Sprog for Tor Browser"> <!ENTITY torlauncher.localePicker.prompt "Vælg venligst et sprog.">  @@ -20,13 +20,13 @@ <!ENTITY torsettings.restartTor "Genstart Tor"> <!ENTITY torsettings.reconfigTor "Genkonfigurer"> -<!ENTITY torsettings.discardSettings.prompt "Du har konfigureret Tor-broer eller du har indtastet lokale proxyindstillinger.  For at kunne foretage direkte forbindelse til Tor-netværket, skal disse indstillinger fjernes."> +<!ENTITY torsettings.discardSettings.prompt "Du har konfigureret Tor-broer eller du har indtastet lokale proxyindstillinger.  For at kunne foretage direkte forbindelse til Tor-netværket, skal indstillingerne fjernes."> <!ENTITY torsettings.discardSettings.proceed "Fjern indstillinger og opret forbindelse"> <!ENTITY torsettings.optional "Valgfri"> <!ENTITY torsettings.useProxy.checkbox "Jeg bruger en proxy til at oprette forbindelse til internettet"> -<!ENTITY torsettings.useProxy.type "Proxy-type"> +<!ENTITY torsettings.useProxy.type "Proxytype"> <!ENTITY torsettings.useProxy.type.placeholder "vælg en proxytype"> <!ENTITY torsettings.useProxy.address "Adresse"> <!ENTITY torsettings.useProxy.address.placeholder "IP-adresse eller værtsnavn"> @@ -36,7 +36,7 @@ <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP/HTTPS"> -<!ENTITY torsettings.firewall.checkbox "Computeren går gennem en firewall som kun tillader forbindelse til bestemte porte"> +<!ENTITY torsettings.firewall.checkbox "Computeren går gennem en firewall som kun tillader forbindelser til bestemte porte"> <!ENTITY torsettings.firewall.allowedPorts "Tilladte porte"> <!ENTITY torsettings.useBridges.checkbox "Tor er censureret i mit land"> <!ENTITY torsettings.useBridges.default "Vælg en indbygget bro"> diff --git a/src/chrome/locale/da/torlauncher.properties b/src/chrome/locale/da/torlauncher.properties index 3338624..ad2a160 100644 --- a/src/chrome/locale/da/torlauncher.properties +++ b/src/chrome/locale/da/torlauncher.properties @@ -1,37 +1,37 @@ ### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor starter +torlauncher.error_title=Tor-opstarter -torlauncher.tor_exited_during_startup=Tor lukkede under opstart. Det kan skyldes en fejl i din torrc-fil, en fejl i Tor eller et andet program på dit system, eller hardwarefejl. Tor Browser vil ikke starte, før du løser det underliggende problem og genstarter Tor. -torlauncher.tor_exited=Tor lukkede uventet. Dette kan skyldes en fejl i selve Tor, et andet program i dit system eller en hardware-fejl. Tor Browser vil ikke være i stand til at forbinde til noget som helst websted før du genstarter Tor. Send en kopi af din Tor-log til support-teamet hvis problemet fortsætter. -torlauncher.tor_exited2=Fanebladene i din browser vil ikke blive lukket ved af at du genstarter Tor. -torlauncher.tor_controlconn_failed=Kunne ikke oprette forbindelse til Tor kontrol-porten. +torlauncher.tor_exited_during_startup=Tor afsluttede under opstart. Det kan skyldes en fejl i din torrc-fil, en fejl i Tor eller et andet program på dit system, eller fejl i hardware. Tor Browser starter ikke før du løser det underliggende problem og genstarter Tor. +torlauncher.tor_exited=Tor afsluttede uventet. Det kan skyldes en fejl i selve Tor, et andet program i dit system eller fejl i hardware. Tor Browser vil ikke være i stand til at nå nogen websteder før du genstarter Tor. Send en kopi af din Tor-log til supportteamet hvis problemet fortsætter. +torlauncher.tor_exited2=Hvis du genstarter Tor, så lukkes fanebladene i din browser. +torlauncher.tor_controlconn_failed=Kunne ikke oprette forbindelse til Tor-kontrolport. torlauncher.tor_failed_to_start=Tor kunne ikke starte. torlauncher.tor_control_failed=Det lykkedes ikke at tage kontrol over Tor. torlauncher.tor_bootstrap_failed=Tor kunne ikke etablere en forbindelse til Tor-netværket. -torlauncher.tor_bootstrap_failed_details=%1$S fejlede (%2$S). +torlauncher.tor_bootstrap_failed_details=%1$S mislykkedes (%2$S). torlauncher.unable_to_start_tor=Kan ikke starte Tor.\n\n%S -torlauncher.tor_missing=Kunne ikke finde Tor-programmet. +torlauncher.tor_missing=Tor-kørbaren mangler. torlauncher.torrc_missing=torrc-filen mangler og kunne ikke oprettes. torlauncher.datadir_missing=Tor-datamappen findes ikke og kunne ikke oprettes. torlauncher.onionauthdir_missing=Tor-onionautentifikationsmappen findes ikke og kunne ikke oprettes. -torlauncher.password_hash_missing=Kunne ikke finde hash-værdi af adgangskode. +torlauncher.password_hash_missing=Kunne ikke hente hashed adgangskode. torlauncher.failed_to_get_settings=Kan ikke hente Tor-indstillingerne..\n\n%S torlauncher.failed_to_save_settings=Kan ikke gemme Tor-indstillingerne.\n\n%S -torlauncher.ensure_tor_is_running=Kontroller venligst at Tor kører. +torlauncher.ensure_tor_is_running=Sørg venligst for at Tor kører. -torlauncher.error_proxy_addr_missing=Du skal angive både IP-adresse eller værtsnavn og en port, for at konfigurere Tor til at bruge en proxy som forbindelse til internettet. -torlauncher.error_proxy_type_missing=Du skal vælge proxytypen: +torlauncher.error_proxy_addr_missing=Du skal både angive en IP-adresse, eller værtsnavn og et portnummer, for at konfigurere Tor til at bruge en proxy til at få adgang til internettet. +torlauncher.error_proxy_type_missing=Du skal vælge proxytypen. torlauncher.error_bridges_missing=Du skal angive en eller flere broer. -torlauncher.error_default_bridges_type_missing=Du skal vælge en transporttype for de tildelte broer. +torlauncher.error_default_bridges_type_missing=Du skal vælge en transporttype til de tildelte broer. torlauncher.error_bridgedb_bridges_missing=Anmod venligst om en bro. -torlauncher.error_bridge_bad_default_type=Ingen tildelte broer med transporttypen %S er tilgængelige. Justér venligst dine indstillinger. +torlauncher.error_bridge_bad_default_type=Ingen tildelte broer med transporttypen %S er tilgængelige. Juster venligst dine indstillinger. -torlauncher.bridge_suffix.meek-amazon=(virker i kina) -torlauncher.bridge_suffix.meek-azure=(virker i kina) +torlauncher.bridge_suffix.meek-amazon=(virker i Kina) +torlauncher.bridge_suffix.meek-azure=(virker i Kina) torlauncher.request_a_bridge=Anmod om en bro… torlauncher.request_a_new_bridge=Anmod om en ny bro… @@ -40,7 +40,7 @@ torlauncher.captcha_prompt=Løs CAPTCHA'en for at anmode om en bro. torlauncher.bad_captcha_solution=Løsningen er ikke korrekt. Prøv venligst igen. torlauncher.unable_to_get_bridge=Kan ikke hente en bro fra BridgeDB.\n\n%S torlauncher.no_meek=Browseren er ikke konfigureret til meek, som behøves for at hente broer. -torlauncher.no_bridges_available=Der er ingen broer tilgængelige på nuværende tidspunkt. Beklager. +torlauncher.no_bridges_available=Der er på nuværende tidspunkt ingen broer tilgængelige. Beklager. torlauncher.connect=Opret forbindelse torlauncher.restart_tor=Genstart Tor @@ -48,10 +48,10 @@ torlauncher.quit=Afslut torlauncher.quit_win=Afslut torlauncher.done=Færdig -torlauncher.forAssistance=For at få hjælp, kontakt %S -torlauncher.forAssistance2=For at få hjælp, besøg %S +torlauncher.forAssistance=Få hjælp ved at kontakte %S +torlauncher.forAssistance2=Få hjælp ved at besøge %S -torlauncher.copiedNLogMessages=Kopieringen er gennemført. %S logbeskeder er klar til at blive indsæt i en tekstredigering eller en e-mail. +torlauncher.copiedNLogMessages=Kopieringen gennemført. %S logmeddelelser er klar til at blive indsæt i en tekstredigering eller en e-mailmeddelelse. torlauncher.bootstrapStatus.starting=Starter torlauncher.bootstrapStatus.conn_pt=Opretter forbindelse til bro @@ -62,19 +62,19 @@ torlauncher.bootstrapStatus.conn=Opretter forbindelse til et Tor-relæ torlauncher.bootstrapStatus.conn_done=Forbundet til et Tor-relæ torlauncher.bootstrapStatus.handshake=Forhandler med et Tor-relæ torlauncher.bootstrapStatus.handshake_done=Færdig med at forhandle med et Tor-relæ -torlauncher.bootstrapStatus.onehop_create=Etablerer en krypteret mappe forbindelse +torlauncher.bootstrapStatus.onehop_create=Etablerer en forbindelse for krypteret mappe torlauncher.bootstrapStatus.requesting_status=Henter netværksstatus torlauncher.bootstrapStatus.loading_status=Indlæser netværksstatus torlauncher.bootstrapStatus.loading_keys=Indlæser nøglecentercertifikater -torlauncher.bootstrapStatus.requesting_descriptors=Anmoder om relæ information +torlauncher.bootstrapStatus.requesting_descriptors=Anmoder om relæinformation torlauncher.bootstrapStatus.loading_descriptors=Indlæser relæinformation torlauncher.bootstrapStatus.enough_dirinfo=Færdig med at indlæse relæinformation torlauncher.bootstrapStatus.ap_conn_pt=Bygger kredsløb: Opretter forbindelse til bro torlauncher.bootstrapStatus.ap_conn_done_pt=Bygger kredsløb: Forbundet til bro torlauncher.bootstrapStatus.ap_conn_proxy=Bygger kredsløb: Opretter forbindelse til proxy torlauncher.bootstrapStatus.ap_conn_done_proxy=Bygger kredsløb: Forbundet til proxy -torlauncher.bootstrapStatus.ap_conn=Bygger kredsløb: Opretter forbindelse til Tor-relæ -torlauncher.bootstrapStatus.ap_conn_done=Bygger kredsløb: Forbundet til Tor-relæ +torlauncher.bootstrapStatus.ap_conn=Bygger kredsløb: Opretter forbindelse til et Tor-relæ +torlauncher.bootstrapStatus.ap_conn_done=Bygger kredsløb: Forbundet til et Tor-relæ torlauncher.bootstrapStatus.ap_handshake=Bygger kredsløb: Forhandler med et Tor-relæ torlauncher.bootstrapStatus.ap_handshake_done=Bygger kredsløb: Færdig med at forhandle med et Tor-relæ torlauncher.bootstrapStatus.circuit_create=Bygger kredsløb: Etablerer et Tor-kredsløb @@ -85,11 +85,11 @@ torlauncher.bootstrapWarning.connectrefused=forbindelse afvist torlauncher.bootstrapWarning.misc=diverse torlauncher.bootstrapWarning.resourcelimit=utilstrækkelige ressourcer torlauncher.bootstrapWarning.identity=identitet matcher ikke -torlauncher.bootstrapWarning.timeout=forbindelse timeout +torlauncher.bootstrapWarning.timeout=forbindelse fik timeout torlauncher.bootstrapWarning.noroute=ingen rute til vært -torlauncher.bootstrapWarning.ioerror=læse/skrive fejl +torlauncher.bootstrapWarning.ioerror=fejl ved læse/skrive torlauncher.bootstrapWarning.pt_missing=mangler udskiftelig transport -torlauncher.nsresult.NS_ERROR_NET_RESET=Mistede forbindelsen til serveren. +torlauncher.nsresult.NS_ERROR_NET_RESET=Forbindelsen til serveren blev tabt. torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Kunne ikke oprette forbindelse til serveren. torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Kunne ikke oprette forbindelse til proxyen. diff --git a/src/chrome/locale/et/network-settings.dtd b/src/chrome/locale/et/network-settings.dtd index 6facfbf..06167d2 100644 --- a/src/chrome/locale/et/network-settings.dtd +++ b/src/chrome/locale/et/network-settings.dtd @@ -68,13 +68,13 @@ <!ENTITY torPreferences.learnMore "Loe lähemalt"> <!ENTITY torPreferences.bridges "Sillad"> <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> -<!ENTITY torPreferences.useBridge "Use a bridge"> -<!ENTITY torPreferences.requestNewBridge "Taotle uut Silda…"> -<!ENTITY torPreferences.provideBridge "Provide a bridge"> +<!ENTITY torPreferences.useBridge "Kasuta silda"> +<!ENTITY torPreferences.requestNewBridge "Taotle uut silda…"> +<!ENTITY torPreferences.provideBridge "Paku silda"> <!ENTITY torPreferences.advanced "Peenhäälestus"> <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet."> <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> -<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> +<!ENTITY torPreferences.requestBridgeDialogTitle "Taotle silda"> <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Lahenda CAPTCHA, et taotleda silda."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/et/torlauncher.properties b/src/chrome/locale/et/torlauncher.properties index 868e761..52b2ef3 100644 --- a/src/chrome/locale/et/torlauncher.properties +++ b/src/chrome/locale/et/torlauncher.properties @@ -54,8 +54,8 @@ torlauncher.forAssistance2=Abi saamiseks külasta %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. torlauncher.bootstrapStatus.starting=Starting -torlauncher.bootstrapStatus.conn_pt=Connecting to bridge -torlauncher.bootstrapStatus.conn_done_pt=Connected to bridge +torlauncher.bootstrapStatus.conn_pt=Sillaga ühendamine +torlauncher.bootstrapStatus.conn_done_pt=Sillaga ühendatud torlauncher.bootstrapStatus.conn_proxy=Connecting to proxy torlauncher.bootstrapStatus.conn_done_proxy=Connected to proxy torlauncher.bootstrapStatus.conn=Connecting to a Tor relay diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index fa11b59..1b26ec5 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -45,7 +45,7 @@ <!ENTITY torsettings.useBridges.captchaSolution.placeholder "Saisissez les caractères de l’image"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Obtenir un nouveau test"> <!ENTITY torsettings.useBridges.captchaSubmit "Envoyer"> -<!ENTITY torsettings.useBridges.custom "Utiliser un pont que je connais"> +<!ENTITY torsettings.useBridges.custom "Indiquer un pont que je connais"> <!ENTITY torsettings.useBridges.label "Saisir des renseignements de pont provenant d’une source fiable"> <!ENTITY torsettings.useBridges.placeholder "type adresse:port (un par ligne)"> diff --git a/src/chrome/locale/hr/network-settings.dtd b/src/chrome/locale/hr/network-settings.dtd index 68df069..4aaa597 100644 --- a/src/chrome/locale/hr/network-settings.dtd +++ b/src/chrome/locale/hr/network-settings.dtd @@ -5,79 +5,79 @@  <!ENTITY torlauncher.localePicker.title "Jezik Tor preglednika"> -<!ENTITY torlauncher.localePicker.prompt "Odaberite jezik"> +<!ENTITY torlauncher.localePicker.prompt "Odaberi jezik">  -<!ENTITY torSettings.connectPrompt "Za povezivanje s Tor-om kliknite "Poveži se""> -<!ENTITY torSettings.configurePrompt "Ako ste u zemlji koja cenzurira Tor (kao Egipat, Kina, Turska) ili ste spojeni preko privatne mreže za koju je potrebno proxy, kliknite "Podesi" kako biste promijenili postavke mreže."> +<!ENTITY torSettings.connectPrompt "Za povezivanje s Torom, pritisni „Poveži se”"> +<!ENTITY torSettings.configurePrompt "Ako si u zemlji koja cenzurira Tor (kao Egipat, Kina, Turska) ili si spojen/a preko privatne mreže za koju je potreban poslužitelj, promijeni postavke mreže pritiskom na „Podesi”."> <!ENTITY torSettings.configure "Podesi"> <!ENTITY torSettings.connect "Poveži se">  -<!ENTITY torsettings.startingTor "Čekanje na pokretanje Tor-a…"> -<!ENTITY torsettings.restartTor "Ponovno pokreni Tor"> -<!ENTITY torsettings.reconfigTor "Ponovno podesi"> +<!ENTITY torsettings.startingTor "Čekanje na pokretanje Tora …"> +<!ENTITY torsettings.restartTor "Ponovo pokreni Tor"> +<!ENTITY torsettings.reconfigTor "Ponovo podesi"> -<!ENTITY torsettings.discardSettings.prompt "Konfigurirali ste Tor mostove ili ste unijeli postavke lokalnog proxya.  Kako bi ostvarili direktnu vezu s Tor mrežom, ove postavke moraju biti uklonjene."> -<!ENTITY torsettings.discardSettings.proceed "Obriši postavke i poveži se"> +<!ENTITY torsettings.discardSettings.prompt "Postavio/la si Tor mostove ili si upisao/la postavke lokalnog poslužitelja.  Za ostvarivanje direktne veze s Tor mrežom, moraš ukloniti te postavke."> +<!ENTITY torsettings.discardSettings.proceed "Ukloni postavke i poveži se"> <!ENTITY torsettings.optional "Neobavezno"> -<!ENTITY torsettings.useProxy.checkbox "Koristim proxy za spajanje na internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type"> -<!ENTITY torsettings.useProxy.type.placeholder "odaberite tip proxy-a"> -<!ENTITY torsettings.useProxy.address "Address"> -<!ENTITY torsettings.useProxy.address.placeholder "IP adresa ili poslužitelj"> +<!ENTITY torsettings.useProxy.checkbox "Koristim poslužitelja za povezivanje na internet"> +<!ENTITY torsettings.useProxy.type "Vrsta poslužitelja"> +<!ENTITY torsettings.useProxy.type.placeholder "odaberi vrstu poslužitelja"> +<!ENTITY torsettings.useProxy.address "Adresa"> +<!ENTITY torsettings.useProxy.address.placeholder "IP adresa ili ime računala"> <!ENTITY torsettings.useProxy.port "Port"> <!ENTITY torsettings.useProxy.username "Korisničko ime"> <!ENTITY torsettings.useProxy.password "Lozinka"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "Ovo raučunalo ide kroz vatrozid koji dozvoljava veze samo preko pojedinih portova."> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> +<!ENTITY torsettings.firewall.checkbox "Ovo računalo ide kroz vatrozid koji dozvoljava veze samo s određenim portovima"> +<!ENTITY torsettings.firewall.allowedPorts "Dozvoljeni portovi"> <!ENTITY torsettings.useBridges.checkbox "Tor je cenzuriran u mojoj zemlji"> -<!ENTITY torsettings.useBridges.default "Odaberite ugrađeni most"> -<!ENTITY torsettings.useBridges.default.placeholder "odaberite most"> -<!ENTITY torsettings.useBridges.bridgeDB "Zatražite most od torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Unesite znakove sa slike"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Dobijte novi izazov"> +<!ENTITY torsettings.useBridges.default "Odaberi ugrađeni most"> +<!ENTITY torsettings.useBridges.default.placeholder "odaberi most"> +<!ENTITY torsettings.useBridges.bridgeDB "Zatraži most od torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Upiši znakove sa slike"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Nabavi novi izazov"> <!ENTITY torsettings.useBridges.captchaSubmit "Pošalji"> -<!ENTITY torsettings.useBridges.custom "Pružaj mi most koji poznajem"> -<!ENTITY torsettings.useBridges.label "Unesite informacije o mostu sa pouzdanog izvora."> -<!ENTITY torsettings.useBridges.placeholder "tip adresa:port (jedna po retku)"> +<!ENTITY torsettings.useBridges.custom "Pruži mi most koji poznam"> +<!ENTITY torsettings.useBridges.label "Upiši podatke o mostu s pouzdanog izvora."> +<!ENTITY torsettings.useBridges.placeholder "upiši adresa:port (jednu po retku)"> <!ENTITY torsettings.copyLog "Kopiraj Tor zapisnik u međuspremnik"> -<!ENTITY torsettings.proxyHelpTitle "Pomoć s proxy-em"> -<!ENTITY torsettings.proxyHelp1 "Ako se povezujete kroz mrežu tvrtke, škole ili sveučilišta moguće je da će vam trebati lokalni proxy. Ako niste sigurni treba li vam proxy, pregledajte postavke interneta u drugom pregledniku ili provjerite postavke mreže Vašeg sistema."> +<!ENTITY torsettings.proxyHelpTitle "Pomoć poslužitelja"> +<!ENTITY torsettings.proxyHelp1 "Ako se povezuješ kroz mrežu tvrtke, škole ili sveučilišta moguće je da ćeš trebati lokalni poslužitelj. Ako ne znaš točno je li ti poslužitelj treba, pregledaj postavke interneta u jednom drugom pregledniku ili provjeri postavke mreže tvog sustava."> <!ENTITY torsettings.bridgeHelpTitle "Pomoć s mostovima"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "Mostovi su nenavedeni releji koji otežavaju blokiranje veza s Tor mrežom.  Svaka vrsta mosta koristi drugačiju metodu kako bi se izbjegla cenzura.  Obfs metode čine da tvoj promet izgleda kao slučajni šum, a meek metode čine da tvoj promet izgleda kao da se povezuje na tu uslugu, umjesto na Tor."> +<!ENTITY torsettings.bridgeHelp2 "Budući da neke zemlje pokušavaju blokirati Tor, određeni mostovi djeluju u određenim zemljama, ali ne i u drugima.  Ako ne znaš točno koji mostovi rade u tvojoj zemlji, posjeti torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Molimo pričekajte dok uspostavljamo vezu sa Tor mrežom.   Ovo može potrajati nekoliko minuta."> +<!ENTITY torprogress.pleaseWait "Pričekaj dok uspostavljamo vezu s Tor mrežom.   Ovo može potrajati nekoliko minuta.">  <!ENTITY torPreferences.categoryTitle "Tor"> -<!ENTITY torPreferences.torSettings "Tor Settings"> -<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > -<!ENTITY torPreferences.learnMore "Saznajte više"> +<!ENTITY torPreferences.torSettings "Tor postavke"> +<!ENTITY torPreferences.torSettingsDescription "Tor preglednik usmjerava tvoj promet na Tor mrežu, koju pokreću tisuće volontera širom svijeta." > +<!ENTITY torPreferences.learnMore "Saznaj više"> <!ENTITY torPreferences.bridges "Mostovi"> -<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> -<!ENTITY torPreferences.useBridge "Use a bridge"> -<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> -<!ENTITY torPreferences.provideBridge "Provide a bridge"> +<!ENTITY torPreferences.bridgesDescription "Mostovi pomažu pristupiti Tor-mreži na mjestima gdje je Tor blokiran. Ovisno o tome gdje se nalaziš, neki mostovi rade bolje od drugih."> +<!ENTITY torPreferences.useBridge "Koristi most"> +<!ENTITY torPreferences.requestNewBridge "Zatraži novi most …"> +<!ENTITY torPreferences.provideBridge "Pruži most"> <!ENTITY torPreferences.advanced "Napredno"> -<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet."> -<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> -<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> -<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> -<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> -<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> -<!ENTITY torPreferences.viewTorLogs "View the Tor logs."> -<!ENTITY torPreferences.viewLogs "View Logs…"> -<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> +<!ENTITY torPreferences.advancedDescription "Podesi način povezivanja Tor preglednika na internet."> +<!ENTITY torPreferences.firewallPortsPlaceholder "Zarezom odvojene vrijednosti"> +<!ENTITY torPreferences.requestBridgeDialogTitle "Zatraži most"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kontaktiranje baze podataka BridgeDB. Pričekaj."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Riješi CAPTCHA za traženje mosta."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "Rješenje nije ispravno. Pokušaj ponovo."> +<!ENTITY torPreferences.viewTorLogs "Pogledaj log-zapise Tora."> +<!ENTITY torPreferences.viewLogs "Pogledaj log-zapise …"> +<!ENTITY torPreferences.torLogsDialogTitle "Log-zapisi Tora"> diff --git a/src/chrome/locale/hr/torlauncher.properties b/src/chrome/locale/hr/torlauncher.properties index 4e0906b..98f60eb 100644 --- a/src/chrome/locale/hr/torlauncher.properties +++ b/src/chrome/locale/hr/torlauncher.properties @@ -1,12 +1,12 @@ ### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher +torlauncher.error_title=Tor pokretač -torlauncher.tor_exited_during_startup=Tor je izašao usred pokretanja. Do toga može doći zbog greške u Vašoj torrc datoteci, greške u Toru ili drugom programu u Vašem sustavu ili zbog neispravnog hardwarea. Dok ne popravite inicijalni problem i ponovno pokrenete Tor, Tor Browser se neće pokrenuti. -torlauncher.tor_exited=Tor je neočekivano izašao. Ovo bi moglo biti zbog greške u samom Toru, drugog programa na Vašem sustavu ili neispravnog hardwarea. Dok ne pokrenete Tor ponovno, Tor Browser neće biti u mogućnosti pristupiti web stranicama. Ako problem ustraje, molimo Vas da pošaljete kopiju Vašeg Tor zapisa timu za podršku. -torlauncher.tor_exited2=Ponovno pokretanje Tora neće zatvoriti Vaše kartice u pregledniku. -torlauncher.tor_controlconn_failed=Nije se moguće spojiti na Torov upravljački port. +torlauncher.tor_exited_during_startup=Tor je izašao usred pokretanja. Do toga može doći zbog greške u tvojoj torrc datoteci, greške u Toru ili drugom programu u tvom sustavu ili zbog neispravnog hardvera. Sve dok ne popraviš osnovni problem i ponovo pokreneš Tor, Tor preglednik se neće pokrenuti. +torlauncher.tor_exited=Tor je neočekivano izašao. Možda zbog greške u samom Toru, zbog jednog drugog programa na tvom sustavu ili zbog neispravnog hardvera. Sve dok ne pokreneš Tor ponovno, Tor preglednik neće moći pristupiti web stranicama. Ako problem ustraje, pošalji kopiju tvog Tor zapisa timu za podršku. +torlauncher.tor_exited2=Ponovno pokretanje Tora neće zatvoriti kartice tvog preglednika. +torlauncher.tor_controlconn_failed=Nije moguće spojiti se na Torov upravljački port. torlauncher.tor_failed_to_start=Tor se nije uspio pokrenuti. torlauncher.tor_control_failed=Preuzimanje kontrole nad Torom nije uspjelo. torlauncher.tor_bootstrap_failed=Tor nije uspio uspostaviti Tor mrežnu vezu. @@ -16,31 +16,31 @@ torlauncher.unable_to_start_tor=Nije moguće pokrenuti Tor.\n\n%S torlauncher.tor_missing=Nije moguće pronaći izvršni program za Tor. torlauncher.torrc_missing=Torrc datoteka nedostaje i nije mogla biti stvorena. torlauncher.datadir_missing=Direktorij s Tor podacima ne postoji i nije mogao biti stvoren. -torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. +torlauncher.onionauthdir_missing=Direktorij Tor onion autentifikacije ne postoji i nije ga moguće stvoriti. torlauncher.password_hash_missing=Nije moguće dobiti hash lozinke. torlauncher.failed_to_get_settings=Nije moguće dobaviti Tor postavke.\n\n%S torlauncher.failed_to_save_settings=Nije moguće spremiti Tor postavke.\n\n%S -torlauncher.ensure_tor_is_running=Molimo osigurajte da je Tor pokrenut. +torlauncher.ensure_tor_is_running=Provjeri, da je Tor pokrenut. -torlauncher.error_proxy_addr_missing=Morate navesti i IP adresu ili ime računala i broj porta da biste konfigurirali Tor za korištenje proxya za pristup Internetu. -torlauncher.error_proxy_type_missing=Morate odabrati tip proxya. -torlauncher.error_bridges_missing=Morate odrediti jedan ili više mostova. -torlauncher.error_default_bridges_type_missing=Morate odabrati vrstu transporta za pružene mostove. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. -torlauncher.error_bridge_bad_default_type=Nema dostupnih pruženih mostova koji imaju %S vrstu transporta. Molimo, prilagodite svoje postavke. +torlauncher.error_proxy_addr_missing=Moraš navesti i IP adresu ili ime računala i broj porta za konfiguriranje Tora0 za korištenje proxya za pristup internetu. +torlauncher.error_proxy_type_missing=Moraš odabrati vrstu proxya. +torlauncher.error_bridges_missing=Moraš odrediti jedan ili više mostova. +torlauncher.error_default_bridges_type_missing=Moraš odabrati vrstu transporta za pružene mostove. +torlauncher.error_bridgedb_bridges_missing=Zatraži most. +torlauncher.error_bridge_bad_default_type=Nema dostupnih pruženih mostova koji imaju %S vrstu transporta. Prilagodi svoje postavke. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(radi u Kini) +torlauncher.bridge_suffix.meek-azure=(radi u Kini) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=Zatraži most … +torlauncher.request_a_new_bridge=Zatraži novi most … +torlauncher.contacting_bridgedb=Kontaktira se BridgeDB. Pričekaj. +torlauncher.captcha_prompt=Riješi CAPTCHA za traženje mosta. +torlauncher.bad_captcha_solution=Rješenje nije ispravno. Pokušaj ponovo. +torlauncher.unable_to_get_bridge=Neuspjelo dobivanje mosta od BridgeDB-a.\n\n%S +torlauncher.no_meek=Ovaj preglednik nije konfiguriran za meek, što je potrebno za dobivanje mostova.. +torlauncher.no_bridges_available=Trenutačno nema mostova. Žao nam je. torlauncher.connect=Spoji torlauncher.restart_tor=Ponovno pokreni Tor @@ -48,36 +48,36 @@ torlauncher.quit=Prekini torlauncher.quit_win=Izlaz torlauncher.done=Gotovo -torlauncher.forAssistance=Za pomoć, kontaktirajte %S -torlauncher.forAssistance2=Za pomoć posjetite %S +torlauncher.forAssistance=Za pomoć kontaktiraj %S +torlauncher.forAssistance2=Za pomoć posjeti %S torlauncher.copiedNLogMessages=Kopiranje završeno. %S Tor zapisi su spremni za lijepljenje u uređivač teksta ili email poruku. -torlauncher.bootstrapStatus.starting=Starting -torlauncher.bootstrapStatus.conn_pt=Connecting to bridge -torlauncher.bootstrapStatus.conn_done_pt=Connected to bridge -torlauncher.bootstrapStatus.conn_proxy=Connecting to proxy -torlauncher.bootstrapStatus.conn_done_proxy=Connected to proxy -torlauncher.bootstrapStatus.conn=Connecting to a Tor relay -torlauncher.bootstrapStatus.conn_done=Connected to a Tor relay -torlauncher.bootstrapStatus.handshake=Negotiating with a Tor relay -torlauncher.bootstrapStatus.handshake_done=Finished negotiating with a Tor relay -torlauncher.bootstrapStatus.onehop_create=Uspostavljanje enkriptirane veze na direktorij +torlauncher.bootstrapStatus.starting=Pokretanje +torlauncher.bootstrapStatus.conn_pt=Povezivanje s mostom +torlauncher.bootstrapStatus.conn_done_pt=Povezano s mostom +torlauncher.bootstrapStatus.conn_proxy=Povezivanje s poslužiteljem +torlauncher.bootstrapStatus.conn_done_proxy=Povezano s poslužiteljem +torlauncher.bootstrapStatus.conn=Povezivanje s Tor relejem +torlauncher.bootstrapStatus.conn_done=Povezano s Tor relejem +torlauncher.bootstrapStatus.handshake=Pregovaranje s Tor relejem +torlauncher.bootstrapStatus.handshake_done=Gotovo pregovaranje s Tor relejem +torlauncher.bootstrapStatus.onehop_create=Uspostavljanje šifrirane veze direktorija torlauncher.bootstrapStatus.requesting_status=Dohvaćanje statusa mreže torlauncher.bootstrapStatus.loading_status=Učitavanje statusa mreže torlauncher.bootstrapStatus.loading_keys=Učitavanje certifikata autoriteta torlauncher.bootstrapStatus.requesting_descriptors=Zahtjevanje informacija o releju torlauncher.bootstrapStatus.loading_descriptors=Učitavanje informacija o releju -torlauncher.bootstrapStatus.enough_dirinfo=Finished loading relay information -torlauncher.bootstrapStatus.ap_conn_pt=Building circuits: Connecting to bridge -torlauncher.bootstrapStatus.ap_conn_done_pt=Building circuits: Connected to bridge -torlauncher.bootstrapStatus.ap_conn_proxy=Building circuits: Connecting to proxy -torlauncher.bootstrapStatus.ap_conn_done_proxy=Building circuits: Connected to proxy -torlauncher.bootstrapStatus.ap_conn=Building circuits: Connecting to a Tor relay -torlauncher.bootstrapStatus.ap_conn_done=Building circuits: Connected to a Tor relay -torlauncher.bootstrapStatus.ap_handshake=Building circuits: Negotiating with a Tor relay -torlauncher.bootstrapStatus.ap_handshake_done=Building circuits: Finished negotiating with a Tor relay -torlauncher.bootstrapStatus.circuit_create=Building circuits: Establishing a Tor circuit +torlauncher.bootstrapStatus.enough_dirinfo=Gotovo učitavanje informacija o releju +torlauncher.bootstrapStatus.ap_conn_pt=Gradnja lanaca: Povezivanje s mostom +torlauncher.bootstrapStatus.ap_conn_done_pt=Gradnja lanaca: Povezano s mostom +torlauncher.bootstrapStatus.ap_conn_proxy=Gradnja lanaca: Povezivanje s poslužiteljem +torlauncher.bootstrapStatus.ap_conn_done_proxy=Gradnja lanaca: Povezano s poslužiteljem +torlauncher.bootstrapStatus.ap_conn=Gradnja lanaca: Povezivanje s Tor relejem +torlauncher.bootstrapStatus.ap_conn_done=Gradnja lanaca: Povezano s Tor relejem +torlauncher.bootstrapStatus.ap_handshake=Gradnja lanaca: Pregovaranje s Tor relejem +torlauncher.bootstrapStatus.ap_handshake_done=Gradnja lanaca: Gotovo pregovaranje s Tor relejem +torlauncher.bootstrapStatus.circuit_create=Gradnja lanaca: Uspostavljanje Tor lanca torlauncher.bootstrapStatus.done=Spojen na Tor mrežu! torlauncher.bootstrapWarning.done=gotovo @@ -90,6 +90,6 @@ torlauncher.bootstrapWarning.noroute=nema rute do domaćina torlauncher.bootstrapWarning.ioerror=greška čitanja/pisanja torlauncher.bootstrapWarning.pt_missing=nedostaje priključni transport -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Veza s poslužiteljem je izgubljena. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Neuspjelo povezivanje s poslužiteljem. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Neuspjelo povezivanje s proxijem. diff --git a/src/chrome/locale/kk/torlauncher.properties b/src/chrome/locale/kk/torlauncher.properties index 81382ed..d574e5d 100644 --- a/src/chrome/locale/kk/torlauncher.properties +++ b/src/chrome/locale/kk/torlauncher.properties @@ -16,7 +16,7 @@ torlauncher.unable_to_start_tor=Tor іске қосылмады.\n\n%S torlauncher.tor_missing=Tor орындаушысы жоқ. torlauncher.torrc_missing=Torrc файлы жоқ және жасалмады. torlauncher.datadir_missing=Tor деректер каталогы жоқ және жасалмады. -torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. +torlauncher.onionauthdir_missing=Tor onion-ның түпнұсқалық растамасы жоқ және оны құру мүмкін емес. torlauncher.password_hash_missing=Құпия сөзді алу сәтсіз аяқталды. torlauncher.failed_to_get_settings=Tor параметрлерін шығарып алу мүмкін емес.\n\n%S diff --git a/src/chrome/locale/nb-NO/network-settings.dtd b/src/chrome/locale/nb-NO/network-settings.dtd index 6823448..fc60f3b 100644 --- a/src/chrome/locale/nb-NO/network-settings.dtd +++ b/src/chrome/locale/nb-NO/network-settings.dtd @@ -5,7 +5,7 @@  <!ENTITY torlauncher.localePicker.title "Tor Nettleser Språk"> -<!ENTITY torlauncher.localePicker.prompt "Velg språk"> +<!ENTITY torlauncher.localePicker.prompt "Vennligst velg et språk">  @@ -26,8 +26,8 @@ <!ENTITY torsettings.optional "Valgfritt"> <!ENTITY torsettings.useProxy.checkbox "Jeg bruker en mellomtjener for å koble til Internett"> -<!ENTITY torsettings.useProxy.type "Mellomtjeningstype"> -<!ENTITY torsettings.useProxy.type.placeholder "velg en mellomtjenertype"> +<!ENTITY torsettings.useProxy.type "Mellomtjener-type"> +<!ENTITY torsettings.useProxy.type.placeholder "velg en mellomtjener-type"> <!ENTITY torsettings.useProxy.address " Adresse"> <!ENTITY torsettings.useProxy.address.placeholder "IP-adresse, eller vertsnavn"> <!ENTITY torsettings.useProxy.port "Port"> @@ -52,7 +52,7 @@ <!ENTITY torsettings.copyLog "Kopier Tor-loggen til utklippstavlen"> <!ENTITY torsettings.proxyHelpTitle "Mellomtjenerhjelp"> -<!ENTITY torsettings.proxyHelp1 "En lokal proxy kan være nødvendig når du kobler deg gjennom et firma, skole eller universitet nettverk.  Hvis du ikke er sikker på om en proxy er nødvendig, kan du se på Internett-innstillingene i en annen nettleser eller kontrollere systemets nettverksinnstillinger."> +<!ENTITY torsettings.proxyHelp1 "En lokal mellomtjener kan være nødvendig når du kobler deg gjennom et firma, skole eller universitet nettverk.  Hvis du ikke er sikker på om en mellomtjener er nødvendig, kan du se på Internett-innstillingene i en annen nettleser eller kontrollere systemets nettverksinnstillinger."> <!ENTITY torsettings.bridgeHelpTitle "Hjelp med Bro-rutingsstafettoppsett"> <!ENTITY torsettings.bridgeHelp1 "Broer er ulistede rutingstafettoppsett som gjør det vanskeligere å blokkere tilkoblinger til Tor-nettverket.  Hver type bro bruker en egen måte å unngå sensur.  Obfs-broene får trafikken din til å se ut som tilfeldig støy, og de ydmyke broene får broene til å se ut som de kobler til en annen tjeneste enn Tor."> @@ -72,12 +72,12 @@ <!ENTITY torPreferences.requestNewBridge "Forespør ny bro…"> <!ENTITY torPreferences.provideBridge "Gi en bro"> <!ENTITY torPreferences.advanced "Avansert"> -<!ENTITY torPreferences.advancedDescription "Konfigurer hvordan Tor Browser kobles til internett."> -<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> +<!ENTITY torPreferences.advancedDescription "Konfigurer hvordan Tor-nettleseren kobles til internett."> +<!ENTITY torPreferences.firewallPortsPlaceholder "Komma-separerte verdier"> <!ENTITY torPreferences.requestBridgeDialogTitle "Forespør en bro"> <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kontakter BridgeDB. Vennligst vent."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Løs CAPTCHA-en for å forespørre en bro."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "Løsningen er ikke riktig. Vær så snill, prøv på nytt."> <!ENTITY torPreferences.viewTorLogs "Se Tor-loggene."> <!ENTITY torPreferences.viewLogs "Vis logger..."> -<!ENTITY torPreferences.torLogsDialogTitle "Tor Logger"> +<!ENTITY torPreferences.torLogsDialogTitle "Tor logger"> diff --git a/src/chrome/locale/nb-NO/torlauncher.properties b/src/chrome/locale/nb-NO/torlauncher.properties index a00cde2..769200e 100644 --- a/src/chrome/locale/nb-NO/torlauncher.properties +++ b/src/chrome/locale/nb-NO/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Tor-oppstarteren -torlauncher.tor_exited_during_startup=Tor ble avsluttet under oppstart. Dette kan ha sin årsak i en feil i din torrc-fil, en feil i Tor eller et annet program på din maskin, eller feilaktig maskinvare. Tor Nettleser vil ikke starte før det bakenforliggende problemet er ordnet og du har startet det på ny. -torlauncher.tor_exited=Tor avsluttet uventet. Dette kan skyldes en feil i Tor i seg selv, et annet program på systemet ditt eller feil maskinvare. Før du starter Tor på nytt, vil ikke Tor Nettleser kunne nå noen nettsteder. Hvis problemet vedvarer, kan du sende en kopi av Tor-loggen til brukerstøtte team. +torlauncher.tor_exited_during_startup=Tor ble avsluttet under oppstart. Dette kan ha sin årsak i en feil i din torrc-fil, en feil i Tor eller et annet program på din maskin, eller feilaktig maskinvare. Tor-nettleseren vil ikke starte før det bakenforliggende problemet er ordnet og du har startet det på ny. +torlauncher.tor_exited=Tor avsluttet uventet. Dette kan skyldes en feil i Tor i seg selv, et annet program på systemet ditt eller feil maskinvare. Før du starter Tor på nytt, vil ikke Tor-nettleseren kunne nå noen nettsteder. Hvis problemet vedvarer, kan du sende en kopi av Tor-loggen til brukerstøtte team. torlauncher.tor_exited2=Omstart av Tor vil ikke lukke fanene dine. torlauncher.tor_controlconn_failed=Kunne ikke koble til Tor kontrollport. torlauncher.tor_failed_to_start=Tor kunne ikke starte. @@ -24,7 +24,7 @@ torlauncher.failed_to_save_settings=Kunne ikke lagre Tor-innstillinger.\n\n%S torlauncher.ensure_tor_is_running=Sjekk at Tor kjører. torlauncher.error_proxy_addr_missing=Du må spesifisere både IP-adresse eller vertsnavn og et portnummer for å sette opp Tor til bruk med en mellomtjener for å koble til Internett. -torlauncher.error_proxy_type_missing=Du må velge mellomtjenertypen. +torlauncher.error_proxy_type_missing=Du må velge mellomtjener-typen. torlauncher.error_bridges_missing=Du må velge én eller flere broer. torlauncher.error_default_bridges_type_missing=Du må velge en tilkoblingstype for de angitte broene. torlauncher.error_bridgedb_bridges_missing=Forespør en bro. @@ -56,8 +56,8 @@ torlauncher.copiedNLogMessages=Kopiering ferdig. %S Loggføringsmeldinger fra To torlauncher.bootstrapStatus.starting=Starter opp torlauncher.bootstrapStatus.conn_pt=Kobler til bro torlauncher.bootstrapStatus.conn_done_pt=Koblet til broen -torlauncher.bootstrapStatus.conn_proxy=Kobler til proxy -torlauncher.bootstrapStatus.conn_done_proxy=Koblet til proxy +torlauncher.bootstrapStatus.conn_proxy=Kobler til mellomtjener +torlauncher.bootstrapStatus.conn_done_proxy=Koblet til mellomtjener torlauncher.bootstrapStatus.conn=Kobler til et Tor-relé torlauncher.bootstrapStatus.conn_done=Koblet til et Tor-relé torlauncher.bootstrapStatus.handshake=Forhandler med et Tor-relé @@ -71,8 +71,8 @@ torlauncher.bootstrapStatus.loading_descriptors=Laster inn rutingsstafettoppsett torlauncher.bootstrapStatus.enough_dirinfo=Fullført lasting om relé informasjon torlauncher.bootstrapStatus.ap_conn_pt=Bygger kretser: Kobler til bro torlauncher.bootstrapStatus.ap_conn_done_pt=Bygger kretser: Koblet til bro -torlauncher.bootstrapStatus.ap_conn_proxy=Bygger kretser: Kobler til proxy -torlauncher.bootstrapStatus.ap_conn_done_proxy=Bygger kretser: Koblet til proxy +torlauncher.bootstrapStatus.ap_conn_proxy=Bygger kretser: Kobler til mellomtjener +torlauncher.bootstrapStatus.ap_conn_done_proxy=Bygger kretser: Koblet til mellomtjener torlauncher.bootstrapStatus.ap_conn=Bygger kretser: Kobler til et Tor-relé torlauncher.bootstrapStatus.ap_conn_done=Bygger kretser: Koblet til et Tor-relé torlauncher.bootstrapStatus.ap_handshake=Bygger kretser: Forhandler med et Tor-relé diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd index dd42068..733730d 100644 --- a/src/chrome/locale/pl/network-settings.dtd +++ b/src/chrome/locale/pl/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Kliknij "Połącz", aby połączyć się z Torem."> -<!ENTITY torSettings.configurePrompt "Kliknij "Konfiguruj", aby dostosować ustawienia sieci, jeśli jesteś w kraju, który cenzuruje Tora (np. Egipt, Chiny, Turcja) lub jeśli łączysz się z prywatną siecią, która wymaga serwera proxy."> +<!ENTITY torSettings.configurePrompt "Kliknij "Konfiguruj", aby dostosować ustawienia sieci, jeśli jesteś w kraju, który cenzuruje Tora (np. Egipt, Chiny, Turcja) lub jeśli łączysz się z prywatnej sieci, która wymaga serwera proxy."> <!ENTITY torSettings.configure "Konfiguruj"> <!ENTITY torSettings.connect "Połącz"> @@ -20,13 +20,13 @@ <!ENTITY torsettings.restartTor "Zrestartuj Tora"> <!ENTITY torsettings.reconfigTor "Przekonfiguruj"> -<!ENTITY torsettings.discardSettings.prompt "Skonfigurowałeś mosty Tora lub wprowadziłeś lokalne ustawienia serwera proxy.  Aby nawiązać bezpośrednie połączenie do sieci Tor, ustawienia te muszą być usunięte."> -<!ENTITY torsettings.discardSettings.proceed "Usuń Ustawienia i Połącz"> +<!ENTITY torsettings.discardSettings.prompt "Skonfigurowałeś mostki Tora lub wprowadziłeś lokalne ustawienia serwera proxy.  Aby nawiązać bezpośrednie połączenie do sieci Tor, ustawienia te muszą być usunięte."> +<!ENTITY torsettings.discardSettings.proceed "Usuń ustawienia i połącz"> <!ENTITY torsettings.optional "(opcjonalnie)"> -<!ENTITY torsettings.useProxy.checkbox "Używam proxy do łączenia się z Internetem"> -<!ENTITY torsettings.useProxy.type "Typ Proxy"> +<!ENTITY torsettings.useProxy.checkbox "Używam serwera proxy do łączenia się z Internetem"> +<!ENTITY torsettings.useProxy.type "Typ serwera proxy"> <!ENTITY torsettings.useProxy.type.placeholder "wybierz typ proxy"> <!ENTITY torsettings.useProxy.address "Adres"> <!ENTITY torsettings.useProxy.address.placeholder "Nazwa hosta lub adres IP"> @@ -37,17 +37,17 @@ <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Ten komputer pozwala na połączenie z ustalonymi portami"> -<!ENTITY torsettings.firewall.allowedPorts "Dozwolone Porty"> +<!ENTITY torsettings.firewall.allowedPorts "Dozwolone porty"> <!ENTITY torsettings.useBridges.checkbox "Tor jest ocenzurowany w moim kraju"> -<!ENTITY torsettings.useBridges.default "Wybierz wbudowany most"> -<!ENTITY torsettings.useBridges.default.placeholder "wybierz most"> -<!ENTITY torsettings.useBridges.bridgeDB "Zażądaj mostu od torproject.org"> +<!ENTITY torsettings.useBridges.default "Wybierz wbudowany mostek"> +<!ENTITY torsettings.useBridges.default.placeholder "wybierz mostek"> +<!ENTITY torsettings.useBridges.bridgeDB "Uzyskaj mostek od torproject.org"> <!ENTITY torsettings.useBridges.captchaSolution.placeholder "Wprowadź znaki z obrazka"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Uzyskaj nowe wyzwanie"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Poproś o inne zadanie"> <!ENTITY torsettings.useBridges.captchaSubmit "Podsumowując"> <!ENTITY torsettings.useBridges.custom "Dostarcz mostek, który znam"> <!ENTITY torsettings.useBridges.label "Wprowadź informacje o mostku z zaufanego źródła."> -<!ENTITY torsettings.useBridges.placeholder "wpisz adres:port (po jednym w linii)"> +<!ENTITY torsettings.useBridges.placeholder "wpisz adres:port (po jednym w każdej linii)"> <!ENTITY torsettings.copyLog "Skopiuj log do schowka"> @@ -55,29 +55,29 @@ <!ENTITY torsettings.proxyHelp1 "Lokalny serwer proxy może być potrzebny podczas łączenia się przez sieć firmową, szkolną lub uniwersytecką. Jeśli nie masz pewności, czy serwer proxy jest potrzebny, sprawdź ustawienia internetowe w innej przeglądarce lub sprawdź ustawienia sieciowe systemu."> <!ENTITY torsettings.bridgeHelpTitle "Pomoc Przekaźników Mostkowych"> -<!ENTITY torsettings.bridgeHelp1 "Mosty są zastrzeżonymi przekaźnikami, które utrudniają blokowanie połączeń z siecią Tor. Każdy rodzaj mostu wykorzystuje inną metodę unikania cenzury.  Obiekty obfs sprawiają, że twój ruch wygląda jak losowy szum, a łagodne połączenia sprawiają, że twój ruch wygląda jakbyś łączył się z tą usługą zamiast z Torem."> -<!ENTITY torsettings.bridgeHelp2 "Ze względu na to, jak niektóre kraje próbują blokować Tora, niektóre mosty działają w niektórych krajach, ale nie w innych.  Jeśli nie masz pewności, które mosty działają w Twoim kraju, odwiedź torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "Mosty są specjalnymi rodzajami przekaźników, które utrudniają blokowanie połączeń z siecią Tor. Każdy rodzaj mostku wykorzystuje inną metodę unikania cenzury.  Mostki "obfs" sprawiają, że Twój ruch wygląda jak losowy szum, a "meek-azure" sprawiają, że Twój ruch wygląda jakbyś łączył się z tą usługą zamiast z Torem."> +<!ENTITY torsettings.bridgeHelp2 "Ze względu na różny sposób, w jaki kraje próbują blokować Tora, niektóre mostki działają tylko w niektórych krajach.  Jeśli nie masz pewności, które mostki działają w Twoim kraju, odwiedź torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Proszę zaczekać, aż ustanowimy połączenie do sieci Tor.  To może zająć kilka minut."> +<!ENTITY torprogress.pleaseWait "Proszę zaczekać, aż ustanowimy połączenie do sieci Tor.  Może to potrwać kilka minut.">  <!ENTITY torPreferences.categoryTitle "Tor"> <!ENTITY torPreferences.torSettings "Ustawienia Tor"> -<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > +<!ENTITY torPreferences.torSettingsDescription "Przeglądarka Tor kieruje Twój ruch przez sieć Tor, utrzymywaną przez tysiące wolontariuszy na całym świecie." > <!ENTITY torPreferences.learnMore "Dowiedz się więcej"> <!ENTITY torPreferences.bridges "Mostki"> -<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> -<!ENTITY torPreferences.useBridge "Użyj mostu"> -<!ENTITY torPreferences.requestNewBridge "Poproś o nowy most..."> +<!ENTITY torPreferences.bridgesDescription "Mostki ułatwiają dostęp do sieci Tor w miejscach, w których Tor jest zablokowany. W zależności od tego, gdzie jesteś, niektóre mostki mogą działać lepiej niż inne."> +<!ENTITY torPreferences.useBridge "Użyj mostku"> +<!ENTITY torPreferences.requestNewBridge "Poproś o nowy mostek..."> <!ENTITY torPreferences.provideBridge "Dodaj most"> <!ENTITY torPreferences.advanced "Zaawansowane"> -<!ENTITY torPreferences.advancedDescription "Skonfiguruj jak Przeglądarka Tor łączy się z internetem."> +<!ENTITY torPreferences.advancedDescription "Skonfiguruj w jaki sposób Przeglądarka Tor łączy się z Internetem."> <!ENTITY torPreferences.firewallPortsPlaceholder "Wartości oddzielone przecinkiem"> -<!ENTITY torPreferences.requestBridgeDialogTitle "Poproś o Most"> +<!ENTITY torPreferences.requestBridgeDialogTitle "Poproś o mostek"> <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Nawiązywanie połączenia z BridgeDB. Proszę czekać."> -<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Rozwiąż CAPTCHA, aby poprosić o most."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Rozwiąż CAPTCHA, aby poprosić o mostek."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "Rozwiązanie nie jest poprawne. Proszę spróbuj ponownie."> -<!ENTITY torPreferences.viewTorLogs "Zobacz dziennik Tor."> +<!ENTITY torPreferences.viewTorLogs "Zobacz dziennik zdarzeń Tor."> <!ENTITY torPreferences.viewLogs "Wyświetl dziennik..."> -<!ENTITY torPreferences.torLogsDialogTitle "Dziennik Tor"> +<!ENTITY torPreferences.torLogsDialogTitle "Dziennik zdarzeń Tor"> diff --git a/src/chrome/locale/pl/torlauncher.properties b/src/chrome/locale/pl/torlauncher.properties index ce40f0d..a7cba2a 100644 --- a/src/chrome/locale/pl/torlauncher.properties +++ b/src/chrome/locale/pl/torlauncher.properties @@ -27,20 +27,20 @@ torlauncher.error_proxy_addr_missing=Musisz określić adres IP lub nazwę hosta torlauncher.error_proxy_type_missing=Musisz wybrać typ proxy. torlauncher.error_bridges_missing=Musisz podać jeden lub więcej mostów. (bridges) torlauncher.error_default_bridges_type_missing=Musisz wybrać rodzaj transportu dla dostępnych mostów. -torlauncher.error_bridgedb_bridges_missing=Proszę poprosić o most. +torlauncher.error_bridgedb_bridges_missing=Proszę poprosić o mostek. torlauncher.error_bridge_bad_default_type=Brak dostępnych mostków, które mają typ transportu %S. Proszę zmienić swoje ustawienia. torlauncher.bridge_suffix.meek-amazon=(działa w Chinach) torlauncher.bridge_suffix.meek-azure=(działa w Chinach) -torlauncher.request_a_bridge=Poproś o most... -torlauncher.request_a_new_bridge=Poproś o nowy most... +torlauncher.request_a_bridge=Poproś o mostek... +torlauncher.request_a_new_bridge=Poproś o nowy mostek... torlauncher.contacting_bridgedb=Kontakt z BridgeDB. Proszę czekać. -torlauncher.captcha_prompt=Rozwiąż CAPTCHA, aby poprosić o most. +torlauncher.captcha_prompt=Rozwiąż CAPTCHA, aby poprosić o mostek. torlauncher.bad_captcha_solution=Rozwiązanie nie jest poprawne. Proszę spróbuj ponownie. -torlauncher.unable_to_get_bridge=Nie można uzyskać mostu z BridgeDB.\n\n%S -torlauncher.no_meek=Ta przeglądarka nie jest skonfigurowana dla połączeń, które są potrzebne do uzyskania mostów. -torlauncher.no_bridges_available=W tej chwili nie są dostępne żadne mosty. Przepraszam. +torlauncher.unable_to_get_bridge=Nie można uzyskać mostku z BridgeDB.\n\n%S +torlauncher.no_meek=Ta przeglądarka nie jest skonfigurowana dla połączeń, które są potrzebne do uzyskania mostków. +torlauncher.no_bridges_available=W tej chwili nie są dostępne żadne mostki. Przepraszamy. torlauncher.connect=Połącz torlauncher.restart_tor=Zrestartuj Tora @@ -54,8 +54,8 @@ torlauncher.forAssistance2=Aby uzyskać pomoc, odwiedź %S torlauncher.copiedNLogMessages=Kopia zakończona. %S logi Tora są gotowe do wklejenia do notatnika lub wiadomości email. torlauncher.bootstrapStatus.starting=Uruchamianie -torlauncher.bootstrapStatus.conn_pt=Łączenie z mostem -torlauncher.bootstrapStatus.conn_done_pt=Połączono z mostem +torlauncher.bootstrapStatus.conn_pt=Łączenie z mostkiem +torlauncher.bootstrapStatus.conn_done_pt=Połączono z mostkiem torlauncher.bootstrapStatus.conn_proxy=Łączenie z proxy torlauncher.bootstrapStatus.conn_done_proxy=Połączono z proxy torlauncher.bootstrapStatus.conn=Łączenie z przekaźnikiem Tora @@ -69,8 +69,8 @@ torlauncher.bootstrapStatus.loading_keys=Wczytywanie certyfikatów uwierzytelnie torlauncher.bootstrapStatus.requesting_descriptors=Żądanie informacji o węźle torlauncher.bootstrapStatus.loading_descriptors=Wczytywanie informacji o węźle torlauncher.bootstrapStatus.enough_dirinfo=Zakończono ładowanie informacji przekaźnika -torlauncher.bootstrapStatus.ap_conn_pt=Budowanie obwodu: Łączenie z mostem -torlauncher.bootstrapStatus.ap_conn_done_pt=Budowanie obwodu: Połączono z mostem +torlauncher.bootstrapStatus.ap_conn_pt=Budowanie obwodu: Łączenie z mostkiem +torlauncher.bootstrapStatus.ap_conn_done_pt=Budowanie obwodu: Połączono z mostkiem torlauncher.bootstrapStatus.ap_conn_proxy=Budowanie obwodu: Łączenie z proxy torlauncher.bootstrapStatus.ap_conn_done_proxy=Budowanie obwodu: Połączono z proxy torlauncher.bootstrapStatus.ap_conn=Budowanie obwodu: Łączenie z przekaźnikiem Tora diff --git a/src/chrome/locale/ru/torlauncher.properties b/src/chrome/locale/ru/torlauncher.properties index 82284c1..543cb96 100644 --- a/src/chrome/locale/ru/torlauncher.properties +++ b/src/chrome/locale/ru/torlauncher.properties @@ -16,7 +16,7 @@ torlauncher.unable_to_start_tor=Невозможно запустить Tor.\n\n torlauncher.tor_missing=Исполняемый файл Tor отсутствует. torlauncher.torrc_missing=torrc файл отсутствует и не может быть создан. torlauncher.datadir_missing=Директория данных Tor не существует и не может быть создана. -torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. +torlauncher.onionauthdir_missing=Каталог проверки подлинности Tor не существует и не может быть создан. torlauncher.password_hash_missing=Не удается получить хэшированный пароль. torlauncher.failed_to_get_settings=Не удается загрузить настройки Tor.\n\n%S diff --git a/src/chrome/locale/sv-SE/network-settings.dtd b/src/chrome/locale/sv-SE/network-settings.dtd index 05823df..4a65574 100644 --- a/src/chrome/locale/sv-SE/network-settings.dtd +++ b/src/chrome/locale/sv-SE/network-settings.dtd @@ -5,7 +5,7 @@  <!ENTITY torlauncher.localePicker.title "Språk i Tor Browser"> -<!ENTITY torlauncher.localePicker.prompt "Välj ett språk."> +<!ENTITY torlauncher.localePicker.prompt "Vänligen välj ett språk.">  @@ -45,7 +45,7 @@ <!ENTITY torsettings.useBridges.captchaSolution.placeholder "Ange tecknen från bilden"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Få en ny utmaning"> <!ENTITY torsettings.useBridges.captchaSubmit "Skicka"> -<!ENTITY torsettings.useBridges.custom "Använd en egen bro"> +<!ENTITY torsettings.useBridges.custom "Ange en bro jag vet"> <!ENTITY torsettings.useBridges.label "Ange broinformationen från en betrodd källa"> <!ENTITY torsettings.useBridges.placeholder "skriv adress:port (en per rad)"> @@ -55,11 +55,11 @@ <!ENTITY torsettings.proxyHelp1 "En lokal proxy kan behövas när du ansluter via ett företags-, skol- eller universitetsnätverk. Om du inte är säker på om en proxy behövs, titta på internetinställningarna i en annan webbläsare eller kontrollera systemets nätverksinställningar."> <!ENTITY torsettings.bridgeHelpTitle "Hjälp om relä-broar"> -<!ENTITY torsettings.bridgeHelp1 "Broar är olistade reläer som gör det svårare att blockera anslutningar till Tor nätverket.   Var typ av bro använder sig av olika metoder för att undvika censur.   Obfs gör att din trafik ser ut som brus och meek gör att din trafik ser ut som att du ansluter till tjänsten istället för Tor."> +<!ENTITY torsettings.bridgeHelp1 "Broar är olistade reläer som gör det svårare att blockera anslutningar till Tor-nätverket.   Var typ av bro använder sig av olika metoder för att undvika censur.   Obfs gör att din trafik ser ut som brus och meek gör att din trafik ser ut som att du ansluter till tjänsten istället för Tor."> <!ENTITY torsettings.bridgeHelp2 "I och med att vissa länder försöker blockera Tor fungerar inte alla broar i alla länder.   Ifall du är osäker på vilka broar som fungerar i ditt land besök torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Var god och vänta medan vi etablerar en anslutning till Tor-nätverket.   Detta kan ta upp till flera minuter."> +<!ENTITY torprogress.pleaseWait "Vänligen vänta medan vi etablerar en anslutning till Tor-nätverket.   Detta kan ta flera minuter.">  <!ENTITY torPreferences.categoryTitle "Tor"> @@ -70,7 +70,7 @@ <!ENTITY torPreferences.bridgesDescription "Broar hjälper dig att komma åt Tor-nätverket på platser där Tor är blockerat. Beroende på var du är, kan en bro fungera bättre än en annan."> <!ENTITY torPreferences.useBridge "Använd en bro"> <!ENTITY torPreferences.requestNewBridge "Begär en ny bro..."> -<!ENTITY torPreferences.provideBridge "Tillhandahålla en bro"> +<!ENTITY torPreferences.provideBridge "Ange en bro"> <!ENTITY torPreferences.advanced "Avancerat"> <!ENTITY torPreferences.advancedDescription "Konfigurera hur Tor Browser ansluter till internet."> <!ENTITY torPreferences.firewallPortsPlaceholder "Kommaseparerade värden"> diff --git a/src/chrome/locale/sv-SE/torlauncher.properties b/src/chrome/locale/sv-SE/torlauncher.properties index d89feaf..b267016 100644 --- a/src/chrome/locale/sv-SE/torlauncher.properties +++ b/src/chrome/locale/sv-SE/torlauncher.properties @@ -4,31 +4,31 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited_during_startup=Tor stängdes av under uppstart. Detta kan bero på ett fel i din torrc-fil, ett fel i Tor eller ett annat program på ditt system, eller ett hårdvarufel. Tills dess att du har åtgärdat det underliggande problemet och startat om Tor, kommer Tor Browser inte starta. -torlauncher.tor_exited=Tor stängdes oväntat ner. Det kan bero på ett fel i Tor eller i ett annat program på din dator, eller ett hårdvarufel. Tor Browser kommer inte kunna komma åt några sidor förrän du har startat om Tor. Om problemet återkommer, skicka en kopia på din Tor-logg till vår support. +torlauncher.tor_exited=Tor stängdes oväntat ner. Det kan bero på ett fel i Tor, ett annat program på ditt system eller ett hårdvarufel. Tor Browser kommer inte kunna komma åt några webbplatser förrän du har startat om Tor. Om problemet återkommer, vänligen skicka en kopia på din Tor-logg till vår support. torlauncher.tor_exited2=Starta om Tor stänger inte flikarna i webbläsaren. torlauncher.tor_controlconn_failed=Kunde inte ansluta till Tor-kontrollport. torlauncher.tor_failed_to_start=Det gick inte att starta Tor. -torlauncher.tor_control_failed=Misslyckades med att ta kontroll över Tor. -torlauncher.tor_bootstrap_failed=Tor misslyckades med att upprätta en anslutning till Tor-nätverket. +torlauncher.tor_control_failed=Det gick inte att ta kontroll över Tor. +torlauncher.tor_bootstrap_failed=Tor kunde inte upprätta en Tor-nätverksanslutning. torlauncher.tor_bootstrap_failed_details=%1$S misslyckades (%2$S). -torlauncher.unable_to_start_tor=Kan inte starta Tor.\n\n%S +torlauncher.unable_to_start_tor=Det går inte att starta Tor.\n\n%S torlauncher.tor_missing=Tors körbara programfil saknas. torlauncher.torrc_missing=Torrc-fil saknas och kunde inte skapas. torlauncher.datadir_missing=Tor-datakatalog finns inte och kunde inte skapas. torlauncher.onionauthdir_missing=Autentiseringskatalogen Tor onion finns inte och kunde inte skapas. torlauncher.password_hash_missing=Det gick inte att få hashat lösenord. -torlauncher.failed_to_get_settings=Kunde inte läsa in inställningar för Tor.\n\n%S -torlauncher.failed_to_save_settings=Kunde inte spara inställningar för Tor.\n\n%S -torlauncher.ensure_tor_is_running=Försäkra dig om att Tor är startad. +torlauncher.failed_to_get_settings=Det går inte att hämta inställningarna för Tor.\n\n%S +torlauncher.failed_to_save_settings=Det går inte att spara inställningarna för Tor.\n\n%S +torlauncher.ensure_tor_is_running=Vänligen försäkra dig om att Tor är startad. torlauncher.error_proxy_addr_missing=Du måste ange både en IP-adress eller värdnamn, samt ett port-nummer för att konfigurera Tor till att använda en proxy för att nå Internet. torlauncher.error_proxy_type_missing=Du måste välja proxytyp. torlauncher.error_bridges_missing=Du måste ange en eller flera broar. -torlauncher.error_default_bridges_type_missing=Du måste välja en transporttyp för de förkonfigurerade broarna. +torlauncher.error_default_bridges_type_missing=Du måste välja en transporttyp för de angivna broarna. torlauncher.error_bridgedb_bridges_missing=Vänligen begär en bro. -torlauncher.error_bridge_bad_default_type=Det finns inga förkonfigurerade broar för transporttypen %S tillgängliga. Du behöver ändra dina inställningar. +torlauncher.error_bridge_bad_default_type=Det finns inga angivna broar för transporttypen %S tillgängliga. Vänligen justera dina inställningar. torlauncher.bridge_suffix.meek-amazon=(fungerar i Kina) torlauncher.bridge_suffix.meek-azure=(fungerar i Kina) @@ -38,7 +38,7 @@ torlauncher.request_a_new_bridge=Begär en ny bro... torlauncher.contacting_bridgedb=Kontaktar BridgeDB. Vänligen vänta. torlauncher.captcha_prompt=Lös CAPTCHA:n för att begära en bro. torlauncher.bad_captcha_solution=Lösningen är inte korrekt. Vänligen försök igen. -torlauncher.unable_to_get_bridge=Kunde inte ta emot en bro från BridgeDB.\n\n%S +torlauncher.unable_to_get_bridge=Det går inte att ta emot en bro från BridgeDB.\n\n%S torlauncher.no_meek=Den här webbläsaren är inte konfigurerad för meek, vilket krävs för att ta emot broar. torlauncher.no_bridges_available=Inga broar finns tillgängliga för tillfället, tyvärr. @@ -68,7 +68,7 @@ torlauncher.bootstrapStatus.loading_status=Läser in nätverksstatus torlauncher.bootstrapStatus.loading_keys=Läser in auktoritära certifikat torlauncher.bootstrapStatus.requesting_descriptors=Begär reläinformation torlauncher.bootstrapStatus.loading_descriptors=Läser in reläinformation -torlauncher.bootstrapStatus.enough_dirinfo=Färdig inläsning av relä-information +torlauncher.bootstrapStatus.enough_dirinfo=Färdig inläsning av reläinformation torlauncher.bootstrapStatus.ap_conn_pt=Bygger kretser: Ansluter till bron torlauncher.bootstrapStatus.ap_conn_done_pt=Bygger kretser: Ansluten till bron torlauncher.bootstrapStatus.ap_conn_proxy=Bygger kretsar: Ansluter till proxyservern diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd index 53500ef..c1a1507 100644 --- a/src/chrome/locale/zh-CN/network-settings.dtd +++ b/src/chrome/locale/zh-CN/network-settings.dtd @@ -77,7 +77,7 @@ <!ENTITY torPreferences.requestBridgeDialogTitle "正在请求网桥"> <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "正在连接到 BridgeDB，请等待。"> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "请输入验证码以获取网桥。"> -<!ENTITY torPreferences.requestBridgeErrorBadSolution "结果并不正确，请重试。"> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "输入错误，请重试。"> <!ENTITY torPreferences.viewTorLogs "查看 Tor 日志。"> <!ENTITY torPreferences.viewLogs "查看日志"> <!ENTITY torPreferences.torLogsDialogTitle "Tor 日志"> diff --git a/src/chrome/locale/zh-CN/torlauncher.properties b/src/chrome/locale/zh-CN/torlauncher.properties index dbb5658..54bdfcc 100644 --- a/src/chrome/locale/zh-CN/torlauncher.properties +++ b/src/chrome/locale/zh-CN/torlauncher.properties @@ -37,7 +37,7 @@ torlauncher.request_a_bridge=正在请求网桥…… torlauncher.request_a_new_bridge=正在请求新网桥…… torlauncher.contacting_bridgedb=正在连接到BridgeDB,请等待。 torlauncher.captcha_prompt=请输入验证码以获取网桥。 -torlauncher.bad_captcha_solution=结果并不正确，请重试。 +torlauncher.bad_captcha_solution=输入错误，请重试。 torlauncher.unable_to_get_bridge=无法从BridgeDB获取网桥。\n\n%S torlauncher.no_meek=这个浏览器未被配置为可以使用meek，获取网桥需要这个功能。 torlauncher.no_bridges_available=抱歉，目前没有可供使用的网桥。 @@ -77,7 +77,7 @@ torlauncher.bootstrapStatus.ap_conn=建立链路：正在连接到 Tor 中继 torlauncher.bootstrapStatus.ap_conn_done=建立链路：已连接到 Tor 中继 torlauncher.bootstrapStatus.ap_handshake=建立链路：与 Tor 中继交涉中 torlauncher.bootstrapStatus.ap_handshake_done=建立链路：与一个 Tor 中继交涉完毕 -torlauncher.bootstrapStatus.circuit_create=建立链路：建立一个 Tor 链路中 +torlauncher.bootstrapStatus.circuit_create=建立链路：正在建立 Tor 链路 torlauncher.bootstrapStatus.done=Tor 网络已经连接！ torlauncher.bootstrapWarning.done=完成 diff --git a/src/install.rdf b/src/install.rdf index b8e379b..4cae1e1 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.21.5</em:version> + <em:version>0.2.21.6</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

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

02 May '20

commit 36f8182a25818548d62b7fbc6be4d2472773b820 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sat May 2 16:50:49 2020 +0000 Translations update --- chrome/locale/da/aboutDialog.dtd | 2 +- chrome/locale/da/aboutTor.dtd | 2 +- chrome/locale/da/brand.dtd | 2 +- chrome/locale/da/brand.properties | 2 +- chrome/locale/da/browserOnboarding.properties | 32 +++--- chrome/locale/da/torbutton.dtd | 16 +-- chrome/locale/da/torbutton.properties | 130 +++++++++++------------ chrome/locale/fa/torbutton.properties | 84 +++++++-------- chrome/locale/he/torbutton.properties | 28 ++--- chrome/locale/is/aboutTor.dtd | 2 +- chrome/locale/is/torbutton.properties | 48 ++++----- chrome/locale/it/torbutton.properties | 82 +++++++------- chrome/locale/ka/torbutton.properties | 88 +++++++-------- chrome/locale/lt/torbutton.properties | 6 +- chrome/locale/mk/aboutTor.dtd | 2 +- chrome/locale/mk/torbutton.properties | 84 +++++++-------- chrome/locale/nb-NO/aboutTBUpdate.dtd | 4 +- chrome/locale/nb-NO/aboutTor.dtd | 6 +- chrome/locale/nb-NO/browserOnboarding.properties | 32 +++--- chrome/locale/nb-NO/torbutton.dtd | 12 +-- chrome/locale/nb-NO/torbutton.properties | 20 ++-- chrome/locale/nl/torbutton.properties | 86 +++++++-------- chrome/locale/pl/aboutTBUpdate.dtd | 4 +- chrome/locale/pl/aboutTor.dtd | 8 +- chrome/locale/pl/brand.dtd | 2 +- chrome/locale/pl/torbutton.dtd | 20 ++-- chrome/locale/pl/torbutton.properties | 22 ++-- chrome/locale/pt-BR/torbutton.properties | 20 ++-- chrome/locale/ro/aboutTor.dtd | 2 +- chrome/locale/ro/torbutton.properties | 84 +++++++-------- chrome/locale/sv-SE/aboutTor.dtd | 2 +- chrome/locale/sv-SE/brand.properties | 2 +- chrome/locale/sv-SE/torbutton.properties | 100 ++++++++--------- chrome/locale/tr/aboutTor.dtd | 2 +- chrome/locale/tr/torbutton.properties | 84 +++++++-------- chrome/locale/zh-CN/aboutTor.dtd | 2 +- chrome/locale/zh-CN/torbutton.properties | 46 ++++---- 37 files changed, 585 insertions(+), 585 deletions(-) diff --git a/chrome/locale/da/aboutDialog.dtd b/chrome/locale/da/aboutDialog.dtd index 0105c4c7..d96a1f1b 100644 --- a/chrome/locale/da/aboutDialog.dtd +++ b/chrome/locale/da/aboutDialog.dtd @@ -15,5 +15,5 @@  <!ENTITY bottomLinks.grow "Hjælp Tor-netværket med at vokse!">  -<!ENTITY bottomLinks.license "Licens Information"> +<!ENTITY bottomLinks.license "Licensinformation"> <!ENTITY tor.TrademarkStatement ""Tor" og "løg-logoet" er registrerede varemærker tilhørende Tor Project, Inc."> diff --git a/chrome/locale/da/aboutTor.dtd b/chrome/locale/da/aboutTor.dtd index 58e37f56..789e4a0d 100644 --- a/chrome/locale/da/aboutTor.dtd +++ b/chrome/locale/da/aboutTor.dtd @@ -27,5 +27,5 @@ <!ENTITY aboutTor.newsletter.tagline "Få de seneste nyheder fra Tor direkte i din indbakke."> <!ENTITY aboutTor.newsletter.link_text "Tilmeld Tor-nyheder."> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor er gratis takke være donationer fra personer som dig."> +<!ENTITY aboutTor.donationBanner.freeToUse "Tor er gratis at bruge takke være donationer fra personer som dig."> <!ENTITY aboutTor.donationBanner.buttonA "Donér nu"> diff --git a/chrome/locale/da/brand.dtd b/chrome/locale/da/brand.dtd index 188f2d0d..b395d3a6 100644 --- a/chrome/locale/da/brand.dtd +++ b/chrome/locale/da/brand.dtd @@ -12,4 +12,4 @@ <!ENTITY plugins.installed.find "Klik for at indlæse installerede systemplugins"> <!ENTITY plugins.installed.enable "Aktivér plugins"> <!ENTITY plugins.installed.disable "Deaktivér plugins"> -<!ENTITY plugins.installed.disable.tip "Klik for at undgå indlæsning af systemplugins"> +<!ENTITY plugins.installed.disable.tip "Klik for at forhindre indlæsning af systemplugins"> diff --git a/chrome/locale/da/brand.properties b/chrome/locale/da/brand.properties index dec4fbd5..51cba078 100644 --- a/chrome/locale/da/brand.properties +++ b/chrome/locale/da/brand.properties @@ -11,6 +11,6 @@ homePageSingleStartMain=Firefox Start, en hurtig startside med indbygget søgnin homePageImport=Importer din startside fra %S homePageMigrationPageTitle=Valg af startside -homePageMigrationDescription=Vælg den ønskede startside: +homePageMigrationDescription=Vælg venligst den startside du ønsker at bruge: syncBrandShortName=Synkroniser diff --git a/chrome/locale/da/browserOnboarding.properties b/chrome/locale/da/browserOnboarding.properties index f8ced959..373e919a 100644 --- a/chrome/locale/da/browserOnboarding.properties +++ b/chrome/locale/da/browserOnboarding.properties @@ -4,7 +4,7 @@ onboarding.tour-tor-welcome=Velkommen onboarding.tour-tor-welcome.title=Du er klar. -onboarding.tour-tor-welcome.description=Tor Browser tilbyder den højeste standard indenfor privatliv og sikkerhed på webbet. Du er nu beskyttet mod sporing, overvågning og censur. Denne hurtige introduktion viser dig hvordan. +onboarding.tour-tor-welcome.description=Tor Browser tilbyder den højeste standard indenfor privatliv og sikkerhed på webbet. Du er nu beskyttet mod sporing, overvågning og censur. Den hurtige introduktion viser dig hvordan. onboarding.tour-tor-welcome.next-button=Gå til privatliv onboarding.tour-tor-privacy=Privatliv @@ -14,35 +14,35 @@ onboarding.tour-tor-privacy.button=Gå til Tor-netværk onboarding.tour-tor-network=Tor-netværk onboarding.tour-tor-network.title=Rejs på et decentraliseret netværk. -onboarding.tour-tor-network.description=Tor Browser opretter forbindelse for dig til Tor-netværket, som køres af tusindvis af frivillige verden over. I modsætning til en VPN, er der ikke ét punkt som kan få det til at fejle, eller centraliseret indgang som du skal have tillid til for at bruge internettet privat. -onboarding.tour-tor-network.description-para2=NYT: Tor-netværksindstillinger som indeholder muligheden for at anmode om broer hvor Tor er blokeret, kan nu findes i Præferencer. +onboarding.tour-tor-network.description=Tor Browser forbinder dig til Tor-netværket, som køres af tusindvis af frivillige verden over. I modsætning til en VPN, er der ikke ét punkt som kan få det til at fejle, eller centraliseret indgang som du skal have tillid til for at bruge internettet privat. +onboarding.tour-tor-network.description-para2=NYT: Tor-netværksindstillingerne, herunder muligheden for at anmode om broer hvor Tor er blokeret, findes nu i Præferencer. onboarding.tour-tor-network.action-button=Juster dine Tor-netværksindstillinger onboarding.tour-tor-network.button=Gå til kredsløb-visning onboarding.tour-tor-circuit-display=Kredsløb-visning onboarding.tour-tor-circuit-display.title=Se din sti. -onboarding.tour-tor-circuit-display.description=Hver gang du besøger et domæne, videresendes og krypteres din trafik i et kredsløb hen over tre Tor-relæ verden over. Webstederne kan ikke se hvor du opretter forbindelse fra. Du kan anmode om et nyt kredsløb ved at klikke på ‘Nyt kredsløb til dette sted’ på vores kredsløb-display. +onboarding.tour-tor-circuit-display.description=Hver gang du besøger et domæne, videresendes og krypteres din trafik i et kredsløb hen over tre Tor-relæer verden over. Webstederne kan ikke se hvor du opretter forbindelse fra. Du kan anmode om et nyt kredsløb ved at klikke på ‘Nyt kredsløb til dette sted’ på vores kredsløb-visning. onboarding.tour-tor-circuit-display.button=Se min sti onboarding.tour-tor-circuit-display.next-button=Gå til sikkerhed onboarding.tour-tor-security=Sikkerhed onboarding.tour-tor-security.title=Vælg din oplevelse. onboarding.tour-tor-security.description=Vi giver dig også yderligere sikkerhedsindstillinger for at øge din browsersikkerhed. Vores sikkerhedsindstillinger giver dig mulighed for at blokere elementer der kan bruges til at angribe din computer. Klik nedenfor for at se hvad de forskellige valgmuligheder gør. -onboarding.tour-tor-security.description-suffix=Bemærk: NoScript og HTTPS Everywhere inkluderes, som standard, ikke på værktøjslinjen, men du kan tilpasse din værktøjsline for at tilføje dem. +onboarding.tour-tor-security.description-suffix=Bemærk: NoScript og HTTPS Everywhere inkluderes, som standard, ikke på værktøjslinjen, men du kan tilpasse din værktøjslinje for at tilføje dem. onboarding.tour-tor-security-level.button=Se dit sikkerhedsniveau onboarding.tour-tor-security-level.next-button=Gå til oplevelesestips onboarding.tour-tor-expect-differences=Oplevelesestips -onboarding.tour-tor-expect-differences.title=Forvent nogen forskelle. -onboarding.tour-tor-expect-differences.description=Med alle de sikkerheds- og privatlivsfunktionaliteter som gives af Tor, kan din oplevelse på internettet være lidt anderledes. Ting man være lidt langsommere, og afhængig af dit sikkerhedsniveau, kan det være at nogle elementer ikke virker eller ikke indlæses. Du bliver måske også spurgt om du er et menneske eller en robot. +onboarding.tour-tor-expect-differences.title=Forvent nogle forskelle. +onboarding.tour-tor-expect-differences.description=Med alle de sikkerheds- og privatlivsfunktionaliteter som gives af Tor, kan din oplevelse på internettet være lidt anderledes. Ting kan være lidt langsommere, og afhængig af dit sikkerhedsniveau, kan det være at nogle elementer ikke virker eller ikke indlæses. Du bliver måske også spurgt om du er et menneske eller en robot. onboarding.tour-tor-expect-differences.button=Se FAQ'er -onboarding.tour-tor-expect-differences.next-button=Gå til Oniontjenester +onboarding.tour-tor-expect-differences.next-button=Gå til oniontjenester onboarding.tour-tor-onion-services=Oniontjenester onboarding.tour-tor-onion-services.title=Vær ekstra beskyttet. -onboarding.tour-tor-onion-services.description=Oniontjenester er steder som slutter med .onion som giver yderligere beskyttelse til udgivere og besøgende, inklusiv tilføjelse af sikkhedsforanstaltninger mod censur. Oniontjenester giver alle mulighed for at levere indhold og tjenester anonymt. Klik nedenfor for at besøge DuckDuckGo's onionsted. +onboarding.tour-tor-onion-services.description=Oniontjenester er steder som slutter med .onion som giver yderligere beskyttelse til udgivere og besøgende, inklusiv tilføjelse af sikkhedsforanstaltninger mod censur. Oniontjenester giver alle mulighed for at levere indhold og tjenester anonymt. Klik nedenfor for at besøge DuckDuckGos onionsted. onboarding.tour-tor-onion-services.button=Besøg et onion -onboarding.tour-tor-onion-services.next-button=Fuldført +onboarding.tour-tor-onion-services.next-button=Færdig onboarding.overlay-icon-tooltip-updated2=Se nyhederne\ni %S onboarding.tour-tor-update.prefix-new=Ny @@ -50,23 +50,23 @@ onboarding.tour-tor-update.prefix-updated=Opdateret onboarding.tour-tor-toolbar=Værktøjslinje onboarding.tour-tor-toolbar-update-9.0.title=Farvel løg-knap. -onboarding.tour-tor-toolbar-update-9.0.description=Vil ønsker at din oplevelse med Tor skal være fuldt integreret i Tor Browser. -onboarding.tour-tor-toolbar-update-9.0.description-para2=Derfor kan du nu, i stedet for at bruge løg-knappen, se dine Tor-kredsløb via [i] på adresselinjen og anmod om en ny identitet med værktøjslinjeknappen eller [≡]-menuen. +onboarding.tour-tor-toolbar-update-9.0.description=Vi ønsker at din oplevelse med Tor skal være fuldt integreret i Tor Browser. +onboarding.tour-tor-toolbar-update-9.0.description-para2=Derfor kan du nu, i stedet for at bruge løg-knappen, se dine Tor-kredsløb via [i] på adresselinjen og anmode om en ny identitet med værktøjslinjeknappen eller [≡]-menuen. onboarding.tour-tor-toolbar-update-9.0.button=Anmod om en ny identitet onboarding.tour-tor-toolbar-update-9.0.next-button=Gå til Tor-netværk # Circuit Display onboarding. onboarding.tor-circuit-display.next=Næste -onboarding.tor-circuit-display.done=Fuldført +onboarding.tor-circuit-display.done=Færdig onboarding.tor-circuit-display.one-of-three=1 af 3 onboarding.tor-circuit-display.two-of-three=2 af 3 onboarding.tor-circuit-display.three-of-three=3 af 3 onboarding.tor-circuit-display.intro.title=Hvordan virker kredsløb? -onboarding.tor-circuit-display.intro.msg=Kredsløb består af relæ, som er tildelt tilfældigt, hvilket er computere verden over som er konfigureret til at videresende Tor-trafik. Kredskøb giver dig mulighed for at bruge internettet privat og at oprette forbindelse til oniontjenester. +onboarding.tor-circuit-display.intro.msg=Kredsløb består af relæer, som er tildelt tilfældigt, hvilket er computere verden over som er konfigureret til at videresende Tor-trafik. Kredsløb giver dig mulighed for at bruge internettet privat og oprette forbindelse til oniontjenester. onboarding.tor-circuit-display.diagram.title=Kredsløb-visning -onboarding.tor-circuit-display.diagram.msg=Diagrammet viser relæene som opgør kredsløbet til webstedet. For at forhindre sammenkædning af aktivitet på tværs af forskellige steder, så får hvert websted et andet kredsløb. +onboarding.tor-circuit-display.diagram.msg=Diagrammet viser de relæer som opgør kredsløbet til webstedet. For at forhindre sammenkædning af aktivitet på tværs af forskellige steder, så får hvert websted et andet kredsløb. onboarding.tor-circuit-display.new-circuit.title=Har du brug for et nyt kredsløb? -onboarding.tor-circuit-display.new-circuit.msg=Hvis du ikke kan oprette forbindelse til det websted du prøver at besøge, eller det ikke indlæser ordentligt, så kan du bruge denne knap til at genindlæse stedet med et nyt kredsløb. +onboarding.tor-circuit-display.new-circuit.msg=Hvis du ikke er i stand til at oprette forbindelse til det websted du prøver at besøge, eller det ikke indlæser ordentligt, så kan du bruge denne knap til at genindlæse stedet med et nyt kredsløb. diff --git a/chrome/locale/da/torbutton.dtd b/chrome/locale/da/torbutton.dtd index d305193e..6a4fb8aa 100644 --- a/chrome/locale/da/torbutton.dtd +++ b/chrome/locale/da/torbutton.dtd @@ -6,11 +6,11 @@ <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Søg efter opdateringer til Tor Browser..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "O"> -<!ENTITY torbutton.context_menu.cookieProtections "Cookie-beskyttelser..."> +<!ENTITY torbutton.context_menu.cookieProtections "Cookiebeskyttelser..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Klik for at starte Torbutton"> -<!ENTITY torbutton.prefs.security_settings "Tor Browser-sikkerhedsindstillinger"> -<!ENTITY torbutton.cookiedialog.title "Håndtér Cookie-beskyttelser"> +<!ENTITY torbutton.prefs.security_settings "Sikkerhedsindstillinger for Tor Browser"> +<!ENTITY torbutton.cookiedialog.title "Håndtér cookiebeskyttelser"> <!ENTITY torbutton.cookiedialog.lockCol "Beskyttet"> <!ENTITY torbutton.cookiedialog.domainCol "Vært"> <!ENTITY torbutton.cookiedialog.nameCol "Navn"> @@ -18,7 +18,7 @@ <!ENTITY torbutton.cookiedialog.protectCookie "Beskyt cookie"> <!ENTITY torbutton.cookiedialog.removeCookie "Fjern cookie"> <!ENTITY torbutton.cookiedialog.unprotectCookie "Fjern beskyttelse af cookie"> -<!ENTITY torbutton.cookiedialog.removeAllBut "Fjern alle pånær beskyttede"> +<!ENTITY torbutton.cookiedialog.removeAllBut "Fjern alle, undtagen beskyttede"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Beskyt nye cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Beskyt ikke nye cookies"> <!ENTITY torbutton.prefs.sec_caption "Sikkerhedsniveau"> @@ -27,12 +27,12 @@ <!ENTITY torbutton.prefs.sec_standard_description "Alle Tor Browser- og webstedsfunktionaliteter er aktiveret."> <!ENTITY torbutton.prefs.sec_safer_label "Mere sikker"> <!ENTITY torbutton.prefs.sec_safer_description "Deaktiverer webstedsfunktionaliteter som ofte er farlige, hvilket kan gøre at nogle steder mister deres funktionalitet."> -<!ENTITY torbutton.prefs.sec_safer_list_label "Ved mere sikker-indstillingen:"> +<!ENTITY torbutton.prefs.sec_safer_list_label "Ved indstillingen mere sikker:"> <!ENTITY torbutton.prefs.sec_safest_label "Mest sikker"> <!ENTITY torbutton.prefs.sec_safest_description "Tillader kun webstedsfunktionaliteter som kræves til statiske steder og grundlæggende tjenester. Ændringerne påvirker billeder, medier og scripts."> -<!ENTITY torbutton.prefs.sec_safest_list_label "Ved mest sikker-indstillingen:"> +<!ENTITY torbutton.prefs.sec_safest_list_label "Ved indstillingen mest sikker:"> <!ENTITY torbutton.prefs.sec_learn_more_label "Lær mere"> -<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript er deaktiveret på ikke-HTTPS steder."> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript er deaktiveret på steder som ikke bruger HTTPS."> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript er som standard deaktiveret på alle steder."> <!ENTITY torbutton.prefs.sec_limit_typography "Nogle skrifttyper og matematiksymboler er deaktiverede."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Nogle skrifttyper, ikoner, matematiksymboler og billeder er deaktiveret."> @@ -43,7 +43,7 @@ <!ENTITY torbutton.prefs.sec_safer_tooltip "Sikkerhedsniveau : Mere sikker"> <!ENTITY torbutton.prefs.sec_safest_tooltip "Sikkerhedsniveau : Mest sikker"> <!ENTITY torbutton.prefs.sec_custom_summary "Dine tilpassede browserpræferencer har resulterede i usædvanlige sikkerhedsindstillinger. Pga. sikkerheds- og privatlivsårsagen, anbefaler vi at du vælger en af standardsikkerhedsniveauerne."> -<!ENTITY torbutton.prefs.sec_restore_defaults "Gendan Standarder"> +<!ENTITY torbutton.prefs.sec_restore_defaults "Gendan standarder"> <!ENTITY torbutton.prefs.sec_advanced_security_settings "Avancerede sikkerhedsindstillinger…"> <!ENTITY torbutton.circuit_display.title "Tor-kredsløb"> <!ENTITY torbutton.circuit_display.new_circuit "Nyt kredsløb til dette sted"> diff --git a/chrome/locale/da/torbutton.properties b/chrome/locale/da/torbutton.properties index 86a0a517..92e3d8d4 100644 --- a/chrome/locale/da/torbutton.properties +++ b/chrome/locale/da/torbutton.properties @@ -1,5 +1,5 @@ torbutton.circuit_display.internet = Internettet -torbutton.circuit_display.ip_unknown = Ukendt IP-adresse +torbutton.circuit_display.ip_unknown = Ukendt IP torbutton.circuit_display.onion_site = Onionsted torbutton.circuit_display.this_browser = Browseren torbutton.circuit_display.relay = Relæ @@ -8,49 +8,49 @@ torbutton.circuit_display.unknown_country = Ukendt land torbutton.circuit_display.guard = Vagt torbutton.circuit_display.guard_note = Dit [Vagt]-knudepunkt ændres måske ikke. torbutton.circuit_display.learn_more = Lær mere -torbutton.circuit_display.click_to_copy = Click to Copy -torbutton.circuit_display.copied = Copied! -torbutton.content_sizer.margin_tooltip = Tor Browser tilføjer denne margin for at gøre dit vindues højde og bredde mindre genkendeligt, hvilket reducerer muligheden for at andre spore dig online. +torbutton.circuit_display.click_to_copy = Klik for at kopiere +torbutton.circuit_display.copied = Kopieret! +torbutton.content_sizer.margin_tooltip = Tor Browser tilføjer margenen for at gøre dit vindues højde og bredde mindre genkendeligt, hvilket reducerer muligheden for at andre kan spore dig online. torbutton.panel.tooltip.disabled = Klik for at aktivere Tor torbutton.panel.tooltip.enabled = Klik for at deaktivere Tor torbutton.panel.label.disabled = Tor deaktiveret torbutton.panel.label.enabled = Tor aktiveret -extensions.torbutton(a)torproject.org.description = Torbutton tilbyder en knap, der konfigurerer Tor-indstillinger, samt hurtigt og nemt fjerner private data browsing-data. +extensions.torbutton(a)torproject.org.description = Torbutton giver en knap til at konfigurere Tor-indstillinger og til hurtigt og nemt at fjerne private browsingdata. torbutton.popup.external.title = Download en ekstern filtype? -torbutton.popup.external.app = Tor Browser kan ikke vis denne file. Du skal derfor åbne den med et andet program.\n\n -torbutton.popup.external.note = Nogle filtyper kan lede programmer til at oprette forbindelse til internettet uden at bruge Tor.\n\n -torbutton.popup.external.suggest = For at være sikker bør du kun åbne downloade filer mens du er offline, eller bruge en Tor Live CD såsom Tails.\n +torbutton.popup.external.app = Tor Browser kan ikke vis filen. Du skal åbne den med et andet program.\n\n +torbutton.popup.external.note = Nogle filtyper kan få programmer til at oprette forbindelse til internettet uden at bruge Tor.\n\n +torbutton.popup.external.suggest = For at være sikker bør du kun åbne downloade filer mens du er offline, eller bruge en Tor live-CD såsom Tails.\n torbutton.popup.launch = Download fil torbutton.popup.cancel = Annuller torbutton.popup.dontask = Download automatisk filer fremover -torbutton.popup.no_newnym = Torbutton kan ikke med sikkerhed give dig en ny identitet. Den har ikke adgang til kontrolporten for Tor.\n\nKører du Tor Browser-bundet? +torbutton.popup.no_newnym = Torbutton kan ikke med sikkerhed give dig en ny identitet. Den har ikke adgang til Tor-kontrolporten.\n\nKører du Tor Browser-bundet? torbutton.security_settings.menu.title = Sikkerhedsindstillinger -torbutton.title.prompt_torbrowser = Vigtig Torbutton-information -torbutton.popup.prompt_torbrowser = Torbutton fungerer anderledes end før: du kan ikke længere slå den fra.\n\nDu foretog ændringen, da det ikke er sikkert at anvende Torbutton i en browser, der også anvendes til non-Tor-browsing. Der var for mange fejl deri, som vi ikke kunne rette på andre måder.\n\nHvis du ønsker at anvende Firefox på normal vis, så bør du afinstallere Torbutton og downloade Tor Browser-bundet. Indstillingerne for privatliv i Tor Browser overgår også de normale i Firefox, selv når Firefox anvende med Torbutton.\n\nFor at fjerne Torbutton, så gå til Funktioner->Tilføjelser->Udvidelser og klik dernæst Fjern-knappen ved siden af Torbutton. -torbutton.popup.short_torbrowser = Vigtig Torbutton-information!\n\nTorbutton er nu altid slået til.\n\nKlik på Torbutton for mere information. +torbutton.title.prompt_torbrowser = Vigtig information om Torbutton +torbutton.popup.prompt_torbrowser = Torbutton fungerer nu anderledes: du kan ikke længere slå den fra.\n\nVi foretog ændringen, da det ikke er sikkert at bruge Torbutton i en browser, der også anvendes til ikke-Tor-browsing. Der var for mange fejl deri, som vi ikke kunne rette på andre måder.\n\nHvis du vil bruge Firefox på normal vis, så bør du afinstallere Torbutton og downloade Tor Browser-bundet. Egenskaberne for privatliv i Tor Browser overgår også dem der normalt er i Firefox, selv når Firefox bruges med Torbutton.\n\nFjern Torbutton ved at gå til Funktioner->Tilføjelser->Udvidelser og så klikke på Fjern-knappen ved siden af Torbutton. +torbutton.popup.short_torbrowser = Vigtig information om Torbutton!\n\nTorbutton er nu altid aktiveret.\n\nKlik på Torbutton for mere information. -torbutton.popup.confirm_plugins = Udvidelsesmoduler såsom Flash kan skade sikkerheden for dit privatliv og din anonymitet.\n\nDe kan også omgå Tor, så din nuværende placering og IP-adresse afsløres.\n\nEr du sikker på at du vil aktivere udvidelsesmoduler?\n\n +torbutton.popup.confirm_plugins = Plugins såsom Flash kan skade dit privatliv og din anonymitet.\n\nDe kan også omgå Tor, så din nuværende placering og IP-adresse afsløres.\n\nEr du sikker på, at du vil aktivere plugins?\n\n torbutton.popup.never_ask_again = Spørg mig aldrig igen -torbutton.popup.confirm_newnym = Tor Browser vil lukke alle vinduer og faneblade. Alle websted-sessioner vil gå tabt.\nGenstart Tor Browser nu for at nulstille din identitet?\n +torbutton.popup.confirm_newnym = Tor Browser vil lukke alle vinduer og faneblade. Alle webstedssessioner vil gå tabt.\nGenstart Tor Browser nu for at nulstille din identitet?\n -torbutton.maximize_warning = Hvis du maksimere Tor Browser kan websteder fastslå din skærmstørrelse, hvilket kan bruges til at spore dig. Vi anbefaler at lade Tor Browser-vinduet være i sin oprindelige standardstørrelse. +torbutton.maximize_warning = Hvis du maksimere Tor Browser kan websteder fastslå din skærmstørrelse, hvilket kan bruges til at spore dig. Vi anbefaler at lade Tor Browser-vinduerne være i deres oprindelige standardstørrelse. # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=Dette websted (%S) forsøgte at uddrage HTML5 canvas-billeddata, hvilket kan bruges til unikt at identificere din computer.\n\nSkal Tor Browser tillade dette websted at uddrage HTML5 canvas-billeddata? +canvas.siteprompt=Dette websted (%S) forsøgte at udtrække billeddata fra HTML5-canvas, hvilket kan bruges til identificere din computer unikt.\n\nSkal Tor Browser give webstedet tilladelse til at udtrække billeddata fra HTML5-canvas? canvas.notNow=Ikke nu canvas.notNowAccessKey=N canvas.allow=Tillad i fremtiden canvas.allowAccessKey=T -canvas.never=Aldrig for dette sted (anbefalet) +canvas.never=Aldrig for dette sted (anbefales) canvas.neverAccessKey=L # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. -profileProblemTitle=%S Profil Problem +profileProblemTitle=Problem med %S-profil profileReadOnly=Du kan ikke køre %S fra et skrivebeskyttet filsystem. Kopiér venligst %S til et andet sted før du prøver at bruge det. -profileReadOnlyMac=Du kan ikke køre %S fra et skrivebeskyttet filsystem. Kopiér venligst %S til skrivebordet eller en programmappe før du prøver at bruge det. -profileAccessDenied= %S har ikke rettigheder til at bruge profilen. Skift venligst rettigheder og prøv igen. -profileMigrationFailed=Overførsel af din eksisterende %S profil fejlede.\nNye indstillinger vil blive brugt. +profileReadOnlyMac=Du kan ikke køre %S fra et skrivebeskyttet filsystem. Kopiér venligst %S til din skrivebordsmappe eller programmappe før du prøver at bruge det. +profileAccessDenied= %S har ikke tilladelse til at få adgang til profilen. Skift venligst tilladelser for dit filsystem og prøv igen. +profileMigrationFailed=Overførsel af din eksisterende %S-profil mislykkedes.\nNye indstillinger vil blive brugt. # "Downloading update" string for the hamburger menu (see #28885). # This string is kept here for ease of translation. @@ -58,8 +58,8 @@ profileMigrationFailed=Overførsel af din eksisterende %S profil fejlede.\nNye i updateDownloadingPanelUILabel=Downloader %S opdatering # .Onion Page Info prompt. Strings are kept here for ease of translation. -pageInfo_OnionEncryptionWithBitsAndProtocol=Forbindelse krypteret (oniontjeneste, %1$S, %2$S-bit nøgler, %3$S) -pageInfo_OnionEncryption=Forbindelse krypteret (oniontjeneste) +pageInfo_OnionEncryptionWithBitsAndProtocol=Forbindelsen er krypteret (oniontjeneste, %1$S, %2$S-bit nøgler, %3$S) +pageInfo_OnionEncryption=Forbindelsen er krypteret (oniontjeneste) # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Lær mere @@ -69,56 +69,56 @@ onionServices.errorPage.onionSite=Onionsted # 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.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. +onionServices.descNotFound.pageTitle=Problem ved indlæsning af onionsted +onionServices.descNotFound.header=Onionsted ikke fundet +onionServices.descNotFound=Det er højst sandsynligt fordi onionstedet er offline. Kontakt onionstedets administrator. +onionServices.descNotFound.longDescription=Detaljer: %S — Den anmodede oniontjeneste-beskriver blev ikke fundet i hashringen og tjenesten kan derfor ikke nås af klient. # Tor SOCKS error 0xF1: -onionServices.descInvalid.pageTitle=Problem Loading Onionsite -onionServices.descInvalid.header=Onionsite Cannot Be Reached -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. +onionServices.descInvalid.pageTitle=Problem ved indlæsning af onionsted +onionServices.descInvalid.header=Onionstedet kan ikke nås +onionServices.descInvalid=Onionstedet kan ikke nås pga. en intern fejl. +onionServices.descInvalid.longDescription=Detaljer: %S — Den anmodende oniontjeneste-beskriver kan ikke fortolkes eller validering af underskrift mislykkedes. # Tor SOCKS error 0xF2: -onionServices.introFailed.pageTitle=Problem Loading Onionsite -onionServices.introFailed.header=Onionsite Has Disconnected -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. +onionServices.introFailed.pageTitle=Problem ved indlæsning af onionsted +onionServices.introFailed.header=Onionstedet har afbrudt forbindelsen +onionServices.introFailed=Det er højst sandsynligt fordi onionstedet er offline. Kontakt onionstedets administrator. +onionServices.introFailed.longDescription=Detaljer: %S — Introduktion mislykkedes, hvilket betyder at beskriveren blev fundet men tjenesten er ikke længere forbundet til introduktionspunktet. Tjenesten har sandsynligvis ændret sin beskriver eller den kører ikke. # Tor SOCKS error 0xF3: -onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite -onionServices.rendezvousFailed.header=Unable to Connect to Onionsite -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. +onionServices.rendezvousFailed.pageTitle=Problem ved indlæsning af onionsted +onionServices.rendezvousFailed.header=Kan ikke oprette forbindelse til onionstedet +onionServices.rendezvousFailed=Onionstedet er optaget eller Tor-netværket er overbelastet. Prøv igen senere. +onionServices.rendezvousFailed.longDescription=Detaljer: %S — Klienten kunne ikke rendezvous med tjenesten, hvilket betyder at klienten ikke var i stand til at færdiggøre forbindelsen. # Tor SOCKS error 0xF4: -onionServices.clientAuthMissing.pageTitle=Authorization Required -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. +onionServices.clientAuthMissing.pageTitle=Autentifikation kræves +onionServices.clientAuthMissing.header=Onionsted kræver autentifikation +onionServices.clientAuthMissing=Adgang til onionstedet kræver en nøgle, men der blev ikke angivet nogen. +onionServices.clientAuthMissing.longDescription=Detaljer: %S — Klienten downloadede den anmodede oniontjeneste-beskriver men kunne ikke dekryptere dens indhold fordi der mangler information om klientautentifikation. # Tor SOCKS error 0xF5: -onionServices.clientAuthIncorrect.pageTitle=Authorization Failed -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. +onionServices.clientAuthIncorrect.pageTitle=Autentifikation mislykkedes +onionServices.clientAuthIncorrect.header=Autentifkation af onionsted mislykkes +onionServices.clientAuthIncorrect=Den angivne nøgle er forkert eller er blevet tilbagekaldt. Kontakt onionstedets administrator. +onionServices.clientAuthIncorrect.longDescription=Detaljer: %S — Klienten var i stand til at downloade den anmodede oniontjeneste-beskriver men var ikke i stand til at dekryptere dens indhold med den angivne information om klientautentifikation. Det betyder måske at adgangen er blevet tilbagekaldt. # Tor SOCKS error 0xF6: -onionServices.badAddress.pageTitle=Problem Loading Onionsite -onionServices.badAddress.header=Invalid Onionsite Address -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. +onionServices.badAddress.pageTitle=Problem ved indlæsning af onionsted +onionServices.badAddress.header=Ugyldig onionsted-adresse +onionServices.badAddress=Den angivne onionsted-adresse er ugyldig. Tjek venligst at du har indtastet den korrekt. +onionServices.badAddress.longDescription=Detaljer: %S — Den angivne .onion-adresse er ugyldig. Fejlen returneres pga. en af følgende årsager: adressens checksum matcher ikke, den offentlige ed25519-nøgle er ugyldig eller kodningen er ugyldig. # Tor SOCKS error 0xF7: -onionServices.introTimedOut.pageTitle=Problem Loading Onionsite -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. +onionServices.introTimedOut.pageTitle=Problem ved indlæsning af onionsted +onionServices.introTimedOut.header=Oprettelse af onionsted-kredsløb fik timeout +onionServices.introTimedOut=Kunne ikke oprette forbindelse til onionstedet, muligvis pga. en dårlig netværksforbindelse. +onionServices.introTimedOut.longDescription=Detaljer: %S — Forbindelsen til den anmodede oniontjeneste fik timeout mens rendezvous-kredsløbet blev forsøgt bygget. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. onionServices.authPrompt.description=%S anmoder om din private nøgle. onionServices.authPrompt.keyPlaceholder=Indtast din private nøgle til oniontjenesten -onionServices.authPrompt.done=Fuldført +onionServices.authPrompt.done=Færdig onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Indtast venligst en gyldig nøgle (52 base32-tegn eller 44 base64-tegn) onionServices.authPrompt.failedToSetKey=Kan ikke konfigurere Tor med din nøgle onionServices.authPreferences.header=Autentifikation for oniontjenester onionServices.authPreferences.overview=Nogle oniontjenester kræver at du identificerer dig med en nøgle (en slags adgangskode) inden du kan tilgå dem. -onionServices.authPreferences.savedKeys=Gemmer nøgler … +onionServices.authPreferences.savedKeys=Gemmer nøgler… onionServices.authPreferences.dialogTitle=Nøgler for oniontjeneste onionServices.authPreferences.dialogIntro=Der gemmes nøgler til følgende onionsteder på din computer onionServices.authPreferences.onionSite=Onionsted @@ -129,15 +129,15 @@ onionServices.authPreferences.failedToGetKeys=Kan ikke hente nøgler fra tor onionServices.authPreferences.failedToRemoveKey=Kan ikke fjerne nøgle # Onion-Location strings. -onionLocation.alwaysPrioritize=Always Prioritize Onions +onionLocation.alwaysPrioritize=Prioriter altid onions onionLocation.alwaysPrioritizeAccessKey=a onionLocation.notNow=Ikke nu 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.prioritizeOnionsDescription=Prioritize .onion sites when known. +onionLocation.description=Der findes en mere privat og sikker version af stedet på Tor-netværket over oniontjenester. Oniontjenester hjælper webstedsudgivere og deres besøgende med bekæmpe overvågning og censur. +onionLocation.tryThis=Prøv oniontjenester +onionLocation.onionAvailable=.onion tilgængelig +onionLocation.learnMore=Lær mere… +onionLocation.always=Altid +onionLocation.askEverytime=Spørg hver gang +onionLocation.prioritizeOnionsDescription=Prioriter .onion-steder når de kendes. onionLocation.onionServicesTitle=Oniontjenester diff --git a/chrome/locale/fa/torbutton.properties b/chrome/locale/fa/torbutton.properties index 0b238160..1abf5548 100644 --- a/chrome/locale/fa/torbutton.properties +++ b/chrome/locale/fa/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 = مرورگر Tor اضافه می کند این حاشیه را به عرض و ارتفاع پنجره شما که کمتر مشخص شود، و در نتیجه باعث کاهش توانایی به ردیابی آنلاین شما شود. torbutton.panel.tooltip.disabled = برای فعال کردن Tor کليک کنيد torbutton.panel.tooltip.enabled = برای غيرفعال کردن Tor کليک کنيد @@ -69,45 +69,45 @@ 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=Problem Loading Onionsite -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. +onionServices.descNotFound.pageTitle=اشکال در بارگیری سایت پیازی +onionServices.descNotFound.header=سایت پیازی یافت نشد +onionServices.descNotFound=به احتمال زیاد علت این است که سایت پیازی آفلاین است. با سرپرست سایت پیازی تماس بگیرید. +onionServices.descNotFound.longDescription=جزئیات: S% — توصیف‌گر سرویس پیازی درخواست شده روی حلقه هش یافت نشد بنابراین سرویس توسط کلاینت قابل دسترسی نیست. # Tor SOCKS error 0xF1: -onionServices.descInvalid.pageTitle=Problem Loading Onionsite -onionServices.descInvalid.header=Onionsite Cannot Be Reached -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. +onionServices.descInvalid.pageTitle=اشکال در بارگیری سایت پیازی +onionServices.descInvalid.header=دسترسی به سایت پیازی ممکن نیست. +onionServices.descInvalid=سایت پیازی به دلیل خطا داخلی قابل دسترسی نیست. +onionServices.descInvalid.longDescription=جزئیات: S% — توصیف‌گر سرویس پیازی درخواست شده نمی تواند تجزیه شود یا تائید امضا ناموفق بود. # Tor SOCKS error 0xF2: -onionServices.introFailed.pageTitle=Problem Loading Onionsite -onionServices.introFailed.header=Onionsite Has Disconnected -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. +onionServices.introFailed.pageTitle=اشکال در بارگیری سایت پیازی +onionServices.introFailed.header=سایت پیازی قطع شده است +onionServices.introFailed=به احتمال زیاد علت این است که سایت پیازی آفلاین است. با سرپرست سایت پیازی تماس بگیرید. +onionServices.introFailed.longDescription=جزئیات: S% — معرفی ناموفق بود، یعنی توصیف‌گر یافت شد ولی سرویس دیگر به نقطه معرفی وصل نمی باشد. ممکن است که سرویس توصیف‌گر خود را تغییر داده یا در حال اجرا نیست. # Tor SOCKS error 0xF3: -onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite -onionServices.rendezvousFailed.header=Unable to Connect to Onionsite -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. +onionServices.rendezvousFailed.pageTitle=اشکال در بارگیری سایت پیازی +onionServices.rendezvousFailed.header=امکان برقراری ارتباط با سایت پیازی نیست +onionServices.rendezvousFailed=سایت پیازی مشغول یا شبکه Tor شلوغ است. بعدا دوباره تلاش کنید. +onionServices.rendezvousFailed.longDescription=جزئیات: S% — کلاینت موفق به ملاقات با سرویس نشد، یعنی کلاینت قادر نبود تا اتصال را نهایی کند. # Tor SOCKS error 0xF4: -onionServices.clientAuthMissing.pageTitle=Authorization Required -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. +onionServices.clientAuthMissing.pageTitle=احراز هویت مورد‌نیاز است +onionServices.clientAuthMissing.header=سایت پیازی نیاز به احراز هویت دارد +onionServices.clientAuthMissing=دسترسی به سایت پیازی نیاز به کلید دارد ولی هیچ موردی ارائه نشده است. +onionServices.clientAuthMissing.longDescription=جزئیات: S% — کلاینت توصیف‌گر سرویس پیازی درخواستی را دریافت کرد ولی قادر به رمزگشایی محتوای آن نبود چون اطلاعات احراز هویت کلاینت ناقص است. # Tor SOCKS error 0xF5: -onionServices.clientAuthIncorrect.pageTitle=Authorization Failed -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. +onionServices.clientAuthIncorrect.pageTitle=احراز هویت ناموفق +onionServices.clientAuthIncorrect.header=احراز هویت سایت پیازی ناموفق بود +onionServices.clientAuthIncorrect=کلید ارائه‌شده نادرست بوده یا باطل ‌شده است. با سرپرست سایت پیازی تماس بگیرید. +onionServices.clientAuthIncorrect.longDescription=جزئیات: S% — کلاینت قادر به دریافت توصیف‌گر سرویس پیازی درخواستی بود ولی قادر به رمزگشایی محتوای آن از طریق اطلاعات احراز هویت کلاینت ارائه شده نبود. این ممکن است به این معنا باشد که دسترسی فسخ شده است. # Tor SOCKS error 0xF6: -onionServices.badAddress.pageTitle=Problem Loading Onionsite -onionServices.badAddress.header=Invalid Onionsite Address -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. +onionServices.badAddress.pageTitle=اشکال در بارگیری سایت پیازی +onionServices.badAddress.header=آدرس سایت پیازی نامعتبر است +onionServices.badAddress=آدرس سایت پیازی ارائه‌شده نامعتبر است. لطفا بررسی کنید که آن را به درستی وارد کرده‌اید. +onionServices.badAddress.longDescription=جزئیات: S% — نشانی onion. ارائه شده نامعتبر است. این خطا به یکی از این دلایل نشان داده شده است: چک‌سام نشانی مطابقت ندارد، کلید عمومی ed25519 نامعتبر می باشد، یا کدبندی نامعتبر است. # Tor SOCKS error 0xF7: -onionServices.introTimedOut.pageTitle=Problem Loading Onionsite -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. +onionServices.introTimedOut.pageTitle=اشکال در بارگیری سایت پیازی +onionServices.introTimedOut.header=زمان ایجاد زنجیره سایت پیازی به اتمام رسید. +onionServices.introTimedOut=اتصال به سایت پیازی، احتمالا به دلیل اتصال شبکه ضعیف، ناموفق بود. +onionServices.introTimedOut.longDescription=جزئیات: S% — وقت اتصال به سرویس پیازی درخواست شده اتمام یافت در حالی که سعی داشت تا چرخه ملاقات را ایجاد کند. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. onionServices.authPrompt.description=%S درخواست کلید خصوصی شما را دارد. @@ -129,15 +129,15 @@ onionServices.authPreferences.failedToGetKeys=قادر به بازیابی کل onionServices.authPreferences.failedToRemoveKey=قادر به حذف کردن کلید نیستیم # Onion-Location strings. -onionLocation.alwaysPrioritize=Always Prioritize Onions +onionLocation.alwaysPrioritize=همیشه پیاز‌ها را در اولویت قرار بده onionLocation.alwaysPrioritizeAccessKey=a onionLocation.notNow=نه در حال حاضر 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.tryThis=Try Onion Services -onionLocation.onionAvailable=.onion available -onionLocation.learnMore=Learn more… +onionLocation.description=یک نسخه امن‌تر و خصوصی‌تر از این سایت روی شبکه‌ی تور از طریق سرویس های پیازی در دسترس می باشد. سرویس های پیازی به انتشار دهندگان سایت‌ها و مراجعه کنندگان آن‌ها این اجازه را می دهند تا سانسور و نظارت کلی را شکست دهند. +onionLocation.tryThis=سرویس های پیازی را امتحان کنید +onionLocation.onionAvailable=مورد ‎.onion در دسترس است +onionLocation.learnMore=بیشتر بدانید... onionLocation.always=همیشه -onionLocation.askEverytime=Ask every time -onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. -onionLocation.onionServicesTitle=◾️ سرویس های پیازی +onionLocation.askEverytime=هر بار بپرس +onionLocation.prioritizeOnionsDescription=سایتهای ‎‎.onion را در صورت شناخت در اولویت قرار بده. +onionLocation.onionServicesTitle=خدمات پیازی diff --git a/chrome/locale/he/torbutton.properties b/chrome/locale/he/torbutton.properties index d05b8f67..91249590 100644 --- a/chrome/locale/he/torbutton.properties +++ b/chrome/locale/he/torbutton.properties @@ -71,43 +71,43 @@ onionServices.errorPage.onionSite=אתר בצל # Tor SOCKS error 0xF0: onionServices.descNotFound.pageTitle=בעיה בטעינת אתר בצל onionServices.descNotFound.header=אתר בצל לא נמצא -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. +onionServices.descNotFound=הגורם הסביר הוא שאתר הבצל לא מקוון. צור קשר עם מינהלן אתר הבצל. +onionServices.descNotFound.longDescription=פרטים: %S — המתאר של שירות הבצל המבוקש לא ניתן להימצא על ה־HashRing ולכן השירות בלתי נגיש ע״י הלקוח. # Tor SOCKS error 0xF1: 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. +onionServices.descInvalid.longDescription=פרטים: %S — המתאר של שירות הבצל המבוקש אינו יכול להינתח או שוידוא החתימה נכשל. # Tor SOCKS error 0xF2: onionServices.introFailed.pageTitle=בעיה בטעינת אתר בצל onionServices.introFailed.header=אתר בצל נותק -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. +onionServices.introFailed=הגורם הסביר הוא שאתר הבצל לא מקוון. צור קשר עם מינהלן אתר הבצל. +onionServices.introFailed.longDescription=פרטים: %S — ההיכרות נכשלה, מה שאומר שהמתאר נמצא אבל השירות אינו מחובר יותר אל נקודת ההיכרות. ככל הנראה שהשירות שינה את המתאר שלו או שהשירות אינו רץ. # Tor SOCKS error 0xF3: onionServices.rendezvousFailed.pageTitle=בעיה בטעינת אתר בצל onionServices.rendezvousFailed.header=לא היה ניתן להתחבר אל אתר בצל onionServices.rendezvousFailed=אתר הבצל עסוק או שרשת Tor עמוסה. נסה שוב מאוחר יותר. -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=פרטים: %S — הלקוח נכשל להיפגש עם השירות, מה שאומר שהלקוח לא היה יכול להשלים את החיבור. # Tor SOCKS error 0xF4: onionServices.clientAuthMissing.pageTitle=אימות נדרש 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. +onionServices.clientAuthMissing.longDescription=פרטים: %S — הלקוח הוריד את המתאר של שירות הבצל המבוקש אבל לא הצליח לפענח את תוכנו מאחר שמידע האימות של הלקוח חסר. # Tor SOCKS error 0xF5: onionServices.clientAuthIncorrect.pageTitle=אימות נכשל onionServices.clientAuthIncorrect.header=אימות אתר בצל נכשל -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=המפתח המסופק שגוי או שהוא נשלל. צור קשר עם המינהלן של אתר הבצל. +onionServices.clientAuthIncorrect.longDescription=פרטים: %S — הלקוח היה יכול להוריד את המתאר של שירות הבצל המבוקש אבל לא היה יכול לפענח את תוכנו ע״י שימוש במידע האימות המסופק של הלקוח. זה עשוי להעיד שהגישה נשללה. # Tor SOCKS error 0xF6: onionServices.badAddress.pageTitle=בעיה בטעינת אתר בצל onionServices.badAddress.header=כתובת אתר בצל בלתי תקפה -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. +onionServices.badAddress=כתובת אתר הבצל המסופקת בלתי תקפה. אנא בדוק שהכנסת אותה כראוי. +onionServices.badAddress.longDescription=פרטים: %S — כתובת .onion המסופקת בלתי תקפה. שגיאה זאת מוחזרת עקב אחת מהסיבות הבאות: סיכום הביקורת של הכתובת אינו תואם, המפתח הציבורי ed25519 בלתי תקף, או שהקידוד בלתי תקף. # Tor SOCKS error 0xF7: onionServices.introTimedOut.pageTitle=בעיה בטעינת אתר בצל -onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out +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. +onionServices.introTimedOut.longDescription=פרטים: %S — החיבור אל שירות הבצל המבוקש לקח פסק זמן בעת ניסיון לבנות את מעגל המפגש. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. onionServices.authPrompt.description=%S מבקש את המפתח הפרטי שלך. @@ -133,7 +133,7 @@ onionLocation.alwaysPrioritize=תעדף תמיד בצלים onionLocation.alwaysPrioritizeAccessKey=a onionLocation.notNow=לא עכשיו 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=יש גרסה פרטית יותר ומאובטחת יותר של אתר זה שזמינה על גבי רשת Tor באמצעות שירותי בצל. שירותי בצל עוזרים למפרסמי אתרים ולמבקרים שלהם להביס ציתות וצנזורה. onionLocation.tryThis=נסה שירותי בצל onionLocation.onionAvailable=.onion זמין onionLocation.learnMore=למד עוד… diff --git a/chrome/locale/is/aboutTor.dtd b/chrome/locale/is/aboutTor.dtd index ea83fa8e..14bad9ac 100644 --- a/chrome/locale/is/aboutTor.dtd +++ b/chrome/locale/is/aboutTor.dtd @@ -27,5 +27,5 @@ <!ENTITY aboutTor.newsletter.tagline "Fáðu nýjustu fréttir af Tor beint í pósthólfið þitt."> <!ENTITY aboutTor.newsletter.link_text "Skráðu þig til að fá Tor-fréttir."> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> +<!ENTITY aboutTor.donationBanner.freeToUse "Öllum er frjálst að nota Tor vegna styrkja frá fólki eins og þér."> <!ENTITY aboutTor.donationBanner.buttonA "Styrkja núna"> diff --git a/chrome/locale/is/torbutton.properties b/chrome/locale/is/torbutton.properties index bbc47299..71e3278f 100644 --- a/chrome/locale/is/torbutton.properties +++ b/chrome/locale/is/torbutton.properties @@ -8,8 +8,8 @@ torbutton.circuit_display.unknown_country = Óþekkt land torbutton.circuit_display.guard = Vörður (guard) torbutton.circuit_display.guard_note = Varðarhnúturinn [Guard] breytist ekki endilega. torbutton.circuit_display.learn_more = Læra meira -torbutton.circuit_display.click_to_copy = Click to Copy -torbutton.circuit_display.copied = Copied! +torbutton.circuit_display.click_to_copy = Smelltu til að afrita +torbutton.circuit_display.copied = Afritað! torbutton.content_sizer.margin_tooltip = Tor-vafrinn setur inn þessa spássíu til að gera hæð og breidd gluggans minna einkennandi, og þar með að gera erfiðara að fylgjast með þér á netinu. torbutton.panel.tooltip.disabled = Smelltu til að virkja Tor torbutton.panel.tooltip.enabled = Smelltu til að afvirkja Tor @@ -69,42 +69,42 @@ onionServices.errorPage.onionSite=Onion-vefsvæði # 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.header=Onionsite Not Found +onionServices.descNotFound.pageTitle=Vandamál við að hlaða inn onion-vef +onionServices.descNotFound.header=Onion-vefsvæði fannst ekki 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=Vandamál við að hlaða inn onion-vef +onionServices.descInvalid.header=Ekki tókst að tengjast onion-vefsvæði 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=Vandamál við að hlaða inn onion-vef +onionServices.introFailed.header=Onion-vefsvæði hefur aftengst 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=Vandamál við að hlaða inn onion-vef +onionServices.rendezvousFailed.header=Tókst ekki að tengjast onion-vef 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=Auðkenning er nauðsynleg +onionServices.clientAuthMissing.header=Onion-vefur krefst auðkenningar 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.header=Onionsite Authentication Failed +onionServices.clientAuthIncorrect.pageTitle=Auðkenning mistókst +onionServices.clientAuthIncorrect.header=Auðkenning á onion-vef mistókst 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=Vandamál við að hlaða inn onion-vef +onionServices.badAddress.header=Ógilt vistfang onion-vefsvæðis 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=Vandamál við að hlaða inn onion-vef 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. @@ -129,15 +129,15 @@ onionServices.authPreferences.failedToGetKeys=Tókst ekki að ná í lykla frá onionServices.authPreferences.failedToRemoveKey=Tókst ekki að fjarlægja lykil # Onion-Location strings. -onionLocation.alwaysPrioritize=Always Prioritize Onions +onionLocation.alwaysPrioritize=Alltaf gefa onion-vefjum forgang onionLocation.alwaysPrioritizeAccessKey=a onionLocation.notNow=Ekki núna 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.tryThis=Try Onion Services -onionLocation.onionAvailable=.onion available -onionLocation.learnMore=Learn more… -onionLocation.always=Always -onionLocation.askEverytime=Ask every time -onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. +onionLocation.tryThis=Prófaðu onion-þjónustur +onionLocation.onionAvailable=.onion er tiltækt +onionLocation.learnMore=Fræðast frekar… +onionLocation.always=Alltaf +onionLocation.askEverytime=Spyrja í hvert skipti +onionLocation.prioritizeOnionsDescription=Gefa .onion-vefjum forgang þegar þeir eru þekktir. onionLocation.onionServicesTitle=Onion-þjónustur diff --git a/chrome/locale/it/torbutton.properties b/chrome/locale/it/torbutton.properties index d62fd753..37ac5478 100644 --- a/chrome/locale/it/torbutton.properties +++ b/chrome/locale/it/torbutton.properties @@ -8,8 +8,8 @@ torbutton.circuit_display.unknown_country = Paese sconosciuto torbutton.circuit_display.guard = Guardia torbutton.circuit_display.guard_note = Il tuo nodo [Guardia] non deve cambiare. torbutton.circuit_display.learn_more = Per saperne di più -torbutton.circuit_display.click_to_copy = Click to Copy -torbutton.circuit_display.copied = Copied! +torbutton.circuit_display.click_to_copy = Clicca per copiare +torbutton.circuit_display.copied = Copiato! torbutton.content_sizer.margin_tooltip = Il browser Tor aggiunge questo margine per rendere l'ampiezza e altezza della tua finestra meno distintiva, così si riduce la possibilità di che tu sia tracciato in linea. torbutton.panel.tooltip.disabled = Fai clic per attivare Tor torbutton.panel.tooltip.enabled = Fai clic per disattivare Tor @@ -69,45 +69,45 @@ onionServices.errorPage.onionSite=Sito 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.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. +onionServices.descNotFound.pageTitle=Problema di caricamento del sito onion +onionServices.descNotFound.header=Sito onion non trovato +onionServices.descNotFound=La causa più probabile è che il sito onion sia offline. Contatta l'amministratore del sito onion. +onionServices.descNotFound.longDescription=Dettagli: %S — Il descrittore del servizio onion richiesto non può essere trovato nell'hashring, perciò il servizio non è raggiungibile dal client. # Tor SOCKS error 0xF1: -onionServices.descInvalid.pageTitle=Problem Loading Onionsite -onionServices.descInvalid.header=Onionsite Cannot Be Reached -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. +onionServices.descInvalid.pageTitle=Problema di caricamento del sito onion +onionServices.descInvalid.header=Sito onion non raggiungibile +onionServices.descInvalid=Il sito onion non è raggiungibile per un errore interno. +onionServices.descInvalid.longDescription=Dettagli: %S — Il descrittore del servizio onion richiesto non può essere letto o la validazione della firma è fallita. # Tor SOCKS error 0xF2: -onionServices.introFailed.pageTitle=Problem Loading Onionsite -onionServices.introFailed.header=Onionsite Has Disconnected -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. +onionServices.introFailed.pageTitle=Problema di caricamento del sito onion +onionServices.introFailed.header=Il sito onion si è disconnesso +onionServices.introFailed=La causa più probabile è che il sito onion sia offline. Contatta l'amministratore del sito onion. +onionServices.introFailed.longDescription=Dettagli: %S — Introduzione fallita, il che significa che il descrittore è stato trovato ma il servizio non è più connesso al punto di introduzione. Probabilmente il servizio ha cambiato il suo descrittore o non è in esecuzione. # Tor SOCKS error 0xF3: -onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite -onionServices.rendezvousFailed.header=Unable to Connect to Onionsite -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. +onionServices.rendezvousFailed.pageTitle=Problema di caricamento del sito onion +onionServices.rendezvousFailed.header=Impossibile connettersi al sito onion +onionServices.rendezvousFailed=Il sito onion è occupato o la rete Tor è sovraccarica. Riprova più tardi. +onionServices.rendezvousFailed.longDescription=Dettagli: %S — Il client non ha trovato riscontro con il servizio, il che significa che il client non è riuscito a completare la connessione. # Tor SOCKS error 0xF4: -onionServices.clientAuthMissing.pageTitle=Authorization Required -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. +onionServices.clientAuthMissing.pageTitle=Autorizzazione necessaria +onionServices.clientAuthMissing.header=Il sito onion richiede l'autenticazione +onionServices.clientAuthMissing=L'accesso al sito onion richiede una chiave ma non ne è stata fornita nessuna. +onionServices.clientAuthMissing.longDescription=Dettagli: %S — Il client ha scaricato il descrittore del servizio onion richiesto ma non è riuscito a decifrarne il contenuto perchè mancano informazioni di autorizzazione del client. # Tor SOCKS error 0xF5: -onionServices.clientAuthIncorrect.pageTitle=Authorization Failed -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. +onionServices.clientAuthIncorrect.pageTitle=Autorizzazione fallita +onionServices.clientAuthIncorrect.header=Autenticazione al sito onion fallita +onionServices.clientAuthIncorrect=La chiave fornita non è corretta o è stata revocata. Contatta l'amministratore del sito onion. +onionServices.clientAuthIncorrect.longDescription=Dettagli: %S — Il client è riuscito a scaricare il descrittore del servizio onion richiesto ma non è riuscito a decifrarne il contenuto usando le informazioni di autorizzazione del client fornite. Potrebbe significare che l'accesso è stato revocato. # Tor SOCKS error 0xF6: -onionServices.badAddress.pageTitle=Problem Loading Onionsite -onionServices.badAddress.header=Invalid Onionsite Address -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. +onionServices.badAddress.pageTitle=Problema di caricamento del sito onion +onionServices.badAddress.header=Indirizzo onion non valido +onionServices.badAddress=L'indirizzo onion fornito non è valido. Controlla di averlo inserito correttamente. +onionServices.badAddress.longDescription=Dettagli: %S — L'indirizzo .onion fornito non è valido. Questo errore accade per uno dei seguenti motivi: il checksum dell'indirizzo non corrisponde, la chiave pubblica ed25519 non è valida o la codifica non è valida. # Tor SOCKS error 0xF7: -onionServices.introTimedOut.pageTitle=Problem Loading Onionsite -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. +onionServices.introTimedOut.pageTitle=Problema di caricamento del sito onion +onionServices.introTimedOut.header=Creazione del circuito onion scaduta +onionServices.introTimedOut=Connessione al sito onion fallita, probabilmente per una connessione di rete debole. +onionServices.introTimedOut.longDescription=Dettagli: %S — La connessione al servizio onion richiesto è scaduta mentre si tentava di costruire il circuito di incontro. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. onionServices.authPrompt.description=%S richiede la tua chiave privata. @@ -129,15 +129,15 @@ onionServices.authPreferences.failedToGetKeys=Impossibile recuperare le chiavi d onionServices.authPreferences.failedToRemoveKey=Impossibile rimuovere la chiave # Onion-Location strings. -onionLocation.alwaysPrioritize=Always Prioritize Onions +onionLocation.alwaysPrioritize=Priorità sempre agli onion onionLocation.alwaysPrioritizeAccessKey=a onionLocation.notNow=Non ora 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.tryThis=Try Onion Services -onionLocation.onionAvailable=.onion available -onionLocation.learnMore=Learn more… +onionLocation.description=C'è una versione più privata e sicura di questo sito disponibile nella rete Tor tramite i servizi onion. I servizi onion aiutano i gestori dei siti ed i loro visitatori a sconfiggere la sorveglianza e la censura. +onionLocation.tryThis=Prova i servizi onion +onionLocation.onionAvailable=.onion disponibile +onionLocation.learnMore=Maggiori informazioni... onionLocation.always=Sempre -onionLocation.askEverytime=Ask every time -onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. +onionLocation.askEverytime=Chiedi ogni volta +onionLocation.prioritizeOnionsDescription=Priorità ai siti .onion quando conosciuti. onionLocation.onionServicesTitle=Servizi onion diff --git a/chrome/locale/ka/torbutton.properties b/chrome/locale/ka/torbutton.properties index 14cbf16f..44ec2210 100644 --- a/chrome/locale/ka/torbutton.properties +++ b/chrome/locale/ka/torbutton.properties @@ -8,11 +8,11 @@ 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 = Tor-ბრაუზერი ამატებს მინდვრებს კიდეებზე, რომ თქვენი ფანჯრის სიგანე და სიმაღლე ნაკლებად გამორჩეული და შესამჩნევი იყოს, რაც შეუმცირებს სხვებს, ინტერნეტში თქვენი დევნის შესაძლებლობებს. -torbutton.panel.tooltip.disabled = დაკლიკეთ Tor-ის ჩასართავად -torbutton.panel.tooltip.enabled = დაკლიკეთ Tor-ის გამოსართავად +torbutton.panel.tooltip.disabled = დაწკაპეთ, რომ ჩაირთოს Tor +torbutton.panel.tooltip.enabled = დაწკაპეთ, რომ გამოირთოს Tor torbutton.panel.label.disabled = Tor გამორთულია torbutton.panel.label.enabled = Tor ჩართულია extensions.torbutton(a)torproject.org.description = Torbutton საშუალებას გაძლევთ ერთი ღილაკით გამართოთ Tor-ის პარამეტრები და სწრაფად გაასუფთავოთ მონახულებული გვერდების მონაცემები. @@ -69,45 +69,45 @@ 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.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. +onionServices.descNotFound.pageTitle=ხარვეზი Onion-საიტის ჩატვირთვისას +onionServices.descNotFound.header=Onion-საიტი არ მოიძებნა +onionServices.descNotFound=უმეტესად იმის შედეგია, რომ onion-საიტი ხაზგარეშეა. დაუკავშირდით onion-საიტის ზედამხედველს. +onionServices.descNotFound.longDescription=ვრცლად: %S — მოთხოვნილი onion-მომსახურების აღმწერი ვერ მოიძებნა hashring-ზე და ამრიგად, მიუწვდომელია მომხმარებლისთვის. # Tor SOCKS error 0xF1: -onionServices.descInvalid.pageTitle=Problem Loading Onionsite -onionServices.descInvalid.header=Onionsite Cannot Be Reached -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. +onionServices.descInvalid.pageTitle=ხარვეზი Onion-საიტის ჩატვირთვისას +onionServices.descInvalid.header=Onion-საიტთან წვდომა არაა +onionServices.descInvalid=Onion-საიტი მიუწვდომელია შიდა შეცდომის გამო. +onionServices.descInvalid.longDescription=ვრცლად: %S — მოთხოვნილი onion-მომსახურების აღმწერის გარჩევა ან ხელმოწერის დამოწმება ვერ მოხერხდა. # Tor SOCKS error 0xF2: -onionServices.introFailed.pageTitle=Problem Loading Onionsite -onionServices.introFailed.header=Onionsite Has Disconnected -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. +onionServices.introFailed.pageTitle=ხარვეზი Onion-საიტის ჩატვირთვისას +onionServices.introFailed.header=Onion-საიტი გათიშულია +onionServices.introFailed=უმეტესად იმის შედეგია, რომ onion-საიტი ხაზგარეშეა. დაუკავშირდით onion-საიტის ზედამხედველს. +onionServices.introFailed.longDescription=ვრცლად: %S — წარდგენა ვერ მოხერხდა, რაც ნიშნავს, რომ აღმწერი ნაპოვნია, მაგრამ მომსახურება აღარაა დაკავშირებული წარდგენის წერტილთან. უმეტესად, გამოწვეულია მომსახურების მიერ აღმწერის შეცვლით ან მუშაობის შეჩერებით. # Tor SOCKS error 0xF3: -onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite -onionServices.rendezvousFailed.header=Unable to Connect to Onionsite -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. +onionServices.rendezvousFailed.pageTitle=ხარვეზი Onion-საიტის ჩატვირთვისას +onionServices.rendezvousFailed.header=ვერ უკავშირდება Onion-საიტს. +onionServices.rendezvousFailed=Onion-საიტი დაკავებულია ან Tor-ქსელი გადატვირთულია. სცადეთ კვლავ მოგვიანებით. +onionServices.rendezvousFailed.longDescription=ვრცლად: %S — მომხმარებლის მომსახურებასთან შეწყობა ვერ მოხერხდა, რაც ნიშნავს რომ მომხმარებელმა კავშირი ვერ დაასრულა. # Tor SOCKS error 0xF4: -onionServices.clientAuthMissing.pageTitle=Authorization Required -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. +onionServices.clientAuthMissing.pageTitle=საჭიროებს შესვლის დამოწმებას +onionServices.clientAuthMissing.header=Onion-მომსახურების საჭიროებს შესვლის დამოწმებას +onionServices.clientAuthMissing=Onion-საიტთან წვდომისთვის, საჭიროა გასაღები რომელიც არ მოწოდებულა. +onionServices.clientAuthMissing.longDescription=ვრცლად: %S — მომხმარებელმა ჩამოტვირთა მოთხოვნილი onion-მომსახურების აღმწერი, მაგრამ ვერ გაშიფრა, ვინაიდან მომხმარებლის დამოწმების მონაცემები არ იძებნება. # Tor SOCKS error 0xF5: -onionServices.clientAuthIncorrect.pageTitle=Authorization Failed -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. +onionServices.clientAuthIncorrect.pageTitle=დამოწმება ვერ მოხერხდა +onionServices.clientAuthIncorrect.header=Onion-საიტზე დამოწმება ვერ მოხერხდა +onionServices.clientAuthIncorrect=მოწოდებული გასაღები არასწორი ან გაუქმებულია. დაუკავშირდით onion-საიტი ზედამხედველს. +onionServices.clientAuthIncorrect.longDescription=ვრცლად: %S — მომხმარებელს შეუძლია ჩამოტვირთოს მოთხოვნილი onion-მომსახურების აღმწერი, მაგრამ ვერ გაშიფრავს, მომხმარებლის დამოწმების მოწოდებული მონაცემებით. ეს ნიშნავს, რომ შესაძლოა, წვდომა უარყოფილია. # Tor SOCKS error 0xF6: -onionServices.badAddress.pageTitle=Problem Loading Onionsite -onionServices.badAddress.header=Invalid Onionsite Address -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. +onionServices.badAddress.pageTitle=ხარვეზი Onion-საიტის ჩატვირთვისას +onionServices.badAddress.header=Onion-საიტის არამართებული მისამართი +onionServices.badAddress=მოცემული onion-საიტის მისამართი არამართებულია. გთხოვთ, გადაამოწმოთ შეყვანამდე. +onionServices.badAddress.longDescription=ვრცლად: %S — მოცემული .onion-მისამართი არამართებულია. ამ შეცდომის მიზეზი შეიძლება იყოს შემდეგი: მისამართის სადარჯამი არ ემთხვევა, საჯარო გასაღები ed25519 არასწორია ან დაშიფვრაა არამართებული. # Tor SOCKS error 0xF7: -onionServices.introTimedOut.pageTitle=Problem Loading Onionsite -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. +onionServices.introTimedOut.pageTitle=ხარვეზი Onion-საიტის ჩატვირთვისას +onionServices.introTimedOut.header=Onion-საიტის წრედის შექმნის ვადა ამოიწურა +onionServices.introTimedOut=ვერ მოხერხდა onion-საიტთან მიერთება, შესაძლოა ცუდი კავშირის გამო. +onionServices.introTimedOut.longDescription=ვრცლად: %S — მოთხოვნილ onion-მომსახურებასთან კავშირის ვადა ამოიწურა, შეხვედრის წრედის ჩამოყალიბებისას. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. onionServices.authPrompt.description=%S ითხოვს თქვენს საიდუმლო გასაღებს. @@ -129,15 +129,15 @@ onionServices.authPreferences.failedToGetKeys=ვერ ხერხდება onionServices.authPreferences.failedToRemoveKey=ვერ ხერხდება გასაღების მოცილება # Onion-Location strings. -onionLocation.alwaysPrioritize=Always Prioritize Onions +onionLocation.alwaysPrioritize=ყოველთვის უპირატესობა Onions-ს 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.always=Always -onionLocation.askEverytime=Ask every time -onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. +onionLocation.description=არსებობს მეტად პირადი და დაცული ვერსია ამ საიტის Tor-ქსელში, onion-მომსახურების სახით. Onion-მომსახურებები ეხმარება საიტის მფლობელებსა და მნახველებს, თვალის დევნებისა და ცენზურის არიდებაში. +onionLocation.tryThis=სცადეთ Onion-მომსახურებები +onionLocation.onionAvailable=.onion ხელმისაწვდომია +onionLocation.learnMore=იხილეთ ვრცლად... +onionLocation.always=ყოველთვის +onionLocation.askEverytime=შეკითხვა ყოველ ჯერზე +onionLocation.prioritizeOnionsDescription=უპირატესობა .onion-საიტებს ამოცნობისას onionLocation.onionServicesTitle=Onion-მომსახურებები diff --git a/chrome/locale/lt/torbutton.properties b/chrome/locale/lt/torbutton.properties index 156480c9..bf209881 100644 --- a/chrome/locale/lt/torbutton.properties +++ b/chrome/locale/lt/torbutton.properties @@ -8,8 +8,8 @@ torbutton.circuit_display.unknown_country = Nežinoma šalis torbutton.circuit_display.guard = Sargybinis torbutton.circuit_display.guard_note = Jūsų [Sargybinis] mazgas negali pasikeisti. torbutton.circuit_display.learn_more = Sužinoti daugiau -torbutton.circuit_display.click_to_copy = Click to Copy -torbutton.circuit_display.copied = Copied! +torbutton.circuit_display.click_to_copy = Spustelėkite norėdami nukopijuoti +torbutton.circuit_display.copied = Nukopijuota! torbutton.content_sizer.margin_tooltip = Tor Naršyklė prideda šią paraštę, kad jūsų lango plotis ir aukštis būtų mažiau atskiriami ir, tokiu būdu, žmonėms būtų sumažinta galimybė sekti jus internete. torbutton.panel.tooltip.disabled = Spustelėkite norėdami įjungti Tor torbutton.panel.tooltip.enabled = Spustelėkite norėdami išjungti Tor @@ -137,7 +137,7 @@ onionLocation.description=There's a more private and secure version of this site onionLocation.tryThis=Try Onion Services onionLocation.onionAvailable=.onion available onionLocation.learnMore=Learn more… -onionLocation.always=Always +onionLocation.always=Visada onionLocation.askEverytime=Ask every time onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. onionLocation.onionServicesTitle=Onion paslaugos diff --git a/chrome/locale/mk/aboutTor.dtd b/chrome/locale/mk/aboutTor.dtd index fb9e1bcf..5853c075 100644 --- a/chrome/locale/mk/aboutTor.dtd +++ b/chrome/locale/mk/aboutTor.dtd @@ -27,5 +27,5 @@ <!ENTITY aboutTor.newsletter.tagline "Добијте ги најновите вести од Tor директно во вашето сандаче."> <!ENTITY aboutTor.newsletter.link_text "Пријавете се за Tor Вести."> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> +<!ENTITY aboutTor.donationBanner.freeToUse "Tor е бесплатен за користење благодарение на донациите од луѓе како вас."> <!ENTITY aboutTor.donationBanner.buttonA "Донирај сега"> diff --git a/chrome/locale/mk/torbutton.properties b/chrome/locale/mk/torbutton.properties index d1fd4c12..60412498 100644 --- a/chrome/locale/mk/torbutton.properties +++ b/chrome/locale/mk/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 = Tor Browser ја додава ова маргина за ширината и висината на вашиот прозорец да биде постандарден, со што се намалува можноста луѓето да ве следат онлајн. torbutton.panel.tooltip.disabled = Кликнете за да го овозможите Tor torbutton.panel.tooltip.enabled = Кликнете за да го оневозможите Tor @@ -69,45 +69,45 @@ 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.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. +onionServices.descNotFound.pageTitle=Проблем при вчитување на Onion веб страна +onionServices.descNotFound.header=Onion веб страната не е најдена +onionServices.descNotFound=Најверојатна причина затоа е дека Onion веб страната е офлајн. Контактријате го администраторот на Onion веб страната. +onionServices.descNotFound.longDescription=Детали: %S — Бараниот објаснувач на onion услугата не може да биде пронајден на хашпрстенот и поради тоа услугата не е достапна за клиентот. # Tor SOCKS error 0xF1: -onionServices.descInvalid.pageTitle=Problem Loading Onionsite -onionServices.descInvalid.header=Onionsite Cannot Be Reached -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. +onionServices.descInvalid.pageTitle=Проблем при вчитување на Onion веб страна +onionServices.descInvalid.header=Onion веб страната не е достапна +onionServices.descInvalid=Onion веб страната не е достапна поради интерна грешка. +onionServices.descInvalid.longDescription=Детали: %S — Бараниот објаснувач на onion услугата не може да биде анализиран или валидацијата на потписот не е успешна. # Tor SOCKS error 0xF2: -onionServices.introFailed.pageTitle=Problem Loading Onionsite -onionServices.introFailed.header=Onionsite Has Disconnected -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. +onionServices.introFailed.pageTitle=Проблем при вчитување на Onion веб страна +onionServices.introFailed.header=Onion веб страната се исклучи +onionServices.introFailed=Најверојатна причина затоа е дека onion веб страната е офлајн. Контактријате го администраторот на onion веб страната. +onionServices.introFailed.longDescription=Детали: %S — Воведот беше неуспешен, што значи дека објаснувачот беше пронајден но услугата не е повеќе поврзани на воведната точка. Веројатно е дека услугата го променија нејзиниот објаснувач или не е во функцијата. # Tor SOCKS error 0xF3: -onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite -onionServices.rendezvousFailed.header=Unable to Connect to Onionsite -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. +onionServices.rendezvousFailed.pageTitle=Проблем при вчитување на onion веб страна +onionServices.rendezvousFailed.header=Не може да се поврзе на onion веб страна +onionServices.rendezvousFailed=Onion веб страната е зафатена или Tor мрежата е преоптоварена. Обидете се повторно подоцна. +onionServices.rendezvousFailed.longDescription=Детали: %S — Клиентот не успеа да се состане со услугата, што значи дека клиентот не беше во можност да го заврши поврзувањето. # Tor SOCKS error 0xF4: -onionServices.clientAuthMissing.pageTitle=Authorization Required -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. +onionServices.clientAuthMissing.pageTitle=Потребна е авторизација +onionServices.clientAuthMissing.header=Onion веб страната бара автентикација +onionServices.clientAuthMissing=Пристапот до onion веб страна бара клуч но ниту еден не беше овозможен. +onionServices.clientAuthMissing.longDescription=Детали: %S — Клиентот го презема бараниот објаснувач за Onion услугата но не можеше да ја декриптира неговата содржина бидејќи информација за авторизација на клиентот недостасува. # Tor SOCKS error 0xF5: -onionServices.clientAuthIncorrect.pageTitle=Authorization Failed -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. +onionServices.clientAuthIncorrect.pageTitle=Авторизацијата е неуспешна +onionServices.clientAuthIncorrect.header=Автентикацијата на onion веб страна беше неуспешна +onionServices.clientAuthIncorrect=Овозможениот клуч е неточен или бил повлечен. Контактирајте го администраторот на onion веб страната. +onionServices.clientAuthIncorrect.longDescription=Детали: %S — Клиентот беше во можност да го преземе бараниот објаснувач за onion услугата но не можеше да ја декриптира неговата содржина користејќи ја овозможената информација за авторизација на клиентот. Ова можеби значи дека пристапот бил повлечен. # Tor SOCKS error 0xF6: -onionServices.badAddress.pageTitle=Problem Loading Onionsite -onionServices.badAddress.header=Invalid Onionsite Address -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. +onionServices.badAddress.pageTitle=Проблем при вчитување на onion веб страна +onionServices.badAddress.header=Невалидна адреса на Onion веб страна +onionServices.badAddress=Овозможената адреса на onion веб страна е невалидна. Ве молиме проверете дека сте ја внеле точно. +onionServices.badAddress.longDescription=Детали: %S — Овозможената .onion адреса е невалидна. Оваа грешка се појавува поради една од следниве причини: контролната сума на адресата не се совпаѓа, јавниот клуч ed25519 е невалиден, или кодирањето е невалидно. # Tor SOCKS error 0xF7: -onionServices.introTimedOut.pageTitle=Problem Loading Onionsite -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. +onionServices.introTimedOut.pageTitle=Проблем при вчитување на onion веб страна +onionServices.introTimedOut.header=Времето за создавање на круг за onion веб страна истече +onionServices.introTimedOut=Неуспешно поврзување на onion веб страна, можно поради слабо мрежно поврзување. +onionServices.introTimedOut.longDescription=Детали: %S — Времето за поврзување со бараната onion услуга истече додека се градеше кругот. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. onionServices.authPrompt.description=%S го бара вашиот приватен клуч. @@ -129,15 +129,15 @@ onionServices.authPreferences.failedToGetKeys=Не може да се повра onionServices.authPreferences.failedToRemoveKey=Не може да се избрише клуч # Onion-Location strings. -onionLocation.alwaysPrioritize=Always Prioritize Onions +onionLocation.alwaysPrioritize=Секогаш преферирај Onion-и onionLocation.alwaysPrioritizeAccessKey=a onionLocation.notNow=Не сега 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.tryThis=Try Onion Services -onionLocation.onionAvailable=.onion available -onionLocation.learnMore=Learn more… -onionLocation.always=Always -onionLocation.askEverytime=Ask every time -onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. +onionLocation.description=Има поприватна и побезбедна верзија достапна за оваа веб страна преку Tor мрежата преку onion услугите. Onion услугите им помагаат на објавувачите на веб страните и на нивните посетители да ги победат надзорот и цензурата. +onionLocation.tryThis=Пробај onion услуги +onionLocation.onionAvailable=.onion достапно +onionLocation.learnMore=Научи повеќе... +onionLocation.always=Секогаш +onionLocation.askEverytime=Прашувај секој пат +onionLocation.prioritizeOnionsDescription=Преферирај .onion веб страна кога се познати. onionLocation.onionServicesTitle=Onion Услуги diff --git a/chrome/locale/nb-NO/aboutTBUpdate.dtd b/chrome/locale/nb-NO/aboutTBUpdate.dtd index e94bc709..d5dce189 100644 --- a/chrome/locale/nb-NO/aboutTBUpdate.dtd +++ b/chrome/locale/nb-NO/aboutTBUpdate.dtd @@ -1,5 +1,5 @@ -<!ENTITY aboutTBUpdate.changelogTitle "Tor Nettleser Endringslogg"> -<!ENTITY aboutTBUpdate.updated "Tor Nettleser har blitt oppdatert."> +<!ENTITY aboutTBUpdate.changelogTitle "Tor-nettleseren sin endringslogg"> +<!ENTITY aboutTBUpdate.updated "Tor-nettleseren har blitt oppdatert."> <!ENTITY aboutTBUpdate.linkPrefix "For den mest oppdaterte informasjonen om denne utgivelsen,"> <!ENTITY aboutTBUpdate.linkLabel "besøk vårt nettsted"> <!ENTITY aboutTBUpdate.linkSuffix "."> diff --git a/chrome/locale/nb-NO/aboutTor.dtd b/chrome/locale/nb-NO/aboutTor.dtd index 11a0db5d..15c0c327 100644 --- a/chrome/locale/nb-NO/aboutTor.dtd +++ b/chrome/locale/nb-NO/aboutTor.dtd @@ -20,12 +20,12 @@ <!ENTITY aboutTor.torbrowser_user_manual_link.label "Sjekk vår Tor Nettleser Håndbok »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Nettleser Håndbok"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Hånbok for Tor-nettleseren"> <!ENTITY aboutTor.tor_mission.label "The Tor Project er en US 501(c)(3) ideell organisasjon som fremmer menneskerettigheter og friheter ved å skape og distribuere anonymisering og personvernteknologi for fri og åpen kildekode, som støtter deres ubegrensede tilgjengelighet og bruk, og fremmer sin vitenskapelige og populære forståelse."> <!ENTITY aboutTor.getInvolved.label "Bli involvert »"> <!ENTITY aboutTor.newsletter.tagline "Få de siste nyhetene fra Tor rett til innboksen din."> -<!ENTITY aboutTor.newsletter.link_text "Registrer deg for Tor Nyheter."> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> +<!ENTITY aboutTor.newsletter.link_text "Registrer deg for Tor-nyheter."> +<!ENTITY aboutTor.donationBanner.freeToUse "Tor er gratis å bruke, grunnet bidrag fra folk som deg."> <!ENTITY aboutTor.donationBanner.buttonA "Donér nå"> diff --git a/chrome/locale/nb-NO/browserOnboarding.properties b/chrome/locale/nb-NO/browserOnboarding.properties index 99e81620..209fe6bd 100644 --- a/chrome/locale/nb-NO/browserOnboarding.properties +++ b/chrome/locale/nb-NO/browserOnboarding.properties @@ -4,19 +4,19 @@ onboarding.tour-tor-welcome=Velkommen onboarding.tour-tor-welcome.title=Du er klar. -onboarding.tour-tor-welcome.description=Tor Nettleser tilbyr den høyeste standarden på personvern og sikkerhet mens du surfer på nettet. Du er nå beskyttet mot sporing, overvåkning og sensur. Denne raske onboarding vil vise deg hvordan. +onboarding.tour-tor-welcome.description=Tor-nettleseren tilbyr den høyeste standarden på personvern og sikkerhet mens du surfer på nettet. Du er nå beskyttet mot sporing, overvåkning og sensur. Denne raske onboarding vil vise deg hvordan. onboarding.tour-tor-welcome.next-button=Gå til Personvern onboarding.tour-tor-privacy=Personvern onboarding.tour-tor-privacy.title=Avvis snokere og sporing. -onboarding.tour-tor-privacy.description=Tor Nettleser isolerer informasjonskapsler og sletter nettleserens historie etter økten. Disse endringene sikrer at personvernet ditt og sikkerheten er beskyttet i nettleseren. Klikk "Tor Nettverk" for å lære hvordan vi beskytter deg på nettverksnivå. -onboarding.tour-tor-privacy.button=Gå til Tor Nettverk +onboarding.tour-tor-privacy.description=Tor Nettleser isolerer informasjonskapsler og sletter nettleserens historie etter økten. Disse endringene sikrer at personvernet ditt og sikkerheten er beskyttet i nettleseren. Klikk "Tor-nettverk" for å lære hvordan vi beskytter deg på nettverksnivå. +onboarding.tour-tor-privacy.button=Gå til Tor-nettverk -onboarding.tour-tor-network=Tor Nettverk -onboarding.tour-tor-network.title=Reis et decentralisert nettverk. -onboarding.tour-tor-network.description=Tor Nettleser forbinder deg med Tor-nettet som drives av tusenvis av frivillige rundt om i verden. I motsetning til en VPN er det ingen feilpunkt eller sentralisert enhet du må stole på for å kunne nyte Internettet privat. -onboarding.tour-tor-network.description-para2=NYTT: Tor nettverksinnstillinger, inkluderer muligheten til å be om broer der Tor er blokkert, kan nå finnes i Innstillinger. -onboarding.tour-tor-network.action-button=Juster din Tor-nettverksinnstillinger +onboarding.tour-tor-network=Tor-nettverk +onboarding.tour-tor-network.title=Reis et desentralisert nettverk. +onboarding.tour-tor-network.description=Tor-nettleseren forbinder deg med Tor-nettet som drives av tusenvis av frivillige rundt om i verden. I motsetning til en VPN er det ingen feilpunkt eller sentralisert enhet du må stole på for å kunne nyte Internettet privat. +onboarding.tour-tor-network.description-para2=NYTT: Tor-nettverksinnstillinger, inkluderer muligheten til å be om broer der Tor er blokkert, kan nå finnes i Innstillinger. +onboarding.tour-tor-network.action-button=Juster dine Tor-nettverksinnstillinger onboarding.tour-tor-network.button=Gå til Kretsvisning onboarding.tour-tor-circuit-display=Kretsvisning @@ -29,19 +29,19 @@ onboarding.tour-tor-security=Sikkerhet onboarding.tour-tor-security.title=Velg din opplevelse. onboarding.tour-tor-security.description=Vi gir deg også tilleggsinnstillinger for å støte på nettleserens sikkerhet. Våre sikkerhetsinnstillinger lar deg blokkere elementer som kan brukes til å angripe datamaskinen din. Klikk nedenfor for å se hva de forskjellige alternativene gjør. onboarding.tour-tor-security.description-suffix=Merk: Som standard er NoScript og HTTPS Everywhere ikke inkludert i verktøylinjen, men du kan tilpasse verktøylinjen din for å legge dem til. -onboarding.tour-tor-security-level.button=Se Sikkerhetsnivået Ditt +onboarding.tour-tor-security-level.button=Se sikkerhetsnivået ditt onboarding.tour-tor-security-level.next-button=Gå til opplevelsestips onboarding.tour-tor-expect-differences=Opplevelsestips onboarding.tour-tor-expect-differences.title=Forvent noen forskjeller. onboarding.tour-tor-expect-differences.description=Med alle de sikkerhets og personvernfunksjonene som Tor leverer, kan din erfaring mens du surfer på Internett, være litt annerledes. Det kan være litt tregere, og avhengig av sikkerhetsnivået, kan noen elementer ikke fungere eller lastes. Du kan også bli bedt om å bevise at du er et menneske og ikke en robot. -onboarding.tour-tor-expect-differences.button=se FAQs -onboarding.tour-tor-expect-differences.next-button=Gå til Onion Tjenester +onboarding.tour-tor-expect-differences.button=se Ofte-Stilte-Spørsmål +onboarding.tour-tor-expect-differences.next-button=Gå til Løk-tjenester onboarding.tour-tor-onion-services=Løk-tjenester onboarding.tour-tor-onion-services.title=Vær ekstra beskyttet. -onboarding.tour-tor-onion-services.description=Onion tjenester er nettsteder som slutter med en .onion som gir ekstra beskyttelse til utgivere og besøkende, inkludert ekstra sikkerhetskontroll mot sensur. Onion tjenester tillater alle å gi innhold og tjenester anonymt. Klikk nedenfor for å besøke DuckDuckGo-onionstedet. -onboarding.tour-tor-onion-services.button=Besøk en Onion +onboarding.tour-tor-onion-services.description=Onion tjenester er nettsteder som slutter med en .onion som gir ekstra beskyttelse til utgivere og besøkende, inkludert ekstra sikkerhetskontroll mot sensur. Onion tjenester tillater alle å gi innhold og tjenester anonymt. Klikk nedenfor for å besøke DuckDuckGo sin løk-siden. +onboarding.tour-tor-onion-services.button=Besøk en løk-side onboarding.tour-tor-onion-services.next-button=Ferdig onboarding.overlay-icon-tooltip-updated2=Se hva som er nytt\ni %S @@ -50,10 +50,10 @@ onboarding.tour-tor-update.prefix-updated=Oppdatert onboarding.tour-tor-toolbar=Verktøylinje onboarding.tour-tor-toolbar-update-9.0.title=Farvel løk-knapp. -onboarding.tour-tor-toolbar-update-9.0.description=Vi ønsker at din erfaring med å bruke Tor skal være fullt integrert i Tor Browser. -onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu. +onboarding.tour-tor-toolbar-update-9.0.description=Vi ønsker at din erfaring med å bruke Tor skal være fullt integrert i Tor-nettleseren. +onboarding.tour-tor-toolbar-update-9.0.description-para2=Istedenfor å bruke løk-knappen, så kan du se Tor-kretser via [i] i URL-linjen og be om en ny identitet ved å bruke verktøylinjeknappen eller [≡] -menyen. onboarding.tour-tor-toolbar-update-9.0.button=Hvordan be om en Ny identitet -onboarding.tour-tor-toolbar-update-9.0.next-button=Gå til Tor Nettverk +onboarding.tour-tor-toolbar-update-9.0.next-button=Gå til Tor-nettverk # Circuit Display onboarding. onboarding.tor-circuit-display.next=Neste diff --git a/chrome/locale/nb-NO/torbutton.dtd b/chrome/locale/nb-NO/torbutton.dtd index bd5e0c42..04ca01f8 100644 --- a/chrome/locale/nb-NO/torbutton.dtd +++ b/chrome/locale/nb-NO/torbutton.dtd @@ -8,7 +8,7 @@ <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Informasjonskapsels-beskyttelse…"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> -<!ENTITY torbutton.button.tooltip "Klikk for å igangsette Torbutton"> +<!ENTITY torbutton.button.tooltip "Klikk for å igangsette Tor-knappen"> <!ENTITY torbutton.prefs.security_settings "Sikkerhetsinnstillinger for Tor-nettleseren"> <!ENTITY torbutton.cookiedialog.title "Administrer beskyttelse av informasjonskapsler"> <!ENTITY torbutton.cookiedialog.lockCol "Beskyttet"> @@ -17,7 +17,7 @@ <!ENTITY torbutton.cookiedialog.pathCol "Rute"> <!ENTITY torbutton.cookiedialog.protectCookie "Beskytt Informasjonskapsel"> <!ENTITY torbutton.cookiedialog.removeCookie "Fjern Informasjonskapsel"> -<!ENTITY torbutton.cookiedialog.unprotectCookie "Ikke Beskytt Informasjonskapsel"> +<!ENTITY torbutton.cookiedialog.unprotectCookie "Ikke beskytt informasjonskapsel"> <!ENTITY torbutton.cookiedialog.removeAllBut "Fjern alle bortsett fra beskyttede"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Beskytt nye informasjonskapsler"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ikke beskytt nye informasjonskapsler"> @@ -45,9 +45,9 @@ <!ENTITY torbutton.prefs.sec_custom_summary "Dine nettleserinnstillinger har ført med seg uvanlige sikkerhetsvalg. Av sikkerhet- og personverns-hensyn anbefaler vi at du velger en av de forvalgte sikkerhetsnivåene."> <!ENTITY torbutton.prefs.sec_restore_defaults "Gjenopprett forvalg"> <!ENTITY torbutton.prefs.sec_advanced_security_settings "Avanserte sikkerhetsinnstillinger..."> -<!ENTITY torbutton.circuit_display.title "Tor Krets"> -<!ENTITY torbutton.circuit_display.new_circuit "Ny Krets for denne siden"> +<!ENTITY torbutton.circuit_display.title "Tor-krets"> +<!ENTITY torbutton.circuit_display.new_circuit "Ny krets for denne siden">  -<!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> -<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> +<!ENTITY torbutton.onionServices.authPrompt.tooltip "Åpne løk-tjeneste klient autentiserings-ledetekst"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Husk denne nøkkelen"> diff --git a/chrome/locale/nb-NO/torbutton.properties b/chrome/locale/nb-NO/torbutton.properties index fcc737aa..b200606a 100644 --- a/chrome/locale/nb-NO/torbutton.properties +++ b/chrome/locale/nb-NO/torbutton.properties @@ -8,8 +8,8 @@ torbutton.circuit_display.unknown_country = Ukjent land torbutton.circuit_display.guard = Vakt torbutton.circuit_display.guard_note = Din [Vakt] node kan ikke endres. torbutton.circuit_display.learn_more = Lær mer -torbutton.circuit_display.click_to_copy = Click to Copy -torbutton.circuit_display.copied = Copied! +torbutton.circuit_display.click_to_copy = Trykk for å kopiere +torbutton.circuit_display.copied = Kopiert! torbutton.content_sizer.margin_tooltip = Tor Nettleser legger til denne marginen for å gjøre bredden og høyden på vinduet ditt mindre særegent, og reduserer dermed muligheten for folk til å spore deg på nett. torbutton.panel.tooltip.disabled = Klikk for å aktivere Tor torbutton.panel.tooltip.enabled = Klikk for å skru av Tor @@ -65,26 +65,26 @@ pageInfo_OnionEncryption=Tilkobling kryptert (Løk Tjeneste) onionServices.learnMore=Lær mer onionServices.errorPage.browser=Nettleser onionServices.errorPage.network=Nettverk -onionServices.errorPage.onionSite=Onionsite +onionServices.errorPage.onionSite=Løk-side # 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=Problem ved lasting av løk-side 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.pageTitle=Problem ved lasting av løk-side onionServices.descInvalid.header=Onionsite Cannot Be Reached 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.pageTitle=Problemer med å laste løk-side onionServices.introFailed.header=Onionsite Has Disconnected 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.pageTitle=Problemer med å laste løk-side onionServices.rendezvousFailed.header=Unable to Connect to Onionsite 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. @@ -99,12 +99,12 @@ 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.pageTitle=Problemer med å laste løk-side onionServices.badAddress.header=Invalid Onionsite Address 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=Problemer med å laste løk-side 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. @@ -121,7 +121,7 @@ onionServices.authPreferences.overview=Some onion services require that you iden onionServices.authPreferences.savedKeys=Saved Keys… 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=Løk-side onionServices.authPreferences.onionKey=Nøkkel onionServices.authPreferences.remove=Fjern onionServices.authPreferences.removeAll=Remove All diff --git a/chrome/locale/nl/torbutton.properties b/chrome/locale/nl/torbutton.properties index 1714bbf3..d063cb04 100644 --- a/chrome/locale/nl/torbutton.properties +++ b/chrome/locale/nl/torbutton.properties @@ -8,8 +8,8 @@ torbutton.circuit_display.unknown_country = Onbekend land torbutton.circuit_display.guard = Bewaking torbutton.circuit_display.guard_note = Uw [Guard]-node mag niet worden gewijzigd. torbutton.circuit_display.learn_more = Meer info -torbutton.circuit_display.click_to_copy = Click to Copy -torbutton.circuit_display.copied = Copied! +torbutton.circuit_display.click_to_copy = Klik om te kopiëren +torbutton.circuit_display.copied = Gekopieerd! torbutton.content_sizer.margin_tooltip = Tor Browser voegt deze rand toe om de afmetingen van het venster minder uit de toon te laten vallen. Dit maakt het moeilijker om u online te volgen. torbutton.panel.tooltip.disabled = Klik om Tor in te schakelen torbutton.panel.tooltip.enabled = Klik om Tor uit te schakelen @@ -69,45 +69,45 @@ onionServices.errorPage.onionSite=Onion-website # 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.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. +onionServices.descNotFound.pageTitle=Probleem bij laden van Onion-website +onionServices.descNotFound.header=Onion-website niet gevonden +onionServices.descNotFound=De meest waarschijnlijke oorzaak is dat de onion-website offline is. Neem contact op met de beheerder van de onion-website. +onionServices.descNotFound.longDescription=Details: %S – De opgevraagde onion-servicedescriptor kan niet op de hashring worden gevonden, waardoor de service niet bereikbaar is voor de client. # Tor SOCKS error 0xF1: -onionServices.descInvalid.pageTitle=Problem Loading Onionsite -onionServices.descInvalid.header=Onionsite Cannot Be Reached -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. +onionServices.descInvalid.pageTitle=Probleem bij laden van Onion-website +onionServices.descInvalid.header=Onion-website kan niet worden bereikt +onionServices.descInvalid=De onion-website is niet bereikbaar vanwege een interne fout. +onionServices.descInvalid.longDescription=Details: %S – De opgevraagde onion-servicedescriptor kan niet worden geparseerd, of de handtekeningverificatie is mislukt. # Tor SOCKS error 0xF2: -onionServices.introFailed.pageTitle=Problem Loading Onionsite -onionServices.introFailed.header=Onionsite Has Disconnected -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. +onionServices.introFailed.pageTitle=Probleem bij laden van Onion-website +onionServices.introFailed.header=Verbinding met Onion-website is verbroken +onionServices.introFailed=De meest waarschijnlijke oorzaak is dat de onion-website offline is. Neem contact op met de beheerder van de onion-website. +onionServices.introFailed.longDescription=Details: %S – Introductie mislukt, wat betekent dat de descriptor is gevonden maar de service niet meer met het introductiepunt is verbonden. Waarschijnlijk heeft de service de descriptor ervan gewijzigd of is deze niet actief. # Tor SOCKS error 0xF3: -onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite -onionServices.rendezvousFailed.header=Unable to Connect to Onionsite -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. +onionServices.rendezvousFailed.pageTitle=Probleem bij laden van Onion-website +onionServices.rendezvousFailed.header=Kan geen verbinding maken met Onion-website +onionServices.rendezvousFailed=De onion-website is bezet of het Tor-netwerk is overbelast. Probeer het later opnieuw. +onionServices.rendezvousFailed.longDescription=Details: %S – Rendezvous tussen client en de service is mislukt, wat betekent dat de client de verbinding niet kon voltooien. # Tor SOCKS error 0xF4: -onionServices.clientAuthMissing.pageTitle=Authorization Required -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. +onionServices.clientAuthMissing.pageTitle=Autorisatie vereist +onionServices.clientAuthMissing.header=Onion-website vereist authenticatie +onionServices.clientAuthMissing=Toegang tot de onion-website vereist een sleutel, maar deze is niet opgegeven. +onionServices.clientAuthMissing.longDescription=Details: %S – De client heeft de opgevraagde onion-servicedescriptor gedownload maar kon de inhoud ervan niet ontsleutelen, omdat clientautorisatie-informatie ontbreekt. # Tor SOCKS error 0xF5: -onionServices.clientAuthIncorrect.pageTitle=Authorization Failed -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. +onionServices.clientAuthIncorrect.pageTitle=Autorisatie mislukt +onionServices.clientAuthIncorrect.header=Onion-website-authenticatie mislukt +onionServices.clientAuthIncorrect=De opgegeven sleutel is onjuist of ingetrokken. Neem contact op met de beheerder van de onion-website. +onionServices.clientAuthIncorrect.longDescription=Details: %S – De client kon de opgevraagde onion-servicedescriptor wel downloaden, maar niet de inhoud ervan ontsleutelen via de opgegeven clientautorisatie-informatie. Dit kan betekenen dat de toegang is ingetrokken. # Tor SOCKS error 0xF6: -onionServices.badAddress.pageTitle=Problem Loading Onionsite -onionServices.badAddress.header=Invalid Onionsite Address -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. +onionServices.badAddress.pageTitle=Probleem bij laden van Onion-website +onionServices.badAddress.header=Ongeldig Onion-websiteadres +onionServices.badAddress=Het opgegeven adres van de onion-website is ongeldig. Controleer of u het juist hebt ingevuld. +onionServices.badAddress.longDescription=Details: %S – Het opgegeven .onion-adres is ongeldig. Deze fout wordt teruggegeven vanwege een van de volgende redenen: de checksum van het adres komt niet overeen, de publieke ed25519-sleutel is niet geldig, of de codering is ongeldig. # Tor SOCKS error 0xF7: -onionServices.introTimedOut.pageTitle=Problem Loading Onionsite -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. +onionServices.introTimedOut.pageTitle=Probleem bij laden van Onion-website +onionServices.introTimedOut.header=Time-out bij maken van Onion-websitecircuit +onionServices.introTimedOut=Verbinding maken met de onion-website is mislukt, mogelijk vanwege een slechte netwerkverbinding. +onionServices.introTimedOut.longDescription=Details: %S – Time-out bij verbinding met de opgevraagde onion-service tijdens opbouwen van het rendezvous-circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. onionServices.authPrompt.description=%S vraagt om uw privésleutel. @@ -129,15 +129,15 @@ onionServices.authPreferences.failedToGetKeys=Kan geen sleutels van tor ophalen onionServices.authPreferences.failedToRemoveKey=Kan sleutel niet verwijderen # Onion-Location strings. -onionLocation.alwaysPrioritize=Always Prioritize Onions +onionLocation.alwaysPrioritize=Onions altijd prioriteit geven onionLocation.alwaysPrioritizeAccessKey=a onionLocation.notNow=Niet nu 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.tryThis=Try Onion Services -onionLocation.onionAvailable=.onion available -onionLocation.learnMore=Learn more… -onionLocation.always=Always -onionLocation.askEverytime=Ask every time -onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. -onionLocation.onionServicesTitle=Onion-diensten +onionLocation.description=Er is een meer private en veilige versie van deze website beschikbaar over het Tor-netwerk via onion-services. Onion-services helpen publicisten van websites en hun bezoekers bewaking en censuur te verslaan. +onionLocation.tryThis=Onion-services proberen +onionLocation.onionAvailable=.onion beschikbaar +onionLocation.learnMore=Meer info… +onionLocation.always=Altijd +onionLocation.askEverytime=Elke keer vragen +onionLocation.prioritizeOnionsDescription=.onion-websites prioriteit geven wanneer bekend. +onionLocation.onionServicesTitle=Onion-services diff --git a/chrome/locale/pl/aboutTBUpdate.dtd b/chrome/locale/pl/aboutTBUpdate.dtd index bc318cc3..7aec1eb6 100644 --- a/chrome/locale/pl/aboutTBUpdate.dtd +++ b/chrome/locale/pl/aboutTBUpdate.dtd @@ -1,6 +1,6 @@ <!ENTITY aboutTBUpdate.changelogTitle "Lista zmian przeglądarki Tor"> -<!ENTITY aboutTBUpdate.updated "Tor Browser została zaktualizowana."> -<!ENTITY aboutTBUpdate.linkPrefix "Aby uzyskać najbardziej aktualne informacje o tym wydaniu,"> +<!ENTITY aboutTBUpdate.updated "Tor Browser został zaktualizowany."> +<!ENTITY aboutTBUpdate.linkPrefix "Aby uzyskać najbardziej aktualne informacje o tym wydaniu, "> <!ENTITY aboutTBUpdate.linkLabel "odwiedź naszą stronę internetową"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.version "Wersja"> diff --git a/chrome/locale/pl/aboutTor.dtd b/chrome/locale/pl/aboutTor.dtd index d8330a10..f67d40b9 100644 --- a/chrome/locale/pl/aboutTor.dtd +++ b/chrome/locale/pl/aboutTor.dtd @@ -22,10 +22,10 @@ <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> <!ENTITY aboutTor.torbrowser_user_manual.label "Instrukcja korzystania z Przeglądarki Tor"> -<!ENTITY aboutTor.tor_mission.label "Projekt Tor jest organizacją non-profit US 501(c)(3), wspierającą prawa człowieka i wolności. W jego ramach tworzone są darmowe i otwarte technologie chroniące anonimowość i prywatność. Tor wspiera ich nieograniczoną dostępność i użycie oraz popularyzuje je w świecie nauki i życiu codziennym. "> +<!ENTITY aboutTor.tor_mission.label "Projekt Tor jest organizacją non-profit US 501(c)(3), wspierającą prawa człowieka i wolności. W jego ramach tworzone są darmowe i otwarte technologie chroniące anonimowość i prywatność. Tor wspiera ich nieograniczoną dostępność i użycie oraz popularyzuje je w świecie nauki i w życiu codziennym. "> <!ENTITY aboutTor.getInvolved.label "Zaangażuj się »"> -<!ENTITY aboutTor.newsletter.tagline "Otrzymuj najnowsze newsy o Tor, prosto do swojej skrzynki."> -<!ENTITY aboutTor.newsletter.link_text "Zapisz się na Tor News."> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> +<!ENTITY aboutTor.newsletter.tagline "Otrzymuj aktualności o Tor, prosto do swojej skrzynki."> +<!ENTITY aboutTor.newsletter.link_text "Zapisz się na newsletter."> +<!ENTITY aboutTor.donationBanner.freeToUse "Z przeglądarki Tor można korzystać bezpłatnie dzięki darowiznom od osób takich jak Ty."> <!ENTITY aboutTor.donationBanner.buttonA "Wesprzyj teraz"> diff --git a/chrome/locale/pl/brand.dtd b/chrome/locale/pl/brand.dtd index 5cd5d9f2..d96029f1 100644 --- a/chrome/locale/pl/brand.dtd +++ b/chrome/locale/pl/brand.dtd @@ -9,7 +9,7 @@ <!ENTITY trademarkInfo.part1 "'Tor' oraz logo 'Onion' są zarejestrowanymi markami Tor Project Inc.">  -<!ENTITY plugins.installed.find "Kliknij, aby załadować wszystkie zainstalowane wtyczki"> +<!ENTITY plugins.installed.find "Kliknij, aby włączyć wszystkie zainstalowane wtyczki systemowe"> <!ENTITY plugins.installed.enable "Włącz wtyczki"> <!ENTITY plugins.installed.disable "Wyłącz wtyczki"> <!ENTITY plugins.installed.disable.tip "Kliknij, aby zapobiec włączaniu wtyczek systemowych."> diff --git a/chrome/locale/pl/torbutton.dtd b/chrome/locale/pl/torbutton.dtd index 16d97cfd..7719281a 100644 --- a/chrome/locale/pl/torbutton.dtd +++ b/chrome/locale/pl/torbutton.dtd @@ -25,23 +25,23 @@ <!ENTITY torbutton.prefs.sec_caption_tooltip "Suwak poziomu bezpieczeństwa pozwala na wyłączenie pewnych funkcji przeglądarki, które mogą uczynić ten program bardziej narażonym na próby ataku hakerskiego."> <!ENTITY torbutton.prefs.sec_standard_label "Standardowy"> <!ENTITY torbutton.prefs.sec_standard_description "Wszystkie funkcje Przeglądarki Tor i strony zostały włączone."> -<!ENTITY torbutton.prefs.sec_safer_label "Bezpieczniej"> -<!ENTITY torbutton.prefs.sec_safer_description "Wyłącza funkcje witryny, które często są niebezpieczne, co powoduje, że niektóre witryny tracą funkcjonalność."> +<!ENTITY torbutton.prefs.sec_safer_label "Bezpieczniejszy"> +<!ENTITY torbutton.prefs.sec_safer_description "Wyłącza te funkcje witryn, które często mogą być niebezpieczne. Powoduje to, że niektóre witryny mogą nie działać poprawnie."> <!ENTITY torbutton.prefs.sec_safer_list_label "W bezpieczniejszych ustawieniach:"> <!ENTITY torbutton.prefs.sec_safest_label "Najbezpieczniejszy"> <!ENTITY torbutton.prefs.sec_safest_description "Pozwala tylko na funkcje serwisu wymagane w przypadku witryn statycznych i podstawowych usług. Te zmiany dotyczą obrazów, multimediów i skryptów."> <!ENTITY torbutton.prefs.sec_safest_list_label "W najbezpieczniejszych ustawieniach:"> <!ENTITY torbutton.prefs.sec_learn_more_label "Dowiedz się więcej"> -<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "Obsługa skryptów Java na stronach bez HTTPS jest wyłączona."> -<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript jest domyślnie wyłączona na wszystkich stronach."> -<!ENTITY torbutton.prefs.sec_limit_typography "Niektóre fonty i symbole są wyłączone."> -<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Niektóre fonty, ikony, symbole i obrazki są wyłączone."> -<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio i wideo (media HTML5) i WebGL kliknij, aby odtworzyć."> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "Obsługa JavaScript na stronach nie używających HTTPS jest wyłączona."> +<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript jest domyślnie wyłączony na wszystkich stronach."> +<!ENTITY torbutton.prefs.sec_limit_typography "Niektóre czcionki i symbole matematyczne są wyłączone."> +<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Niektóre czcionki, ikony, symbole matematyczne oraz obrazki są wyłączone."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio i wideo (HTML5) oraz WebGL wymagają kliknięcia celem odtworzenia."> <!ENTITY torbutton.prefs.sec_custom_warning "Dowolne"> -<!ENTITY torbutton.prefs.sec_overview "Wyłącz niektóre funkcje internetowe, które mogą zostać użyte do zaatakowania Twojego bezpieczeństwa i anonimowości."> +<!ENTITY torbutton.prefs.sec_overview "Wyłącz niektóre funkcje, które mogą zostać użyte do zaatakowania Twojego bezpieczeństwa i anonimowości."> <!ENTITY torbutton.prefs.sec_standard_tooltip "Poziom bezpieczeństwa: Standardowy"> -<!ENTITY torbutton.prefs.sec_safer_tooltip "Poziom bezpieczeństwa: bezpieczniejszy"> -<!ENTITY torbutton.prefs.sec_safest_tooltip "Poziom bezpieczeństwa: najbezpieczniejszy"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "Poziom bezpieczeństwa: Bezpieczniejszy"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "Poziom bezpieczeństwa: Najbezpieczniejszy"> <!ENTITY torbutton.prefs.sec_custom_summary "Niestandardowe preferencje przeglądarki spowodowały nietypowe ustawienia zabezpieczeń. Ze względów bezpieczeństwa i prywatności zalecamy wybranie jednego z domyślnych poziomów zabezpieczeń."> <!ENTITY torbutton.prefs.sec_restore_defaults "Przywróć domyślne"> <!ENTITY torbutton.prefs.sec_advanced_security_settings "Zaawansowane ustawienia zabezpieczeń…"> diff --git a/chrome/locale/pl/torbutton.properties b/chrome/locale/pl/torbutton.properties index e4d68125..7d179996 100644 --- a/chrome/locale/pl/torbutton.properties +++ b/chrome/locale/pl/torbutton.properties @@ -3,13 +3,13 @@ torbutton.circuit_display.ip_unknown = IP nieznany torbutton.circuit_display.onion_site = strona Onion torbutton.circuit_display.this_browser = Ta przeglądarka torbutton.circuit_display.relay = Przekaźnik -torbutton.circuit_display.tor_bridge = Bridge +torbutton.circuit_display.tor_bridge = Mostek torbutton.circuit_display.unknown_country = Nieznane państwo torbutton.circuit_display.guard = Guard torbutton.circuit_display.guard_note = Twój węzeł [Guard] może się nie zmienić. torbutton.circuit_display.learn_more = Dowiedz się więcej -torbutton.circuit_display.click_to_copy = Click to Copy -torbutton.circuit_display.copied = Copied! +torbutton.circuit_display.click_to_copy = Kliknij, aby skopiować +torbutton.circuit_display.copied = Skopiowano! torbutton.content_sizer.margin_tooltip = Tor Browser dodaje ten margines po to, aby szerokość i wysokość okna Twojej przeglądarki była mniej charakterystyczna, dzięki temu zmniejszysz szanse śledzenia Ciebie online. torbutton.panel.tooltip.disabled = Kliknij tutaj, aby włączyć Tora torbutton.panel.tooltip.enabled = Kliknij tutaj, aby wyłączyć Tora @@ -87,14 +87,14 @@ onionServices.introFailed.longDescription=Details: %S — Introduction failed, w onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite onionServices.rendezvousFailed.header=Unable to Connect to Onionsite 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. +onionServices.rendezvousFailed.longDescription=Szczegóły: %S — Klient nie mógł się spotkać z usługą, co oznacza, że klient nie mógł sfinalizować połączenia. # Tor SOCKS error 0xF4: -onionServices.clientAuthMissing.pageTitle=Authorization Required +onionServices.clientAuthMissing.pageTitle=Wymagana Autoryzacja 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=Błąd Autoryzacji 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. @@ -110,7 +110,7 @@ onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to 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. -onionServices.authPrompt.description= %S żąda twój klucz prywatny. +onionServices.authPrompt.description= %S żąda Twojego klucza prywatnego. onionServices.authPrompt.keyPlaceholder=Wprowadź swój klucz prywatny dla tej usługi cebulowej onionServices.authPrompt.done=Skończone onionServices.authPrompt.doneAccessKey=d @@ -133,11 +133,11 @@ onionLocation.alwaysPrioritize=Always Prioritize Onions onionLocation.alwaysPrioritizeAccessKey=u onionLocation.notNow=Nie teraz 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=Bezpieczniejsza wersja tej strony jest dostępna jako usługa cebulowa. Usługi cebulowe pomagają twórcom witryn internetowych oraz odwiedzającym je bronić się przed monitorowaniem ruchu i cenzurą. onionLocation.tryThis=Try Onion Services onionLocation.onionAvailable=.onion available -onionLocation.learnMore=Learn more… -onionLocation.always=Always -onionLocation.askEverytime=Ask every time +onionLocation.learnMore=Dowiedz się więcej... +onionLocation.always=Zawsze +onionLocation.askEverytime=Pytaj za każdym razem onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. onionLocation.onionServicesTitle=Usługi onion diff --git a/chrome/locale/pt-BR/torbutton.properties b/chrome/locale/pt-BR/torbutton.properties index 7a2a2145..f032c795 100644 --- a/chrome/locale/pt-BR/torbutton.properties +++ b/chrome/locale/pt-BR/torbutton.properties @@ -77,22 +77,22 @@ onionServices.descNotFound.longDescription=Detalhes: %S — O descritor de servi onionServices.descInvalid.pageTitle=Problema ao carregar o Onionsite onionServices.descInvalid.header=Onionsite não pode ser alcançado onionServices.descInvalid=O onionsite está inacessível devido a um erro interno. -onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed. +onionServices.descInvalid.longDescription=Detalhes: %S — O descritor de serviço cebola solicitado não pode ser analisado ou a verificação de assinatura falhou. # Tor SOCKS error 0xF2: onionServices.introFailed.pageTitle=Problema ao carregar o Onionsite -onionServices.introFailed.header=Onionsite Has Disconnected +onionServices.introFailed.header=Onionsite se desconectou onionServices.introFailed=a causa mais provável é que o onionsite esteja offline. Entre em contato com o administrador do site. -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=Detalhes: %S — Introdução falhou, oque significa que o descritor foi encontrado mas o serviço não está mais conectado ao ponto de introdução. É provável que o serviço mudou seu descritor ou não está operando. # Tor SOCKS error 0xF3: onionServices.rendezvousFailed.pageTitle=Problema ao carregar o Onionsite -onionServices.rendezvousFailed.header=Unable to Connect to Onionsite -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. +onionServices.rendezvousFailed.header=Não foi possível conectar com o Onionsite +onionServices.rendezvousFailed=O onionsite está ocupado ou a rede Tor está sobrecarregada. Tente novamente mais tarde. +onionServices.rendezvousFailed.longDescription=Detalhes: %S — O cliente falhou em encontrar com o serviço, oque significa que o cliente não foi capaz de finalizar a conexão. # Tor SOCKS error 0xF4: onionServices.clientAuthMissing.pageTitle=Autorização necessária onionServices.clientAuthMissing.header=Onionsite Requer autenticação onionServices.clientAuthMissing=O acesso ao onionsite requer uma chave, mas nenhuma foi fornecida. -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=Detalhes: %S — O cliente fez o download do descritor de serviço cebola solicitado, mas não foi capaz de descriptografar seu conteúdo porque está faltando a informação de autorização do cliente. # Tor SOCKS error 0xF5: onionServices.clientAuthIncorrect.pageTitle=Falha na autorização onionServices.clientAuthIncorrect.header=Falha na autenticação do Onionsite @@ -102,7 +102,7 @@ onionServices.clientAuthIncorrect.longDescription=Detalhes: %S — O cliente con onionServices.badAddress.pageTitle=Problema ao carregar o Onionsite onionServices.badAddress.header=Endereço Onionsite inválido onionServices.badAddress=O endereço fornecido no onionsite é inválido. Verifique se você o inseriu corretamente. -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=Details: %S — O endereço cebola fornecido não é válido. Este erro está aparecendo devido a uma das seguintes razões: a soma de verificação do endereço não confere, a chave pública ed25519 é inválida ou a codificação é inválida. # Tor SOCKS error 0xF7: onionServices.introTimedOut.pageTitle=Problema ao carregar o Onionsite onionServices.introTimedOut.header=A criação do circuito de onionsite expirou @@ -135,9 +135,9 @@ onionLocation.notNow=Por enquanto, não onionLocation.notNowAccessKey=n onionLocation.description=Existe uma versão mais privada e segura deste site disponível na rede Tor através de serviços de cebola. Os serviços Onion ajudam os editores de sites e seus visitantes a derrotar a vigilância e a censura. onionLocation.tryThis=testar serviços Onion -onionLocation.onionAvailable=.onion available +onionLocation.onionAvailable=.onion disponível onionLocation.learnMore=Saber mais… onionLocation.always=Sempre onionLocation.askEverytime=Perguntar sempre -onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. +onionLocation.prioritizeOnionsDescription=Priorize sites .onion quando conhecido. onionLocation.onionServicesTitle=Serviços Onion diff --git a/chrome/locale/ro/aboutTor.dtd b/chrome/locale/ro/aboutTor.dtd index 550b1f6a..07488af9 100644 --- a/chrome/locale/ro/aboutTor.dtd +++ b/chrome/locale/ro/aboutTor.dtd @@ -27,5 +27,5 @@ <!ENTITY aboutTor.newsletter.tagline "Obțineți ultimele știri de la Tor direct în căsuța de e-mail."> <!ENTITY aboutTor.newsletter.link_text "Abonează-te la Tor News."> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> +<!ENTITY aboutTor.donationBanner.freeToUse "Tor poate fi folosit gratuit datorită donațiilor de la oameni ca tine."> <!ENTITY aboutTor.donationBanner.buttonA "Donează Acum"> diff --git a/chrome/locale/ro/torbutton.properties b/chrome/locale/ro/torbutton.properties index 41f1a075..b5daca68 100644 --- a/chrome/locale/ro/torbutton.properties +++ b/chrome/locale/ro/torbutton.properties @@ -8,8 +8,8 @@ torbutton.circuit_display.unknown_country = Țară necunoscută torbutton.circuit_display.guard = Releu Gardă torbutton.circuit_display.guard_note = Releul de [Gardă] va putea rămâne neschimbat. torbutton.circuit_display.learn_more = Află mai mult -torbutton.circuit_display.click_to_copy = Click to Copy -torbutton.circuit_display.copied = Copied! +torbutton.circuit_display.click_to_copy = Click pentru a copia +torbutton.circuit_display.copied = Copiat! torbutton.content_sizer.margin_tooltip = Navigatorul Tor Browser adaugă această margine pentru a face lățimea și înălțimea ferestrei tale mai puțin specifică, și astfel reduce abilitatea altora de a te urmări online. torbutton.panel.tooltip.disabled = Click pentru a activa Tor torbutton.panel.tooltip.enabled = Click pentru a dezactiva Tor @@ -69,45 +69,45 @@ onionServices.errorPage.onionSite=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=Problem Loading Onionsite -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. +onionServices.descNotFound.pageTitle=A apărut o problemă la încărcarea Onionsite +onionServices.descNotFound.header=Nu am găsit Onionsite +onionServices.descNotFound=Cea mai probabilă cauză este că Onionsite este offline. Contactați administratorul Onionsite. +onionServices.descNotFound.longDescription=Detalii: %S — Descriptorul serviciului de Onion solicitat nu poate fi găsit pe hashring și, prin urmare, serviciul nu poate fi accesat de către client. # Tor SOCKS error 0xF1: -onionServices.descInvalid.pageTitle=Problem Loading Onionsite -onionServices.descInvalid.header=Onionsite Cannot Be Reached -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. +onionServices.descInvalid.pageTitle=A apărut o problemă la încărcarea Onionsite +onionServices.descInvalid.header=Onionsite nu poate fi accesat +onionServices.descInvalid=Onionsite nu poate fi accesat din cauza unei erori interne. +onionServices.descInvalid.longDescription=Detalii: %S — Descriptorul serviciului Onion solicitat nu poate fi analizat sau validarea semnăturii a eșuat. # Tor SOCKS error 0xF2: -onionServices.introFailed.pageTitle=Problem Loading Onionsite -onionServices.introFailed.header=Onionsite Has Disconnected -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. +onionServices.introFailed.pageTitle=A apărut o problemă la încărcarea Onionsite +onionServices.introFailed.header=Onionsite s-a deconectat +onionServices.introFailed=Cea mai probabilă cauză este că Onionsite este offline. Contactați administratorul Onionsite. +onionServices.introFailed.longDescription=Detalii: %S — Introducerea a eșuat, ceea ce înseamnă că descriptorul a fost găsit, dar serviciul nu mai este conectat la punctul de introducere. Este probabil ca serviciul să-și fi schimbat descriptorul sau să nu funcționeze. # Tor SOCKS error 0xF3: -onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite -onionServices.rendezvousFailed.header=Unable to Connect to Onionsite -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. +onionServices.rendezvousFailed.pageTitle=A apărut o problemă la încărcarea Onionsite +onionServices.rendezvousFailed.header=Conectarea la Onionsite nu este posibilă +onionServices.rendezvousFailed=Onionsite este ocupat sau rețeaua Tor este supraîncărcată. Încercați mai târziu. +onionServices.rendezvousFailed.longDescription=Detalii: %S — Clientul nu a reușit să ia legătura cu serviciul, ceea ce înseamnă că clientul nu a putut finaliza conexiunea. # Tor SOCKS error 0xF4: -onionServices.clientAuthMissing.pageTitle=Authorization Required -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. +onionServices.clientAuthMissing.pageTitle=Este necesară autorizarea +onionServices.clientAuthMissing.header=Onionsite cere autentificarea +onionServices.clientAuthMissing=Accesul la Onionsite necesită o cheie, dar nu a fost furnizată niciuna. +onionServices.clientAuthMissing.longDescription=Detalii: %S — Clientul a descărcat descriptorul serviciului Onion solicitat, dar nu a putut să decripteze conținutul său, deoarece lipsesc informațiile privind autorizarea clientului. # Tor SOCKS error 0xF5: -onionServices.clientAuthIncorrect.pageTitle=Authorization Failed -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. +onionServices.clientAuthIncorrect.pageTitle=Autorizarea a eșuat +onionServices.clientAuthIncorrect.header=Autorizarea Onionsite a eșuat +onionServices.clientAuthIncorrect=Cheia furnizată este incorectă sau a fost revocată. Contactați administratorul Onionsite. +onionServices.clientAuthIncorrect.longDescription=Detalii: %S — Clientul a putut descărca descriptorul serviciului Onion solicitat, dar nu a putut să decripteze conținutul său folosind informațiile de autorizare furnizate de client. Aceasta poate însemna că accesul a fost revocat. # Tor SOCKS error 0xF6: -onionServices.badAddress.pageTitle=Problem Loading Onionsite -onionServices.badAddress.header=Invalid Onionsite Address -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. +onionServices.badAddress.pageTitle=A apărut o problemă la încărcarea Onionsite +onionServices.badAddress.header=Adresa Onionsite incorectă +onionServices.badAddress=Adresa furnizată la Onionsite nu este validă. Verificați dacă ați introdus-o corect. +onionServices.badAddress.longDescription=Detalii: %S — Adresa .onion furnizată nu este validă. Această eroare are unul dintre următoarele motive: suma de control a adresei nu se potrivește, cheia publică ed25519 nu este valabilă sau codificarea este nevalidă. # Tor SOCKS error 0xF7: -onionServices.introTimedOut.pageTitle=Problem Loading Onionsite -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. +onionServices.introTimedOut.pageTitle=A apărut o problemă la încărcarea Onionsite +onionServices.introTimedOut.header=Crearea de circuite Onionsite a fost terminată +onionServices.introTimedOut=Eroare la conectarea la Oniosite, posibil din cauza unei conexiuni de rețea deficitare. +onionServices.introTimedOut.longDescription=Detalii: %S — Conexiunea la serviciul Onion solicitat a expirat în timp ce încercați să construiți circuitul de întâlnire. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. onionServices.authPrompt.description=%S solicită cheia dvs. privată. @@ -129,15 +129,15 @@ onionServices.authPreferences.failedToGetKeys=Imposibil de a prelua chei de la t onionServices.authPreferences.failedToRemoveKey=Nu se poate elimina cheia # Onion-Location strings. -onionLocation.alwaysPrioritize=Always Prioritize Onions +onionLocation.alwaysPrioritize=Întotdeauna prioritate pentru serviciile Onion onionLocation.alwaysPrioritizeAccessKey=a onionLocation.notNow=Nu acum 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.tryThis=Try Onion Services -onionLocation.onionAvailable=.onion available -onionLocation.learnMore=Learn more… -onionLocation.always=Always -onionLocation.askEverytime=Ask every time -onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. +onionLocation.description=Există o versiune mai privată și mai sigură a acestui site, disponibilă prin rețeaua Tor, prin intermediul serviciilor Onion. Serviciile Onion ajută editorii de site-uri și vizitatorii lor să învingă supravegherea și cenzura. +onionLocation.tryThis=Încercați serviciile Onion +onionLocation.onionAvailable=.onion disponibil +onionLocation.learnMore=Aflați mai multe +onionLocation.always=Întotdeauna +onionLocation.askEverytime=Întreabă de fiecare dată +onionLocation.prioritizeOnionsDescription=Prioritizați site-urile .onion când sunt cunoscute. onionLocation.onionServicesTitle=Servicii Onion diff --git a/chrome/locale/sv-SE/aboutTor.dtd b/chrome/locale/sv-SE/aboutTor.dtd index 23248383..2e1f82fc 100644 --- a/chrome/locale/sv-SE/aboutTor.dtd +++ b/chrome/locale/sv-SE/aboutTor.dtd @@ -25,7 +25,7 @@ <!ENTITY aboutTor.tor_mission.label "Tor-projektet är en amerikansk 501(c)(3) ideell organisation som främjar mänskliga rättigheter och friheter genom att skapa och distribuera anonymitets- och sekretessteknik med fri och öppen källkod, stödja deras obegränsade tillgänglighet och användning och främja deras vetenskapliga och populära förståelse."> <!ENTITY aboutTor.getInvolved.label "Engagera dig »"> -<!ENTITY aboutTor.newsletter.tagline "Få de senaste nyheterna från Tor direkt till din inkorg."> +<!ENTITY aboutTor.newsletter.tagline "Få de senaste nyheterna från Tor direkt i din inkorg."> <!ENTITY aboutTor.newsletter.link_text "Anmäl dig till Tor-nyheter."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor är gratis att använda på grund av donationer från människor som du."> <!ENTITY aboutTor.donationBanner.buttonA "Donera nu"> diff --git a/chrome/locale/sv-SE/brand.properties b/chrome/locale/sv-SE/brand.properties index 22f1382b..362ab3ab 100644 --- a/chrome/locale/sv-SE/brand.properties +++ b/chrome/locale/sv-SE/brand.properties @@ -11,6 +11,6 @@ homePageSingleStartMain=Firefox Start, en snabb webbplats med inbyggd sökfunkti homePageImport=Importera din startsida från %S homePageMigrationPageTitle=Val av startsida -homePageMigrationDescription=Välj den startsida du vill använda: +homePageMigrationDescription=Vänligen välj den startsida du vill använda: syncBrandShortName=Synka diff --git a/chrome/locale/sv-SE/torbutton.properties b/chrome/locale/sv-SE/torbutton.properties index caa5e824..78fff3a9 100644 --- a/chrome/locale/sv-SE/torbutton.properties +++ b/chrome/locale/sv-SE/torbutton.properties @@ -8,8 +8,8 @@ torbutton.circuit_display.unknown_country = Okänt land torbutton.circuit_display.guard = Vakt torbutton.circuit_display.guard_note = Din [Guard]-nod kanske inte ändras. torbutton.circuit_display.learn_more = Läs mer -torbutton.circuit_display.click_to_copy = Click to Copy -torbutton.circuit_display.copied = Copied! +torbutton.circuit_display.click_to_copy = Klicka för att kopiera +torbutton.circuit_display.copied = Kopierat! torbutton.content_sizer.margin_tooltip = Tor Browser lägger till denna marginal för att göra bredden och höjden på ditt fönster mindre tydlig. Därmed minskas möjligheten att spåra dig. torbutton.panel.tooltip.disabled = Klicka för att aktivera Tor torbutton.panel.tooltip.enabled = Klicka för att inaktivera Tor @@ -20,9 +20,9 @@ torbutton.popup.external.title = Ladda ned en extern filtyp? torbutton.popup.external.app = Tor Browser kan inte visa filen. Du behöver öppna den i ett annat program.\n\n torbutton.popup.external.note = Vissa typer av filer kan få program att ansluta till internet utan att använda Tor.\n\n torbutton.popup.external.suggest = Det är säkrast att öppna filer du har hämtat hem bara när du är offline, eller så kan du använda en Tor Live CD som till exempel Tails.\n -torbutton.popup.launch = Hämta hem filen +torbutton.popup.launch = Hämta fil torbutton.popup.cancel = Avbryt -torbutton.popup.dontask = Hämta hem filer automatiskt i fortsättningen +torbutton.popup.dontask = Hämta filer automatiskt i fortsättningen torbutton.popup.no_newnym = Torbutton kan inte säkert ge dig en ny identitet. Det har inte tillgång till Tor Control Port.\n\nKör du Tor Browser Bundle? torbutton.security_settings.menu.title = Säkerhetsinställningar torbutton.title.prompt_torbrowser = Viktig information om Torbutton @@ -47,15 +47,15 @@ canvas.neverAccessKey=e # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. profileProblemTitle=%S Profilproblem -profileReadOnly=Du kan inte köra %S från ett read-only filsystem. Kopiera först %S till ett annat ställe innan användning. -profileReadOnlyMac=Du kan inte köra %S från ett read-only filsystem. Kopiera först %S till Skrivbordet eller Applications-mapp innan användning. +profileReadOnly=Du kan inte köra %S från ett skrivskyddat filsystem. Vänligen kopiera %S till en annan plats innan du försöker använda den. +profileReadOnlyMac=Du kan inte köra %S från ett skrivskyddat filsystem. Vänligen kopiera först %S till Skrivbordet eller Applications-mappen innan du försöker använda den. profileAccessDenied=%S har inte rättighet att använda profilen. Vänligen ändra dina rättigheter i filsystemet och försök igen! profileMigrationFailed=Migrering av din befintliga %S profil misslyckades.\nNya inställningar kommer att användas. # "Downloading update" string for the hamburger menu (see #28885). # This string is kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. -updateDownloadingPanelUILabel=Hämtar % s-uppdatering +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) @@ -69,59 +69,59 @@ onionServices.errorPage.onionSite=Onion-sida # 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.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. +onionServices.descNotFound.pageTitle=Problem med att läsa in onion-webbplats +onionServices.descNotFound.header=Onion-webbplats hittades inte +onionServices.descNotFound=Den mest troliga orsaken är att onion-webbplatsen är frånkopplad. Kontakta administratör för onion-webbplats. +onionServices.descNotFound.longDescription=Detaljer: %S — Den begärda beskrivningen för onion-tjänsten kan inte hittas på hashringen och därför kan tjänsten inte nås av klienten. # Tor SOCKS error 0xF1: -onionServices.descInvalid.pageTitle=Problem Loading Onionsite -onionServices.descInvalid.header=Onionsite Cannot Be Reached -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. +onionServices.descInvalid.pageTitle=Problem med att läsa in onion-webbplats +onionServices.descInvalid.header=Onion-webbplats kan inte nås +onionServices.descInvalid=Onion-webbplatsen är onåbar på grund av ett internt fel. +onionServices.descInvalid.longDescription=Detaljer: %S — Den begärda beskrivningen för onion-tjänsten kan inte tolkas eller signaturvalidering misslyckades. # Tor SOCKS error 0xF2: -onionServices.introFailed.pageTitle=Problem Loading Onionsite -onionServices.introFailed.header=Onionsite Has Disconnected -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. +onionServices.introFailed.pageTitle=Problem med att läsa in onion-webbplatsen +onionServices.introFailed.header=Onion-webbplats har kopplats från +onionServices.introFailed=Den mest troliga orsaken är att onion-webbplatsen är frånkopplad. Kontakta administratör för onion-webbplats. +onionServices.introFailed.longDescription=Detaljer: %S — Introduktion misslyckades, vilket innebär att beskrivningen hittades men tjänsten är inte längre ansluten till introduktionspunkten. Det är troligt att tjänsten har ändrat sin beskrivning eller att den inte körs. # Tor SOCKS error 0xF3: -onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite -onionServices.rendezvousFailed.header=Unable to Connect to Onionsite -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. +onionServices.rendezvousFailed.pageTitle=Problem med att läsa in onion-webbplats +onionServices.rendezvousFailed.header=Det går inte att ansluta till onion-webbplats +onionServices.rendezvousFailed=Onion-webbplatsen är upptagen eller Tor-nätverket är överbelastat. Försök igen senare. +onionServices.rendezvousFailed.longDescription=Detaljer: %S — Klienten misslyckades med att delta i tjänsten, vilket innebär att klienten inte kunde slutföra anslutningen. # Tor SOCKS error 0xF4: -onionServices.clientAuthMissing.pageTitle=Authorization Required -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. +onionServices.clientAuthMissing.pageTitle=Autentisering krävs +onionServices.clientAuthMissing.header=Onion-webbplats kräver autentisering +onionServices.clientAuthMissing=Tillgång till onion-webbplats kräver en nyckel men ingen tillhandahölls. +onionServices.clientAuthMissing.longDescription=Detaljer: %S — Klienten hämtade den begärda beskrivningen för onion-tjänsten men kunde inte dekryptera dess innehåll eftersom information om klientautentisering saknas. # Tor SOCKS error 0xF5: -onionServices.clientAuthIncorrect.pageTitle=Authorization Failed -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. +onionServices.clientAuthIncorrect.pageTitle=Autentisering misslyckades +onionServices.clientAuthIncorrect.header=Autentisering av onion-webbplatsen misslyckades +onionServices.clientAuthIncorrect=Den medföljande nyckeln är felaktig eller har återkallats. Kontakta administratör för onion-webbplats. +onionServices.clientAuthIncorrect.longDescription=Detaljer: %S — Klienten kunde hämta den begärda beskrivningen för onion-tjänsten men kunde inte dekryptera dess innehåll med den tillhandahållna klientauktoriseringsinformationen. Detta kan innebära att åtkomst har återkallats. # Tor SOCKS error 0xF6: -onionServices.badAddress.pageTitle=Problem Loading Onionsite -onionServices.badAddress.header=Invalid Onionsite Address -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. +onionServices.badAddress.pageTitle=Problem med att läsa in onion-webbplats +onionServices.badAddress.header=Ogiltig onion-webbplatsadress +onionServices.badAddress=Den angivna adressen för onion-webbplatsen är ogiltig. Vänligen kontrollera att du har angett det korrekt. +onionServices.badAddress.longDescription=Detaljer: %S — Den tillhandahållna .onion-adressen är ogiltig. Det här felet returneras på grund av ett av följande skäl: adresskontrollsumman stämmer inte, den offentliga nyckeln ed25519 är ogiltig eller kodningen är ogiltig. # Tor SOCKS error 0xF7: -onionServices.introTimedOut.pageTitle=Problem Loading Onionsite -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. +onionServices.introTimedOut.pageTitle=Problem med att läsa in onion-webbplats +onionServices.introTimedOut.header=Tiden för skapandet av onionwebbplatskrets löpte ut +onionServices.introTimedOut=Det gick inte att ansluta till onion-webbplats, eventuellt på grund av en dålig nätverksanslutning. +onionServices.introTimedOut.longDescription=Detaljer: %S — Anslutningen till den begärda onion-tjänsten avbröts när man försökte bygga möteskretsen. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. onionServices.authPrompt.description=%S begär din privata nyckel. onionServices.authPrompt.keyPlaceholder=Ange din privata nyckel för den här onion-tjänsten onionServices.authPrompt.done=Färdig onionServices.authPrompt.doneAccessKey=d -onionServices.authPrompt.invalidKey=Ange en giltig nyckel (52 base32-tecken eller 44 base64-tecken) +onionServices.authPrompt.invalidKey=Vänligen ange en giltig nyckel (52 base32-tecken eller 44 base64-tecken) onionServices.authPrompt.failedToSetKey=Det går inte att konfigurera Tor med din nyckel onionServices.authPreferences.header=Autentisering för onion-tjänster onionServices.authPreferences.overview=Vissa onion-tjänster kräver att du identifierar dig med en nyckel (ett slags lösenord) innan du kan komma åt dem. onionServices.authPreferences.savedKeys=Sparade nycklar… onionServices.authPreferences.dialogTitle=Nycklar för onion-tjänster -onionServices.authPreferences.dialogIntro=Nycklar för följande onion-sidor lagras på din dator -onionServices.authPreferences.onionSite=Onion-sida +onionServices.authPreferences.dialogIntro=Nycklar för följande onion-webbplatser lagras på din dator +onionServices.authPreferences.onionSite=Onion-webbplats onionServices.authPreferences.onionKey=Förklaring onionServices.authPreferences.remove=Ta bort onionServices.authPreferences.removeAll=Ta bort alla @@ -129,15 +129,15 @@ onionServices.authPreferences.failedToGetKeys=Det går inte att hämta nycklar f onionServices.authPreferences.failedToRemoveKey=Det går inte att ta bort nyckeln # Onion-Location strings. -onionLocation.alwaysPrioritize=Always Prioritize Onions +onionLocation.alwaysPrioritize=Prioritera alltid onion-tjänster onionLocation.alwaysPrioritizeAccessKey=a onionLocation.notNow=Inte just nu 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.tryThis=Try Onion Services -onionLocation.onionAvailable=.onion available -onionLocation.learnMore=Learn more… -onionLocation.always=Always -onionLocation.askEverytime=Ask every time -onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. +onionLocation.description=Det finns en mer privat och säker version av denna webbplats via Tor-nätverket via onion-tjänster. Onion-tjänster hjälper webbplatsutgivare och deras besökare att besegra övervakning och censur. +onionLocation.tryThis=Prova onion-tjänster +onionLocation.onionAvailable=.onion tillgänglig +onionLocation.learnMore=Läs mer... +onionLocation.always=Alltid +onionLocation.askEverytime=Fråga varje gång +onionLocation.prioritizeOnionsDescription=Prioritera .onion-webbplatser när de är kända. onionLocation.onionServicesTitle=Onion-tjänster diff --git a/chrome/locale/tr/aboutTor.dtd b/chrome/locale/tr/aboutTor.dtd index 71cc6e52..d36cc0fd 100644 --- a/chrome/locale/tr/aboutTor.dtd +++ b/chrome/locale/tr/aboutTor.dtd @@ -27,5 +27,5 @@ <!ENTITY aboutTor.newsletter.tagline "Tor ile ilgili son gelişmeler doğrudan e-posta kutunuza gelsin."> <!ENTITY aboutTor.newsletter.link_text "Tor Duyurularına Abone Olun"> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> +<!ENTITY aboutTor.donationBanner.freeToUse "Tor sizin gibi insanların bağışları ile desteklendiği için ücretsiz olarak kullanılabilir."> <!ENTITY aboutTor.donationBanner.buttonA "Bağış Yapın"> diff --git a/chrome/locale/tr/torbutton.properties b/chrome/locale/tr/torbutton.properties index 8bfbc007..ddf3af56 100644 --- a/chrome/locale/tr/torbutton.properties +++ b/chrome/locale/tr/torbutton.properties @@ -8,8 +8,8 @@ torbutton.circuit_display.unknown_country = Bilinmeyen Ülke torbutton.circuit_display.guard = Koruma torbutton.circuit_display.guard_note = [Koruma] düğümünüz değiştirilemez. torbutton.circuit_display.learn_more = Ayrıntılı bilgi alın -torbutton.circuit_display.click_to_copy = Click to Copy -torbutton.circuit_display.copied = Copied! +torbutton.circuit_display.click_to_copy = Kopyalamak için tıklayın +torbutton.circuit_display.copied = Kopyalandı! torbutton.content_sizer.margin_tooltip = Tor Browser pencerenizin genişlik ve yüksekliğini daha az ayırt edilebilir duruma getirmek için kenar boşlukları ekleyerek kişilerin sizi çevrim içi olarak izleme yeteneğini azaltır. torbutton.panel.tooltip.disabled = Tor uygulamasını etkinleştirmek için tıklayın torbutton.panel.tooltip.enabled = Tor uygulamasını devre dışı bırakmak için tıklayın @@ -69,45 +69,45 @@ onionServices.errorPage.onionSite=Onion Sitesi # 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.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. +onionServices.descNotFound.pageTitle=Onion Sitesi Yüklenirken Sorun Çıktı +onionServices.descNotFound.header=Onion Sitesi Bulunamadı +onionServices.descNotFound=Onion sitesi büyük olasılıkla çevrimdışı. Onion sitesinin yöneticisi ile görüşün. +onionServices.descNotFound.longDescription=Ayrıntılar: %S — İstenilen onion hizmetinin tanımlayıcısı karma kitaplığında bulunamadı. Bu nedenle hizmete istemci tarafından erişlemiyor. # Tor SOCKS error 0xF1: -onionServices.descInvalid.pageTitle=Problem Loading Onionsite -onionServices.descInvalid.header=Onionsite Cannot Be Reached -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. +onionServices.descInvalid.pageTitle=Onion Sitesi Yüklenirken Sorun Çıktı +onionServices.descInvalid.header=Onion Sitesine Erişilemedi +onionServices.descInvalid=Bir iç hata nedeniyle onion sitesine erişilemiyor. +onionServices.descInvalid.longDescription=Ayrıntılar: %S — İstenilen onion hizmetinin tanımlayıcısı işlenemedi ya da imza doğrulanamadı. # Tor SOCKS error 0xF2: -onionServices.introFailed.pageTitle=Problem Loading Onionsite -onionServices.introFailed.header=Onionsite Has Disconnected -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. +onionServices.introFailed.pageTitle=Onion Sitesi Yüklenirken Sorun Çıktı +onionServices.introFailed.header=Onion Sitesinin Bağlantısı Kesildi +onionServices.introFailed=Onion sitesi büyük olasılıkla çevrimdışı. Onion sitesinin yöneticisi ile görüşün. +onionServices.introFailed.longDescription=Ayrıntılar: %S — Giriş tamamlanamadı. Tanımlayıcı bulunmuş olsa da hizmetin artık bu giriş noktasına bağlı değil. Büyük olasılıkla hizmet ya tanımlayıcısını değiştirdi ya da şu anda çalışmıyor. # Tor SOCKS error 0xF3: -onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite -onionServices.rendezvousFailed.header=Unable to Connect to Onionsite -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. +onionServices.rendezvousFailed.pageTitle=Onion Sitesi Yüklenirken Sorun Çıktı +onionServices.rendezvousFailed.header=Onion Sitesi ile Bağlantı Kurulamadı +onionServices.rendezvousFailed=Onion sitesi meşgul ya da Tor ağının yükü fazla. Daha sonra yeniden deneyin. +onionServices.rendezvousFailed.longDescription=Ayrıntılar: %S — İstemci hizmet ile görüşmeyi başlatamadı. Bu durum istemcinin bağlantı kurulumunu tamamlayamadığı anlamına gelir. # Tor SOCKS error 0xF4: -onionServices.clientAuthMissing.pageTitle=Authorization Required -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. +onionServices.clientAuthMissing.pageTitle=Kimlik Doğrulaması Gerekli +onionServices.clientAuthMissing.header=Onion Sitesi Kimlik Doğrulaması İstiyor +onionServices.clientAuthMissing=Onion sitesine erişmek için bir anahtar gerekiyor ancak herhangi bir anahtar belirtilmemiş.. +onionServices.clientAuthMissing.longDescription=Ayrıntılar: %S — İstemci istenilen onion hizmeti tanımlayıcısını indirdi ancak istemci kimlik doğrulama bilgileri eksik olduğundan, içeriğin şifresini çözemedi. # Tor SOCKS error 0xF5: -onionServices.clientAuthIncorrect.pageTitle=Authorization Failed -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. +onionServices.clientAuthIncorrect.pageTitle=Kimlik Doğrulanamadı +onionServices.clientAuthIncorrect.header=Onion Sitesinde Kimlik Doğrulanamadı +onionServices.clientAuthIncorrect=Belirtilen anahtar hatalı ya da kullanımdan kaldırılmış. Onion sitesinin yöneticisi ile görüşün. +onionServices.clientAuthIncorrect.longDescription=Ayrıntılar: %S — İstemci istenilen onion hizmeti tanımlayıcısını indirebildi ancak belirtilen kimlik doğrulama bilgisi ile içeriğinin şifresini çözemedi. Bu durum erişimin kaldırıldığı anlamına gelebilir. # Tor SOCKS error 0xF6: -onionServices.badAddress.pageTitle=Problem Loading Onionsite -onionServices.badAddress.header=Invalid Onionsite Address -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. +onionServices.badAddress.pageTitle=Onion Sitesi Yüklenirken Sorun Çıktı +onionServices.badAddress.header=Onion Sitesi Adresi Geçersiz +onionServices.badAddress=Belirtilen onion sitesi adresi geçersiz. Lütfen adresi doğru yazdığından emin olun. +onionServices.badAddress.longDescription=Ayrıntılar: %S — Belirtilen .onion adresi geçersiz. Bu hata şunlardan dolayısıyla görülür: Adres sağlaması doğru değil, ed25519 herkese açık anahtarı geçersiz ya da kodlama geçersiz. # Tor SOCKS error 0xF7: -onionServices.introTimedOut.pageTitle=Problem Loading Onionsite -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. +onionServices.introTimedOut.pageTitle=Onion Sitesi Yüklenirken Sorun Çıktı +onionServices.introTimedOut.header=Onion Sitesi Devresi Oluşturulurken Zaman Aşımı +onionServices.introTimedOut=Onion sitesi ile bağlantı kurulamadı. Büyük olasılıkla ağ bağlantısı kötü. +onionServices.introTimedOut.longDescription=Ayrıntılar: %S — İstenilen onion hizmeti ile görüşme devresi kurulurken işlem zaman aşımına uğradı. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. onionServices.authPrompt.description=%S kişisel anahtarınıza gerek duyuyor @@ -129,15 +129,15 @@ onionServices.authPreferences.failedToGetKeys=Anahtarlar Tor üzerinden alınama onionServices.authPreferences.failedToRemoveKey=Anahtar silinemedi # Onion-Location strings. -onionLocation.alwaysPrioritize=Always Prioritize Onions +onionLocation.alwaysPrioritize=Onion sitelerine öncelik verilsin onionLocation.alwaysPrioritizeAccessKey=a onionLocation.notNow=Şimdi Değil 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.tryThis=Try Onion Services -onionLocation.onionAvailable=.onion available -onionLocation.learnMore=Learn more… -onionLocation.always=Always -onionLocation.askEverytime=Ask every time -onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. +onionLocation.description=Bu sitenin Tor ağı üzerinde onion hizmetleri ile sunulan daha özel ve güvenli bir sürümü var. Onion hizmetleri web sitesi yayıncıları ve ziyaretçilerinin sansürden ve izlenmekten kaçınmasına yardımcı olur. +onionLocation.tryThis=Onion Hizmetlerini Deneyin +onionLocation.onionAvailable=.onion sitesi var +onionLocation.learnMore=Ayrıntılı bilgi alın… +onionLocation.always=Her zaman +onionLocation.askEverytime=Her defasında sorulsun +onionLocation.prioritizeOnionsDescription=Bilindiğinde .onion sitelerine öncelik verilsin. onionLocation.onionServicesTitle=Onion Hizmetleri diff --git a/chrome/locale/zh-CN/aboutTor.dtd b/chrome/locale/zh-CN/aboutTor.dtd index c8a28898..5b4f5fa7 100644 --- a/chrome/locale/zh-CN/aboutTor.dtd +++ b/chrome/locale/zh-CN/aboutTor.dtd @@ -27,5 +27,5 @@ <!ENTITY aboutTor.newsletter.tagline "通过邮件获取 Tor 的最新消息。"> <!ENTITY aboutTor.newsletter.link_text "订阅 Tor 的最新动态"> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor是免费使用的，因为有像您这样的人捐献。"> +<!ENTITY aboutTor.donationBanner.freeToUse "Tor 是免费使用的，因为有和您一样的人捐助。"> <!ENTITY aboutTor.donationBanner.buttonA "立即捐助"> diff --git a/chrome/locale/zh-CN/torbutton.properties b/chrome/locale/zh-CN/torbutton.properties index f4770a48..da5b345c 100644 --- a/chrome/locale/zh-CN/torbutton.properties +++ b/chrome/locale/zh-CN/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 = Tor 浏览器添加了一些边框，以降低窗口大小的独特性，令在线跟踪监控变得更加困难。 torbutton.panel.tooltip.disabled = 点击启用 Tor torbutton.panel.tooltip.enabled = 点击禁用 Tor @@ -65,46 +65,46 @@ pageInfo_OnionEncryption=连接已经被加密（洋葱服务） onionServices.learnMore=更多详情 onionServices.errorPage.browser=浏览器 onionServices.errorPage.network=网络 -onionServices.errorPage.onionSite=洋葱站 +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=Problem Loading Onionsite -onionServices.descNotFound.header=Onionsite Not Found -onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +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=Problem Loading Onionsite -onionServices.descInvalid.header=Onionsite Cannot Be Reached -onionServices.descInvalid=The onionsite is unreachable due an internal error. +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=Problem Loading Onionsite -onionServices.introFailed.header=Onionsite Has Disconnected -onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +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=Problem Loading Onionsite +onionServices.rendezvousFailed.pageTitle=洋葱页加载问题 onionServices.rendezvousFailed.header=Unable to Connect to Onionsite 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.pageTitle=需要验证 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=验证失败 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=洋葱页加载问题 +onionServices.badAddress.header=无效洋葱页面地址 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=洋葱页加载问题 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. @@ -133,11 +133,11 @@ onionLocation.alwaysPrioritize=Always Prioritize Onions onionLocation.alwaysPrioritizeAccessKey=a onionLocation.notNow=暂不 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.tryThis=Try Onion Services -onionLocation.onionAvailable=.onion available -onionLocation.learnMore=Learn more… +onionLocation.description=该网站还有一个更私密、更安全的版本，可以通过洋葱服务通过Tor网络访问。洋葱服务帮助网站发布者和他们的访问者战胜监控和审查。 +onionLocation.tryThis=尝试洋葱服务 +onionLocation.onionAvailable=.onion 可用 +onionLocation.learnMore=详细了解…… onionLocation.always=始终 -onionLocation.askEverytime=Ask every time +onionLocation.askEverytime=每次询问 onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. onionLocation.onionServicesTitle=洋葱服务

1 0

[tor-browser-build/master] Pick up tor-android-service changes for #33931
by gk＠torproject.org 01 May '20

01 May '20

commit b858dca8745b583afd2660389ccd5a96630154a0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 1 20:04:15 2020 +0000 Pick up tor-android-service changes for #33931 --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 57f3fff..800fc47 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: 2a7091dd16842b58bb4ae10dabfddae97c8e3a4a +git_hash: ed2e1479eeddede01b1d510ef79dc5ec798b39c0 git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[tor-browser-build/master] Bug 33931 - Patch TOPL for filtering bridges by type
by gk＠torproject.org 01 May '20

01 May '20

commit 04da65342a76f74b3d4a58601f326ded457dc97a Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Apr 30 15:58:32 2020 +0000 Bug 33931 - Patch TOPL for filtering bridges by type --- ...ug-33931-Filter-bridges-in-stream-by-type.patch | 76 ++++++++++++++++++++++ projects/tor-onion-proxy-library/build | 2 + projects/tor-onion-proxy-library/config | 1 + 3 files changed, 79 insertions(+) diff --git a/projects/tor-onion-proxy-library/0001-Bug-33931-Filter-bridges-in-stream-by-type.patch b/projects/tor-onion-proxy-library/0001-Bug-33931-Filter-bridges-in-stream-by-type.patch new file mode 100644 index 0000000..e04e7d9 --- /dev/null +++ b/projects/tor-onion-proxy-library/0001-Bug-33931-Filter-bridges-in-stream-by-type.patch @@ -0,0 +1,76 @@ +From 9a2048f02d602cab7bd937c66a4d3f9c35fbfa9e Mon Sep 17 00:00:00 2001 +From: Matthew Finkel <sysrqb(a)torproject.org> +Date: Thu, 30 Apr 2020 15:40:25 +0000 +Subject: [PATCH] Bug 33931 - Filter bridges in stream by type + +The InputStream contains a first-byte that indicates the format of the +following datastream. If the first-byte is 1, then the following stream +is a string of bridges that are separated by the '\n' byte. If the +first-byte is not 1, then the following data stream is default bridges +and that list should be filtered such that only the requested bridge +type is used. +--- + .../thali/toronionproxy/TorConfigBuilder.java | 35 ++++++++++++++++--- + 1 file changed, 31 insertions(+), 4 deletions(-) + +diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +index ab11948..2405097 100644 +--- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java ++++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +@@ -535,9 +535,32 @@ public final class TorConfigBuilder { + TorConfigBuilder addBridgesFromResources() throws IOException { + if(settings.hasBridges()) { + InputStream bridgesStream = context.getInstaller().openBridgesStream(); +- int formatType = bridgesStream.read(); +- if (formatType == 0) { +- addBridges(bridgesStream); ++ // The first byte encodes the type of bridges contained within the ++ // following data stream. Currently, it may contain either default bridges ++ // or user-provided bridges. ++ int bridgesType = bridgesStream.read(); ++ ++ // When bridgesType is 0x01, then the following stream is ++ // user-provided (custom) bridges. ++ // When bridgesType is one of: 0x02 or 0x03, then the Stream ++ // consists of default PT bridges. That list must be filtered, after ++ // parsing each bridge line, such that only the requested bridge type ++ // is used. ++ if (bridgesType != 1) { ++ // Terrible hack. Must keep in sync with tas::CustomTorInstaller::openBridgesStream ++ // and transports defined by TorConfigBuilder::transportPlugin(). ++ String reqBridgeType; ++ switch (bridgesType) { ++ case 2: ++ reqBridgeType = "obfs4"; ++ break; ++ case 3: ++ reqBridgeType = "meek_lite"; ++ break; ++ default: ++ throw new IOException("Requested unknown transport type: " + bridgesType); ++ } ++ addBridges(bridgesStream, reqBridgeType); + } else { + addCustomBridges(bridgesStream); + } +@@ -548,12 +571,16 @@ public final class TorConfigBuilder { + /** + * Add bridges from bridges.txt file. + */ +- private void addBridges(InputStream input) { ++ private void addBridges(InputStream input, String bridgeType) { + if (input == null) { + return; + } + List<Bridge> bridges = readBridgesFromStream(input); + for (Bridge b : bridges) { ++ if (!b.type.equals(bridgeType)) { ++ // This is not the transport we're looking for. ++ continue; ++ } + bridge(b.type, b.config); + } + } +-- +2.20.1 + diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build index 21c8f7a..c8025ad 100644 --- a/projects/tor-onion-proxy-library/build +++ b/projects/tor-onion-proxy-library/build @@ -21,6 +21,8 @@ cd /var/tmp/build/[% project %]-[% c('version') %] # build will pull down the correct android tool versions patch -p1 < $rootdir/gradle.patch +patch -p1 < $rootdir/0001-Bug-33931-Filter-bridges-in-stream-by-type.patch + # Extract obfs4proxy from TorBrowser/Tor/PluggableTransports/obfs4proxy tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/obfs4') %] diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index 080f0c2..5d90481 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -25,3 +25,4 @@ input_files: name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - filename: gradle.patch + - filename: 0001-Bug-33931-Filter-bridges-in-stream-by-type.patch

1 0

[tor-android-service/master] Bug 33931 - Indicate bridge type in stream
by gk＠torproject.org 01 May '20

01 May '20

commit ed2e1479eeddede01b1d510ef79dc5ec798b39c0 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Apr 30 15:47:07 2020 +0000 Bug 33931 - Indicate bridge type in stream Use the first-byte to indicate if the following data stream contains default bridges or custom bridges. In addition, if the stream contains default bridges, then indicate if only one type of bridge should be used after parsing the stream. --- .../org/torproject/android/service/CustomTorInstaller.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 e962137..198c981 100644 --- a/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java +++ b/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java @@ -48,6 +48,18 @@ public class CustomTorInstaller extends TorInstaller { */ String userDefinedBridgeList = Prefs.getBridgesList(); byte bridgeType = (byte) (userDefinedBridgeList.length() > 5 ? 1 : 0); + // Terrible hack. Must keep in sync with topl::addBridgesFromResources. + if (bridgeType == 0) { + switch (userDefinedBridgeList) { + case "obfs4": + bridgeType = 2; + break; + case "meek": + bridgeType = 3; + break; + } + } + ByteArrayInputStream bridgeTypeStream = new ByteArrayInputStream(new byte[]{bridgeType}); InputStream bridgeStream = (bridgeType == 1) ? new ByteArrayInputStream((userDefinedBridgeList + "\r\n").getBytes()) : context.getResources().getAssets().open("common/bridges.txt");

1 0

[tor-browser-build/maint-9.0] Picking up 68.8.0esr rc2
by gk＠torproject.org 30 Apr '20

30 Apr '20

commit 545e9783a2faf9d577036ddc4f102c5a52dcb467 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 30 06:08:46 2020 +0000 Picking up 68.8.0esr rc2 --- projects/firefox-langpacks/config | 2 +- projects/firefox-locale-bundle/config | 2 +- projects/firefox/config | 2 +- rbm.conf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 34d6fad..17a707a 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' targets: diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config index 2f4997f..2ea6db6 100644 --- a/projects/firefox-locale-bundle/config +++ b/projects/firefox-locale-bundle/config @@ -5,4 +5,4 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: use_container: 0 ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 diff --git a/projects/firefox/config b/projects/firefox/config index 75efe0d..9d7c3c2 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") %]-2-build1' 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 e23a15b..88a6565 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.0.10' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 9.0.9 project_name: tor-browser

1 0

[tor-browser-spec/master] Bug 33950: Add instructions for rolling back an update
by gk＠torproject.org 29 Apr '20

29 Apr '20

commit c1a8d19ec385b815f54d26638f886588e1854294 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Apr 28 14:56:36 2020 +0200 Bug 33950: Add instructions for rolling back an update --- processes/ReleaseProcess | 3 +- processes/RollingBackUpdate | 71 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 1 deletion(-) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index 7d731d9..842325c 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -201,7 +201,8 @@ chmod 664 ${TORBROWSER_UPDATE_CHANNEL}/.htaccess chmod 775 ${TORBROWSER_UPDATE_CHANNEL}/ # Rename the update responses directory to .old to make it easier to - # revert in case of problem + # revert in case of problem (see the file RollingBackUpdate for more + # details about this) torsocks ssh staticiforme.torproject.org "rm -rf /srv/aus1-master.torproject.org/htdocs/torbrowser/update_3/${TORBROWSER_UPDATE_CHANNEL}.old" torsocks ssh staticiforme.torproject.org "mv -v /srv/aus1-master.torproject.org/htdocs/torbrowser/update_3/${TORBROWSER_UPDATE_CHANNEL} /srv/aus1-master.torproject.org/htdocs/torbrowser/update_3/${TORBROWSER_UPDATE_CHANNEL}.old" torsocks rsync -avP $TORBROWSER_UPDATE_CHANNEL staticiforme.torproject.org:/srv/aus1-master.torproject.org/htdocs/torbrows… diff --git a/processes/RollingBackUpdate b/processes/RollingBackUpdate new file mode 100644 index 0000000..bfe7471 --- /dev/null +++ b/processes/RollingBackUpdate @@ -0,0 +1,71 @@ +Rolling Back Tor Browser Updates +================================ + +In some cases a critical issue is found shortly after releasing an update. +In those cases rolling back an update to avoid having more users hitting +the issue can be useful. + +There are two separate cases: + - rolling back an update for users of all platforms + - rolling back an update only for users of a specific platform + +Note: this is about rolling back updates for stable/alpha releases. +Rolling back updates on nightly is more difficult. + +In the following instructions we are assuming that we are rolling back +an alpha update. But the same instructions should work for a stable +release too by replacing all instances of "alpha" by "release". +We also assume that we released version 9.5a11 and want to roll back to +version 9.5a10. You will need to replace those versions numbers in the +instructions. + +If you followed the instructions from ReleaseProcess, in the directory +/srv/aus1-master.torproject.org/htdocs/torbrowser/update_3 on staticiforme +you should have renamed the directory alpha to alpha.old. +If you didn't do it, you should get a new copy of the update_responses +directory for the previous release, for instance by running +"make update_responses-alpha" in tor-browser-build, after +checking out the tag from the previous release. + +You should also check that the previous release is still present in +the directory /srv/cdn-master.torproject.org/htdocs/aus1/torbrowser. + + +Rolling back an update for users of all platforms +------------------------------------------------- + +You can roll back the update with the following steps on staticiforme: + + - in /srv/aus1-master.torproject.org/htdocs/torbrowser/update_3, remove + the directory "alpha" and rename "alpha.old" to "alpha". + + - edit the file "alpha/.htaccess" and at the top, after the line + "RewriteEngine On" add a new line: + RewriteRule ^[^/]+/9.5a11/ no-update.xml [last] + With this line we can avoid proposing an update to the previous + version to the users who already updated to the new version. + + - run "static-update-component aus1.torproject.org" + + +Rolling back an update only for users of a specific platform +------------------------------------------------------------ + +In the following instructions, we assume that we want to roll back the +update for users of Windows x86_64 only. In the following instructions, +you should replace WINNT_x86_64-gcc3-x64 with the platform for which +you want to roll back the update (see build_targets in the file +projects/release/update_responses_config.yml in tor-browser-build for +the list of platforms). + +You can roll back the update with the following steps on staticiforme: + + - in /srv/aus1-master.torproject.org/htdocs/torbrowser/update_3, rename + or copy the directory "alpha.old" to "alpha.9.5a10". + + - edit the file "alpha/.htaccess" and at the top, after the line + "RewriteEngine On" add a new line: + RewriteRule ^WINNT_x86_64-gcc3-x64/.* https://aus1.torproject.org/torbrowser/update_3/alpha.95a10/$0 [last] + + - run "static-update-component aus1.torproject.org" +

1 0

[tor-browser-spec/master] Small typo fix
by gk＠torproject.org 29 Apr '20

29 Apr '20

commit 99878a95e913e3286f6d756429129cd15ce94791 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 29 15:55:34 2020 +0000 Small typo fix --- processes/RollingBackUpdate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/processes/RollingBackUpdate b/processes/RollingBackUpdate index bfe7471..a1e518b 100644 --- a/processes/RollingBackUpdate +++ b/processes/RollingBackUpdate @@ -16,7 +16,7 @@ In the following instructions we are assuming that we are rolling back an alpha update. But the same instructions should work for a stable release too by replacing all instances of "alpha" by "release". We also assume that we released version 9.5a11 and want to roll back to -version 9.5a10. You will need to replace those versions numbers in the +version 9.5a10. You will need to replace those version numbers in the instructions. If you followed the instructions from ReleaseProcess, in the directory

1 0

[tor-browser-build/master] Bug 33952: Add instructions related to build-sunet-a.torproject.net
by gk＠torproject.org 29 Apr '20

29 Apr '20

commit 513da8008078851501da2e4e9c2d91c4fbfdb5bf Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 27 22:59:20 2020 +0200 Bug 33952: Add instructions related to build-sunet-a.torproject.net Add instructions for adding/removing/updating users on build-sunet-a.torproject.net as well as installing new packages. We also update the tbb-team role to make it possible to remove users. While updating the README file we also add a link for more details about setting up a new nightly build machine. --- tools/ansible/README | 38 ++++++++++++++++++++++++-- tools/ansible/roles/tbb-team/defaults/main.yml | 1 + tools/ansible/roles/tbb-team/tasks/main.yml | 7 +++++ 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/tools/ansible/README b/tools/ansible/README index dc69ad7..6056372 100644 --- a/tools/ansible/README +++ b/tools/ansible/README @@ -1,4 +1,4 @@ -This directory contains some ansible script that we use to setup some +This directory contains some ansible script that we use to set up some machines that we use for Tor Browser development. To deploy some changes you need the ansible package to be installed on @@ -9,7 +9,8 @@ You can then use one of the following makefile targets: ansible-tbb-build: Deploy changes to the machine used by Tor Browser team members to do - some Tor Browser builds. + some Tor Browser builds. See below for more details about adding, + removing and updating users on this machine. fpcentral: Deploy fpcentral to forrestii.torproject.org. To be able to run this @@ -21,4 +22,37 @@ boklm-tbb-nightly-build: anybody else wants to set up their own nightly builds, it is possible to do it by adding a new host to the inventory file and making copies of group_vars/boklm-tbb-nightly/ and boklm-tbb-nightly-build.yml. + For more details, see also this ticket: + https://trac.torproject.org/projects/tor/ticket/33948 + + +Adding, removing, updating users on the Tor Browser team build machine +====================================================================== + +The tbb-build.yml playbook is used to set up the Tor Browser team build +machine (build-sunet-a.torproject.net) + +To add a new user: + + - add the new username to roles/tbb-team/defaults/main.yml + - add the ssh key file to roles/tbb-team/files/${username}.pub + - run "make ansible-tbb-build" + +To update the ssh key for an existing user: + - update roles/tbb-team/files/${username}.pub + - run "make ansible-tbb-build" + +To remove a user and their home directory from the build machine: + - in roles/tbb-team/defaults/main.yml, move the user from + tbb_team_members to tbb_team_alums + - remove roles/tbb-team/files/${username}.pub + - run "make ansible-tbb-build" + +To install additional packages you can add them to +roles/tbb-builder/tasks/main.yml if they are necessary to build +Tor Browser, or to roles/useful-packages/tasks/main.yml otherwise. + +If you don't want to apply the changes directly, but first want to check +what would be the changes done by ansible, you can edit the ansible-playbook +command in the Makefile to add the --check argument. diff --git a/tools/ansible/roles/tbb-team/defaults/main.yml b/tools/ansible/roles/tbb-team/defaults/main.yml index 4ce9c03..75a1db5 100644 --- a/tools/ansible/roles/tbb-team/defaults/main.yml +++ b/tools/ansible/roles/tbb-team/defaults/main.yml @@ -8,3 +8,4 @@ tbb_team_members: - mikeperry - pospeselr - sukhbir +tbb_team_alums: [] diff --git a/tools/ansible/roles/tbb-team/tasks/main.yml b/tools/ansible/roles/tbb-team/tasks/main.yml index 5cc5755..8e63416 100644 --- a/tools/ansible/roles/tbb-team/tasks/main.yml +++ b/tools/ansible/roles/tbb-team/tasks/main.yml @@ -13,3 +13,10 @@ state: present key: "{{ lookup('file', item + '.pub') }}" with_items: "{{ tbb_team_members }}" + +- name: Remove tbb-team alums users + user: + name: "{{ item }}" + state: absent + remove: yes + with_items: "{{ tbb_team_alums }}"

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_33952_v2'
by gk＠torproject.org 29 Apr '20

29 Apr '20

commit 6768a86581b63bfa37279d3144e105faaa35e366 Merge: 7464798 513da80 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 29 15:17:45 2020 +0000 Merge remote-tracking branch 'boklm/bug_33952_v2' tools/ansible/README | 38 ++++++++++++++++++++++++-- tools/ansible/roles/tbb-team/defaults/main.yml | 1 + tools/ansible/roles/tbb-team/tasks/main.yml | 7 +++++ 3 files changed, 44 insertions(+), 2 deletions(-)

1 0

[tor-browser-build/master] Move mcs and brade to alumns build machine-wise
by gk＠torproject.org 29 Apr '20

29 Apr '20

commit 895efbcd312083c6da2fc9f9e1c023441e5e97c0 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 29 15:20:54 2020 +0000 Move mcs and brade to alumns build machine-wise --- tools/ansible/roles/tbb-team/defaults/main.yml | 6 +++--- tools/ansible/roles/tbb-team/files/brade.pub | 1 - tools/ansible/roles/tbb-team/files/mcs.pub | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/ansible/roles/tbb-team/defaults/main.yml b/tools/ansible/roles/tbb-team/defaults/main.yml index 75a1db5..879c435 100644 --- a/tools/ansible/roles/tbb-team/defaults/main.yml +++ b/tools/ansible/roles/tbb-team/defaults/main.yml @@ -1,11 +1,11 @@ --- tbb_team_members: - boklm - - brade - cohosh - gk - - mcs - mikeperry - pospeselr - sukhbir -tbb_team_alums: [] +tbb_team_alums: + - brade + - mcs diff --git a/tools/ansible/roles/tbb-team/files/brade.pub b/tools/ansible/roles/tbb-team/files/brade.pub deleted file mode 100644 index 0a83b4d..0000000 --- a/tools/ansible/roles/tbb-team/files/brade.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+p9eNuVj59oHkPe/uM+DFTchAxMsm1F6jsMMQqzcNd2sIVAxftMEu8OTM5/rdz+XemevzE+BYHhNUamW/05rur97AYJB7hsOYBtx0g9tGx/2zot72yU38TjmbhWE1FKct+9zc6ZQnYHXLtWBB6k/zJeQH2CvwDLrHsXxfUvOE9lXrcgFy1ugVC96EknBfqz5LTG2dsQhn+nzpEnb3IZYoaRc0h33BVGLkNyFQEtm+7JzylTX6/854kk1BqwZLl03U6++7XA4SjVOYPCM3K1++dJt3CwnARs7mR3t03FFUj0gyRoPuxB6iwPtaCDIDEhSOMmj8hfbFu1N4jm4XY1H3 diff --git a/tools/ansible/roles/tbb-team/files/mcs.pub b/tools/ansible/roles/tbb-team/files/mcs.pub deleted file mode 100644 index af8dd08..0000000 --- a/tools/ansible/roles/tbb-team/files/mcs.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDipHBalbwyEb0AWwbRPa+pxGGSyFTkoOtyn76AqTD6WZIJKBBe4PkkqkJOI7STWxwVkbzTZoC1UyzUCXc3L/bxt85bopAgg0EucM3z3t6XX3kbaDPEGi+mhA4lFYdpJmWe1wbDhiAMYSAONnVcRgmk6bPkgRBWM5zCshOOS5/hs1HW6/zOzgJX6+B7vLYiccHkRj9YeOln+OyR+ko1nFovBFIeDw5DjZqNHki0/hBe1SpaBKCUWHBwkugmvI3Q/VL5pQhWAcMwqEmEcosmX5SPBsAn8217u0mPLcW2cAx30Yj95lfO3LzOV27dnqYfT0IN4gysm2S9Z0mV7yMgSkgV mcs

1 0

[tor-browser-build/master] Merge remote-tracking branch 'cohoshtpo/ticket/33576'
by sysrqb＠torproject.org 29 Apr '20

29 Apr '20

commit 7464798ed3a34a2d492c55e34673dbe3d4a134d2 Merge: 4d855e7 be5efcc Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Apr 29 14:06:53 2020 +0000 Merge remote-tracking branch 'cohoshtpo/ticket/33576' projects/goxxerrors/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor-browser-build/master] Fix git url for goxxerrors project
by sysrqb＠torproject.org 29 Apr '20

29 Apr '20

commit be5efccdf6aeb316a2b8c9888a942e647c544bc9 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Apr 29 13:47:37 2020 +0000 Fix git url for goxxerrors project --- projects/goxxerrors/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/goxxerrors/config b/projects/goxxerrors/config index 08d6777..6733498 100644 --- a/projects/goxxerrors/config +++ b/projects/goxxerrors/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' -git_url: https://golang.org/x/xerrors +git_url: https://go.googlesource.com/xerrors git_hash: 9bdfabe68543c54f90421aeb9a60ef8061b5b544 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'

1 0

[tor-browser-build/master] Add GeKo to nightly build emails
by boklm＠torproject.org 29 Apr '20

29 Apr '20

commit 4d855e74585ac099e4c5526c83c04302093305d2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 29 15:02:28 2020 +0200 Add GeKo to nightly build emails --- tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml index 8e4bc05..6addb1d 100644 --- a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml +++ b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml @@ -2,5 +2,5 @@ nightly_build_hostname: f4amtbsowhix7rrf.onion nightly_build_url: 'http://{{ nightly_build_hostname }}' nightly_build_email_from: "'Tor Browser Nightly Builds (boklm) <boklm-tbb-nightly(a)riseup.net>'," -nightly_build_email_to: "[ 'boklm(a)torproject.org', 'sysrqb(a)torproject.org', ]," +nightly_build_email_to: "[ 'boklm(a)torproject.org', 'gk(a)torproject.org', 'sysrqb(a)torproject.org', ]," nightly_build_sign_build: 1

1 0

[tor-browser-build/master] Bug 33573: Update pion-webrtc version to 2.2.3
by sysrqb＠torproject.org 28 Apr '20

28 Apr '20

commit 02a73e328b08882cff7a20cedac446aad423de35 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Mar 12 16:28:32 2020 +0000 Bug 33573: Update pion-webrtc version to 2.2.3 --- projects/agouti/config | 17 +++++++++++++++++ projects/goerrors/config | 2 +- projects/goxcrypto/config | 2 +- projects/goxxerrors/config | 17 +++++++++++++++++ projects/pion-datachannel/config | 2 +- projects/pion-dtls/config | 8 +++++++- projects/pion-ice/config | 8 ++++---- projects/pion-rtp/config | 6 +++++- projects/pion-sctp/config | 2 +- projects/pion-sdp/config | 2 +- projects/pion-srtp/config | 5 +---- projects/pion-turn/config | 14 +------------- projects/pion-webrtc/config | 8 ++++---- projects/testify/config | 2 +- 14 files changed, 62 insertions(+), 33 deletions(-) diff --git a/projects/agouti/config b/projects/agouti/config new file mode 100644 index 0000000..086aa86 --- /dev/null +++ b/projects/agouti/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/sclevine/agouti +git_hash: e3f6c97a4077ad821daab49db8172cf9f6690faf #v3.0.0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/sclevine/agouti + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/goerrors/config b/projects/goerrors/config index c9a34e8..626f7d5 100644 --- a/projects/goerrors/config +++ b/projects/goerrors/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pkg/errors -git_hash: ba968bfe8b2f7e042a574c888954fccecfa385b4 # v0.8.1 +git_hash: 614d223910a179a466c1767a985424175c39b465 # v0.9.1 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/goxcrypto/config b/projects/goxcrypto/config index 698f94b..1e23034 100644 --- a/projects/goxcrypto/config +++ b/projects/goxcrypto/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://go.googlesource.com/crypto -git_hash: ff983b9c42bc9fbf91556e191cc8efb585c16908 +git_hash: 69ecbb4d6d5dab05e49161c6e77ea40a030884e1 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/goxxerrors/config b/projects/goxxerrors/config new file mode 100644 index 0000000..08d6777 --- /dev/null +++ b/projects/goxxerrors/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://golang.org/x/xerrors +git_hash: 9bdfabe68543c54f90421aeb9a60ef8061b5b544 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: golang.org/x/xerrors + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/pion-datachannel/config b/projects/pion-datachannel/config index b8a521c..c36a0bb 100644 --- a/projects/pion-datachannel/config +++ b/projects/pion-datachannel/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/datachannel -git_hash: 58b4a51d48764c2cb19e0c7ced43640a87857c69 # v1.4.13 +git_hash: a245abfdaab4a9406cc2e18ad303b5d0717d43af # v1.4.16 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-dtls/config b/projects/pion-dtls/config index 244c764..0ee19b4 100644 --- a/projects/pion-dtls/config +++ b/projects/pion-dtls/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/dtls -git_hash: 8748e4ac8bf7960bbf399e6f23a9bf4dd30d4e92 # v2.0.0-rc.3 +git_hash: 147774b64b6a8ac9bd0af5a7efff69ee8e0fd4a8 # v2.0.0-rc.7 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -12,6 +12,8 @@ var: go_lib: github.com/pion/dtls go_lib_deps: - goxcrypto + - goxnet + - goxxerrors - pion-logging - pion-transport @@ -21,6 +23,10 @@ input_files: project: go - name: goxcrypto project: goxcrypto + - name: goxnet + project: goxnet + - name: goxxerrors + project: goxxerrors - name: pion-logging project: pion-logging - name: pion-transport diff --git a/projects/pion-ice/config b/projects/pion-ice/config index 56d0a03..042c014 100644 --- a/projects/pion-ice/config +++ b/projects/pion-ice/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/ice -git_hash: 57e7b93a4bac70ee2fd3b38cc2fdf3c6d586ed27 # v0.7.6 +git_hash: 5b6a2756ccaa173bd14050acf3d6e5d5d371bae8 # v0.7.10 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -12,7 +12,7 @@ var: go_lib: github.com/pion/ice go_lib_deps: - goxnet - - goxsys + - pion-dtls - pion-logging - pion-mdns - pion-stun @@ -26,8 +26,8 @@ input_files: project: go - name: goxnet project: goxnet - - name: goxsys - project: goxsys + - name: pion-dtls + project: pion-dtls - name: pion-logging project: pion-logging - name: pion-mdns diff --git a/projects/pion-rtp/config b/projects/pion-rtp/config index 5e63b29..b926612 100644 --- a/projects/pion-rtp/config +++ b/projects/pion-rtp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/rtp -git_hash: 94055aff4ae00d46f218eab6949fa713d48306af # v1.1.4 +git_hash: f7a712d0fb41baeacb3e2ef9ed68ed1aa42afb82 # v1.3.2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -10,8 +10,12 @@ var: container: use_container: 1 go_lib: github.com/pion/rtp + go_lib_deps: + - testify input_files: - project: container-image - name: go project: go + - name: testify + project: testify diff --git a/projects/pion-sctp/config b/projects/pion-sctp/config index a81911c..89da952 100644 --- a/projects/pion-sctp/config +++ b/projects/pion-sctp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/sctp -git_hash: ced24b2276cf7991920a301ce5f0735cabafaf3e # v1.7.3 +git_hash: 9e890a28db4990b61ba414e35f79108c19e0a7db # v1.7.6 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-sdp/config b/projects/pion-sdp/config index 1a865d4..ed2dbdc 100644 --- a/projects/pion-sdp/config +++ b/projects/pion-sdp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/sdp -git_hash: 9b824fbb8047370a0073ef4b9ebae356e7536502 # v2.3.1 +git_hash: 06fd9e503a8f545f663a757afb09b1e1833c7b2d # v2.3.4 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-srtp/config b/projects/pion-srtp/config index eac420c..310cf75 100644 --- a/projects/pion-srtp/config +++ b/projects/pion-srtp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/srtp -git_hash: 0741c018e441a3502045133280347b9deba1e9d8 # v1.2.6 +git_hash: 57349fe0710b65080a26d8855aa18689364560c3 # v1.2.7 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -12,7 +12,6 @@ var: go_lib: github.com/pion/srtp go_lib_deps: - go-spew - - goerrors - pion-logging - pion-rtcp - pion-rtp @@ -25,8 +24,6 @@ input_files: project: go - name: go-spew project: go-spew - - name: goerrors - project: goerrors - name: pion-logging project: pion-logging - name: pion-rtcp diff --git a/projects/pion-turn/config b/projects/pion-turn/config index 2cbef46..44d81c0 100644 --- a/projects/pion-turn/config +++ b/projects/pion-turn/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/turn -git_hash: bac88c5c692a9826c9703b2950dc52093ae1779a # v1.4.0 +git_hash: b54907e0b25fb5eea5d860ac61f1bf41ea8a6b01 # v2.0.3 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -11,32 +11,20 @@ var: use_container: 1 go_lib: github.com/pion/turn go_lib_deps: - - go-spew - - gocheck - - goerrors - pion-logging - pion-stun - pion-transport - - pretty - testify input_files: - project: container-image - name: go project: go - - name: go-spew - project: go-spew - - name: gocheck - project: gocheck - - name: goerrors - project: goerrors - name: pion-logging project: pion-logging - name: pion-stun project: pion-stun - name: pion-transport project: pion-transport - - name: pretty - project: pretty - name: testify project: testify diff --git a/projects/pion-webrtc/config b/projects/pion-webrtc/config index c27a3df..f4bde82 100644 --- a/projects/pion-webrtc/config +++ b/projects/pion-webrtc/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/webrtc -git_hash: 77c6e3b827e40175572fcf2894bb81ab1e8fd2c9 # v2.1.18 +git_hash: 1f448413f22d6c32d690db594748d8ad5d3812f5 # v2.2.3 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -11,7 +11,7 @@ var: use_container: 1 go_lib: github.com/pion/webrtc go_lib_deps: - - goxcrypto + - agouti - pion-datachannel - pion-dtls - pion-ice @@ -28,8 +28,8 @@ input_files: - project: container-image - name: go project: go - - name: goxcrypto - project: goxcrypto + - name: agouti + project: agouti - name: pion-datachannel project: pion-datachannel - name: pion-dtls diff --git a/projects/testify/config b/projects/testify/config index 9b20867..bbb82c3 100644 --- a/projects/testify/config +++ b/projects/testify/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/stretchr/testify -git_hash: 221dbe5ed46703ee255b1da0dec05086f5035f62 # v1.4.0 +git_hash: 3ebf1ddaeb260c4b1ae502a01c7844fa8c1fa0e9 # v1.5.1 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]'

1 0

[tor-browser/tor-browser-68.7.0esr-9.5-1] fixup! Bug 28005: Implement .onion alias urlbar rewrites
by sysrqb＠torproject.org 28 Apr '20

28 Apr '20

commit 0052c74b743756dafa4f3614f559dd8f8d1645c2 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Apr 28 18:25:36 2020 +0200 fixup! Bug 28005: Implement .onion alias urlbar rewrites --- browser/components/onionservices/HttpsEverywhereControl.jsm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/components/onionservices/HttpsEverywhereControl.jsm b/browser/components/onionservices/HttpsEverywhereControl.jsm index 87954461bab1..60c3b5fca282 100644 --- a/browser/components/onionservices/HttpsEverywhereControl.jsm +++ b/browser/components/onionservices/HttpsEverywhereControl.jsm @@ -16,9 +16,9 @@ const SECUREDROP_TOR_ONION_CHANNEL = { kty: "RSA", e: "AQAB", n: - "y0iWTVev1uYDVhLdc5uSHWke-9JlbxzqIsGkS95Pk5NsxdlkdbHpqaPr-5xL5FspX8QGo3HAT5hrUcPV_kz8x-HwGEm2-p9BQ6-yEPtr5QXQGGzNoizmj7HH-b0y5qx8iUFwAJ__PJWK4IwSgjIQqHMjmkOLc9N4bmRPULi6ZZMb-97FdeZsh34dVy2tpIzZaijRfRQSfeZkwRXZzOY-siGfOAzY_UcrHFli5zroTZAyDaetFm1z2-TdFLOvN8fi0o3mBbCB9SqhOUImPwSTNWTp2D6bHhI91mt7gr6fLnzHMGrTMh2DQ4vjt_98pe7WTUzuRCLa9Awb6JJgbYA4ySV1akAU0_iq6oCAE9PZbUgUw9UAH1ctRFml87F3HORUMMj5ZCLwRIrEXqrCJbV4f-Ius-ZO2wwlYTsEv8TmUzISpMwVjGOIpXwFIb65R_EX3_vIopauSoyZkvk3klly0Qe6KTy_gg1CZ_h2ZXPpLMwqlfFTDBPv2q8gyuzgkYXQes3FX-PbJ9Dsl5QO4icuEjV2NQ7iPwwIPAtj9cpqCD8-p9TqTKaZjOFC9-ryJpWsivGCbvN2JotmJ5Ax9rmnAMvQM09muCetFj_ZIgllcpeahaw6gxVXlSYIhb0J9V878KNuRJ2yPJFlBmgpFexvCcz8Jqs6JUfIrmUAGUXG9nE", + "p10BbUVc5Xj2S_-MH3bACNBaISo_r9e3PVPyTTjsGsdg2qSXvqUO42fBtpFAy0zUzIGS83v4JjiRdvKJaZTIvbC8AcpymzdsTqujMm8RPTSy3hO_8mXzGa4DEsIB1uNLnUWRBKXvSGCmT9kFyxhTpkYqokNBzafVihTU34tN2Md1xFHnmZGqfYtPtbJLWAa5Z1M11EyR4lIyUxIiPTV9t1XstDbWr3iS83REJrGEFmjG1-BAgx8_lDUTa41799N2yYEhgZud7bL0M3ei8s5OERjiion5uANkUV3-s2QqUZjiVA-XR_HizXjciaUWNd683KqekpNOZ_0STh_UGwpcwU-KwG07QyiCrLrRpz8S_vH8CqGrrcWY3GSzYe9dp34jJdO65oA-G8tK6fMXtvTCFDZI6oNNaXJH71F5J0YbqO2ZqwKYc2WSi0gKVl2wd9roOVjaBmkJqvocntYuNM7t38fDEWHn5KUkmrTbiG68Cy56tDUfpKl3D9Uj4LaMvxJ1tKGvzQ4k_60odT7gIxu6DqYjXUHZpwPsSGBq3njaD7boe4CUXF2K7ViOc87BsKxRNCzDD8OklRjjXzOTOBH3PqFJ93CJ-4ECE5t9STU20aZ8E-2zKB8vjKyCySE4-kcIvBBsnkwVaJTPy9Ft1qYybo-soXEWVEZATANNWklBt8k", }, - update_path_prefix: "https://redshiftzero.github.io/securedrop-httpse/", + update_path_prefix: "https://securedrop.org/https-everywhere/", scope: "^https?:\\/\\/[a-z0-9-]+(?:\\.[a-z0-9-]+)*\\.securedrop\\.tor\\.onion\\/", replaces_default_rulesets: false,

1 0

[tor-browser/tor-browser-68.7.0esr-9.5-1] Revert "Bug 30575: Don't allow enterprise policies in Tor Browser"
by sysrqb＠torproject.org 28 Apr '20

28 Apr '20

commit 7d0d47db46531a32c88db85323cd771761b8bb5d Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Apr 15 14:09:53 2020 -0400 Revert "Bug 30575: Don't allow enterprise policies in Tor Browser" This reverts commit d362cff17d44a82534ea553cbf50fa76906cc218. --- .../enterprisepolicies/EnterprisePolicies.js | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/toolkit/components/enterprisepolicies/EnterprisePolicies.js b/toolkit/components/enterprisepolicies/EnterprisePolicies.js index dd43d31cb3b0..db77b4717736 100644 --- a/toolkit/components/enterprisepolicies/EnterprisePolicies.js +++ b/toolkit/components/enterprisepolicies/EnterprisePolicies.js @@ -88,9 +88,25 @@ EnterprisePoliciesManager.prototype = { ), _initialize() { - // We don't want to have any enterprise policies in Tor Browser enabled as - // those can affect proxy settings etc. See: e.g. #30575. - this.status = Ci.nsIEnterprisePolicies.INACTIVE; + let provider = this._chooseProvider(); + + if (!provider) { + this.status = Ci.nsIEnterprisePolicies.INACTIVE; + return; + } + + if (provider.failed) { + this.status = Ci.nsIEnterprisePolicies.FAILED; + return; + } + + this.status = Ci.nsIEnterprisePolicies.ACTIVE; + this._parsedPolicies = {}; + Services.telemetry.scalarSet( + "policies.count", + Object.keys(provider.policies).length + ); + this._activatePolicies(provider.policies); }, _chooseProvider() {

1 0

[tor-browser/tor-browser-68.7.0esr-9.5-1] Merge remote-tracking branch 'acatgh/34032' into tor-browser-68.7.0esr-9.5-1
by sysrqb＠torproject.org 28 Apr '20

28 Apr '20

commit f5bf259fa2f16c68f3dc12bf9e6d28f43ff8d7e1 Merge: f81583b0d6d7 0052c74b7437 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Apr 28 20:42:31 2020 +0000 Merge remote-tracking branch 'acatgh/34032' into tor-browser-68.7.0esr-9.5-1 browser/components/onionservices/HttpsEverywhereControl.jsm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor-browser/tor-browser-68.7.0esr-9.5-1] Merge branch 'bradetpo/bug32418-01' into tor-browser-68.7.0esr-9.5-1
by sysrqb＠torproject.org 28 Apr '20

28 Apr '20

commit f81583b0d6d7eefd4b7384e8ee95d528ea4fb303 Merge: 5a8128b566fa e577d655d204 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Apr 28 20:04:14 2020 +0000 Merge branch 'bradetpo/bug32418-01' into tor-browser-68.7.0esr-9.5-1 .../enterprisepolicies/EnterprisePolicies.js | 32 ++++++++++++++++++++-- toolkit/components/enterprisepolicies/moz.build | 4 ++- toolkit/mozapps/update/UpdateService.jsm | 20 ++++++++++++++ 3 files changed, 52 insertions(+), 4 deletions(-)

1 0

[tor-browser/tor-browser-68.7.0esr-9.5-1] Bug 32418: Allow updates to be disabled via an enterprise policy.
by sysrqb＠torproject.org 28 Apr '20

28 Apr '20

commit e577d655d2044e3b6636b0bccfbb5bd776148582 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Apr 16 17:07:09 2020 -0400 Bug 32418: Allow updates to be disabled via an enterprise policy. Restrict the Enterprise Policies mechanism to only consult a policies.json file (avoiding the Windows Registry and macOS's file system attributes). Add a few disabledByPolicy() checks to the update service to avoid extraneous (and potentially confusing) log messages when updates are disabled by policy. Sample content for distribution/policies.json: { "policies": { "DisableAppUpdate": true } } --- .../enterprisepolicies/EnterprisePolicies.js | 10 ++++++++++ toolkit/components/enterprisepolicies/moz.build | 4 +++- toolkit/mozapps/update/UpdateService.jsm | 20 ++++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/toolkit/components/enterprisepolicies/EnterprisePolicies.js b/toolkit/components/enterprisepolicies/EnterprisePolicies.js index db77b4717736..bc0171867dfa 100644 --- a/toolkit/components/enterprisepolicies/EnterprisePolicies.js +++ b/toolkit/components/enterprisepolicies/EnterprisePolicies.js @@ -2,6 +2,10 @@ * 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 + const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); @@ -11,9 +15,11 @@ const { AppConstants } = ChromeUtils.import( ); XPCOMUtils.defineLazyModuleGetters(this, { +#ifndef JSON_POLICIES_ONLY WindowsGPOParser: "resource://gre/modules/policies/WindowsGPOParser.jsm", macOSPoliciesParser: "resource://gre/modules/policies/macOSPoliciesParser.jsm", +#endif Policies: "resource:///modules/policies/Policies.jsm", JsonSchemaValidator: "resource://gre/modules/components-utils/JsonSchemaValidator.jsm", @@ -111,6 +117,7 @@ EnterprisePoliciesManager.prototype = { _chooseProvider() { let provider = null; +#ifndef JSON_POLICIES_ONLY if (AppConstants.platform == "win") { provider = new WindowsGPOPoliciesProvider(); } else if (AppConstants.platform == "macosx") { @@ -119,6 +126,7 @@ EnterprisePoliciesManager.prototype = { if (provider && provider.hasPolicies) { return provider; } +#endif provider = new JSONPoliciesProvider(); if (provider.hasPolicies) { @@ -547,6 +555,7 @@ class JSONPoliciesProvider { } } +#ifndef JSON_POLICIES_ONLY class WindowsGPOPoliciesProvider { constructor() { this._policies = null; @@ -608,6 +617,7 @@ class macOSPoliciesProvider { return this._failed; } } +#endif var components = [EnterprisePoliciesManager]; this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components); diff --git a/toolkit/components/enterprisepolicies/moz.build b/toolkit/components/enterprisepolicies/moz.build index 8f7d7d8cfed7..7528f569bb3e 100644 --- a/toolkit/components/enterprisepolicies/moz.build +++ b/toolkit/components/enterprisepolicies/moz.build @@ -19,10 +19,12 @@ TEST_DIRS += [ if CONFIG['MOZ_WIDGET_TOOLKIT'] != "android": EXTRA_COMPONENTS += [ - 'EnterprisePolicies.js', 'EnterprisePolicies.manifest', 'EnterprisePoliciesContent.js', ] + EXTRA_PP_COMPONENTS += [ + 'EnterprisePolicies.js', + ] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': EXTRA_JS_MODULES.policies += [ diff --git a/toolkit/mozapps/update/UpdateService.jsm b/toolkit/mozapps/update/UpdateService.jsm index 282e1aecc5e8..5fbcc1536540 100644 --- a/toolkit/mozapps/update/UpdateService.jsm +++ b/toolkit/mozapps/update/UpdateService.jsm @@ -2772,6 +2772,10 @@ UpdateService.prototype = { _checkForBackgroundUpdates: function AUS__checkForBackgroundUpdates( isNotify ) { + if (this.disabledByPolicy) { + return; + } + this._isNotify = isNotify; // Histogram IDs: @@ -3293,6 +3297,14 @@ UpdateService.prototype = { * See nsIUpdateService.idl */ get canApplyUpdates() { + if (this.disabledByPolicy) { + LOG( + "UpdateService.canApplyUpdates - unable to apply updates, " + + "the option has been disabled by the administrator." + ); + return false; + } + return getCanApplyUpdates() && hasUpdateMutex(); }, @@ -3300,6 +3312,14 @@ UpdateService.prototype = { * See nsIUpdateService.idl */ get canStageUpdates() { + if (this.disabledByPolicy) { + LOG( + "UpdateService.canStageUpdates - unable to stage updates, " + + "the option has been disabled by the administrator." + ); + return false; + } + return getCanStageUpdates(); },

1 0

[tor-browser-build/maint-9.0] Openssl version bump is only on Win/macOS/Linux
by sysrqb＠torproject.org 28 Apr '20

28 Apr '20

commit ccef18adc1cae3dc652c0b617d6db1d0b1df6631 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Apr 28 18:36:23 2020 +0000 Openssl version bump is only on Win/macOS/Linux --- 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 6f66cad..18c2c76 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -2,6 +2,7 @@ Tor Browser 9.0.10 -- May 5 2020 * All Platforms * Update Firefox to 68.8.0esr * Bump NoScript to 11.0.25 + * Windows + OS X + Linux * Bug 34017: Bump openssl version to 1.1.1g Tor Browser 9.0.9 -- April 7 2020

1 0

[tor-browser-build/maint-9.0] Bug 34017 - Bump openssl version to 1.1.1g
by sysrqb＠torproject.org 28 Apr '20

28 Apr '20

commit b92fb2a97d0c15db625d979b7d24df628dad1477 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Apr 28 17:19:41 2020 +0000 Bug 34017 - Bump openssl version to 1.1.1g --- projects/openssl/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/openssl/config b/projects/openssl/config index 8ee3b69..f5f16b0 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.1.1f +version: 1.1.1g filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -28,6 +28,6 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: 186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35 + sha256sum: ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46 - filename: use-SOURCE_DATE_EPOCH.patch enable: '[% c("var/windows") %]' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index b0b7a8c..6f66cad 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -2,6 +2,7 @@ Tor Browser 9.0.10 -- May 5 2020 * All Platforms * Update Firefox to 68.8.0esr * Bump NoScript to 11.0.25 + * Bug 34017: Bump openssl version to 1.1.1g Tor Browser 9.0.9 -- April 7 2020 * All Platforms

1 0

[tor-browser-build/maint-9.0] Release preparations for 9.0.10
by sysrqb＠torproject.org 28 Apr '20

28 Apr '20

commit 36455baf5bc29c3f256a055cdac0a83563e5c0fa Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Apr 28 15:40:45 2020 +0000 Release preparations for 9.0.10 Versions bump and Changelog update. --- projects/firefox-langpacks/config | 2 +- projects/firefox-locale-bundle/config | 2 +- projects/firefox/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 5 +++++ projects/tor-browser/config | 4 ++-- rbm.conf | 5 ++--- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 2d55896..34d6fad 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build3 + ff_build: build1 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' targets: diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config index b2d33a8..2f4997f 100644 --- a/projects/firefox-locale-bundle/config +++ b/projects/firefox-locale-bundle/config @@ -5,4 +5,4 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: use_container: 0 ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build3 + ff_build: build1 diff --git a/projects/firefox/config b/projects/firefox/config index 8ee8817..75efe0d 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,14 +1,14 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.7.0 + firefox_platform_version: 68.8.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 9.0 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 7e24574..b0b7a8c 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,8 @@ +Tor Browser 9.0.10 -- May 5 2020 + * All Platforms + * Update Firefox to 68.8.0esr + * Bump NoScript to 11.0.25 + Tor Browser 9.0.9 -- April 7 2020 * All Platforms * Update Firefox to 68.7.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 6f2f436..22d0bb8 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -73,9 +73,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 3f046da13f487392f34858f8a5e2fc24d7d87ff19e98a3a7907f59baff8a3705 + sha256sum: 2e55cf6dc6d0f6012e2f0328ecfec182a4f02c94e2fc40818af41f610ebd6668 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/rbm.conf b/rbm.conf index 5b7db99..e23a15b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,11 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.0.9' + torbrowser_version: '9.0.10' torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.0.7 - - 9.0.8 + - 9.0.9 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gktpo/bug_32027_v4'
by sysrqb＠torproject.org 27 Apr '20

27 Apr '20

commit 30bdc472d4d2b222b9435c4a1c728ab74ff96365 Merge: ea9ec4f 260a844 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Apr 27 22:04:06 2020 +0000 Merge remote-tracking branch 'gktpo/bug_32027_v4' .../go/0001-Use-fixed-go-build-tmp-directory.patch | 22 ++++----- .../90a3ce02dc25adcf1598faf11a66b151ada3f637.patch | 57 ---------------------- projects/go/build | 2 - projects/go/config | 12 +++-- projects/obfs4/build | 7 +-- projects/snowflake/build | 4 -- 6 files changed, 23 insertions(+), 81 deletions(-)

1 0

[tor-browser-build/master] Bug 32027: Bump Go to 1.13.10
by sysrqb＠torproject.org 27 Apr '20

27 Apr '20

commit 260a8442b8b34ace8920c93b3e92cbe3e06a0c7f Author: Georg Koppen <gk(a)torproject.org> Date: Sat Apr 18 08:04:50 2020 +0000 Bug 32027: Bump Go to 1.13.10 Patch based on dcf's GO111MODULE idea as outlined in #32027. Thanks! --- .../go/0001-Use-fixed-go-build-tmp-directory.patch | 22 ++++----- .../90a3ce02dc25adcf1598faf11a66b151ada3f637.patch | 57 ---------------------- projects/go/build | 2 - projects/go/config | 12 +++-- projects/obfs4/build | 7 +-- projects/snowflake/build | 4 -- 6 files changed, 23 insertions(+), 81 deletions(-) diff --git a/projects/go/0001-Use-fixed-go-build-tmp-directory.patch b/projects/go/0001-Use-fixed-go-build-tmp-directory.patch index a10e059..022aa23 100644 --- a/projects/go/0001-Use-fixed-go-build-tmp-directory.patch +++ b/projects/go/0001-Use-fixed-go-build-tmp-directory.patch @@ -1,33 +1,33 @@ -From 44e3391a5a3d9a2c4b57f78e43414465ab84681e Mon Sep 17 00:00:00 2001 -From: Nicolas Vigier <boklm(a)torproject.org> -Date: Thu, 27 Jun 2019 19:21:05 +0200 +From 958f724b1b434702c3d44ceaca646791674d07b1 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Fri, 17 Apr 2020 10:24:23 +0000 Subject: [PATCH] Use fixed go-build tmp directory Use fixed go-build tmp directory, when the directory does not exist, in order to avoid some reproducibility issues where build directory gets embedded in generated binaries. ---- - src/cmd/go/internal/work/action.go | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/cmd/go/internal/work/action.go b/src/cmd/go/internal/work/action.go -index 1f91046eb1..ba74b26a38 100644 +index 33b7818fb2..5e369d0f53 100644 --- a/src/cmd/go/internal/work/action.go +++ b/src/cmd/go/internal/work/action.go -@@ -224,9 +224,13 @@ func (b *Builder) Init() { +@@ -249,9 +249,13 @@ func (b *Builder) Init() { if cfg.BuildN { b.WorkDir = "$WORK" } else { -- tmp, err := ioutil.TempDir(os.Getenv("GOTMPDIR"), "go-build") +- tmp, err := ioutil.TempDir(cfg.Getenv("GOTMPDIR"), "go-build") - if err != nil { - base.Fatalf("go: creating work dir: %v", err) -+ tmp := filepath.Join(os.Getenv("GOTMPDIR"), "go-build-workdir") ++ tmp := filepath.Join(cfg.Getenv("GOTMPDIR"), "go-build-workdir") + _, err := os.Stat(tmp) + if !os.IsNotExist(err) { -+ tmp, err = ioutil.TempDir(os.Getenv("GOTMPDIR"), "go-build") ++ tmp, err = ioutil.TempDir(cfg.Getenv("GOTMPDIR"), "go-build") + if err != nil { + base.Fatalf("go: creating work dir: %v", err) + } } if !filepath.IsAbs(tmp) { abs, err := filepath.Abs(tmp) +-- +2.26.1 + diff --git a/projects/go/90a3ce02dc25adcf1598faf11a66b151ada3f637.patch b/projects/go/90a3ce02dc25adcf1598faf11a66b151ada3f637.patch deleted file mode 100644 index dc66809..0000000 --- a/projects/go/90a3ce02dc25adcf1598faf11a66b151ada3f637.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 90a3ce02dc25adcf1598faf11a66b151ada3f637 Mon Sep 17 00:00:00 2001 -From: Elias Naur <mail(a)eliasnaur.com> -Date: Wed, 27 Mar 2019 14:25:24 +0100 -Subject: [PATCH] cmd/link/internal/ld: skip TLS section on Android - -We don't use the TLS section on android, and dropping it avoids -complaints about underalignment from the Android Q linker. - -Updates #29674 - -Change-Id: I91dabf2a58e6eb1783872639a6a144858db09cef -Reviewed-on: https://go-review.googlesource.com/c/go/+/169618 -Reviewed-by: Ian Lance Taylor <iant(a)golang.org> ---- - src/cmd/link/internal/ld/lib.go | 29 +++++++++++++++++------------ - 1 file changed, 17 insertions(+), 12 deletions(-) - -diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go -index 1d44c0eb18b..b331e39fe3e 100644 ---- a/src/cmd/link/internal/ld/lib.go -+++ b/src/cmd/link/internal/ld/lib.go -@@ -453,18 +453,23 @@ func (ctxt *Link) loadlib() { - } - } - -- tlsg := ctxt.Syms.Lookup("runtime.tlsg", 0) -- -- // runtime.tlsg is used for external linking on platforms that do not define -- // a variable to hold g in assembly (currently only intel). -- if tlsg.Type == 0 { -- tlsg.Type = sym.STLSBSS -- tlsg.Size = int64(ctxt.Arch.PtrSize) -- } else if tlsg.Type != sym.SDYNIMPORT { -- Errorf(nil, "runtime declared tlsg variable %v", tlsg.Type) -- } -- tlsg.Attr |= sym.AttrReachable -- ctxt.Tlsg = tlsg -+ // The Android Q linker started to complain about underalignment of the our TLS -+ // section. We don't actually use the section on android, so dont't -+ // generate it. -+ if objabi.GOOS != "android" { -+ tlsg := ctxt.Syms.Lookup("runtime.tlsg", 0) -+ -+ // runtime.tlsg is used for external linking on platforms that do not define -+ // a variable to hold g in assembly (currently only intel). -+ if tlsg.Type == 0 { -+ tlsg.Type = sym.STLSBSS -+ tlsg.Size = int64(ctxt.Arch.PtrSize) -+ } else if tlsg.Type != sym.SDYNIMPORT { -+ Errorf(nil, "runtime declared tlsg variable %v", tlsg.Type) -+ } -+ tlsg.Attr |= sym.AttrReachable -+ ctxt.Tlsg = tlsg -+ } - - var moduledata *sym.Symbol - if ctxt.BuildMode == BuildModePlugin { diff --git a/projects/go/build b/projects/go/build index 06af067..02fba2b 100644 --- a/projects/go/build +++ b/projects/go/build @@ -68,8 +68,6 @@ cd /var/tmp/dist/go/src CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash [% ELSIF c("var/android") -%] patch -p2 < $rootdir/0001-Use-fixed-go-build-tmp-directory.patch - # Obfs4 breaks on Android Q without this patch, see: #32303 - patch -p2 < $rootdir/90a3ce02dc25adcf1598faf11a66b151ada3f637.patch CGO_ENABLED=1 CC_FOR_TARGET=[% c("var/CC") %] CGO_CFLAGS='-D__ANDROID_API__=[% c("var/android_min_api") %]' CC= CFLAGS= LDFLAGS= ./make.bash [% END -%] diff --git a/projects/go/config b/projects/go/config index 371f8c2..509c6da 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.12.13 +version: 1.13.10 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -17,6 +17,9 @@ var: export GOOS=[% c("var/GOOS") %] export GOARCH=[% c("var/GOARCH") %] [% END -%] + # Run in GOPATH mode: https://golang.org/cmd/go/#hdr-Module_support. (see: + # #32027) + export GO111MODULE=off export GOPATH=/var/tmp/dist/gopath export PATH=/var/tmp/dist/go/bin:/var/tmp/dist/gopath/bin:"$PATH" [% IF c("var/linux") -%] @@ -50,6 +53,9 @@ var: do patch -p1 < $p done + # Run in GOPATH mode: https://golang.org/cmd/go/#hdr-Module_support. (see: + # #32027) + export GO111MODULE=off [% IF c("var/build_go_lib_pre"); GET c("var/build_go_lib_pre"); END; -%] [% IF c("var/go_lib_install") -%] [% FOREACH inst IN c("var/go_lib_install") %] @@ -112,11 +118,9 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 5383d3b8db4baa48284ffcb14606d9cad6f03e9db843fa6d835b94d63cccf5a7 + sha256sum: eb9ccc8bf59ed068e7eff73e154e4f5ee7eec0a47a610fb864e3332a2fdc8b8c - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 - filename: 0001-Use-fixed-go-build-tmp-directory.patch enable: '[% c("var/android") %]' - - filename: 90a3ce02dc25adcf1598faf11a66b151ada3f637.patch - enable: '[% c("var/android") %]' diff --git a/projects/obfs4/build b/projects/obfs4/build index 53b83df..47c7228 100644 --- a/projects/obfs4/build +++ b/projects/obfs4/build @@ -7,6 +7,9 @@ mkdir -p $PTDIR [% IF c("var/android") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] + # We need to explicitly set CGO_ENABLED with Go 1.13.x as the Android build + # breaks otherwise. + export CGO_ENABLED=1 [% END -%] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %] @@ -22,11 +25,9 @@ mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] -# Remove go.mod and go.sum files until we can build using Go module -# versioning (see bug 28325). -rm -f go.mod go.sum mkdir -p "$GOPATH/src/gitlab.com/yawning" ln -sf "$PWD" "$GOPATH/src/gitlab.com/yawning/obfs4.git" + cd obfs4proxy go build -ldflags '-s' cp -a obfs4proxy[% IF c("var/windows") %].exe[% END %] $PTDIR diff --git a/projects/snowflake/build b/projects/snowflake/build index fe74e84..1aede45 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -15,10 +15,6 @@ cd /var/tmp/build/[% project %]-[% c('version') %] mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/snowflake.git" - -# Remove go.mod and go.sum files until we can build using Go module versioning -rm -f go.mod go.sum - # Fix gopath location of versioned dependencies ln -sf "$GOPATH/src/github.com/pion/webrtc" "$GOPATH/src/github.com/pion/webrtc/v2" ln -sf "$GOPATH/src/github.com/pion/sdp" "$GOPATH/src/github.com/pion/sdp/v2"

1 0

[tor-browser/tor-browser-68.7.0esr-9.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by sysrqb＠torproject.org 27 Apr '20

27 Apr '20

commit 5a8128b566fab32fa2d97fe7a1a99e761afe77b0 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Apr 21 15:02:17 2020 -0400 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- browser/base/content/aboutDialog.xul | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/base/content/aboutDialog.xul b/browser/base/content/aboutDialog.xul index 3c76076c0e8f..d21a24adc499 100644 --- a/browser/base/content/aboutDialog.xul +++ b/browser/base/content/aboutDialog.xul @@ -140,11 +140,11 @@ </description> <description class="text-blurb" id="helpDesc"> &help.start; - <label is="text-link" href="https://www.torproject.org/donate/donate.html.en"> + <label is="text-link" href="https://donate.torproject.org/"> &help.donateLink; </label> &help.or; - <label is="text-link" href="https://www.torproject.org/getinvolved/volunteer.html.en"> + <label is="text-link" href="https://community.torproject.org/"> &help.getInvolvedLink; </label>&help.end; </description> @@ -153,8 +153,8 @@ </hbox> <vbox id="bottomBox"> <hbox id="newBottom" pack="center" position="1"> - <label is="text-link" class="bottom-link" href="https://www.torproject.org/docs/faq.html.en">&bottomLinks.questions;</label> - <label is="text-link" class="bottom-link" href="https://www.torproject.org/getinvolved/relays">&bottomLinks.grow;</label> + <label is="text-link" class="bottom-link" href="https://support.torproject.org/">&bottomLinks.questions;</label> + <label is="text-link" class="bottom-link" href="https://community.torproject.org/relay/">&bottomLinks.grow;</label> <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license">&bottomLinks.license;</label> </hbox> <description id="trademark" data-l10n-id="trademarkInfo"></description>

1 0

[tor-browser-build/master] Pick up rbm changes for #33993
by gk＠torproject.org 27 Apr '20

27 Apr '20

commit ea9ec4f818092b1f35bc4884f7b077cbe915c907 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 27 18:29:35 2020 +0000 Pick up rbm changes for #33993 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index 18b396f..5f8c0ac 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 18b396fb08ee9ee9311de7b8224197282f0935fe +Subproject commit 5f8c0ac72abfa72cc80d2ff24627c3e3f8db963f

1 0

[rbm/master] Bug 33993: Check type of target, target_prepend, target_append
by gk＠torproject.org 27 Apr '20

27 Apr '20

commit 5f8c0ac72abfa72cc80d2ff24627c3e3f8db963f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Apr 25 12:46:22 2020 +0200 Bug 33993: Check type of target, target_prepend, target_append Exit with an error message if target, target_prepend or target_append defined in input_files is not an array. --- lib/RBM.pm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index 375648f..7cc9e24 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -811,19 +811,24 @@ sub input_files { if ($input_file->{target} || $input_file->{target_append} || $input_file->{target_prepend}) { $input_file = { %$input_file }; - if (ref $input_file->{target} eq 'ARRAY') { + foreach my $t (qw/target target_append target_prepend/) { + if ($input_file->{$t} && ref $input_file->{$t} ne 'ARRAY') { + exit_error("$t should be an ARRAY:\n" . pp($input_file)); + } + } + if ($input_file->{target}) { $input_file->{target} = process_template_opt($project, $input_file->{target}, $options); } else { $input_file->{target} = $config->{run}{target}; } - if (ref $input_file->{target_prepend} eq 'ARRAY') { + if ($input_file->{target_prepend}) { $input_file->{target} = [ @{ process_template_opt($project, $input_file->{target_prepend}, $options) }, @{$input_file->{target}} ]; } - if (ref $input_file->{target_append} eq 'ARRAY') { + if ($input_file->{target_append}) { $input_file->{target} = [ @{$input_file->{target}}, @{ process_template_opt($project, $input_file->{target_append},

1 0

[tor-browser-build/master] Bug 33987: Make var/build_id_txt work in non-build steps
by gk＠torproject.org 27 Apr '20

27 Apr '20

commit 32e6bcd3b6db11313be8bfdce475555bbf72138b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 24 15:40:53 2020 +0200 Bug 33987: Make var/build_id_txt work in non-build steps --- rbm.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 94f9fcc..819a257 100644 --- a/rbm.conf +++ b/rbm.conf @@ -47,7 +47,8 @@ var: [% END -%] input_files: [% c("input_files_id") %] build: - [% c("build", { filename => 'f', output_dir => '/out', norec => {} }) %] + [% SET step = c("step") -%] + [% c(step, { filename => 'f', output_dir => '/out', norec => {} }) %] container: dir: '[% c("rbm_tmp_dir") %]/rbm-containers/[% sha256(c("build_id")) %]' user: rbm

1 0

[tor-browser-build/master] Bump rbm commit to pick up fix for #33990
by gk＠torproject.org 27 Apr '20

27 Apr '20

commit 824287778856704d2b97ba871d9d5ed4c6bd9e04 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 27 11:20:14 2020 +0000 Bump rbm commit to pick up fix for #33990 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index e4f12ab..18b396f 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit e4f12abe9ed81050994b5345c21b988005259396 +Subproject commit 18b396fb08ee9ee9311de7b8224197282f0935fe

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_33987'
by gk＠torproject.org 27 Apr '20

27 Apr '20

commit 07e75fab2a78626ed3c6ec1a593754785119e1cf Merge: 8242877 32e6bcd Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 27 11:21:10 2020 +0000 Merge remote-tracking branch 'boklm/bug_33987' rbm.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[rbm/master] Bug 33990: Initialize step in non-build commands
by gk＠torproject.org 27 Apr '20

27 Apr '20

commit 18b396fb08ee9ee9311de7b8224197282f0935fe Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 24 16:01:23 2020 +0200 Bug 33990: Initialize step in non-build commands When using the build command, step gets initialized to 'build'. However this was not done in some of the other non-build commands where the value of step was left to rbm_init. --- rbm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rbm b/rbm index 5d6417b..6b31185 100755 --- a/rbm +++ b/rbm @@ -109,6 +109,9 @@ sub set_options { } RBM::load_system_config(@_); RBM::load_local_config(@_); + if (!defined $val{step} && @_) { + $RBM::config->{step} = RBM::project_config($_[0], 'pkg_type'); + } return $RBM::config->{run}{args} = \@_; } @@ -172,9 +175,9 @@ sub build_script { my $script_name = shift; usageexit($_[0]) unless @_ >= 2; my $cmd = shift; - my $args = set_options(@_); + my $args = set_options("--step=$script_name", @_); usageexit($cmd) unless @$args == 1; - $script_name = $RBM::config->{step} if $RBM::config->{step} ne 'rbm_init'; + $script_name = $RBM::config->{step}; RBM::build_pkg($args->[0], { pkg_type => $script_name }); }

1 0

[tor-browser-build/master] Bug 33802: Remove obsolete --enabled-secure-api
by boklm＠torproject.org 19 Apr '20

19 Apr '20

commit f9eef9924b8e748d436fd27b15cf0c2617b44249 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 3 07:03:49 2020 +0000 Bug 33802: Remove obsolete --enabled-secure-api --- projects/mingw-w64-clang/build | 1 - projects/mingw-w64/build | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/mingw-w64-clang/build b/projects/mingw-w64-clang/build index fa059da..302975d 100644 --- a/projects/mingw-w64-clang/build +++ b/projects/mingw-w64-clang/build @@ -72,7 +72,6 @@ cd mingw-w64-headers mkdir build && cd build ../configure --host=[% c("arch") %]-w64-mingw32 \ --enable-sdk=all \ - --enable-secure-api \ --enable-idl \ --with-default-msvcrt=ucrt \ --with-default-win32-winnt=$default_win32_winnt \ diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index 9e504ba..c5fcda6 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -15,7 +15,7 @@ mkdir -p builddir/mingw-w64/mingw-w64-headers32 cd builddir/mingw-w64/mingw-w64-headers32 /var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-headers/configure \ --prefix=$distdir/[% c("arch") %]-w64-mingw32 --host=[% c("arch") %]-w64-mingw32 \ - --enable-sdk=all --enable-secure-api --enable-idl + --enable-sdk=all --enable-idl make install cd /var/tmp/build

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_33802'
by boklm＠torproject.org 19 Apr '20

19 Apr '20

commit 6b60066bddd5d93442fc2d4fe553b779dcf8a045 Merge: 49319fa f9eef99 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Apr 19 15:55:32 2020 +0200 Merge remote-tracking branch 'gk/bug_33802' projects/mingw-w64-clang/build | 1 - projects/mingw-w64/build | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)

1 0

[tor-browser-bundle-testsuite/master] Bug 33926: Add a LICENSE file ("3-clause BSD" license)
by gk＠torproject.org 17 Apr '20

17 Apr '20

commit 2357de09b5e66dddf749a4fec042940abcafabca Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 17 15:16:11 2020 +0200 Bug 33926: Add a LICENSE file ("3-clause BSD" license) --- LICENSE | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..a8acdf3 --- /dev/null +++ b/LICENSE @@ -0,0 +1,29 @@ +Copyright (c) 2020, The Tor Project, Inc. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + + * Neither the names of the copyright owners nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

1 0

[tor-browser-build/master] Bug 32038: Add a LICENSE file
by gk＠torproject.org 17 Apr '20

17 Apr '20

commit 49319fa1afea0f0f0e2ce16b7d61da95f39c79b2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 31 20:28:27 2020 +0200 Bug 32038: Add a LICENSE file --- LICENSE | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..ee29ae2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,37 @@ +This file contains the license for the build recipes and tools used in +the Tor Browser development process, that are included in this repository. + +For the license of specific components included in Tor Browser, see +directory projects/tor-browser/Bundle-Data/Docs/Licenses. + +=============================================================================== + +Copyright (c) 2020, The Tor Project, Inc. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + + * Neither the names of the copyright owners nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

1 0

[tor-browser-build/master] Bug 32788: Specify version for test builds
by gk＠torproject.org 17 Apr '20

17 Apr '20

commit 3310abeac20111775407177fb95f4ede3d50251c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 17 06:46:29 2020 +0000 Bug 32788: Specify version for test builds With our switch to including a date into our nightly build versioning (#25009) testing patches with test builds got harder. The firefox part has to be rebuilt every day now as it includes the version number, even if no code changes occurred. That slows down testing of patches significantly. We hardcode "testing" as the test build version number to fix that and use "20010101010101" for the build date. Thanks to boklm for help. --- projects/firefox/get-moz-build-date | 4 ++++ rbm.conf | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/projects/firefox/get-moz-build-date b/projects/firefox/get-moz-build-date index e6989ff..a43f2f7 100755 --- a/projects/firefox/get-moz-build-date +++ b/projects/firefox/get-moz-build-date @@ -8,6 +8,10 @@ my ($year, $version) = @ARGV; my $date; if ($version =~ m/^tbb-nightly\.([^\.]+)\.([^\.]+)\.([^\.]+)$/) { $date = sprintf("%d%02d%02d010101", $1, $2, $3); +} elsif ($version eq 'testbuild') { + # There is no need for an increasing build date in test builds. Just hardcode + # it. + $date = 20010101010101; } else { my @v = split(/[\.ab]/, $version); push @v, '0' if @v < 4; diff --git a/rbm.conf b/rbm.conf index cd17da9..94f9fcc 100644 --- a/rbm.conf +++ b/rbm.conf @@ -151,7 +151,16 @@ targets: var: nightly: 1 channel: nightly - torbrowser_version: '[% ENV.TORBROWSER_NIGHTLY_VERSION ? ENV.TORBROWSER_NIGHTLY_VERSION : c("var_p/nightly_torbrowser_version") %]' + torbrowser_version: | + [% + IF ENV.TORBROWSER_NIGHTLY_VERSION; + GET ENV.TORBROWSER_NIGHTLY_VERSION; + ELSIF c("var/testbuild"); + GET "testbuild"; + ELSE; + GET c("var_p/nightly_torbrowser_version"); + END; + -%] # For nightly builds, we support updates for a limited set of locales mar_locales: - de

1 0

[tor-browser-build/master] Bug 33359: Use latest Version of TOPL and Remove Patches
by gk＠torproject.org 17 Apr '20

17 Apr '20

commit d567f0f9fc3cebd4f57ee928b6b2c185137403d5 Author: sisbell <shane.isbell(a)gmail.com> Date: Mon Feb 17 21:56:11 2020 -0800 Bug 33359: Use latest Version of TOPL and Remove Patches --- ...ustom-obfs4-bridge-does-not-work-on-Tor-B.patch | 146 --------------------- projects/tor-onion-proxy-library/build | 2 - .../tor-onion-proxy-library/canceldormant.patch | 46 ------- projects/tor-onion-proxy-library/config | 4 +- 4 files changed, 1 insertion(+), 197 deletions(-) diff --git a/projects/tor-onion-proxy-library/0001-Bug-30767-Custom-obfs4-bridge-does-not-work-on-Tor-B.patch b/projects/tor-onion-proxy-library/0001-Bug-30767-Custom-obfs4-bridge-does-not-work-on-Tor-B.patch deleted file mode 100644 index 2d1bc51..0000000 --- a/projects/tor-onion-proxy-library/0001-Bug-30767-Custom-obfs4-bridge-does-not-work-on-Tor-B.patch +++ /dev/null @@ -1,146 +0,0 @@ -From 0a482a749fd770827d3d6c71debb112a07e7fae3 Mon Sep 17 00:00:00 2001 -From: sisbell <shane.isbell(a)gmail.com> -Date: Thu, 14 Nov 2019 13:43:09 -0800 -Subject: [PATCH] Bug 30767: Custom obfs4 bridge does not work on Tor Browser - for Android - -TOPL fixes #134 ---- - .../thali/toronionproxy/TorConfigBuilder.java | 63 ++++++++----------- - 1 file changed, 26 insertions(+), 37 deletions(-) - -diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java -index e324d9f..da9a6a2 100644 ---- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java -+++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java -@@ -99,25 +99,32 @@ public final class TorConfigBuilder { - return this; - } - -+ @SettingsConfig -+ public TorConfigBuilder bridgesFromSettings() { -+ try { -+ addBridgesFromResources(); -+ } catch (IOException e) { -+ e.printStackTrace(); -+ } -+ return this; -+ } -+ - public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportClient) throws IOException { -- List<String> supportedBridges = settings.getListOfSupportedBridges(); -- if (pluggableTransportClient == null || !settings.hasBridges() || supportedBridges.size() < 1) { -+ if (pluggableTransportClient == null) { - return this; - } - -- if (!pluggableTransportClient.exists() || !pluggableTransportClient.canExecute()) { -+ if (!pluggableTransportClient.exists()) { - throw new IOException("Bridge binary does not exist: " + pluggableTransportClient - .getCanonicalPath()); - } - -- if (supportedBridges.contains("obfs3") || supportedBridges.contains("obfs4")) { -- transportPluginObfs(pluggableTransportClient.getCanonicalPath()); -- } -- if (supportedBridges.contains("meek")) { -- transportPluginMeek(pluggableTransportClient.getCanonicalPath()); -+ if (!pluggableTransportClient.canExecute()) { -+ throw new IOException("Bridge binary is not executable: " + pluggableTransportClient -+ .getCanonicalPath()); - } -- String type = supportedBridges.contains("meek") ? "meek_lite" : "obfs4"; -- addBridgesFromResources(type, 2); -+ -+ transportPlugin(pluggableTransportClient.getCanonicalPath()); - return this; - } - -@@ -471,14 +478,8 @@ public final class TorConfigBuilder { - return transPort(settings.transPort()); - } - -- public TorConfigBuilder transportPluginMeek(String clientPath) { -- buffer.append("ClientTransportPlugin meek_lite exec ").append(clientPath).append('\n'); -- return this; -- } -- -- public TorConfigBuilder transportPluginObfs(String clientPath) { -- buffer.append("ClientTransportPlugin obfs3 exec ").append(clientPath).append('\n'); -- buffer.append("ClientTransportPlugin obfs4 exec ").append(clientPath).append('\n'); -+ public TorConfigBuilder transportPlugin(String clientPath) { -+ buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(clientPath).append('\n'); - return this; - } - -@@ -489,7 +490,7 @@ public final class TorConfigBuilder { - - @SettingsConfig - public TorConfigBuilder useBridgesFromSettings() { -- return !settings.hasBridges() ? dontUseBridges() : this; -+ return settings.hasBridges() ? useBridges() : this; - } - - public TorConfigBuilder virtualAddressNetwork(String address) { -@@ -518,12 +519,12 @@ public final class TorConfigBuilder { - * </code> - * - */ -- TorConfigBuilder addBridgesFromResources(String type, int maxBridges) throws IOException { -+ TorConfigBuilder addBridgesFromResources() throws IOException { - if(settings.hasBridges()) { - InputStream bridgesStream = context.getInstaller().openBridgesStream(); - int formatType = bridgesStream.read(); -- if(formatType == 0) { -- addBridges(bridgesStream, type, maxBridges); -+ if (formatType == 0) { -+ addBridges(bridgesStream); - } else { - addCustomBridges(bridgesStream); - } -@@ -534,23 +535,14 @@ public final class TorConfigBuilder { - /** - * Add bridges from bridges.txt file. - */ -- private void addBridges(InputStream input, String bridgeType, int maxBridges) { -- if (input == null || isNullOrEmpty(bridgeType) || maxBridges < 1) { -+ private void addBridges(InputStream input) { -+ if (input == null) { - return; - } -- boolean hasAddedBridge = false; - List<Bridge> bridges = readBridgesFromStream(input); -- Collections.shuffle(bridges, new Random(System.nanoTime())); -- int bridgeCount = 0; - for (Bridge b : bridges) { -- if (b.type.equals(bridgeType)) { -- bridge(b.type, b.config); -- hasAddedBridge = true; -- if (++bridgeCount > maxBridges) -- break; -- } -+ bridge(b.type, b.config); - } -- if(hasAddedBridge) useBridges(); - } - - /** -@@ -560,15 +552,12 @@ public final class TorConfigBuilder { - if (input == null) { - return; - } -- boolean hasAddedBridge = false; - List<Bridge> bridges = readCustomBridgesFromStream(input); - for (Bridge b : bridges) { - if (b.type.equals("custom")) { - bridgeCustom(b.config); -- hasAddedBridge = true; - } - } -- if(hasAddedBridge) useBridges(); - } - - private static List<Bridge> readBridgesFromStream(InputStream input) { --- -2.20.1 - diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build index 9a8b31e..21c8f7a 100644 --- a/projects/tor-onion-proxy-library/build +++ b/projects/tor-onion-proxy-library/build @@ -20,8 +20,6 @@ cd /var/tmp/build/[% project %]-[% c('version') %] # Gradle patch provided so that when generating a gradle dependency list, the # build will pull down the correct android tool versions patch -p1 < $rootdir/gradle.patch -patch -p1 < $rootdir/canceldormant.patch -patch -p1 < $rootdir/0001-Bug-30767-Custom-obfs4-bridge-does-not-work-on-Tor-B.patch # Extract obfs4proxy from TorBrowser/Tor/PluggableTransports/obfs4proxy tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/obfs4') %] diff --git a/projects/tor-onion-proxy-library/canceldormant.patch b/projects/tor-onion-proxy-library/canceldormant.patch deleted file mode 100644 index 8d48af1..0000000 --- a/projects/tor-onion-proxy-library/canceldormant.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/DefaultSettings.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/DefaultSettings.java -index 5f5adac..da6747f 100644 ---- a/universal/src/main/java/com/msopentech/thali/toronionproxy/DefaultSettings.java -+++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/DefaultSettings.java -@@ -187,4 +187,9 @@ public class DefaultSettings implements TorSettings { - public boolean useSocks5() { - return false; - } -+ -+ @Override -+ public boolean hasDormantCanceledByStartup() { -+ return false; -+ } - } -diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java -index e324d9f..99e5693 100644 ---- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java -+++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java -@@ -503,6 +503,16 @@ public final class TorConfigBuilder { - return virtualAddressNetwork(settings.getVirtualAddressNetwork()); - } - -+ public TorConfigBuilder dormantCanceledByStartup() { -+ buffer.append("DormantCanceledByStartup 1").append('\n'); -+ return this; -+ } -+ -+ @SettingsConfig -+ public TorConfigBuilder domantCanceledByStartupFromSettings() { -+ return settings.hasDormantCanceledByStartup() ? dormantCanceledByStartup() : this; -+ } -+ - /** - * Adds bridges from a resource stream. This relies on the TorInstaller to know how to obtain this stream. - * These entries may be type-specified like: -diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorSettings.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorSettings.java -index 2d515d1..43f01ef 100644 ---- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorSettings.java -+++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorSettings.java -@@ -77,4 +77,6 @@ public interface TorSettings { - String transPort(); - - boolean useSocks5(); -+ -+ boolean hasDormantCanceledByStartup(); - } diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index c682078..080f0c2 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: a720e25bcdada2e6ba5c8cb1f566a6b633b79dc5 +git_hash: aeb63ebd079b646a3ec1b7b84d755653baa467d7 git_url: https://github.com/thaliproject/Tor_Onion_Proxy_Library.git git_submodule: 1 @@ -25,5 +25,3 @@ input_files: name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - filename: gradle.patch - - filename: canceldormant.patch - - filename: 0001-Bug-30767-Custom-obfs4-bridge-does-not-work-on-Tor-B.patch

1 0

[tor-browser/tor-browser-68.7.0esr-9.5-1] fixup! Bug 23247: Communicating security expectations for .onion
by boklm＠torproject.org 15 Apr '20

15 Apr '20

commit dcae22191c42bdb1948a6e55c7c50e0ab97dbf70 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Mar 25 18:33:57 2020 +0100 fixup! Bug 23247: Communicating security expectations for .onion --- dom/security/nsMixedContentBlocker.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dom/security/nsMixedContentBlocker.cpp b/dom/security/nsMixedContentBlocker.cpp index cf060b67d68f..2bbc2e8aecb3 100644 --- a/dom/security/nsMixedContentBlocker.cpp +++ b/dom/security/nsMixedContentBlocker.cpp @@ -794,6 +794,11 @@ nsresult nsMixedContentBlocker::ShouldLoad( return NS_OK; } + if (isHttpScheme && IsPotentiallyTrustworthyOrigin(innerContentLocation)) { + *aDecision = ACCEPT; + return NS_OK; + } + // The page might have set the CSP directive 'upgrade-insecure-requests'. In // such a case allow the http: load to succeed with the promise that the // channel will get upgraded to https before fetching any data from the

1 0

[tor-browser-build/master] Bug 28766: Tor Build for Android
by boklm＠torproject.org 15 Apr '20

15 Apr '20

commit 7894190b275b412c8d4f9cf7cad281601594da24 Author: sisbell <shane.isbell(a)gmail.com> Date: Wed Jan 15 21:48:13 2020 -0800 Bug 28766: Tor Build for Android --- projects/tor/build | 27 ++++++++++++++++++++++----- projects/tor/config | 10 +++++++++- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/projects/tor/build b/projects/tor/build index 0235da7..30ecc7e 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -4,6 +4,12 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build +[% IF c("var/android") %] + TORCONFIGDIR="$distdir/assets/common" + libsdir=$distdir/jniLibs/[% c("var/abi") %] + mkdir -p $libsdir $TORCONFIGDIR "$distdir/Tor" +[% END %] + [% IF c("var/linux") || c("var/windows") %] TORCONFIGDIR="$distdir/Data/Tor" mkdir -p $TORCONFIGDIR @@ -22,12 +28,19 @@ mkdir -p /var/tmp/build mkdir -p $TORCONFIGDIR [% END %] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/openssl') %] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/libevent') %] +[% IF c("var/windows") || c("var/android") %] + tar -C /var/tmp/dist -xf [% c('input_files_by_name/zlib') %] + zlibdir=/var/tmp/dist/zlib +[% END %] +[% IF c("var/android") %] + tar -C /var/tmp/dist -xf [% c('input_files_by_name/zstd') %] +[% END %] [% IF !c("var/android") && c("var/nightly") %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] export PATH=/var/tmp/dist/rust/bin:$PATH [% END %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/openssl') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/libevent') %] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz libeventdir=/var/tmp/dist/libevent openssldir=/var/tmp/dist/openssl/openssl @@ -37,8 +50,6 @@ openssldir=/var/tmp/dist/openssl/openssl # We are compiling Tor with Rust enabled for nightlies. export TOR_RUST_TARGET=[% c("arch") %]-pc-windows-gnu [% END %] - tar -C /var/tmp/build -xf [% c('input_files_by_name/zlib') %] - zlibdir=/var/tmp/build/zlib # XXX: It's a bit unfortunate but we need the pthread dll here as libevent # gets compiled with pthread support once it is enabled in GCC, which we need # to do as otherwise the Rust compilaton breaks. @@ -86,7 +97,7 @@ echo '"[% c("abbrev", { abbrev_length => 16 }) %]"' > micro-revision.i find -type f -print0 | xargs -0 [% c("var/touch") %] [% IF !c("var/android") && c("var/nightly") %]TOR_RUST_DEPENDENCIES=`pwd`/src/ext/rust/crates[% END %] ./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \ [% IF c("var/asan") %]--enable-fragile-hardening[% END %] \ - [% IF c("var/windows") %]--with-zlib-dir="$zlibdir"[% END %] \ + [% IF c("var/windows") || c("var/android") %]--with-zlib-dir="$zlibdir"[% END %] \ [% IF c("var/osx") %]--enable-static-openssl[% END %] \ [% IF !c("var/android") && c("var/nightly") %]--enable-rust[% END %] \ --prefix="$distdir" [% c("var/configure_opt") %] @@ -132,6 +143,10 @@ cd $distdir done [% END %] +[% IF c("var/android") %] + install -s --strip-program=[% c("var/configure_host") %]-strip $distdir/bin/tor $libsdir/libTor.so +[% END %] + mkdir -p [% dest_dir _ '/' _ c('filename') %] [% IF c("var/expert_bundle"); @@ -143,6 +158,8 @@ mkdir -p [% dest_dir _ '/' _ c('filename') %] ELSE; IF c("var/osx"); SET tarsrcdir = [ 'Contents' ]; + ELSIF c("var/android"); + SET tarsrcdir = [ 'assets', 'jniLibs' ]; ELSE; SET tarsrcdir = [ 'Data', 'Tor', ]; END; diff --git a/projects/tor/config b/projects/tor/config index a491ba0..3bd3999 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -45,6 +45,11 @@ targets: var: expert_bundle: 1 flag_mwindows: '' + android: + var: + configure_opt_project: --libdir=$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/lib --enable-android --enable-static-openssl --enable-static-libevent --enable-zstd --disable-tool-name-check --disable-system-torrc --disable-system-torrc + arch_deps: + - libtinfo5 input_files: - project: container-image @@ -54,9 +59,12 @@ input_files: project: libevent - name: zlib project: zlib - enable: '[% c("var/windows") %]' + enable: '[% c("var/windows") || c("var/android") %]' - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - name: rust project: rust enable: '[% !c("var/android") && c("var/nightly") %]' + - name: zstd + project: zstd + enable: '[% c("var/android") %]'

1 0

[tor-browser-build/master] Bug 32993: Package Tor With Tor Android Service Project
by boklm＠torproject.org 15 Apr '20

15 Apr '20

commit 4b2a1dcfba4bb57d8ace4f7ffaaff18bfed7a535 Author: sisbell <shane.isbell(a)gmail.com> Date: Sun Jan 19 21:12:07 2020 -0800 Bug 32993: Package Tor With Tor Android Service Project --- projects/tor-android-service/build | 8 ++++++-- projects/tor-android-service/config | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/projects/tor-android-service/build b/projects/tor-android-service/build index 8f8d16d..1a623e5 100644 --- a/projects/tor-android-service/build +++ b/projects/tor-android-service/build @@ -14,9 +14,13 @@ mkdir -p /var/tmp/build $output_dir tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] -patch -p1 < $rootdir/remove-native-build.patch -# Remove native files, otherwise build will fail after gradle.patch +# Replace pre-packaged tor library with the latest build +rm -fR service/src/main/jniLibs/* +tar -C service/src/main -xf $rootdir/[% c('input_files_by_name/tor') %]/tor.tar.gz + +# Patch native build. Then remove native files, otherwise build will fail after gradle.patch +patch -p1 < $rootdir/remove-native-build.patch rm -fR service/src/main/jni # Replace libraries with the config dependencies diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index c2994b7..2f8dd3e 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -22,4 +22,6 @@ input_files: exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - project: tor-onion-proxy-library name: topl + - project: tor + name: tor - filename: remove-native-build.patch

1 0

[tor-browser-build/master] Merge remote-tracking branch 'sisbell/bug-32993a'
by boklm＠torproject.org 15 Apr '20

15 Apr '20

commit acfda9f43d3203bb12913b56cbf8c3891a16253c Merge: ea9f208 4b2a1dc Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 15 23:56:02 2020 +0200 Merge remote-tracking branch 'sisbell/bug-32993a' projects/tor-android-service/build | 8 ++++++-- projects/tor-android-service/config | 2 ++ projects/tor/build | 27 ++++++++++++++++++++++----- projects/tor/config | 10 +++++++++- projects/zlib/build | 16 ++++++++++++++-- 5 files changed, 53 insertions(+), 10 deletions(-)

1 0

[tor-browser-build/master] Bug 33685: Add Support for Building zlib for Android
by boklm＠torproject.org 15 Apr '20

15 Apr '20

commit cc6e1439cdc0bc393ce7c3c2ece47cc2d9abed4f Author: sisbell <shane.isbell(a)gmail.com> Date: Sat Mar 21 16:48:11 2020 -0700 Bug 33685: Add Support for Building zlib for Android --- projects/zlib/build | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/projects/zlib/build b/projects/zlib/build index fe1377f..5ee00d5 100644 --- a/projects/zlib/build +++ b/projects/zlib/build @@ -5,8 +5,20 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] -make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j[% c("buildconf/num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" -make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j[% c("buildconf/num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" install +[% IF c("var/windows") -%] + make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j[% c("buildconf/num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" + make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j[% c("buildconf/num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" install +[% END -%] + +[% IF c("var/android") -%] + export CHOST=[% c("var/configure_host") %] + export CC="clang" + ./configure --prefix=$distdir + make -j[% c("buildconf/num_procs") %] + make -j[% c("buildconf/num_procs") %] install + # Only need static libraries + rm -r $distdir/lib/{*.so*,pkgconfig} +[% END -%] cd /var/tmp/dist [% c('tar', {

1 0

[tor-browser-spec/master] Bug 21952: Onion-Location spec update to match latest implementation
by sysrqb＠torproject.org 15 Apr '20

15 Apr '20

commit fcdbf39dde66f629c7abefb2ab44e36ade55f9ff Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Apr 7 17:22:35 2020 +0200 Bug 21952: Onion-Location spec update to match latest implementation --- proposals/100-onion-location-header.txt | 46 ++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/proposals/100-onion-location-header.txt b/proposals/100-onion-location-header.txt index 0820968..5d0e763 100644 --- a/proposals/100-onion-location-header.txt +++ b/proposals/100-onion-location-header.txt @@ -35,10 +35,8 @@ Ticket: #21952 2.1. Redirection method - We introduce a new HTTP header called "Onion-Location" with the exact same - restrictions and semantics as the Location HTTP header. Websites can use the - Onion-Location HTTP header to specify their onion counterpart, in the same - way that they would use the Location header. + We introduce a new HTTP header called "Onion-Location", which websites + can use to specify their onion counterpart. Example: Onion-Location: http://vwc43ag5jyewlfgf.onion @@ -46,8 +44,29 @@ Ticket: #21952 2.2. Browser logic The Tor Browser intercepts the Onion-Location HTTP header (if any) and - informs the user of the existence of the onion site, giving them the option - to visit it. Tor Browser only does so if the header is served over HTTPS. + acts upon it in two possible ways, depending on the configuration state + of the browser: + + a) If the user has enabled automatic Onion-Location redirects + the header is equivalent to a redirect with a Refresh header and a + timeout of 0 seconds [1]. As an example: the header in 2.1 would be + treated like a `Refresh: 0;URL='http://vwc43ag5jyewlfgf.onion'` header. + + b) If the user has not enabled automatic Onion-Location redirects, + it informs them of the existence of the onionsite, giving them the option + to visit it. If the user chooses to visit the onionsite, the webpage + will be reloaded and redirected to its onion counterpart, as in a). + + Before acting upon it, the browser checks whether the Onion-Location has + a valid value, and ignores it if it does not. For the header to be valid + the following conditions need to be fulfilled: + + * The Onion-Location value must be a valid URL with http: or https: protocol + and a .onion hostname. + + * The webpage defining the Onion-Location header must be served over HTTPS. + + * The webpage defining the Onion-Location header must not be an onionsite. Tor Browser should inform the user about the onion in a non-intrusive way (e.g. an infobar below the address bar), it should also provide a way for @@ -56,6 +75,18 @@ Ticket: #21952 Browsers that don't support Tor SHOULD ignore the Onion-Location header. +2.3. Using an HTML <meta> attribute instead of an HTTP header + + The (conditionally) identical behaviour of Onion-Location and a Refresh + header (with 0 seconds timeout) includes the option of defining it as a + HTML <meta> http-equiv attribute. This may be used by websites that prefer + (or need) to define Onion-Location by modifying the served HTML content + instead of adding a new HTTP header. + + As an example, the Onion-Location header in 2.1 would be equivalent to a + `<meta http-equiv="onion-location" content="http://vwc43ag5jyewlfgf.onion" />` + added in the HTML head element of the webpage. + 3. Drawbacks 3.1. No security/performance benefits @@ -122,3 +153,6 @@ Ticket: #21952 and would still confuse people. So I think starting with a simple approach that will educate users and then moving to more advanced designs is a more normative way to go. + + +[1] https://www.w3.org/TR/2016/NOTE-WCAG20-TECHS-20161007/H76 \ No newline at end of file

1 0

[tor-browser-build/master] Update ChangeLog: add #33630
by sysrqb＠torproject.org 15 Apr '20

15 Apr '20

commit ea9f208259bfe185a35b10cd1e7b9ffd15466ec9 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Apr 15 12:47:45 2020 +0000 Update ChangeLog: add #33630 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 1b34667..7f826ee 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,7 @@ +Tor Browser 9.5a12 -- April XX 2020 + * All Platforms + Bug 33630: Remove noisebridge01 default bridge + Tor Browser 9.5a11 -- April 8 2020 * All Platforms * Update Firefox to 68.7.0esr

1 0

[tor-browser-build/master] Revert "Revert "Bug 33630: Remove noisebridge01 default bridge.""
by sysrqb＠torproject.org 15 Apr '20

15 Apr '20

commit 121d6597d436e94b92928f39fade8eb2067e6047 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Apr 15 12:45:04 2020 +0000 Revert "Revert "Bug 33630: Remove noisebridge01 default bridge."" This reverts commit ac8641d245dadc64f0057231f9e593379e9701fc. --- .../tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index a87aa58..282e56f 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -9,15 +9,14 @@ pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 37.218.240.34:40035 pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-build/master] Revert "Revert "Bug 33630: Pick up tor-android-service patch""
by sysrqb＠torproject.org 15 Apr '20

15 Apr '20

commit 66d52da6b8b6fccdadc926b85a49109f15ef00ab Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Apr 15 12:45:16 2020 +0000 Revert "Revert "Bug 33630: Pick up tor-android-service patch"" This reverts commit 8c408b55345aec7af1be95d722e115df3f877beb. --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index c2994b7..9754ebe 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: 18ba7d2780b1d5194cc5854d703655f6c9d3d196 +git_hash: 2a7091dd16842b58bb4ae10dabfddae97c8e3a4a git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0