- tbb-commits - lists.torproject.org

[torbutton/master] Bug 18743: Pref to hide 'Sign in to Sync' button in hamburger menu
by gk＠torproject.org 16 May '16

16 May '16

commit d127873b498fb83e4f608b82a8d382df25183dd3 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Apr 25 23:03:17 2016 -0700 Bug 18743: Pref to hide 'Sign in to Sync' button in hamburger menu --- src/chrome/content/torbutton.js | 16 ++++++++++++++++ src/defaults/preferences/preferences.js | 1 + 2 files changed, 17 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index a8a4ce6..a293c44 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -236,6 +236,9 @@ var torbutton_unique_pref_observer = case "extensions.torbutton.restrict_thirdparty": torbutton_update_thirdparty_prefs(); break; + case "extensions.torbutton.hide_sync_ui": + torbutton_update_sync_ui(); + break; case "gfx.font_rendering.opentype_svg.enabled": case "javascript.options.ion.content": case "javascript.options.typeinference": @@ -625,6 +628,7 @@ function torbutton_init() { torbutton_update_toolbutton(mode); torbutton_update_statusbar(mode); torbutton_notify_if_update_needed(); + torbutton_update_sync_ui(); createTorCircuitDisplay(m_tb_control_host, m_tb_control_port, m_tb_control_pass, "extensions.torbutton.display_circuit"); @@ -3566,4 +3570,16 @@ function torbutton_is_homepage_url(aURI) return (urls.indexOf(aURI.spec) >= 0); } +// Check if "extensions.torbutton.hide_sync_ui" is enabled, and if so, +// hide the "Sign in to Sync" button on the hamburger menu. +function torbutton_update_sync_ui() +{ + try { + document.getElementById("PanelUI-footer-fxa").style.display = + getBoolPref("extensions.torbutton.hide_sync_ui") ? "none" : ""; + } catch (e) { + torbutton_log(5, 'Error updating the Sync UI: ' + e); + } +} + //vim:set ts=4 diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 548f4ed..c958ec4 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -9,6 +9,7 @@ pref("extensions.torbutton.display_panel",true); pref("extensions.torbutton.panel_style",'text'); pref("extensions.torbutton(a)torproject.org.description", "chrome://torbutton/locale/torbutton.properties"); pref("extensions.torbutton.updateNeeded", false); +pref("extensions.torbutton.hide_sync_ui", true); // proxy prefs pref("extensions.torbutton.settings_method",'recommended');

1 0

[tor-browser/tor-browser-45.1.0esr-6.0-1] fixup! Bug 12827: Create preference to disable SVG.
by gk＠torproject.org 16 May '16

16 May '16

commit 7ffe3230d2b6020394803784c140765e7c8e4b76 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue May 10 16:57:17 2016 -0400 fixup! Bug 12827: Create preference to disable SVG. When SVGs are disabled, do no load SVG images within the Page Info Media tab (bug 18770). --- image/ImageFactory.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/image/ImageFactory.cpp b/image/ImageFactory.cpp index 9298d74..ec20c78 100644 --- a/image/ImageFactory.cpp +++ b/image/ImageFactory.cpp @@ -98,8 +98,10 @@ ImageFactory::CreateImage(nsIRequest* aRequest, nsCOMPtr<nsIChannel> channel(do_QueryInterface(aRequest)); isBlocked = !NS_SVGEnabledForChannel(channel); if (!isBlocked && channel && !NS_SVGEnabledForChannel(nullptr)) { - // Special case for favicons: block this image load if SVGs are - // disallowed from content and if this image load originated from the + // This SVG was not blocked based on the channel but SVGs are + // disallowed from content. Check some special cases. + + // For favicons, block this SVG image load if it originated from the // favicon xul:image node within a tab. nsCOMPtr<nsILoadInfo> loadInfo; nsresult rv = channel->GetLoadInfo(getter_AddRefs(loadInfo)); @@ -111,6 +113,17 @@ ImageFactory::CreateImage(nsIRequest* aRequest, nsAutoString anonid; elem->GetAttribute(NS_LITERAL_STRING("anonid"), anonid); isBlocked = anonid.EqualsLiteral("tab-icon-image"); + + if (!isBlocked) { + // For the Page Info "Media" tab, block this SVG image load if + // it originated from a node within a chrome document that has + // an id of "thepreviewimage". + if (nsContentUtils::IsChromeDoc(node->OwnerDoc())) { + nsAutoString loadingID; + elem->GetId(loadingID); + isBlocked = loadingID.EqualsLiteral("thepreviewimage"); + } + } } } }

1 0

[tor-browser/tor-browser-45.1.0esr-6.0-1] Bug 18958: Spoof screen.orientation values
by gk＠torproject.org 13 May '16

13 May '16

commit a086a5d0070821b1c4dfd2492bdc993c91353a2b Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sun May 8 22:23:42 2016 -0700 Bug 18958: Spoof screen.orientation values Make sure that screen.orientation.angle -> 0 and screen.orientation.type -> "landscape-primary" Also refactors screen.mozOrientation. --- dom/base/ScreenOrientation.cpp | 29 +++++++++++++++++++++++++++-- dom/base/ScreenOrientation.h | 2 ++ dom/base/nsGlobalWindow.cpp | 7 ++++--- dom/base/nsScreen.cpp | 38 ++++++++++++++++++++------------------ 4 files changed, 53 insertions(+), 23 deletions(-) diff --git a/dom/base/ScreenOrientation.cpp b/dom/base/ScreenOrientation.cpp index 868a1d5..fdea67a 100644 --- a/dom/base/ScreenOrientation.cpp +++ b/dom/base/ScreenOrientation.cpp @@ -15,6 +15,7 @@ #include "mozilla/Preferences.h" #include "mozilla/dom/Promise.h" +#include "nsContentUtils.h" using namespace mozilla; using namespace mozilla::dom; @@ -403,18 +404,23 @@ ScreenOrientation::UnlockDeviceOrientation() OrientationType ScreenOrientation::DeviceType() const { - return mType; + return ShouldResistFingerprinting() ? OrientationType::Landscape_primary + : mType; } uint16_t ScreenOrientation::DeviceAngle() const { - return mAngle; + return ShouldResistFingerprinting() ? 0 : mAngle; } OrientationType ScreenOrientation::GetType(ErrorResult& aRv) const { + if (ShouldResistFingerprinting()) { + return OrientationType::Landscape_primary; + } + nsIDocument* doc = GetResponsibleDocument(); if (!doc) { aRv.Throw(NS_ERROR_UNEXPECTED); @@ -427,6 +433,10 @@ ScreenOrientation::GetType(ErrorResult& aRv) const uint16_t ScreenOrientation::GetAngle(ErrorResult& aRv) const { + if (ShouldResistFingerprinting()) { + return 0; + } + nsIDocument* doc = GetResponsibleDocument(); if (!doc) { aRv.Throw(NS_ERROR_UNEXPECTED); @@ -489,6 +499,10 @@ ScreenOrientation::GetResponsibleDocument() const void ScreenOrientation::Notify(const hal::ScreenConfiguration& aConfiguration) { + if (ShouldResistFingerprinting()) { + return; + } + nsIDocument* doc = GetResponsibleDocument(); if (!doc) { return; @@ -564,6 +578,17 @@ ScreenOrientation::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) return ScreenOrientationBinding::Wrap(aCx, this, aGivenProto); } +bool +ScreenOrientation::ShouldResistFingerprinting() const +{ + bool resist = false; + nsCOMPtr<nsPIDOMWindow> owner = GetOwner(); + if (owner) { + resist = nsContentUtils::ShouldResistFingerprinting(owner->GetDocShell()); + } + return resist; +} + NS_IMPL_ISUPPORTS(ScreenOrientation::VisibleEventListener, nsIDOMEventListener) NS_IMETHODIMP diff --git a/dom/base/ScreenOrientation.h b/dom/base/ScreenOrientation.h index afb5e77..a6e51c7 100644 --- a/dom/base/ScreenOrientation.h +++ b/dom/base/ScreenOrientation.h @@ -102,6 +102,8 @@ private: void DispatchChangeEvent(); + bool ShouldResistFingerprinting() const; + LockPermission GetLockOrientationPermission(bool aCheckSandbox) const; // Gets the responsible document as defined in the spec. diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp index ed42538..6dc06b1 100644 --- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -12820,8 +12820,8 @@ void nsGlobalWindow::EnableOrientationChangeListener() { MOZ_ASSERT(IsInnerWindow()); - - if (!mOrientationChangeObserver) { + if (!nsContentUtils::ShouldResistFingerprinting(mDocShell) + && !mOrientationChangeObserver) { mOrientationChangeObserver = new WindowOrientationObserver(this); } @@ -13671,7 +13671,8 @@ nsGlobalWindow::IsModalContentWindow(JSContext* aCx, JSObject* aGlobal) int16_t nsGlobalWindow::Orientation() const { - return WindowOrientationObserver::OrientationAngle(); + return nsContentUtils::ShouldResistFingerprinting(mDocShell) ? + 0 : WindowOrientationObserver::OrientationAngle(); } #endif diff --git a/dom/base/nsScreen.cpp b/dom/base/nsScreen.cpp index ad1642b..49c12eb 100644 --- a/dom/base/nsScreen.cpp +++ b/dom/base/nsScreen.cpp @@ -166,25 +166,21 @@ nsScreen::Orientation() const void nsScreen::GetMozOrientation(nsString& aOrientation) const { - if (ShouldResistFingerprinting()) { + switch (mScreenOrientation->DeviceType()) { + case OrientationType::Portrait_primary: + aOrientation.AssignLiteral("portrait-primary"); + break; + case OrientationType::Portrait_secondary: + aOrientation.AssignLiteral("portrait-secondary"); + break; + case OrientationType::Landscape_primary: aOrientation.AssignLiteral("landscape-primary"); - } else { - switch (mScreenOrientation->DeviceType()) { - case OrientationType::Portrait_primary: - aOrientation.AssignLiteral("portrait-primary"); - break; - case OrientationType::Portrait_secondary: - aOrientation.AssignLiteral("portrait-secondary"); - break; - case OrientationType::Landscape_primary: - aOrientation.AssignLiteral("landscape-primary"); - break; - case OrientationType::Landscape_secondary: - aOrientation.AssignLiteral("landscape-secondary"); - break; - default: - MOZ_CRASH("Unacceptable screen orientation type."); - } + break; + case OrientationType::Landscape_secondary: + aOrientation.AssignLiteral("landscape-secondary"); + break; + default: + MOZ_CRASH("Unacceptable screen orientation type."); } } @@ -236,6 +232,9 @@ bool nsScreen::MozLockOrientation(const Sequence<nsString>& aOrientations, ErrorResult& aRv) { + if (ShouldResistFingerprinting()) { + return false; + } ScreenOrientationInternal orientation = eScreenOrientation_None; for (uint32_t i = 0; i < aOrientations.Length(); ++i) { @@ -283,6 +282,9 @@ nsScreen::MozLockOrientation(const Sequence<nsString>& aOrientations, void nsScreen::MozUnlockOrientation() { + if (ShouldResistFingerprinting()) { + return; + } UpdateDocShellOrientationLock(GetOwner(), eScreenOrientation_None); mScreenOrientation->UnlockDeviceOrientation(); }

1 0

[tor-browser/tor-browser-45.1.0esr-6.0-1] fixup! Regression tests for #5856: Do not expose physical screen info via window & window.screen.
by gk＠torproject.org 13 May '16

13 May '16

commit ec74b173f8a00e59aa42e0cf32e65ec2266cb477 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sun May 8 23:33:39 2016 -0700 fixup! Regression tests for #5856: Do not expose physical screen info via window & window.screen. --- tbb-tests/test_tor_bug5856.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tbb-tests/test_tor_bug5856.html b/tbb-tests/test_tor_bug5856.html index 2eae453..7a9ab6f 100644 --- a/tbb-tests/test_tor_bug5856.html +++ b/tbb-tests/test_tor_bug5856.html @@ -27,7 +27,10 @@ https://trac.torproject.org/projects/tor/ticket/5856 ["window.screen.availLeft", 0], ["window.screen.availTop", 0], ["window.screen.width", "window.innerWidth"], - ["window.screen.height", "window.innerHeight"] + ["window.screen.height", "window.innerHeight"], + ["window.screen.orientation.type", "'landscape-primary'"], + ["window.screen.orientation.angle", 0], + ["window.screen.mozOrientation", "'landscape-primary'"], ]; pairs.map(checkPair);

1 0

[tor-browser-bundle/hardened-builds] Bug 17406: Include SelfRando support in our nightlies
by gk＠torproject.org 13 May '16

13 May '16

commit 138470ca7ce810f62761af8c3989654ec4a611fa Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 12 20:25:02 2016 +0000 Bug 17406: Include SelfRando support in our nightlies SelfRando is a new defense against code reuse attacks developed by the Radactor and Readactor++ people. We should give it a wider testing audience by including it in the nightly. --- RelativeLink/start-tor-browser | 3 + gitian/descriptors/linux/gitian-firefox.yml | 7 + gitian/descriptors/linux/gitian-utils.yml | 38 +++- gitian/fetch-inputs.sh | 4 +- gitian/gpg/ELFUTILS.gpg | Bin 0 -> 10483 bytes gitian/mkbundle-linux.sh | 9 +- gitian/patches/libfaketime-asan.patch | 268 ++++++++++++++++++++++++++-- gitian/verify-tags.sh | 3 +- gitian/versions.nightly | 4 + 9 files changed, 313 insertions(+), 23 deletions(-) diff --git a/RelativeLink/start-tor-browser b/RelativeLink/start-tor-browser index 2e7805d..19c5cfc 100755 --- a/RelativeLink/start-tor-browser +++ b/RelativeLink/start-tor-browser @@ -270,6 +270,9 @@ fi LD_LIBRARY_PATH="${HOME}/TorBrowser/Tor/" export LD_LIBRARY_PATH +export SELFRANDO_write_layout_file= +export NSS_DISABLE_HW_AES=1 + # We need to disable LSan which is enabled by default now. Otherwise we'll get # a crash during shutdown: https://bugs.torproject.org/10599#comment:59 ASAN_OPTIONS="detect_leaks=0" diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index e24a740..22686b7 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -29,12 +29,15 @@ remotes: "dir": "tor-browser" - "url": "https://github.com/wolfcw/libfaketime" "dir": "faketime" +- "url": "https://github.com/immunant/selfrando.git" + "dir": "selfrando" files: - "binutils-linux64-utils.zip" - "gcc-linux64-utils.zip" - "re-dzip.sh" - "dzip.sh" - "versions" +- "self-rando-utils.zip" script: | source versions INSTDIR="$HOME/install" @@ -49,6 +52,7 @@ script: | export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 # + unzip -d $INSTDIR self-rando-utils.zip # Preparing Binutils and GCC for Tor Browser unzip -d $INSTDIR binutils-linux$GBUILD_BITS-utils.zip # Make sure gold is used with the hardening wrapper for full RELRO, see @@ -96,6 +100,9 @@ script: | # that feature it would hang sometimes for unknown but to libfaketime related # reasons. export LD_PRELOAD="" + # Self-Rando wrapper + export PATH="$HOME/build/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH" + export SELFRANDO_skip_shuffle= make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" # We need libfaketime for all the timestamps e.g. written into the libraries. # BUT we need to exclude |make build| from it. Otherwise the build fails close diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 72ead1b..15b26f4 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -24,10 +24,14 @@ packages: - "libssl-dev" # Needed for binutils (64bit) as we are building with PIE enabled. - "libstdc++6-4.7-pic" +# Needed for Selfrando +- "scons" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/libevent/libevent.git" "dir": "libevent" +- "url": "https://github.com/immunant/selfrando.git" + "dir": "selfrando" files: - "binutils.tar.bz2" - "gcc.tar.bz2" @@ -36,6 +40,7 @@ files: - "versions" - "dzip.sh" - "libfaketime-asan.patch" +- "elfutils.tar.bz2" script: | INSTDIR="$HOME/install" source versions @@ -56,11 +61,8 @@ script: | # The libstdc++ shipped by default is non-PIC which breaks the binutils build # if we build with DEB_BUILD_HARDENING_PIE=1. We need to install a PIC one AND # make sure it gets used before the non-PIC one would. - if [ $GBUILD_BITS == "64" ]; - then - ln -s /usr/lib/gcc/x86_64-linux-gnu/4.7/libstdc++_pic.a libstdc++.a - export LDFLAGS="-L/home/debian -lstdc++" - fi + ln -s /usr/lib/gcc/x86_64-linux-gnu/4.7/libstdc++_pic.a libstdc++.a + export LDFLAGS="-L/home/debian -lstdc++" cd binutils* # We want to use gold as the linker in our toolchain mainly as it is way # faster when linking Tor Browser code (especially libxul). But apart from @@ -90,6 +92,31 @@ script: | cd .. export DEB_BUILD_HARDENING_FORMAT=1 + OPATH="$PATH" + OLD_LIBRARY_PATH="$LD_LIBRARY_PATH" + export PATH="$INSTDIR/binutils/bin:$INSTDIR/gcc/bin:$PATH" + export LD_LIBRARY_PATH="$INSTDIR/gcc/lib64/:$LD_LIBRARY_PATH" + + # Building Elfutils + tar xjf elfutils.tar.bz2 + cd elfutils*/ + ./configure --prefix=$INSTDIR/elfutils + make $MAKEOPTS + make install + cd .. + + # Building Selfrando + cd selfrando + scons -Q arch=x86_64 ADDN_CCFLAGS="-include $(ls $HOME/build/elfutils-*/libelf/elf.h) -I $INSTDIR/elfutils/include -fno-reorder-functions" ADDN_LINKFLAGS="-L $INSTDIR/elfutils/lib" + mkdir -p $INSTDIR/self-rando + cp sconsRelease/x86_64/bin/* $INSTDIR/self-rando/ + cd .. + + PATH="$OPATH" + unset OPATH + LD_LIBRARY_PATH="$OLD_LIBRARY_PATH" + unset OLD_LIBRARY_PATH + # Building Libevent cd libevent ./autogen.sh @@ -134,4 +161,5 @@ script: | ~/build/dzip.sh openssl-$OPENSSL_VER-linux$GBUILD_BITS-utils.zip openssl ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-linux$GBUILD_BITS-utils.zip libevent ~/build/dzip.sh gmp-$GMP_VER-linux$GBUILD_BITS-utils.zip gmp + ~/build/dzip.sh self-rando-utils.zip self-rando cp *utils.zip $OUTDIR/ diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 027a47e..4f63374 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -112,7 +112,7 @@ update_git() { ############################################################################## # Get+verify sigs that exist -for i in OPENSSL BINUTILS GCC PYCRYPTO PYTHON_MSI GMP +for i in OPENSSL BINUTILS GCC PYCRYPTO PYTHON_MSI GMP ELFUTILS do PACKAGE="${i}_PACKAGE" URL="${i}_URL" @@ -236,6 +236,7 @@ ln -sf "$SETUPTOOLS_PACKAGE" setuptools.tar.gz ln -sf "$GMP_PACKAGE" gmp.tar.bz2 ln -sf "$PARSLEY_PACKAGE" parsley.tar.gz ln -sf "$GO_PACKAGE" go.tar.gz +ln -sf "$ELFUTILS_PACKAGE" elfutils.tar.bz2 # Fetch latest gitian-builder itself # XXX - this is broken if a non-standard inputs dir is selected using the command line flag. @@ -273,6 +274,7 @@ goxcrypto https://go.googlesource.com/crypto $GO_X_CRYPTO_TAG goxnet https://go.googlesource.com/net $GO_X_NET_TAG obfs4 https://git.torproject.org/pluggable-transports/obfs4.git $OBFS4_TAG noto-fonts https://github.com/googlei18n/noto-fonts $NOTOFONTS_TAG +selfrando https://github.com/immunant/selfrando.git $SELFRANDO_TAG EOF # HTTPS-Everywhere is special, too. We need to initialize the git submodules and diff --git a/gitian/gpg/ELFUTILS.gpg b/gitian/gpg/ELFUTILS.gpg new file mode 100644 index 0000000..f1cd4b3 Binary files /dev/null and b/gitian/gpg/ELFUTILS.gpg differ diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index a1674dd..48aac24 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -35,7 +35,7 @@ fi if [ -z "$VM_MEMORY" ]; then - export VM_MEMORY=4000 + export VM_MEMORY=6000 fi ./make-vms.sh @@ -104,13 +104,14 @@ if [ ! -f inputs/binutils-$BINUTILS_VER-linux64-utils.zip -o \ ! -f inputs/gcc-$GCC_VER-linux64-utils.zip -o \ ! -f inputs/openssl-$OPENSSL_VER-linux64-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-linux64-utils.zip -o \ - ! -f inputs/gmp-$GMP_VER-linux64-utils.zip ]; + ! -f inputs/gmp-$GMP_VER-linux64-utils.zip -o \ + ! -f inputs/self-rando-utils.zip ]; then echo echo "****** Starting Utilities Component of Linux Bundle (1/5 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libevent=$LIBEVENT_TAG $DESCRIPTOR_DIR/linux/gitian-utils.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libevent=$LIBEVENT_TAG,selfrando=$SELFRANDO_TAG $DESCRIPTOR_DIR/linux/gitian-utils.yml if [ $? -ne 0 ]; then #mv var/build.log ./utils-fail-linux.log.`date +%Y%m%d%H%M%S` @@ -169,7 +170,7 @@ then echo "****** Starting TorBrowser Component of Linux Bundle (3/5 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor-browser=$TORBROWSER_TAG,faketime=$FAKETIME_TAG $DESCRIPTOR_DIR/linux/gitian-firefox.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor-browser=$TORBROWSER_TAG,faketime=$FAKETIME_TAG,selfrando=$SELFRANDO_TAG $DESCRIPTOR_DIR/linux/gitian-firefox.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-linux.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/patches/libfaketime-asan.patch b/gitian/patches/libfaketime-asan.patch index 5346eae..ff3e62b 100644 --- a/gitian/patches/libfaketime-asan.patch +++ b/gitian/patches/libfaketime-asan.patch @@ -1,12 +1,3 @@ -From 0ef83e9a0631e25e62e1dbc483108742fc125304 Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Mon, 14 Sep 2015 14:27:36 +0000 -Subject: [PATCH] No dying anymore - ---- - libsanitizer/asan/asan_linux.cc | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - diff --git a/libsanitizer/asan/asan_linux.cc b/libsanitizer/asan/asan_linux.cc index c504168..1d1a6dd 100644 --- a/libsanitizer/asan/asan_linux.cc @@ -23,6 +14,259 @@ index c504168..1d1a6dd 100644 } } --- -1.7.10.4 - +diff --git a/libsanitizer/sanitizer_common/SelfRandoAddressTranslator.h b/libsanitizer/sanitizer_common/SelfRandoAddressTranslator.h +new file mode 100644 +index 0000000..5f13870 +--- /dev/null ++++ b/libsanitizer/sanitizer_common/SelfRandoAddressTranslator.h +@@ -0,0 +1,155 @@ ++// ++// Created by tf on 10/12/2015. ++// ++ ++#pragma once ++#include "sanitizer_internal_defs.h" ++#include "sanitizer_libc.h" ++#include "sanitizer_common.h" ++ ++#define PROT_READ 0x1 /* Page can be read. */ ++#define PROT_WRITE 0x2 /* Page can be written. */ ++#define PROT_EXEC 0x4 /* Page can be executed. */ ++#define PROT_NONE 0x0 /* Page can not be accessed. */ ++#define MAP_SHARED 0x01 /* Share changes. */ ++ ++namespace __sanitizer { ++ class SelfRandoAddressTranslator { ++ struct __attribute__((__packed__)) FunctionRecord { ++ void *undiv_addr; ++ void *div_addr; ++ u32 size; ++ }; ++ ++ struct __attribute__((__packed__)) LibraryRecord { ++ u32 version; ++ u32 seed; ++ void *file_base; ++ void *mem_base; ++ void *size; ++ ++ private: ++ char _name; ++ ++ public: ++ inline char *name() { return &_name; } ++ ++ inline FunctionRecord *function_records() { ++ return (FunctionRecord *) (&_name + internal_strlen(&_name) + 1); ++ } ++ ++ u8 *record_end() { ++ FunctionRecord *fr = function_records(); ++ while (fr->undiv_addr) { ++ fr++; ++ } ++ return (u8 *) fr + sizeof(void *); ++ } ++ }; ++ ++ // 16K loaded modules should be enough for everyone. ++ LibraryRecord* library_records_idx[1<<14]; ++ int library_records_idx_size; ++ u8 *library_records_end; ++ void add_library_record(LibraryRecord* lr); ++ ++ void read_layout_file(); ++ u8 *record_end(int i); ++ ++ public: ++ SelfRandoAddressTranslator(); ++ ++ uptr convertAddress(uptr original_address); ++ }; ++ ++ ++ ++ ++ SelfRandoAddressTranslator::SelfRandoAddressTranslator() { ++ Printf("SRAT init\n"); ++ read_layout_file(); ++ } ++ ++ void SelfRandoAddressTranslator::add_library_record(LibraryRecord* lr) { ++ library_records_idx_size++; ++ CHECK(library_records_idx_size <= 1<<14); ++ library_records_idx[library_records_idx_size - 1] = lr; ++ } ++ ++ u8* SelfRandoAddressTranslator::record_end(int i) { ++ if (i < library_records_idx_size - 1) { ++ return (u8 *) library_records_idx[i + 1] - sizeof(void *); ++ } else { ++ return library_records_end - sizeof(void*); ++ } ++ } ++ ++ void SelfRandoAddressTranslator::read_layout_file() { ++ uptr pid = internal_getpid(); ++ char filename[32]; ++ internal_snprintf(filename, 32, "/tmp/%d.mlf", pid); ++ ++ u8 buf[200]; // Current size of struct stat: 144 ++ if(0 != internal_stat(filename, &buf)) { ++ Printf("SRAT warning: cannot find Memory Layout File. Stack trace will be probably wrong.\n"); ++ return; ++ } ++ ++ uptr fd = OpenFile(filename, /*write*/ false); ++ uptr size = *(uptr*) (buf+48); ++ CHECK_NE(fd, -1); ++ u8 *f = (u8 *) internal_mmap(0, size, PROT_READ, MAP_SHARED, (int) fd, 0); ++ CHECK_NE(f, 0); ++ library_records_end = f + size; ++ ++ u8 *p = f; ++ while (p < library_records_end) { ++ LibraryRecord *lr = (LibraryRecord *) p; ++ add_library_record(lr); ++ CHECK_EQ(lr->version, 0x00000101); ++ p = lr->record_end(); ++ } ++ ++ } ++ ++ uptr SelfRandoAddressTranslator::convertAddress(uptr p) { ++// Printf("conv %p", p); ++ for (int i = 0; i < library_records_idx_size; ++i) { ++ LibraryRecord *lr = library_records_idx[i]; ++ ++ if (p > (uptr) lr->mem_base && p < (uptr) lr->mem_base + (uptr) lr->size) { ++ // found the correct library ++ ++ FunctionRecord *function_records = lr->function_records(); ++ ++ int a = 0; ++ int b = (int) ((FunctionRecord *) record_end(i) - function_records); ++// Printf(" (lib=>%s< a=%d b=%d)", lr->name(), a, b); ++ CHECK_EQ((u8 *) (function_records + b), record_end(i)); ++ ++ while (b - a > 1) { // bisection ++ int c = a + (b - a) / 2; ++ FunctionRecord *fr = &function_records[c]; ++ ++ if ((uptr) fr->div_addr > p) { // too high ++ b = c; ++ } else if ((uptr) fr->div_addr + (uptr) fr->size < p) { // too low ++ a = c; ++ } else { // found ++ b = c + 1; ++ a = c; ++ } ++ } ++ FunctionRecord *fr = &function_records[a]; ++ CHECK((uptr) fr->div_addr < p && p < (uptr) fr->div_addr + (uptr) fr->size); ++ ++ p = (p - (uptr) fr->div_addr + (uptr) fr->undiv_addr); ++ ++ break; ++ } ++ } ++ ++// Printf(" => %p\n", p); ++ return p; ++ } ++} +\ No newline at end of file +diff --git a/libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc +index 5cc21d3..393a494 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc +@@ -21,6 +21,7 @@ + #include "sanitizer_procmaps.h" + #include "sanitizer_symbolizer.h" + #include "sanitizer_symbolizer_libbacktrace.h" ++#include "SelfRandoAddressTranslator.h" + + #include <errno.h> + #include <stdlib.h> +@@ -512,7 +513,7 @@ class POSIXSymbolizer : public Symbolizer { + internal_symbolizer_(internal_symbolizer), + libbacktrace_symbolizer_(libbacktrace_symbolizer) {} + +- uptr SymbolizePC(uptr addr, AddressInfo *frames, uptr max_frames) { ++ virtual uptr SymbolizePC(uptr addr, AddressInfo *frames, uptr max_frames) { + BlockingMutexLock l(&mu_); + if (max_frames == 0) + return 0; +@@ -580,7 +581,7 @@ class POSIXSymbolizer : public Symbolizer { + return frame_id; + } + +- bool SymbolizeData(uptr addr, DataInfo *info) { ++ virtual bool SymbolizeData(uptr addr, DataInfo *info) { + BlockingMutexLock l(&mu_); + LoadedModule *module = FindModuleForAddress(addr); + if (module == 0) +@@ -606,7 +607,7 @@ class POSIXSymbolizer : public Symbolizer { + return true; + } + +- bool GetModuleNameAndOffsetForPC(uptr pc, const char **module_name, ++ virtual bool GetModuleNameAndOffsetForPC(uptr pc, const char **module_name, + uptr *module_address) { + BlockingMutexLock l(&mu_); + return FindModuleNameAndOffsetForAddress(pc, module_name, module_address); +@@ -720,9 +721,40 @@ class POSIXSymbolizer : public Symbolizer { + LibbacktraceSymbolizer *libbacktrace_symbolizer_; // Leaked. + }; + ++ ++ class SelfRandoPOSIXSymbolizer : public POSIXSymbolizer { ++ SelfRandoAddressTranslator translator; ++ ++ public: ++ SelfRandoPOSIXSymbolizer(ExternalSymbolizerInterface *external_symbolizer, ++ InternalSymbolizer *internal_symbolizer, ++ LibbacktraceSymbolizer *libbacktrace_symbolizer) ++ : POSIXSymbolizer(external_symbolizer, internal_symbolizer, libbacktrace_symbolizer), ++ translator() { } ++ ++ ++ private: ++ virtual uptr SymbolizePC(uptr addr, AddressInfo *frames, uptr max_frames) override { ++ uptr conv_addr = translator.convertAddress(addr); ++ uptr res = POSIXSymbolizer::SymbolizePC(conv_addr, frames, max_frames); ++ if (res == 1) frames->address = addr; ++ return res; ++ } ++ ++ virtual bool SymbolizeData(uptr addr, DataInfo *info) override { ++ addr = translator.convertAddress(addr); ++ return POSIXSymbolizer::SymbolizeData(addr, info); ++ } ++ ++ virtual bool GetModuleNameAndOffsetForPC(uptr pc, const char **module_name, uptr *module_address) override { ++ pc = translator.convertAddress(pc); ++ return POSIXSymbolizer::GetModuleNameAndOffsetForPC(pc, module_name, module_address); ++ }; ++ }; ++ + Symbolizer *Symbolizer::PlatformInit() { + if (!common_flags()->symbolize) { +- return new(symbolizer_allocator_) POSIXSymbolizer(0, 0, 0); ++ return new(symbolizer_allocator_) SelfRandoPOSIXSymbolizer(0, 0, 0); + } + InternalSymbolizer* internal_symbolizer = + InternalSymbolizer::get(&symbolizer_allocator_); +@@ -754,10 +786,11 @@ Symbolizer *Symbolizer::PlatformInit() { + } + } + +- return new(symbolizer_allocator_) POSIXSymbolizer( ++ return new(symbolizer_allocator_) SelfRandoPOSIXSymbolizer( + external_symbolizer, internal_symbolizer, libbacktrace_symbolizer); + } + ++ + } // namespace __sanitizer + + #endif // SANITIZER_POSIX diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 46cb01a..5268f85 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -118,10 +118,11 @@ siphash $GOSIPHASH_TAG goxcrypto $GO_X_CRYPTO_TAG goxnet $GO_X_NET_TAG noto-fonts $NOTOFONTS_TAG +selfrando $SELFRANDO_TAG EOF # Verify signatures on signed packages -for i in OPENSSL BINUTILS GCC PYCRYPTO PYTHON_MSI GMP +for i in OPENSSL BINUTILS GCC PYCRYPTO PYTHON_MSI GMP ELFUTILS do PACKAGE="${i}_PACKAGE" URL="${i}_URL" diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 088625b..9ff7e8f 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -48,6 +48,7 @@ GO_X_CRYPTO_TAG=master GO_X_NET_TAG=master OBFS4_TAG=master NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 +SELFRANDO_TAG=8e49e7aa664625d8e4793579864231b151589d0f GITIAN_TAG=tor-browser-builder-4 @@ -69,6 +70,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 GO_VER=1.4.2 NSIS_VER=2.51 +ELFUTILS_VER=0.160 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -99,6 +101,7 @@ NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf NOTOKRFONT_PACKAGE=NotoSansKR-Regular.otf NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf +ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=e7e81d82f3cd538ab0cdba494006d44aab9dd96b7f6233ce9971fb7c7916d511 @@ -157,3 +160,4 @@ NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} NOTOKRFONT_URL=${NOTOCJKBASE_URL}/${NOTOKRFONT_PACKAGE} NOTOSCFONT_URL=${NOTOCJKBASE_URL}/${NOTOSCFONT_PACKAGE} NOTOTCFONT_URL=${NOTOCJKBASE_URL}/${NOTOTCFONT_PACKAGE} +ELFUTILS_URL=https://fedorahosted.org/releases/e/l/elfutils/${ELFUTILS_VER}/${ELFUTILS_PACKAGE}

1 0

[tor-browser/tor-browser-45.1.0esr-6.0-1] Bug 18995: Regression test to ensure CacheStorage is disabled in private browsing
by gk＠torproject.org 12 May '16

12 May '16

commit cea5f1efcd9590885127a0763432143aca01524c Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue May 10 16:51:08 2016 -0700 Bug 18995: Regression test to ensure CacheStorage is disabled in private browsing --- tbb-tests/browser.ini | 5 ++++ tbb-tests/browser_tor_bug18995.js | 50 +++++++++++++++++++++++++++++++++++++++ tbb-tests/bug18995.html | 31 ++++++++++++++++++++++++ tbb-tests/worker_bug_18995.html | 26 ++++++++++++++++++++ tbb-tests/worker_bug_18995.js | 8 +++++++ 5 files changed, 120 insertions(+) diff --git a/tbb-tests/browser.ini b/tbb-tests/browser.ini index f481660..9b6c47b 100644 --- a/tbb-tests/browser.ini +++ b/tbb-tests/browser.ini @@ -1,5 +1,10 @@ [DEFAULT] +support-files = + bug18995.html + worker_bug_18995.js + worker_bug_18995.html +[browser_tor_bug18995.js] [browser_tor_bug2950.js] [browser_tor_omnibox.js] [browser_tor_TB4.js] diff --git a/tbb-tests/browser_tor_bug18995.js b/tbb-tests/browser_tor_bug18995.js new file mode 100644 index 0000000..1f1801b --- /dev/null +++ b/tbb-tests/browser_tor_bug18995.js @@ -0,0 +1,50 @@ +// __browser_tor_bug18995.js__. +// In this test, we open a private browsing window, and load pages +// that test whether we can call `caches.open("test")` + +// Helper function. +// Returns a promise that is fulfilled when the first event of eventype +// arrives from the target. +let listen = function (target, eventType, useCapture) { + return new Promise(function (resolve, reject) { + let listenFunction = function (event) { + target.removeEventListener(eventType, listenFunction, useCapture); + resolve(event); + }; + target.addEventListener(eventType, listenFunction, useCapture); + }); +}; + +// The main test +add_task(function* () { + // First open the private browsing window + let privateWin = yield BrowserTestUtils.openNewBrowserWindow({private: true}); + let privateBrowser = privateWin.gBrowser.selectedBrowser; + + // We have two pages: (1) access CacheStorage in content page + // (2) access CacheStorage in worker + let testURIs = ["http://mochi.test:8888/browser/tbb-tests/bug18995.html", + "http://mochi.test:8888/browser/tbb-tests/worker_bug_18995.html"]; + for (let testURI of testURIs) { + // Load the test page + privateBrowser.loadURI(testURI); + // Wait for it too fully load + yield BrowserTestUtils.browserLoaded(privateBrowser); + // Get the <div id="result"/> in the content page + let resultDiv = privateBrowser.contentDocument.getElementById("result"); + // Send an event to the content page indicating we are ready to receive. + resultDiv.dispatchEvent(new Event("ready")); + // Wait for a signal from the content page that a result is ready. + yield listen(resultDiv, "result", false); + // Read the result from the result <div> + let resultValue = resultDiv.innerHTML; + // Print out the result + info("received: " + resultValue); + // If we are in PBM, then the promise returned by caches.open(...) + // is supposed to arrive at a rejection with a SecurityError. + ok(resultValue.contains("SecurityError"), + "CacheStorage should fail in private browsing mode"); + } + // Close the browser window because we are done testing. + yield BrowserTestUtils.closeWindow(privateWin); +}); diff --git a/tbb-tests/bug18995.html b/tbb-tests/bug18995.html new file mode 100644 index 0000000..445a26ab --- /dev/null +++ b/tbb-tests/bug18995.html @@ -0,0 +1,31 @@ +<!DOCTYPE html> +<html> + <head> + <meta charset="utf-8" /> + <title>Bug 18995 test</title> + </head> + <body> + <div id="result"></div> + <script type="application/javascript"> + let resultDiv = document.getElementById("result"); + // Wait for a signal from chrome to start. + resultDiv.addEventListener("ready", function () { + let resultEvent = new Event("result"); + // Test caches.open(...) + caches.open("test1").then(function (value) { + // We are not supposed to succeed, but if we do, + // post the result to resultDiv. + resultDiv.innerHTML = value.toString(); + // Notify chrome that the result is available. + resultDiv.dispatchEvent(resultEvent); + }, function (reason) { + // We should arrive here to fail. Post the result + // to resultDiv. + resultDiv.innerHTML = reason.toString(); + // Notify chrome that the result is available. + resultDiv.dispatchEvent(resultEvent); + }); + }); + </script> + </body> +</html> diff --git a/tbb-tests/worker_bug_18995.html b/tbb-tests/worker_bug_18995.html new file mode 100644 index 0000000..d9be95c --- /dev/null +++ b/tbb-tests/worker_bug_18995.html @@ -0,0 +1,26 @@ +<!DOCTYPE html> +<html> + <head> + <meta charset="utf-8" /> + <title>Bug 18995 test</title> + </head> + <body> + <div id="result"></div> + <script type="application/javascript"> + let resultDiv = document.getElementById("result"); + // Wait for a signal from chrome to start. + resultDiv.addEventListener("ready", function() { + // Run the test worker. + let worker = new Worker("worker_bug_18995.js"); + // Wait for a message from the worker, which should contain + // the result or the error from the caches.open(...) call. + worker.addEventListener("message", function (msg) { + // Put the result in our resultDiv. + resultDiv.innerHTML = msg.data; + // Notify chrome that the result is ready. + resultDiv.dispatchEvent(new Event("result")); + }); + }); + </script> + </body> +</html> diff --git a/tbb-tests/worker_bug_18995.js b/tbb-tests/worker_bug_18995.js new file mode 100644 index 0000000..11641e1 --- /dev/null +++ b/tbb-tests/worker_bug_18995.js @@ -0,0 +1,8 @@ +// Attempt to open a cache +caches.open("test2").then(function (value) { + // This is not supposed to happen. + self.postMessage(value.toString()); +}, function (reason) { + // We are supposed to fail. + self.postMessage(reason.toString()); +});

1 0

[tor-browser-bundle/hardened-builds] Bug 18915: Use our search plugins in localized builds
by gk＠torproject.org 11 May '16

11 May '16

commit 467796a7b7901fc22f26716860ed6ed8d4102416 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 11 19:37:29 2016 +0000 Bug 18915: Use our search plugins in localized builds We are preparing the language packs we ship for using our search engines in the order we want. This is necessary due to https://bugzilla.mozilla.org/show_bug.cgi?id=1162569. --- gitian/descriptors/linux/gitian-bundle.yml | 19 +++++++++++++ gitian/descriptors/mac/gitian-bundle.yml | 19 +++++++++++++ gitian/descriptors/windows/gitian-bundle.yml | 40 +++++++++++++++++++++------- 3 files changed, 68 insertions(+), 10 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index b9bf0f9..eca8d0f 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -184,6 +184,10 @@ script: | cp -a ${TB_STAGE_DIR} ${PKG_DIR} # pushd ${PKG_DIR}/Browser/browser/ + # For the proper search engines in our language packs + unzip omni.ja chrome/en-US/locale/browser/searchplugins* + mv chrome/en-US/locale/browser/searchplugins ~/build + rm -rf chrome unzip omni.ja defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js ~/build/ # Set the locale of the bundle. @@ -194,6 +198,21 @@ script: | # unzip linux-langpacks.zip LINUX_LOCALES="$BUNDLE_LOCALES $BUNDLE_LOCALES_LINUX" + # Prepare our language packs for using the proper search engines. See bug + # 18915 for more details. + for LANG in $LINUX_LOCALES + do + xpi=linux-langpacks/$LANG.xpi + unzip -d prep_$LANG $xpi + search_plugins_path=prep_$LANG/browser/chrome/$LANG/locale/browser + rm -rf $search_plugins_path/searchplugins + cp -rf ~/build/searchplugins $search_plugins_path + rm $xpi + cd prep_$LANG + zip -r9 ../$xpi * + cd .. + rm -rf prep_$LANG + done # If we are building a multi-lingual package, add all of the language packs. if [ "z$MULTI_LINGUAL" = "z1" ]; then pushd linux-langpacks diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 0199cca..e046b57 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -184,6 +184,10 @@ script: | cd .. # pushd $TORBROWSER_NAME.app/Contents/Resources/browser/ + # For the proper search engines in our language packs + unzip omni.ja chrome/en-US/locale/browser/searchplugins* + mv chrome/en-US/locale/browser/searchplugins ~/build + rm -rf chrome unzip omni.ja defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js ~/build/ # Set the locale of the bundle. @@ -203,6 +207,21 @@ script: | unzip mac-langpacks.zip MAC_LOCALES="$BUNDLE_LOCALES $BUNDLE_LOCALES_MAC" + # Prepare our language packs for using the proper search engines. See bug + # 18915 for more details. + for LANG in $MAC_LOCALES + do + xpi=mac-langpacks/$LANG.xpi + unzip -d prep_$LANG $xpi + search_plugins_path=prep_$LANG/browser/chrome/$LANG/locale/browser + rm -rf $search_plugins_path/searchplugins + cp -rf ~/build/searchplugins $search_plugins_path + rm $xpi + cd prep_$LANG + zip -r9 ../$xpi * + cd .. + rm -rf prep_$LANG + done PKG_LOCALE="en-US" # If we are building a multi-lingual package, add all of the language packs # and use "ALL" in the package name and as the locale for update purposes. diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 51565bf..5473bf3 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -152,8 +152,38 @@ script: | cp ../versions "Tor Browser"/Browser/TorBrowser/Docs/sources/ cp ../bundle.inputs "Tor Browser"/Browser/TorBrowser/Docs/sources/ + # + pushd "Tor Browser"/Browser/browser/ + # For the proper search engines in our language packs + unzip omni.ja chrome/en-US/locale/browser/searchplugins* + mv chrome/en-US/locale/browser/searchplugins ~/build + rm -rf chrome + unzip omni.ja defaults/preferences/000-tor-browser.js + cp defaults/preferences/000-tor-browser.js ~/build/ + # Set the locale bundle. + echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js + zip -Xm omni.ja defaults/preferences/000-tor-browser.js + rm -rf defaults + popd + # + unzip ../win32-langpacks.zip WIN32_LOCALES="$BUNDLE_LOCALES $BUNDLE_LOCALES_WIN32" + # Prepare our language packs for using the proper search engines. See bug + # 18915 for more details. + for LANG in $WIN32_LOCALES + do + xpi=win32-langpacks/$LANG.xpi + unzip -d prep_$LANG $xpi + search_plugins_path=prep_$LANG/browser/chrome/$LANG/locale/browser + rm -rf $search_plugins_path/searchplugins + cp -rf ~/build/searchplugins $search_plugins_path + rm $xpi + cd prep_$LANG + zip -r9 ../$xpi * + cd .. + rm -rf prep_$LANG + done PKG_LOCALE="en-US" # If we are building a multi-lingual package, add all of the language packs # and use "ALL" in the package name and as the locale for update purposes. @@ -175,16 +205,6 @@ script: | popd fi - # - pushd "Tor Browser"/Browser/browser/ - unzip omni.ja defaults/preferences/000-tor-browser.js - cp defaults/preferences/000-tor-browser.js ~/build/ - # Set the locale bundle. - echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js - zip -Xm omni.ja defaults/preferences/000-tor-browser.js - rm -rf defaults - popd - # # Recreate precomplete file (needs to be accurate for full MAR updates). pushd "Tor Browser"/Browser/ rm -f precomplete

1 0

[tor-browser-bundle/master] Bug 18915: Use our search plugins in localized builds
by gk＠torproject.org 11 May '16

11 May '16

commit 94c6a1c73291f8f456249d9719de57ff002fe6fe Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 11 19:37:29 2016 +0000 Bug 18915: Use our search plugins in localized builds We are preparing the language packs we ship for using our search engines in the order we want. This is necessary due to https://bugzilla.mozilla.org/show_bug.cgi?id=1162569. --- gitian/descriptors/linux/gitian-bundle.yml | 19 +++++++++++++ gitian/descriptors/mac/gitian-bundle.yml | 19 +++++++++++++ gitian/descriptors/windows/gitian-bundle.yml | 40 +++++++++++++++++++++------- 3 files changed, 68 insertions(+), 10 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index d5aaec4..39ad811 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -194,6 +194,10 @@ script: | cp -a ${TB_STAGE_DIR} ${PKG_DIR} # pushd ${PKG_DIR}/Browser/browser/ + # For the proper search engines in our language packs + unzip omni.ja chrome/en-US/locale/browser/searchplugins* + mv chrome/en-US/locale/browser/searchplugins ~/build + rm -rf chrome unzip omni.ja defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js ~/build/ # Set the locale of the bundle. @@ -204,6 +208,21 @@ script: | # unzip linux-langpacks.zip LINUX_LOCALES="$BUNDLE_LOCALES $BUNDLE_LOCALES_LINUX" + # Prepare our language packs for using the proper search engines. See bug + # 18915 for more details. + for LANG in $LINUX_LOCALES + do + xpi=linux-langpacks/$LANG.xpi + unzip -d prep_$LANG $xpi + search_plugins_path=prep_$LANG/browser/chrome/$LANG/locale/browser + rm -rf $search_plugins_path/searchplugins + cp -rf ~/build/searchplugins $search_plugins_path + rm $xpi + cd prep_$LANG + zip -r9 ../$xpi * + cd .. + rm -rf prep_$LANG + done # If we are building a multi-lingual package, add all of the language packs. if [ "z$MULTI_LINGUAL" = "z1" ]; then pushd linux-langpacks diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 00cd4d1..ff17520 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -213,6 +213,10 @@ script: | cd .. # pushd $TORBROWSER_NAME.app/Contents/Resources/browser/ + # For the proper search engines in our language packs + unzip omni.ja chrome/en-US/locale/browser/searchplugins* + mv chrome/en-US/locale/browser/searchplugins ~/build + rm -rf chrome unzip omni.ja defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js ~/build/ if [ "z$DATA_OUTSIDE_APP_DIR" = "z1" ]; then @@ -245,6 +249,21 @@ script: | unzip mac-langpacks.zip MAC_LOCALES="$BUNDLE_LOCALES $BUNDLE_LOCALES_MAC" + # Prepare our language packs for using the proper search engines. See bug + # 18915 for more details. + for LANG in $MAC_LOCALES + do + xpi=mac-langpacks/$LANG.xpi + unzip -d prep_$LANG $xpi + search_plugins_path=prep_$LANG/browser/chrome/$LANG/locale/browser + rm -rf $search_plugins_path/searchplugins + cp -rf ~/build/searchplugins $search_plugins_path + rm $xpi + cd prep_$LANG + zip -r9 ../$xpi * + cd .. + rm -rf prep_$LANG + done PKG_LOCALE="en-US" # If we are building a multi-lingual package, add all of the language packs # and use "ALL" in the package name and as the locale for update purposes. diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 4fe4bb6..da65142 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -161,8 +161,38 @@ script: | cp ../versions "Tor Browser"/Browser/TorBrowser/Docs/sources/ cp ../bundle.inputs "Tor Browser"/Browser/TorBrowser/Docs/sources/ + # + pushd "Tor Browser"/Browser/browser/ + # For the proper search engines in our language packs + unzip omni.ja chrome/en-US/locale/browser/searchplugins* + mv chrome/en-US/locale/browser/searchplugins ~/build + rm -rf chrome + unzip omni.ja defaults/preferences/000-tor-browser.js + cp defaults/preferences/000-tor-browser.js ~/build/ + # Set the locale bundle. + echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js + zip -Xm omni.ja defaults/preferences/000-tor-browser.js + rm -rf defaults + popd + # + unzip ../win32-langpacks.zip WIN32_LOCALES="$BUNDLE_LOCALES $BUNDLE_LOCALES_WIN32" + # Prepare our language packs for using the proper search engines. See bug + # 18915 for more details. + for LANG in $WIN32_LOCALES + do + xpi=win32-langpacks/$LANG.xpi + unzip -d prep_$LANG $xpi + search_plugins_path=prep_$LANG/browser/chrome/$LANG/locale/browser + rm -rf $search_plugins_path/searchplugins + cp -rf ~/build/searchplugins $search_plugins_path + rm $xpi + cd prep_$LANG + zip -r9 ../$xpi * + cd .. + rm -rf prep_$LANG + done PKG_LOCALE="en-US" # If we are building a multi-lingual package, add all of the language packs # and use "ALL" in the package name and as the locale for update purposes. @@ -184,16 +214,6 @@ script: | popd fi - # - pushd "Tor Browser"/Browser/browser/ - unzip omni.ja defaults/preferences/000-tor-browser.js - cp defaults/preferences/000-tor-browser.js ~/build/ - # Set the locale bundle. - echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js - zip -Xm omni.ja defaults/preferences/000-tor-browser.js - rm -rf defaults - popd - # # Recreate precomplete file (needs to be accurate for full MAR updates). pushd "Tor Browser"/Browser/ rm -f precomplete

1 0

[tor-browser-bundle/hardened-builds] Bug 18976: Remove some FTE bridges
by gk＠torproject.org 11 May '16

11 May '16

commit 076028da65ee8d4785b65f818e7f8c19bf9e3f0b Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 9 07:53:06 2016 +0000 Bug 18976: Remove some FTE bridges --- Bundle-Data/PTConfigs/bridge_prefs.js | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 390d7a5..379f256 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -8,15 +8,10 @@ pref("extensions.torlauncher.default_bridge.obfs3.3", "obfs3 169.229.59.75:46328 pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED"); pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A"); -pref("extensions.torlauncher.default_bridge.fte.1", "fte 192.240.101.106:80 FDC5BA65D93B6BCA5EBDF8EF8E4FA936B7F1F8E5"); -pref("extensions.torlauncher.default_bridge.fte.2", "fte 50.7.176.114:80 2BD466989944867075E872310EBAD65BC88C8AEF"); -pref("extensions.torlauncher.default_bridge.fte.3", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); -pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); -pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); -pref("extensions.torlauncher.default_bridge.fte.6", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); - -pref("extensions.torlauncher.default_bridge.fte-ipv6.1", "fte [2001:49f0:d002:1::2]:80 FDC5BA65D93B6BCA5EBDF8EF8E4FA936B7F1F8E5"); -pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte [2001:49f0:d00a:1::c]:80 2BD466989944867075E872310EBAD65BC88C8AEF"); +pref("extensions.torlauncher.default_bridge.fte.1", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); +pref("extensions.torlauncher.default_bridge.fte.2", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); +pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); +pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH");

1 0

[tor-browser-bundle/master] Bug 18976: Remove some FTE bridges
by gk＠torproject.org 11 May '16

11 May '16

commit bd2d6d501e88599a86b7a55a23f1731c0ec6ed74 Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 9 07:53:06 2016 +0000 Bug 18976: Remove some FTE bridges --- Bundle-Data/PTConfigs/bridge_prefs.js | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 390d7a5..379f256 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -8,15 +8,10 @@ pref("extensions.torlauncher.default_bridge.obfs3.3", "obfs3 169.229.59.75:46328 pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED"); pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A"); -pref("extensions.torlauncher.default_bridge.fte.1", "fte 192.240.101.106:80 FDC5BA65D93B6BCA5EBDF8EF8E4FA936B7F1F8E5"); -pref("extensions.torlauncher.default_bridge.fte.2", "fte 50.7.176.114:80 2BD466989944867075E872310EBAD65BC88C8AEF"); -pref("extensions.torlauncher.default_bridge.fte.3", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); -pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); -pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); -pref("extensions.torlauncher.default_bridge.fte.6", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); - -pref("extensions.torlauncher.default_bridge.fte-ipv6.1", "fte [2001:49f0:d002:1::2]:80 FDC5BA65D93B6BCA5EBDF8EF8E4FA936B7F1F8E5"); -pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte [2001:49f0:d00a:1::c]:80 2BD466989944867075E872310EBAD65BC88C8AEF"); +pref("extensions.torlauncher.default_bridge.fte.1", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); +pref("extensions.torlauncher.default_bridge.fte.2", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); +pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); +pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH");

1 0

[tor-browser/tor-browser-45.1.0esr-6.0-1] fixup! Bug 13252 - Do not store data in the app bundle
by gk＠torproject.org 09 May '16

09 May '16

commit d4f5d1c3704007cadaf6a37f3b8330f4e1930828 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon May 2 17:54:39 2016 -0400 fixup! Bug 13252 - Do not store data in the app bundle Ignore the XRE_PROFILE_PATH environment variable during the restart that occurs immediately after updating from a version of Tor Browser that uses an embedded profile (fixes bug 18928). --- toolkit/xre/nsAppRunner.cpp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 20be296..67bb2d3 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -2756,6 +2756,29 @@ SelectProfile(nsIProfileLock* *aResult, nsIToolkitProfileService* aProfileSvc, } nsCOMPtr<nsIFile> lf = GetFileFromEnv("XRE_PROFILE_PATH"); +#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR + // If we are transitioning away from an embedded profile, ignore the + // XRE_PROFILE_PATH value if it matches the old default profile location. + // This ensures that a new default profile will be created immediately + // after applying an update and that our migration code will then be + // executed. + if (lf) { + nsCOMPtr<nsIFile> oldTorProfileDir; + nsresult rv = GetAppRootDir(aAppDir, getter_AddRefs(oldTorProfileDir)); + NS_ENSURE_SUCCESS(rv, rv); + rv = oldTorProfileDir->AppendRelativeNativePath( + NS_LITERAL_CSTRING("TorBrowser" XPCOM_FILE_PATH_SEPARATOR + "Data" XPCOM_FILE_PATH_SEPARATOR + "Browser" XPCOM_FILE_PATH_SEPARATOR "profile.default")); + NS_ENSURE_SUCCESS(rv, rv); + bool isOldProfile = false; + rv = lf->Equals(oldTorProfileDir, &isOldProfile); + NS_ENSURE_SUCCESS(rv, rv); + if (isOldProfile) + lf = nullptr; // Ignore this XRE_PROFILE_PATH value. + } +#endif + if (lf) { nsCOMPtr<nsIFile> localDir = GetFileFromEnv("XRE_PROFILE_LOCAL_PATH");

1 0

[torbutton/master] Bug 18980: Remove obsolete toolbar button code
by gk＠torproject.org 09 May '16

09 May '16

commit 1e3a5db79447d742bffa5aa773a813f3e379fac9 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu May 5 21:45:29 2016 -0700 Bug 18980: Remove obsolete toolbar button code --- src/chrome/content/torbutton.js | 36 ++++++++---------------------------- 1 file changed, 8 insertions(+), 28 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 03a3b56..a8a4ce6 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -7,13 +7,6 @@ // TODO: Double-check there are no strange exploits to defeat: // http://kb.mozillazine.org/Links_to_local_pages_don%27t_work -// TODO: Remove the following HUDService loading code once TBB-ESR24 has -// been retired. -if (!window.hasOwnProperty("HUDService")) { - XPCOMUtils.defineLazyModuleGetter(this, "HUDService", - "resource:///modules/HUDService.jsm"); -} - XPCOMUtils.defineLazyModuleGetter(this, "ConsoleServiceListener", "resource://gre/modules/devtools/WebConsoleUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "WebConsoleUtils", @@ -610,27 +603,14 @@ function torbutton_init() { if (!m_tb_prefs.getBoolPref("extensions.torbutton.inserted_button")) { torbutton_log(3, 'Adding button'); try { - if (CustomizableUI) { - // ESR31-style toolbar is handled by the existing compiled-in pref. - // We also need to prevent first-run toolbar reorg (#13378), so we - // reset this toolbar state on first-run. - try { - m_tb_prefs.clearUserPref("browser.uiCustomization.state"); - } catch(e) {} - CustomizableUI.reset(); - CustomizableUI.undoReset(); - } else { - // ESR24-style toolbar - // TODO: Remove this branch once TBB-ESR24 has been retired. - var toolbutton = torbutton_get_button_from_toolbox(); - var navbar = document.getElementById("nav-bar"); - // XXX: Will probably fail on fennec. Also explicitly forbidden - // by MDC style guides (for good reason). Fix later.. - var urlbar = document.getElementById("urlbar-container"); - navbar.insertBefore(toolbutton, urlbar); - navbar.setAttribute("currentset", navbar.currentSet); - document.persist("nav-bar", "currentset"); - } + // ESR31-style toolbar is handled by the existing compiled-in pref. + // We also need to prevent first-run toolbar reorg (#13378), so we + // reset this toolbar state on first-run. + try { + m_tb_prefs.clearUserPref("browser.uiCustomization.state"); + } catch(e) {} + CustomizableUI.reset(); + CustomizableUI.undoReset(); torbutton_log(3, 'Button added'); m_tb_prefs.setBoolPref("extensions.torbutton.inserted_button", true); } catch(e) {

1 0

[tor-browser/tor-browser-45.1.0esr-6.0-1] fixup! Bug #13670.1: Isolate favicon requests by first party
by gk＠torproject.org 04 May '16

04 May '16

commit ac739a883c7960eda72ce71e82e8b3f704381c4d Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Apr 26 13:33:46 2016 -0700 fixup! Bug #13670.1: Isolate favicon requests by first party This fixes the isolation issues on the Page Info dialog (both video and audio related). See bug 18703 for more details. --- browser/base/content/content.js | 1 + browser/base/content/pageinfo/pageInfo.js | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/browser/base/content/content.js b/browser/base/content/content.js index 55f579f..ee456df 100644 --- a/browser/base/content/content.js +++ b/browser/base/content/content.js @@ -972,6 +972,7 @@ var PageInfoListener = { catch (exception) { } windowInfo.hostName = hostName; + windowInfo.firstParty = window.top.location.href; return windowInfo; }, diff --git a/browser/base/content/pageinfo/pageInfo.js b/browser/base/content/pageinfo/pageInfo.js index 3683b06..beff551 100644 --- a/browser/base/content/pageinfo/pageInfo.js +++ b/browser/base/content/pageinfo/pageInfo.js @@ -152,6 +152,7 @@ pageInfoTreeView.prototype = { // mmm, yummy. global variables. var gDocInfo = null; var gImageElement = null; +var gFirstParty = null; // column number to help using the data array const COL_IMAGE_ADDRESS = 0; @@ -378,6 +379,8 @@ function loadPageInfo(frameOuterWindowID, imageElement) gImageElement = pageInfoData.imageInfo; + gFirstParty = windowInfo.firstParty; + var titleFormat = windowInfo.isTopWindow ? "pageInfo.page.title" : "pageInfo.frame.title"; document.title = gBundle.getFormattedString(titleFormat, [docInfo.location]); @@ -881,7 +884,7 @@ function makePreview(row) var newImage = new Image; newImage.id = "thepreviewimage"; // Ensure "Media" items are fetched over the first-party domain. - newImage.setAttribute("firstparty", gWindow.top.document.location); + newImage.setAttribute("firstparty", gFirstParty); var physWidth = 0, physHeight = 0; var width = 0, height = 0; @@ -929,6 +932,7 @@ function makePreview(row) else if (item.HTMLVideoElement && isProtocolAllowed) { newImage = document.createElementNS("http://www.w3.org/1999/xhtml", "video"); newImage.id = "thepreviewimage"; + newImage.setAttribute("firstparty", gFirstParty); newImage.src = url; newImage.controls = true; width = physWidth = item.videoWidth; @@ -940,6 +944,7 @@ function makePreview(row) else if (item.HTMLAudioElement && isProtocolAllowed) { newImage = new Audio; newImage.id = "thepreviewimage"; + newImage.setAttribute("firstparty", gFirstParty); newImage.src = url; newImage.controls = true; isAudio = true;

1 0

[torbutton/master] Bug 18905: Hide unusable items from help menu
by gk＠torproject.org 04 May '16

04 May '16

commit b72f495c9593bb7df8fab34b642325c22e4e7393 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Apr 26 15:59:36 2016 -0700 Bug 18905: Hide unusable items from help menu --- src/chrome.manifest | 3 +++ src/chrome/content/menu-overlay.xul | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/src/chrome.manifest b/src/chrome.manifest index 30aa2ff..e85a205 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -12,6 +12,9 @@ override chrome://branding/locale/brand.dtd chrome://torbutton/locale/brand.dtd override chrome://branding/locale/brand.properties chrome://torbutton/locale/brand.properties overlay chrome://browser/content/aboutDialog.xul chrome://torbutton/content/aboutDialog.xul +# UI customization +overlay chrome://browser/content/baseMenuOverlay.xul chrome://torbutton/content/menu-overlay.xul + # Strings for the about:tbupdate page override chrome://browser/locale/aboutTBUpdate.dtd chrome://torbutton/locale/aboutTBUpdate.dtd diff --git a/src/chrome/content/menu-overlay.xul b/src/chrome/content/menu-overlay.xul new file mode 100644 index 0000000..ceadf85 --- /dev/null +++ b/src/chrome/content/menu-overlay.xul @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?>  + + +<overlay id="torbutton-menu-overlay" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> + <menupopup id="menu_HelpPopup"> + <menuitem id="menu_openHelp" removeelement="true"/> + <menuitem id="menu_openTour" removeelement="true"/> + <menuitem id="healthReport" removeelement="true"/> + <menuitem id="feedbackPage" removeelement="true"/> + <menuitem id="helpSafeMode" removeelement="true"/> + <menuitem id="menu_HelpPopup_reportPhishingtoolmenu" removeelement="true"/> + <menuitem id="menu_HelpPopup_reportPhishingErrortoolmenu" removeelement="true"/> +  + <box id="menu_HelpPopup_reportPhishingtoolmenu"/> + <box id="menu_HelpPopup_reportPhishingErrortoolmenu"/> + </menupopup> +</overlay>

1 0

[tor-browser-bundle/master] Folding in changelogs
by gk＠torproject.org 03 May '16

03 May '16

commit 5bf62ce8d5e4bbeec5eace152ae90cc36657f836 Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 3 19:28:59 2016 +0000 Folding in changelogs --- Bundle-Data/Docs/ChangeLog.txt | 55 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 5ea56f1..b96cb79 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,48 @@ +Tor Browser 6.0a5-hardened -- April 28 2016 + * All Platforms + * Update Firefox to 45.1.0esr + * Update Tor to 0.2.8.2-alpha + * Update Torbutton to 1.9.5.3 + * Bug 18466: Make Torbutton compatible with Firefox ESR 45 + * Translation updates + * Update Tor Launcher to 0.2.8.4 + * Bug 13252: Do not store data in the application bundle + * Bug 10534: Don't advertise the help desk directly anymore + * Translation updates + * Update HTTPS-Everywhere to 5.1.6 + * Update NoScript to 2.9.0.11 + * Update meek to 0.22 (tag 0.22-18371-2) + * Bug 18371: Symlinks are incompatible with Gatekeeper signing + * Bug 15197 and child tickets: Rebase Tor Browser patches to ESR 45 + * Bug 18900: Fix broken updater on Linux + * Bug 18042: Disable SHA1 certificate support + * Bug 18821: Disable libmdns support for desktop and mobile + * Bug 18848: Disable additional welcome URL shown on first start + * Bug 14970: Exempt our extensions from signing requirement + * Bug 16328: Disable MediaDevices.enumerateDevices + * Bug 16673: Disable HTTP Alternative-Services + * Bug 17167: Disable Mozilla's tracking protection + * Bug 18603: Disable performance-based WebGL fingerprinting option + * Bug 18738: Disable Selfsupport and Unified Telemetry + * Bug 18799: Disable Network Tickler + * Bug 18800: Remove DNS lookup in lockfile code + * Bug 18801: Disable dom.push preferences + * Bug 18802: Remove the JS-based Flash VM (Shumway) + * Bug 18863: Disable MozTCPSocket explicitly + * Bug 15640: Place Canvas MediaStream behind site permission + * Bug 16326: Verify cache isolation for Request and Fetch APIs + * Bug 18741: Fix OCSP and favicon isolation for ESR 45 + * Bug 16998: Disable <link rel="preconnect"> for now + * Bug 17506: Reenable building hardened Tor Browser with startup cache + * Bug 18898: Exempt the meek extension from the signing requirement as well + * Bug 18899: Don't copy Torbutton, TorLauncher, etc. into meek profile + * Bug 18890: Test importScripts() for cache and network isolation + * Bug 18726: Add new default obfs4 bridge (GreenBelt) + * Build System + * Bug 16224: Don't use BUILD_HOSTNAME anymore in Firefox builds + * Bug 18699: Stripping fails due to obsolete Browser/components directory + * Bug 18698: Include libgconf2-dev for our Linux builds + Tor Browser 6.0a5 -- April 28 2016 * All Platforms * Update Firefox to 45.1.0esr @@ -58,6 +103,16 @@ Tor Browser 6.0a5 -- April 28 2016 * Bug 18699: Stripping fails due to obsolete Browser/components directory * Bug 18698: Include libgconf2-dev for our Linux builds +Tor Browser 5.5.5 -- April 26 2016 + * All Platforms + * Update Firefox to 38.8.0esr + * Update Tor Launcher to 0.2.7.9 + * Bug 10534: Don't advertise the help desk directly anymore + * Translation updates + * Update HTTPS-Everywhere to 5.1.6 + * Update NoScript to 2.9.0.11 + * Bug 18726: Add new default obfs4 bridge (GreenBelt) + Tor Browser 6.0a4-hardened -- March 17 2016 * All Platforms * Update Firefox to 38.7.1esr

1 0

[tor-browser/tor-browser-45.1.0esr-6.0-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 03 May '16

03 May '16

commit e51823989e0f57328f6b710e599ed3b564ac0c37 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon May 2 16:28:10 2016 -0400 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. Avoid special handling and use of "add-if" for unpacked add-ons that are located under distribution/extensions (fixes bug #18951). --- tools/update-packaging/common.sh | 36 +++++++----------------------------- 1 file changed, 7 insertions(+), 29 deletions(-) diff --git a/tools/update-packaging/common.sh b/tools/update-packaging/common.sh index 5af9e27..96bfa43 100755 --- a/tools/update-packaging/common.sh +++ b/tools/update-packaging/common.sh @@ -66,22 +66,10 @@ make_add_instruction() { forced= fi - is_extension=$(echo "$f" | grep -c 'distribution/extensions/.*/') - if [ $is_extension = "1" ]; then - # Use the subdirectory of the extensions folder as the file to test - # before performing this add instruction. - testdir=$(echo "$f" | sed 's/$.*distribution\/extensions\/[^\/]*$\/.*/\1/') - verbose_notice " add-if \"$testdir\" \"$f\"" - echo "add-if \"$testdir\" \"$f\"" >> "$filev2" - if [ ! "$filev3" = "" ]; then - echo "add-if \"$testdir\" \"$f\"" >> "$filev3" - fi - else - verbose_notice " add \"$f\"$forced" - echo "add \"$f\"" >> "$filev2" - if [ ! "$filev3" = "" ]; then - echo "add \"$f\"" >> "$filev3" - fi + verbose_notice " add \"$f\"$forced" + echo "add \"$f\"" >> "$filev2" + if [ ! "$filev3" = "" ]; then + echo "add \"$f\"" >> "$filev3" fi } @@ -132,19 +120,9 @@ make_patch_instruction() { filev2="$2" filev3="$3" - is_extension=$(echo "$f" | grep -c 'distribution/extensions/.*/') - if [ $is_extension = "1" ]; then - # Use the subdirectory of the extensions folder as the file to test - # before performing this add instruction. - testdir=$(echo "$f" | sed 's/$.*distribution\/extensions\/[^\/]*$\/.*/\1/') - verbose_notice " patch-if \"$testdir\" \"$f.patch\" \"$f\"" - echo "patch-if \"$testdir\" \"$f.patch\" \"$f\"" >> "$filev2" - echo "patch-if \"$testdir\" \"$f.patch\" \"$f\"" >> "$filev3" - else - verbose_notice " patch \"$f.patch\" \"$f\"" - echo "patch \"$f.patch\" \"$f\"" >> "$filev2" - echo "patch \"$f.patch\" \"$f\"" >> "$filev3" - fi + verbose_notice " patch \"$f.patch\" \"$f\"" + echo "patch \"$f.patch\" \"$f\"" >> "$filev2" + echo "patch \"$f.patch\" \"$f\"" >> "$filev3" } append_remove_instructions() {

1 0

[tor-browser-bundle/master] Remove references to unused packages in versions.beta
by gk＠torproject.org 29 Apr '16

29 Apr '16

commit 2949186d010368417599854304030951ad9d870c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 29 08:42:10 2016 +0000 Remove references to unused packages in versions.beta --- gitian/versions.beta | 5 ----- 1 file changed, 5 deletions(-) diff --git a/gitian/versions.beta b/gitian/versions.beta index 9df153b..87680b7 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -22,7 +22,6 @@ LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 -FLASHPROXY_TAG=1.6 LIBFTE_TAG=58734a5aec563600fa8d82fb48ea9d6b8e26556c # tag 0.1.0 FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 @@ -45,7 +44,6 @@ ARGPARSE_VER=1.2.1 PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 -M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 @@ -67,7 +65,6 @@ ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 -M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz @@ -92,7 +89,6 @@ ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 -M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 @@ -119,7 +115,6 @@ PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} -M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_PACKAGE} PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC…

1 0

[tor-browser-bundle/master] Bug 18919: Remove swig dependencies and wine-wrapper.
by gk＠torproject.org 29 Apr '16

29 Apr '16

commit 4f80e41c593e5680bfe31fcb421d04fc7d875c89 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 23 09:30:15 2016 -0700 Bug 18919: Remove swig dependencies and wine-wrapper. swig was only needed as a dependency of M2crypto, which was removed in 969136e13861c1cc6d983a66a82736a1fae971c3. --- gitian/build-helpers/wine-wrappers/setup.py | 2 +- gitian/build-helpers/wine-wrappers/swig.py | 33 ---------------------- .../linux/gitian-pluggable-transports.yml | 2 -- .../mac/gitian-pluggable-transports.yml | 2 -- .../windows/gitian-pluggable-transports.yml | 2 +- 5 files changed, 2 insertions(+), 39 deletions(-) diff --git a/gitian/build-helpers/wine-wrappers/setup.py b/gitian/build-helpers/wine-wrappers/setup.py index 77a9526..f80f2c0 100644 --- a/gitian/build-helpers/wine-wrappers/setup.py +++ b/gitian/build-helpers/wine-wrappers/setup.py @@ -1,7 +1,7 @@ from distutils.core import setup import py2exe setup( - console=["gcc.py", "g++.py", "dllwrap.py", "swig.py"], + console=["gcc.py", "g++.py", "dllwrap.py"], zipfile=None, options={"py2exe": {"bundle_files": 1, "compressed": True}} ) diff --git a/gitian/build-helpers/wine-wrappers/swig.py b/gitian/build-helpers/wine-wrappers/swig.py deleted file mode 100755 index 45941f4..0000000 --- a/gitian/build-helpers/wine-wrappers/swig.py +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env python - -# A wrapper for swig that converts Windows paths to Unix paths, so that swig can -# be called by Python distutils. - -import os -import subprocess -import sys - -import common - -args = ["/usr/bin/swig"] -sys.argv.pop(0) -while sys.argv: - a = sys.argv.pop(0) - if not a.startswith("-"): - args.append(common.winepath(a)) - continue - if a in ("-I",): - args.append(a) - args.append(common.winepath(sys.argv.pop(0))) - continue - o = common.search_startswith(a, ("-I",)) - if o is not None: - path = a[len(o):] - args.append("%s%s" % (o, common.winepath(path))) - continue - args.append(a) -p = common.popen_faketime(args, stderr=subprocess.PIPE) -stderr = p.stderr.read() -sys.stderr.write(stderr) -if " Error: " in stderr: - sys.exit(1) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index cecc390..38ae561 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -11,8 +11,6 @@ packages: - "unzip" - "python-setuptools" - "python-dev" -# Needed by M2Crypto -- "swig" - "zip" - "hardening-wrapper" reference_datetime: "2000-01-01 00:00:00" diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 6b1a99e..fbf38c2 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -10,8 +10,6 @@ packages: - "unzip" - "python-setuptools" - "python-dev" -# Needed by M2Crypto -- "swig" - "zip" reference_datetime: "2000-01-01 00:00:00" remotes: diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 9c1642d..f073fd1 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -136,7 +136,7 @@ script: | mkdir -p build/bdist.win32/winexe/bundle-2.7/ cp -a $INSTDIR/python/python27.dll build/bdist.win32/winexe/bundle-2.7/ LD_PRELOAD= $INSTPYTHON setup.py py2exe - cp -a dist/gcc.exe dist/g++.exe dist/dllwrap.exe dist/swig.exe $WINEROOT/windows/ + cp -a dist/gcc.exe dist/g++.exe dist/dllwrap.exe $WINEROOT/windows/ cd .. # Building go

1 0

[tor-browser-bundle/master] Bug 18919: Remove unused gpg keys.
by gk＠torproject.org 29 Apr '16

29 Apr '16

commit 124cfb4ed86f38ddbcab81722f76a4bb4eed3424 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 23 09:06:59 2016 -0700 Bug 18919: Remove unused gpg keys. Unused since ac9da1d5965169f91973d57737fcd20e06351b08: LXML PYTHON Unused since 969136e13861c1cc6d983a66a82736a1fae971c3: M2CRYPTO flashproxy --- gitian/gpg/LXML.gpg | Bin 1450 -> 0 bytes gitian/gpg/M2CRYPTO.gpg | Bin 2441 -> 0 bytes gitian/gpg/PYTHON.gpg | Bin 4446 -> 0 bytes gitian/gpg/flashproxy.gpg | Bin 5876 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/LXML.gpg b/gitian/gpg/LXML.gpg deleted file mode 100644 index fd5f415..0000000 Binary files a/gitian/gpg/LXML.gpg and /dev/null differ diff --git a/gitian/gpg/M2CRYPTO.gpg b/gitian/gpg/M2CRYPTO.gpg deleted file mode 100644 index d6d889a..0000000 Binary files a/gitian/gpg/M2CRYPTO.gpg and /dev/null differ diff --git a/gitian/gpg/PYTHON.gpg b/gitian/gpg/PYTHON.gpg deleted file mode 100644 index 0b32223..0000000 Binary files a/gitian/gpg/PYTHON.gpg and /dev/null differ diff --git a/gitian/gpg/flashproxy.gpg b/gitian/gpg/flashproxy.gpg deleted file mode 100644 index f3b543f..0000000 Binary files a/gitian/gpg/flashproxy.gpg and /dev/null differ

1 0

[tor-browser/tor-browser-45.1.0esr-6.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 29 Apr '16

29 Apr '16

commit d592a0e41881c06e6d93c4f272ea7e4f3ea6e9bb Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Apr 26 16:46:38 2016 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Disable Pocket feature (bug 18886) --- browser/app/profile/000-tor-browser.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index b2beff5..bd24118 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -97,6 +97,10 @@ pref("browser.search.geoip.url", ""); pref("browser.fixup.alternate.enabled", false); // Bug #16783: Prevent .onion fixups // Make sure there is no Tracking Protection active in Tor Browser, see: #17898. pref("privacy.trackingprotection.pbmode.enabled", false); +// Disable the Pocket extension (Bug #18886) +pref("browser.pocket.enabled", false); +pref("browser.pocket.api", ""); +pref("browser.pocket.site", ""); // Fingerprinting pref("webgl.min_capability_mode", true);

1 0

[tor-browser-bundle/hardened-builds] Preparations for -build4
by gk＠torproject.org 27 Apr '16

27 Apr '16

commit 52d518cc8c89b2934190838fbe3075e686e05b97 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 26 21:28:04 2016 +0000 Preparations for -build4 --- Bundle-Data/Docs/ChangeLog.txt | 6 +++++- gitian/versions.alpha | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 49a49e5..35d0e9d 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 6.0a5-hardened -- April 27 2016 +Tor Browser 6.0a5-hardened -- April 28 2016 * All Platforms * Update Firefox to 45.1.0esr * Update Tor to 0.2.8.2-alpha @@ -14,6 +14,7 @@ Tor Browser 6.0a5-hardened -- April 27 2016 * Update meek to 0.22 (tag 0.22-18371-2) * Bug 18371: Symlinks are incompatible with Gatekeeper signing * Bug 15197 and child tickets: Rebase Tor Browser patches to ESR 45 + * Bug 18900: Fix broken updater on Linux * Bug 18042: Disable SHA1 certificate support * Bug 18821: Disable libmdns support for desktop and mobile * Bug 18848: Disable additional welcome URL shown on first start @@ -33,6 +34,9 @@ Tor Browser 6.0a5-hardened -- April 27 2016 * Bug 18741: Fix OCSP and favicon isolation for ESR 45 * Bug 16998: Disable <link rel="preconnect"> for now * Bug 17506: Reenable building hardened Tor Browser with startup cache + * Bug 18898: Exempt the meek extension from the signing requirement as well + * Bug 18899: Don't copy Torbutton, TorLauncher, etc. into meek profile + * Bug 18890: Test importScripts() for cache and network isolation * Bug 18726: Add new default obfs4 bridge (GreenBelt) * Build System * Bug 16224: Don't use BUILD_HOSTNAME anymore in Firefox builds diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 2a8e10f..b9239dc 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -18,7 +18,7 @@ FIREFOX_VERSION=45.1.0esr TORBROWSER_UPDATE_CHANNEL=hardened -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build3 TOR_TAG=tor-0.2.8.2-alpha TORLAUNCHER_TAG=0.2.8.4 TORBUTTON_TAG=1.9.5.3

1 0

[tor-browser-bundle/master] Update changelog for -build4
by gk＠torproject.org 27 Apr '16

27 Apr '16

commit 91ee3ab05a1a2775acd680bb3dd75b8eb2797890 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 26 20:41:06 2016 +0000 Update changelog for -build4 --- Bundle-Data/Docs/ChangeLog.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 4d27e9e..5ea56f1 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 6.0a5 -- April 27 2016 +Tor Browser 6.0a5 -- April 28 2016 * All Platforms * Update Firefox to 45.1.0esr * Update Tor to 0.2.8.2-alpha @@ -14,6 +14,7 @@ Tor Browser 6.0a5 -- April 27 2016 * Update meek to 0.22 (tag 0.22-18371-2) * Bug 18371: Symlinks are incompatible with Gatekeeper signing * Bug 15197 and child tickets: Rebase Tor Browser patches to ESR 45 + * Bug 18900: Fix broken updater on Linux * Bug 18042: Disable SHA1 certificate support * Bug 18821: Disable libmdns support for desktop and mobile * Bug 18848: Disable additional welcome URL shown on first start @@ -32,6 +33,9 @@ Tor Browser 6.0a5 -- April 27 2016 * Bug 16326: Verify cache isolation for Request and Fetch APIs * Bug 18741: Fix OCSP and favicon isolation for ESR 45 * Bug 16998: Disable <link rel="preconnect"> for now + * Bug 18898: Exempt the meek extension from the signing requirement as well + * Bug 18899: Don't copy Torbutton, TorLauncher, etc. into meek profile + * Bug 18890: Test importScripts() for cache and network isolation * Bug 18726: Add new default obfs4 bridge (GreenBelt) * Windows * Bug 13419: Support ICU in Windows builds

1 0

[tor-browser-bundle/master] Using tor-browser-45.1.0esr-6.0-1-build3
by gk＠torproject.org 27 Apr '16

27 Apr '16

commit 127c4835c3ff00db224b4e38e51d0bf3ef322a9b Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 26 21:15:07 2016 +0000 Using tor-browser-45.1.0esr-6.0-1-build3 --- gitian/versions.alpha | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 8752e76..f2023f0 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -14,7 +14,7 @@ FIREFOX_VERSION=45.1.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build3 TOR_TAG=tor-0.2.8.2-alpha TORLAUNCHER_TAG=0.2.9.1 TORBUTTON_TAG=1.9.5.3

1 0

[tor-browser/tor-browser-45.1.0esr-6.0-1] fixup! Bug 14970: Don't block our unsigned extensions
by gk＠torproject.org 27 Apr '16

27 Apr '16

commit f46c63ff6856251faf39e20a040ee104fa113176 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 26 19:55:31 2016 +0000 fixup! Bug 14970: Don't block our unsigned extensions --- toolkit/mozapps/extensions/internal/XPIProvider.jsm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index 3056201..94c33ea 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -683,12 +683,13 @@ function isUsableAddon(aAddon) { return false; } // Temporary and system add-ons do not require signing. Neither do Torbutton - // nor TorLauncher nor EFF's HTTPS-Everywhere. + // nor TorLauncher nor EFF's HTTPS-Everywhere nor meek. if ((aAddon._installLocation.name != KEY_APP_SYSTEM_DEFAULTS && aAddon._installLocation.name != KEY_APP_TEMPORARY) && aAddon.id != "torbutton(a)torproject.org" && aAddon.id != "tor-launcher(a)torproject.org" && aAddon.id != "https-everywhere-eff(a)eff.org" && + aAddon.id != "meek-http-helper(a)bamsoftware.com" && mustSign(aAddon.type)) { if (aAddon.signedState <= AddonManager.SIGNEDSTATE_MISSING) return false; @@ -3289,12 +3290,13 @@ this.XPIProvider = { continue; } - // Make sure Torbutton, TorLauncher and EFF's HTTPS-Everywhere are still - // working after an update. + // Make sure Torbutton, TorLauncher, EFF's HTTPS-Everywhere and meek + // are still working after an update. if (mustSign(addon.type) && addon.id != "torbutton(a)torproject.org" && addon.id != "tor-launcher(a)torproject.org" && addon.id != "https-everywhere-eff(a)eff.org" && + addon.id != "meek-http-helper(a)bamsoftware.com" && addon.signedState <= AddonManager.SIGNEDSTATE_MISSING) { logger.warn("Refusing to install staged add-on " + id + " with signed state " + addon.signedState); seenFiles.push(stageDirEntry.leafName);

1 0

[tor-browser/tor-browser-45.1.0esr-6.0-1] Bug 18900: updater doesn't work on Linux (cannot find libraries)
by gk＠torproject.org 27 Apr '16

27 Apr '16

commit 82cfa7c8786c1ad1421666365bd71f3594861328 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Apr 26 14:25:35 2016 -0400 Bug 18900: updater doesn't work on Linux (cannot find libraries) Revert "Bug 1159090 - Only append library path for updater if it is a unique value. r=rstrong" This reverts commit 5c4fcaf37f8e479b5d3c46a21b8a48ad1fe567d8. --- toolkit/xre/nsUpdateDriver.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/toolkit/xre/nsUpdateDriver.cpp b/toolkit/xre/nsUpdateDriver.cpp index 0c7b6b0..d256f2a 100644 --- a/toolkit/xre/nsUpdateDriver.cpp +++ b/toolkit/xre/nsUpdateDriver.cpp @@ -488,20 +488,20 @@ CopyUpdaterIntoUpdateDir(nsIFile *greDir, nsIFile *appDir, nsIFile *updateDir, static void AppendToLibPath(const char *pathToAppend) { + char *s = nullptr; char *pathValue = getenv(LD_LIBRARY_PATH_ENVVAR_NAME); if (nullptr == pathValue || '\0' == *pathValue) { - char *s = PR_smprintf("%s=%s", LD_LIBRARY_PATH_ENVVAR_NAME, pathToAppend); - PR_SetEnv(s); - } else if (!strstr(pathValue, pathToAppend)) { - char *s = PR_smprintf("%s=%s" PATH_SEPARATOR "%s", + s = PR_smprintf("%s=%s", LD_LIBRARY_PATH_ENVVAR_NAME, pathToAppend); + } else { + s = PR_smprintf("%s=%s" PATH_SEPARATOR "%s", LD_LIBRARY_PATH_ENVVAR_NAME, pathToAppend, pathValue); - PR_SetEnv(s); } // The memory used by PR_SetEnv is not copied to the environment on all // platform, it can be used by reference directly. So we purposely do not // call PR_smprintf_free on s. Subsequent calls to PR_SetEnv will free // the old memory first. + PR_SetEnv(s); } #endif

1 0

[tor-browser-bundle/hardened-builds] Bug 18899: meek profile gets all extensions
by gk＠torproject.org 27 Apr '16

27 Apr '16

commit 210aa37e48b1bc27f6925f8a4be5d7f47551803e Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Apr 26 15:11:06 2016 -0400 Bug 18899: meek profile gets all extensions Set extensions.installDistroAddons = false in the meek-http-helper browser profile so that Tor Launcher, Torbutton, etc. are not copied into that profile. --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index de2355c..820335d 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -40,3 +40,7 @@ user_pref("network.proxy.socks_port", 9); user_pref("network.proxy.socks_remote_dns", true); user_pref("extensions.enabledAddons", "meek-http-helper@bamsoftware.com:1.0"); + +// Ensure that distribution extensions (e.g., Tor Launcher) are not copied +// into the meek-http-helper profile. +user_pref("extensions.installDistroAddons", false);

1 0

[tor-browser-bundle/master] Bug 18899: meek profile gets all extensions
by gk＠torproject.org 27 Apr '16

27 Apr '16

commit 3b226118fadf42623032b423e41d6803e05901c1 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Apr 26 15:11:06 2016 -0400 Bug 18899: meek profile gets all extensions Set extensions.installDistroAddons = false in the meek-http-helper browser profile so that Tor Launcher, Torbutton, etc. are not copied into that profile. --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index de2355c..820335d 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -40,3 +40,7 @@ user_pref("network.proxy.socks_port", 9); user_pref("network.proxy.socks_remote_dns", true); user_pref("extensions.enabledAddons", "meek-http-helper@bamsoftware.com:1.0"); + +// Ensure that distribution extensions (e.g., Tor Launcher) are not copied +// into the meek-http-helper profile. +user_pref("extensions.installDistroAddons", false);

1 0

[tor-browser/tor-browser-45.1.0esr-6.0-1] squash! Bug #13749.2: Regression tests for first-party isolation of cache
by gk＠torproject.org 26 Apr '16

26 Apr '16

commit 7caee5e04bfac481c4f39ac75b366c530aba5374 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Apr 25 17:15:21 2016 -0700 squash! Bug #13749.2: Regression tests for first-party isolation of cache Also tests for isolation of WorkerGlobalScope.importScripts() https://bugs.torproject.org/18890 --- netwerk/test/browser/browser.ini | 1 + netwerk/test/browser/browser_cacheFirstParty.js | 3 ++- netwerk/test/browser/thirdPartyChild.import.js | 1 + netwerk/test/browser/thirdPartyChild.worker.js | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/netwerk/test/browser/browser.ini b/netwerk/test/browser/browser.ini index 9bc3361..a78557b 100644 --- a/netwerk/test/browser/browser.ini +++ b/netwerk/test/browser/browser.ini @@ -8,6 +8,7 @@ support-files = thirdPartyChild.fetch.html thirdPartyChild.iframe.html thirdPartyChild.img.png + thirdPartyChild.import.js thirdPartyChild.link.css thirdPartyChild.object.png thirdPartyChild.request.html diff --git a/netwerk/test/browser/browser_cacheFirstParty.js b/netwerk/test/browser/browser_cacheFirstParty.js index 08b3231..967c597 100644 --- a/netwerk/test/browser/browser_cacheFirstParty.js +++ b/netwerk/test/browser/browser_cacheFirstParty.js @@ -113,7 +113,8 @@ let privacyPref = "privacy.thirdparty.isolate", "embed.png", "xhr.html", "worker.xhr.html", "audio.ogg", "video.ogv", "track.vtt", "favicon.ico", "fetch.html", "worker.fetch.html", - "request.html", "worker.request.html"]; + "request.html", "worker.request.html", + "import.js"]; // __checkCachePopulation(pref, numberOfDomains)__. // Check if the number of entries found in the cache for each diff --git a/netwerk/test/browser/thirdPartyChild.import.js b/netwerk/test/browser/thirdPartyChild.import.js new file mode 100644 index 0000000..dbf8f83 --- /dev/null +++ b/netwerk/test/browser/thirdPartyChild.import.js @@ -0,0 +1 @@ +// dummy script, to be called by self.importScripts(...) diff --git a/netwerk/test/browser/thirdPartyChild.worker.js b/netwerk/test/browser/thirdPartyChild.worker.js index 34627b2..c8c187b 100644 --- a/netwerk/test/browser/thirdPartyChild.worker.js +++ b/netwerk/test/browser/thirdPartyChild.worker.js @@ -5,3 +5,5 @@ xhr.send(); fetch("http://example.net/browser/netwerk/test/browser/thirdPartyChild.worker.fetc…", {cache: "force-cache"} ); var myRequest = new Request("http://example.net/browser/netwerk/test/browser/thirdPartyChild.worker.requ…"); fetch(myRequest, {cache: "force-cache"} ); + +self.importScripts("http://example.net/browser/netwerk/test/browser/thirdPartyChild.import.js");

1 0

[tor-browser-bundle/hardened-builds] Don't include old OS X toolchain in results anymore
by gk＠torproject.org 25 Apr '16

25 Apr '16

commit 41386f37bbc771c559e5986963a6db79b1abd9b7 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 25 12:34:50 2016 +0000 Don't include old OS X toolchain in results anymore --- gitian/record-inputs.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index afcd70d..a74d70b 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -25,7 +25,6 @@ rm -f bundle.inputs sha256sum $OSXSDK_PACKAGE >> bundle.inputs sha256sum $OPENSSL_PACKAGE >> bundle.inputs -sha256sum $TOOLCHAIN4_PACKAGE >> bundle.inputs echo >> bundle.inputs sha256sum noscript(a)noscript.net.xpi >> bundle.inputs echo >> bundle.inputs

1 0

[tor-browser-bundle/hardened-builds] Don't fetch old OS X toolchain anymore
by gk＠torproject.org 25 Apr '16

25 Apr '16

commit 9c9ff9a72eeab0ae48e842567a55f651de2dd539 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 25 08:37:47 2016 +0000 Don't fetch old OS X toolchain anymore --- gitian/fetch-inputs.sh | 4 ++-- gitian/verify-tags.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 4f3c886..027a47e 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -131,7 +131,7 @@ do fi done -for i in TOOLCHAIN4 TOOLCHAIN4_OLD OSXSDK OSXSDK_OLD MSVCR100 +for i in TOOLCHAIN4_OLD OSXSDK OSXSDK_OLD MSVCR100 do PACKAGE="${i}_PACKAGE" URL="${MIRROR_URL}${!PACKAGE}" @@ -166,7 +166,7 @@ wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 7bc2683..46cb01a 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -140,7 +140,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH"

1 0

[tor-browser-bundle/hardened-builds] Release preparations for 6.0a5-hardened
by gk＠torproject.org 25 Apr '16

25 Apr '16

commit 583cbc0936483ee9cef8e58497458f3ce3420d5c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 25 07:54:07 2016 +0000 Release preparations for 6.0a5-hardened Version bumps, changelog update and config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 41 ++++++++++++++++++++++++++++++++++++ gitian/versions.alpha | 44 ++++++++++++++++++++++++++------------- tools/update-responses/config.yml | 13 ++++++------ 3 files changed, 76 insertions(+), 22 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index f348f23..dd8269f 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,44 @@ +Tor Browser 6.0a5-hardened -- April 27 2016 + * All Platforms + * Update Firefox to 45.1.0esr + * Update Tor to 0.2.8.2-alpha + * Update Torbutton to 1.9.5.3 + * Bug 18466: Make Torbutton compatible with Firefox ESR 45 + * Translation updates + * Update Tor Launcher to 0.2.8.4 + * Bug 13252: Do not store data in the application bundle + * Bug 10534: Don't advertise the help desk directly anymore + * Translation updates + * Update HTTPS-Everywhere to 5.1.6 + * Update NoScript to 2.9.0.11 + * Update meek to 0.22 (tag 0.22-18371-2) + * Bug 18371: Symlinks are incompatible with Gatekeeper signing + * Bug 15197 and child tickets: Rebase Tor Browser patches to ESR 45 + * Bug 18042: Disable SHA1 certificate support + * Bug 18821: Disable libmdns support for desktop and mobile + * Bug 18848: Disable additional welcome URL shown on first start + * Bug 14970: Exempt our extensions from signing requirement + * Bug 16328: Disable MediaDevices.enumerateDevices + * Bug 16673: Disable HTTP Alternative-Services + * Bug 17167: Disable Mozilla's tracking protection + * Bug 18603: Disable performance-based WebGL fingerprinting option + * Bug 18738: Disable Selfsupport and Unified Telemetry + * Bug 18799: Disable Network Tickler + * Bug 18800: Remove DNS lookup in lockfile code + * Bug 18801: Disable dom.push preferences + * Bug 18802: Remove the JS-based Flash VM (Shumway) + * Bug 18863: Disable MozTCPSocket explicitly + * Bug 15640: Place Canvas MediaStream behind site permission + * Bug 16326: Verify cache isolation for Request and Fetch APIs + * Bug 18741: Fix OCSP and favicon isolation for ESR 45 + * Bug 16998: Disable <link rel="preconnect"> for now + * Bug 17506: Reenable building hardened Tor Browser with startup cache + * Bug 18726: Add new default obfs4 bridge (GreenBelt) + * Build System + * Bug 16224: Don't use BUILD_HOSTNAME anymore in Firefox builds + * Bug 18699: Stripping fails due to obsolete Browser/components directory + * Bug 18698: Include libgconf2-dev for our Linux builds + Tor Browser 6.0a4-hardened -- March 17 2016 * All Platforms * Update Firefox to 38.7.1esr diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 71058ca..2a8e10f 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -9,29 +9,35 @@ BUILD_PT_BUNDLES=1 # that does not include the language prompt. MULTI_LINGUAL=1 +# DATA_OUTSIDE_APP_DIR is only implemented for Mac OS. +DATA_OUTSIDE_APP_DIR=1 + VERIFY_TAGS=1 -FIREFOX_VERSION=38.7.1esr +FIREFOX_VERSION=45.1.0esr TORBROWSER_UPDATE_CHANNEL=hardened -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1 -TOR_TAG=tor-0.2.8.1-alpha -TORLAUNCHER_TAG=0.2.8.3 -TORBUTTON_TAG=1.9.5.2 -HTTPSE_TAG=5.1.4 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build2 +TOR_TAG=tor-0.2.8.2-alpha +TORLAUNCHER_TAG=0.2.8.4 +TORBUTTON_TAG=1.9.5.3 +HTTPSE_TAG=5.1.6 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable -MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 +CMAKE_TAG=v2.8.12.2 +LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74 # r247539 +CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539 +MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 -GOPTLIB_TAG=0.2 -MEEK_TAG=0.20 +GOPTLIB_TAG=0.5 +MEEK_TAG=0.22-18371-2 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd @@ -40,7 +46,7 @@ GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 OBFS4_TAG=obfs4proxy-0.0.5 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 -GITIAN_TAG=tor-browser-builder-3.x-9 +GITIAN_TAG=tor-browser-builder-4-1 OPENSSL_VER=1.0.1s GMP_VER=5.1.3 @@ -48,6 +54,7 @@ FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.2.0 +CLANG_VER=r247539 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 @@ -58,13 +65,14 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 GO_VER=1.4.2 +NSIS_VER=2.51 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.4-fx+fn+sm.xpi -TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.11-fn+sm+fx.xpi TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz +CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll @@ -80,6 +88,8 @@ PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz +NSIS_PACKAGE=nsis-${NSIS_VER}-src.tar.bz2 +NSIS_DEBIAN_PACKAGE=nsis_${NSIS_VER}-1.debian.tar.xz STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf @@ -92,9 +102,9 @@ OPENSSL_HASH=e7e81d82f3cd538ab0cdba494006d44aab9dd96b7f6233ce9971fb7c7916d511 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc -TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=94d036ff45116023bde97e6dee6c79daf2d28804764bfa8937f5d4d3463173f5 +NOSCRIPT_HASH=fdd965a69188ac651b08a7d3ada54821a89db10a4685aa73ba59edc0b8243390 +CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 @@ -105,6 +115,8 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b +NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 +NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=5f835b04b5f7dd4f4d2dc96190ec1621b8d89f2dc6f638f9f8bc1b1014ba8cad STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 @@ -116,8 +128,8 @@ NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} -TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_PACKAGE} TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources… +CCTOOLS_URL=https://people.torproject.org/~gk/mirrors/sources/${CCTOOLS_PACKAGE} OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} @@ -133,6 +145,8 @@ PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} +NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} +NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIAN_PACKAGE} STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index ceaaf10..73b1cf8 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -9,7 +9,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - hardened: 6.0a4-hardened + hardened: 6.0a5-hardened release: 5.0 versions: 5.0: @@ -23,13 +23,12 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 6.0a4-hardened: - platformVersion: 38.7.1 - detailsURL: https://blog.torproject.org/blog/tor-browser-60a4-hardened-released - download_url: https://www.torproject.org/dist/torbrowser/6.0a4-hardened + 6.0a5-hardened: + platformVersion: 45.1.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-60a5-hardened-released + download_url: https://www.torproject.org/dist/torbrowser/6.0a5-hardened incremental_from: - - 6.0a2-hardened - - 6.0a3-hardened + - 6.0a4-hardened migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/hardened-builds] Add missing year in changelog entry
by gk＠torproject.org 25 Apr '16

25 Apr '16

commit bc94203645ac3d9714f4b0de390b2865c3c66552 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 25 07:54:40 2016 +0000 Add missing year in changelog entry --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index dd8269f..49a49e5 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -46,7 +46,7 @@ Tor Browser 6.0a4-hardened -- March 17 2016 * Bug 18557: Exempt Graphite from the Security Slider * Bug 18536: Make Mosaddegh and MaBishomarim available on port 80 and 443 -Tor Browser 6.0a3-hardened -- March 8 +Tor Browser 6.0a3-hardened -- March 8 2016 * All Platforms * Update Firefox to 38.7.0esr * Update Tor to 0.2.8.1-alpha

1 0

[tor-launcher/master] Version bump (0.2.8.4)
by gk＠torproject.org 25 Apr '16

25 Apr '16

commit 1df3415e36e8997717d98d6396550c2af1b9eee0 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 25 07:47:24 2016 +0000 Version bump (0.2.8.4) --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 5c81e17..6db501e 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.8.3</em:version> + <em:version>0.2.8.4</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL> <em:updateKey>-</em:updateKey>

1 0

[tor-browser-bundle/hardened-builds] Updating nightly versions for hardened builds
by gk＠torproject.org 25 Apr '16

25 Apr '16

commit 3afd340534ef8f7d3938a679f34fba673e8bed9f Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 25 07:35:04 2016 +0000 Updating nightly versions for hardened builds --- gitian/versions.nightly | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index e7c5b3d..088625b 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -8,13 +8,16 @@ BUNDLE_LOCALES_WIN32="ja" BUNDLE_LOCALES_MAC="ja-JP-mac" BUILD_PT_BUNDLES=1 +# DATA_OUTSIDE_APP_DIR is only implemented for Mac OS. +DATA_OUTSIDE_APP_DIR=1 + # If you remove MULTI_LINGUAL=1, be sure to use a version of Tor Launcher # that does not include the language prompt. MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=38.6.1esr +FIREFOX_VERSION=45.1.0esr TORBROWSER_UPDATE_CHANNEL=default @@ -26,7 +29,10 @@ HTTPSE_TAG=master NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable -MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 +CMAKE_TAG=v2.8.12.2 +LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74 # r247539 +CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539 +MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 PYPTLIB_TAG=master OBFSPROXY_TAG=master LIBFTE_TAG=master @@ -34,7 +40,7 @@ FTEPROXY_TAG=master LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=master -MEEK_TAG=master +MEEK_TAG=0.22-18371-2 #master FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd @@ -45,12 +51,13 @@ NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-4 -OPENSSL_VER=1.0.1q +OPENSSL_VER=1.0.1s GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.2.0 +CLANG_VER=r247539 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 @@ -61,13 +68,14 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 GO_VER=1.4.2 +NSIS_VER=2.51 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.3-fx+fn+sm.xpi -TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.11-fn+sm+fx.xpi TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz +CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll @@ -83,6 +91,8 @@ PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz +NSIS_PACKAGE=nsis-${NSIS_VER}-src.tar.bz2 +NSIS_DEBIAN_PACKAGE=nsis_${NSIS_VER}-1.debian.tar.xz STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf @@ -91,13 +101,13 @@ NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 +OPENSSL_HASH=e7e81d82f3cd538ab0cdba494006d44aab9dd96b7f6233ce9971fb7c7916d511 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc -TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=097298d5004c1f384f3af508cb1915921145f0f962e78c977a62f405bd7eb2d9 +NOSCRIPT_HASH=fdd965a69188ac651b08a7d3ada54821a89db10a4685aa73ba59edc0b8243390 +CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 @@ -108,6 +118,8 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b +NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 +NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=5f835b04b5f7dd4f4d2dc96190ec1621b8d89f2dc6f638f9f8bc1b1014ba8cad STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 @@ -119,8 +131,8 @@ NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} -TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_PACKAGE} TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources… +CCTOOLS_URL=https://people.torproject.org/~gk/mirrors/sources/${CCTOOLS_PACKAGE} OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} @@ -136,6 +148,8 @@ PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} +NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} +NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIAN_PACKAGE} STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a…

1 0

[tor-browser-bundle/master] Bump tor-browser branch used for nightlies
by gk＠torproject.org 25 Apr '16

25 Apr '16

commit a00e9b4617c65e8a09eb7584ebe92aa76df24ec3 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 25 07:28:45 2016 +0000 Bump tor-browser branch used for nightlies --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index dab84ef..cbc0a92 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,11 +17,11 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=45.0.2esr +FIREFOX_VERSION=45.1.0esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.x-1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master

1 0

[tor-browser-bundle/hardened-builds] Bug 18699: Stripping fails due to missing Browser/components
by gk＠torproject.org 25 Apr '16

25 Apr '16

commit f4d923d05643643e20f0d8fb755278260d7c90e4 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 1 07:16:19 2016 +0000 Bug 18699: Stripping fails due to missing Browser/components --- gitian/descriptors/linux/gitian-firefox.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index d21b342..b70d5c9 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -150,7 +150,7 @@ script: | # Strip and generate debuginfo for the firefox binary that we keep, all *.so # files, the plugin-container, and the updater (see ticket #10126) cd $INSTDIR - for LIB in Browser/*.so Browser/webapprt-stub Browser/firefox Browser/plugin-container Browser/components/*.so Browser/browser/components/*.so Browser/updater + for LIB in Browser/*.so Browser/webapprt-stub Browser/firefox Browser/plugin-container Browser/browser/components/*.so Browser/updater do objcopy --only-keep-debug $LIB Debug/$LIB strip $LIB

1 0

[tor-browser-bundle/hardened-builds] Bug 16224: No need to set BUILD_HOSTNAME anymore
by gk＠torproject.org 25 Apr '16

25 Apr '16

commit cfd21c15e32220fe8e6728f143389186c4f1d7f0 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 19 08:58:05 2016 +0000 Bug 16224: No need to set BUILD_HOSTNAME anymore Mozilla got rid of exposing the hostname of the machine that built Firefox in https://bugzilla.mozilla.org/show_bug.cgi?id=1168316. We therefore don't need to set it anymore to avoid reproducibility issues. --- gitian/descriptors/linux/gitian-firefox.yml | 2 +- gitian/descriptors/mac/gitian-firefox.yml | 2 +- gitian/descriptors/windows/gitian-firefox.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index b70d5c9..e24a740 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -108,7 +108,7 @@ script: | find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Without disabling LSan our build is blowing up: # https://bugs.torproject.org/10599#comment:52 - ASAN_OPTIONS="detect_leaks=0" make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build + ASAN_OPTIONS="detect_leaks=0" make $MAKEOPTS -f client.mk build # Packaging is broken with libfaketime enabled, thus we disable it again. See # #12461 comments 11 and 12 for details. export LD_PRELOAD="" diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 1a35eab..17c830f 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -81,7 +81,7 @@ script: | # stall otherwise right at the beginning. See #13877 for details. export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" export FAKETIME_SKIP_CMDS="python2.7,rsync,make" - make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build + make $MAKEOPTS -f client.mk build # make -C obj-macos package INNER_MAKE_PACKAGE=true cp -a obj-macos/dist/firefox/* $INSTDIR diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index 7358922..2686c5f 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -100,7 +100,7 @@ script: | # stall otherwise right at the beginning. See #13877 for details. export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" export FAKETIME_SKIP_CMDS="python2.7,make" - make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build + make $MAKEOPTS -f client.mk build # make -C obj-* package INNER_MAKE_PACKAGE=true cp -a obj-*/dist/firefox/* $INSTDIR/Browser/

1 0

[tor-browser-bundle/master] Add further missing years in changelog
by gk＠torproject.org 25 Apr '16

25 Apr '16

commit 625231728bd29f5520c4e864d551a88094fa9da0 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Apr 24 20:42:58 2016 +0000 Add further missing years in changelog --- Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 1681dc4..4d27e9e 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -75,7 +75,7 @@ Tor Browser 5.5.4 -- March 16 2016 * Bug 18557: Exempt Graphite from the Security Slider * Bug 18536: Make Mosaddegh and MaBishomarim available on port 80 and 443 -Tor Browser 6.0a3-hardened -- March 8 +Tor Browser 6.0a3-hardened -- March 8 2016 * All Platforms * Update Firefox to 38.7.0esr * Update Tor to 0.2.8.1-alpha @@ -95,7 +95,7 @@ Tor Browser 6.0a3-hardened -- March 8 * Windows * Bug 18292: Disable staged updates on Windows -Tor Browser 6.0a3 -- March 8 +Tor Browser 6.0a3 -- March 8 2016 * All Platforms * Update Firefox to 38.7.0esr * Update Tor to 0.2.8.1-alpha

1 0

[tor-browser-bundle/master] Adding the year for the 6.0a5 changelog entry
by gk＠torproject.org 25 Apr '16

25 Apr '16

commit 028973178a31a295c73d829974bfcb3859d6201f Author: Georg Koppen <gk(a)torproject.org> Date: Sun Apr 24 20:34:39 2016 +0000 Adding the year for the 6.0a5 changelog entry --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 4719c8b..1681dc4 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 6.0a5 -- April 27 +Tor Browser 6.0a5 -- April 27 2016 * All Platforms * Update Firefox to 45.1.0esr * Update Tor to 0.2.8.2-alpha

1 0

[tor-browser-bundle/master] Using -build2 to fix busted mingw-w64 build
by gk＠torproject.org 23 Apr '16

23 Apr '16

commit 7c8f82b43ceaa86adfc24fd825daa4ab69fd0dbb Author: Georg Koppen <gk(a)torproject.org> Date: Sat Apr 23 18:20:54 2016 +0000 Using -build2 to fix busted mingw-w64 build --- gitian/versions.alpha | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index c6ab27d..8752e76 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -14,7 +14,7 @@ FIREFOX_VERSION=45.1.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build2 TOR_TAG=tor-0.2.8.2-alpha TORLAUNCHER_TAG=0.2.9.1 TORBUTTON_TAG=1.9.5.3

1 0

[tor-browser/tor-browser-45.1.0esr-6.0-1] Bug 1263653 - Fixed TSFTextStore.h compilation with mingw. r=masayuki
by gk＠torproject.org 23 Apr '16

23 Apr '16

commit 9485c82c37e30700fe7d2512296234412afe701b Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 12 12:37:18 2016 +0200 Bug 1263653 - Fixed TSFTextStore.h compilation with mingw. r=masayuki --- widget/windows/TSFTextStore.cpp | 2 +- widget/windows/TSFTextStore.h | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/widget/windows/TSFTextStore.cpp b/widget/windows/TSFTextStore.cpp index 40ddf88..da88b00 100644 --- a/widget/windows/TSFTextStore.cpp +++ b/widget/windows/TSFTextStore.cpp @@ -5225,7 +5225,7 @@ TSFTextStore::SetInputContext(nsWindowBase* aWidget, if (aAction.mFocusChange != InputContextAction::FOCUS_NOT_CHANGED) { if (sEnabledTextStore) { - RefPtr<TSFTextStore> textStore = sEnabledTextStore; + RefPtr<TSFTextStore> textStore(sEnabledTextStore); textStore->SetInputScope(aContext.mHTMLInputType, aContext.mHTMLInputInputmode); } diff --git a/widget/windows/TSFTextStore.h b/widget/windows/TSFTextStore.h index a3b7009..117a8f1 100644 --- a/widget/windows/TSFTextStore.h +++ b/widget/windows/TSFTextStore.h @@ -118,7 +118,7 @@ public: if (!sEnabledTextStore) { return; } - RefPtr<TSFTextStore> textStore = sEnabledTextStore; + RefPtr<TSFTextStore> textStore(sEnabledTextStore); textStore->CommitCompositionInternal(aDiscard); } @@ -135,7 +135,7 @@ public: if (!sEnabledTextStore) { return NS_OK; } - RefPtr<TSFTextStore> textStore = sEnabledTextStore; + RefPtr<TSFTextStore> textStore(sEnabledTextStore); return textStore->OnTextChangeInternal(aIMENotification); } @@ -145,7 +145,7 @@ public: if (!sEnabledTextStore) { return NS_OK; } - RefPtr<TSFTextStore> textStore = sEnabledTextStore; + RefPtr<TSFTextStore> textStore(sEnabledTextStore); return textStore->OnSelectionChangeInternal(aIMENotification); } @@ -155,7 +155,7 @@ public: if (!sEnabledTextStore) { return NS_OK; } - RefPtr<TSFTextStore> textStore = sEnabledTextStore; + RefPtr<TSFTextStore> textStore(sEnabledTextStore); return textStore->OnLayoutChangeInternal(); } @@ -165,7 +165,7 @@ public: if (!sEnabledTextStore) { return NS_OK; } - RefPtr<TSFTextStore> textStore = sEnabledTextStore; + RefPtr<TSFTextStore> textStore(sEnabledTextStore); return textStore->OnUpdateCompositionInternal(); } @@ -175,7 +175,7 @@ public: if (!sEnabledTextStore) { return NS_OK; } - RefPtr<TSFTextStore> textStore = sEnabledTextStore; + RefPtr<TSFTextStore> textStore(sEnabledTextStore); return textStore->OnMouseButtonEventInternal(aIMENotification); }

1 0

[tor-browser-bundle/master] Bump GOPTLIB tag
by gk＠torproject.org 23 Apr '16

23 Apr '16

commit 1d68debb4d34b22ae76d1078b8f157cf4ab54e07 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Apr 23 12:36:47 2016 +0000 Bump GOPTLIB tag --- gitian/versions.alpha | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 0ba31d2..c6ab27d 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -32,7 +32,7 @@ LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 -GOPTLIB_TAG=0.2 +GOPTLIB_TAG=0.5 MEEK_TAG=0.22-18371-2 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] Bug 16998: Disable link rel=preconnect
by gk＠torproject.org 23 Apr '16

23 Apr '16

commit e4606f2da9c79fec5f1f8cda10869063e640af9e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Apr 22 14:39:14 2016 -0700 Bug 16998: Disable link rel=preconnect --- dom/base/nsDocument.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp index a4181ef..719c274 100644 --- a/dom/base/nsDocument.cpp +++ b/dom/base/nsDocument.cpp @@ -9704,6 +9704,10 @@ nsDocument::MaybePreLoadImage(nsIURI* uri, const nsAString &aCrossOriginAttr, void nsDocument::MaybePreconnect(nsIURI* aOrigURI, mozilla::CORSMode aCORSMode) { + // Tor Browser: Here we disable <link rel="preconnect"> + // See #16998. + // TODO: Isolate preconnect by first party. +/* nsCOMPtr<nsIURI> uri; if (NS_FAILED(aOrigURI->Clone(getter_AddRefs(uri)))) { return; @@ -9738,6 +9742,7 @@ nsDocument::MaybePreconnect(nsIURI* aOrigURI, mozilla::CORSMode aCORSMode) } else { speculator->SpeculativeConnect(uri, nullptr); } +*/ } void

1 0

[tor-browser-bundle/master] Add changelog for 6.0a5
by gk＠torproject.org 23 Apr '16

23 Apr '16

commit 74beabeb2ead3694e0c258e20e80d9da58df9270 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 22 21:32:57 2016 +0000 Add changelog for 6.0a5 --- Bundle-Data/Docs/ChangeLog.txt | 56 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 8c5d733..4719c8b 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,59 @@ +Tor Browser 6.0a5 -- April 27 + * All Platforms + * Update Firefox to 45.1.0esr + * Update Tor to 0.2.8.2-alpha + * Update Torbutton to 1.9.5.3 + * Bug 18466: Make Torbutton compatible with Firefox ESR 45 + * Translation updates + * Update Tor Launcher to 0.2.9.1 + * Bug 13252: Do not store data in the application bundle + * Bug 10534: Don't advertise the help desk directly anymore + * Translation updates + * Update HTTPS-Everywhere to 5.1.6 + * Update NoScript to 2.9.0.11 + * Update meek to 0.22 (tag 0.22-18371-2) + * Bug 18371: Symlinks are incompatible with Gatekeeper signing + * Bug 15197 and child tickets: Rebase Tor Browser patches to ESR 45 + * Bug 18042: Disable SHA1 certificate support + * Bug 18821: Disable libmdns support for desktop and mobile + * Bug 18848: Disable additional welcome URL shown on first start + * Bug 14970: Exempt our extensions from signing requirement + * Bug 16328: Disable MediaDevices.enumerateDevices + * Bug 16673: Disable HTTP Alternative-Services + * Bug 17167: Disable Mozilla's tracking protection + * Bug 18603: Disable performance-based WebGL fingerprinting option + * Bug 18738: Disable Selfsupport and Unified Telemetry + * Bug 18799: Disable Network Tickler + * Bug 18800: Remove DNS lookup in lockfile code + * Bug 18801: Disable dom.push preferences + * Bug 18802: Remove the JS-based Flash VM (Shumway) + * Bug 18863: Disable MozTCPSocket explicitly + * Bug 15640: Place Canvas MediaStream behind site permission + * Bug 16326: Verify cache isolation for Request and Fetch APIs + * Bug 18741: Fix OCSP and favicon isolation for ESR 45 + * Bug 16998: Disable <link rel="preconnect"> for now + * Bug 18726: Add new default obfs4 bridge (GreenBelt) + * Windows + * Bug 13419: Support ICU in Windows builds + * Bug 16874: Fix broken https://sports.yahoo.com/dailyfantasy page + * Bug 18767: Context menu is broken on Windows in ESR 45 based Tor Browser + * OS X + * Bug 6540: Support OS X Gatekeeper + * Bug 13252: Tor Browser should not store data in the application bundle + * Build System + * All Platforms + * Bug 18127: Add LXC support for building with Debian guest VMs + * Bug 16224: Don't use BUILD_HOSTNAME anymore in Firefox builds + * Windows + * Bug 17895: Use NSIS 2.51 for installer to avoid DLL hijacking + * Bug 18290: Bump mingw-w64 commit we use + * OS X + * Bug 18331: Update toolchain for Firefox 45 ESR + * Bug 18690: Switch to Debian Wheezy guest VMs + * Linux + * Bug 18699: Stripping fails due to obsolete Browser/components directory + * Bug 18698: Include libgconf2-dev for our Linux builds + Tor Browser 6.0a4-hardened -- March 17 2016 * All Platforms * Update Firefox to 38.7.1esr

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] fixup! Bug #6253: Add canvas image extraction prompt.
by gk＠torproject.org 22 Apr '16

22 Apr '16

commit 916c78a0a56a38763077634cd492cfdcb2e37b81 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Mar 28 17:04:07 2016 -0400 fixup! Bug #6253: Add canvas image extraction prompt. Place Canvas MediaStream behind site permission prompt (#15640). --- dom/html/HTMLCanvasElement.cpp | 46 ++++++++++++++++++++++++++++++++---------- dom/html/HTMLCanvasElement.h | 5 ++++- 2 files changed, 39 insertions(+), 12 deletions(-) diff --git a/dom/html/HTMLCanvasElement.cpp b/dom/html/HTMLCanvasElement.cpp index 314bf48..dd74d9f 100644 --- a/dom/html/HTMLCanvasElement.cpp +++ b/dom/html/HTMLCanvasElement.cpp @@ -59,8 +59,10 @@ class RequestedFrameRefreshObserver : public nsARefreshObserver public: RequestedFrameRefreshObserver(HTMLCanvasElement* const aOwningElement, - nsRefreshDriver* aRefreshDriver) + nsRefreshDriver* aRefreshDriver, + bool aReturnPlaceholderData) : mRegistered(false), + mReturnPlaceholderData(aReturnPlaceholderData), mOwningElement(aOwningElement), mRefreshDriver(aRefreshDriver) { @@ -68,7 +70,8 @@ public: } static already_AddRefed<DataSourceSurface> - CopySurface(const RefPtr<SourceSurface>& aSurface) + CopySurface(const RefPtr<SourceSurface>& aSurface, + bool aReturnPlaceholderData) { RefPtr<DataSourceSurface> data = aSurface->GetDataSurface(); if (!data) { @@ -97,12 +100,23 @@ public: MOZ_ASSERT(data->GetSize() == copy->GetSize()); MOZ_ASSERT(data->GetFormat() == copy->GetFormat()); - memcpy(write.GetData(), read.GetData(), - write.GetStride() * copy->GetSize().height); + if (aReturnPlaceholderData) { + // If returning placeholder data, fill the frame copy with white pixels. + memset(write.GetData(), 0xFF, + write.GetStride() * copy->GetSize().height); + } else { + memcpy(write.GetData(), read.GetData(), + write.GetStride() * copy->GetSize().height); + } return copy.forget(); } + void SetReturnPlaceholderData(bool aReturnPlaceholderData) + { + mReturnPlaceholderData = aReturnPlaceholderData; + } + void WillRefresh(TimeStamp aTime) override { MOZ_ASSERT(NS_IsMainThread()); @@ -128,8 +142,8 @@ public: return; } - RefPtr<DataSourceSurface> copy = CopySurface(snapshot); - + RefPtr<DataSourceSurface> copy = CopySurface(snapshot, + mReturnPlaceholderData); mOwningElement->SetFrameCapture(copy.forget()); mOwningElement->MarkContextCleanForFrameCapture(); } @@ -177,6 +191,7 @@ private: } bool mRegistered; + bool mReturnPlaceholderData; HTMLCanvasElement* const mOwningElement; RefPtr<nsRefreshDriver> mRefreshDriver; }; @@ -682,8 +697,13 @@ HTMLCanvasElement::CaptureStream(const Optional<double>& aFrameRate, return nullptr; } + // Check site-specific permission and display prompt if appropriate. + // If no permission, arrange for the frame capture listener to return + // all-white, opaque image data. + bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc(), + nsContentUtils::GetCurrentJSContext()); stream->CreateOwnDOMTrack(videoTrackId, MediaSegment::VIDEO); - RegisterFrameCaptureListener(stream->FrameCaptureListener()); + RegisterFrameCaptureListener(stream->FrameCaptureListener(), usePlaceholder); return stream.forget(); } @@ -693,7 +713,7 @@ HTMLCanvasElement::ExtractData(JSContext* aCx, const nsAString& aOptions, nsIInputStream** aStream) { - // Check site-speciifc permission and display prompt if appropriate. + // Check site-specific permission and display prompt if appropriate. // If no permission, return all-white, opaque image data. bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc(), aCx); return ImageEncoder::ExtractData(aType, @@ -766,7 +786,7 @@ HTMLCanvasElement::ToBlob(JSContext* aCx, nsCOMPtr<nsIGlobalObject> global = OwnerDoc()->GetScopeObject(); MOZ_ASSERT(global); - // Check site-speciifc permission and display prompt if appropriate. + // Check site-specific permission and display prompt if appropriate. // If no permission, return all-white, opaque image data. bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc(), aCx); CanvasRenderingContextHelper::ToBlob(aCx, global, aCallback, aType, @@ -1131,7 +1151,8 @@ HTMLCanvasElement::IsContextCleanForFrameCapture() } void -HTMLCanvasElement::RegisterFrameCaptureListener(FrameCaptureListener* aListener) +HTMLCanvasElement::RegisterFrameCaptureListener(FrameCaptureListener* aListener, + bool aReturnPlaceholderData) { WeakPtr<FrameCaptureListener> listener = aListener; @@ -1158,7 +1179,10 @@ HTMLCanvasElement::RegisterFrameCaptureListener(FrameCaptureListener* aListener) MOZ_RELEASE_ASSERT(driver); mRequestedFrameRefreshObserver = - new RequestedFrameRefreshObserver(this, driver); + new RequestedFrameRefreshObserver(this, driver, aReturnPlaceholderData); + } else { + mRequestedFrameRefreshObserver->SetReturnPlaceholderData( + aReturnPlaceholderData); } mRequestedFrameRefreshObserver->Register(); diff --git a/dom/html/HTMLCanvasElement.h b/dom/html/HTMLCanvasElement.h index 542f11b..6ed7bbd 100644 --- a/dom/html/HTMLCanvasElement.h +++ b/dom/html/HTMLCanvasElement.h @@ -263,8 +263,11 @@ public: * The registered FrameCaptureListeners are stored as WeakPtrs, thus it's the * caller's responsibility to keep them alive. Once a registered * FrameCaptureListener is destroyed it will be automatically deregistered. + * If aReturnPlaceholderData is true, white data is captured instead of the + * actual canvas contents. */ - void RegisterFrameCaptureListener(FrameCaptureListener* aListener); + void RegisterFrameCaptureListener(FrameCaptureListener* aListener, + bool aReturnPlaceholderData); /* * Returns true when there is at least one registered FrameCaptureListener

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] squash! Bug #13749.2: Regression tests for first-party isolation of cache
by gk＠torproject.org 22 Apr '16

22 Apr '16

commit e6b06c64d7a2294a0f3def31d8e51acd751f40c9 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Apr 20 14:07:37 2016 -0700 squash! Bug #13749.2: Regression tests for first-party isolation of cache Test for network isolation as well --- netwerk/test/browser/browser_cacheFirstParty.js | 36 +++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/netwerk/test/browser/browser_cacheFirstParty.js b/netwerk/test/browser/browser_cacheFirstParty.js index 970043d..08b3231 100644 --- a/netwerk/test/browser/browser_cacheFirstParty.js +++ b/netwerk/test/browser/browser_cacheFirstParty.js @@ -25,6 +25,8 @@ Cu.import("resource://gre/modules/Task.jsm"); let tempScope = {}; // Avoid 'leaked window property' error. Cu.import("resource://gre/modules/LoadContextInfo.jsm", tempScope); let LoadContextInfo = tempScope.LoadContextInfo; +let thirdPartyUtil = Cc["@mozilla.org/thirdpartyutil;1"] + .getService(Ci.mozIThirdPartyUtil); // __listen(target, eventType, timeoutMs, useCapture)__. // Calls addEventListener on target, with the given eventType. @@ -144,10 +146,43 @@ let checkCachePopulation = function* (pref, numberOfDomains) { } }; +// __observeChannels(onChannel)__. +// onChannel is called for every http channel request. Returns a zero-arg stop() function. +let observeChannels = function (onChannel) { + let channelObserver = { + observe: function(subject, topic, data) { + if (topic === "http-on-modify-request") { + onChannel(subject.QueryInterface(Components.interfaces.nsIHttpChannel)); + } + } + }; + Services.obs.addObserver(channelObserver, "http-on-modify-request", /* ownsWeak */ false); + return function () { Services.obs.removeObserver(channelObserver, "http-on-modify-request"); }; +}; + +// __channelFirstPartyHost(aChannel)__. +// Returns the first-party host for the given channel. +let channelFirstPartyHost = function (aChannel) { + let channel = aChannel.QueryInterface(Ci.nsIChannel), + firstPartyURI = thirdPartyUtil.getFirstPartyURIFromChannel(channel, true) + .QueryInterface(Ci.nsIURI); + return thirdPartyUtil.getFirstPartyHostForIsolation(firstPartyURI); +} + // The main testing function. // Launch a Task.jsm coroutine so we can open tabs and wait for each of them to open, // one by one. add_task(function* () { + // Here we check to see if each channel has the correct first party assigned. + // All "thirdPartyChild" resources are loaded from a third-party + // "example.net" host, but they should all report either an "example.com" + // or an "example.org" first-party domain. + let stopObservingChannels = observeChannels(function (channel) { + if (channel.originalURI.spec.contains("thirdPartyChild")) { + let firstPartyHost = channelFirstPartyHost(channel); + ok(firstPartyHost === "example.com" || firstPartyHost === "example.org", "first party is " + firstPartyHost); + } + }); // Keep original pref value for restoring after the tests. let originalPrefValue = Services.prefs.getIntPref(privacyPref); // Test the pref with both values: 2 (isolating by first party) or 0 (not isolating) @@ -169,6 +204,7 @@ add_task(function* () { // Clean up by removing tabs. tabs.forEach(tab => gBrowser.removeTab(tab)); } + stopObservingChannels(); // Restore the pref to its original value. Services.prefs.setIntPref(privacyPref, originalPrefValue); });

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] squash! Bug #13749.2: Regression tests for first-party isolation of cache
by gk＠torproject.org 22 Apr '16

22 Apr '16

commit 3560a0c1a998f1e875e06bea15fb3d1203da385e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Apr 19 15:39:00 2016 -0700 squash! Bug #13749.2: Regression tests for first-party isolation of cache Bug #16326: Add regression test for isolating fetch and request in page scripts and workers --- netwerk/test/browser/browser.ini | 16 ++++++++++------ netwerk/test/browser/browser_cacheFirstParty.js | 8 ++++++-- netwerk/test/browser/thirdPartyChild.fetch.html | 8 ++++++++ netwerk/test/browser/thirdPartyChild.iframe.html | 3 +++ netwerk/test/browser/thirdPartyChild.request.html | 8 ++++++++ netwerk/test/browser/thirdPartyChild.worker.fetch.html | 8 ++++++++ netwerk/test/browser/thirdPartyChild.worker.js | 4 ++++ netwerk/test/browser/thirdPartyChild.worker.request.html | 8 ++++++++ 8 files changed, 55 insertions(+), 8 deletions(-) diff --git a/netwerk/test/browser/browser.ini b/netwerk/test/browser/browser.ini index 5ab1546..9bc3361 100644 --- a/netwerk/test/browser/browser.ini +++ b/netwerk/test/browser/browser.ini @@ -2,19 +2,23 @@ support-files = firstPartyGrandParent.html firstPartyParent.html - thirdPartyChild.link.css - thirdPartyChild.iframe.html - thirdPartyChild.script.js thirdPartyChild.audio.ogg - thirdPartyChild.video.ogv thirdPartyChild.embed.png + thirdPartyChild.favicon.ico + thirdPartyChild.fetch.html + thirdPartyChild.iframe.html thirdPartyChild.img.png + thirdPartyChild.link.css thirdPartyChild.object.png + thirdPartyChild.request.html + thirdPartyChild.script.js + thirdPartyChild.track.vtt + thirdPartyChild.video.ogv + thirdPartyChild.worker.fetch.html thirdPartyChild.worker.js + thirdPartyChild.worker.request.html thirdPartyChild.worker.xhr.html thirdPartyChild.xhr.html - thirdPartyChild.track.vtt - thirdPartyChild.favicon.ico [browser_cacheFirstParty.js] [browser_NetUtil.js] diff --git a/netwerk/test/browser/browser_cacheFirstParty.js b/netwerk/test/browser/browser_cacheFirstParty.js index 79abffb..970043d 100644 --- a/netwerk/test/browser/browser_cacheFirstParty.js +++ b/netwerk/test/browser/browser_cacheFirstParty.js @@ -106,10 +106,12 @@ let privacyPref = "privacy.thirdparty.isolate", duplicatedDomains = [].concat(domains, domains), // We will check cache for example.net content from // iframe, link (css), script, img, object, embed, xhr, audio, video, - // track, favicon + // track, favicon, fetch, request suffixes = ["iframe.html", "link.css", "script.js", "img.png", "object.png", "embed.png", "xhr.html", "worker.xhr.html", "audio.ogg", - "video.ogv", "track.vtt", "favicon.ico" ]; + "video.ogv", "track.vtt", "favicon.ico", + "fetch.html", "worker.fetch.html", + "request.html", "worker.request.html"]; // __checkCachePopulation(pref, numberOfDomains)__. // Check if the number of entries found in the cache for each @@ -120,6 +122,8 @@ let checkCachePopulation = function* (pref, numberOfDomains) { // Collect cache data. let data = yield cacheDataForContext(LoadContextInfo.default, 2000); data = data.concat(yield cacheDataForContext(LoadContextInfo.private, 2000)); + // `fetch` is cached in storage where both private and anonymous flags are set to true. + data = data.concat(yield cacheDataForContext(LoadContextInfo.custom(true, true, {appid : null}), 2000)); /* // Uncomment to log all of the cache entries (useful for debugging). for (let cacheEntry of data) { diff --git a/netwerk/test/browser/thirdPartyChild.fetch.html b/netwerk/test/browser/thirdPartyChild.fetch.html new file mode 100644 index 0000000..65a9bbd --- /dev/null +++ b/netwerk/test/browser/thirdPartyChild.fetch.html @@ -0,0 +1,8 @@ +<!DOCTYPE html> +<html> +<meta content="text/html;charset=utf-8" http-equiv="Content-Type"> + +<body> +<div>thirdPartyChild.fetch.html</div> +</body> +</html> diff --git a/netwerk/test/browser/thirdPartyChild.iframe.html b/netwerk/test/browser/thirdPartyChild.iframe.html index bbd6043..56f6df2 100644 --- a/netwerk/test/browser/thirdPartyChild.iframe.html +++ b/netwerk/test/browser/thirdPartyChild.iframe.html @@ -9,6 +9,9 @@ xhr.open("GET", "http://example.net/browser/netwerk/test/browser/thirdPartyChild.xhr.html", true); xhr.send(); var worker = new Worker("http://example.net/browser/netwerk/test/browser/thirdPartyChild.worker.js"); + + fetch("thirdPartyChild.fetch.html", {cache: "force-cache"} ); + fetch(new Request("thirdPartyChild.request.html"), {cache: "force-cache"} ); </script> </body> </html> diff --git a/netwerk/test/browser/thirdPartyChild.request.html b/netwerk/test/browser/thirdPartyChild.request.html new file mode 100644 index 0000000..46fffde0 --- /dev/null +++ b/netwerk/test/browser/thirdPartyChild.request.html @@ -0,0 +1,8 @@ +<!DOCTYPE html> +<html> +<meta content="text/html;charset=utf-8" http-equiv="Content-Type"> + +<body> +<div>thirdPartyChild.request.html</div> +</body> +</html> diff --git a/netwerk/test/browser/thirdPartyChild.worker.fetch.html b/netwerk/test/browser/thirdPartyChild.worker.fetch.html new file mode 100644 index 0000000..b44bc7d --- /dev/null +++ b/netwerk/test/browser/thirdPartyChild.worker.fetch.html @@ -0,0 +1,8 @@ +<!DOCTYPE html> +<html> +<meta content="text/html;charset=utf-8" http-equiv="Content-Type"> + +<body> +<div>thirdPartyChild.worker.fetch.html</div> +</body> +</html> diff --git a/netwerk/test/browser/thirdPartyChild.worker.js b/netwerk/test/browser/thirdPartyChild.worker.js index 49154b7..34627b2 100644 --- a/netwerk/test/browser/thirdPartyChild.worker.js +++ b/netwerk/test/browser/thirdPartyChild.worker.js @@ -1,3 +1,7 @@ var xhr = new XMLHttpRequest(); xhr.open("GET", "http://example.net/browser/netwerk/test/browser/thirdPartyChild.worker.xhr.…", true); xhr.send(); + +fetch("http://example.net/browser/netwerk/test/browser/thirdPartyChild.worker.fetc…", {cache: "force-cache"} ); +var myRequest = new Request("http://example.net/browser/netwerk/test/browser/thirdPartyChild.worker.requ…"); +fetch(myRequest, {cache: "force-cache"} ); diff --git a/netwerk/test/browser/thirdPartyChild.worker.request.html b/netwerk/test/browser/thirdPartyChild.worker.request.html new file mode 100644 index 0000000..c0306b7 --- /dev/null +++ b/netwerk/test/browser/thirdPartyChild.worker.request.html @@ -0,0 +1,8 @@ +<!DOCTYPE html> +<html> +<meta content="text/html;charset=utf-8" http-equiv="Content-Type"> + +<body> +<div>thirdPartyChild.worker.request.html</div> +</body> +</html>

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] fixup! Bug #13670.1: Isolate favicon requests by first party
by gk＠torproject.org 22 Apr '16

22 Apr '16

commit 9c9b94f764495c8500093622c611029883badc97 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Apr 21 17:07:05 2016 -0700 fixup! Bug #13670.1: Isolate favicon requests by first party --- browser/base/content/tabbrowser.xml | 2 +- toolkit/content/widgets/menu.xml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml index 6afe7e8..1a92ae7 100644 --- a/browser/base/content/tabbrowser.xml +++ b/browser/base/content/tabbrowser.xml @@ -5928,7 +5928,7 @@ class="tab-throbber" role="presentation" layer="true" /> - <xul:image xbl:inherits="src=image,fadein,pinned,selected,visuallyselected,busy,crashed" + <xul:image xbl:inherits="src=image,fadein,pinned,selected,visuallyselected,busy,crashed,firstparty" anonid="tab-icon-image" class="tab-icon-image" validate="never" diff --git a/toolkit/content/widgets/menu.xml b/toolkit/content/widgets/menu.xml index 26dcad4..a9ba686 100644 --- a/toolkit/content/widgets/menu.xml +++ b/toolkit/content/widgets/menu.xml @@ -214,7 +214,7 @@ <content> <xul:hbox class="menu-iconic-left" align="center" pack="center" xbl:inherits="selected,_moz-menuactive,disabled,checked"> - <xul:image class="menu-iconic-icon" xbl:inherits="src=image,validate,src"/> + <xul:image class="menu-iconic-icon" xbl:inherits="src=image,validate,src,firstparty"/> </xul:hbox> <xul:label class="menu-iconic-text" flex="1" xbl:inherits="value=label,accesskey,crop" crop="right"/> <children/> @@ -228,7 +228,7 @@ <content> <xul:hbox class="menu-iconic-left" align="center" pack="center" xbl:inherits="selected,disabled,checked"> - <xul:image class="menu-iconic-icon" xbl:inherits="src=image,validate,src"/> + <xul:image class="menu-iconic-icon" xbl:inherits="src=image,validate,src,firstparty"/> </xul:hbox> <xul:label class="menu-iconic-text" flex="1" xbl:inherits="value=label,accesskey,crop" crop="right"/> </content> @@ -238,7 +238,7 @@ <content> <xul:hbox class="menu-iconic-left" align="center" pack="center" xbl:inherits="selected,disabled,checked"> - <xul:image class="menu-iconic-icon" xbl:inherits="src=image,validate,src"/> + <xul:image class="menu-iconic-icon" xbl:inherits="src=image,validate,src,firstparty"/> </xul:hbox> <xul:label class="menu-iconic-text" flex="1" xbl:inherits="value=label,crop" crop="right"/> </content> @@ -248,7 +248,7 @@ <content> <xul:hbox class="menu-iconic-left" align="center" pack="center" xbl:inherits="selected,disabled,checked"> - <xul:image class="menu-iconic-icon" xbl:inherits="src=image,validate,src"/> + <xul:image class="menu-iconic-icon" xbl:inherits="src=image,validate,src,firstparty"/> </xul:hbox> <xul:label class="menu-iconic-text" xbl:inherits="value=label,accesskey,crop" crop="right" flex="1"/> <xul:label class="menu-iconic-text menu-description" xbl:inherits="value=description" crop="right" flex="10000"/> @@ -259,7 +259,7 @@ extends="chrome://global/content/bindings/menu.xml#menu-base"> <content> <xul:hbox class="menu-iconic-left" align="center" pack="center"> - <xul:image class="menu-iconic-icon" xbl:inherits="src=image"/> + <xul:image class="menu-iconic-icon" xbl:inherits="src=image,firstparty"/> </xul:hbox> <xul:label class="menu-iconic-text" flex="1" xbl:inherits="value=label,accesskey,crop" crop="right"/> <xul:hbox class="menu-accel-container" anonid="accel">

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] fixup! Bug #5742: API allows you to get the url bar URI for a channel or nsIDocument.
by gk＠torproject.org 22 Apr '16

22 Apr '16

commit 1f16ce85bc145032a6954a2b8ae81875c6ec1dbf Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Apr 20 11:05:51 2016 -0700 fixup! Bug #5742: API allows you to get the url bar URI for a channel or nsIDocument. See also: Bug 18741: Ensure that favicons and similar "content images in chrome" get the correct first-party assigned. --- dom/base/ThirdPartyUtil.cpp | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/dom/base/ThirdPartyUtil.cpp b/dom/base/ThirdPartyUtil.cpp index 762e2cf..26c95f5 100644 --- a/dom/base/ThirdPartyUtil.cpp +++ b/dom/base/ThirdPartyUtil.cpp @@ -543,24 +543,26 @@ ThirdPartyUtil::GetFirstPartyURIInternal(nsIChannel *aChannel, // Favicons, or other items being loaded in chrome that belong // to a particular web site should be assigned that site's first party. - if (aNode && aNode->IsElement() && aNode->OwnerDoc() && - nsContentUtils::IsChromeDoc(aNode->OwnerDoc())) { - nsTArray<nsINode*> nodeAncestors; - nsContentUtils::GetAncestors(aNode, nodeAncestors); - for (nsINode* nodeAncestor : nodeAncestors) { - if (nodeAncestor->IsElement()) { - nsString firstparty; - nodeAncestor->AsElement()->GetAttribute(NS_LITERAL_STRING("firstparty"), firstparty); - if (!firstparty.IsEmpty()) { - nsCOMPtr<nsIURI> tempURI; - rv = NS_NewURI(getter_AddRefs(tempURI), firstparty); - if (rv != NS_OK) { - return rv; - } else { - NS_ADDREF(*aOutput = tempURI); - return NS_OK; - } - } + // If the originating node has a "firstparty" attribute + // containing a URI string, then it is returned. + nsCOMPtr<nsINode> node = aNode; + if (!node && aChannel) { + if (nsCOMPtr<nsILoadInfo> loadInfo = aChannel->GetLoadInfo()) { + node = loadInfo->LoadingNode(); + } + } + if (node && node->IsElement() && node->OwnerDoc() && + nsContentUtils::IsChromeDoc(node->OwnerDoc())) { + nsString firstparty; + node->AsElement()->GetAttribute(NS_LITERAL_STRING("firstparty"), firstparty); + if (!firstparty.IsEmpty()) { + nsCOMPtr<nsIURI> tempURI; + rv = NS_NewURI(getter_AddRefs(tempURI), firstparty); + if (rv != NS_OK) { + return rv; + } else { + NS_ADDREF(*aOutput = tempURI); + return NS_OK; } } }

1 0

[tor-browser-bundle/maint-5.5] Changelog update
by gk＠torproject.org 22 Apr '16

22 Apr '16

commit 36f1a7455a79caa624eb4276cd0e4f168e95698e Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 22 18:12:57 2016 +0000 Changelog update --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index ef982de..cd424e5 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -5,6 +5,7 @@ Tor Browser 5.5.5 -- April 26 2016 * Bug 10534: Don't advertise the help desk directly anymore * Translation updates * Update HTTPS-Everywhere to 5.1.6 + * Update NoScript to 2.9.0.11 * Bug 18726: Add new default obfs4 bridge (GreenBelt) Tor Browser 5.5.4 -- March 16 2016

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 22 Apr '16

22 Apr '16

commit 659e0bdad18e5f4550cb7de8b4248354af5870c9 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 22 08:49:32 2016 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. We disable `media.navigator.enabled` as a defense-in-depth to avoid media devices getting exposed. (bug 16328) --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index fbe6fb4..b2beff5 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -175,6 +175,9 @@ pref("plugin.state.flash", 1); pref("plugins.hide_infobar_for_missing_plugin", true); pref("plugins.hideMissingPluginsNotification", true); pref("media.peerconnection.enabled", false); // Disable WebRTC interfaces +// Disables media devices but only if `media.peerconnection.enabled` is set to +// `false` as well. (see bug 16328 for this defense-in-depth measure) +pref("media.navigator.enabled", false); // GMPs: We make sure they don't show up on the Add-on panel and confuse users. // And the external update/donwload server must not get pinged. We apply a // clever solution for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=769716.

1 0

[tor-browser-bundle/master] Fold in older changelogs
by gk＠torproject.org 22 Apr '16

22 Apr '16

commit 54958f512cfc610208f1fe851d3f766940dfb0ae Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 22 14:17:32 2016 +0000 Fold in older changelogs --- Bundle-Data/Docs/ChangeLog.txt | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 3b3cfd8..8c5d733 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,10 @@ +Tor Browser 6.0a4-hardened -- March 17 2016 + * All Platforms + * Update Firefox to 38.7.1esr + * Update Torbutton to 1.9.5.2 + * Bug 18557: Exempt Graphite from the Security Slider + * Bug 18536: Make Mosaddegh and MaBishomarim available on port 80 and 443 + Tor Browser 6.0a4 -- March 17 2016 * All Platforms * Update Firefox to 38.7.1esr @@ -5,6 +12,13 @@ Tor Browser 6.0a4 -- March 17 2016 * Bug 18557: Exempt Graphite from the Security Slider * Bug 18536: Make Mosaddegh and MaBishomarim available on port 80 and 443 +Tor Browser 5.5.4 -- March 16 2016 + * All Platforms + * Update Firefox to 38.7.1esr + * Update Torbutton to 1.9.4.5 + * Bug 18557: Exempt Graphite from the Security Slider + * Bug 18536: Make Mosaddegh and MaBishomarim available on port 80 and 443 + Tor Browser 6.0a3-hardened -- March 8 * All Platforms * Update Firefox to 38.7.0esr @@ -108,6 +122,28 @@ Tor Browser 5.5.1 -- February 4 2016 * Linux * Bug 18172: Add Emoji support +Tor Browser 6.0a1-hardened -- January 27 2016 + * All Platforms + * Update Firefox to 38.6.0esr + * Update NoScript to 2.9.0.2 + * Update Torbutton to 1.9.5 + * Bug 16990: Show circuit display for connections using multi-party channels + * Bug 18019: Avoid empty prompt shown after non-en-US update + * Bug 18004: Remove Tor fundraising donation banner + * Code cleanup + * Translation updates + * Update Tor Launcher to 0.2.8.3 + * Bug 18113: Randomly permutate available default bridges of chosen type + * Bug 11773: Setup wizard UI flow improvements + * Translation updates + * Bug 17428: Remove Flashproxy + * Bug 18115+18104+18071+18091: Update/add new obfs4 bridge + * Bug 18072: Change recommended pluggable transport type to obfs4 + * Bug 18008: Create a new MAR Signing key and bake it into Tor Browser + * Bug 16322: Use onion address for DuckDuckGo search engine + * Bug 17917: Changelog after update is empty if JS is disabled + * Bug 17790: Map the proper SHIFT characters to the digit keys (fix of #15646) + Tor Browser 6.0a1 -- January 27 2016 * All Platforms * Update Firefox to 38.6.0esr

1 0

[tor-browser-bundle/master] Bug 17895: Build and use NSIS 2.51 with Debian patches
by gk＠torproject.org 22 Apr '16

22 Apr '16

commit 186c4e271355646eb4b9faadffaaa7fc0f986a3e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 21 23:46:08 2016 +0200 Bug 17895: Build and use NSIS 2.51 with Debian patches --- gitian/descriptors/windows/gitian-bundle.yml | 5 ++++- gitian/descriptors/windows/gitian-utils.yml | 28 ++++++++++++++++++++++++ gitian/fetch-inputs.sh | 6 +++-- gitian/mkbundle-windows.sh | 5 ++++- gitian/patches/nsis-missing-unistd-include.patch | 11 ++++++++++ gitian/verify-tags.sh | 2 +- gitian/versions | 7 ++++++ gitian/versions.alpha | 7 ++++++ gitian/versions.nightly | 7 ++++++ 9 files changed, 73 insertions(+), 5 deletions(-) diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 5a165a7..4fe4bb6 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -7,7 +7,6 @@ architectures: packages: - "unzip" - "zip" -- "nsis" # Needed to compensate NSIS's failure of regenerating the PE-file checksum and # proper padding. - "python-pefile" @@ -50,6 +49,7 @@ files: - "mar-tools-win32.zip" - "tbb-docs.zip" - "pe_checksum_fix.py" +- "nsis-win32-utils.zip" script: | INSTDIR="$HOME/install" source versions @@ -71,6 +71,9 @@ script: | # Extract the MAR tools. unzip -d ~/build ~/build/mar-tools-win32.zip MARTOOLS=~/build/mar-tools + # Extract nsis + unzip -d $INSTDIR ~/build/nsis-win32-utils.zip + export PATH=$INSTDIR/nsis/bin:$PATH # mkdir -p $OUTDIR/ mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff(a)eff.org diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index ae938af..2767bad 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -13,6 +13,9 @@ packages: - "g++-mingw-w64-i686" # Needed for compiling gcc. - "libmpc-dev" +# Needed for compiling nsis. +- "scons" +- "libcppunit-dev" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "http://git.code.sf.net/p/mingw-w64/mingw-w64" @@ -30,6 +33,9 @@ files: - "peXXigen.patch" - "versions" - "dzip.sh" +- "nsis.tar.bz2" +- "nsis-debian.tar.xz" +- "nsis-missing-unistd-include.patch" script: | INSTDIR="$HOME/install" source versions @@ -157,6 +163,27 @@ script: | make install cd .. + # Building nsis + tar xf nsis.tar.bz2 + cd nsis-${NSIS_VER}-src + tar xf ../nsis-debian.tar.xz + patch -p1 < ../nsis-missing-unistd-include.patch + # nsis_system_zlib.patch and parallel_build.patch cause build errors + # so we remove them + rm -f debian/patches/nsis_system_zlib.patch + rm -f debian/patches/parallel_build.patch + for patch in $(grep '\.patch$' debian/patches/series) + do + [ -f debian/patches/$patch ] && patch -p1 < debian/patches/$patch + done + # When the gcc-mingw-w64-i686 package is installed, files from + # /usr/i686-w64-mingw32/include are used, causing the build to fail. + # To prevent that we remove the gcc-mingw-w64-i686 package. + sudo -i apt-get remove -y gcc-mingw-w64-i686 + scons APPEND_CCFLAGS="-fgnu89-inline" VERSION=${NSIS_VER} SKIPUTILS='NSIS Menu' XGCC_W32_PREFIX=i686-w64-mingw32- PREFIX=$INSTDIR/nsis + scons APPEND_CCFLAGS="-fgnu89-inline" VERSION=${NSIS_VER} SKIPUTILS='NSIS Menu' XGCC_W32_PREFIX=i686-w64-mingw32- PREFIX=$INSTDIR/nsis install + cd .. + # Grabbing the remaining results cd $INSTDIR # We might want to bump binutils independent of bumping mingw-w64. @@ -168,4 +195,5 @@ script: | ~/build/dzip.sh openssl-$OPENSSL_VER-win32-utils.zip openssl ~/build/dzip.sh gmp-$GMP_VER-win32-utils.zip gmp ~/build/dzip.sh gcclibs-$GCC_VER-win32-utils.zip gcclibs + ~/build/dzip.sh nsis-$NSIS_VER-win32-utils.zip nsis cp *-utils.zip $OUTDIR/ diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index da487f4..99b984b 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -162,7 +162,7 @@ do get "${!PACKAGE}" "${MIRROR_URL_ASN}${!PACKAGE}" done -for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT +for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN do URL="${i}_URL" PACKAGE="${i}_PACKAGE" @@ -174,7 +174,7 @@ wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4_OLD CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4_OLD CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -244,6 +244,8 @@ ln -sf "$SETUPTOOLS_PACKAGE" setuptools.tar.gz ln -sf "$GMP_PACKAGE" gmp.tar.bz2 ln -sf "$PARSLEY_PACKAGE" parsley.tar.gz ln -sf "$GO_PACKAGE" go.tar.gz +ln -sf "$NSIS_PACKAGE" nsis.tar.bz2 +ln -sf "$NSIS_DEBIAN_PACKAGE" nsis-debian.tar.xz # Fetch latest gitian-builder itself # XXX - this is broken if a non-standard inputs dir is selected using the command line flag. diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 2de0f1e..1afa840 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -106,7 +106,8 @@ if [ ! -f inputs/binutils-$BINUTILS_VER-win32-utils.zip -o \ ! -f inputs/zlib-${ZLIB_TAG_ORIG#v}-win32-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-win32-utils.zip -o \ ! -f inputs/openssl-$OPENSSL_VER-win32-utils.zip -o \ - ! -f inputs/gmp-$GMP_VER-win32-utils.zip ]; + ! -f inputs/gmp-$GMP_VER-win32-utils.zip -o \ + ! -f inputs/nsis-$NSIS_VER-win32-utils.zip ]; then echo echo "****** Starting Utilities Component of Windows Bundle (1/5 for Windows) ******" @@ -128,6 +129,7 @@ then ln -sf gmp-$GMP_VER-win32-utils.zip gmp-win32-utils.zip ln -sf gcclibs-$GCC_VER-win32-utils.zip gcclibs-win32-utils.zip ln -sf gcc-$GCC_VER-linux32-precise-utils.zip gcc-linux32-precise-utils.zip + ln -sf nsis-$NSIS_VER-win32-utils.zip nsis-win32-utils.zip cd .. #cp -a result/utils-win-res.yml inputs/ else @@ -144,6 +146,7 @@ else ln -sf gmp-$GMP_VER-win32-utils.zip gmp-win32-utils.zip ln -sf gcclibs-$GCC_VER-win32-utils.zip gcclibs-win32-utils.zip ln -sf gcc-$GCC_VER-linux32-precise-utils.zip gcc-linux32-precise-utils.zip + ln -sf nsis-$NSIS_VER-win32-utils.zip nsis-win32-utils.zip cd .. fi diff --git a/gitian/patches/nsis-missing-unistd-include.patch b/gitian/patches/nsis-missing-unistd-include.patch new file mode 100644 index 0000000..4f4fdd2 --- /dev/null +++ b/gitian/patches/nsis-missing-unistd-include.patch @@ -0,0 +1,11 @@ +--- nsis-2.46-src.old/Source/util.h 2009-03-28 09:47:26.000000000 +0000 ++++ nsis-2.46-src/Source/util.h 2012-01-16 12:22:14.967416817 +0000 +@@ -17,6 +17,8 @@ + #ifndef _UTIL_H_ + #define _UTIL_H_ + ++#include <unistd.h> ++ + #include <string> // for std::string + + #include "boost/scoped_ptr.hpp" // for boost::scoped_ptr diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 95bdaf1..a966626 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -143,7 +143,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4_OLD CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4_OLD CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index 4dd8aa5..a18afab 100755 --- a/gitian/versions +++ b/gitian/versions @@ -54,6 +54,7 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 GO_VER=1.4.2 +NSIS_VER=2.51 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -75,6 +76,8 @@ PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz +NSIS_PACKAGE=nsis-${NSIS_VER}-src.tar.bz2 +NSIS_DEBIAN_PACKAGE=nsis_${NSIS_VER}-1.debian.tar.xz STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf @@ -99,6 +102,8 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b +NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 +NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 @@ -126,6 +131,8 @@ PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} +NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} +NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIAN_PACKAGE} STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 7e1dd98..0ba31d2 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -61,6 +61,7 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 GO_VER=1.4.2 +NSIS_VER=2.51 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -83,6 +84,8 @@ PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz +NSIS_PACKAGE=nsis-${NSIS_VER}-src.tar.bz2 +NSIS_DEBIAN_PACKAGE=nsis_${NSIS_VER}-1.debian.tar.xz STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf @@ -108,6 +111,8 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b +NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 +NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 @@ -136,6 +141,8 @@ PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} +NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} +NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIAN_PACKAGE} STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… diff --git a/gitian/versions.nightly b/gitian/versions.nightly index bf2e2a6..dab84ef 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -68,6 +68,7 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 GO_VER=1.4.2 +NSIS_VER=2.51 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -90,6 +91,8 @@ PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz +NSIS_PACKAGE=nsis-${NSIS_VER}-src.tar.bz2 +NSIS_DEBIAN_PACKAGE=nsis_${NSIS_VER}-1.debian.tar.xz STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf @@ -115,6 +118,8 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b +NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 +NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 @@ -143,6 +148,8 @@ PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} +NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} +NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIAN_PACKAGE} STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a…

1 0

[tor-browser-bundle/hardened-builds] Add a nightly-hardened target (for ease of nightly builds)
by gk＠torproject.org 22 Apr '16

22 Apr '16

commit 8551d6626b7e439f42277fd4edc87c6c6ec20eca Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 22 12:36:27 2016 +0000 Add a nightly-hardened target (for ease of nightly builds) --- gitian/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitian/Makefile b/gitian/Makefile index 36b5ec3..1aac5ed 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -2,6 +2,8 @@ TORSOCKS = torsocks all: clean resume +nightly-hardened: nightly + nightly: clean resume-nightly alpha: clean resume-alpha

1 0

[tor-browser-bundle/master] Release preparations for 6.0a5
by gk＠torproject.org 22 Apr '16

22 Apr '16

commit 6ff2f177e34a32fa554949ebb542fc52772b12ce Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 22 12:13:37 2016 +0000 Release preparations for 6.0a5 Version bumps; config.yml update --- gitian/versions.alpha | 27 +++++++++++++++++---------- tools/update-responses/config.yml | 13 ++++++------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 75b3089..7e1dd98 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -10,19 +10,22 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=38.7.1esr +FIREFOX_VERSION=45.1.0esr TORBROWSER_UPDATE_CHANNEL=alpha TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1 -TOR_TAG=tor-0.2.8.1-alpha -TORLAUNCHER_TAG=0.2.9 -TORBUTTON_TAG=1.9.5.2 -HTTPSE_TAG=5.1.4 +TOR_TAG=tor-0.2.8.2-alpha +TORLAUNCHER_TAG=0.2.9.1 +TORBUTTON_TAG=1.9.5.3 +HTTPSE_TAG=5.1.6 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable -MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 +CMAKE_TAG=v2.8.12.2 +LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74 # r247539 +CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539 +MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix @@ -30,7 +33,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.20 +MEEK_TAG=0.22-18371-2 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd @@ -39,7 +42,7 @@ GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 OBFS4_TAG=obfs4proxy-0.0.5 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 -GITIAN_TAG=tor-browser-builder-3.x-9 +GITIAN_TAG=tor-browser-builder-4-1 OPENSSL_VER=1.0.1s GMP_VER=5.1.3 @@ -47,6 +50,7 @@ FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.1.0 +CLANG_VER=r247539 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 @@ -61,8 +65,9 @@ GO_VER=1.4.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.4-fx+fn+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.11-fn+sm+fx.xpi TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz +CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll @@ -91,7 +96,8 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=94d036ff45116023bde97e6dee6c79daf2d28804764bfa8937f5d4d3463173f5 +NOSCRIPT_HASH=fdd965a69188ac651b08a7d3ada54821a89db10a4685aa73ba59edc0b8243390 +CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 @@ -114,6 +120,7 @@ NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources… +CCTOOLS_URL=https://people.torproject.org/~gk/mirrors/sources/${CCTOOLS_PACKAGE} OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 69e9a2c..a747fd6 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -9,7 +9,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 6.0a4 + alpha: 6.0a5 release: 5.5 versions: 5.5: @@ -23,13 +23,12 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 6.0a4: - platformVersion: 38.7.1 - detailsURL: https://blog.torproject.org/blog/tor-browser-60a4-released - download_url: https://www.torproject.org/dist/torbrowser/6.0a4 + 6.0a5: + platformVersion: 45.1.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-60a5-released + download_url: https://www.torproject.org/dist/torbrowser/6.0a5 incremental_from: - - 6.0a2 - - 6.0a3 + - 6.0a4 migrate_archs: osx32: osx64 osx32:

1 0

[tor-launcher/maint-0.2.9] Release preparations for 0.2.9.1
by gk＠torproject.org 22 Apr '16

22 Apr '16

commit 8895c856aeb452b4690a61865c471c2a524a2cc9 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 22 12:03:55 2016 +0000 Release preparations for 0.2.9.1 Translation updates and version bump --- src/chrome/locale/ach/network-settings.dtd | 2 +- src/chrome/locale/ach/torlauncher.properties | 7 +- src/chrome/locale/ady/network-settings.dtd | 2 +- src/chrome/locale/ady/torlauncher.properties | 7 +- src/chrome/locale/af/network-settings.dtd | 2 +- src/chrome/locale/af/torlauncher.properties | 7 +- src/chrome/locale/ak/network-settings.dtd | 2 +- src/chrome/locale/ak/torlauncher.properties | 7 +- src/chrome/locale/am/network-settings.dtd | 2 +- src/chrome/locale/am/torlauncher.properties | 7 +- src/chrome/locale/ar/network-settings.dtd | 26 ++--- src/chrome/locale/ar/progress.dtd | 2 +- src/chrome/locale/ar/torlauncher.properties | 7 +- src/chrome/locale/arn/network-settings.dtd | 2 +- src/chrome/locale/arn/torlauncher.properties | 7 +- src/chrome/locale/ast/network-settings.dtd | 2 +- src/chrome/locale/ast/torlauncher.properties | 7 +- src/chrome/locale/az/network-settings.dtd | 2 +- src/chrome/locale/az/torlauncher.properties | 7 +- src/chrome/locale/be/network-settings.dtd | 2 +- src/chrome/locale/be/torlauncher.properties | 7 +- src/chrome/locale/bg/network-settings.dtd | 22 ++--- src/chrome/locale/bg/progress.dtd | 2 +- src/chrome/locale/bg/torlauncher.properties | 7 +- src/chrome/locale/bn-BD/torlauncher.properties | 7 +- src/chrome/locale/bn-IN/network-settings.dtd | 2 +- src/chrome/locale/bn-IN/torlauncher.properties | 7 +- src/chrome/locale/bn/network-settings.dtd | 2 +- src/chrome/locale/bn/torlauncher.properties | 7 +- src/chrome/locale/bo/network-settings.dtd | 2 +- src/chrome/locale/bo/torlauncher.properties | 7 +- src/chrome/locale/br/network-settings.dtd | 2 +- src/chrome/locale/br/torlauncher.properties | 7 +- src/chrome/locale/bs/network-settings.dtd | 2 +- src/chrome/locale/bs/torlauncher.properties | 7 +- src/chrome/locale/ca/network-settings.dtd | 4 +- src/chrome/locale/ca/progress.dtd | 2 +- src/chrome/locale/ca/torlauncher.properties | 7 +- src/chrome/locale/cs/network-settings.dtd | 2 +- src/chrome/locale/cs/progress.dtd | 2 +- src/chrome/locale/cs/torlauncher.properties | 7 +- src/chrome/locale/csb/network-settings.dtd | 2 +- src/chrome/locale/csb/torlauncher.properties | 7 +- src/chrome/locale/cv/network-settings.dtd | 2 +- src/chrome/locale/cv/torlauncher.properties | 7 +- src/chrome/locale/cy/network-settings.dtd | 8 +- src/chrome/locale/cy/torlauncher.properties | 13 +-- src/chrome/locale/da/network-settings.dtd | 2 +- src/chrome/locale/da/torlauncher.properties | 7 +- src/chrome/locale/de/network-settings.dtd | 16 +-- src/chrome/locale/de/torlauncher.properties | 7 +- src/chrome/locale/dz/network-settings.dtd | 2 +- src/chrome/locale/dz/torlauncher.properties | 7 +- src/chrome/locale/el/network-settings.dtd | 22 ++--- src/chrome/locale/el/progress.dtd | 2 +- src/chrome/locale/el/torlauncher.properties | 9 +- src/chrome/locale/en-GB/network-settings.dtd | 2 +- src/chrome/locale/en-GB/torlauncher.properties | 7 +- src/chrome/locale/eo/network-settings.dtd | 2 +- src/chrome/locale/eo/torlauncher.properties | 7 +- src/chrome/locale/es-AR/network-settings.dtd | 4 +- src/chrome/locale/es-AR/torlauncher.properties | 7 +- src/chrome/locale/es-CL/network-settings.dtd | 2 +- src/chrome/locale/es-CL/torlauncher.properties | 7 +- src/chrome/locale/es-CO/network-settings.dtd | 8 +- src/chrome/locale/es-CO/torlauncher.properties | 7 +- src/chrome/locale/es-MX/network-settings.dtd | 2 +- src/chrome/locale/es-MX/progress.dtd | 2 +- src/chrome/locale/es-MX/torlauncher.properties | 7 +- src/chrome/locale/es/network-settings.dtd | 2 +- src/chrome/locale/es/torlauncher.properties | 7 +- src/chrome/locale/et/network-settings.dtd | 2 +- src/chrome/locale/et/torlauncher.properties | 9 +- src/chrome/locale/eu/network-settings.dtd | 2 +- src/chrome/locale/eu/torlauncher.properties | 7 +- src/chrome/locale/fa/network-settings.dtd | 6 +- src/chrome/locale/fa/torlauncher.properties | 7 +- src/chrome/locale/fi/network-settings.dtd | 8 +- src/chrome/locale/fi/progress.dtd | 3 +- src/chrome/locale/fi/torlauncher.properties | 7 +- src/chrome/locale/fil/network-settings.dtd | 2 +- src/chrome/locale/fil/torlauncher.properties | 7 +- src/chrome/locale/fo/network-settings.dtd | 2 +- src/chrome/locale/fo/torlauncher.properties | 7 +- src/chrome/locale/fr-CA/network-settings.dtd | 4 +- src/chrome/locale/fr-CA/torlauncher.properties | 7 +- src/chrome/locale/fr/network-settings.dtd | 28 +++--- src/chrome/locale/fr/progress.dtd | 2 +- src/chrome/locale/fr/torlauncher.properties | 11 ++- src/chrome/locale/fur/network-settings.dtd | 2 +- src/chrome/locale/fur/torlauncher.properties | 7 +- src/chrome/locale/fy/network-settings.dtd | 2 +- src/chrome/locale/fy/torlauncher.properties | 7 +- src/chrome/locale/ga/network-settings.dtd | 2 +- src/chrome/locale/ga/torlauncher.properties | 7 +- src/chrome/locale/gl/network-settings.dtd | 2 +- src/chrome/locale/gl/torlauncher.properties | 7 +- src/chrome/locale/gu-IN/network-settings.dtd | 2 +- src/chrome/locale/gu-IN/torlauncher.properties | 7 +- src/chrome/locale/gu/network-settings.dtd | 2 +- src/chrome/locale/gu/torlauncher.properties | 9 +- src/chrome/locale/gun/network-settings.dtd | 2 +- src/chrome/locale/gun/torlauncher.properties | 7 +- src/chrome/locale/ha/network-settings.dtd | 2 +- src/chrome/locale/ha/torlauncher.properties | 7 +- src/chrome/locale/he/network-settings.dtd | 2 +- src/chrome/locale/he/torlauncher.properties | 7 +- src/chrome/locale/hi/network-settings.dtd | 2 +- src/chrome/locale/hi/torlauncher.properties | 7 +- src/chrome/locale/hr-HR/network-settings.dtd | 24 ++--- src/chrome/locale/hr-HR/progress.dtd | 2 +- src/chrome/locale/hr-HR/torlauncher.properties | 7 +- src/chrome/locale/hr/network-settings.dtd | 2 +- src/chrome/locale/hr/progress.dtd | 2 +- src/chrome/locale/hr/torlauncher.properties | 7 +- src/chrome/locale/ht/network-settings.dtd | 2 +- src/chrome/locale/ht/torlauncher.properties | 7 +- src/chrome/locale/hu/network-settings.dtd | 22 ++--- src/chrome/locale/hu/progress.dtd | 2 +- src/chrome/locale/hu/torlauncher.properties | 7 +- src/chrome/locale/hy/network-settings.dtd | 2 +- src/chrome/locale/hy/torlauncher.properties | 7 +- src/chrome/locale/ia/network-settings.dtd | 2 +- src/chrome/locale/ia/torlauncher.properties | 7 +- src/chrome/locale/id/network-settings.dtd | 18 ++-- src/chrome/locale/id/torlauncher.properties | 7 +- src/chrome/locale/is/network-settings.dtd | 2 +- src/chrome/locale/is/progress.dtd | 2 +- src/chrome/locale/is/torlauncher.properties | 7 +- src/chrome/locale/it/network-settings.dtd | 22 ++--- src/chrome/locale/it/progress.dtd | 2 +- src/chrome/locale/it/torlauncher.properties | 7 +- src/chrome/locale/ja/network-settings.dtd | 6 +- src/chrome/locale/ja/torlauncher.properties | 7 +- src/chrome/locale/jv/network-settings.dtd | 2 +- src/chrome/locale/jv/torlauncher.properties | 7 +- src/chrome/locale/ka/network-settings.dtd | 8 +- src/chrome/locale/ka/torlauncher.properties | 9 +- src/chrome/locale/kk/network-settings.dtd | 2 +- src/chrome/locale/kk/torlauncher.properties | 7 +- src/chrome/locale/km/network-settings.dtd | 2 +- src/chrome/locale/km/torlauncher.properties | 7 +- src/chrome/locale/kn/network-settings.dtd | 2 +- src/chrome/locale/kn/torlauncher.properties | 7 +- src/chrome/locale/ko-KR/network-settings.dtd | 2 +- src/chrome/locale/ko-KR/torlauncher.properties | 7 +- src/chrome/locale/ko/network-settings.dtd | 2 +- src/chrome/locale/ko/torlauncher.properties | 9 +- src/chrome/locale/ku/network-settings.dtd | 2 +- src/chrome/locale/ku/torlauncher.properties | 7 +- src/chrome/locale/kw/network-settings.dtd | 2 +- src/chrome/locale/kw/torlauncher.properties | 7 +- src/chrome/locale/ky/network-settings.dtd | 2 +- src/chrome/locale/ky/torlauncher.properties | 7 +- src/chrome/locale/lb/network-settings.dtd | 2 +- src/chrome/locale/lb/torlauncher.properties | 7 +- src/chrome/locale/lg/network-settings.dtd | 2 +- src/chrome/locale/lg/torlauncher.properties | 7 +- src/chrome/locale/ln/network-settings.dtd | 2 +- src/chrome/locale/ln/torlauncher.properties | 7 +- src/chrome/locale/lo/network-settings.dtd | 2 +- src/chrome/locale/lo/torlauncher.properties | 7 +- src/chrome/locale/lt/network-settings.dtd | 2 +- src/chrome/locale/lt/torlauncher.properties | 7 +- src/chrome/locale/lv/network-settings.dtd | 2 +- src/chrome/locale/lv/torlauncher.properties | 7 +- src/chrome/locale/mg/network-settings.dtd | 2 +- src/chrome/locale/mg/torlauncher.properties | 7 +- src/chrome/locale/mi/network-settings.dtd | 2 +- src/chrome/locale/mi/torlauncher.properties | 7 +- src/chrome/locale/mk/network-settings.dtd | 2 +- src/chrome/locale/mk/torlauncher.properties | 9 +- src/chrome/locale/ml/network-settings.dtd | 2 +- src/chrome/locale/ml/torlauncher.properties | 7 +- src/chrome/locale/mn/network-settings.dtd | 2 +- src/chrome/locale/mn/torlauncher.properties | 7 +- src/chrome/locale/mr/network-settings.dtd | 4 +- src/chrome/locale/mr/torlauncher.properties | 7 +- src/chrome/locale/ms-MY/network-settings.dtd | 2 +- src/chrome/locale/ms-MY/torlauncher.properties | 9 +- src/chrome/locale/mt/network-settings.dtd | 2 +- src/chrome/locale/mt/torlauncher.properties | 7 +- src/chrome/locale/my/network-settings.dtd | 2 +- src/chrome/locale/my/torlauncher.properties | 9 +- src/chrome/locale/nah/network-settings.dtd | 2 +- src/chrome/locale/nah/torlauncher.properties | 7 +- src/chrome/locale/nap/network-settings.dtd | 2 +- src/chrome/locale/nap/torlauncher.properties | 7 +- src/chrome/locale/nb/network-settings.dtd | 48 ++++----- src/chrome/locale/nb/progress.dtd | 4 +- src/chrome/locale/nb/torlauncher.properties | 23 ++--- src/chrome/locale/nds/network-settings.dtd | 2 +- src/chrome/locale/nds/torlauncher.properties | 7 +- src/chrome/locale/ne/network-settings.dtd | 2 +- src/chrome/locale/ne/torlauncher.properties | 7 +- src/chrome/locale/nl-BE/network-settings.dtd | 2 +- src/chrome/locale/nl-BE/torlauncher.properties | 7 +- src/chrome/locale/nl/network-settings.dtd | 22 ++--- src/chrome/locale/nl/progress.dtd | 5 +- src/chrome/locale/nl/torlauncher.properties | 7 +- src/chrome/locale/nn/network-settings.dtd | 38 ++++---- src/chrome/locale/nn/torlauncher.properties | 17 ++-- src/chrome/locale/nso/network-settings.dtd | 2 +- src/chrome/locale/nso/torlauncher.properties | 7 +- src/chrome/locale/oc/network-settings.dtd | 2 +- src/chrome/locale/oc/torlauncher.properties | 7 +- src/chrome/locale/or/network-settings.dtd | 2 +- src/chrome/locale/or/torlauncher.properties | 7 +- src/chrome/locale/pa/network-settings.dtd | 2 +- src/chrome/locale/pa/torlauncher.properties | 7 +- src/chrome/locale/pap/network-settings.dtd | 2 +- src/chrome/locale/pap/torlauncher.properties | 7 +- src/chrome/locale/pl/network-settings.dtd | 22 ++--- src/chrome/locale/pl/progress.dtd | 2 +- src/chrome/locale/pl/torlauncher.properties | 7 +- src/chrome/locale/pms/network-settings.dtd | 2 +- src/chrome/locale/pms/torlauncher.properties | 7 +- src/chrome/locale/ps/network-settings.dtd | 2 +- src/chrome/locale/ps/torlauncher.properties | 7 +- src/chrome/locale/pt-BR/network-settings.dtd | 22 ++--- src/chrome/locale/pt-BR/progress.dtd | 2 +- src/chrome/locale/pt-BR/torlauncher.properties | 7 +- src/chrome/locale/pt/network-settings.dtd | 30 +++--- src/chrome/locale/pt/torlauncher.properties | 7 +- src/chrome/locale/ro/network-settings.dtd | 22 ++--- src/chrome/locale/ro/progress.dtd | 2 +- src/chrome/locale/ro/torlauncher.properties | 7 +- src/chrome/locale/ru/network-settings.dtd | 22 ++--- src/chrome/locale/ru/progress.dtd | 2 +- src/chrome/locale/ru/torlauncher.properties | 7 +- src/chrome/locale/ru(a)petr1708/network-settings.dtd | 2 +- .../locale/ru(a)petr1708/torlauncher.properties | 7 +- src/chrome/locale/sco/network-settings.dtd | 2 +- src/chrome/locale/sco/torlauncher.properties | 9 +- src/chrome/locale/si-LK/network-settings.dtd | 2 +- src/chrome/locale/si-LK/torlauncher.properties | 9 +- src/chrome/locale/sk-SK/network-settings.dtd | 2 +- src/chrome/locale/sk-SK/torlauncher.properties | 7 +- src/chrome/locale/sk/network-settings.dtd | 2 +- src/chrome/locale/sk/torlauncher.properties | 7 +- src/chrome/locale/sl-SI/network-settings.dtd | 2 +- src/chrome/locale/sl-SI/torlauncher.properties | 7 +- src/chrome/locale/sl/network-settings.dtd | 2 +- src/chrome/locale/sl/torlauncher.properties | 9 +- src/chrome/locale/sn/network-settings.dtd | 2 +- src/chrome/locale/sn/torlauncher.properties | 7 +- src/chrome/locale/so/network-settings.dtd | 2 +- src/chrome/locale/so/torlauncher.properties | 7 +- src/chrome/locale/son/network-settings.dtd | 2 +- src/chrome/locale/son/torlauncher.properties | 7 +- src/chrome/locale/sq/network-settings.dtd | 26 ++--- src/chrome/locale/sq/progress.dtd | 2 +- src/chrome/locale/sq/torlauncher.properties | 7 +- src/chrome/locale/sr/network-settings.dtd | 2 +- src/chrome/locale/sr/torlauncher.properties | 7 +- src/chrome/locale/sr(a)latin/network-settings.dtd | 4 +- src/chrome/locale/sr(a)latin/torlauncher.properties | 9 +- src/chrome/locale/st/network-settings.dtd | 2 +- src/chrome/locale/st/torlauncher.properties | 7 +- src/chrome/locale/su/network-settings.dtd | 2 +- src/chrome/locale/su/torlauncher.properties | 7 +- src/chrome/locale/sv/network-settings.dtd | 22 ++--- src/chrome/locale/sv/progress.dtd | 2 +- src/chrome/locale/sv/torlauncher.properties | 7 +- src/chrome/locale/sw/network-settings.dtd | 2 +- src/chrome/locale/sw/torlauncher.properties | 9 +- src/chrome/locale/szl/network-settings.dtd | 2 +- src/chrome/locale/szl/torlauncher.properties | 7 +- src/chrome/locale/ta/network-settings.dtd | 2 +- src/chrome/locale/ta/torlauncher.properties | 7 +- src/chrome/locale/te-IN/network-settings.dtd | 2 +- src/chrome/locale/te-IN/torlauncher.properties | 7 +- src/chrome/locale/te/network-settings.dtd | 2 +- src/chrome/locale/te/torlauncher.properties | 7 +- src/chrome/locale/tg/network-settings.dtd | 2 +- src/chrome/locale/tg/torlauncher.properties | 7 +- src/chrome/locale/th/network-settings.dtd | 2 +- src/chrome/locale/th/torlauncher.properties | 7 +- src/chrome/locale/ti/network-settings.dtd | 2 +- src/chrome/locale/ti/torlauncher.properties | 7 +- src/chrome/locale/tk/network-settings.dtd | 2 +- src/chrome/locale/tk/torlauncher.properties | 7 +- src/chrome/locale/tr/network-settings.dtd | 8 +- src/chrome/locale/tr/torlauncher.properties | 13 +-- src/chrome/locale/uk/network-settings.dtd | 22 ++--- src/chrome/locale/uk/progress.dtd | 2 +- src/chrome/locale/uk/torlauncher.properties | 7 +- src/chrome/locale/ur-PK/network-settings.dtd | 2 +- src/chrome/locale/ur-PK/torlauncher.properties | 7 +- src/chrome/locale/ur/network-settings.dtd | 2 +- src/chrome/locale/ur/torlauncher.properties | 7 +- src/chrome/locale/uz/network-settings.dtd | 4 +- src/chrome/locale/uz/torlauncher.properties | 7 +- src/chrome/locale/ve/network-settings.dtd | 2 +- src/chrome/locale/ve/torlauncher.properties | 7 +- src/chrome/locale/vi/network-settings.dtd | 2 +- src/chrome/locale/vi/torlauncher.properties | 7 +- src/chrome/locale/wa/network-settings.dtd | 2 +- src/chrome/locale/wa/torlauncher.properties | 7 +- src/chrome/locale/wo/network-settings.dtd | 2 +- src/chrome/locale/wo/torlauncher.properties | 7 +- src/chrome/locale/zh-CN/network-settings.dtd | 4 +- src/chrome/locale/zh-CN/progress.dtd | 2 +- src/chrome/locale/zh-CN/torlauncher.properties | 7 +- src/chrome/locale/zh-HK/network-settings.dtd | 108 ++++++++++----------- src/chrome/locale/zh-HK/progress.dtd | 8 +- src/chrome/locale/zh-HK/torlauncher.properties | 87 +++++++++-------- src/chrome/locale/zh-TW/network-settings.dtd | 26 ++--- src/chrome/locale/zh-TW/progress.dtd | 6 +- src/chrome/locale/zh-TW/torlauncher.properties | 49 +++++----- src/chrome/locale/zu/network-settings.dtd | 2 +- src/chrome/locale/zu/torlauncher.properties | 7 +- src/install.rdf | 2 +- 313 files changed, 1168 insertions(+), 1022 deletions(-) diff --git a/src/chrome/locale/ach/network-settings.dtd b/src/chrome/locale/ach/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/ach/network-settings.dtd +++ b/src/chrome/locale/ach/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/ach/torlauncher.properties b/src/chrome/locale/ach/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/ach/torlauncher.properties +++ b/src/chrome/locale/ach/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/ady/network-settings.dtd b/src/chrome/locale/ady/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/ady/network-settings.dtd +++ b/src/chrome/locale/ady/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/ady/torlauncher.properties b/src/chrome/locale/ady/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/ady/torlauncher.properties +++ b/src/chrome/locale/ady/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/af/network-settings.dtd b/src/chrome/locale/af/network-settings.dtd index 93e2527..d226ca3 100644 --- a/src/chrome/locale/af/network-settings.dtd +++ b/src/chrome/locale/af/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Deur die Web"> <!ENTITY torsettings.bridgeHelp2 "Gebruik 'n webblaaier om https://bridges.torproject.org te besoek"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/af/torlauncher.properties b/src/chrome/locale/af/torlauncher.properties index c347389..f432219 100644 --- a/src/chrome/locale/af/torlauncher.properties +++ b/src/chrome/locale/af/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/ak/network-settings.dtd b/src/chrome/locale/ak/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/ak/network-settings.dtd +++ b/src/chrome/locale/ak/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/ak/torlauncher.properties b/src/chrome/locale/ak/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/ak/torlauncher.properties +++ b/src/chrome/locale/ak/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/am/network-settings.dtd b/src/chrome/locale/am/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/am/network-settings.dtd +++ b/src/chrome/locale/am/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/am/torlauncher.properties b/src/chrome/locale/am/torlauncher.properties index 8329edd..7d0e8d0 100644 --- a/src/chrome/locale/am/torlauncher.properties +++ b/src/chrome/locale/am/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd index 9d42278..76641ed 100644 --- a/src/chrome/locale/ar/network-settings.dtd +++ b/src/chrome/locale/ar/network-settings.dtd @@ -1,8 +1,8 @@ <!ENTITY torsettings.dialog.title "إعدادات الشبكة">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "لغة متصفح تور"> +<!ENTITY torlauncher.localePicker.prompt "الرجاء اختيار لغة">  @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "أي مما يلي يعتبر وصف افضل لموقفك؟"> <!ENTITY torSettings.configurePrompt1 "اتصال هذا الحاسب بالإنترنت محجوب أو له بروكسي."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "احتاج الى موافقه جسر او إعدادات بروكسي موضعي قبل الاتصال بشبكه  تور"> <!ENTITY torSettings.configure "تكوين"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "اود انشاء اتصال مباشر بشبكه تور."> <!ENTITY torSettings.connectPrompt3 "سيصلح هذا في معظم الحالات."> <!ENTITY torSettings.connect "اتصل"> <!ENTITY torSettings.proxyPageTitle "إعداد البروكسي المحلّي"> <!ENTITY torSettings.proxyQuestion "هل يحتاج هذا الكمبيوتر لاستخدام وكيل محلي للاتصال بالإنترنت؟">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "في معضم الحالات لايوجب استخدام بروكسي محلي، ولكننى نوصي باستخدامه عند انشاء اتصال من شبكه شركه، مدرسه، او جامعه."> +<!ENTITY torSettings.proxyExplanation2 "في حاله عدم معرفتك عن كيفيه اجابه هذا السؤال، يمكنك الاطلاع على متصفح آخر او اعدادات الشبكه لنظام التشغيل لمعرفه فيما اذا كان استخدام بروكسي مطلوب."> <!ENTITY torSettings.enterProxy "أدخل إعدادات البروكسي."> <!ENTITY torSettings.bridgePageTitle "إعداد جسور تور."> <!ENTITY torSettings.bridgeQuestion "هل يقوم مقدم خدمة الإنترنت (ISP) الذي تتعامل معه بحجب الاتصالات بشبكة Tor أو مراقبتها بطريقة أخرى؟"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "اذا لم تكن متاكدا على كيفيه اجابه هذا السؤال، الرجاء اختيار لا( اذا لم تتمكن من الاتصال بشبكه تور بدون جسر، يمكنك اضافه جسر لاحق)"> +<!ENTITY torSettings.bridgeExplanation2 "اذا قمت باختيار نعم، سيتم سؤالك عن اعدادات جسر تور، حيث انها مرحلات غير مدرجة تصعب عمليه حجب الاتصال بشبكه تور."> <!ENTITY torSettings.bridgeSettingsPrompt "يمكنك استخدام مجموعة الجسور المتوفرة أو الحصول على مجموعة مخصصة من الجسور.">  <!ENTITY torsettings.startingTor "في انتظار تور حتي يبدء بالعمل..."> <!ENTITY torsettings.restartTor "إعادة تشغيل تور"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "إعادة إعداد"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "قمت بضبت جسر تور او ادخلت اعدادات بروكسي محلي.  لانشاء اتصال مباشر بشبكه تور، يجب ازاله هذه الاعدادات."> +<!ENTITY torsettings.discardSettings.proceed "ازل الاعدادات ثم اتصل"> <!ENTITY torsettings.optional "اختياري"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "المنافذ المسموح بها:"> <!ENTITY torsettings.useBridges.checkbox "مزود خدمة الإنترنت الخاص بي (ISP) يمنع الاتصالات بشبكة تور"> <!ENTITY torsettings.useBridges.default "الاتصال بالجسور المتوفرة"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "كل جسر يستخدم طريقه مختلفه لتجنب الحجب.  في حاله عدم نجاح احد الجسور في العمل، قم بتجربه جسر مختلف."> <!ENTITY torsettings.useBridges.type "نوع النقل:"> <!ENTITY torsettings.useBridges.custom "إدخال جسور مخصصة"> <!ENTITY torsettings.useBridges.label "ادخل جسر او اكثر (جسر واحد في كل سطر)."> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "نسخ سجل تور إلي الحافظة"> <!ENTITY torsettings.bridgeHelpTitle "المساعدة الخاصة بالجسور المُرحلة"> <!ENTITY torsettings.bridgeHelp1 "قد يكون السبب في عدم قدرتك علي الاتصال بشبكة تورهو ان مزود خدمة الإنترنت الخاص بك (ISP) أو منظمة اخري يمنع محاولات الاتصال بشبكة تور. وغالباً، تستطيع تخطي هذا المنع عن طريق استخدام جسور تور و الجسور عبارة عن مُرحلات مخفية صعب منعها."> -<!ENTITY torsettings.bridgeHelp1B "يمكنك استخدام مجموعة عناوين الجسور المتوفرة التي تم تكوينها مسبقا أو الحصول على مجموعة مخصصة من العناوين باستخدام إحدى هذه الطرق الثلاث:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "من خلال الويب"> <!ENTITY torsettings.bridgeHelp2 "استخدم متصفح ويب لزيارة https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "من خلال المستجيب التلقائي للبريد الإلكتروني"> diff --git a/src/chrome/locale/ar/progress.dtd b/src/chrome/locale/ar/progress.dtd index ef4cfb9..90ac171 100644 --- a/src/chrome/locale/ar/progress.dtd +++ b/src/chrome/locale/ar/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "حالة تور"> <!ENTITY torprogress.openSettings "افتح الإعدادات"> <!ENTITY torprogress.heading "جاري الاتصال بشبكة تور"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "الرجاء الانتظار حتى نتمكن من تفعيل اتصال الى شبكه "تور" .  قد يستغرق الامر عده دقائق."> diff --git a/src/chrome/locale/ar/torlauncher.properties b/src/chrome/locale/ar/torlauncher.properties index 2fc973e..306816c 100644 --- a/src/chrome/locale/ar/torlauncher.properties +++ b/src/chrome/locale/ar/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=مُشغل تور @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S فشل(%2$S). torlauncher.unable_to_start_tor=غير قادر علي بدء تشغيل تور.\n\n%S torlauncher.tor_missing=الملف التنفيذي لتور مفقود. -torlauncher.torrc_missing=ملف torrc مفقود. -torlauncher.datadir_missing=مجلد data الخاص بتور غير موجود. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=فشل في الحصول على كلمة المرور المجزأة. torlauncher.failed_to_get_settings=غير قادر علي جلب إعدادات تور.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=خروج torlauncher.done=تم torlauncher.forAssistance=للمساعدة, اتصل بـ %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=تم إكمال النسخ. %S من رسائل سجل تور جاهزة لنسخها في محرر نصوص أو رسالة بريد إلكتروني. diff --git a/src/chrome/locale/arn/network-settings.dtd b/src/chrome/locale/arn/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/arn/network-settings.dtd +++ b/src/chrome/locale/arn/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/arn/torlauncher.properties b/src/chrome/locale/arn/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/arn/torlauncher.properties +++ b/src/chrome/locale/arn/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/ast/network-settings.dtd b/src/chrome/locale/ast/network-settings.dtd index caa9d55..6f12432 100644 --- a/src/chrome/locale/ast/network-settings.dtd +++ b/src/chrome/locale/ast/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/ast/torlauncher.properties b/src/chrome/locale/ast/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/ast/torlauncher.properties +++ b/src/chrome/locale/ast/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/az/network-settings.dtd b/src/chrome/locale/az/network-settings.dtd index eb34988..9e96619 100644 --- a/src/chrome/locale/az/network-settings.dtd +++ b/src/chrome/locale/az/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Tor bort jurnalını panoya kopyalayın"> <!ENTITY torsettings.bridgeHelpTitle "Körpü Keçid Dəstəyi"> <!ENTITY torsettings.bridgeHelp1 "Əgər sən Tor şəbəkəsinə qoşula bilmirsənsə, ola bilsin ki, sənin İnternet Xidmət Provayderin (İXP) və ya digər agentlik Tor-la əlaqəni bloklayır.  Çox hallarda sən bu problemdən qaçınmaq üçün Tor Körpülərini istifadə edə bilərsən. Onların tapılıb bloklanması qat-qat çətin başa gəlir. "> -<!ENTITY torsettings.bridgeHelp1B "Aşağıdakı üç üsuldan birini istifadə etməklə əvvəlcədən konfiqurasiya edilmiş körpü ünvanları dəstini və ya istəyinə uyğun ünvan dəstini istifadə edə bilərsən:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Bilavasitə web ilə"> <!ENTITY torsettings.bridgeHelp2 "web brauzer istifadə edərək bu səhifəni ziyarət edin https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Email Avtocavablayıcı Vasitəsilə"> diff --git a/src/chrome/locale/az/torlauncher.properties b/src/chrome/locale/az/torlauncher.properties index 55df92f..3c67c38 100644 --- a/src/chrome/locale/az/torlauncher.properties +++ b/src/chrome/locale/az/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor İşlədici @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S xətası (%2$S). torlauncher.unable_to_start_tor=Tor başlaya bilmir.\n\n%S torlauncher.tor_missing=İcra edilə bilən Tor çatışmır. -torlauncher.torrc_missing=Torrc faylı çatışmır. -torlauncher.datadir_missing=Tor məlumat kataloqu mövcud deyil. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Qarışıd şifrə əldə edə bilmədi. torlauncher.failed_to_get_settings=Tor parametrlərinin bərpası mümkün olmadı.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Çıx torlauncher.done=Oldu torlauncher.forAssistance=Dəstək üçün %S ilə əlaqə saxla +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Köçürülmə tamamlandı. %S Tor giriş mesajları mətn dəyişdiricisi və ya email mesajına daxil edilməyə hazırdır. diff --git a/src/chrome/locale/be/network-settings.dtd b/src/chrome/locale/be/network-settings.dtd index ad37df4..9e0d430 100644 --- a/src/chrome/locale/be/network-settings.dtd +++ b/src/chrome/locale/be/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/be/torlauncher.properties b/src/chrome/locale/be/torlauncher.properties index 68ed6bf..2d0992e 100644 --- a/src/chrome/locale/be/torlauncher.properties +++ b/src/chrome/locale/be/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/bg/network-settings.dtd b/src/chrome/locale/bg/network-settings.dtd index 94bd5f1..da063e0 100644 --- a/src/chrome/locale/bg/network-settings.dtd +++ b/src/chrome/locale/bg/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "Кое от следните описва най-добре вашата ситуация?"> <!ENTITY torSettings.configurePrompt1 "Интернет връзката на този компютър е цензурирана или минава през proxy сървър."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Трябва да конфигурират bridge или proxy настройки преди свързване към Tor мрежата."> <!ENTITY torSettings.configure "Конфигурирай"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Бих искал да се свържа директно към Tor мрежата."> <!ENTITY torSettings.connectPrompt3 "Това ще работи при повечето ситуации."> <!ENTITY torSettings.connect "Свържи се"> <!ENTITY torSettings.proxyPageTitle "Локални прокси настройки"> <!ENTITY torSettings.proxyQuestion "Този компютър използва ли локално прокси за достъп до Интернет?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "В повечето случаи не е необходима локално прокси, но то може да се изисква, когато се свързвате от корпоративна, училищна или университетска мрежа."> +<!ENTITY torSettings.proxyExplanation2 "Ако не сте сигурни как да отговорите на този въпрос, погледнете настройките на Интернет в друг браузър или проверете мрежовите настройки на вашата система, за да видите дали е необходимо локално прокси."> <!ENTITY torSettings.enterProxy "Въведете настройките за прокси."> <!ENTITY torSettings.bridgePageTitle "Настройки на Тор бриджове"> <!ENTITY torSettings.bridgeQuestion "Блокирани или цензурирани ли са връзките към Tor Мрежата от вашият Интернет Доставчик(ISP)?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Ако не сте сигурни как да отговори на този въпрос, изберете Не (ако не сте в състояние да се свържете с Tor мрежата без bridge, може да го добавите по-късно)."> +<!ENTITY torSettings.bridgeExplanation2 "Ако изберете Да, ще бъдете помолени да изберете Tor Bridges, които са неофициални relays, което прави по-трудно да се блокира връзката към Tor мрежата."> <!ENTITY torSettings.bridgeSettingsPrompt "Вие може да използвате предложените комплекти от bridges или може да изисквате персонализиран комплект от тях.">  <!ENTITY torsettings.startingTor "Изчакване на Tor да стартира..."> <!ENTITY torsettings.restartTor "Рестартирайте Тор"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Преконфигуриране"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Вие сте конфигурирали Tor bridges или сте въвели местните настройките на прокси сървъра.  За да направите директно свързване към Tor мрежата, тези настройки трябва да бъдат отстранени."> +<!ENTITY torsettings.discardSettings.proceed "Премахване на Настройките и Свързване"> <!ENTITY torsettings.optional "Допълнителен"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Позволени портове:"> <!ENTITY torsettings.useBridges.checkbox "Моят Интернет Доставчик (ISP) блокира връзките към Tor мрежата"> <!ENTITY torsettings.useBridges.default "Свържи се с предоставените bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Всеки вид bridge използва различен метод, за да се избегне цензурата.  Ако един bridge не работи, опитайте отново като използвате друг."> <!ENTITY torsettings.useBridges.type "Тип транспортиране:"> <!ENTITY torsettings.useBridges.custom "Въведи персонални bridges"> <!ENTITY torsettings.useBridges.label "Въведи един или повече bridge relays (по един на линия)."> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Копирай Tor лога в клипборда"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay помощ"> <!ENTITY torsettings.bridgeHelp1 "Ако не може да се свържете към Tor network, причината може да бъде във вашия Интернет доставчик (ISP) или определена агенция интернет наблюдение блокира Tor.  Често, вие може да заобиколите този проблем с използване на Tor Bridges, които са непубликувани relays и са много по трудни за блокиране."> -<!ENTITY torsettings.bridgeHelp1B "Вие може да използвате пре-конфигурирани, предоставени комплекти от bridge адреси или може да изисквате собствен персонализиран комплект от адреси като използвате един от следните три метода:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "През Web"> <!ENTITY torsettings.bridgeHelp2 "Използвайте уеб браузър за да посетите https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "През автоматично отговарящия имейл"> diff --git a/src/chrome/locale/bg/progress.dtd b/src/chrome/locale/bg/progress.dtd index 1c89f2e..134ee70 100644 --- a/src/chrome/locale/bg/progress.dtd +++ b/src/chrome/locale/bg/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Състояние на Тор"> <!ENTITY torprogress.openSettings "Отвори настройки"> <!ENTITY torprogress.heading "Свързване с Тор мрежата"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Моля изчакайте,докато установим връзка с Тор мрежата..  Toва може да отнеме няколко минути."> diff --git a/src/chrome/locale/bg/torlauncher.properties b/src/chrome/locale/bg/torlauncher.properties index af17760..7d3959a 100644 --- a/src/chrome/locale/bg/torlauncher.properties +++ b/src/chrome/locale/bg/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Тор лънчер @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S несупя да (%2$S). torlauncher.unable_to_start_tor=Невъзможно е да се стартира Tor.\n\n%S torlauncher.tor_missing=Приложението "Tor" липсва. -torlauncher.torrc_missing=Файла "torrc" липсва. -torlauncher.datadir_missing=Дата директорията на Тор не съществува +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Проблем с изтеглянето на хеширани пароли. torlauncher.failed_to_get_settings=Невъзможно е получаването на настройките на Tor.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Изход torlauncher.done=Готово torlauncher.forAssistance=За съдействие , моля свържете се с %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Копирането е завършено. %S Съобщенията от Тор log-а са готови да бъдат поставени в текстов редактор или имейл. diff --git a/src/chrome/locale/bn-BD/torlauncher.properties b/src/chrome/locale/bn-BD/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/bn-BD/torlauncher.properties +++ b/src/chrome/locale/bn-BD/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/bn-IN/network-settings.dtd b/src/chrome/locale/bn-IN/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/bn-IN/network-settings.dtd +++ b/src/chrome/locale/bn-IN/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/bn-IN/torlauncher.properties b/src/chrome/locale/bn-IN/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/bn-IN/torlauncher.properties +++ b/src/chrome/locale/bn-IN/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/bn/network-settings.dtd b/src/chrome/locale/bn/network-settings.dtd index 2c55dd3..a674a2c 100644 --- a/src/chrome/locale/bn/network-settings.dtd +++ b/src/chrome/locale/bn/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/bn/torlauncher.properties b/src/chrome/locale/bn/torlauncher.properties index fd9face..aed4578 100644 --- a/src/chrome/locale/bn/torlauncher.properties +++ b/src/chrome/locale/bn/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S ব্যর্থ হয়েছে torlauncher.unable_to_start_tor=টর শুরু করা সম্ভব নয়।\n\n%S torlauncher.tor_missing= Tor executable নথিটি পাওয়া যাচ্ছে না। -torlauncher.torrc_missing=torrc নথিটি পাওয়া যাচ্ছে না। -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=বেরিয়ে যান torlauncher.done=সমাপ্ত torlauncher.forAssistance=সাহায্যের জন্য , যোগাযোগ করুনঃ %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/bo/network-settings.dtd b/src/chrome/locale/bo/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/bo/network-settings.dtd +++ b/src/chrome/locale/bo/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/bo/torlauncher.properties b/src/chrome/locale/bo/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/bo/torlauncher.properties +++ b/src/chrome/locale/bo/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/br/network-settings.dtd b/src/chrome/locale/br/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/br/network-settings.dtd +++ b/src/chrome/locale/br/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/br/torlauncher.properties b/src/chrome/locale/br/torlauncher.properties index 5860c8a..152b0a8 100644 --- a/src/chrome/locale/br/torlauncher.properties +++ b/src/chrome/locale/br/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/bs/network-settings.dtd b/src/chrome/locale/bs/network-settings.dtd index cd1efa7..5a33a60 100644 --- a/src/chrome/locale/bs/network-settings.dtd +++ b/src/chrome/locale/bs/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/bs/torlauncher.properties b/src/chrome/locale/bs/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/bs/torlauncher.properties +++ b/src/chrome/locale/bs/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/ca/network-settings.dtd b/src/chrome/locale/ca/network-settings.dtd index e344598..9c8a242 100644 --- a/src/chrome/locale/ca/network-settings.dtd +++ b/src/chrome/locale/ca/network-settings.dtd @@ -15,7 +15,7 @@ <!ENTITY torSettings.configurePrompt1 "La connexió a internet d'aquest ordinador està censurada o configurada amb un proxy. "> <!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> <!ENTITY torSettings.configure "Configura"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "M'agradaria fer una connexió directa a la red Tor."> <!ENTITY torSettings.connectPrompt3 "Això funciona en la majoria dels casos."> <!ENTITY torSettings.connect "Conectar"> @@ -66,7 +66,7 @@ <!ENTITY torsettings.copyLog "Copiar el Log al portapapers"> <!ENTITY torsettings.bridgeHelpTitle "Ajuda Repetidors"> <!ENTITY torsettings.bridgeHelp1 "Si no sóu capaçps de connectar-vos a la xarxa Tor, pot ser que el vostre proveidor d'internet (ISP) o alguna altra agència estigui bloquejant Tor.  normalment, podeu evitar aquest problema usant Ponts Tor, que son relés no llistats més difícils de bloquejar. "> -<!ENTITY torsettings.bridgeHelp1B "Podeu usar el conjunt d'adreces pont preconfigurades o podeu obtenir un conjunt personalitzat d'adreces usant un d'aquests tres mètodes: "> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "A través del web"> <!ENTITY torsettings.bridgeHelp2 "Utilitza un navegador web o vés a: https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "A través del mail d'autorresposta."> diff --git a/src/chrome/locale/ca/progress.dtd b/src/chrome/locale/ca/progress.dtd index 331193c..06eba3a 100644 --- a/src/chrome/locale/ca/progress.dtd +++ b/src/chrome/locale/ca/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Estat de Tor"> <!ENTITY torprogress.openSettings "Obrir preferències."> <!ENTITY torprogress.heading "S'està connectant a la xarxa Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Per favor, esperi mentre establim la connexió amb la red de Tor.  L'acció pot durar varis minuts."> diff --git a/src/chrome/locale/ca/torlauncher.properties b/src/chrome/locale/ca/torlauncher.properties index 520ffda..588c3d1 100644 --- a/src/chrome/locale/ca/torlauncher.properties +++ b/src/chrome/locale/ca/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Inicialitzador Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S ha fallat (%2$S). torlauncher.unable_to_start_tor=Impossible iniciar Tor.\n%S torlauncher.tor_missing=Falta l'executable de Tor. -torlauncher.torrc_missing=Falta l'arxiu torrc. -torlauncher.datadir_missing=La carpeta de dades de Tor no existeix. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Ha fallat l'obtencio de la contrasenya hash. torlauncher.failed_to_get_settings=Impossible obtenir la configuració de Tor\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Surt torlauncher.done=Fet torlauncher.forAssistance=Per assistència, contacta %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Còpia completada. Els missatges del registre de %S Tor ja es poden enganxar en un editor de text o un missatge de correu. diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd index b08348b..de87e8f 100644 --- a/src/chrome/locale/cs/network-settings.dtd +++ b/src/chrome/locale/cs/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Zkopíruj logový soubor Toru do schránky"> <!ENTITY torsettings.bridgeHelpTitle "Nápověda o mostních relé"> <!ENTITY torsettings.bridgeHelp1 "Pokud nejste schopni se připojit k síti TORu, může to být způsobeno tím, že váš posktytovatel internetu (ISP) nebo nějaká jiná služba blokuje Tor.  Většinou můžete obejít tento problém použitím Mostů TORu, což jsou přenašeče neuvedené v seznamu, které je složitější zablokovat."> -<!ENTITY torsettings.bridgeHelp1B "Můžete použít přednastavenou, poskytnutou sadu síťových mostů, nebo můžete získat vlastní sadu adres použitím jedné z těchto tří metod:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Přes síť"> <!ENTITY torsettings.bridgeHelp2 "Použijte internetový prohlížeč k návštěvě https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Přes automatický e-mailový odpovídač"> diff --git a/src/chrome/locale/cs/progress.dtd b/src/chrome/locale/cs/progress.dtd index e91a01f..0311994 100644 --- a/src/chrome/locale/cs/progress.dtd +++ b/src/chrome/locale/cs/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Stav"> <!ENTITY torprogress.openSettings "Otevřít nastavení"> <!ENTITY torprogress.heading "Připojuji se k síti Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Prosím čekejte zatímco se připojuji do Tor sítě.  Toto může trvat několik minut."> diff --git a/src/chrome/locale/cs/torlauncher.properties b/src/chrome/locale/cs/torlauncher.properties index 0701889..63343e1 100644 --- a/src/chrome/locale/cs/torlauncher.properties +++ b/src/chrome/locale/cs/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor spouštěč @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S selhal (%2$S). torlauncher.unable_to_start_tor=Tor není schopen startovat\n\n%S torlauncher.tor_missing=Spustitelný soubor Tor chybí. -torlauncher.torrc_missing=Chybí soubor torrc. -torlauncher.datadir_missing=Adresář s daty Tor neexistuje. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Nepovedlo se získat hashované heslo. torlauncher.failed_to_get_settings=Nelze načíst Tor nastavení.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Konec torlauncher.done=Hotovo torlauncher.forAssistance=Pro asistenci kontaktujte %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Kopírování kompletní. %S zprávy protokolu Tor jsou připraveny k vložení do textového editoru nebo e-mailové zprávy. diff --git a/src/chrome/locale/csb/network-settings.dtd b/src/chrome/locale/csb/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/csb/network-settings.dtd +++ b/src/chrome/locale/csb/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/csb/torlauncher.properties b/src/chrome/locale/csb/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/csb/torlauncher.properties +++ b/src/chrome/locale/csb/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/cv/network-settings.dtd b/src/chrome/locale/cv/network-settings.dtd index f3d44b5..dfe657e 100644 --- a/src/chrome/locale/cv/network-settings.dtd +++ b/src/chrome/locale/cv/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/cv/torlauncher.properties b/src/chrome/locale/cv/torlauncher.properties index f55f173..7165530 100644 --- a/src/chrome/locale/cv/torlauncher.properties +++ b/src/chrome/locale/cv/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/cy/network-settings.dtd b/src/chrome/locale/cy/network-settings.dtd index e743cc1..6f3cc56 100644 --- a/src/chrome/locale/cy/network-settings.dtd +++ b/src/chrome/locale/cy/network-settings.dtd @@ -1,8 +1,8 @@ <!ENTITY torsettings.dialog.title "Gosodiadau Rhwydwaith Tor">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Iaith Porwr Tor"> +<!ENTITY torlauncher.localePicker.prompt "Dewiswch iaith">  @@ -34,7 +34,7 @@  <!ENTITY torsettings.startingTor "Yn aros am Tor i gychwyn…"> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Ailgychwyn Tor"> <!ENTITY torsettings.reconfigTor "Reconfigure"> <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copio Cofnod Tor i'r Clipfwrdd"> <!ENTITY torsettings.bridgeHelpTitle "Cymorth Pont Relái"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/cy/torlauncher.properties b/src/chrome/locale/cy/torlauncher.properties index 5119e81..a4ff982 100644 --- a/src/chrome/locale/cy/torlauncher.properties +++ b/src/chrome/locale/cy/torlauncher.properties @@ -1,10 +1,10 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Lansiwr Tor torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.tor_exited2=Ni fydd ailgychwyn Tor yn cau'ch tabiau porwr. torlauncher.tor_controlconn_failed=Ni allai gysylltu â'r porth rheolaeth Tor. torlauncher.tor_failed_to_start=Methodd Tor gychwyn. torlauncher.tor_control_failed=Methu cymryd rheolaeth o Tor. @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=Methodd %1$S (%2$S). torlauncher.unable_to_start_tor=Methu cychwyn Tor.\n\n%S torlauncher.tor_missing=Mae'r gweithredadwyn Tor ar goll. -torlauncher.torrc_missing=Mae'r ffeil torrc ar goll. -torlauncher.datadir_missing=Nid yw'r cyfeiriadur data Tor yn bodoli. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Methwyd gael cyfrinair stwnshlyd. torlauncher.failed_to_get_settings=Methwyd nôl gosodiadau Tor.\n\n%S @@ -30,14 +30,15 @@ torlauncher.error_bridge_bad_default_type=Does ddim pontiau a ddatparwyd gyda'r torlauncher.recommended_bridge=(awgrymwyd) torlauncher.connect=Cysylltu -torlauncher.restart_tor=Restart Tor +torlauncher.restart_tor=Ailgychwyn Tor torlauncher.quit=Cau torlauncher.quit_win=Gadael torlauncher.done=Wedi gorffen torlauncher.forAssistance=Am gymorth, cysylltu â %S +torlauncher.forAssistance2=For assistance, visit %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Copio wedi gorffen. Mae %S o negeseuon log Tor yn barod i'u gludo mewn golygydd testun neu neges ebost. torlauncher.bootstrapStatus.conn_dir=Cysylltu i cyfeiriadur cyfnewid torlauncher.bootstrapStatus.handshake_dir=Yn sefydlu cysylltiad cyfeiriadur amgryptiedig diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd index f8f4c0f..aa32a1f 100644 --- a/src/chrome/locale/da/network-settings.dtd +++ b/src/chrome/locale/da/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Kopier Tor loggen til udklipsholderen"> <!ENTITY torsettings.bridgeHelpTitle "Bro-relæ hjælp"> <!ENTITY torsettings.bridgeHelp1 "Hvis du ikke kan forbinde dig til Tor netværket er det muligt at din internet udbyder (ISP) eller anden myndighed blokerer Tor.   Det er ofte muligt at komme rundt om en blokade ved at bruge en Tor bro. En bro er et relæ som ikke er på den offentliggjorte liste og som derfor er sværere at blokkere."> -<!ENTITY torsettings.bridgeHelp1B "Du kan bruge det pre-konfigurerede tildelte sæt af bro-adresser eller du kan hente et skræddersyet sæt adresser ved at bruge en af følgende tre metoder:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "På nettet"> <!ENTITY torsettings.bridgeHelp2 "Brug en browser og besøg https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Via den automatiske email service"> diff --git a/src/chrome/locale/da/torlauncher.properties b/src/chrome/locale/da/torlauncher.properties index 2c7c9ca..7ad9dda 100644 --- a/src/chrome/locale/da/torlauncher.properties +++ b/src/chrome/locale/da/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor starter @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S fejlede (%2$S). torlauncher.unable_to_start_tor=Kan ikke starte Tor.\n\n%S torlauncher.tor_missing=Kunne ikke finde Tor programmet. -torlauncher.torrc_missing=Torrc-filen mangler. -torlauncher.datadir_missing=Tor's data bibliotek eksisterer ikke. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Kunne ikke finde hash-værdi af kodeordet. torlauncher.failed_to_get_settings=Kunne ikke læse Tor indstillingerne..⏎\n⏎\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Afslut torlauncher.done=Færdig torlauncher.forAssistance=For hjælp, kontakt %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Kopieringen er gennemført. %S logbeskeder fra Tor er klar til at blive sat ind i et tekstdokument eller en e-mail. diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd index 4d4b2ac..b2cc0c2 100644 --- a/src/chrome/locale/de/network-settings.dtd +++ b/src/chrome/locale/de/network-settings.dtd @@ -13,7 +13,7 @@ <!ENTITY torSettings.firstQuestion "Was beschreibt Ihre Situation am besten?"> <!ENTITY torSettings.configurePrompt1 "Die Internetverbindung dieses Rechner ist zensiert oder vermittelt."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Ich muss eine Netzwerkbrücke oder lokale Proxy-Einstellungen konfigurieren, bevor ich mich mit dem Tor Netzwerk verbinde."> <!ENTITY torSettings.configure "Konfigurieren"> <!ENTITY torSettings.connectPrompt2 "Ich würde gerne eine direkte Verbindung mit dem Tor-Netzwerk herstellen"> <!ENTITY torSettings.connectPrompt3 "Das wird in den meisten Situationen funktionieren."> @@ -22,13 +22,13 @@ <!ENTITY torSettings.proxyPageTitle "Lokale Proxy-Konfiguration"> <!ENTITY torSettings.proxyQuestion "Benötigt dieser Rechner einen lokalen Proxy um auf das Internet zuzugreifen?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "In den meisten Fällen ist ein lokaler Proxy nicht nötig, er könnte aber notwendig werden, falls eine Verbindung durch ein Firmen-, Schul- oder Universitätsnetzwerk aufgebaut werden soll."> +<!ENTITY torSettings.proxyExplanation2 "Wenn Sie sich nicht sicher sind, wie Sie diese Frage beantworten sollen, sehen Sie sich die Interneteinstellungen in einem anderen Browser an oder überprüfen Sie die Netzwerkeinstellungen des Systems um zu bestimmen, ob sie einen lokalen Proxyserver benötigen."> <!ENTITY torSettings.enterProxy "Proxy-Einstellungen eingeben."> <!ENTITY torSettings.bridgePageTitle "Torbrücken-Konfiguration"> <!ENTITY torSettings.bridgeQuestion "Blockiert oder zensiert Ihr Internetdienstanbieter (ISP) Verbindungen zum Tor-Netzwerk?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Wenn Sie sich nicht sicher sind, wie Sie diese Frage beantworten sollen, wählen Sie nein (falls Sie nicht in der Lage sind, sich ohne Brücke mit dem Tor-Netzwerk zu verbinden, können Sie sie später hinzufügen)."> +<!ENTITY torSettings.bridgeExplanation2 "Wenn Sie Ja wählen, werden sie gebeten, Tor-Brücken zu konfigurieren. Tor-Brücken sind nicht gelistete Relais, die es erschweren, Verbindungen zum Tor-Netzwerk zu blockieren."> <!ENTITY torSettings.bridgeSettingsPrompt "Sie könne den bereitgestellten Satz an Brücken verwenden oder Sie können welche erhalten, und geben einen benutzerdefinierten Satz an Brücken ein.">  @@ -37,7 +37,7 @@ <!ENTITY torsettings.restartTor "Tor neu starten"> <!ENTITY torsettings.reconfigTor "Neu einstellen"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> +<!ENTITY torsettings.discardSettings.prompt "Sie haben Tor-Brücken konfiguriert oder lokale Proxyeinstellungen eingetragen.  Um eine direkte Verbindung zum Tor-Netzwerk herzustellen, müssen diese Einstellungen entfernt werden."> <!ENTITY torsettings.discardSettings.proceed "Einstellungen entfernen und verbinden"> <!ENTITY torsettings.optional "Optional"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Erlaubte Anschlüsse:"> <!ENTITY torsettings.useBridges.checkbox "Mein Internetdienstanbieter (ISP) blockiert Verbindungen zum Tor-Netzwerk"> <!ENTITY torsettings.useBridges.default "Mit bereitgestellten Brücken verbinden "> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Jede Art von Brücke verwendet eine andere Methode um Zensur zu umgehen. Wenn eine Brücke nicht funktioniert, versuchen Sie es erneut, unter Verwendung einer anderen Brücke."> <!ENTITY torsettings.useBridges.type "Übertragungstyp:"> <!ENTITY torsettings.useBridges.custom "Benutzerdefinierte Brücken eingeben"> <!ENTITY torsettings.useBridges.label "Ein oder mehrere Brückenrelais eingeben (eins pro Zeile)."> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Tor-Protokoll in die Zwischenablage kopieren"> <!ENTITY torsettings.bridgeHelpTitle "Hilfe zum Brückenrelais"> <!ENTITY torsettings.bridgeHelp1 "Sollten Sie sich nicht mit dem Tor-Netzwerk verbinden können, ist es möglich, dass Ihr Internetdienstanbieter (ISP) oder eine andere Organisation, Tor blockiert.  Dieses Problem kann meist mit der Benutzung von Torbrücken umgangen werden, das sind versteckte Relais und damit schwerer zu blocken."> -<!ENTITY torsettings.bridgeHelp1B "Sie können den vorkonfigurierten und bereitgestellten Satz an Brückenadressen verwenden, oder Sie können einen benutzerdefinierten Satz von Adressen, mit einer dieser drei Methoden erhalten:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Durch das Internet"> <!ENTITY torsettings.bridgeHelp2 "Benutzen Sie einen Browser und besuchen Sie https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Durch die automatische E-Mail-Antwort"> diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties index 0da42da..39ee07a 100644 --- a/src/chrome/locale/de/torlauncher.properties +++ b/src/chrome/locale/de/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor-Starter @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S gescheitert (%2$S). torlauncher.unable_to_start_tor=Tor kann nicht gestartet werden.\n\n%S torlauncher.tor_missing=Die Tor-Programmdatei ist nicht vorhanden. -torlauncher.torrc_missing=Die torrc-Datei ist nicht vorhanden. -torlauncher.datadir_missing=Das Tor-Datenverzeichniss existiert nicht. +torlauncher.torrc_missing=Die torrc Datei fehlt und konnte nicht erstellt werden. +torlauncher.datadir_missing=Das Tor Dateiverzeichnis existiert nicht und konnte nicht erstellt werden. torlauncher.password_hash_missing=Erhalt des Hash-Passwortes ist fehlgeschlagen. torlauncher.failed_to_get_settings=Die Tor-Einstellungen können nicht abgefragt werden.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Beenden torlauncher.done=Fertig torlauncher.forAssistance=Falls Sie Hilfe benötigen, kontaktieren Sie %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Kopie vollständig. %S Tor-Protokollnachrichten sind bereit, um in eine Textbearbeitung oder in eine E-Mail-Nachricht eingefügt zu werden. diff --git a/src/chrome/locale/dz/network-settings.dtd b/src/chrome/locale/dz/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/dz/network-settings.dtd +++ b/src/chrome/locale/dz/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/dz/torlauncher.properties b/src/chrome/locale/dz/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/dz/torlauncher.properties +++ b/src/chrome/locale/dz/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd index d776892..210a82e 100644 --- a/src/chrome/locale/el/network-settings.dtd +++ b/src/chrome/locale/el/network-settings.dtd @@ -13,33 +13,33 @@ <!ENTITY torSettings.firstQuestion "Ποιο από τα παρακάτω περιγράφει καλύτερα την κατάστασή σας;"> <!ENTITY torSettings.configurePrompt1 "Σύνδεση στο Internet αυτού του υπολογιστή λογοκρίνεται ή προσεγγίζεται"> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Πριν συνδεθώ στο δίκτυο Tor πρέπει να προσαρμοσθούν οι γέφυρες ή οι ρυθμίσεις του τοπικού ενδιάμεσου."> <!ENTITY torSettings.configure "Ρύθμιση "> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Θέλω να συνδεθώ απ'ευθείας στο δίκτυο Tor."> <!ENTITY torSettings.connectPrompt3 "Αυτό θα λειτουργήσει στις περισσότερες περιπτώσεις."> <!ENTITY torSettings.connect "Σύνδεση"> <!ENTITY torSettings.proxyPageTitle "Τοπική διαμόρφωση Proxy"> <!ENTITY torSettings.proxyQuestion "Μήπως αυτός ο υπολογιστής πρέπει να χρησιμοποιήσει ένα τοπικό proxy για την πρόσβαση στο Διαδίκτυο;">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "Στις περισσότερες περιπτώσεις δε χρειάζεται κάποιος τοπικός ενδιάμεσος διακομιστής, ίσως όμως είναι αναγκαίος όταν συνδέεστε μέσω κάποιας εταιρίας, σχολείου ή πανεπιστημιακού δικτύου."> +<!ENTITY torSettings.proxyExplanation2 "Αν δεν είστε βέβαιοι/ες για την απάντηση σε αυτό το ερώτημα και για να διαπιστώσετε αν είναι αναγκαίος ένας τοπικός ενδιάμεσος, ελέγξτε τις ρυθμίσεις Διαδικτύου σε κάποιον άλλο περιηγητή ή τις ρυθμίσεις δικτύωσης του υπολογιστή σας ."> <!ENTITY torSettings.enterProxy "Εισάγωγη των ρυθμίσεων διακομιστή μεσολάβησης."> <!ENTITY torSettings.bridgePageTitle "Διαμόρφωση Γεφυρών Tor"> <!ENTITY torSettings.bridgeQuestion "Γνωρίζετε αν ο πάροχος (ISP) σας μπλοκάρει ή με οποιοδήποτε τρόπο ελέγχει συνδέσεις στο δίκτυο Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Αν δεν γνωρίζετε πως να απαντήσετε σε αυτή την ερώτηση, επιλέξτε Όχι (αν δεν μπορείτε να συνδεθείτε στο δίκτυο Tor χωρίς την χρήση κάποιας γέφυρας, μπορείτε να προσθέσετε αργότερα μια)."> +<!ENTITY torSettings.bridgeExplanation2 "Αν επιλέξετε Ναι θα σας ζητηθεί να ρυθμίσετε τις Γέφυρες Tor, οι οποίες είναι ακαταχώριστοι αναμεταδότες που δυσκολεύουν την παρεμπόδιση σύνδεσης στο Δίκτυο Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Μπορείτε να χρησιμοποιήσετε τις προκαθορισμένες γέφυρες, ή να αποκτήσετε και εισάγετε νέες διευθύνσεις γεφυρών.">  <!ENTITY torsettings.startingTor "Αναμονή για να ξεκινήσει το Tor... "> <!ENTITY torsettings.restartTor "Eπανεκκίνηση Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Αναδιαμόρφωση"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Έχετε ρυθμισμένες γέφυρες Tor ή έχετε εισάγει ρυθμίσεις για τον τοπικό ενδιάμεσο.  Για να πραγματοποιήσετε απευθείας σύνδεση με το δίκτυο Tor οι ρυθμίσεις αυτές πρέπει να απομακρυνθούν."> +<!ENTITY torsettings.discardSettings.proceed "Απομακρύνετε τις ρυθμίσεις και συνδεθείτε"> <!ENTITY torsettings.optional "Προεραιτικα"> @@ -57,7 +57,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Επιτρεπόμενες Θύρες:"> <!ENTITY torsettings.useBridges.checkbox "Ο πάροχος διαδικτυου (ISP) μπλοκάρει τις συνδέσεις στο δίκτυο του Tor"> <!ENTITY torsettings.useBridges.default "Σύνδεση με προκαθορισμένες γέφυρες"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Κάθε τύπος γέφυρας χρησιμοποιεί διαφορετική μέθοδο αποφυγής της λογοκρισίας.  Αν δεν λειτουργεί κάποια γέφυρα, προσπαθήστε και πάλι χρησιμοποιώντας κάποια άλλη, διαφορετική."> <!ENTITY torsettings.useBridges.type "Τύπος μεταφοράς:"> <!ENTITY torsettings.useBridges.custom "Εισαγωγή άλλων γεφυρών"> <!ENTITY torsettings.useBridges.label "Εισάγετε μια ή περισσότερες διευθύνσεις γεφυρών (μία ανά γραμμή)."> @@ -66,7 +66,7 @@ <!ENTITY torsettings.copyLog "Αντιγραφή στο πρόχειρο"> <!ENTITY torsettings.bridgeHelpTitle "Γεφυρες αναμεταδοτων Βοηθεια"> <!ENTITY torsettings.bridgeHelp1 "Αν δε μπορείτε να συνδεθείτε στο δίκτυο Tor, ίσως ο πάροχός (ISP) σας ή κάποιος τρίτος μπλοκάρει το Tor .  Αυτό το πρόβλημα συνήθως λύνεται με τη χρήση Tor Bridges (γέφυρες), που είναι μη δημοσιευμένες διευθύνσεις από τις οποίες μπορείτε να μπείτε στο δίκτυο Tor, συνεπώς πιο δύσκολο να μπλοκαριστούν."> -<!ENTITY torsettings.bridgeHelp1B "Μπορείτε να χρησιμοποιήσετε τις προκαθορισμένες γέφυρες, ή να αποκτήσετε νέες διυθύνσεις γεφυρών με έναν από τους παρακάτω τρεις τρόπους:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Μέσω του Διαδικτύου"> <!ENTITY torsettings.bridgeHelp2 "Χρησιμοποιήστε έναν φυλλομετρητή για να επισκεφτείτε το https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Μέσω της Αυτοματοποιημένης Απάντησης Email"> diff --git a/src/chrome/locale/el/progress.dtd b/src/chrome/locale/el/progress.dtd index 9f96b8d..e63961a 100644 --- a/src/chrome/locale/el/progress.dtd +++ b/src/chrome/locale/el/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Κατάσταση του Tor "> <!ENTITY torprogress.openSettings "Ανοιγμα ρυθμισεων"> <!ENTITY torprogress.heading "Δημιουργια σύνδεσης στο δίκτυο Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Παρακαλώ περιμένετε καθώς δημιουργήστε σύνδεση στο δίκτυο Tor.  Αυτό μπορεί να πάρει μερικά λεπτά."> diff --git a/src/chrome/locale/el/torlauncher.properties b/src/chrome/locale/el/torlauncher.properties index b257e45..b0a53e6 100644 --- a/src/chrome/locale/el/torlauncher.properties +++ b/src/chrome/locale/el/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S απέτυχε (%2$S). torlauncher.unable_to_start_tor=Αδυναμία εκκίνησης του Tor.⏎\n⏎\n%S torlauncher.tor_missing=Το Tor εκτελέσιμο λείπει. -torlauncher.torrc_missing=Το torrc αρχείο λείπει. -torlauncher.datadir_missing=Ο κατάλογος δεδομένων του Tor δεν υπάρχει. +torlauncher.torrc_missing=Το αρχείο torrc λείπει και δεν μπορεί να δημιουργηθεί. +torlauncher.datadir_missing=Ο κατάλογος δεδομένων Tor δεν υπάρχει και δεν μπορεί να δημιουργηθεί. torlauncher.password_hash_missing=Απέτυχε να πάρει διαγραμμισμένο κωδικό πρόσβασης. torlauncher.failed_to_get_settings=Αποτυχία διαγραφής των Tor ρυθμισεων.⏎\n⏎\n%S @@ -36,8 +36,9 @@ torlauncher.quit_win=Έξοδος torlauncher.done=Τελος torlauncher.forAssistance=Για βοήθεια, επικοινωνήστε με το% S +torlauncher.forAssistance2=For assistance, visit %S -torlauncher.copiedNLogMessages=Η αντιγραφή ολοκληρώθηκε. %S Τα μηνύματα καταγραφής είναι έτοιμα να επικολληθούν σε ένα κειμενογράφο ή ένα μήνυμα ηλεκτρονικού ταχυδρομείου. +torlauncher.copiedNLogMessages=Η αντιγραφή ολοκληρώθηκε. %S μηνύματα καταγραφής είναι έτοιμα να επικολληθούν σε ένα κειμενογράφο ή ένα μήνυμα ηλεκτρονικού ταχυδρομείου. torlauncher.bootstrapStatus.conn_dir=Σύνδεση σε ενδιάμεσο (relay) κατάλογο torlauncher.bootstrapStatus.handshake_dir=Πραγματοποιήθηκε σύνδεση σε κρυπτογραφημένο κατάλογο diff --git a/src/chrome/locale/en-GB/network-settings.dtd b/src/chrome/locale/en-GB/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/en-GB/network-settings.dtd +++ b/src/chrome/locale/en-GB/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/en-GB/torlauncher.properties b/src/chrome/locale/en-GB/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/en-GB/torlauncher.properties +++ b/src/chrome/locale/en-GB/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/eo/network-settings.dtd b/src/chrome/locale/eo/network-settings.dtd index 89f752b..0c3fa75 100644 --- a/src/chrome/locale/eo/network-settings.dtd +++ b/src/chrome/locale/eo/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/eo/torlauncher.properties b/src/chrome/locale/eo/torlauncher.properties index 7609a5c..2fd97ff 100644 --- a/src/chrome/locale/eo/torlauncher.properties +++ b/src/chrome/locale/eo/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor-startigilo @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S malsukcesis (%2$S). torlauncher.unable_to_start_tor=Ne eblas starti Tor.\n\n%S torlauncher.tor_missing=Tor-komandodosiero mankas. -torlauncher.torrc_missing=Konfigura dosiero torrc mankas. -torlauncher.datadir_missing=Datuma dosierujo de Tor ne ekzistas. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Malsukcesis ricevado de haketigita pasvorto. torlauncher.failed_to_get_settings=Ne eblas ricevi agordojn de Tor.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Eliri torlauncher.done=Preta torlauncher.forAssistance=Por asiston kontaktu %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Kopiado estas preta. %S Tor-protokolaj mesaĝoj pretas por enigi ilin en tekstredaktilon aŭ retpoŝtmesaĝon. diff --git a/src/chrome/locale/es-AR/network-settings.dtd b/src/chrome/locale/es-AR/network-settings.dtd index 9dd4ef3..43e6c10 100644 --- a/src/chrome/locale/es-AR/network-settings.dtd +++ b/src/chrome/locale/es-AR/network-settings.dtd @@ -13,7 +13,7 @@ <!ENTITY torSettings.firstQuestion "¿Cuál de las siguientes opciones describe mejor su situación?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Necesito configurar un puente o proxy local anntes de conectarme a la red Tor."> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> <!ENTITY torSettings.connectPrompt3 "Esto debería funcionar en la mayoría de situaciones."> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "A través de la Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/es-AR/torlauncher.properties b/src/chrome/locale/es-AR/torlauncher.properties index 3c010cb..3ca3c78 100644 --- a/src/chrome/locale/es-AR/torlauncher.properties +++ b/src/chrome/locale/es-AR/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Lanzador de Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S falló (%2$S). 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. -torlauncher.datadir_missing=El directorio de datos de Tor no existe. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. 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 @@ -36,6 +36,7 @@ torlauncher.quit_win=Salir torlauncher.done=Hecho torlauncher.forAssistance=Para solicitar asistencia, contactese al %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copia completa. %S registros de log de Tor están listos para ser pegados en un editor de textos o un e-mail. diff --git a/src/chrome/locale/es-CL/network-settings.dtd b/src/chrome/locale/es-CL/network-settings.dtd index b6cd80c..6303509 100644 --- a/src/chrome/locale/es-CL/network-settings.dtd +++ b/src/chrome/locale/es-CL/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/es-CL/torlauncher.properties b/src/chrome/locale/es-CL/torlauncher.properties index 292e182..c605b64 100644 --- a/src/chrome/locale/es-CL/torlauncher.properties +++ b/src/chrome/locale/es-CL/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/es-CO/network-settings.dtd b/src/chrome/locale/es-CO/network-settings.dtd index 8ec90ba..cb4c106 100644 --- a/src/chrome/locale/es-CO/network-settings.dtd +++ b/src/chrome/locale/es-CO/network-settings.dtd @@ -1,12 +1,12 @@ <!ENTITY torsettings.dialog.title "Configuraciones de red de Tor">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Idioma del Navegador Tor"> +<!ENTITY torlauncher.localePicker.prompt "Por favor selecciona un idioma.">  -<!ENTITY torsettings.prompt "Antes de conectar con la red de Tor, necesitas proveer informacion acerca de la coneccion de internet de este computador."> +<!ENTITY torsettings.prompt "Antes de conectar con la red de Tor, necesitas proveer información acerca de la conexión de internet de este computador."> <!ENTITY torSettings.yes "Si"> <!ENTITY torSettings.no "No"> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/es-CO/torlauncher.properties b/src/chrome/locale/es-CO/torlauncher.properties index 8580f6e..8451a68 100644 --- a/src/chrome/locale/es-CO/torlauncher.properties +++ b/src/chrome/locale/es-CO/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Hecho torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/es-MX/network-settings.dtd b/src/chrome/locale/es-MX/network-settings.dtd index 0d8f71d..99d4197 100644 --- a/src/chrome/locale/es-MX/network-settings.dtd +++ b/src/chrome/locale/es-MX/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/es-MX/progress.dtd b/src/chrome/locale/es-MX/progress.dtd index d1d6bb5..3ee4849 100644 --- a/src/chrome/locale/es-MX/progress.dtd +++ b/src/chrome/locale/es-MX/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Estado de Tor"> <!ENTITY torprogress.openSettings "Abrir Ajustes"> <!ENTITY torprogress.heading "Conectando a la red Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Por favor, espera mientras establecemos una conexión con Tor network.  Esto puede llevar varios minutos."> diff --git a/src/chrome/locale/es-MX/torlauncher.properties b/src/chrome/locale/es-MX/torlauncher.properties index 77aa158..515b570 100644 --- a/src/chrome/locale/es-MX/torlauncher.properties +++ b/src/chrome/locale/es-MX/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Lanzador Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S falló (%2$S). torlauncher.unable_to_start_tor=No se ha podido iniciar Tor.\n\n%S torlauncher.tor_missing=Falta el ejecutable de Tor. -torlauncher.torrc_missing=Falta el archivo torrc. -torlauncher.datadir_missing=El diccionario de datos de Tor no existe. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=No se pudo obtener la contraseña cifrada. torlauncher.failed_to_get_settings=No se puede recuperar la configuración de Tor. \n\n% S @@ -36,6 +36,7 @@ torlauncher.quit_win=Salir torlauncher.done=Hecho torlauncher.forAssistance=Si necesitas ayuda, contacta a %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copia completa. %S mensajes del registro de Tor están listos para ser pegados en un editor de texto o mensaje de correo electrónico. diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd index 13b8c28..a6db1ee 100644 --- a/src/chrome/locale/es/network-settings.dtd +++ b/src/chrome/locale/es/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copiar el registro de mensajes(log) de Tor al portapapeles"> <!ENTITY torsettings.bridgeHelpTitle "Ayuda de repetidores puente ('bridge relays')"> <!ENTITY torsettings.bridgeHelp1 "Si no puede conectarse a la red Tor, podría ser que su proveedor de servicios de Internet (ISP) u otra agencia, esté bloqueando Tor.  A menudo, puede evitar este problema usando puentes ('bridges') de Tor, que son repetidores ('relays') de salida de la red Tor que no son públicos, y es más difícil que sean bloqueados."> -<!ENTITY torsettings.bridgeHelp1B "Puede usar el conjunto de direcciones de repetidores puente ('bridge') preconfigurado proporcionado, o puede obtener un conjunto de direcciones personalizado usando uno de estos tres métodos:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Mediante la web"> <!ENTITY torsettings.bridgeHelp2 "Use un navegador web para visitar https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Mediante el correo electrónico automático"> diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties index 42780e5..45381fb 100644 --- a/src/chrome/locale/es/torlauncher.properties +++ b/src/chrome/locale/es/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Arranque de Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S falló (%2$S). torlauncher.unable_to_start_tor=Imposible 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" -torlauncher.datadir_missing=El directorio de datos de Tor no existe. +torlauncher.torrc_missing=No existe el fichero torcc y no puede ser creado. +torlauncher.datadir_missing=El directorio de datos de Tor no existe y no puede ser creado torlauncher.password_hash_missing=Fallo al obtener la contraseña cifrada. torlauncher.failed_to_get_settings=No se pudo recuperar las preferencias de Tor.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Salir torlauncher.done=Listo torlauncher.forAssistance=Para obtener ayuda, contacte con %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copia completada. %S mensajes de registro ('log') de Tor están listos para ser pegados en un editor de texto o en un mensaje de correo electrónico. diff --git a/src/chrome/locale/et/network-settings.dtd b/src/chrome/locale/et/network-settings.dtd index d4e4c14..c4bdb10 100644 --- a/src/chrome/locale/et/network-settings.dtd +++ b/src/chrome/locale/et/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/et/torlauncher.properties b/src/chrome/locale/et/torlauncher.properties index 1ebd50d..37d82b4 100644 --- a/src/chrome/locale/et/torlauncher.properties +++ b/src/chrome/locale/et/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tori käivitaja @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Ei suuda käivitada Tor-i.\n\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(soovitatud) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Valmis torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/eu/network-settings.dtd b/src/chrome/locale/eu/network-settings.dtd index e034658..b311fdc 100644 --- a/src/chrome/locale/eu/network-settings.dtd +++ b/src/chrome/locale/eu/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Kopiatu Tor erregistroa arbelera"> <!ENTITY torsettings.bridgeHelpTitle "Zubi errele laguntza"> <!ENTITY torsettings.bridgeHelp1 "Tor sarera konektatu ezin bazara, baliteke zure Internet Zerbitzu Hornitzaileak (ISP ingeleraz) edo beste agentziaren batek Tor blokeatzen egotea.  Askotan, arazo honen inguruan Tor zubiak, ezkutatuta dauden eta blokeatzeko zailagoak diren erreleak erabiliz lan egin dezakezu."> -<!ENTITY torsettings.bridgeHelp1B "Aurrez konfiguratutako, emandako zubi taldea erabili dezakezu, edo zubi talde pertsonalizatua eskuratu dezakezu hurrengo hiru metodoetako bat aukeratuz: "> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Webean bidez"> <!ENTITY torsettings.bridgeHelp2 "Erabili ezazu web nabigatzaile bat https://bridges.torproject.org bisitatzeko"> <!ENTITY torsettings.bridgeHelp3Heading "Email erantzule automatikoaren bidez"> diff --git a/src/chrome/locale/eu/torlauncher.properties b/src/chrome/locale/eu/torlauncher.properties index 073e987..f5f51b5 100644 --- a/src/chrome/locale/eu/torlauncher.properties +++ b/src/chrome/locale/eu/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor abiarazlea @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S huts egin du (%2$S). torlauncher.unable_to_start_tor=Ezin izan da Tor hasi.\n\n%S torlauncher.tor_missing=Tor exekutagarria falta da. -torlauncher.torrc_missing=torrc fitxategia falta da. -torlauncher.datadir_missing=Tor datu direktorioa ez da existitzen. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Huts egin du hash-eatutako pasahitza eskuratzen. torlauncher.failed_to_get_settings=Ezin izan dira Tor ezarpenak berreskuratu.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Irten torlauncher.done=Eginda torlauncher.forAssistance=Laguntza lortzeko, %S(r)ekin harremanetan jarri +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Kopia burutu da. %S Tor erregistro mezuak prest daude testu editore edo email mezu batean itsasteko. diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd index 3a95731..17705b4 100644 --- a/src/chrome/locale/fa/network-settings.dtd +++ b/src/chrome/locale/fa/network-settings.dtd @@ -35,10 +35,10 @@ <!ENTITY torsettings.startingTor "در انتظار آغاز به کار تور..."> <!ENTITY torsettings.restartTor "تور را دوباره شوروع کنید."> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "پیکربندی مجدد"> <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.proceed "حذف تنظیمات و اتصال"> <!ENTITY torsettings.optional "اختیاری"> @@ -66,7 +66,7 @@ <!ENTITY torsettings.bridgeHelpTitle "کمک برای پل ارتباطی"> <!ENTITY torsettings.bridgeHelp1 "اگر نمی توانید به شبکه تور متصل شوید، ممکن است به این دلیل باشد که شرکت ارایه کننده اینترنت شما(ISP) و یا سازمان های دیگر شبکه تور را بسته اند.  غالباً می توانید این محدودیت را با استفاده از «پل» های تور دور بزنید. پل ها مسیرهای اضافی دور زدن فیلتر هستند که لیست آن در دسترس نیست و فیلتر کردن آن ها بسیار مشکل است."> -<!ENTITY torsettings.bridgeHelp1B "شما می‌توانید از پل‌های موجود استفاده کنید و یا برای به‌دست آوردن مجموعه‌ای از پل‌های شخصی از یکی از سه روش زیر بهره بگیرید:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "از طریق اینترنت"> <!ENTITY torsettings.bridgeHelp2 "با استفاده از یک مرورگر به آدرس https://bridges.torproject.org بروید."> <!ENTITY torsettings.bridgeHelp3Heading "از طریق آدرس ایمیل پاسخگوی خودکار"> diff --git a/src/chrome/locale/fa/torlauncher.properties b/src/chrome/locale/fa/torlauncher.properties index bdd5c09..d5c4f78 100644 --- a/src/chrome/locale/fa/torlauncher.properties +++ b/src/chrome/locale/fa/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=اجرا کننده تور @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S ناموفق بود (%2$S). torlauncher.unable_to_start_tor=راه اندازی تور امکان پذیر نمی باشد.\n\n%S torlauncher.tor_missing=فایل اجرایی تور یافت نشد. -torlauncher.torrc_missing=فایل torrc یافت نشد. -torlauncher.datadir_missing=لیست داده تور وجود ندارد. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=کلمهٔ عبور رمزشده دریافت نشد. torlauncher.failed_to_get_settings=ناموفق در بازگردانی تنظیمات تور.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=خروج torlauncher.done=انجام شد torlauncher.forAssistance=برای دریافت کمک٫ با %S تماس بگیرید +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=کپی کامل شد. %S پیامهای ثبت شده آماده است تا Paste شود در ویرایشگر متن یا یک ایمیل. diff --git a/src/chrome/locale/fi/network-settings.dtd b/src/chrome/locale/fi/network-settings.dtd index 6338e04..31dae56 100644 --- a/src/chrome/locale/fi/network-settings.dtd +++ b/src/chrome/locale/fi/network-settings.dtd @@ -15,7 +15,7 @@ <!ENTITY torSettings.configurePrompt1 "Tämän tietokoneen internet-yhteys on sensuroitu tai kulkee välityspalvelimen kautta."> <!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> <!ENTITY torSettings.configure "Määritä"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Haluan tehdä suoran yhteyden Tor-verkkoon."> <!ENTITY torSettings.connectPrompt3 "Tämä toimii useimmissa tilanteissa."> <!ENTITY torSettings.connect "Yhdistä"> @@ -35,10 +35,10 @@ <!ENTITY torsettings.startingTor "Odotetaan Tor-sovelluksen käynnistymistä..."> <!ENTITY torsettings.restartTor "Käynnistä Tor uudelleen"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Uudelleenmääritä"> <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.proceed "Poista asetukset ja yhdistä"> <!ENTITY torsettings.optional "Vaihtoehtoinen"> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Kopioi Tor-loki leikepöydälle"> <!ENTITY torsettings.bridgeHelpTitle "Siltavälityspalvelinopaste"> <!ENTITY torsettings.bridgeHelp1 "Jos et pysty yhdistämään Tor-verkkoon, syy voi olla, että Internet palveluntarjoajasi (ISP) tai muu taho estää Tor-sovelluksen.  Usein voit kiertää tämän ongelman käyttämällä Tor-siltoja, jotka ovat listaamattomia välityspalvelimia, joita on vaikeampi estää."> -<!ENTITY torsettings.bridgeHelp1B "Voit käyttää esiasetettuja, tarjottuja siltaosoitejoukkoja tai voit hankkia oman osoitejoukon käyttämällä yhtä näistä kolmesta menetelmästä:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Verkon yli"> <!ENTITY torsettings.bridgeHelp2 "Käytä internet-selainta vieraillaksesi osoitteessa: https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Sähköpostin automaattivastaajan läpi"> diff --git a/src/chrome/locale/fi/progress.dtd b/src/chrome/locale/fi/progress.dtd index 5850aa9..69414cf 100644 --- a/src/chrome/locale/fi/progress.dtd +++ b/src/chrome/locale/fi/progress.dtd @@ -1,4 +1,5 @@ <!ENTITY torprogress.dialog.title "Tor-tila"> <!ENTITY torprogress.openSettings "Avaa asetukset"> <!ENTITY torprogress.heading "Yhdistetään Tor-verkkoon"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Odota pieni hetki, kun yhteys TOR-verkostoon luodaan.  +Tässä saattaa kestää muutama minuutti."> diff --git a/src/chrome/locale/fi/torlauncher.properties b/src/chrome/locale/fi/torlauncher.properties index 533f596..5a62a38 100644 --- a/src/chrome/locale/fi/torlauncher.properties +++ b/src/chrome/locale/fi/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor-käynnistin @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S epäonnistui (%2$S). torlauncher.unable_to_start_tor=Tor-sovelluksen käynnistys epäonnistui.\n\n%S torlauncher.tor_missing=Suoritettava Tor-tiedosto puuttuu. -torlauncher.torrc_missing=Tiedosto torrc puuttuu. -torlauncher.datadir_missing=Tor-tietohakemistoa ei ole. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Tiivistettyä salasanaa ei löytynyt. torlauncher.failed_to_get_settings=Tor-asetusten noutaminen epäonnistui.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Lopeta torlauncher.done=Valmis torlauncher.forAssistance=Tukea saat ottamalla yhteyttä osoitteeseen %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Kopionti suoritettu. %S Tor-lokiviestiä on valmiina kopiotavaksi tekstimuokkaimeen tai sähköpostiviestiin. diff --git a/src/chrome/locale/fil/network-settings.dtd b/src/chrome/locale/fil/network-settings.dtd index 78c45b7..bd9412b 100644 --- a/src/chrome/locale/fil/network-settings.dtd +++ b/src/chrome/locale/fil/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/fil/torlauncher.properties b/src/chrome/locale/fil/torlauncher.properties index 23dfc4d..32a2ee7 100644 --- a/src/chrome/locale/fil/torlauncher.properties +++ b/src/chrome/locale/fil/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tagapaglunsad ng Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S nabigo (%2$S). torlauncher.unable_to_start_tor=Hindi magawang simulan ang Tor.\n\n%S torlauncher.tor_missing=Ang Tor executable ay nawawala. -torlauncher.torrc_missing=Ang torrc file ay nawawala. -torlauncher.datadir_missing=Walang direktoryo ng data ang Tor. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Nabigong makakuha ng na-hash na password. torlauncher.failed_to_get_settings=Hindi nabawi ang mga setting ng Tor.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Lumabas torlauncher.done=Tapos na torlauncher.forAssistance=Para sa tulong, makipag-ugnay sa %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Kumpleto na ang Pag-kopya. %S Ang mga log messages ng Tor ay handa na ma-paste sa isang text editor o sa e-mail message. diff --git a/src/chrome/locale/fo/network-settings.dtd b/src/chrome/locale/fo/network-settings.dtd index 14dac48..78bc505 100644 --- a/src/chrome/locale/fo/network-settings.dtd +++ b/src/chrome/locale/fo/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/fo/torlauncher.properties b/src/chrome/locale/fo/torlauncher.properties index 954ef11..3861409 100644 --- a/src/chrome/locale/fo/torlauncher.properties +++ b/src/chrome/locale/fo/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/fr-CA/network-settings.dtd b/src/chrome/locale/fr-CA/network-settings.dtd index 111e80e..558b7ac 100644 --- a/src/chrome/locale/fr-CA/network-settings.dtd +++ b/src/chrome/locale/fr-CA/network-settings.dtd @@ -13,7 +13,7 @@ <!ENTITY torSettings.firstQuestion "Laquelle des suivantes décrit le mieux votre situation?"> <!ENTITY torSettings.configurePrompt1 "La connexion Internet de cet ordinateur est censurée ou relayée."> -<!ENTITY torSettings.configurePrompt2 "Je dois paramétrer un pont ou un mandataire local avant de me connecter au réseau  Tor."> +<!ENTITY torSettings.configurePrompt2 "Je dois paramétrer un pont ou un mandataire local avant de me connecter au réseau Tor."> <!ENTITY torSettings.configure "Configurer"> <!ENTITY torSettings.connectPrompt2 "J'aimerais établir une connexion directe vers le réseau Tor."> <!ENTITY torSettings.connectPrompt3 "Ceci fonctionnera dans la plupart des situations."> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copier le journal de Tor dans le presse-papier"> <!ENTITY torsettings.bridgeHelpTitle "Aide pour les relais-ponts"> <!ENTITY torsettings.bridgeHelp1 "Si vous ne pouvez pas vous connecter au réseau Tor, il se peut que votre fournisseur d'accès à Internet (FAI) ou une autre organisme bloque Tor.  Vous pouvez souvent le contourner en utilisant des ponts Tor qui sont des relais non répertoriés, plus difficiles à bloquer."> -<!ENTITY torsettings.bridgeHelp1B "Vous pouvez utiliser le jeu préconfiguré d'adresses de ponts fourni ou vous pouvez obtenir un jeu personnalisé d'adresses en utilisant une de ces trois méthodes :"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "par le Web"> <!ENTITY torsettings.bridgeHelp2 "en utilisant un navigateur Web pour visiter https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Par le répondeur automatique de courriel"> diff --git a/src/chrome/locale/fr-CA/torlauncher.properties b/src/chrome/locale/fr-CA/torlauncher.properties index 2f7cc98..05443db 100644 --- a/src/chrome/locale/fr-CA/torlauncher.properties +++ b/src/chrome/locale/fr-CA/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Lanceur Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S a échoué (%2$S). torlauncher.unable_to_start_tor=Impossible de démarrer Tor.\n\n%S torlauncher.tor_missing=L'exécutable Tor est manquant. -torlauncher.torrc_missing=Le fichier torrc est manquant. -torlauncher.datadir_missing=Le répertoire de données de Tor n'existe pas. +torlauncher.torrc_missing=Le fichier torrc est manquant et n'a pas pu être créé. +torlauncher.datadir_missing=Le répertoire de données Tor n'existe pas et n'a pas pu être créé. torlauncher.password_hash_missing=Impossible d'obtenir le mot de passe haché. torlauncher.failed_to_get_settings=Impossible de récupérer les paramètres de Tor.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Sortir torlauncher.done=Fait torlauncher.forAssistance=Pour l'assistance, contacter %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=La copie est terminée. %S messages de journalisation de Tor sont prêts à être coller dans un éditeur de texte ou un courriel. diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index e3b06af..16bdfac 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Paramètres du réseau Tor">  -<!ENTITY torlauncher.localePicker.title "Language du navigateur Tor"> +<!ENTITY torlauncher.localePicker.title "Langue du Navigateur Tor"> <!ENTITY torlauncher.localePicker.prompt "Merci de sélectionner une langue.">  @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "Laquelle des phrases suivantes décrit le mieux votre situation ?"> <!ENTITY torSettings.configurePrompt1 "Le connexion internet de cet ordinateur est restreinte (censurée) ou passe par un proxy."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Je dois configurer le pont réseau ou les paramètres du proxy avant de me connecter au réseau Tor."> <!ENTITY torSettings.configure "Configurer"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Je voudrais faire une connexion directe au réseau Tor."> <!ENTITY torSettings.connectPrompt3 "Cela fonctionnera dans la plupart des situations."> <!ENTITY torSettings.connect "Se connecter"> <!ENTITY torSettings.proxyPageTitle "Configuration du proxy local"> <!ENTITY torSettings.proxyQuestion "Est-ce que cet ordinateur a besoin d'utiliser un proxy pour accéder à internet ?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "Dans la plupart des cas le proxy local n'est pas nécessaire, mais il peut être exigé pour une connexion dans un réseau d'entreprise, d'école ou universitaire."> +<!ENTITY torSettings.proxyExplanation2 "Si vous n'êtes pas certain de savoir comment répondre à cette question, regardez les paramètres Internet d'un autre navigateur ou les paramètres réseaux de votre système afin de vérifier si vous avez besoin d'un proxy."> <!ENTITY torSettings.enterProxy "Entrez les paramètres de votre proxy."> <!ENTITY torSettings.bridgePageTitle "Configuration des relais TOR"> <!ENTITY torSettings.bridgeQuestion "Est-ce que votre Fournisseur d'Accès Internet (FAI) bloque les connexions au réseau Tor ?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "Vous pouvez utiliser les ponts fournis ou bien saisir votre liste de ponts personnels."> +<!ENTITY torSettings.bridgeExplanation1 "Si vous ne savez par comment répondre à cette question, choisissez Non (si vous ne pouvez pas vous connecter au réseau Tor sans un bridge, vous pourrez le rajouter plus tard)."> +<!ENTITY torSettings.bridgeExplanation2 "Si vous choisissez Oui, il vous sera demandé de configurer les bridges Tor qui sont des relais non listés et qui rendent plus difficile le blocage du réseau Tor."> +<!ENTITY torSettings.bridgeSettingsPrompt "Vous pouvez utiliser les bridges fournis ou bien saisir votre liste de bridges personnels.">  <!ENTITY torsettings.startingTor "En attente du démarrage de Tor..."> <!ENTITY torsettings.restartTor "Relancer Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Reconfigurer"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Vous avez configuré les bridges Tor ou vous avez entré les paramètres de proxy local. Pour faire une connexion directe avec le réseau Tor, ces configurations doivent être supprimés."> +<!ENTITY torsettings.discardSettings.proceed "Supprimer les paramètres et se connecter"> <!ENTITY torsettings.optional "Optionnel"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Ports autorisés :"> <!ENTITY torsettings.useBridges.checkbox "Mon Fournisseur d'Accès à Internet (FAI) bloque les connexions au réseau Tor"> <!ENTITY torsettings.useBridges.default "Se connecter en utilisant les ponts pré-configurés"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Chaque type de pont utilise une méthode différente pour éviter la censure. Si un pont ne marche pas, essayez de nouveau avec un autre."> <!ENTITY torsettings.useBridges.type "Mode de transport:"> <!ENTITY torsettings.useBridges.custom "Entrez vos ponts personnels"> <!ENTITY torsettings.useBridges.label "Saisir un ou davantage de ponts relais (un par ligne)."> @@ -64,8 +64,8 @@ <!ENTITY torsettings.copyLog "Copier le journal des messages de Tor dans le presse-papier"> <!ENTITY torsettings.bridgeHelpTitle "Aide pour les ponts"> -<!ENTITY torsettings.bridgeHelp1 "Si vous ne pouvez pas vous connecter au réseau Tor, il se pourrait que votre fournisseur d'accès à Internet (FAI) ou une autre agence bloque le Tor.  Souvent, vous pouvez contourner ce problème en utilisant des ponts Tor, qui sont des relais non listés qui sont plus difficiles à bloquer."> -<!ENTITY torsettings.bridgeHelp1B "Vous pouvez utiliser les liste de ponts pré-configurés par défaut ou en obtenir une liste personnalisée d'adresses en utilisant l'une des trois méthodes ci-dessous :"> +<!ENTITY torsettings.bridgeHelp1 "Si vous ne pouvez pas vous connecter au réseau Tor, il se pourrait que votre fournisseur d'accès à Internet (FAI) ou une autre agence bloque le Tor.  Souvent, vous pouvez contourner ce problème en utilisant des bridges Tor, qui sont des relais non listés qui sont plus difficiles à bloquer."> +<!ENTITY torsettings.bridgeHelp1B "Vous pouvez utiliser la liste fournie et pré-configurée d'adresses de bridges, ou alors obtenir une liste personnalisée d'adresses en utilisant une de ces méthodes :"> <!ENTITY torsettings.bridgeHelp2Heading "Par le Web"> <!ENTITY torsettings.bridgeHelp2 "Utilisez un navigateur web pour visiter https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Par le répondeur automatique de courriel"> diff --git a/src/chrome/locale/fr/progress.dtd b/src/chrome/locale/fr/progress.dtd index 157276d..a7d1857 100644 --- a/src/chrome/locale/fr/progress.dtd +++ b/src/chrome/locale/fr/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "État de Tor"> <!ENTITY torprogress.openSettings "Ouvrir les paramètres"> <!ENTITY torprogress.heading "Connexion au réseau Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que la connexion au réseau Tor s'établit. Cela peut prendre quelques minutes."> diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties index 209755b..62364b9 100644 --- a/src/chrome/locale/fr/torlauncher.properties +++ b/src/chrome/locale/fr/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Lanceur Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S échoué (%2$S). torlauncher.unable_to_start_tor=Impossible de démarrer Tor.\n\n%S torlauncher.tor_missing=L'exécutable Tor est introuvable. -torlauncher.torrc_missing=Le fichier torrc est manquant. -torlauncher.datadir_missing=Le répertoire de données de Tor n'existe pas. +torlauncher.torrc_missing=Le fichier torrc est manquant et n'a pas pu être créé. +torlauncher.datadir_missing=Le dossier de données de Tor n'existe pas et n'a pas pu être créé. torlauncher.password_hash_missing=Impossible d'obtenir le mot de passe chiffré. torlauncher.failed_to_get_settings=Impossible de récupérer les paramètres de Tor.\n\n%S @@ -24,8 +24,8 @@ torlauncher.ensure_tor_is_running=Veuillez-vous assurer que Tor est lancé. torlauncher.error_proxy_addr_missing=Pour configurer Tor afin qu'il utilise un proxy, vous devez spécifier une adresse IP ou un nom d'hôte ainsi qu'un numéro de port. torlauncher.error_proxy_type_missing=Vous devez sélectionner un type de proxy. torlauncher.error_bridges_missing=Vous devez spécifier un ou plusieurs bridges. -torlauncher.error_default_bridges_type_missing=Vous devez sélectionner un type de transport pour les ponts fournis. -torlauncher.error_bridge_bad_default_type=Aucun des ponts fournis n'a le type de transport %S. Merci d'ajuster vos paramètres. +torlauncher.error_default_bridges_type_missing=Vous devez sélectionner un type de transport pour les bridges fournis. +torlauncher.error_bridge_bad_default_type=Aucun des bridges fournis n'a le type de transport %S. Merci d'ajuster vos paramètres. torlauncher.recommended_bridge=(recommandé) @@ -36,6 +36,7 @@ torlauncher.quit_win=Sortir torlauncher.done=Terminé torlauncher.forAssistance=Pour obtenir de l'aide, contactez %S +torlauncher.forAssistance2=Pour obtenir de l'aide, visiter %S torlauncher.copiedNLogMessages=La copie est terminée. %S messages de journalisation de Tor sont prêts à être coller dans un éditeur de texte ou un courriel. diff --git a/src/chrome/locale/fur/network-settings.dtd b/src/chrome/locale/fur/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/fur/network-settings.dtd +++ b/src/chrome/locale/fur/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/fur/torlauncher.properties b/src/chrome/locale/fur/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/fur/torlauncher.properties +++ b/src/chrome/locale/fur/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/fy/network-settings.dtd b/src/chrome/locale/fy/network-settings.dtd index 8165a1a..477705a 100644 --- a/src/chrome/locale/fy/network-settings.dtd +++ b/src/chrome/locale/fy/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/fy/torlauncher.properties b/src/chrome/locale/fy/torlauncher.properties index d735f57..17dc982 100644 --- a/src/chrome/locale/fy/torlauncher.properties +++ b/src/chrome/locale/fy/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Klear torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/ga/network-settings.dtd b/src/chrome/locale/ga/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/ga/network-settings.dtd +++ b/src/chrome/locale/ga/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/ga/torlauncher.properties b/src/chrome/locale/ga/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/ga/torlauncher.properties +++ b/src/chrome/locale/ga/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/gl/network-settings.dtd b/src/chrome/locale/gl/network-settings.dtd index c4703b1..7940a38 100644 --- a/src/chrome/locale/gl/network-settings.dtd +++ b/src/chrome/locale/gl/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copia o rexistro do Tor ao portapapeis"> <!ENTITY torsettings.bridgeHelpTitle "Axuda do Repetidor Ponte"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/gl/torlauncher.properties b/src/chrome/locale/gl/torlauncher.properties index 038d926..a5f1613 100644 --- a/src/chrome/locale/gl/torlauncher.properties +++ b/src/chrome/locale/gl/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Lanzador do Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Non se puido iniciar o Tor.⏎\n⏎\n%S torlauncher.tor_missing=Falta o executábel do Tor. -torlauncher.torrc_missing=Falta o ficheiro torrc -torlauncher.datadir_missing=Non existe o directorio de datos do Tor. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Non se puido obter o contrasinal cifrado. torlauncher.failed_to_get_settings=Non se pode recuperar a configuración do Tor.⏎\n⏎\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Saír torlauncher.done=Feito torlauncher.forAssistance=Para obter asistencia, póñase en contacto con %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/gu-IN/network-settings.dtd b/src/chrome/locale/gu-IN/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/gu-IN/network-settings.dtd +++ b/src/chrome/locale/gu-IN/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/gu-IN/torlauncher.properties b/src/chrome/locale/gu-IN/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/gu-IN/torlauncher.properties +++ b/src/chrome/locale/gu-IN/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/gu/network-settings.dtd b/src/chrome/locale/gu/network-settings.dtd index 93ec7cb..b66952c 100644 --- a/src/chrome/locale/gu/network-settings.dtd +++ b/src/chrome/locale/gu/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/gu/torlauncher.properties b/src/chrome/locale/gu/torlauncher.properties index 02be756..066a18a 100644 --- a/src/chrome/locale/gu/torlauncher.properties +++ b/src/chrome/locale/gu/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(સૂચવેલ) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/gun/network-settings.dtd b/src/chrome/locale/gun/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/gun/network-settings.dtd +++ b/src/chrome/locale/gun/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/gun/torlauncher.properties b/src/chrome/locale/gun/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/gun/torlauncher.properties +++ b/src/chrome/locale/gun/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/ha/network-settings.dtd b/src/chrome/locale/ha/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/ha/network-settings.dtd +++ b/src/chrome/locale/ha/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/ha/torlauncher.properties b/src/chrome/locale/ha/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/ha/torlauncher.properties +++ b/src/chrome/locale/ha/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/he/network-settings.dtd b/src/chrome/locale/he/network-settings.dtd index 6fd02c7..d6a09c7 100644 --- a/src/chrome/locale/he/network-settings.dtd +++ b/src/chrome/locale/he/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "העתק את יומן Tor אל לוח גזירה"> <!ENTITY torsettings.bridgeHelpTitle "עזרה בנוגע לגשרים"> <!ENTITY torsettings.bridgeHelp1 "אם אין באפשרותך להתחבר לרשת Tor, ייתכן שהסיבה לכך היא שספק האינטרנט שלך או גורם אחר חוסמים את Tor. לעתים קרובות, ניתן להתגבר על בעיה זו באמצעות שימוש בגשרים, שהם שרתים חסויים שקשה יותר לחסום אותם."> -<!ENTITY torsettings.bridgeHelp1B "באפשרותך להשתמש ברשימה מוכנה מראש של גשרים או להשיג בעצמך רשימה חדשה של כתובות באמצעות אחת משלוש הדרכים הבאות:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "באמצעות רשת האינטרנט"> <!ENTITY torsettings.bridgeHelp2 "היעזר בדפדפן אינטרנט על מנת לבקר באתר https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "דרך שירות הדואל האוטומטי"> diff --git a/src/chrome/locale/he/torlauncher.properties b/src/chrome/locale/he/torlauncher.properties index 66cd550..9c9fd87 100644 --- a/src/chrome/locale/he/torlauncher.properties +++ b/src/chrome/locale/he/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=תוכנת ההפעלה של Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S נכשל (%2$S). torlauncher.unable_to_start_tor=אין אפשרות להפעיל את Tor.\n\n%S torlauncher.tor_missing=קובץ ההפעלה של Tor איננו קיים. -torlauncher.torrc_missing=קובץ torrc איננו קיים. -torlauncher.datadir_missing=תיקיית הנתונים Tor איננה קיימת. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=כשל בהשגת סיסמה מעורבלת. torlauncher.failed_to_get_settings=אין אפשרות לאחזר הגדרות Tor.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=יציאה torlauncher.done=בוצע torlauncher.forAssistance=לתמיכה, צור קשר עם %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=ההעתקה הושלמה. %S הודעות מיומן הרישום של Tor מוכנות להעתקה לתוך עורך טקסט או להודעת דואל. diff --git a/src/chrome/locale/hi/network-settings.dtd b/src/chrome/locale/hi/network-settings.dtd index d63adb7..3b7b724 100644 --- a/src/chrome/locale/hi/network-settings.dtd +++ b/src/chrome/locale/hi/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/hi/torlauncher.properties b/src/chrome/locale/hi/torlauncher.properties index f093ec6..0bfc497 100644 --- a/src/chrome/locale/hi/torlauncher.properties +++ b/src/chrome/locale/hi/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=बाहर torlauncher.done=सम्पन्न torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/hr-HR/network-settings.dtd b/src/chrome/locale/hr-HR/network-settings.dtd index 657b7f9..8eb9b7c 100644 --- a/src/chrome/locale/hr-HR/network-settings.dtd +++ b/src/chrome/locale/hr-HR/network-settings.dtd @@ -14,33 +14,33 @@ internetskoj vezi ovog računala."> <!ENTITY torSettings.firstQuestion "Koje od sljedećeg najbolje opisuje Vašu situaciju?"> <!ENTITY torSettings.configurePrompt1 "Veza ovog računal s Internetom je cenzurirana ili iza proxy-a."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Trebam konfigurirati postavke mosta ili lokalnog proxy-a prije nego se spojim na Tor mrežu."> <!ENTITY torSettings.configure "Podesi"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Želim direktnu vezu s Tor mrežom."> <!ENTITY torSettings.connectPrompt3 "Ovo će raditi u većini situacija."> -<!ENTITY torSettings.connect "Spajanje"> +<!ENTITY torSettings.connect "Spoji"> <!ENTITY torSettings.proxyPageTitle "Konfiguracija lokalnog proxy-a"> <!ENTITY torSettings.proxyQuestion "Treba li ovo računalo koristiti lokalni proxy da pristupi Internetu?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "U većini slučaja lokalni proxy nije potreban, ali može biti kad se spajate kroz mržu tvrtke, škole ili fakulteta."> +<!ENTITY torSettings.proxyExplanation2 "Ako niste sigurni kako odgovoriti na ovo pitanje, pogledajte Internet postavke u drugom pregledniku ili provjerite mrežne postavke Vašeg sustava kako bi vidjeli da li je potreban lokalni proxy."> <!ENTITY torSettings.enterProxy "Unesite postavke proxyj-a."> <!ENTITY torSettings.bridgePageTitle "Konfiguracija Tor mostova"> <!ENTITY torSettings.bridgeQuestion "Blokira li Vaš davetelj Internet usluge (ISP) ili drugačije cenzurira veze s Tor mrežom?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Ako niste sigurni kako odgovoriti na ovo pitanje, odaberite Ne (ako se ne možete spojiti na Tor mrežu bez mosta, možete kasnije dodati jedan)."> +<!ENTITY torSettings.bridgeExplanation2 "Ako odaberete Da, od Vas će se tražiti da konfigurirate Tor mostove, koji su nepopisani releji koji otežavaju blokiranje veza na Tor mrežu."> <!ENTITY torSettings.bridgeSettingsPrompt "Možete koristiti osigurani set adresa mostova ili možete unijeti vlasiti set mostova.">  <!ENTITY torsettings.startingTor "Čekanje da se Tor pokrene..."> <!ENTITY torsettings.restartTor "Ponovno pokreni Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Rekonfiguriraj"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Konfigurirali ste Tor mostove ili ste unijeli postavke lokalnog proxy-a.  Kako bi ostvarili direktnu vezu s Tor mrežom, ove postavke moraju biti uklonjene."> +<!ENTITY torsettings.discardSettings.proceed "Ukloni postavke i poveži"> <!ENTITY torsettings.optional "Opcionalno"> @@ -58,7 +58,7 @@ s Tor mrežom?"> <!ENTITY torsettings.firewall.allowedPorts "Dozvoljeni portovi:"> <!ENTITY torsettings.useBridges.checkbox "Moj pružatelj internetskih usluga (ISP) blokira veze prema Tor mreži"> <!ENTITY torsettings.useBridges.default "Spoji se s osiguranim mostovima"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Svaka vrsta mosta koristi drugačiju metodu kako bi izbjegla cenzuru.&#160: Ako jedan most ne radi, probajte koristiti drugi."> <!ENTITY torsettings.useBridges.type "Tip transporta:"> <!ENTITY torsettings.useBridges.custom "Unesi vlastite mostove"> <!ENTITY torsettings.useBridges.label "Unesite jedan ili više mostova (jedan po retku)."> @@ -67,7 +67,7 @@ s Tor mrežom?"> <!ENTITY torsettings.copyLog "Kopiraj Tor zapisnik u međuspremnik"> <!ENTITY torsettings.bridgeHelpTitle "Pomoć za relej-mostove"> <!ENTITY torsettings.bridgeHelp1 "Ako se ne možete spojiti na Tor mrežu, to može biti zato što Vaš pružatelj Internet usluge (ISP) ili druga agencija blokira Tor.  Najčešće možete zaobići ovaj problem koristeći Tor Mostove, koji su neizlistani releji koje je teže blokirati."> -<!ENTITY torsettings.bridgeHelp1B "Možete koristiti već konfigurirani, osigurani set adresa mostova ili možete dobiti vlastiti set adresa koristeći jednu od ove tri metode:"> +<!ENTITY torsettings.bridgeHelp1B "Možete koristiti unaprijed konfigurirane setove adresa mostova ili možete dobiti prilagođene setove korištenjem jedne od ovih metoda:"> <!ENTITY torsettings.bridgeHelp2Heading "Kroz Web"> <!ENTITY torsettings.bridgeHelp2 "Koristite web preglednik kako bi posjetili https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Kroz Email Autoresponder"> diff --git a/src/chrome/locale/hr-HR/progress.dtd b/src/chrome/locale/hr-HR/progress.dtd index 405b87e..da9a846 100644 --- a/src/chrome/locale/hr-HR/progress.dtd +++ b/src/chrome/locale/hr-HR/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Otvori Postavke"> <!ENTITY torprogress.heading "Spajanje na Tor mrežu"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Molimo pričekajte dok ne uspostavimo vezu s Tor mrežom.  To bi moglo potrajati nekoliko minuta."> diff --git a/src/chrome/locale/hr-HR/torlauncher.properties b/src/chrome/locale/hr-HR/torlauncher.properties index dc68e08..402f997 100644 --- a/src/chrome/locale/hr-HR/torlauncher.properties +++ b/src/chrome/locale/hr-HR/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Pokretač Tor-a @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S neuspjelo (%2$S). 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=Nije moguće pronaći torrc datoteku. -torlauncher.datadir_missing=Podatkovna mapa za Tor ne postoji. +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.password_hash_missing=Nije moguće dobiti hash lozinke. torlauncher.failed_to_get_settings=Nije moguće dobaviti Tor postavke.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Izlaz torlauncher.done=Gotovo torlauncher.forAssistance=Za pomoć, kontaktirajte %S +torlauncher.forAssistance2=Za pomoć posjetite %S torlauncher.copiedNLogMessages=Kopiranje završeno. %S Tor zapisi su spremni za lijepljenje u uređivač teksta ili email poruku. diff --git a/src/chrome/locale/hr/network-settings.dtd b/src/chrome/locale/hr/network-settings.dtd index b229c09..874dda9 100644 --- a/src/chrome/locale/hr/network-settings.dtd +++ b/src/chrome/locale/hr/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/hr/progress.dtd b/src/chrome/locale/hr/progress.dtd index 4bacee4..da8dda4 100644 --- a/src/chrome/locale/hr/progress.dtd +++ b/src/chrome/locale/hr/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Status Tor-a"> <!ENTITY torprogress.openSettings "Otvori Postavke"> <!ENTITY torprogress.heading "Spajanje na Tor mrežu"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Molimo pričekajte dok uspostavljamo vezu sa Tor mrežom.   Ovo može potrajati nekoliko minuta."> diff --git a/src/chrome/locale/hr/torlauncher.properties b/src/chrome/locale/hr/torlauncher.properties index fd08f79..b6f76d4 100644 --- a/src/chrome/locale/hr/torlauncher.properties +++ b/src/chrome/locale/hr/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/ht/network-settings.dtd b/src/chrome/locale/ht/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/ht/network-settings.dtd +++ b/src/chrome/locale/ht/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/ht/torlauncher.properties b/src/chrome/locale/ht/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/ht/torlauncher.properties +++ b/src/chrome/locale/ht/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/hu/network-settings.dtd b/src/chrome/locale/hu/network-settings.dtd index 0f7de0c..effaf53 100644 --- a/src/chrome/locale/hu/network-settings.dtd +++ b/src/chrome/locale/hu/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "A következők közül melyik illik jobban a szituációhoz?"> <!ENTITY torSettings.configurePrompt1 "Ennek a számítógépnek a forgalma cenzorált vagy proxizott."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "A Tor  hálózathoz való csatlakozás előtt be kell állítanom a hálózati hidat vagy a helyi proxyt."> <!ENTITY torSettings.configure "Beállít"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Közvetlen kapcsolatot szeretnék létesíteni a Tor hálózattal."> <!ENTITY torSettings.connectPrompt3 "A legtöbb esetben ez működni fog."> <!ENTITY torSettings.connect "Csatlakozás"> <!ENTITY torSettings.proxyPageTitle "Helyi proxybeállítások"> <!ENTITY torSettings.proxyQuestion "Ez a számítgép helyi proxyn keresztül éri el az Internetet? ">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "A helyi proxy a legtöbb esetben nem kell, de vállalati, iskolai vagy egyetemi hálózat esetén elfordulhat, hogy szükséges beállítani."> +<!ENTITY torSettings.proxyExplanation2 "Ha nem vagy biztos benne, hogyan válaszolj erre a kérdésre, akkor nézd meg egy másik böngésző vagy a rendszer hálózati beállításait, hogy szükséges-e proxyt beállítani."> <!ENTITY torSettings.enterProxy "Adja meg a proxy beállításokat."> <!ENTITY torSettings.bridgePageTitle "Tor hidak konfigurálása"> <!ENTITY torSettings.bridgeQuestion "Az internet szolgáltatód (ISP) blokkolja vagy cenzúrázza a kapcsolatot a Tor hálózathoz?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Ha nem vagy biztos benne, hogyan válaszolj erre a kérdésre, válaszd a Nem lehetőséget (ha hálózati híd nélkül nem tudsz kapcsolódni a Tor hálózathoz, akkor később is hozzáadhatsz egyet)."> +<!ENTITY torSettings.bridgeExplanation2 " Ha az Igen-t választod neked kell konfigurálni a Tor Hidak-et, maleyek nem listázott csomópontok, így lehetővé nehezebbé teszik a Tor hálózathoz kapcsolódás blokkolását."> <!ENTITY torSettings.bridgeSettingsPrompt "Használhatod a szolgáltatott bridge címeket vagy beszerezhetsz egyedi bridge címeket.">  <!ENTITY torsettings.startingTor "Várakozás a Tor indulására..."> <!ENTITY torsettings.restartTor "Tor újraindítása"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Újrakonfigurál"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Beállított Tor Hidakat, vagy megadott egy helyi proxy-t.  A közvetlen kapcsolódáshoz ezeket a beállításokat el kell távolítania."> +<!ENTITY torsettings.discardSettings.proceed "Beállítások eltávolítása és Csatlakozás"> <!ENTITY torsettings.optional "Opcionális"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Engedélyezett portok:"> <!ENTITY torsettings.useBridges.checkbox "Az internet szolgáltatóm (ISP) blokkolja a Tor hálózathoz való csatlakozásokat"> <!ENTITY torsettings.useBridges.default "Csatlakozás a szolgáltatott bridge címekkel."> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Minden híd más megoldást használ a cenzorálás elkerülésére.  Ha egyik nem működik, próbálkozzon újra egy másikkal."> <!ENTITY torsettings.useBridges.type "Átvitel típusa:"> <!ENTITY torsettings.useBridges.custom "Addj meg egyedi bridge címeket"> <!ENTITY torsettings.useBridges.label "Addj meg egy vagy több bridge relay címet (soronként egy)"> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "A Tor log Vágólapra másolása"> <!ENTITY torsettings.bridgeHelpTitle "Híd kapcsoló súgó"> <!ENTITY torsettings.bridgeHelp1 "Ha nem tudsz csatlakozni a Tor.  hálózathoz, akkor valószínű az internet szolgáltató (ISP) vagy egy másik szervezet blokkolja. Gyakran megkerülhető a probléma Tor bridges használatával. Ezek nem listázott átjátszók amiket sokkal nehezebb blokkolni."> -<!ENTITY torsettings.bridgeHelp1B "Használhatod az előre beállított bridge címeket vagy beszerezhetsz egyedi címeket ezzel a három módszerrel:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Interneten keresztül"> <!ENTITY torsettings.bridgeHelp2 "Használj egy böngészőt megnézni ezt az oldalt: https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Az automata email válaszok által."> diff --git a/src/chrome/locale/hu/progress.dtd b/src/chrome/locale/hu/progress.dtd index bdcab7a..e4565a2 100644 --- a/src/chrome/locale/hu/progress.dtd +++ b/src/chrome/locale/hu/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor állapot"> <!ENTITY torprogress.openSettings "Beállítások megnyitása"> <!ENTITY torprogress.heading "Kapcsolódás a Tor hálózathoz"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Kérlek várj, amíg létrehozunk egy kapcsolatot a Tor hálózathoz.  Ez eltarthat néhány percig."> diff --git a/src/chrome/locale/hu/torlauncher.properties b/src/chrome/locale/hu/torlauncher.properties index d2b6ea2..5693367 100644 --- a/src/chrome/locale/hu/torlauncher.properties +++ b/src/chrome/locale/hu/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Indító @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S hiba (%2$S). 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. -torlauncher.datadir_missing=A Tor adat könyvtár nem létezik. +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.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 @@ -36,6 +36,7 @@ torlauncher.quit_win=Kilépés torlauncher.done=Kész torlauncher.forAssistance=Segítségér kérjük írjon ide: %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Másolás kész. %S Tor log üzenet vár arra, hogy beillesszék egy szövegszerkesztővbe vagy egy emailbe. diff --git a/src/chrome/locale/hy/network-settings.dtd b/src/chrome/locale/hy/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/hy/network-settings.dtd +++ b/src/chrome/locale/hy/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/hy/torlauncher.properties b/src/chrome/locale/hy/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/hy/torlauncher.properties +++ b/src/chrome/locale/hy/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/ia/network-settings.dtd b/src/chrome/locale/ia/network-settings.dtd index 0abeba8..b9bd75e 100644 --- a/src/chrome/locale/ia/network-settings.dtd +++ b/src/chrome/locale/ia/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/ia/torlauncher.properties b/src/chrome/locale/ia/torlauncher.properties index 44c40ed..9af1183 100644 --- a/src/chrome/locale/ia/torlauncher.properties +++ b/src/chrome/locale/ia/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Sortir torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/id/network-settings.dtd b/src/chrome/locale/id/network-settings.dtd index 990cbac..ec6e8d4 100644 --- a/src/chrome/locale/id/network-settings.dtd +++ b/src/chrome/locale/id/network-settings.dtd @@ -13,7 +13,7 @@ <!ENTITY torSettings.firstQuestion "Mana dari yang berikut ini tepat menjelaskan situasi Anda?"> <!ENTITY torSettings.configurePrompt1 "Koneksi Internet komputer ini disensor atau terproksi."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Saya perlu untuk mengatur jembatan atau pengaturan proksi lokal sebelum saya terkoneksi ke jaringan Tor."> <!ENTITY torSettings.configure "Konfigur"> <!ENTITY torSettings.connectPrompt2 "Saya ingin membuat koneksi langsung ke jaringan Tor."> <!ENTITY torSettings.connectPrompt3 "Ini akan bekerja dalam kebanyakan situasi."> @@ -22,22 +22,22 @@ <!ENTITY torSettings.proxyPageTitle "Konfigurasi Proksi Lokal"> <!ENTITY torSettings.proxyQuestion "Apakah komputer ini memerlukan proksi lokal untuk dapat mengakses Internet?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "Dalam banyak kasus proksi lokal tidah dibutuhkan, tapi mungkin dibutuhkan ketika menghubungkan lewat jaringan perusahaan, sekolah, atau universitas."> +<!ENTITY torSettings.proxyExplanation2 "Jika anda tidak yakin bagaimana untuk menjawab pertanyaan ini, lihat dipengaturan Internet diperamban lainnya atau periksa pengaturan sistem jaringan anda untuk melihat apakah proksi lokal dibutuhkan."> <!ENTITY torSettings.enterProxy "Masuk ke pengaturan proksi."> <!ENTITY torSettings.bridgePageTitle "Konfigurasi Jembatan Tor"> <!ENTITY torSettings.bridgeQuestion "Apakah Penyedia Layanan Internet (ISP) Anda memblokir atau menyensor sambungan ke Jaringan Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Jika anda tidak yakin bagaimana untuk menjawab pertanyaan ini, pilih Tidak (jika anda tidak dapat menyambungkan ke jaringan Tor tanpa jembatan, anda dapat menambahkannya nanti)."> +<!ENTITY torSettings.bridgeExplanation2 "Jika anda pilih Ya, anda akan ditanyakan untuk mengatur Tor Bridges, dimana relai tak terdaftar yang membuatnya lebih susah untuk menghalangi koneksi ke Tor Network."> <!ENTITY torSettings.bridgeSettingsPrompt "Anda dapat menggunakan setelan jembatan yang disediakan atau Anda dapat memperoleh dan memasukkan setelan jembatan ubahsuai.">  <!ENTITY torsettings.startingTor "Menunggu Tor untuk memulai..."> <!ENTITY torsettings.restartTor "Muat Ulang Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Konfigurasi ulang"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> +<!ENTITY torsettings.discardSettings.prompt "Kamu telah mengatur jembatan Tor atau kamu telah memasukkan pengaturan proksi lokal.  Untuk membuat koneksi langsung ke jaringan Tor, pengaturan ini harus dihapus."> <!ENTITY torsettings.discardSettings.proceed "Buang Pengaturan dan Sambung"> <!ENTITY torsettings.optional "Opsional"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Port yang diizinkan:"> <!ENTITY torsettings.useBridges.checkbox "Internet Service Provider (ISP) saya memblokir koneksi ke jaringan Tor"> <!ENTITY torsettings.useBridges.default "Terhubung dengan bridge yang disediakan"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Setiap tipe jembatan menggunakan metode berbeda untuk menghindari penyaringan.  Jika satu jembatan tidak dapat bekerja, coba gunakan lagi jembatan lainnya."> <!ENTITY torsettings.useBridges.type "Jenis Transport :"> <!ENTITY torsettings.useBridges.custom "Masukkan bridge yang biasa digunakan"> <!ENTITY torsettings.useBridges.label "Masukkan satu atau beberapa jembatan penyambung (satu per baris)."> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Salin Log Tor Ke Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bantuan Bridge Relay"> <!ENTITY torsettings.bridgeHelp1 "Jika Anda tidak dapat terhubung ke jaringan Tor, bisa jadi Provider Layanan Internet (ISP) atau lembaga lain yang menghalangi Tor.   Sering kali, Anda dapat mengatasi masalah ini dengan menggunakan Tor Bridges, yang relai terdaftar yang lebih sulit untuk memblokir."> -<!ENTITY torsettings.bridgeHelp1B "Anda dapat menggunakan prekonfigurasi, disediakan alamat set bridge atau Anda mungkin mendapatkan satu set kebiasaan alamat dengan menggunakan salah satu dari tiga metode ini:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Lewat web"> <!ENTITY torsettings.bridgeHelp2 "Menggunakan applikasi penjelajah interet untuk mengunjungi https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Melalui Email Autoresponder"> diff --git a/src/chrome/locale/id/torlauncher.properties b/src/chrome/locale/id/torlauncher.properties index cc23057..834962a 100644 --- a/src/chrome/locale/id/torlauncher.properties +++ b/src/chrome/locale/id/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S gagal (%2$S). torlauncher.unable_to_start_tor=Tidak dapat memulai Tor\n\n%S torlauncher.tor_missing=Tor executable hilang -torlauncher.torrc_missing=File torrc hilang -torlauncher.datadir_missing=Direktori data Tor tidak ada. +torlauncher.torrc_missing=Berkas torrc hilang dan tidak dapat dibuat. +torlauncher.datadir_missing=Direktori data tor tidak ada dan tidak dapat dibuat. torlauncher.password_hash_missing=Gagal mendapatkan kata sandi hashed. torlauncher.failed_to_get_settings=Gagal mendapatkan pengaturan Tor.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Keluar torlauncher.done=Selesai. torlauncher.forAssistance=Untuk bantuan, hubungi $S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Penyalinan selesai. %S log pesan Tor telah siap untuk ditempelkan ke dalam editor text atau pesan email. diff --git a/src/chrome/locale/is/network-settings.dtd b/src/chrome/locale/is/network-settings.dtd index d151c0d..bc5f007 100644 --- a/src/chrome/locale/is/network-settings.dtd +++ b/src/chrome/locale/is/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Í gegnum vefinn"> <!ENTITY torsettings.bridgeHelp2 "Notaðu vafra til að skoða https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/is/progress.dtd b/src/chrome/locale/is/progress.dtd index c6f500e..4cc7f46 100644 --- a/src/chrome/locale/is/progress.dtd +++ b/src/chrome/locale/is/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Staða Tor"> <!ENTITY torprogress.openSettings "Opna stillingar"> <!ENTITY torprogress.heading "Tengist Tor-netinu"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Bíddu aðeins á meðan tengingu er komið á við Tor-netið.  Það getur tekið nokkrar mínútur."> diff --git a/src/chrome/locale/is/torlauncher.properties b/src/chrome/locale/is/torlauncher.properties index 9a238cc..0f66671 100644 --- a/src/chrome/locale/is/torlauncher.properties +++ b/src/chrome/locale/is/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor-ræsir @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S mistókst (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Fara út torlauncher.done=Búið torlauncher.forAssistance=Til að fá hjálp, hafðu samband við %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd index 4d67204..00db0d8 100644 --- a/src/chrome/locale/it/network-settings.dtd +++ b/src/chrome/locale/it/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "Quale delle seguenti descrizioni raffigura meglio la tua situazione?"> <!ENTITY torSettings.configurePrompt1 "La connessione a Internet di questo computer è bloccata da censura o utilizza un proxy."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Ho bisogno di configurare le impostazioni del bridge o del proxy locale prima di connettermi alla rete Tor."> <!ENTITY torSettings.configure "Configura"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Vorrei connettermi direttamente alla rete Tor."> <!ENTITY torSettings.connectPrompt3 "Questo funzionerà nella maggior parte delle situazioni."> <!ENTITY torSettings.connect "Connetti"> <!ENTITY torSettings.proxyPageTitle "Configurazione Proxy locale"> <!ENTITY torSettings.proxyQuestion "Questo computer richiede l'uso di un proxy locale per accedere ad Internet?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "Nella maggior parte dei casi un proxy locale non è necessario, ma può essere richiesto quando ci si connette da una rete scolastica, universitaria o aziendale."> +<!ENTITY torSettings.proxyExplanation2 "Se non sei sicuro su come rispondere a questa domanda, controlla le impostazioni di Rete in un altro browser o nelle impostazioni del tuo sistema per vedere se è necessario un proxy locale."> <!ENTITY torSettings.enterProxy "Inserisci le impostazioni del proxy."> <!ENTITY torSettings.bridgePageTitle "Configurazione Bridge di Tor"> <!ENTITY torSettings.bridgeQuestion "Il tuo fornitore di servizi internet (ISP) blocca o censura la connessione alla rete Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Se non sei sicuro su come rispondere a questa domanda, scegli No (se non riesci a connetterti alla rete Tor senza un bridge puoi aggiungerlo in seguito)."> +<!ENTITY torSettings.bridgeExplanation2 "Se scegli Si, ti verrà chiesto di configurare i Bridge Tor, che sono relay non listati che rendono più difficile il blocco delle connessioni alla rete Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Puoi usare il set preconfigurato di bridge o ottenere ed inserire un set personale di bridge.">  <!ENTITY torsettings.startingTor "In attesa di avviare Tor..."> <!ENTITY torsettings.restartTor "Riavvia Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Riconfigura"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Tu hai configurato i bridge Tor o hai inserito le impostazioni per il proxy locale.  Per effettuare una connessione diretta alla rete Tor, queste impostazioni devono essere rimosse."> +<!ENTITY torsettings.discardSettings.proceed "Rimuovi Impostazioni e Connetti"> <!ENTITY torsettings.optional "Facoltativo"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Porte consentite:"> <!ENTITY torsettings.useBridges.checkbox "Il mio fornitore di servizi Internet (ISP) blocca le connessioni alla rete Tor"> <!ENTITY torsettings.useBridges.default "Collegati usando i bridge preconfigurati"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Ogni tipo di bridge usa un metodo differente per scavalcare la censura.  Se un bridge non funziona, prova di nuovo usandone uno diverso. "> <!ENTITY torsettings.useBridges.type "Tipo di trasporto:"> <!ENTITY torsettings.useBridges.custom "Inserire bridge personaizzati"> <!ENTITY torsettings.useBridges.label "Inserisci uno o più bridge relay (uno per riga)"> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copia il log di Tor negli "appunti" di sistema"> <!ENTITY torsettings.bridgeHelpTitle "Aiuto per i ponti relé"> <!ENTITY torsettings.bridgeHelp1 "Se non ti riesci a connettere alla rete Tor, è possibile che il tuo Internet Service Provider (ISP) o una qualche altra agenzia stiano bloccando Tor.  Spesso puoi aggirare questo problema utilizzando un Bridge Tor, che è un relay non tracciato più difficile da bloccare."> -<!ENTITY torsettings.bridgeHelp1B "Puoi usare il set preconfigurato di indirizzi bridge o ottenere un set personale di indirizzi attraverso uno di questi tre metodi:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Attraverso il web"> <!ENTITY torsettings.bridgeHelp2 "Usa un browser per visitare https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Attraverso l'autorisponditore Email"> diff --git a/src/chrome/locale/it/progress.dtd b/src/chrome/locale/it/progress.dtd index ef30289..cf758aa 100644 --- a/src/chrome/locale/it/progress.dtd +++ b/src/chrome/locale/it/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Stato di Tor"> <!ENTITY torprogress.openSettings "Apertura impostazioni"> <!ENTITY torprogress.heading "Connessione in corso alla rete Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Perfavore attendi finche non viene stabilita una connessione alla rete Tor.  Potrebbe richiedere alcuni minuti."> diff --git a/src/chrome/locale/it/torlauncher.properties b/src/chrome/locale/it/torlauncher.properties index b5729ed..22fb0e1 100644 --- a/src/chrome/locale/it/torlauncher.properties +++ b/src/chrome/locale/it/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Avviatore di Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Impossibile avviare Tor.⏎\n⏎\n%S torlauncher.tor_missing=Il file eseguibile di Tor è mancante. -torlauncher.torrc_missing=Il file di configurazione torrc è mancante. -torlauncher.datadir_missing=La directory dei dati di Tor non esiste. +torlauncher.torrc_missing=Il file torrc non è presente e non è stato possibile crearlo. +torlauncher.datadir_missing=La cartella dei dati di Tor non esiste e non è stato possibile crearla. torlauncher.password_hash_missing=Tentativo di ottenere la password fallito. torlauncher.failed_to_get_settings=Impossibile recuperare le impostazioni di Tor.⏎\n⏎\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Esci torlauncher.done=Fatto torlauncher.forAssistance=Per richiedere assistenza, contattare %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copia completata. %S Messaggi di log Tor sono pronti per essere incollato in un editor di testo o un messaggio e-mail. diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd index 6fe3ede..fa3049c 100644 --- a/src/chrome/locale/ja/network-settings.dtd +++ b/src/chrome/locale/ja/network-settings.dtd @@ -35,10 +35,10 @@ <!ENTITY torsettings.startingTor "Torの開始を待っています..."> <!ENTITY torsettings.restartTor "Torを再起動する"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "再設定"> <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.proceed "設定と接続を削除"> <!ENTITY torsettings.optional "オプション"> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Torのログをクリップボードにコピー"> <!ENTITY torsettings.bridgeHelpTitle "ブリッジリレーのヘルプ"> <!ENTITY torsettings.bridgeHelp1 "Tor ネットワークに接続できないなら、あなたのインターネットサービスプロバイダー(ISP)や別の機関が Tor をブロックしている可能性があります。  ブロックが比較的困難なリストされていないリレーである Tor ブリッジを使用することでこの問題を回避できることもあります。"> -<!ENTITY torsettings.bridgeHelp1B "事前設定された提供されたブリッジアドレスのセットを使用するか、あるいは以下の3つの方法のいずれかを用いてカスタムのアドレスのセットを取得することができます。"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "ウェブ経由"> <!ENTITY torsettings.bridgeHelp2 "ウェブを使用して、https://bridges.torproject.orgを開く"> <!ENTITY torsettings.bridgeHelp3Heading "メール自動応答システム経由"> diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties index c679f1d..b46261d 100644 --- a/src/chrome/locale/ja/torlauncher.properties +++ b/src/chrome/locale/ja/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S 失敗 (%2$S)。 torlauncher.unable_to_start_tor=Torを開始出来ません。\n\n%S torlauncher.tor_missing=Torの実行可能ファイルが見つかりません。 -torlauncher.torrc_missing=torrcファイルが見つかりません。 -torlauncher.datadir_missing=Torのデータディレクトリが存在しません。 +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=ハッシュ化されたパスワードの入手に失敗しました torlauncher.failed_to_get_settings=Torの設定を回復出来ません。\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=終了 torlauncher.done=完了 torlauncher.forAssistance=サポートについては、%Sにお問い合わせください +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=コピー成功。 %S個のTorログファイルがテキストエディターやEメールにペーストする準備ができました。 diff --git a/src/chrome/locale/jv/network-settings.dtd b/src/chrome/locale/jv/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/jv/network-settings.dtd +++ b/src/chrome/locale/jv/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/jv/torlauncher.properties b/src/chrome/locale/jv/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/jv/torlauncher.properties +++ b/src/chrome/locale/jv/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/ka/network-settings.dtd b/src/chrome/locale/ka/network-settings.dtd index 135c799..d66d355 100644 --- a/src/chrome/locale/ka/network-settings.dtd +++ b/src/chrome/locale/ka/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> +<!ENTITY torSettings.yes "დიახ"> +<!ENTITY torSettings.no "არა"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> @@ -48,7 +48,7 @@ <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "პორტი:"> <!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.password "პაროლი"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/ka/torlauncher.properties b/src/chrome/locale/ka/torlauncher.properties index 02be756..b0a1c21 100644 --- a/src/chrome/locale/ka/torlauncher.properties +++ b/src/chrome/locale/ka/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -33,9 +33,10 @@ torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit torlauncher.quit_win=Exit -torlauncher.done=Done +torlauncher.done=შესრულებულია torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/kk/network-settings.dtd b/src/chrome/locale/kk/network-settings.dtd index ce471c2..478fe43 100644 --- a/src/chrome/locale/kk/network-settings.dtd +++ b/src/chrome/locale/kk/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/kk/torlauncher.properties b/src/chrome/locale/kk/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/kk/torlauncher.properties +++ b/src/chrome/locale/kk/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/km/network-settings.dtd b/src/chrome/locale/km/network-settings.dtd index b2af430..c58339f 100644 --- a/src/chrome/locale/km/network-settings.dtd +++ b/src/chrome/locale/km/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "ចម្លងកំណត់ហេតុ Tor ទៅក្ដារតម្បៀតខ្ទាស់"> <!ENTITY torsettings.bridgeHelpTitle "ជំនួយបញ្ជូនប្រ៊ីតបន្ត"> <!ENTITY torsettings.bridgeHelp1 "បើអ្នកមិនអាចភ្ជាប់ទៅបណ្ដាញ Tor វាអាចមកពីក្រុមហ៊ុនផ្ដល់សេវាកម្មអ៊ីនធឺណិត (ISP) ឬភ្នាក់ងារផ្សេងកំពុងទប់ស្កាត់ Tor ។   ជារឿយៗអ្នកអាចស្វែងយល់ពីបញ្ហានេះ ដោយប្រើប៊្រីត Tor ដែលត្រូវបានលាក់ការបញ្ជូនបន្តដែលពិបាកទប់ស្កាត់។"> -<!ENTITY torsettings.bridgeHelp1B "អ្នកអាចប្រើការកំណត់រចនាសម្ព័ន្ធជាមុន ការកំណត់អាសយដ្ឋានប៊្រីតដែលបានផ្ដល់ ឬអ្នកអាចយកការកំណត់អាសយដ្ឋានផ្ទាល់ខ្លួនដោយប្រើវិធីមួយក្នុងចំណោមវិធីសាស្ត្រទាំងបី៖"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "តាមរយៈបណ្ដាញ"> <!ENTITY torsettings.bridgeHelp2 "ប្រើកម្មវិធីរុករកបណ្ដាញ ដើម្បីមើល https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "តាមរយៈការឆ្លើយតបដោយស្វ័យប្រវត្តិរបស់អ៊ីមែល"> diff --git a/src/chrome/locale/km/torlauncher.properties b/src/chrome/locale/km/torlauncher.properties index b93eb81..1c36568 100644 --- a/src/chrome/locale/km/torlauncher.properties +++ b/src/chrome/locale/km/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=កម្មវិធីចាប់ផ្ដើម Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=បានបរាជ័យ %1$S (% torlauncher.unable_to_start_tor=មិនអាចចាប់ផ្ដើម Tor ។\n\n%S torlauncher.tor_missing=បាត់ឯកសារអាចប្រតិបត្តិរបស់ Tor ។ -torlauncher.torrc_missing=បាត់ឯកសារ torrc ។ -torlauncher.datadir_missing=មិនមានថតទិន្នន័យ Tor ។ +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=បានបរាជ័យក្នុងការទទួលពាក្យសម្ងាត់។ torlauncher.failed_to_get_settings=មិនអាចទៅយកការកំណត់ Tor ។\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=ចាកចេញ torlauncher.done=រួចរាល់ torlauncher.forAssistance=សម្រាប់ជំនួយ សូមទាក់ទង %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/kn/network-settings.dtd b/src/chrome/locale/kn/network-settings.dtd index 6cd943a..e18a7cc 100644 --- a/src/chrome/locale/kn/network-settings.dtd +++ b/src/chrome/locale/kn/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/kn/torlauncher.properties b/src/chrome/locale/kn/torlauncher.properties index a4ad1c9..17518a4 100644 --- a/src/chrome/locale/kn/torlauncher.properties +++ b/src/chrome/locale/kn/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/ko-KR/network-settings.dtd b/src/chrome/locale/ko-KR/network-settings.dtd index 74b8c4a..df3b833 100644 --- a/src/chrome/locale/ko-KR/network-settings.dtd +++ b/src/chrome/locale/ko-KR/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/ko-KR/torlauncher.properties b/src/chrome/locale/ko-KR/torlauncher.properties index c793562..9fb084d 100644 --- a/src/chrome/locale/ko-KR/torlauncher.properties +++ b/src/chrome/locale/ko-KR/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=나가기 torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd index 8ac0ad0..76c93c3 100644 --- a/src/chrome/locale/ko/network-settings.dtd +++ b/src/chrome/locale/ko/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Tor log를 클립보드에 복사하기"> <!ENTITY torsettings.bridgeHelpTitle "브릿지 중계 서버 도움말"> <!ENTITY torsettings.bridgeHelp1 "Tor 네트워크에 접속할 수 없는 경우, 귀하의 인터넷 서비스 공급자(ISP)나 별도의 기관이 Tor를 차단하고 있을 가능성이 있습니다.  그럴 때는 숨겨진 중계 서버를 통해 Tor 브릿지를 사용함으로써 이 문제를 해결할 수도 있습니다."> -<!ENTITY torsettings.bridgeHelp1B "사전 설정되고 제공되어진 브릿지 주소 집합을 사용하거나 다음 세 가지 방법 중 하나를 사용하여 사용자 지정 주소의 집합을 검색 할 수 있습니다."> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "웹을 통해"> <!ENTITY torsettings.bridgeHelp2 "https://bridges.torproject.org 를 방문하십시오."> <!ENTITY torsettings.bridgeHelp3Heading "메일 자동 응답 시스템을 통해"> diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties index c20a6ac..e0b1aaa 100644 --- a/src/chrome/locale/ko/torlauncher.properties +++ b/src/chrome/locale/ko/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor 브라우저 Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S 실패 (%2$S) torlauncher.unable_to_start_tor=Tor를 시작할 수 없습니다.\n\n%S torlauncher.tor_missing=Tor 실행 파일이 없습니다. -torlauncher.torrc_missing=torrc 파일이 없습니다. -torlauncher.datadir_missing=Tor 데이터 목록이 존재하지 않습니다. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=해쉬 암호 획득 실패 torlauncher.failed_to_get_settings=Tor 설정을 찾을 수 없습니다.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=종료 torlauncher.done=완료 torlauncher.forAssistance=지원자 연결 %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=복사 완료. %S Tor 로그 메시지는 텍스트 편집기 나 이메일 메시지에 붙여 넣을 수 있는 상태가 됩니다. @@ -52,7 +53,7 @@ torlauncher.bootstrapStatus.done=Tor 네트워크에 연결 성공! torlauncher.bootstrapWarning.done=완료 torlauncher.bootstrapWarning.connectrefused=연결이 거부됨 -torlauncher.bootstrapWarning.misc=잡동사니 +torlauncher.bootstrapWarning.misc=기타 torlauncher.bootstrapWarning.resourcelimit=리소스 부족 torlauncher.bootstrapWarning.identity=계정 불일치 torlauncher.bootstrapWarning.timeout=연결 타임아웃 diff --git a/src/chrome/locale/ku/network-settings.dtd b/src/chrome/locale/ku/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/ku/network-settings.dtd +++ b/src/chrome/locale/ku/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/ku/torlauncher.properties b/src/chrome/locale/ku/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/ku/torlauncher.properties +++ b/src/chrome/locale/ku/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/kw/network-settings.dtd b/src/chrome/locale/kw/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/kw/network-settings.dtd +++ b/src/chrome/locale/kw/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/kw/torlauncher.properties b/src/chrome/locale/kw/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/kw/torlauncher.properties +++ b/src/chrome/locale/kw/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/ky/network-settings.dtd b/src/chrome/locale/ky/network-settings.dtd index 2f61a16..5349f81 100644 --- a/src/chrome/locale/ky/network-settings.dtd +++ b/src/chrome/locale/ky/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/ky/torlauncher.properties b/src/chrome/locale/ky/torlauncher.properties index 66f9e15..234a644 100644 --- a/src/chrome/locale/ky/torlauncher.properties +++ b/src/chrome/locale/ky/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Чыгуу torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/lb/network-settings.dtd b/src/chrome/locale/lb/network-settings.dtd index 5d56d79..9e4060c 100644 --- a/src/chrome/locale/lb/network-settings.dtd +++ b/src/chrome/locale/lb/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/lb/torlauncher.properties b/src/chrome/locale/lb/torlauncher.properties index 9edd40f..96a287b 100644 --- a/src/chrome/locale/lb/torlauncher.properties +++ b/src/chrome/locale/lb/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Fäerdeg torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/lg/network-settings.dtd b/src/chrome/locale/lg/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/lg/network-settings.dtd +++ b/src/chrome/locale/lg/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/lg/torlauncher.properties b/src/chrome/locale/lg/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/lg/torlauncher.properties +++ b/src/chrome/locale/lg/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/ln/network-settings.dtd b/src/chrome/locale/ln/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/ln/network-settings.dtd +++ b/src/chrome/locale/ln/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/ln/torlauncher.properties b/src/chrome/locale/ln/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/ln/torlauncher.properties +++ b/src/chrome/locale/ln/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/lo/network-settings.dtd b/src/chrome/locale/lo/network-settings.dtd index 7c0e752..f0fdd8f 100644 --- a/src/chrome/locale/lo/network-settings.dtd +++ b/src/chrome/locale/lo/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/lo/torlauncher.properties b/src/chrome/locale/lo/torlauncher.properties index 10e34b0..e79f9a1 100644 --- a/src/chrome/locale/lo/torlauncher.properties +++ b/src/chrome/locale/lo/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=ໂຕເປີດ Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/lt/network-settings.dtd b/src/chrome/locale/lt/network-settings.dtd index 78e4d6d..587ad7f 100644 --- a/src/chrome/locale/lt/network-settings.dtd +++ b/src/chrome/locale/lt/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Kopijuoti Tor žurnalą į iškarpinę"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/lt/torlauncher.properties b/src/chrome/locale/lt/torlauncher.properties index 99962c4..cc45cad 100644 --- a/src/chrome/locale/lt/torlauncher.properties +++ b/src/chrome/locale/lt/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Leistuvas @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S nepavyko (%2$S). torlauncher.unable_to_start_tor=Nepavyksta paleisti Tor.\n\n%S torlauncher.tor_missing=Trūksta Tor vykdomojo failo. -torlauncher.torrc_missing=Trūksta torrc failo -torlauncher.datadir_missing=Nesukurtas Tor duomenų aplankas +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Nepavyko perskaityti slaptažodžio santrumpos torlauncher.failed_to_get_settings=Nepavyko perskaityti Tor nustatymo parametrų.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Išeiti torlauncher.done=Atlikta torlauncher.forAssistance=Jei Jums reikia pagalbos, susisiekti galite su %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Kopijavimas atliktas. %S Tor įvykių žurnalas paruoštas įklijuoti į teksto redagavimo programą ar elektroninio pašto pranešimą. diff --git a/src/chrome/locale/lv/network-settings.dtd b/src/chrome/locale/lv/network-settings.dtd index 3bd53a8..c63091e 100644 --- a/src/chrome/locale/lv/network-settings.dtd +++ b/src/chrome/locale/lv/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Kopēt Tor žurnālu starpliktuvē"> <!ENTITY torsettings.bridgeHelpTitle "Palīdzība par tiltu retranslatoriem"> <!ENTITY torsettings.bridgeHelp1 "Ja nevarat izveidot savienojumu ar tīklu Tor, tad, iespējams, ka Jūsu interneta pakalpojumu sniedzējs (ISP) vai cita iestāde bloķē Tor.  Bieži, šo problemu var apiet izmantojot Tor tiltus jeb Tor Bridges, proti, neuzskaitītus retranslatorus, kurus grūtāk bloķēt."> -<!ENTITY torsettings.bridgeHelp1B "Jūs varat izmantot iepriekš nokonfigurētas un piedāvātas tiltu adreses vai varat iegūt pielāgotu adrešu kopumu, sekojot vienai no trim metodēm:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Caur tīmekli"> <!ENTITY torsettings.bridgeHelp2 "Izmanto pārlūkprogrammu, lai apmeklētu https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Caur E-pasta Auto-atbildētāju"> diff --git a/src/chrome/locale/lv/torlauncher.properties b/src/chrome/locale/lv/torlauncher.properties index fff24bf..cd80b84 100644 --- a/src/chrome/locale/lv/torlauncher.properties +++ b/src/chrome/locale/lv/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor palaidējs @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S neizdevas (%2$S). torlauncher.unable_to_start_tor=Nespēj startēt Tor:\n⏎\n%S torlauncher.tor_missing=Trūkst Tor'a izpildāmā moduļa. -torlauncher.torrc_missing=Trūkst datnes torrc . -torlauncher.datadir_missing=Tor'a datu direktorijs nepastāv. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Neizdevās saņemt jaukto paroli. torlauncher.failed_to_get_settings=Neizdevās izgūt Tor'a iestatījumus.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Iziet torlauncher.done=Gatavs torlauncher.forAssistance=Lai saņemtu palīdzību, sazinieties ar %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Kopēšana paveikta. %S Tor žurnāla ziņojumi sagatavoti ielīmēšanai teksta redaktorā vai e-pasta ziņojumā. diff --git a/src/chrome/locale/mg/network-settings.dtd b/src/chrome/locale/mg/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/mg/network-settings.dtd +++ b/src/chrome/locale/mg/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/mg/torlauncher.properties b/src/chrome/locale/mg/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/mg/torlauncher.properties +++ b/src/chrome/locale/mg/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/mi/network-settings.dtd b/src/chrome/locale/mi/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/mi/network-settings.dtd +++ b/src/chrome/locale/mi/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/mi/torlauncher.properties b/src/chrome/locale/mi/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/mi/torlauncher.properties +++ b/src/chrome/locale/mi/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/mk/network-settings.dtd b/src/chrome/locale/mk/network-settings.dtd index 05cad9a..39b7855 100644 --- a/src/chrome/locale/mk/network-settings.dtd +++ b/src/chrome/locale/mk/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/mk/torlauncher.properties b/src/chrome/locale/mk/torlauncher.properties index 3b8e9fa..abdecf5 100644 --- a/src/chrome/locale/mk/torlauncher.properties +++ b/src/chrome/locale/mk/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(препорачано) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor @@ -36,6 +36,7 @@ torlauncher.quit_win=Излез torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/ml/network-settings.dtd b/src/chrome/locale/ml/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/ml/network-settings.dtd +++ b/src/chrome/locale/ml/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/ml/torlauncher.properties b/src/chrome/locale/ml/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/ml/torlauncher.properties +++ b/src/chrome/locale/ml/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/mn/network-settings.dtd b/src/chrome/locale/mn/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/mn/network-settings.dtd +++ b/src/chrome/locale/mn/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/mn/torlauncher.properties b/src/chrome/locale/mn/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/mn/torlauncher.properties +++ b/src/chrome/locale/mn/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/mr/network-settings.dtd b/src/chrome/locale/mr/network-settings.dtd index c31e040..ede666b 100644 --- a/src/chrome/locale/mr/network-settings.dtd +++ b/src/chrome/locale/mr/network-settings.dtd @@ -8,7 +8,7 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> -<!ENTITY torSettings.yes "Yes"> +<!ENTITY torSettings.yes "होय"> <!ENTITY torSettings.no "नाही"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/mr/torlauncher.properties b/src/chrome/locale/mr/torlauncher.properties index 010b0d4..d8b89e1 100644 --- a/src/chrome/locale/mr/torlauncher.properties +++ b/src/chrome/locale/mr/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=टॉर लाँचर @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=टॉर सुरू करण्यात अपयश.\n\n%S torlauncher.tor_missing=टॉरची प्रोग्राम फाइल अनुपस्थित. -torlauncher.torrc_missing=torrc फाइल अनुपस्थित. -torlauncher.datadir_missing=टॉर माहिती संच अस्तित्वात नाही. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=हॅश्ड परवलीचा शब्द मिळवण्यात अपयश. torlauncher.failed_to_get_settings=टॉरच्या सेटिंग्स मिळवण्यात अपयश. @@ -36,6 +36,7 @@ torlauncher.quit_win=बंद करा torlauncher.done=झाले torlauncher.forAssistance=सहकार्यासाठी संपर्क साधा : %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/ms-MY/network-settings.dtd b/src/chrome/locale/ms-MY/network-settings.dtd index c7eb7d1..237f08d 100644 --- a/src/chrome/locale/ms-MY/network-settings.dtd +++ b/src/chrome/locale/ms-MY/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Salin log Tor ke clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bantuan Bridge Relay"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/ms-MY/torlauncher.properties b/src/chrome/locale/ms-MY/torlauncher.properties index c403773..a2ce9b3 100644 --- a/src/chrome/locale/ms-MY/torlauncher.properties +++ b/src/chrome/locale/ms-MY/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Pelancar Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Tidak dapat memulakan Tor.\n\n%S torlauncher.tor_missing=Tor executable hilang. -torlauncher.torrc_missing=Fail torrc hilang. -torlauncher.datadir_missing=Direktori data Tor tidak wujud. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Gagal untuk mendapatkan kata laluan hashes. torlauncher.failed_to_get_settings=Gagal mendapatkan tetapan Tor.\n\n%S @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=Anda mesti menentukan satu atau lebih bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(digalakkan) torlauncher.connect=Menyambung torlauncher.restart_tor=Restart Tor @@ -36,6 +36,7 @@ torlauncher.quit_win=Keluar torlauncher.done=Selesai torlauncher.forAssistance=Untuk bantuan, hubungi %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/mt/network-settings.dtd b/src/chrome/locale/mt/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/mt/network-settings.dtd +++ b/src/chrome/locale/mt/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/mt/torlauncher.properties b/src/chrome/locale/mt/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/mt/torlauncher.properties +++ b/src/chrome/locale/mt/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/my/network-settings.dtd b/src/chrome/locale/my/network-settings.dtd index a3d9240..94deb90 100644 --- a/src/chrome/locale/my/network-settings.dtd +++ b/src/chrome/locale/my/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/my/torlauncher.properties b/src/chrome/locale/my/torlauncher.properties index 9c1d74c..09113b1 100644 --- a/src/chrome/locale/my/torlauncher.properties +++ b/src/chrome/locale/my/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=Bridge တစ်ခု (သို့) တ torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(အကြံပြုထားသည်) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor @@ -36,6 +36,7 @@ torlauncher.quit_win=ထွက်ရန် torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/nah/network-settings.dtd b/src/chrome/locale/nah/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/nah/network-settings.dtd +++ b/src/chrome/locale/nah/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/nah/torlauncher.properties b/src/chrome/locale/nah/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/nah/torlauncher.properties +++ b/src/chrome/locale/nah/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/nap/network-settings.dtd b/src/chrome/locale/nap/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/nap/network-settings.dtd +++ b/src/chrome/locale/nap/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/nap/torlauncher.properties b/src/chrome/locale/nap/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/nap/torlauncher.properties +++ b/src/chrome/locale/nap/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/nb/network-settings.dtd b/src/chrome/locale/nb/network-settings.dtd index 802253c..51e6e52 100644 --- a/src/chrome/locale/nb/network-settings.dtd +++ b/src/chrome/locale/nb/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Tor Nettverksinnstillinger"> +<!ENTITY torsettings.dialog.title "Nettverksinnstillinger for Tor">  <!ENTITY torlauncher.localePicker.title "Språk i Tor-nettleser"> @@ -6,44 +6,44 @@  -<!ENTITY torsettings.prompt "Før du kan koble til Tor-nettverket, må du gi informasjon om denne datamaskinens internett-tilkobling."> +<!ENTITY torsettings.prompt "Før du kan koble til Tor-nettverket, må du gi informasjon om denne datamaskinens Internett-tilkobling."> <!ENTITY torSettings.yes "Ja"> <!ENTITY torSettings.no "Nei"> <!ENTITY torSettings.firstQuestion "Hvilket av følgende beskriver best din situasjon?"> -<!ENTITY torSettings.configurePrompt1 "Computeren's internett tilkobling er sensurert eller under proxy."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> -<!ENTITY torSettings.configure "Konfigurer"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.configurePrompt1 "Datamaskinens Internett-tilkobling er sensurert eller bak mellomtjener."> +<!ENTITY torSettings.configurePrompt2 "Jeg trenger å sette opp bro eller lokale mellomtjenerinnstillinger før jeg kobler til Tor nettverket."> +<!ENTITY torSettings.configure "Sett opp"> +<!ENTITY torSettings.connectPrompt2 "Jeg ønsker å opprette en direkte forbindelse til Tor-nettverket."> <!ENTITY torSettings.connectPrompt3 "Dette vil fungere i de fleste situasjoner."> <!ENTITY torSettings.connect "Koble til"> -<!ENTITY torSettings.proxyPageTitle "Lokal proxy-konfigurasjon"> +<!ENTITY torSettings.proxyPageTitle "Lokalt mellomtjener-oppsett"> <!ENTITY torSettings.proxyQuestion "Trenger denne maskinen å bruke en lokal mellomtjener for å nå Internett?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Skriv inn proxy-innstillingene."> +<!ENTITY torSettings.proxyExplanation1 "I de fleste tilfeller en lokal mellomtjener ikke er nødvendig, men det kan være påkrevd når du kobler til gjennom et firma, skole eller universitetsnettverk."> +<!ENTITY torSettings.proxyExplanation2 "Hvis du er usikker på hvordan du skal svare på dette spørsmålet, se på Internett-innstillingene i en annen nettleser eller sjekk nettverksinnstillingene systemets å se om en lokal mellomtjener er nødvendig."> +<!ENTITY torSettings.enterProxy "Skriv inn mellomtjenings-innstillingene."> <!ENTITY torSettings.bridgePageTitle "Oppsett av Tor-broer."> -<!ENTITY torSettings.bridgeQuestion "Blokkerer eller sensurerer internettleverandøren (ISP) din tilkoblinger til Tor-nettverket?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeQuestion "Blokkerer eller på annet vis sensurerer Internettleverandøren (ISP) dine tilkoblinger til Tor-nettverket?"> +<!ENTITY torSettings.bridgeExplanation1 "Hvis du er usikker på hvordan du skal svare på dette spørsmålet, velg Nei (hvis du ikke klarer å koble til Tor-nettverket uten en bro, kan du legge til en senere)."> +<!ENTITY torSettings.bridgeExplanation2 "Hvis du velger Ja, vil du bli bedt om å sette opp Tor-broer, som er unoterte rutingsstafettoppsett som gjør det vanskeligere å blokkere tilkoblinger til Tor-nettverket."> <!ENTITY torSettings.bridgeSettingsPrompt "Du kan bruke de angitte broene eller du kan skaffe og oppgi egendefinerte broer.">  -<!ENTITY torsettings.startingTor "Venter på at Tor skal starte..."> +<!ENTITY torsettings.startingTor "Venter på at Tor skal starte…"> <!ENTITY torsettings.restartTor "Omstart av Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Sett opp på ny"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Du har satt opp Tor-broer eller du har angitt lokale mellomtjeningsinnstillinger.   For å gjøre en direkte forbindelse til Tor-nettverket, må disse innstillingene fjernes."> +<!ENTITY torsettings.discardSettings.proceed "Fjern innstillinger og koble til"> <!ENTITY torsettings.optional "Valgfritt"> <!ENTITY torsettings.useProxy.checkbox "Denne maskinen trenger å bruke en mellomtjener for å nå Internett"> -<!ENTITY torsettings.useProxy.type "Proxytype:"> +<!ENTITY torsettings.useProxy.type "Mellomtjeningstype:"> <!ENTITY torsettings.useProxy.address "Adresse:"> <!ENTITY torsettings.useProxy.address.placeholder "IP-adresse, eller vertsnavn"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -53,19 +53,19 @@ <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Denne datamaskinen går gjennom en brannmur som kun tillater tilkoblinger til visse porter"> -<!ENTITY torsettings.firewall.allowedPorts "Tillatte Porter:"> +<!ENTITY torsettings.firewall.allowedPorts "Tillatte porter:"> <!ENTITY torsettings.useBridges.checkbox "Min Internettleverandør (ISP) blokkerer tilkoblinger til Tor-nettverket"> <!ENTITY torsettings.useBridges.default "Koble til med angitte broer"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Hver type bro bruker en annen metode for å unngå sensur.  Hvis en bro ikke virker, prøv på nytt med en annen."> <!ENTITY torsettings.useBridges.type "Tilkoblingstype:"> <!ENTITY torsettings.useBridges.custom "Angi egendefinerte broer"> -<!ENTITY torsettings.useBridges.label "Angi én eller flere bro-reléer (én per linje)."> +<!ENTITY torsettings.useBridges.label "Angi én eller flere bro-rutingsstafettoppsett (ett per linje)."> <!ENTITY torsettings.useBridges.placeholder "type adresse:port"> <!ENTITY torsettings.copyLog "Kopier Torloggen til Utklippstavlen"> -<!ENTITY torsettings.bridgeHelpTitle "Bro-relé Hjelp"> -<!ENTITY torsettings.bridgeHelp1 "Hvis du ikke får koblet til Tor-nettverket, kan det være at internettleverandøren din (ISP), eller et annet byrå/institusjon/etat blokkerer Tor.  Som regel kan du omgå dette problemet ved å bruke Tor-broer, som er ulistede reléer og derfor vanskeligere å blokkere."> -<!ENTITY torsettings.bridgeHelp1B "Du kan bruke de prekonfigurerte, angitte bro-adressene eller du kan skaffe deg egendefinerte adresser ved å bruke en av følgende tre metoder:"> +<!ENTITY torsettings.bridgeHelpTitle "Hjelp med Bro-rutingsstafettoppsett"> +<!ENTITY torsettings.bridgeHelp1 "Hvis du ikke får koblet til Tor-nettverket, kan det være at internettleverandøren din (ISP), eller et annet byrå/institusjon/etat blokkerer Tor.  Som regel kan du omgå dette problemet ved å bruke Tor-broer, som er ulistede rutingsstafettoppsett og derfor vanskeligere å blokkere."> +<!ENTITY torsettings.bridgeHelp1B "Du kan bruke de ferdig oppsatte, medfølgende broene eller du kan skaffe et egendefinert sett adresser ved bruk av én av disse metodene:."> <!ENTITY torsettings.bridgeHelp2Heading "Via nettet"> <!ENTITY torsettings.bridgeHelp2 "Bruk en nettleser for å besøke https://bridges.torproject.org/?lang=nb"> <!ENTITY torsettings.bridgeHelp3Heading "Via e-post autosvar"> diff --git a/src/chrome/locale/nb/progress.dtd b/src/chrome/locale/nb/progress.dtd index 2d7049a..82cf290 100644 --- a/src/chrome/locale/nb/progress.dtd +++ b/src/chrome/locale/nb/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> +<!ENTITY torprogress.dialog.title "Tor-status"> <!ENTITY torprogress.openSettings "Åpne Innstillinger"> <!ENTITY torprogress.heading "Kobler til Tor-nettverket"> -<!ENTITY torprogress.pleaseWait "Vennligst vent mens vi oppretter en tilkobling til Tor-nettverket.  Dette kan ta flere minutter."> +<!ENTITY torprogress.pleaseWait "Vent mens tilkobling til Tor-nettverket.  opprettes. Dette kan ta flere minutter."> diff --git a/src/chrome/locale/nb/torlauncher.properties b/src/chrome/locale/nb/torlauncher.properties index cdbad0e..5c10458 100644 --- a/src/chrome/locale/nb/torlauncher.properties +++ b/src/chrome/locale/nb/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,19 +13,19 @@ torlauncher.tor_bootstrap_failed_details=%1$S feilet (%2$S). torlauncher.unable_to_start_tor=Kunne ikke starte Tor.\n\n%S torlauncher.tor_missing=Den kjørbare Tor-filen finnes ikke. -torlauncher.torrc_missing=torrc filen finnes ikke. -torlauncher.datadir_missing=Datamappen til Tor finnes ikke. +torlauncher.torrc_missing=torrc-fila mangler og kunne ikke opprettes. +torlauncher.datadir_missing=Datakatalogen til Tor finnes ikke og kunne ikke opprettes. torlauncher.password_hash_missing=Kunne ikke hente kryptert passord. torlauncher.failed_to_get_settings=Kunne ikke hente Tor-innstillinger.\n\n%S torlauncher.failed_to_save_settings=Kunne ikke lagre Tor-innstillinger.\n\n%S -torlauncher.ensure_tor_is_running=Vennligst sjekk at Tor kjører. +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 å konfigurere Tor til å bruke en proxy for å koble til Internett. -torlauncher.error_proxy_type_missing=Du må velge proxytypen +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 melomtjenertypen 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_bridge_bad_default_type=Ingen angitte broer som har tilkoblingstypen %S er tilgjengelige. Vennligst juster innstillingene dine. +torlauncher.error_bridge_bad_default_type=Ingen angitte broer som har tilkoblingstypen %S er tilgjengelige. Juster innstillingene dine. torlauncher.recommended_bridge=(anbefalt) @@ -36,16 +36,17 @@ torlauncher.quit_win=Exit torlauncher.done=Ferdig torlauncher.forAssistance=For hjelp, kontakt %S +torlauncher.forAssistance2=For hjelp, besøk %S -torlauncher.copiedNLogMessages=Kopiering ferdig. %S Tor log meldinger er klare til å bli sent til et skriveprogram eller en email. +torlauncher.copiedNLogMessages=Kopiering ferdig. %S Torloggførings-meldinger er klare til å bli sent til et skriveprogram eller en e-post. -torlauncher.bootstrapStatus.conn_dir=Kobler til en relékatalog +torlauncher.bootstrapStatus.conn_dir=Kobler til en rutingsstafettoppsetts-katalog torlauncher.bootstrapStatus.handshake_dir=Etablerer en kryptert katalogforbindelse torlauncher.bootstrapStatus.requesting_status=Mottar nettverkstatus torlauncher.bootstrapStatus.loading_status=Laster nettverkstatus torlauncher.bootstrapStatus.loading_keys=Laster serfikater for autoritet -torlauncher.bootstrapStatus.requesting_descriptors=Sender forespørsel om reléinformasjon -torlauncher.bootstrapStatus.loading_descriptors=Laster reléinformasjon +torlauncher.bootstrapStatus.requesting_descriptors=Sender forespørsel om rutingsstafettoppsettsinformasjon +torlauncher.bootstrapStatus.loading_descriptors=Laster inn rutingsstafettoppsetts-informasjon torlauncher.bootstrapStatus.conn_or=Kobler til Tor-nettverket torlauncher.bootstrapStatus.handshake_or=Etablerer en Tor-rute torlauncher.bootstrapStatus.done=Koblet til Tor-nettverket! diff --git a/src/chrome/locale/nds/network-settings.dtd b/src/chrome/locale/nds/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/nds/network-settings.dtd +++ b/src/chrome/locale/nds/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/nds/torlauncher.properties b/src/chrome/locale/nds/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/nds/torlauncher.properties +++ b/src/chrome/locale/nds/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/ne/network-settings.dtd b/src/chrome/locale/ne/network-settings.dtd index aea700a..57eb5f2 100644 --- a/src/chrome/locale/ne/network-settings.dtd +++ b/src/chrome/locale/ne/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/ne/torlauncher.properties b/src/chrome/locale/ne/torlauncher.properties index ddd7834..fbe0355 100644 --- a/src/chrome/locale/ne/torlauncher.properties +++ b/src/chrome/locale/ne/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=टोर सुरुवातकर्ता @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=टोरको सेटिङ भेटिएन @@ -36,6 +36,7 @@ torlauncher.quit_win=बन्द torlauncher.done=भयो torlauncher.forAssistance=जानकारीको लागि सम्पर्क गर्नुहोस +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/nl-BE/network-settings.dtd b/src/chrome/locale/nl-BE/network-settings.dtd index 95f0a12..1c932a4 100644 --- a/src/chrome/locale/nl-BE/network-settings.dtd +++ b/src/chrome/locale/nl-BE/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Via het Web"> <!ENTITY torsettings.bridgeHelp2 "Gebruik een web browser om https://bridges.torproject.org te bezoeken"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/nl-BE/torlauncher.properties b/src/chrome/locale/nl-BE/torlauncher.properties index e231325..b6ffe5d 100644 --- a/src/chrome/locale/nl-BE/torlauncher.properties +++ b/src/chrome/locale/nl-BE/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Kan Tor niet starten.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=Het torcc bestand ontbreekt -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Afsluiten torlauncher.done=Klaar torlauncher.forAssistance=Voor assistentie, gelieve %S te contacteren +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd index ab35d6b..03707e3 100644 --- a/src/chrome/locale/nl/network-settings.dtd +++ b/src/chrome/locale/nl/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "Welke van de volgende beschrijft het best jouw situatie?"> <!ENTITY torSettings.configurePrompt1 "De internetverbinding van deze computer is gecensureerd of loopt via een proxy."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Ik moet een bridge of lokale proxy instellingen voordat ik verbinding kan maken met het Tor netwerk."> <!ENTITY torSettings.configure "Configureren"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Ik wil een directe verbinding met het Tor netwerk maken."> <!ENTITY torSettings.connectPrompt3 "Dit zal in de meeste omstandigheden werken."> <!ENTITY torSettings.connect "Verbinden"> <!ENTITY torSettings.proxyPageTitle "Lokale proxy-configuratie"> <!ENTITY torSettings.proxyQuestion "Heeft deze computer een lokale proxy nodig om toegang tot het internet te krijgen?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "In de meeste gevallen is een locale proxy niet nodig, maar kan het wel worden vereist bij het verbinden met een bedrijf, school of universitair netwerk."> +<!ENTITY torSettings.proxyExplanation2 "Als je niet zeker bent over het antwoord op deze vraag, bekijk dan de verbindingsinstellingen van een andere browser om te zien of die is ingesteld om gebruik te maken van een proxy."> <!ENTITY torSettings.enterProxy "Voer de proxy-instellingen in."> <!ENTITY torSettings.bridgePageTitle "Tor bridge-configuratie"> <!ENTITY torSettings.bridgeQuestion "Blokkeert of filtert je Internet Service Provider (ISP) verbindingen met het Tor-netwerk?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Als je niet zeker bent hoe je deze vraag moet beantwoorden, kies dan Nee (als je niet kunt verbinden met het Tor netwerk zonder een bridge, kun je later een toevoegen)."> +<!ENTITY torSettings.bridgeExplanation2 "Als je Ja kiest, moet je zelf Tor Bridges instellen, maar omdat het geen vertrouwde relays zijn is het moeilijker om verbindingen te blokkeren naar het Tor Netwerk."> <!ENTITY torSettings.bridgeSettingsPrompt "Je ka de opgegeven bridges gebruiken, of je kan je eigen bridges verkrijgen en instellen. ">  <!ENTITY torsettings.startingTor "Wachten tot Tor gestart is…"> <!ENTITY torsettings.restartTor "Herstart Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Herconfigureer"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "U heeft Tor bridges geconfigureerd of u heeft locale proxy instellingen ingevuld.  Om een directe verbinding tot het Tor netwerk te kunnen maken, dient u deze instellingen te verwijderen."> +<!ENTITY torsettings.discardSettings.proceed "Instellingen Verwijderen en Verbinden"> <!ENTITY torsettings.optional "Facultatief"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Toegestane poorten:"> <!ENTITY torsettings.useBridges.checkbox "Mijn Internet Service Provider (ISP) blokkeert verbindingen naar het Tor-netwerk"> <!ENTITY torsettings.useBridges.default "Verbinden met ingestelde bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Elk type bridge gebruikt een verschillende methode om censorship te voorkomen.  Als een van de bridges niet werkt, probeert u het dan opnieuw met een andere."> <!ENTITY torsettings.useBridges.type "Transporttype:"> <!ENTITY torsettings.useBridges.custom "Eigen bridge-instellingen"> <!ENTITY torsettings.useBridges.label "Voer een of meer bridge relays in (een per regel)."> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Kopieer Tor-log naar het klembord"> <!ENTITY torsettings.bridgeHelpTitle "Bridge relay-hulp"> <!ENTITY torsettings.bridgeHelp1 "Indien je geen verbinding kan maken met het Tor-netwerk, zou het kunnen dat je Internet Service Provider (ISP) of een andere instelling Tor blokkeert.  Vaak kan je dit omzeilen door gebruik te maken van Tor-bridges, dit zijn ongeregistreerde relays die moeilijker te blokkeren zijn."> -<!ENTITY torsettings.bridgeHelp1B "Je kan de voorgeconfigureerde bridge-adresinstellingen gebruiken, of je kan hier zelf een eigen adres instellen met een van de volgende drie methodes: "> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Door middel van het Web"> <!ENTITY torsettings.bridgeHelp2 "Gebruik een browser om https://bridges.torproject.org te bezoeken"> <!ENTITY torsettings.bridgeHelp3Heading "Door middel van de e-mail-autoresponder"> diff --git a/src/chrome/locale/nl/progress.dtd b/src/chrome/locale/nl/progress.dtd index fb513ad..a7ced45 100644 --- a/src/chrome/locale/nl/progress.dtd +++ b/src/chrome/locale/nl/progress.dtd @@ -1,4 +1,5 @@ -<!ENTITY torprogress.dialog.title "Tor status"> +<!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Instellingen"> <!ENTITY torprogress.heading "Bezig met verbinden met het Tor-netwerk"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Even geduld terwijl we verbinding maken met het Tor netwerk.  +Dit kan enkele minuten duren."> diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties index 12c0bf7..00ae9f5 100644 --- a/src/chrome/locale/nl/torlauncher.properties +++ b/src/chrome/locale/nl/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Starter @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S mislukte (%2$S). torlauncher.unable_to_start_tor=Kon Tor niet starten.\n\n%S torlauncher.tor_missing=Het Tor uitvoerbare bestand ontbreekt. -torlauncher.torrc_missing=Het torrc bestand ontbreekt. -torlauncher.datadir_missing=De Tor data map bestaat niet. +torlauncher.torrc_missing=Het torrc bestand is missend en kon niet worden aangemaakt. +torlauncher.datadir_missing=De Tor data directory bestaat niet en kon niet worden aangemaakt. torlauncher.password_hash_missing=Ophalen van een gehashed wachtwoord is mislukt. torlauncher.failed_to_get_settings=Kon Tor instellingen niet ophalen.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Sluit af torlauncher.done=OK torlauncher.forAssistance=Voor hulp, contacteer %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Kopiëren klaar. %S Tor logberichten zijn klaar om in een teksteditor of een e-mailbericht te worden geplakt. diff --git a/src/chrome/locale/nn/network-settings.dtd b/src/chrome/locale/nn/network-settings.dtd index 4bd82f0..120bbf4 100644 --- a/src/chrome/locale/nn/network-settings.dtd +++ b/src/chrome/locale/nn/network-settings.dtd @@ -1,41 +1,41 @@ <!ENTITY torsettings.dialog.title "Tor nettverksinnstillingar">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Tor nettlesarspråk"> +<!ENTITY torlauncher.localePicker.prompt "Vel eit språk.">  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Før du koplar til Tor-nettverket må du oppgje korleis maskina di koplar til internett."> <!ENTITY torSettings.yes "Ja"> <!ENTITY torSettings.no "Nei"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "Dette vil fungera i dei fleste høve"> +<!ENTITY torSettings.firstQuestion "Kva trur du passar best?"> +<!ENTITY torSettings.configurePrompt1 "Internett-sambandet til denne maskina er anten sensurert eller går gjennom ein proxy-tenar."> +<!ENTITY torSettings.configurePrompt2 "Eg må konfigurera bru- eller lokale proxyinnstillingar før eg koplar til Tor-nettverket."> +<!ENTITY torSettings.configure "Konfigurer"> +<!ENTITY torSettings.connectPrompt2 "Eg vil kopla til Tor-nettverket direkte."> +<!ENTITY torSettings.connectPrompt3 "Dette vil fungera i dei fleste høve."> <!ENTITY torSettings.connect "Kopla til"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyPageTitle "Konfigurasjon av lokal proxy"> +<!ENTITY torSettings.proxyQuestion "For å kopla til internett, treng denne maskina å nytta ein lokal proxy?">  <!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> <!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> <!ENTITY torSettings.enterProxy "Skriv inn mellomtenarinnstillingane."> <!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.bridgeQuestion "Sensurerer eller blokkerer internettleverandøren din (ISP) på noko vis tilgang til Tor-nettverket?"> +<!ENTITY torSettings.bridgeExplanation1 "Viss du ikkje er viss på dette, så vel Nei (viss du ikkje klarer å kopla til Tor-nettverket utan ei bru, kan du sete opp dette seinare)."> +<!ENTITY torSettings.bridgeExplanation2 "Viss du vel Ja, vert du spurt om du vil konfigurere bruer med Tor. Bruer er ulista relear som gjer det vanskelegare å blokkere samband til Tor-nettverket."> +<!ENTITY torSettings.bridgeSettingsPrompt "Du kan nytta bruene som følgjer med eller skaffa og skriva inn dine eigne.">  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> +<!ENTITY torsettings.startingTor "Ventar på at Tor startar..."> <!ENTITY torsettings.restartTor "Start Tor på nytt"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Konfigurer på nytt."> <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> <!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> @@ -65,9 +65,9 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp2 "Nytt ein nettlesar for å vitja https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> <!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> diff --git a/src/chrome/locale/nn/torlauncher.properties b/src/chrome/locale/nn/torlauncher.properties index 062fb5c..5c54991 100644 --- a/src/chrome/locale/nn/torlauncher.properties +++ b/src/chrome/locale/nn/torlauncher.properties @@ -1,20 +1,20 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher +torlauncher.error_title=Tor-oppstartar torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. -torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -torlauncher.tor_failed_to_start=Tor failed to start. +torlauncher.tor_controlconn_failed=Kunne ikkje kopla til Tor-kontrollport. +torlauncher.tor_failed_to_start=Tor klarte ikkje å starta opp. torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. +torlauncher.tor_bootstrap_failed=Tor klarte ikkje å kopla til eit samband med Tor-nettverket. torlauncher.tor_bootstrap_failed_details=%1$S feila (%2$S). -torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S +torlauncher.unable_to_start_tor=Tor kunne ikkje starta.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=torrc-fila manglar -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Avslutt torlauncher.done=Ferdig torlauncher.forAssistance=For hjelp, kontakt %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/nso/network-settings.dtd b/src/chrome/locale/nso/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/nso/network-settings.dtd +++ b/src/chrome/locale/nso/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/nso/torlauncher.properties b/src/chrome/locale/nso/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/nso/torlauncher.properties +++ b/src/chrome/locale/nso/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/oc/network-settings.dtd b/src/chrome/locale/oc/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/oc/network-settings.dtd +++ b/src/chrome/locale/oc/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/oc/torlauncher.properties b/src/chrome/locale/oc/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/oc/torlauncher.properties +++ b/src/chrome/locale/oc/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/or/network-settings.dtd b/src/chrome/locale/or/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/or/network-settings.dtd +++ b/src/chrome/locale/or/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/or/torlauncher.properties b/src/chrome/locale/or/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/or/torlauncher.properties +++ b/src/chrome/locale/or/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/pa/network-settings.dtd b/src/chrome/locale/pa/network-settings.dtd index 127f5c6..f749ef0 100644 --- a/src/chrome/locale/pa/network-settings.dtd +++ b/src/chrome/locale/pa/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "ਵੈੱਬ ਰਾਹੀਂ"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/pa/torlauncher.properties b/src/chrome/locale/pa/torlauncher.properties index 4246cf6..289ddf5 100644 --- a/src/chrome/locale/pa/torlauncher.properties +++ b/src/chrome/locale/pa/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=ਟੋਰ ਲਾਂਚਰ @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=ਬੰਦ ਕਰੋ torlauncher.done=ਮੁਕੰਮਲ torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/pap/network-settings.dtd b/src/chrome/locale/pap/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/pap/network-settings.dtd +++ b/src/chrome/locale/pap/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/pap/torlauncher.properties b/src/chrome/locale/pap/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/pap/torlauncher.properties +++ b/src/chrome/locale/pap/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd index 42180fa..d956e39 100644 --- a/src/chrome/locale/pl/network-settings.dtd +++ b/src/chrome/locale/pl/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "Które z poniższych najlepiej opisuje Twoją sytuację?"> <!ENTITY torSettings.configurePrompt1 "Połączenie internetowe tego komputera jest ocenzurowane lub przepuszczane przez proxy."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Muszę skonfigurować ustawienia mostka lub lokalne proxy przed podłączyć do sieci Tor."> <!ENTITY torSettings.configure "Konfiguruj"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Chciałbym nawiązać bezpośrednie połączenie do sieci Tor."> <!ENTITY torSettings.connectPrompt3 "To zadziała w większości sytuacji."> <!ENTITY torSettings.connect "Połącz"> <!ENTITY torSettings.proxyPageTitle "Ustawienia lokalnego proxy"> <!ENTITY torSettings.proxyQuestion "Czy ten komputer musi używać lokalnego proxy, aby połączyć się z Internetem?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "W większości przypadków lokalny serwer proxy nie jest potrzebny, jednakże może to być konieczne w przypadku podłączenia przez firmy, szkoły lub sieci uniwersyteckiej."> +<!ENTITY torSettings.proxyExplanation2 "Jeśli nie jesteś pewien, jak odpowiedzieć na to pytanie, przejrzyj ustawienia opcji internetowych w innej przeglądarce lub sprawdzić ustawienia sieci danego systemu, aby sprawdzić, czy lokalny serwer proxy jest potrzebny."> <!ENTITY torSettings.enterProxy "Wprowadź ustawienia serwera proxy"> <!ENTITY torSettings.bridgePageTitle "Ustawienia Tor Bridges"> <!ENTITY torSettings.bridgeQuestion "Czy Twój dostawca usług internetowych (ISP) blokuje lub cenzuruje połączenia sieci Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Jeśli nie jesteś pewien, jak odpowiedzieć na to pytanie, wybierz opcję Nie (jeśli nie jesteś w stanie połączyć się z siecią Tor bez mostu, możesz dodać jeden później)."> +<!ENTITY torSettings.bridgeExplanation2 "Jeśli wybierzesz Tak, zostaniesz poproszony o skonfigurowanie Mostu Tor, który jest przekaźnikiem nie listowanym, sprawia to, że trudniej zablokować połączenia do sieci Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Możesz wybrać dostępny zestaw mostków, albo możesz uzyskać i wprowadzić niestandardowy zestaw mostów.">  <!ENTITY torsettings.startingTor "Uruchamianie oprogramowania Tor"> <!ENTITY torsettings.restartTor "Zrestartuj Tora"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Przekonfiguruj"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.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.optional "(opcjonalnie)"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Dozwolone porty:"> <!ENTITY torsettings.useBridges.checkbox "Mój dostawca internetu blokuje połączenia do sieci Tor"> <!ENTITY torsettings.useBridges.default "Połącz z dostępnymi mostami."> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Każdy rodzaj mostu używa innej metody, aby uniknąć cenzury..  Jeśli jeden most nie działa, spróbuj użyć innego."> <!ENTITY torsettings.useBridges.type "Typ Transportu:"> <!ENTITY torsettings.useBridges.custom "Wprowadź własne mosty"> <!ENTITY torsettings.useBridges.label "Dodaj jeden lub więcej przekaźników mostowych (jeden w każdej linijce)"> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Skopiuj log do schowka"> <!ENTITY torsettings.bridgeHelpTitle "Pomoc Przekaźników Mostkowych"> <!ENTITY torsettings.bridgeHelp1 "Jeśli nie jesteś w stanie połączyć się z siecią Tor, może to oznaczać, że Twój Dostawca Usług Internetowych (ISP) lub inna agencja blokuje dostęp do sieci Tor.  Często można obejść ten problem używając Mostów Tor, które są nienotowanymi przekaźnikami, dzięki czemu trudniej je zablokować."> -<!ENTITY torsettings.bridgeHelp1B "Możesz użyć wstępnie skonfigurowany, domyślny zestaw adresów mostów lub możesz uzyskać własny zestaw adresów za pomocą jednej z tych trzech metod:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Za pośrednictwem sieci Web"> <!ENTITY torsettings.bridgeHelp2 "Użyj przeglądarki internetowej do odwiedzenia https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Poprzez Email Autoresponder"> diff --git a/src/chrome/locale/pl/progress.dtd b/src/chrome/locale/pl/progress.dtd index f30af87..6896d3c 100644 --- a/src/chrome/locale/pl/progress.dtd +++ b/src/chrome/locale/pl/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Status sieci Tor"> <!ENTITY torprogress.openSettings "Ustawienia"> <!ENTITY torprogress.heading "Łączenie z siecią Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Proszę zaczekać, aż ustanowimy połączenie do sieci Tor.  To może zająć kilka minut."> diff --git a/src/chrome/locale/pl/torlauncher.properties b/src/chrome/locale/pl/torlauncher.properties index 7ba4f88..4f2d39f 100644 --- a/src/chrome/locale/pl/torlauncher.properties +++ b/src/chrome/locale/pl/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S błąd (%2$S). torlauncher.unable_to_start_tor=Nie można wystartować aplikacji Tor.\n\n%S torlauncher.tor_missing=Brakuje pliku wykonywalnego Tora. -torlauncher.torrc_missing=Brakuje pliku torrc -torlauncher.datadir_missing=Katalog danych Tora nie istnieje. +torlauncher.torrc_missing=Brakuje pliku torrc, nie mógł on być utworzony. +torlauncher.datadir_missing=Katalog Tora nie istnieje i nie mógł być utworzony. torlauncher.password_hash_missing=Nie można uzyskać hasha hasła. torlauncher.failed_to_get_settings=Nie można odzyskać ustawień Tora.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Wyjście torlauncher.done=Gotowe torlauncher.forAssistance=By uzyskać pomoc, skontaktuj się +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Kopia zakończona. %S logi Tora są gotowe do wklejenia do notatnika lub wiadomości email. diff --git a/src/chrome/locale/pms/network-settings.dtd b/src/chrome/locale/pms/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/pms/network-settings.dtd +++ b/src/chrome/locale/pms/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/pms/torlauncher.properties b/src/chrome/locale/pms/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/pms/torlauncher.properties +++ b/src/chrome/locale/pms/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/ps/network-settings.dtd b/src/chrome/locale/ps/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/ps/network-settings.dtd +++ b/src/chrome/locale/ps/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/ps/torlauncher.properties b/src/chrome/locale/ps/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/ps/torlauncher.properties +++ b/src/chrome/locale/ps/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/pt-BR/network-settings.dtd b/src/chrome/locale/pt-BR/network-settings.dtd index 1379f93..42b3d0f 100644 --- a/src/chrome/locale/pt-BR/network-settings.dtd +++ b/src/chrome/locale/pt-BR/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "Quais opções descrevem melhor a sua situação?"> <!ENTITY torSettings.configurePrompt1 "A conexão à Internet deste computador foi censurada, filtrada ou limitada por um proxy."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Eu preciso configurar as definições de conexão de ponte ou proxy local antes de conectar à rede Tor."> <!ENTITY torSettings.configure "Configurar"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Eu gostaria de fazer uma conexão direta com a rede Tor."> <!ENTITY torSettings.connectPrompt3 "Isso funcionará na maioria dos casos."> <!ENTITY torSettings.connect "Conectar"> <!ENTITY torSettings.proxyPageTitle "Configuração de Proxy Local"> <!ENTITY torSettings.proxyQuestion "Este computador necessita de um proxy local para acessar a Internet?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "Na maioria dos casos, um proxy local não é necessário, mas é requerido quando estiver conectando através de uma rede de empresa, escola ou universidade."> +<!ENTITY torSettings.proxyExplanation2 "Se você não tem certeza de como responder essa questão, procure nas configurações de Internet de outro navegador ou verifique as configurações de rede do seu sistema para ver se um proxy local é necessário."> <!ENTITY torSettings.enterProxy "Insira as configurações de proxy."> <!ENTITY torSettings.bridgePageTitle "Configuração de Pontes Tor"> <!ENTITY torSettings.bridgeQuestion "Seu provedor de serviços de internet (ISP) bloqueia ou censura conexões à rede Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Se você não tem certeza de como responder essa questão, escolha Não (se você não conseguir conectar à rede Tor sem uma conexão de ponte, você pode adicionar uma mais tarde)."> +<!ENTITY torSettings.bridgeExplanation2 "Se você escolher Sim, será solicitado que você configure Conexões de Ponte Tor, que são transmissores não-listados que dificultam mais o bloqueio de conexões à Rede Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Você pode usar o conjunto de pontes fornecidas ou obter e adicionar um conjunto de pontes personalizadas. ">  <!ENTITY torsettings.startingTor "Esperando que Tor inicie..."> <!ENTITY torsettings.restartTor "Reiniciar o Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Reconfigurar"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Você configurou as definições de conexões de ponte Tor ou inseriu um proxy local.  Para fazer uma conexão direta à rede Tor, essas definições devem ser removidas."> +<!ENTITY torsettings.discardSettings.proceed "Remover Definições e Conectar"> <!ENTITY torsettings.optional "Opcional"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Portas habilitadas:"> <!ENTITY torsettings.useBridges.checkbox "Meu Provedor de Serviços Internet (ISP) bloqueia as conexões à rede Tor"> <!ENTITY torsettings.useBridges.default "Conectar com as pontes fornecidas"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Cada tipo de conexão de ponte usa um método diferente para evitar censura.  Se uma não funcionar, tente novamente usando uma diferente."> <!ENTITY torsettings.useBridges.type "Tipo de transporte:"> <!ENTITY torsettings.useBridges.custom "Adicionar pontes personalizadas"> <!ENTITY torsettings.useBridges.label "Insira um ou mais relés de pontes (um por linha)."> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copiar o registro do Tor na área de transferência"> <!ENTITY torsettings.bridgeHelpTitle "Ajuda Relé de Ponte"> <!ENTITY torsettings.bridgeHelp1 "Se for impossível conectar-se à rede Tor, talvez o seu Provedor de Internet (ISP) ou outra instância esteja bloqueando o Tor. . Normalmente, é possível contornar esse problema utilizando Pontes Tor, que são relés ocultos (não listados), mais difíceis de bloquear."> -<!ENTITY torsettings.bridgeHelp1B "Você pode usar o conjunto de endereços de pontes fornecidas, já configuradas, ou pode obter um conjunto personalizado, usando um desses três métodos:"> +<!ENTITY torsettings.bridgeHelp1B "Você pode usar o conjunto de endereços de pontes fornecido, já pré-configurado, ou pode obter um conjunto de endereços personalizados utilizando um dos métodos indicados abaixo:"> <!ENTITY torsettings.bridgeHelp2Heading "Através da Web"> <!ENTITY torsettings.bridgeHelp2 "Use um navegador internet para visitar https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Através do Email Autoresponder"> diff --git a/src/chrome/locale/pt-BR/progress.dtd b/src/chrome/locale/pt-BR/progress.dtd index b2f8eb3..1c07b36 100644 --- a/src/chrome/locale/pt-BR/progress.dtd +++ b/src/chrome/locale/pt-BR/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Status do Tor"> <!ENTITY torprogress.openSettings "Abrir Configurações "> <!ENTITY torprogress.heading "Conectando à rede Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Por favor, aguarde enquanto estabelecemos uma conexão com a rede Tor.  Isso pode demorar alguns minutos."> diff --git a/src/chrome/locale/pt-BR/torlauncher.properties b/src/chrome/locale/pt-BR/torlauncher.properties index 295770d..ba53e12 100644 --- a/src/chrome/locale/pt-BR/torlauncher.properties +++ b/src/chrome/locale/pt-BR/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Inicializador do Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S falhou (%2$S). torlauncher.unable_to_start_tor=Impossível iniciar Tor. torlauncher.tor_missing=Falta o programa de execução de Tor. -torlauncher.torrc_missing=Falta o arquivo torrc. -torlauncher.datadir_missing=O diretório de dados de Tor não existe. +torlauncher.torrc_missing=O arquivo torrc está faltando e não pôde ser criado. +torlauncher.datadir_missing=O diretório de dados Tor não existe e não pode ser criado. torlauncher.password_hash_missing=Falha ao obter a senha criptografada. torlauncher.failed_to_get_settings=Impossível recuperar as configurações de Tor. @@ -36,6 +36,7 @@ torlauncher.quit_win=Sair torlauncher.done=Terminado torlauncher.forAssistance=Para assistência, contacte +torlauncher.forAssistance2=Se você precisar de assistência, por favor visite %S torlauncher.copiedNLogMessages=Cópia concluída. As mensagens %S do Tor log estão prontas para ser copiadas em um editor de texto ou em uma mensagem de e-mail. diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd index 03dfb80..eb93ba8 100644 --- a/src/chrome/locale/pt/network-settings.dtd +++ b/src/chrome/locale/pt/network-settings.dtd @@ -1,8 +1,8 @@ <!ENTITY torsettings.dialog.title "Configurações da Rede Tor">  -<!ENTITY torlauncher.localePicker.title "Linguagem do Navegador Tor"> -<!ENTITY torlauncher.localePicker.prompt "Por favor seleccione um idioma."> +<!ENTITY torlauncher.localePicker.title "Idioma do Navegador Tor"> +<!ENTITY torlauncher.localePicker.prompt "Por favor, selecione um idioma.">  @@ -11,16 +11,16 @@ <!ENTITY torSettings.yes "Sim"> <!ENTITY torSettings.no "Não"> -<!ENTITY torSettings.firstQuestion "Qual das seguintes frases melhor descreve a sua situação?"> +<!ENTITY torSettings.firstQuestion "Qual das seguintes frases descreve melhor a sua situação?"> <!ENTITY torSettings.configurePrompt1 "Esta ligação à Internet deste computador está censurada ou é efetuada via proxy."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Eu preciso de configurar a ponte ou as definições do proxy local antes de ligar à rede Tor ."> <!ENTITY torSettings.configure "Configurar"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "Isto irá funcionar na maior parte das situações."> +<!ENTITY torSettings.connectPrompt2 "Eu gostaria de efetuar uma ligação direta à rede Tor."> +<!ENTITY torSettings.connectPrompt3 "Isto irá funcionar na maioria das situações."> <!ENTITY torSettings.connect "Ligar"> <!ENTITY torSettings.proxyPageTitle "Configuração do Proxy Local"> -<!ENTITY torSettings.proxyQuestion "Este computador precisa de utilizar um proxy para aceder à Internet."> +<!ENTITY torSettings.proxyQuestion "Este computador precisa de utilizar um proxy para aceder à Internet?">  <!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> <!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> @@ -34,11 +34,11 @@  <!ENTITY torsettings.startingTor "A aguardar que o Tor inicie..."> -<!ENTITY torsettings.restartTor "Reiniciar o Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.restartTor "Reiniciar Tor"> +<!ENTITY torsettings.reconfigTor "Reconfigurar"> <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.proceed "Remover Definições e Ligar"> <!ENTITY torsettings.optional "Opcional"> @@ -52,7 +52,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 "Este computador atravessa uma firewall que só permite ligações a algumas portas."> +<!ENTITY torsettings.firewall.checkbox "Este computador liga através de uma firewall que só permite ligações para determinadas portas."> <!ENTITY torsettings.firewall.allowedPorts "Portas permitidas:"> <!ENTITY torsettings.useBridges.checkbox "O meu Provedor de Serviço da Internet (ISP) bloqueia as ligações à rede Tor"> <!ENTITY torsettings.useBridges.default "Ligar com as pontes fornecidas"> @@ -64,12 +64,12 @@ <!ENTITY torsettings.copyLog "Copiar o Registo do Tor para a Área de Transferência"> <!ENTITY torsettings.bridgeHelpTitle "Ajuda da Retransmissão de Ponte"> -<!ENTITY torsettings.bridgeHelp1 "Se não consegue ligar-se à rede Tor, pode ser devido a algum bloqueio do seu provedor de internet (ISP) ou outro intermediário está a bloquear o Tor.  Normalmente, pode contornar este problema usando Tor Bridges, que são pontos de passagem não listados mais difíceis de bloquear."> -<!ENTITY torsettings.bridgeHelp1B "Pode usar o conjunto de bridges pré-configurado fornecido, ou pode obter um conjunto de endereços personalizados usando um dos três métodos:"> +<!ENTITY torsettings.bridgeHelp1 "Se não consegue ligar-se à rede Tor, pode ser devido a algum bloqueio do seu Provedor de Serviço de Internet (ISP) ou outra agência está a bloquear o Tor.  Frequentemente, pode contornar este problema utilizando Tor Bridges, o qual são pontos de passagem não listados que são mais difíceis de bloquear."> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Através da Web"> <!ENTITY torsettings.bridgeHelp2 "Utilize um navegador da Web para visitar https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Através do Respondedor Automático do Correio Eletrónico"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Enviar mensagem para bridges(a)torproject.org com a linha 'get bridges' sozinha no corpo da mensagem.  Contudo, para tornar mais difícil para os atacantes aprenderem sobre os endereços de pontes, tem de enviar a mensagem de um dos seguintes fornecedores de serviços de correio eletrónico (por esta ordem de preferência):"> +<!ENTITY torsettings.bridgeHelp3Heading "Através do Respondedor Automático de Correio Eletrónico"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Envie uma mensagem para bridges(a)torproject.org com a linha 'get bridges' no corpo da mensagem.  Contudo, para tornar mais difícil para um atacante aprender sobre os endereços de pontes, deve enviar este pedido a partir dos seguintes provedores de serviços de correio eletrónico (listados pela ordem de preferência):"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ou https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Através do Suporte"> <!ENTITY torsettings.bridgeHelp4 "Em último caso, pode solicitar os endereços de ponte, enviando uma mensagem elegante para help(a)rt.torproject.org.  Por favor, note que uma pessoa irá precisar de responder a cada pedido."> diff --git a/src/chrome/locale/pt/torlauncher.properties b/src/chrome/locale/pt/torlauncher.properties index 61b4aa9..428995f 100644 --- a/src/chrome/locale/pt/torlauncher.properties +++ b/src/chrome/locale/pt/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Executor Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S falhou (%2$S). torlauncher.unable_to_start_tor=Não é possível iniciar o Tor.\n\n %S torlauncher.tor_missing=O executável do Tor está em falta. -torlauncher.torrc_missing=O ficheiro torrc está em falta. -torlauncher.datadir_missing=A pasta dos dados do Tor não existe. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Não foi possível obter a senha "hashed". torlauncher.failed_to_get_settings=Não é possível obter as configurações do Tor\n\n %S @@ -36,6 +36,7 @@ torlauncher.quit_win=Fechar torlauncher.done=Concluído torlauncher.forAssistance=Para assistência, contacte %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Cópia completa. Estão prontas %S mensagens do registo de eventos do Tor para serem coladas num editor de texto ou numa mensagem de correio eletrónico. diff --git a/src/chrome/locale/ro/network-settings.dtd b/src/chrome/locale/ro/network-settings.dtd index 1ab990d..7d6b13d 100644 --- a/src/chrome/locale/ro/network-settings.dtd +++ b/src/chrome/locale/ro/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "Care din următoarele descrie cel mai bine situația dvs?"> <!ENTITY torSettings.configurePrompt1 "Această conexiune la internet a computerului este cenzurată sau prin proxy."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Trebuie să configurez setările bridge sau proxy locale înainte de conectarea la rețeaua Tor "> <!ENTITY torSettings.configure "Configuraţi "> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Aș dori o conexiune directă la rețeaua Tor."> <!ENTITY torSettings.connectPrompt3 "Aceasta funcționează în cele mai multe situații."> <!ENTITY torSettings.connect "Conectare"> <!ENTITY torSettings.proxyPageTitle "Configurare Proxy local"> <!ENTITY torSettings.proxyQuestion "Are nevoie acest computer să utilizeze un proxy local pentru accesarea internetului?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "În cele mai multe cazuri un proxy local nu este necesar dar poate fi necesară atunci când conectarea se face printr-o rețea a unei firme, școli sau universități."> +<!ENTITY torSettings.proxyExplanation2 "Dacă nu sunteți sigur cum să răspundeți la această întrebare uitași-vă la setările de internet în alt browser sau verificați setările de rețea ale sistemului dvs. pentru a vedea dacă este nevoie de un proxy local."> <!ENTITY torSettings.enterProxy "Introduceţi setările pentru proxy ."> <!ENTITY torSettings.bridgePageTitle "Configurare Punți Tor "> <!ENTITY torSettings.bridgeQuestion "Internet Service Providerul (ISP) dvs blochează sau cenzurează conexiunile către rețeaua Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Dacă nu sunteți sigur cum să răspundeți la această întrebare, alegeți Nu (dacă nu vă puteți conecta la rețeaua Tor fără un bridge, puteți adăuga unul mai târziu)."> +<!ENTITY torSettings.bridgeExplanation2 "Dacă alegeți Da vi se va cere să configurați Tor Bridges, care sunt relee nelistate ce fac mai dificilă blocarea conexiunilor la Rețeaua Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Puteți folosi setul de punți oferit sau puteți obține și introduce un set particular de punți.">  <!ENTITY torsettings.startingTor "Aștept Tor să pornească..."> <!ENTITY torsettings.restartTor "Repornește Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Reconfigurare"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Ați configurat bridge-uri Tor sau ați introdus setări proxu locale.  Pentru a face o conexiune directă la rețeaua Tor aceste setări trebuiesc eliminate."> +<!ENTITY torsettings.discardSettings.proceed "Eliminați Setări și Conectare"> <!ENTITY torsettings.optional "Opțional"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Porturi permise:"> <!ENTITY torsettings.useBridges.checkbox "Internet Service Providerul (ISP) meu blochează conexiunile către rețeaua Tor"> <!ENTITY torsettings.useBridges.default "Conectați-vă punțile oferite"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Fiecare tip de bridge folosește o metodă diferită de a evita cenzura.  Dacă un bridge nu funcționează, încercați să folosiți unul diferit."> <!ENTITY torsettings.useBridges.type "Tip de transport:"> <!ENTITY torsettings.useBridges.custom "Introduceți punți personalizate"> <!ENTITY torsettings.useBridges.label "Introduceți una sau mai multe bridge relays (una pe linie)."> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copiați jurnalul Tor în Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Ajutor Bridge Relay"> <!ENTITY torsettings.bridgeHelp1 "Dacă nu puteți să vă conectați la rețeaua tor, poate să fie din cauză că Internet Service Providerul (ISP) sau altă agenție blochează Tor.  Des, puteți ocoli această problemă folosind Tor Bridges, care sînt relayuri nelistate, mai dificil de blocat."> -<!ENTITY torsettings.bridgeHelp1B "Puteți folosi setul de adrese de punți preconfigurate oferite sau puteți obține un set personalizat de adrese folosind una din aceste trei metode:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Prin Web"> <!ENTITY torsettings.bridgeHelp2 "Folosiți un webbrowser pentru a vizita https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Prin email automat"> diff --git a/src/chrome/locale/ro/progress.dtd b/src/chrome/locale/ro/progress.dtd index bda4ccc..9efa695 100644 --- a/src/chrome/locale/ro/progress.dtd +++ b/src/chrome/locale/ro/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Stare Tor"> <!ENTITY torprogress.openSettings "Setări"> <!ENTITY torprogress.heading "Conctare la reţeaua Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Vă rugăm așteptați în timp ce stabilim o conexiune la rețeaua Tor.  Acest proces poate dura câteva minute."> diff --git a/src/chrome/locale/ro/torlauncher.properties b/src/chrome/locale/ro/torlauncher.properties index 9d0257b..ec9c4f5 100644 --- a/src/chrome/locale/ro/torlauncher.properties +++ b/src/chrome/locale/ro/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Lansator Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S eșec (%2$S). torlauncher.unable_to_start_tor=Tor nu poate porni. torlauncher.tor_missing=Fișierul executabil Tor lipsește. -torlauncher.torrc_missing=Fișierul torrc lipsește -torlauncher.datadir_missing=Tor data directory nu există. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Eșec parole hashed. torlauncher.failed_to_get_settings=Nu pot obține Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Ieşire torlauncher.done=Gata torlauncher.forAssistance=Pentru asistență, contactați +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copiere efectuată. %S Mesajele de log Tor sunt gata pentru a fi lipite într-un editor de text sau un mesaj e-mail. diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd index fbf9702..9bb3be7 100644 --- a/src/chrome/locale/ru/network-settings.dtd +++ b/src/chrome/locale/ru/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "Что лучше описывает вашу ситуацию?"> <!ENTITY torSettings.configurePrompt1 "Интернет-соединение этого компьютера цензурируется или находится за прокси."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Необходимо настроить параметры моста или локальный прокси, прежде чем подключаться к сети Tor. "> <!ENTITY torSettings.configure "Настроить"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Я хочу напрямую подключиться к сети Tor."> <!ENTITY torSettings.connectPrompt3 "Это должно работать в большинстве ситуаций."> <!ENTITY torSettings.connect "Соединиться"> <!ENTITY torSettings.proxyPageTitle "Настройки локального прокси"> <!ENTITY torSettings.proxyQuestion "Требуется ли этому компьютеру локальный прокси для доступа к Интернету?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "В большинстве случаев локальный прокси не нужен, но он может потребоваться при подключении через сеть компании, школы или университета."> +<!ENTITY torSettings.proxyExplanation2 "Если вы не знаете, как ответить на этот вопрос, проверьте настройки интернета другого браузера или проверьте системные настройки своей сети, чтобы посмотреть, нужен ли локальный прокси."> <!ENTITY torSettings.enterProxy "Введите настройки прокси."> <!ENTITY torSettings.bridgePageTitle "Настройки шлюзов Tor"> <!ENTITY torSettings.bridgeQuestion "Ваш провайдер (ISP) блокирует или как-либо цензурирует подключения к сети Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Если вы не знаете, как ответить на данный вопрос, выберите "Нет" (если вы не можете подключиться к сети Tor, вы можете ответить позже)."> +<!ENTITY torSettings.bridgeExplanation2 "Если вы выберете "Да", Вам будет предложено настроить Tor мосты, что усложняет блокировку подключения к сети Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Вы можете использовать предопределенный набор мостов или получить и ввести список мостов вручную.">  <!ENTITY torsettings.startingTor "Ожидание запуска Tor..."> <!ENTITY torsettings.restartTor "Перезапустить Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Изменить конфигурацию"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Вы настроили Tor мосты или ввели локальные настройки прокси-сервера.  Для прямого подключения к сети Tor эти параметры должны быть удалены."> +<!ENTITY torsettings.discardSettings.proceed "Удалить настройки и подключиться"> <!ENTITY torsettings.optional "Необязательно"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Разрешенные порты:"> <!ENTITY torsettings.useBridges.checkbox "Мой провайдер блокирует доступ к сети Tor"> <!ENTITY torsettings.useBridges.default "Подключиться к предопределенным мостам"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Каждый тип моста использует различные способы избежания цензуры.  Если мост не работает, попробуйте еще раз, используя другой."> <!ENTITY torsettings.useBridges.type "Тип транспорта:"> <!ENTITY torsettings.useBridges.custom "Ввести мосты вручную"> <!ENTITY torsettings.useBridges.label "Введите один или несколько ретрансляторов типа мост (один на строку)"> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Скопировать журнал Tor в буфер обмена"> <!ENTITY torsettings.bridgeHelpTitle "Помощь по ретрансляторам типа мост"> <!ENTITY torsettings.bridgeHelp1 "Если вы не можете подключиться к сети Tor, возможно ваш провайдер (ISP) или иная организация блокирует Tor.  Часто эту проблему можно обойти при помощи мостов Tor, не перечисленных в публичных списках, которые сложнее заблокировать."> -<!ENTITY torsettings.bridgeHelp1B "Вы можете использовать стандартный предопределенный набор мостов или получить и ввести список мостов вручную при помощи одного из этих трёх методов:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Из Веб"> <!ENTITY torsettings.bridgeHelp2 "Откройте в веб-браузере https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Через автоответчик электронной почты"> diff --git a/src/chrome/locale/ru/progress.dtd b/src/chrome/locale/ru/progress.dtd index aa09819..7d7ae9d 100644 --- a/src/chrome/locale/ru/progress.dtd +++ b/src/chrome/locale/ru/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Статус Tor"> <!ENTITY torprogress.openSettings "Открыть Настройки"> <!ENTITY torprogress.heading "Подключение к сети Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Пожалуйста, подождите, пока мы установим подключение к сети Tor.  Это может занять несколько минут."> diff --git a/src/chrome/locale/ru/torlauncher.properties b/src/chrome/locale/ru/torlauncher.properties index 0b68b18..f224679 100644 --- a/src/chrome/locale/ru/torlauncher.properties +++ b/src/chrome/locale/ru/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Загрузчик Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S неудачно (%2$S). torlauncher.unable_to_start_tor=Невозможно запустить Tor.\n\n%S torlauncher.tor_missing=Исполняемый файл Tor отсутствует. -torlauncher.torrc_missing=Файл torrc отсутствует. -torlauncher.datadir_missing=Каталог данных Tor не существует. +torlauncher.torrc_missing=torrc файл отсутствует и не может быть создан. +torlauncher.datadir_missing=Директория данных Tor не существует и не может быть создана. torlauncher.password_hash_missing=Не удаётся получить хэшированный пароль. torlauncher.failed_to_get_settings=Не удаётся загрузить настройки Tor.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Выход torlauncher.done=Готово torlauncher.forAssistance=Для помощи свяжитесь с %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Копирование завершено. %S собщение с логами Tor находятся в буфере обмена и могут быть вставлены в текстовый редактор или email. diff --git a/src/chrome/locale/ru(a)petr1708/network-settings.dtd b/src/chrome/locale/ru(a)petr1708/network-settings.dtd index 9987337..5eae3c6 100644 --- a/src/chrome/locale/ru(a)petr1708/network-settings.dtd +++ b/src/chrome/locale/ru(a)petr1708/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/ru(a)petr1708/torlauncher.properties b/src/chrome/locale/ru(a)petr1708/torlauncher.properties index 77dc4e7..ea2d497 100644 --- a/src/chrome/locale/ru(a)petr1708/torlauncher.properties +++ b/src/chrome/locale/ru(a)petr1708/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/sco/network-settings.dtd b/src/chrome/locale/sco/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/sco/network-settings.dtd +++ b/src/chrome/locale/sco/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/sco/torlauncher.properties b/src/chrome/locale/sco/torlauncher.properties index 02be756..d3f03d2 100644 --- a/src/chrome/locale/sco/torlauncher.properties +++ b/src/chrome/locale/sco/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(recommendit) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/si-LK/network-settings.dtd b/src/chrome/locale/si-LK/network-settings.dtd index d5c5fb1..11e3069 100644 --- a/src/chrome/locale/si-LK/network-settings.dtd +++ b/src/chrome/locale/si-LK/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Clipboard එකට Tor ලොගය පිටපත් කරන්න."> <!ENTITY torsettings.bridgeHelpTitle "සේතු ප්‍රතියෝජක (Bridge Relay) උපකාරකය"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/si-LK/torlauncher.properties b/src/chrome/locale/si-LK/torlauncher.properties index a132cff..c161501 100644 --- a/src/chrome/locale/si-LK/torlauncher.properties +++ b/src/chrome/locale/si-LK/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor පුරනය @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Tor ආරම්භ කිරීමට නොහැක.\n\n%S torlauncher.tor_missing=Tor විධානය අස්ථානගත වී ඇත. -torlauncher.torrc_missing=torrc ගොනුව අස්ථානගත වී ඇත. -torlauncher.datadir_missing=Tor දත්ත නාමාවලිය නොපවතී. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=පුරණය කරනලද මුරපදය ලබාගැනීමට අපොහොසත්ය. torlauncher.failed_to_get_settings=Tor සිටුවම් සොයා ලබාගැනීමට අපොහොසත්ය.\n\n%S @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=ඔබ විසින් සේතු එක torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(නිර්දේශිත) torlauncher.connect=සම්බන්ධ වෙන්න torlauncher.restart_tor=Restart Tor @@ -36,6 +36,7 @@ torlauncher.quit_win=අයින් වන්න torlauncher.done=කරන ලදී torlauncher.forAssistance=සහය සදහා, සම්බන්ධ වන්න%S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/sk-SK/network-settings.dtd b/src/chrome/locale/sk-SK/network-settings.dtd index 81deede..8de7563 100644 --- a/src/chrome/locale/sk-SK/network-settings.dtd +++ b/src/chrome/locale/sk-SK/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Kopírovať log Toru do schránky"> <!ENTITY torsettings.bridgeHelpTitle "Pomocník pre premostenia relé"> <!ENTITY torsettings.bridgeHelp1 "Ak nie ste schopní sa pripojiť do siete Tor, je možné, že váš poskytovateľ internetového pripojenia (ISP) alebo iný správny orgán blokuje Tor.  Väčšinou je možné tento problém obísť použitím Tor Bridges, čo sú nikde nezapísané relé, ktoré je obtiažne blokovať."> -<!ENTITY torsettings.bridgeHelp1B "Môžete použiť prednastavenú, dodanú sadu adries premostenia alebo si môžete zaobstarať vlastnú sadu adries pomocou jedného z troch nasledujúcich spôsobov:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Navštívte https://bridges.torproject.org pomocou webového prehliadača"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/sk-SK/torlauncher.properties b/src/chrome/locale/sk-SK/torlauncher.properties index 63c1b2c..c848a52 100644 --- a/src/chrome/locale/sk-SK/torlauncher.properties +++ b/src/chrome/locale/sk-SK/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S zlyhaných (%2$S). torlauncher.unable_to_start_tor=Nie je možné spustiť Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=Torrc súbor chýba. -torlauncher.datadir_missing=Data adresár pre Tor neexistuje. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Nebolo možné prevziať zašifrované heslo. torlauncher.failed_to_get_settings=Nepodarilo sa získať Tor nastavenia.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Ukončiť torlauncher.done=Hotovo torlauncher.forAssistance=Pre pomoc konaktujte %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/sk/network-settings.dtd b/src/chrome/locale/sk/network-settings.dtd index 5826392..f86e26a 100644 --- a/src/chrome/locale/sk/network-settings.dtd +++ b/src/chrome/locale/sk/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Skopírovať záznam Tor do schránky clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Nápoveda o relé premosteniach"> <!ENTITY torsettings.bridgeHelp1 "Ak nie ste schopný sa pripojiť k sieti Toru, je možné, že vás blokuje váš Poskytovateľ Internetú (ISP) alebo nejaké iná agentúra.   Tento problém môžete často obísť použivaním Mostov Toru, čo sú nezaradené relé náročnejšie na blokovanie."> -<!ENTITY torsettings.bridgeHelp1B "Môžete použiť prekonfigurovanú poskytnutú sadu mostových adries alebo vložiť vlastnú sadu adries použitím jednej z nasledujúcich metód:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Cez Web"> <!ENTITY torsettings.bridgeHelp2 "Použite webový prehliadač na navštívenie https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Cez Email Autoresponder"> diff --git a/src/chrome/locale/sk/torlauncher.properties b/src/chrome/locale/sk/torlauncher.properties index 17de31a..e9012e2 100644 --- a/src/chrome/locale/sk/torlauncher.properties +++ b/src/chrome/locale/sk/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Spúšťač Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S zlyhalo (%2$S). torlauncher.unable_to_start_tor=Nie je možné spustiť Tor.\n\n%S torlauncher.tor_missing=Spustiteľný súbor programu Tor chýba. -torlauncher.torrc_missing=Súbor torrc chýba. -torlauncher.datadir_missing=Dátový priečinok Tor neexistuje. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Nepodarilo sa získať zabezpečené heslo. torlauncher.failed_to_get_settings=Nie je možné prijať nastavenia Tor.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Ukončiť torlauncher.done=Hotovo torlauncher.forAssistance=Pre podporu kontaktujte %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Kopirovanie ukončené. %S Tor log správy je pripravené na prilepenie do textového editora alebo emailovej správy. diff --git a/src/chrome/locale/sl-SI/network-settings.dtd b/src/chrome/locale/sl-SI/network-settings.dtd index a5b4388..6ddb6e3 100644 --- a/src/chrome/locale/sl-SI/network-settings.dtd +++ b/src/chrome/locale/sl-SI/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Kopirajte Tor poročilo v odložišče"> <!ENTITY torsettings.bridgeHelpTitle "Pomoč premostitveno vozlišče"> <!ENTITY torsettings.bridgeHelp1 "Če se ne morete povezati v omrežje Tor, je mogoče, da vaš ponudnik internetnih storitev (ISP) ali druga agencija blokira Tor.  Pogosto lahko to obidete s pomočjo Tor premostitvijo, na nenašteta vozlišča, za težje blokiranje."> -<!ENTITY torsettings.bridgeHelp1B "Uporabite lahko že prednastavljen, ponujen niz premostitvenih naslovov ali pa lahko pridobite običajen set naslovov z uporabo enega od treh načinov:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Preko Web"> <!ENTITY torsettings.bridgeHelp2 "Uporabite web brskalnik za obisk https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Preko poštnega avtomatskega odzivnika"> diff --git a/src/chrome/locale/sl-SI/torlauncher.properties b/src/chrome/locale/sl-SI/torlauncher.properties index e083df9..758b79b 100644 --- a/src/chrome/locale/sl-SI/torlauncher.properties +++ b/src/chrome/locale/sl-SI/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor zaganjalnik @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S neuspešno (%2$S). torlauncher.unable_to_start_tor=Nemogoče zagnati Tor,\n\n%S torlauncher.tor_missing=Tor zagonska manjka. -torlauncher.torrc_missing=Torrc datoteka manjka. -torlauncher.datadir_missing=Tor imenik podatkov ne obstoja. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Neuspelo pridobivanje hash gesla. torlauncher.failed_to_get_settings=Ni moč pridobiti nastavitve Tor,\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Izhod torlauncher.done=Narejeno torlauncher.forAssistance=Za podporo, stik %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Kopiranje končano. % S Tor poročila so pripravljena za lepljenje v urejevalnik besedil ali e-poštno sporočilo. diff --git a/src/chrome/locale/sl/network-settings.dtd b/src/chrome/locale/sl/network-settings.dtd index 73ef092..b7c53c2 100644 --- a/src/chrome/locale/sl/network-settings.dtd +++ b/src/chrome/locale/sl/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/sl/torlauncher.properties b/src/chrome/locale/sl/torlauncher.properties index c1f7981..263016d 100644 --- a/src/chrome/locale/sl/torlauncher.properties +++ b/src/chrome/locale/sl/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor zaganjalnik @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Tor se ne zažene.\n\n%S torlauncher.tor_missing=Manjka Torjeva izvršljiva datoteka. -torlauncher.torrc_missing=Manjka datoteka torrc. -torlauncher.datadir_missing=Torjev podatkovni imenik ne obstaja. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Spodletelo pridobivanje zgoščene vrednosti gesla. torlauncher.failed_to_get_settings=Ni uspela pridobitev Tor nastavitev.\n\n%S @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=Morate določiti vsaj en ali več mostov. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(priporočeno) torlauncher.connect=Poveži torlauncher.restart_tor=Restart Tor @@ -36,6 +36,7 @@ torlauncher.quit_win=Izhod torlauncher.done=Končano torlauncher.forAssistance=Za pomoč, vzpostavite stik z %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/sn/network-settings.dtd b/src/chrome/locale/sn/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/sn/network-settings.dtd +++ b/src/chrome/locale/sn/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/sn/torlauncher.properties b/src/chrome/locale/sn/torlauncher.properties index 6e5b1e9..eb1b275 100644 --- a/src/chrome/locale/sn/torlauncher.properties +++ b/src/chrome/locale/sn/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Buda torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/so/network-settings.dtd b/src/chrome/locale/so/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/so/network-settings.dtd +++ b/src/chrome/locale/so/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/so/torlauncher.properties b/src/chrome/locale/so/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/so/torlauncher.properties +++ b/src/chrome/locale/so/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/son/network-settings.dtd b/src/chrome/locale/son/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/son/network-settings.dtd +++ b/src/chrome/locale/son/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/son/torlauncher.properties b/src/chrome/locale/son/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/son/torlauncher.properties +++ b/src/chrome/locale/son/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/sq/network-settings.dtd b/src/chrome/locale/sq/network-settings.dtd index 228d865..ffa38c1 100644 --- a/src/chrome/locale/sq/network-settings.dtd +++ b/src/chrome/locale/sq/network-settings.dtd @@ -1,8 +1,8 @@ <!ENTITY torsettings.dialog.title "Konfigurimi i Rrjetit të Tor">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Gjuha e Tor Browser"> +<!ENTITY torlauncher.localePicker.prompt "Ju lutemi zgjidhni një gjuhë.">  @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "Cila nga këto e përshkruan më mirë situatën tuaj të tanishme?"> <!ENTITY torSettings.configurePrompt1 "Lidhja e Internetit të këtij kompjuteri është e censuruar ose me proxy"> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Më duhet të konfigurojë urën ose proxy-n lokal, përpara se të lidhem tek rrjeti Tor."> <!ENTITY torSettings.configure "Konfiguroni"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Do pëlqeja të bëja një lidhje të drejtpërdrejtë tek rrjeti i Tor."> <!ENTITY torSettings.connectPrompt3 "Kjo do të funksionojë në shumë situata."> <!ENTITY torSettings.connect "Lidhuni"> <!ENTITY torSettings.proxyPageTitle "Konfigurimi i Proxy-t Lokal "> <!ENTITY torSettings.proxyQuestion "A i nevojitet këtij kompjuteri që të përdorë një proxy lokal, për t'u qasur në Internet?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "Në shumë raste, një proxy lokal nuk nevojitet, por ai mund të kërkohet kur lidhesh përmes një rrejti kompanie, shkolle, ose universiteti."> +<!ENTITY torSettings.proxyExplanation2 "Nëse s'jeni i sigurt sesi t'i përgjigjeni kësaj pyetje, shikoni tek konfigurimi i Internetit në një tjetër shfletues, ose kontrolloni konfigurimin e rrjetit, për të parë nëse nevojitet një proxy lokal."> <!ENTITY torSettings.enterProxy "Futni konfigurimin e proxy-t."> <!ENTITY torSettings.bridgePageTitle "Konfigurimi i Urave të Tor"> <!ENTITY torSettings.bridgeQuestion "A i pengon ose censuron lidhjet për tek Rrjeti Tor, Ofruesi juaj i Shërbimit Internet (ISP)?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Nëse s'jeni i sigurt sesi t'i përgjigjeni kësaj pyetje, zgjidhni "Jo" (nëse e keni të pamundur që të lidheni me rrjetin Tor pa pasur një urë, mund ta shtoni një më vonë)."> +<!ENTITY torSettings.bridgeExplanation2 "Nëse përzgjidhni "Po", do t'ju kërkohet të konfiguroni Tor bridges, të cilat janë rele të palistuara, që e bëjnë më të vështirë pengimin e lidhjeve për tek Rrjeti Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Ju mund të përdorni grupin e dhënë të urave, ose mund të përftoni dhe futni një sasi të personalizuar urash.">  <!ENTITY torsettings.startingTor "Duke pritur që Tor të nisë..."> <!ENTITY torsettings.restartTor "Riniseni Tor-in"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Rikonfiguroni"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Ju keni konfiguruar urat Tor ose keni futur konfigurimin e proxy-t.  Për të bërë një lidhje të drejtpërdrejtë tek rrjeti Tor, ky konfigurim duhet të hiqet."> +<!ENTITY torsettings.discardSettings.proceed "Hiqeni Konfigurimin dhe Lidhuni"> <!ENTITY torsettings.optional "Me zgjedhje"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Portat e Lejuara:"> <!ENTITY torsettings.useBridges.checkbox "Ofruesi im i Shërbimit të Internetit (ISP) pengon lidhjet drejt rrjetit Tor"> <!ENTITY torsettings.useBridges.default "Lidhuni me urat e ofruara"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Çdo lloj ure përdor një mënyrë të ndryshme për të shmangur censurën.  Nëse njëra urë nuk punon, provoni sërish duke përdorur një tjetër."> <!ENTITY torsettings.useBridges.type "Lloji i Transportit:"> <!ENTITY torsettings.useBridges.custom "Futini urat e përshtatura"> <!ENTITY torsettings.useBridges.label "Futni një ose më shumë rele urë (një për rresht)"> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Kopjojeni Regjistrin e Tor në Kujtesën e fragmenteve"> <!ENTITY torsettings.bridgeHelpTitle "Ndihma mbi Relenë e Urë"> <!ENTITY torsettings.bridgeHelp1 "Nëse s'mundeni të lidheni me rrjetin Tor, mund të jetë sepse Ofruesi juaj i Shërbimit të Internetit (ISP), ose ndonjë agjenci tjetër po pengojnë Tor.  Shpesh, ju mund ta shmangni këtë problem, duke përdorur urat e Tor, të cilat janë rele të palistuara, që janë shumë më të vështira për t'u penguar."> -<!ENTITY torsettings.bridgeHelp1B "Ju mund të përdorni grupin e ofruar e të parakonfiguruar të adresave ura, ose mund të përftoni një grup adresash të përshtatura, duke përdorur një nga këto tre metoda:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Përmes Web-it"> <!ENTITY torsettings.bridgeHelp2 "Përdorni një shfletues web-i që të vizitoni https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Përmes Vetëpërgjigjes se E-postës"> diff --git a/src/chrome/locale/sq/progress.dtd b/src/chrome/locale/sq/progress.dtd index 167ecd2..f680a4c 100644 --- a/src/chrome/locale/sq/progress.dtd +++ b/src/chrome/locale/sq/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Gjendja e Tor"> <!ENTITY torprogress.openSettings "Hapeni Konfigurimin"> <!ENTITY torprogress.heading "Duke u lidhur me rrjetin Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Ju lutemi prisni derisa të vendosim një lidhje me rrjetin e Tor.  Kjo mund të kërkojë disa minuta."> diff --git a/src/chrome/locale/sq/torlauncher.properties b/src/chrome/locale/sq/torlauncher.properties index b32ee99..e22bff7 100644 --- a/src/chrome/locale/sq/torlauncher.properties +++ b/src/chrome/locale/sq/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Lëshuesi Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S dështoi (%2$S). torlauncher.unable_to_start_tor=E pamundur që të niset Tor.\n\n%S torlauncher.tor_missing=Skedari i ekzekutueshëm Tor, mungon. -torlauncher.torrc_missing=Skedari torrc mungon. -torlauncher.datadir_missing=Direktoria e të dhënave të Tor nuk ekziston. +torlauncher.torrc_missing=Skedari torrc mungon dhe s'mund të krijohet. +torlauncher.datadir_missing=Të dhënat e direktorisë Tor data nuk ekzistojnë dhe s'mund të krijohen. torlauncher.password_hash_missing=Dështuam të përftonim fjalëkalimin me thurje. torlauncher.failed_to_get_settings=Dështuam të gjenim konfigurimin e Tor.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Dilni torlauncher.done=Kryer torlauncher.forAssistance=Për ndihmë, kontaktoni %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Kopjimi u krye. Mesazhet e regjistrit të Tor për %S, janë gati për t'u ngjitur në një redaktues teksti, ose në një mesazh e-poste. diff --git a/src/chrome/locale/sr/network-settings.dtd b/src/chrome/locale/sr/network-settings.dtd index f4f9098..6b2cd2c 100644 --- a/src/chrome/locale/sr/network-settings.dtd +++ b/src/chrome/locale/sr/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Кроз Мрежу"> <!ENTITY torsettings.bridgeHelp2 "Користите веб прегледач да посетите https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/sr/torlauncher.properties b/src/chrome/locale/sr/torlauncher.properties index d714f9a..739d069 100644 --- a/src/chrome/locale/sr/torlauncher.properties +++ b/src/chrome/locale/sr/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Тоr Покретач @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Тоr се не може покренути\n\n%Ѕ torlauncher.tor_missing=Tor извршни фајл недостаје -torlauncher.torrc_missing=torrc фајл недостаје -torlauncher.datadir_missing=Директоријум за Тоr податке не постоји +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Узимање хеширане лозинке није успело torlauncher.failed_to_get_settings=Немогућност повратка Tor подешавања\n\n%Ѕ @@ -36,6 +36,7 @@ torlauncher.quit_win=Излаз torlauncher.done=Gotovo torlauncher.forAssistance=За помоћ контактирајте %Ѕ +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Копирање завршено. %S Top лог поруке су спремне да буду налепљене у уређивач текста или у поруку у електронској пошти. diff --git a/src/chrome/locale/sr(a)latin/network-settings.dtd b/src/chrome/locale/sr(a)latin/network-settings.dtd index dcb6891..67da423 100644 --- a/src/chrome/locale/sr(a)latin/network-settings.dtd +++ b/src/chrome/locale/sr(a)latin/network-settings.dtd @@ -60,12 +60,12 @@ <!ENTITY torsettings.useBridges.type "Transport type:"> <!ENTITY torsettings.useBridges.custom "Enter custom bridges"> <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.placeholder "tip adrese: port "> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/sr(a)latin/torlauncher.properties b/src/chrome/locale/sr(a)latin/torlauncher.properties index a5e87ea..7e5a4b3 100644 --- a/src/chrome/locale/sr(a)latin/torlauncher.properties +++ b/src/chrome/locale/sr(a)latin/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(preporučeno) torlauncher.connect=Povezivanje torlauncher.restart_tor=Restartovanje Tor-a @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/st/network-settings.dtd b/src/chrome/locale/st/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/st/network-settings.dtd +++ b/src/chrome/locale/st/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/st/torlauncher.properties b/src/chrome/locale/st/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/st/torlauncher.properties +++ b/src/chrome/locale/st/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/su/network-settings.dtd b/src/chrome/locale/su/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/su/network-settings.dtd +++ b/src/chrome/locale/su/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/su/torlauncher.properties b/src/chrome/locale/su/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/su/torlauncher.properties +++ b/src/chrome/locale/su/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv/network-settings.dtd index 19fcb74..5c398b3 100644 --- a/src/chrome/locale/sv/network-settings.dtd +++ b/src/chrome/locale/sv/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "Vilket av följande beskriver bäst din situation?"> <!ENTITY torSettings.configurePrompt1 "Den här datorns Internetanslutning är censorerad eller går genom en proxy."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Jag behöver konfigurera en brygga eller inställningar för lokal proxy innan jag ansluter till Tor-nätverket."> <!ENTITY torSettings.configure "Konfigurera"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Jag vill göra en direktanslutning till Tor-nätverket."> <!ENTITY torSettings.connectPrompt3 "Detta fungerar i de flesta situationer."> <!ENTITY torSettings.connect "Anslut"> <!ENTITY torSettings.proxyPageTitle "Lokal proxy-konfiguration"> <!ENTITY torSettings.proxyQuestion "Behöver den här datorn använda en lokal proxy för att ansluta till Internet?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "I de flesta fallen behövs ingen lokal proxy, men det kan behövas om du ansluter via ett nätverk på ett företag, en skola eller ett universitet."> +<!ENTITY torSettings.proxyExplanation2 "Om du är osäker på hur du ska svara på den här frågan, titta på internetinställningarna i en annan webbläsare eller kontrollera ditt systems nätverksinställningar för att se om en lokal proxy behövs."> <!ENTITY torSettings.enterProxy "Ange proxyinställningarna."> <!ENTITY torSettings.bridgePageTitle "Konfiguration av Tor-bryggor"> <!ENTITY torSettings.bridgeQuestion "Blockerar eller censurerar din internetleverantör anslutningar till Tor-nätverket?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Om du är osäker på hur du ska besvara den här frågan, välj Nej (om du inte kan ansluta till Tor-nätverket utan en brygga så kan du lägga till en senare)."> +<!ENTITY torSettings.bridgeExplanation2 "Om du väljer Ja kommer du att tillfrågas om att konfigurera Tor-bryggor, vilka är olistade reläer som gör det svårare att blockera anslutningarna till Tor-nätverket."> <!ENTITY torSettings.bridgeSettingsPrompt "Du kan använda de förkonfigurerade bryggorna, eller skaffa och ange bryggor själv.">  <!ENTITY torsettings.startingTor "Väntar på att Tor ska starta..."> <!ENTITY torsettings.restartTor "Starta om Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Omkonfigurera"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Du har konfigurerat Tor-bryggor eller så har du angett lokala proxyinställningar.  För att göra en direktanslutning till Tor-nätverket måste de här inställningarna tas bort."> +<!ENTITY torsettings.discardSettings.proceed "Ta bort inställningar och anslut"> <!ENTITY torsettings.optional "Valfri"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Tillåtna portar:"> <!ENTITY torsettings.useBridges.checkbox "Min internetleverantör blockerar anslutningar till Tor-nätverket"> <!ENTITY torsettings.useBridges.default "Anslut med tillgängliga bryggor"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Varje typ av brygga använder en egen metod för att undvika censur.  Om en brygga inte fungerar, försök igen genom att använda en annan."> <!ENTITY torsettings.useBridges.type "Transport-typ:"> <!ENTITY torsettings.useBridges.custom "Fyll i anpassade bryggor"> <!ENTITY torsettings.useBridges.label "Ange en eller flera Tor-bryggor (en per rad)."> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Kopiera Tor-loggen till urklippet"> <!ENTITY torsettings.bridgeHelpTitle "Hjälp om bryggor"> <!ENTITY torsettings.bridgeHelp1 "Om du inte kan ansluta till Tor-nätverket är det möjligt att din internetleverantör eller annan myndighet blockerar Tor.  Ofta kan du kringgå detta problem genom att använda Tor-bryggor, vilka är olistade reläer som är mer svårblockerade."> -<!ENTITY torsettings.bridgeHelp1B "Du kan använda de förkonfigurerade bryggadresserna, eller skaffa bryggadresser själv på något av följande sätt:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Via nätet"> <!ENTITY torsettings.bridgeHelp2 "Använd en webbläsare för att besöka https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Via e-post autosvar"> diff --git a/src/chrome/locale/sv/progress.dtd b/src/chrome/locale/sv/progress.dtd index 7ac45ca..1df097b 100644 --- a/src/chrome/locale/sv/progress.dtd +++ b/src/chrome/locale/sv/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor-status"> <!ENTITY torprogress.openSettings "Öppna inställningar"> <!ENTITY torprogress.heading "Ansluter till Tor-nätverket"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Vänligen vänta medan vi sätter upp en anslutning till Tor-nätverket.  Detta kan ta flera minuter."> diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties index 095d0b7..a49b83f 100644 --- a/src/chrome/locale/sv/torlauncher.properties +++ b/src/chrome/locale/sv/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S misslyckades (%2$S). torlauncher.unable_to_start_tor=Kan inte starta Tor.\n\n%S torlauncher.tor_missing=Tors körbara programfil saknas. -torlauncher.torrc_missing=Filen torrc saknas. -torlauncher.datadir_missing=Tors data-katalog saknas. +torlauncher.torrc_missing=Torrc-fil saknas och kunde inte skapas. +torlauncher.datadir_missing=Tor datakatalog finns inte och kunde inte skapas. torlauncher.password_hash_missing=Misslyckades med att hämta hashat lösenord. torlauncher.failed_to_get_settings=Kunde inte läsa in inställningar för Tor.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Stäng torlauncher.done=Klar torlauncher.forAssistance=För assistans, kontakta %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Kopieringen är färdig. %S meddelanden från Tor-loggen som du kan klistra in i en textredigerare eller ett e-postmeddelande. diff --git a/src/chrome/locale/sw/network-settings.dtd b/src/chrome/locale/sw/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/sw/network-settings.dtd +++ b/src/chrome/locale/sw/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/sw/torlauncher.properties b/src/chrome/locale/sw/torlauncher.properties index 02be756..75f4a6c 100644 --- a/src/chrome/locale/sw/torlauncher.properties +++ b/src/chrome/locale/sw/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(imependekezwa) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/szl/network-settings.dtd b/src/chrome/locale/szl/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/szl/network-settings.dtd +++ b/src/chrome/locale/szl/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/szl/torlauncher.properties b/src/chrome/locale/szl/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/szl/torlauncher.properties +++ b/src/chrome/locale/szl/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/ta/network-settings.dtd b/src/chrome/locale/ta/network-settings.dtd index 7ffc083..02e8fad 100644 --- a/src/chrome/locale/ta/network-settings.dtd +++ b/src/chrome/locale/ta/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog " Tor பதிவுகளை கிளிப்போர்டுக்கு நகலெடு"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/ta/torlauncher.properties b/src/chrome/locale/ta/torlauncher.properties index 079d758..228a61e 100644 --- a/src/chrome/locale/ta/torlauncher.properties +++ b/src/chrome/locale/ta/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor துவக்கி @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Tor தொடங்க முடியவில்லை.\n\n%S torlauncher.tor_missing=Tor இயங்கக்கூடியது காணவில்லை. -torlauncher.torrc_missing=Torrc கோப்பை காணவில்லை. -torlauncher.datadir_missing=Tor தரவு அடைவு இல்லை. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Hashed கடவுச்சொல்லை பெற முடியவில்லை. torlauncher.failed_to_get_settings=Tor அமைப்புகளை மீட்டெடுக்க முடியவில்லை.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=வெளியேறு torlauncher.done=முடிந்தது torlauncher.forAssistance=உதவிக்கு, தொடர்பு கொள்ளுங்கள் %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/te-IN/network-settings.dtd b/src/chrome/locale/te-IN/network-settings.dtd index c19ed8a..bb258de 100644 --- a/src/chrome/locale/te-IN/network-settings.dtd +++ b/src/chrome/locale/te-IN/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/te-IN/torlauncher.properties b/src/chrome/locale/te-IN/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/te-IN/torlauncher.properties +++ b/src/chrome/locale/te-IN/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/te/network-settings.dtd b/src/chrome/locale/te/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/te/network-settings.dtd +++ b/src/chrome/locale/te/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/te/torlauncher.properties b/src/chrome/locale/te/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/te/torlauncher.properties +++ b/src/chrome/locale/te/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/tg/network-settings.dtd b/src/chrome/locale/tg/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/tg/network-settings.dtd +++ b/src/chrome/locale/tg/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/tg/torlauncher.properties b/src/chrome/locale/tg/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/tg/torlauncher.properties +++ b/src/chrome/locale/tg/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/th/network-settings.dtd b/src/chrome/locale/th/network-settings.dtd index c97495e..d4a20d8 100644 --- a/src/chrome/locale/th/network-settings.dtd +++ b/src/chrome/locale/th/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "คัดลอกปูม Tor ไปที่คลิปบอร์ด"> <!ENTITY torsettings.bridgeHelpTitle "การช่วยเหลือรีเลย์สะพาน"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/th/torlauncher.properties b/src/chrome/locale/th/torlauncher.properties index b451784..883b4a7 100644 --- a/src/chrome/locale/th/torlauncher.properties +++ b/src/chrome/locale/th/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=ตัวเปิด Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=ไม่สามารถเริ่มการทำงานของ Tor ได้\n\n%S torlauncher.tor_missing=แฟ้มโปรแกรม Tor ขาดหายไป -torlauncher.torrc_missing=แฟ้ม torrc หายไป -torlauncher.datadir_missing=ไม่มีไดเรกทอรีข้อมูลของ Tor +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=ล้มเหลวในการเรียกรหัสผ่านที่ถูกแฮช torlauncher.failed_to_get_settings=ไม่สามารถเรียกการตั้งค่า Tor ได้\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=ออก torlauncher.done=สำเร็จ torlauncher.forAssistance=ต้องการคำแนะนำ ติดต่อ %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/ti/network-settings.dtd b/src/chrome/locale/ti/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/ti/network-settings.dtd +++ b/src/chrome/locale/ti/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/ti/torlauncher.properties b/src/chrome/locale/ti/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/ti/torlauncher.properties +++ b/src/chrome/locale/ti/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/tk/network-settings.dtd b/src/chrome/locale/tk/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/tk/network-settings.dtd +++ b/src/chrome/locale/tk/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/tk/torlauncher.properties b/src/chrome/locale/tk/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/tk/torlauncher.properties +++ b/src/chrome/locale/tk/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd index 4856f80..4414be7 100644 --- a/src/chrome/locale/tr/network-settings.dtd +++ b/src/chrome/locale/tr/network-settings.dtd @@ -43,7 +43,7 @@ <!ENTITY torsettings.optional "İsteğe bağlı"> <!ENTITY torsettings.useProxy.checkbox "Bu bilgisayarın İnternet'e erişmesi için bir yerel vekil sunucu kullanması gerekiyor"> -<!ENTITY torsettings.useProxy.type "Vekil Sunucu Tipi:"> +<!ENTITY torsettings.useProxy.type "Vekil Sunucu Türü:"> <!ENTITY torsettings.useProxy.address "Adres:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresi ya da sunucu adı"> <!ENTITY torsettings.useProxy.port "Bağlantı noktası:"> @@ -56,8 +56,8 @@ <!ENTITY torsettings.firewall.allowedPorts "İzin Verilen Bağlantı Noktaları:"> <!ENTITY torsettings.useBridges.checkbox "İnternet Servis Sağlayıcım (ISS) Tor ağına olan bağlantıları engelliyor"> <!ENTITY torsettings.useBridges.default "Sağlanan köprüler ile bağlan"> -<!ENTITY torsettings.useBridges.note "Her bir köprü tipinde engellemeyi aşmak için farklı yöntemler kullanılır.  Bir köprü çalışmazsa farklı bir tanesini deneyin."> -<!ENTITY torsettings.useBridges.type "Aktarım tipi:"> +<!ENTITY torsettings.useBridges.note "Her bir köprü türünde engellemeyi aşmak için farklı yöntemler kullanılır.  Bir köprü çalışmazsa farklı bir tanesini deneyin."> +<!ENTITY torsettings.useBridges.type "Aktarım tür:"> <!ENTITY torsettings.useBridges.custom "Özel köprüler yazın"> <!ENTITY torsettings.useBridges.label "Bir ya da birkaç köprü aktarıcısı yazın (her satıra bir tane)."> <!ENTITY torsettings.useBridges.placeholder "adres:bağlantı noktası şeklinde yazın"> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Tor Günlüğünü Panoya Kopyala"> <!ENTITY torsettings.bridgeHelpTitle "Köprü Aktarıcı Yardımı"> <!ENTITY torsettings.bridgeHelp1 "Tor ağına bağlanamıyorsanız, kullandığınız İnternet Servis Sağlayıcısı (ISS) ya da başka bir kurum Tor 'u engelliyor olabilir. Bu sorunu çoğunlukla, engellenmesi daha zor olan listelenmeyen aktarıcılar, Tor Köprülerini kullanarak çözebilirsiniz."> -<!ENTITY torsettings.bridgeHelp1B "Önceden ayarlanmış ve sunulmuş köprü adreslerini kullanabilir ya da şu üç yöntemden birini kullanarak özel adresler edinebilirsiniz:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Web yoluyla"> <!ENTITY torsettings.bridgeHelp2 "Bir web tarayıcısı kullanarak https://bridges.torproject.org adresini ziyaret edin"> <!ENTITY torsettings.bridgeHelp3Heading "Otomatik e-posta yanıtı yoluyla"> diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties index cbf467d..d607ef2 100644 --- a/src/chrome/locale/tr/torlauncher.properties +++ b/src/chrome/locale/tr/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Başlatıcı @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S başarısız oldu (%2$S). torlauncher.unable_to_start_tor=Tor başlatılamadı.\n\n%S torlauncher.tor_missing=Çalıştırılabilecek Tor dosyası bulunamadı. -torlauncher.torrc_missing=torrc dosyası bulunamadı. -torlauncher.datadir_missing=Tor veri klasörü bulunamadı. +torlauncher.torrc_missing="Torcc" dosyası eksik ve oluşturulamadı. +torlauncher.datadir_missing=Tor veri dizini bulunamadı ve oluşturulamadı. torlauncher.password_hash_missing=Karılmış parola alınamadı. torlauncher.failed_to_get_settings=Tor ayarları alınamadı.\n\n%S @@ -22,10 +22,10 @@ torlauncher.failed_to_save_settings=Tor ayarları kaydedilemedi.\n\n%S torlauncher.ensure_tor_is_running=Lütfen Tor'un çalıştığından emin olun. torlauncher.error_proxy_addr_missing=İnternet'e bir vekil sunucu üzerinden bağlanmak için bir IP adresi ya da sunucu adı ile bağlantı noktası numarasının yazılması gereklidir. -torlauncher.error_proxy_type_missing=Vekil sunucu tipini seçmelisiniz. +torlauncher.error_proxy_type_missing=Vekil sunucu türünü seçmelisiniz. torlauncher.error_bridges_missing=Bir ya da birkaç köprü belirtmelisiniz. -torlauncher.error_default_bridges_type_missing=Sağlanan köprüler için bir aktarım tipi seçmelisiniz. -torlauncher.error_bridge_bad_default_type=Sağlanan köprüler %S aktarım tipi için kullanılamıyor. Lütfen ayarlarınızı değiştirin. +torlauncher.error_default_bridges_type_missing=Sağlanan köprüler için bir aktarım türü seçmelisiniz. +torlauncher.error_bridge_bad_default_type=Sağlanan köprüler %S aktarım türü için kullanılamıyor. Lütfen ayarlarınızı değiştirin. torlauncher.recommended_bridge=(önerilir) @@ -36,6 +36,7 @@ torlauncher.quit_win=Çıkış torlauncher.done=Tamamlandı torlauncher.forAssistance=Yardım için %S ile görüşün +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Kopyalama tamamlandı. %S Tor günlük iletisi bir metin düzenleyici ya da e-posta iletisine kopyalanmaya hazır. diff --git a/src/chrome/locale/uk/network-settings.dtd b/src/chrome/locale/uk/network-settings.dtd index ed17b65..3848423 100644 --- a/src/chrome/locale/uk/network-settings.dtd +++ b/src/chrome/locale/uk/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "Яке з наступних тверджень найкраще описує Вашу ситуацію?"> <!ENTITY torSettings.configurePrompt1 "Мережеве з'єднання цього комп'ютера цензурується або йде через проксі-сервер."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Мені потрібно налаштувати міст або локальний проксі перед під'єданням до мережі Tor."> <!ENTITY torSettings.configure "Налаштування"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Я бажаю підключитися до мережі Tor напряму."> <!ENTITY torSettings.connectPrompt3 "Це має працювати у більшості ситуацій."> <!ENTITY torSettings.connect "З'єднатися"> <!ENTITY torSettings.proxyPageTitle "Локальна конфігурація проксі-сервера"> <!ENTITY torSettings.proxyQuestion "Чи потрібно цьому комп'ютеру використовувати локальний проксі для доступу в Інтернет?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "У більшості випадків локальний проксі не потрібний, але він може вимагатися при підключенні через мережу компанії, школи чи університету."> +<!ENTITY torSettings.proxyExplanation2 "Якщо Ви не впевнені, як відповісти на це запитання, подивіться налаштування Інтернету в іншому браузері або мережні налаштування Вашої системи, щоб побачити чи потрібне використання проксі."> <!ENTITY torSettings.enterProxy "Задати параметри проксі"> <!ENTITY torSettings.bridgePageTitle "Конфігурації Tor-мостів"> <!ENTITY torSettings.bridgeQuestion "Ваш Інтернет-провайдер (ISP) блокує чи яким-небудь чином цензурує підключення до Tor мережі?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Якщо Ви не впевнені, як відповісти на це запитання, виберіть Ні. (Якщо Ви не можете під'єднатися до мережі Tor без моста, його можна додати пізніше)."> +<!ENTITY torSettings.bridgeExplanation2 "Якщо Ви виберете Так, Вам буде запропоновано налаштувати мости Tor, які є приватними трансляторами, що ускладнюють блокування з'єднань з мережею Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Ви можете використати визначений перелік мостів або можете отримати і ввести набір мостів вручну.">  <!ENTITY torsettings.startingTor "Підключення до Tor..."> <!ENTITY torsettings.restartTor "Перезапустити Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Переналаштувати"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Ви налаштували мости Tor або ввели налаштування локального проксі.  Для прямого з'єднання з мережею Tor ці налаштування треба вилучити."> +<!ENTITY torsettings.discardSettings.proceed "Вилучити налаштування і під'єднатися"> <!ENTITY torsettings.optional "Додатково"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Дозволенні порти:"> <!ENTITY torsettings.useBridges.checkbox "Мій провайдер блокує доступ до мережі Tor"> <!ENTITY torsettings.useBridges.default "Підключитися з визначеними мостами"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Кожен тип мостів викорисовує інший метод уникнення цензури.  Якщо один міст не працює, спробуйте ще раз через інший."> <!ENTITY torsettings.useBridges.type "Тип транспорту:"> <!ENTITY torsettings.useBridges.custom "Ввести мости вручну"> <!ENTITY torsettings.useBridges.label "Введіть один або кілька ретрансляторів типу міст (по одному в рядок)."> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Скопіювати журнал Tor до буферу обміну"> <!ENTITY torsettings.bridgeHelpTitle "Допомога по ретрансляторам типу міст"> <!ENTITY torsettings.bridgeHelp1 "Якщо Ви не можете підключитися до мережі Tor, може бути, що Ваш інтернет-провайдер (ISP) або інша організація блокує Tor.  Часто можна обійти цю проблему за допомогою Tor мостів, що є приватними трансляторами, які важче заблокувати."> -<!ENTITY torsettings.bridgeHelp1B "Ви можете використати визначений перелік мостів або отримати і ввести набір мостів вручну, використовуючи один з трьох перерахованих методів:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Через Веб"> <!ENTITY torsettings.bridgeHelp2 "Відвідайте сторінку https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Через автовідповідач електронної пошти"> diff --git a/src/chrome/locale/uk/progress.dtd b/src/chrome/locale/uk/progress.dtd index 192f5d3..4e5e458 100644 --- a/src/chrome/locale/uk/progress.dtd +++ b/src/chrome/locale/uk/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Статус Tor"> <!ENTITY torprogress.openSettings "Відкрити Налаштування"> <!ENTITY torprogress.heading "Підключення до мережі Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Будь ласка, зачекайте, поки ми підключаємося до мережі Tor.  Це може зайняти кілька хвилин."> diff --git a/src/chrome/locale/uk/torlauncher.properties b/src/chrome/locale/uk/torlauncher.properties index 8287a1f..597100a 100644 --- a/src/chrome/locale/uk/torlauncher.properties +++ b/src/chrome/locale/uk/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Завантажувач Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S невдало (%2$S). torlauncher.unable_to_start_tor=Неможливо запустити Tor.\n\n%S torlauncher.tor_missing=Виконуваний файл Tor відсутній. -torlauncher.torrc_missing=Файл torrc відсутній. -torlauncher.datadir_missing=Каталог даних Tor не існує. +torlauncher.torrc_missing=Файл torrc відсутній та не може бути створена. +torlauncher.datadir_missing=Директорія для даних Tor не існує і не може бути створена. torlauncher.password_hash_missing=Не вдалося отримати хеширований пароль. torlauncher.failed_to_get_settings=Не вдалося отримати налаштування Tor.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Вихід torlauncher.done=Готово torlauncher.forAssistance=Для допомоги зв'яжіться з %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Копіювання завершено. %S повідомлень журналу tor готові до вставки у текстовий редактор або повідомлення електронної пошти. diff --git a/src/chrome/locale/ur-PK/network-settings.dtd b/src/chrome/locale/ur-PK/network-settings.dtd index f461264..67a1700 100644 --- a/src/chrome/locale/ur-PK/network-settings.dtd +++ b/src/chrome/locale/ur-PK/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/ur-PK/torlauncher.properties b/src/chrome/locale/ur-PK/torlauncher.properties index f5a81fc..e937136 100644 --- a/src/chrome/locale/ur-PK/torlauncher.properties +++ b/src/chrome/locale/ur-PK/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/ur/network-settings.dtd b/src/chrome/locale/ur/network-settings.dtd index a856870..174f353 100644 --- a/src/chrome/locale/ur/network-settings.dtd +++ b/src/chrome/locale/ur/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/ur/torlauncher.properties b/src/chrome/locale/ur/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/ur/torlauncher.properties +++ b/src/chrome/locale/ur/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/uz/network-settings.dtd b/src/chrome/locale/uz/network-settings.dtd index f8795c1..c3dc757 100644 --- a/src/chrome/locale/uz/network-settings.dtd +++ b/src/chrome/locale/uz/network-settings.dtd @@ -17,7 +17,7 @@ <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.connect "Ulanish"> <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/uz/torlauncher.properties b/src/chrome/locale/uz/torlauncher.properties index 9ead70b..08fbe09 100644 --- a/src/chrome/locale/uz/torlauncher.properties +++ b/src/chrome/locale/uz/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=torrc fayli mavjud emas. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Chiqish torlauncher.done=Bajarildi torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/ve/network-settings.dtd b/src/chrome/locale/ve/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/ve/network-settings.dtd +++ b/src/chrome/locale/ve/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/ve/torlauncher.properties b/src/chrome/locale/ve/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/ve/torlauncher.properties +++ b/src/chrome/locale/ve/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd index 7556d04..914f8f6 100644 --- a/src/chrome/locale/vi/network-settings.dtd +++ b/src/chrome/locale/vi/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "Nếu như bạn không thể kết nối đến mạng Tor, có thể là nhà cung cấp dịch vụ của bạn (ISP) hoặc cơ quan khác đã chặn kết nối đến Tor. Thông thường, bạn có thể giải quyết vấn này bằng cách sử dụng Tor Bridges, các Tor Bridges này sẽ không được liệt kê để làm cho việc ngăn chặn khó khăn hơn."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Đi qua Web"> <!ENTITY torsettings.bridgeHelp2 "Sử dụng trình duyệt web truy cập vào https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/vi/torlauncher.properties b/src/chrome/locale/vi/torlauncher.properties index e5d7acd..c0fcbee 100644 --- a/src/chrome/locale/vi/torlauncher.properties +++ b/src/chrome/locale/vi/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=Tập tin thực thi của Tor bị thiếu. -torlauncher.torrc_missing=Thiếu tập tin torrc. -torlauncher.datadir_missing=Thư mục data trong Tor không tồn tại. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Không thể nhận được cài đặt Tor. @@ -36,6 +36,7 @@ torlauncher.quit_win=Thoát torlauncher.done=Hoàn thành torlauncher.forAssistance=Để được trợ giúp, liên hệ %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/wa/network-settings.dtd b/src/chrome/locale/wa/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/wa/network-settings.dtd +++ b/src/chrome/locale/wa/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/wa/torlauncher.properties b/src/chrome/locale/wa/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/wa/torlauncher.properties +++ b/src/chrome/locale/wa/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/wo/network-settings.dtd b/src/chrome/locale/wo/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/wo/network-settings.dtd +++ b/src/chrome/locale/wo/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/wo/torlauncher.properties b/src/chrome/locale/wo/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/wo/torlauncher.properties +++ b/src/chrome/locale/wo/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd index 3adf58a..5910dc8 100644 --- a/src/chrome/locale/zh-CN/network-settings.dtd +++ b/src/chrome/locale/zh-CN/network-settings.dtd @@ -55,7 +55,7 @@ <!ENTITY torsettings.firewall.checkbox "该计算机的防火墙仅允许特定端口的互联网连接"> <!ENTITY torsettings.firewall.allowedPorts "允许的端口："> <!ENTITY torsettings.useBridges.checkbox "我的互联网服务提供商 (ISP) 封锁了 Tor 网络连接"> -<!ENTITY torsettings.useBridges.default "使用集成的网桥进行连接"> +<!ENTITY torsettings.useBridges.default "使用集成的网桥连接"> <!ENTITY torsettings.useBridges.note "每种网桥使用不同的方法以避免被封锁。如果某个网桥不工作，请换用另一种重试。"> <!ENTITY torsettings.useBridges.type "传输类型："> <!ENTITY torsettings.useBridges.custom "输入自定义网桥"> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "点击复制 Tor 日志"> <!ENTITY torsettings.bridgeHelpTitle "网桥中继帮助"> <!ENTITY torsettings.bridgeHelp1 "如果 Tor 网络无法连接，可能是因为互联网服务提供商 (ISP) 或其他机构对 Tor 进行了封锁。通常，使用 Tor 网桥可以解决这种问题。网桥指未公开的网络中继，更难于封锁。"> -<!ENTITY torsettings.bridgeHelp1B "你可以使用本软件集成的一组网桥，也可以通过以下三种方法获取网桥。"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "网页方式"> <!ENTITY torsettings.bridgeHelp2 "使用浏览器访问 https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "电子邮件自动回复方式"> diff --git a/src/chrome/locale/zh-CN/progress.dtd b/src/chrome/locale/zh-CN/progress.dtd index 838d88e..dc816a5 100644 --- a/src/chrome/locale/zh-CN/progress.dtd +++ b/src/chrome/locale/zh-CN/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor 状态"> <!ENTITY torprogress.openSettings "打开设置"> <!ENTITY torprogress.heading "正在连接 Tor 网络"> -<!ENTITY torprogress.pleaseWait "请等待我们建立到 Tor 网络的连接。这可能会需要几分钟。"> +<!ENTITY torprogress.pleaseWait "正在与 Tor 网络建立连接。这可能需要几分钟，请耐心等待。"> diff --git a/src/chrome/locale/zh-CN/torlauncher.properties b/src/chrome/locale/zh-CN/torlauncher.properties index 828415a..909fca6 100644 --- a/src/chrome/locale/zh-CN/torlauncher.properties +++ b/src/chrome/locale/zh-CN/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S 失败 (%2$S)。 torlauncher.unable_to_start_tor=无法启动 Tor。\n\n%S torlauncher.tor_missing=缺少 Tor 可执行文件。 -torlauncher.torrc_missing=缺少 torrc 文件。 -torlauncher.datadir_missing=Tor 数据目录不存在。 +torlauncher.torrc_missing=torrc 文件丢失且无法被创建。 +torlauncher.datadir_missing=Tor 数据目录不存在且无法被创建。 torlauncher.password_hash_missing=无法获取哈希密码。 torlauncher.failed_to_get_settings=无法获取 Tor 设置。\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=关闭 torlauncher.done=完成 torlauncher.forAssistance=如需帮助，请联系 %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=复制完成。%S 条 Tor 日志信息已准备好，可以将其粘贴到文本编辑器或电子邮件中。 diff --git a/src/chrome/locale/zh-HK/network-settings.dtd b/src/chrome/locale/zh-HK/network-settings.dtd index 03178e9..e28320a 100644 --- a/src/chrome/locale/zh-HK/network-settings.dtd +++ b/src/chrome/locale/zh-HK/network-settings.dtd @@ -1,75 +1,75 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "設定Tor洋蔥路由網絡">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Tor洋蔥路由瀏覽器嘅語言"> +<!ENTITY torlauncher.localePicker.prompt "請選取一種語言。">  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "連接到Tor洋蔥路由網絡前，請提供呢部電腦網絡連線嘅相關資訊。"> <!ENTITY torSettings.yes "是"> <!ENTITY torSettings.no "否"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.firstQuestion "下列邊項最符合你嘅實際情況？"> +<!ENTITY torSettings.configurePrompt1 "呢部電腦嘅網絡連線有被監控過濾或有透過代理伺服器。"> +<!ENTITY torSettings.configurePrompt2 "我必須喺連上Tor洋蔥路由 網絡之前，先設定好橋接器或本地代理伺服器。"> +<!ENTITY torSettings.configure "設定"> +<!ENTITY torSettings.connectPrompt2 "我想直接連上Tor洋蔥路由網絡"> +<!ENTITY torSettings.connectPrompt3 "呢樣可以喺大多數情況下正常運作。"> <!ENTITY torSettings.connect "連接"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyPageTitle "設定本地代理伺服器"> +<!ENTITY torSettings.proxyQuestion "呢部電腦需要使用本地代理伺服器嚟存取網絡嗎？">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.proxyExplanation1 "大部份情況係唔需要本地代理伺服器，但當使用嘅係企業或學校等嘅內部網絡時，就有可能需要。"> +<!ENTITY torSettings.proxyExplanation2 "如果唔確定，可參考其他網絡瀏覽器嘅網際網絡設定或者作業系統嘅網絡相關設定，以確定係咪需要設定本地代理伺服器。"> +<!ENTITY torSettings.enterProxy "輸入代理伺服器設定。"> +<!ENTITY torSettings.bridgePageTitle "設定Tor洋蔥路由橋接器"> +<!ENTITY torSettings.bridgeQuestion "你嘅互聯網服務提供者(ISP)會唔會阻擋或過濾連接到Tor洋蔥路由嘅網絡活動？"> +<!ENTITY torSettings.bridgeExplanation1 "唔確定，請選「否」(往後若發現唔使用橋接器無法連上Tor洋蔥路由網絡嘅話，可以返嚟加入此設定)。"> +<!ENTITY torSettings.bridgeExplanation2 "若選取「是」，則須進行Tor洋蔥路由橋接器設定。橋接器係未被列表嘅秘密Tor洋蔥路由節點，可令阻擋連接Tor洋蔥路由網絡更加困難。"> +<!ENTITY torSettings.bridgeSettingsPrompt "你可以使用提供嘅橋接器，也可輸入一組自訂嘅橋接器。">  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.startingTor "等待Tor洋蔥路由啟動…"> +<!ENTITY torsettings.restartTor "重新啟動Tor洋蔥路由"> +<!ENTITY torsettings.reconfigTor "重新設定"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "你已設定Tor洋蔥路由嘅橋接器或本地代理伺服器。  若想要直接連上Tor洋蔥路由網絡嘅話，必須要先移除呢部份嘅設定。"> +<!ENTITY torsettings.discardSettings.proceed "移除設定值並且連線"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "選用"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "密碼:"> +<!ENTITY torsettings.useProxy.checkbox "呢部電腦需要透過本地代理伺服器存取互聯網"> +<!ENTITY torsettings.useProxy.type "代理伺服器類型："> +<!ENTITY torsettings.useProxy.address "位址："> +<!ENTITY torsettings.useProxy.address.placeholder "IP位址或主機名稱"> +<!ENTITY torsettings.useProxy.port "連接埠："> +<!ENTITY torsettings.useProxy.username "用戶名："> +<!ENTITY torsettings.useProxy.password "密碼："> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useProxy.type.http "http╱https"> +<!ENTITY torsettings.firewall.checkbox "呢部電腦通過某個只容許連接至特定連線埠嘅防火牆"> +<!ENTITY torsettings.firewall.allowedPorts "容許嘅連接埠："> +<!ENTITY torsettings.useBridges.checkbox "我嘅互聯網服務提供者(ISP)會阻擋連接到Tor洋蔥路由嘅網絡活動"> +<!ENTITY torsettings.useBridges.default "使用提供嘅橋接器連線"> +<!ENTITY torsettings.useBridges.note "每種橋接器都使用唔同嘅方式去規避網絡封包過濾，  如果發現使用咗某個橋接器仍無法順利連線嘅話，可以更換另一個橋接器再行嘗試。"> +<!ENTITY torsettings.useBridges.type "傳輸類型："> +<!ENTITY torsettings.useBridges.custom "輸入自訂嘅橋接器"> +<!ENTITY torsettings.useBridges.label "輸入一個或多個橋接轉向站(每行一個)。"> +<!ENTITY torsettings.useBridges.placeholder "請輸入「位址:連接埠」"> -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.copyLog "將Tor洋蔥路由嘅日誌複製到剪貼簿"> +<!ENTITY torsettings.bridgeHelpTitle "橋接轉向站嘅說明"> +<!ENTITY torsettings.bridgeHelp1 "若無法連接到Tor洋蔥路由網絡，可能係因為你嘅互聯網服務提供者(ISP)或其他機構正在封鎖Tor洋蔥路由網絡。  通常你可以使用橋接器連上Tor洋蔥路由網絡，以解決此問題。呢類橋接器係未被羅列於清單中嘅秘密轉向站，非常難以被過濾阻擋。"> +<!ENTITY torsettings.bridgeHelp1B "你可使用提供並預先設定好嘅橋接器位址，或使用下列方法嘅任何一種以取得一組自訂嘅位址："> +<!ENTITY torsettings.bridgeHelp2Heading "透過網絡"> +<!ENTITY torsettings.bridgeHelp2 "使用瀏覽器到訪 https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "透過電郵自動回覆"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "傳送郵件到 bridges(a)torproject.org 並在內文中輸入「get bridges」字串。  然而，要使網絡攻擊者更難取得橋接器位址，你必須使用以下電郵提供者之一嚟寄送呢個要求(順序係依照優先建議)："> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net 、 https://mail.google.com 或 https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp4Heading "透過服務台"> +<!ENTITY torsettings.bridgeHelp4 "最後方法係：寄電郵到 help(a)rt.torproject.org.  請注意，此類郵件我哋須一封封手動回覆。"> diff --git a/src/chrome/locale/zh-HK/progress.dtd b/src/chrome/locale/zh-HK/progress.dtd index e93a82a..fbd63d4 100644 --- a/src/chrome/locale/zh-HK/progress.dtd +++ b/src/chrome/locale/zh-HK/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor的狀態"> -<!ENTITY torprogress.openSettings "打開設定"> -<!ENTITY torprogress.heading "連接至Tor的網絡中"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.dialog.title "Tor洋蔥路由狀態"> +<!ENTITY torprogress.openSettings "開啟設定"> +<!ENTITY torprogress.heading "連接到Tor洋蔥路由網絡"> +<!ENTITY torprogress.pleaseWait "我哋正在建立通往Tor洋蔥路由網絡嘅連線，請稍候， 呢樣可能會需要幾分鐘時間。"> diff --git a/src/chrome/locale/zh-HK/torlauncher.properties b/src/chrome/locale/zh-HK/torlauncher.properties index 151dc4b..90bdd80 100644 --- a/src/chrome/locale/zh-HK/torlauncher.properties +++ b/src/chrome/locale/zh-HK/torlauncher.properties @@ -1,61 +1,62 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor啟動器 +torlauncher.error_title=Tor洋蔥路由啟動器 -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. -torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -torlauncher.tor_failed_to_start=Tor failed to start. -torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_exited=意外咁Tor洋蔥路由自行關閉。呢樣可能係Tor洋蔥路由本身、其他應用程式或硬體產生嘅問題。除非重新啟動Tor洋蔥路由，否則Tor洋蔥路由瀏覽器將無法連接任何網站。如果問題仍然存在，請複製並發送你嘅Tor洋蔥路由歷程紀錄到支援團隊。 +torlauncher.tor_exited2=重新啟動Tor洋蔥路由將唔會關閉你瀏覽器嘅分頁。 +torlauncher.tor_controlconn_failed=無法連接到Tor洋蔥路由控制連接埠。 +torlauncher.tor_failed_to_start=無法啟動Tor洋蔥路由。 +torlauncher.tor_control_failed=無法控制Tor洋蔥路由。 +torlauncher.tor_bootstrap_failed=Tor洋蔥路無法連接Tor洋蔥路由網絡。 +torlauncher.tor_bootstrap_failed_details=%1$S失敗(%2$S)。 -torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S -torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. -torlauncher.password_hash_missing=Failed to get hashed password. +torlauncher.unable_to_start_tor=無法啟動Tor洋蔥路由。\n\n%S +torlauncher.tor_missing=遺失Tor洋蔥路由嘅執行檔。 +torlauncher.torrc_missing=遺失Torrc檔案，並且無法建立。 +torlauncher.datadir_missing=Tor洋蔥路由嘅資料夾路徑不存在，並且無法建立。 +torlauncher.password_hash_missing=無法取得驗證碼嘅密碼。 -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=請確定Tor運作中。 +torlauncher.failed_to_get_settings=無法取得Tor洋蔥路由設定\n\n%S +torlauncher.failed_to_save_settings=無法儲存洋蔥路由嘅設定。\n\n%S +torlauncher.ensure_tor_is_running=請確定Tor洋蔥路由運作中。 -torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -torlauncher.error_proxy_type_missing=You must select the proxy type. -torlauncher.error_bridges_missing=You must specify one or more bridges. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_proxy_addr_missing=須指定一個IP位址或主機名，以及連接埠編號，Tor洋蔥路由才可使用代理伺服器嚟存取網絡。 +torlauncher.error_proxy_type_missing=須選擇代理伺服器類型。 +torlauncher.error_bridges_missing=須指定一個或多個橋接器。 +torlauncher.error_default_bridges_type_missing=須為橋接器選取傳輸類型。 +torlauncher.error_bridge_bad_default_type=未提供傳輸類型為%S嘅橋接器。請重選。 torlauncher.recommended_bridge=(建議) torlauncher.connect=連接 -torlauncher.restart_tor=Restart Tor +torlauncher.restart_tor=重新啟動Tor洋蔥路由 torlauncher.quit=離開 torlauncher.quit_win=離開 torlauncher.done=完成 -torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance=如需協助，請聯絡%S +torlauncher.forAssistance2=如需協助，請到訪%S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=複製完成。%S Tor洋蔥路由日誌已準備好被貼到文字編輯器或電郵。 -torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory -torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection -torlauncher.bootstrapStatus.requesting_status=Retrieving network status -torlauncher.bootstrapStatus.loading_status=Loading network status -torlauncher.bootstrapStatus.loading_keys=Loading authority certificates -torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information -torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.conn_or=連接上Tor的網絡 -torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit -torlauncher.bootstrapStatus.done=Connected to the Tor network! +torlauncher.bootstrapStatus.conn_dir=正連接至轉向目錄 +torlauncher.bootstrapStatus.handshake_dir=正在建立加密嘅目錄連線 +torlauncher.bootstrapStatus.requesting_status=正在取得網絡狀態 +torlauncher.bootstrapStatus.loading_status=正在載入網絡狀態 +torlauncher.bootstrapStatus.loading_keys=正在載入授權憑證 +torlauncher.bootstrapStatus.requesting_descriptors=正在索取轉向站資訊 +torlauncher.bootstrapStatus.loading_descriptors=正在載入轉向站資訊 +torlauncher.bootstrapStatus.conn_or=正連接到Tor洋蔥路由網絡 +torlauncher.bootstrapStatus.handshake_or=正在建立Tor洋蔥路由線路 +torlauncher.bootstrapStatus.done=已連接到Tor洋蔥路由網絡！ torlauncher.bootstrapWarning.done=完成 -torlauncher.bootstrapWarning.connectrefused=connection refused -torlauncher.bootstrapWarning.misc=miscellaneous -torlauncher.bootstrapWarning.resourcelimit=insufficient resources -torlauncher.bootstrapWarning.identity=identity mismatch -torlauncher.bootstrapWarning.timeout=connection timeout -torlauncher.bootstrapWarning.noroute=no route to host -torlauncher.bootstrapWarning.ioerror=read/write error -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.connectrefused=連線遭到拒絕 +torlauncher.bootstrapWarning.misc=其他 +torlauncher.bootstrapWarning.resourcelimit=資源唔夠 +torlauncher.bootstrapWarning.identity=身份唔相符 +torlauncher.bootstrapWarning.timeout=連接逾時 +torlauncher.bootstrapWarning.noroute=無前往主機嘅路由 +torlauncher.bootstrapWarning.ioerror=讀寫錯誤 +torlauncher.bootstrapWarning.pt_missing=遺失Pluggable transport diff --git a/src/chrome/locale/zh-TW/network-settings.dtd b/src/chrome/locale/zh-TW/network-settings.dtd index 5e54ea1..07a6deb 100644 --- a/src/chrome/locale/zh-TW/network-settings.dtd +++ b/src/chrome/locale/zh-TW/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "下列哪一項敘述最符合您的實際情況？"> <!ENTITY torSettings.configurePrompt1 "這部電腦的網路連線有被監控過濾或是有透過代理伺服器。"> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "我必須要在連上洋蔥路由 網路之前，先設定好橋接器或本地端代理伺服器。"> <!ENTITY torSettings.configure "設定"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "我想要直接連上洋蔥路由網路。"> <!ENTITY torSettings.connectPrompt3 "這將在大多數情況下正常運作。"> <!ENTITY torSettings.connect "連接"> <!ENTITY torSettings.proxyPageTitle "本地端代理伺服器的設定"> <!ENTITY torSettings.proxyQuestion "這台電腦需要使用本地代理伺服器來存取網路嗎？">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "在大部分的情況中是不需要本地端代理伺服器的，但是當所使用的網路服務是公司企業或學校等之內部網路時，就有可能會需要。"> +<!ENTITY torSettings.proxyExplanation2 "如果您不確定如何回答這個問題的話，可以參考其他網路瀏覽器的網際網路設定或者是作業系統中的網路相關設定，以確定是否需要設定本地端代理伺服器。"> <!ENTITY torSettings.enterProxy "輸入代理伺服器設定。"> <!ENTITY torSettings.bridgePageTitle "洋蔥路由橋接器的設定"> <!ENTITY torSettings.bridgeQuestion "您的網際網路服務提供者(ISP)是否會阻擋或監控過濾連接到洋蔥路由的網路活動？"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "若您不確定如何回答這個問題的話，請選擇「否」(若之後您發現沒有使用橋接器無法連上洋蔥路由網路的話，可以再回頭來增加此設定)。"> +<!ENTITY torSettings.bridgeExplanation2 "若您選擇「是」的話，您將必須要進行洋蔥路由的橋接器設定，橋接器是未被列表的祕密洋蔥路由節點，它可以讓對通往洋蔥路由網路連線的阻擋，變得更加困難。"> <!ENTITY torSettings.bridgeSettingsPrompt "您可以使用提供的橋接器，您也可以輸入一組自訂的橋接器。">  <!ENTITY torsettings.startingTor "正在等待洋蔥路由啟動…"> <!ENTITY torsettings.restartTor "重新啟動洋蔥路由"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "重新設定"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "您已經有設定洋蔥路由的橋接器或本地端代理伺服器。  若想要直接連上洋蔥路由網路的話，必須要先移除這部份的設定。"> +<!ENTITY torsettings.discardSettings.proceed "移除設定值並且連線"> <!ENTITY torsettings.optional "選用"> @@ -52,11 +52,11 @@ <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "這台電腦通過只允許連接至特定連線埠的防火牆"> +<!ENTITY torsettings.firewall.checkbox "這台電腦通過某個只允許連接至特定連線埠的防火牆"> <!ENTITY torsettings.firewall.allowedPorts "允許的連接埠："> <!ENTITY torsettings.useBridges.checkbox "我的網際網路服務提供者(ISP)會過濾阻擋連接至洋蔥路由的網路活動"> <!ENTITY torsettings.useBridges.default "使用提供的橋接器連線"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "每種橋接器都使用不同的方式去規避網路封包過濾，  如果發現使用了某個橋接器仍然無法順利連上線的話，可以更換另一個橋接器再行嘗試。"> <!ENTITY torsettings.useBridges.type "傳輸類型："> <!ENTITY torsettings.useBridges.custom "輸入自訂的橋接器"> <!ENTITY torsettings.useBridges.label "輸入一個或多個橋接中繼器 (每行一個)。"> @@ -64,8 +64,8 @@ <!ENTITY torsettings.copyLog "將洋蔥路由的訊息記錄複製到剪貼簿"> <!ENTITY torsettings.bridgeHelpTitle "橋接中繼器之說明"> -<!ENTITY torsettings.bridgeHelp1 "若您無法連接到洋蔥路由網路，可能是因為您的網際網路服務提供者 (ISP) 或其它機構正在封鎖洋蔥路由網路。  通常您可以使用更難以被封鎖之橋接中繼器來連上洋蔥路由，以便解決此問題。"> -<!ENTITY torsettings.bridgeHelp1B "您可以使用預先設定好的橋接器位址，或您也可以使用下列三種方法的任一種以獲取一組自訂的位址："> +<!ENTITY torsettings.bridgeHelp1 "若您無法連接到洋蔥路由網路，可能是因為您的網際網路服務提供者 (ISP) 或其它機構正在封鎖洋蔥路由網路。  通常您可以使用橋接中繼器來連上洋蔥路由網路，以便解決此問題。該種中繼器是未被羅列於清單中的秘密中繼節點，非常難以被過濾阻擋。"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "透過網路"> <!ENTITY torsettings.bridgeHelp2 "使用網路瀏覽器造訪 https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "透過電子郵件自動回覆"> diff --git a/src/chrome/locale/zh-TW/progress.dtd b/src/chrome/locale/zh-TW/progress.dtd index 65b0d3e..fda5971 100644 --- a/src/chrome/locale/zh-TW/progress.dtd +++ b/src/chrome/locale/zh-TW/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor 狀態"> +<!ENTITY torprogress.dialog.title "洋蔥路由狀態"> <!ENTITY torprogress.openSettings "開啟設定"> -<!ENTITY torprogress.heading "正在連線至 Tor 網路"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.heading "正在連線至洋蔥路由網路"> +<!ENTITY torprogress.pleaseWait "我們正在建立通往洋蔥路由網路的連線，敬請稍作等待， 因為這可能會需要幾分鐘的時間。"> diff --git a/src/chrome/locale/zh-TW/torlauncher.properties b/src/chrome/locale/zh-TW/torlauncher.properties index 6fadc66..8c59496 100644 --- a/src/chrome/locale/zh-TW/torlauncher.properties +++ b/src/chrome/locale/zh-TW/torlauncher.properties @@ -1,57 +1,58 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor 啟動工具 +torlauncher.error_title=洋蔥路由啟動工具 -torlauncher.tor_exited=Tor 意外地結束。這有可能是 Tor 本身的程式錯誤、您系統上的其它程式或是硬體故障。直到您重新啟動 Tor，Tor Browser將不會造訪任何網站。如果問題仍然存在，請發送您的 Tor 紀錄副本到支援團隊。 +torlauncher.tor_exited=洋蔥路由程式意外地中止了。這有可能是洋蔥路由本身的程式錯誤、您系統上的其它程式或是硬體故障。除非您重新啟動洋蔥路由，否則洋蔥路由瀏覽器將無法連接上任何網站。如果此問題持續發生，請發複製並發送您的洋蔥路由歷程紀錄到支援團隊。 torlauncher.tor_exited2=重新啟動洋蔥路由將不會關閉您瀏覽器的分頁。 -torlauncher.tor_controlconn_failed=無法連接至 Tor 控制連接埠。 +torlauncher.tor_controlconn_failed=無法連接至洋蔥路由控制連接埠。 torlauncher.tor_failed_to_start=洋蔥路由無法啟動。 -torlauncher.tor_control_failed=無法控制 Tor。 -torlauncher.tor_bootstrap_failed=Tor 無法建立 Tor 網路連線。 +torlauncher.tor_control_failed=無法控制洋蔥路由。 +torlauncher.tor_bootstrap_failed=洋蔥路由系統無法建立起通往洋蔥路由網路的連線。 torlauncher.tor_bootstrap_failed_details=%1$S 失敗 (%2$S)。 -torlauncher.unable_to_start_tor=無法啟動 Tor。\n\n%S -torlauncher.tor_missing=Tor 可執行檔遺失。 -torlauncher.torrc_missing=torrc 檔案遺失。 -torlauncher.datadir_missing=Tor 資料目錄不存在。 +torlauncher.unable_to_start_tor=無法啟動洋蔥路由。\n\n%S +torlauncher.tor_missing=洋蔥路由可執行檔遺失。 +torlauncher.torrc_missing=洋蔥路由的配置文件遺失而且無法創建。 +torlauncher.datadir_missing=洋蔥路由的資料路徑並不存在，且無法被創建。 torlauncher.password_hash_missing=無法取得雜湊過的密碼。 -torlauncher.failed_to_get_settings=無法擷取 Tor 設定。\n\n%S -torlauncher.failed_to_save_settings=無法儲存 Tor 的設定。\n\n%S -torlauncher.ensure_tor_is_running=請確定 Tor 正在執行。 +torlauncher.failed_to_get_settings=無法擷取洋蔥路由設定。\n\n%S +torlauncher.failed_to_save_settings=無法儲存洋蔥路由的設定。\n\n%S +torlauncher.ensure_tor_is_running=請確定洋蔥路由正在執行。 -torlauncher.error_proxy_addr_missing=想要設定 Tor 使用代理伺服器來存取網路，您必須指定一個 IP 位址或主機名稱以及連接埠號碼。 +torlauncher.error_proxy_addr_missing=您必須指定一個 IP 位址或主機名稱以及連接埠號碼，才能夠讓洋蔥路由使用代理伺服器來存取網路。 torlauncher.error_proxy_type_missing=您必須選擇代理伺服器類型。 torlauncher.error_bridges_missing=您必須指定一個或多個橋接。 -torlauncher.error_default_bridges_type_missing=您必須選擇一種傳輸類型才能提供橋接。 -torlauncher.error_bridge_bad_default_type=沒有可用的傳輸類型為 %S 的橋接。請調整您的設定。 +torlauncher.error_default_bridges_type_missing=您必須為該橋接器選擇一種傳輸類型。 +torlauncher.error_bridge_bad_default_type=沒有提供傳輸類型為 %S 的橋接器。請調整您的設定。 torlauncher.recommended_bridge=(建議使用) torlauncher.connect=連線 -torlauncher.restart_tor=重新啟動 Tor +torlauncher.restart_tor=重新啟動洋蔥路由 torlauncher.quit=離開 torlauncher.quit_win=結束 torlauncher.done=完成 torlauncher.forAssistance=如需協助，請聯絡 %S +torlauncher.forAssistance2=For assistance, visit %S -torlauncher.copiedNLogMessages=複製完成。%S Tor 紀錄訊息已準備好被貼到文字編輯器或是一封電子郵件訊息。 +torlauncher.copiedNLogMessages=複製完成。%S 洋蔥路由紀錄訊息已準備好被貼到文字編輯器或是一封電子郵件訊息。 torlauncher.bootstrapStatus.conn_dir=正連接至中繼目錄 torlauncher.bootstrapStatus.handshake_dir=正在建立加密的目錄連線 torlauncher.bootstrapStatus.requesting_status=正在擷取網路狀態 torlauncher.bootstrapStatus.loading_status=正在載入網路狀態 torlauncher.bootstrapStatus.loading_keys=正在載入授權憑證 -torlauncher.bootstrapStatus.requesting_descriptors=正在要求中繼資訊 -torlauncher.bootstrapStatus.loading_descriptors=正在載入中繼資訊 -torlauncher.bootstrapStatus.conn_or=正連接至 Tor 網路 -torlauncher.bootstrapStatus.handshake_or=正在建立 Tor 迴路 -torlauncher.bootstrapStatus.done=已連接到 Tor 網路! +torlauncher.bootstrapStatus.requesting_descriptors=正在索取中繼節點資訊 +torlauncher.bootstrapStatus.loading_descriptors=正在載入中繼節點資訊 +torlauncher.bootstrapStatus.conn_or=正連接至洋蔥路由網路 +torlauncher.bootstrapStatus.handshake_or=正在建立洋蔥路由迴路 +torlauncher.bootstrapStatus.done=已連接到洋蔥路由網路! torlauncher.bootstrapWarning.done=完成 -torlauncher.bootstrapWarning.connectrefused=連線遭拒 +torlauncher.bootstrapWarning.connectrefused=連線遭到拒絕 torlauncher.bootstrapWarning.misc=雜項 torlauncher.bootstrapWarning.resourcelimit=資源不足 torlauncher.bootstrapWarning.identity=識別不符 diff --git a/src/chrome/locale/zu/network-settings.dtd b/src/chrome/locale/zu/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/zu/network-settings.dtd +++ b/src/chrome/locale/zu/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/zu/torlauncher.properties b/src/chrome/locale/zu/torlauncher.properties index 02be756..6b471a3 100644 --- a/src/chrome/locale/zu/torlauncher.properties +++ b/src/chrome/locale/zu/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/install.rdf b/src/install.rdf index 500da96..d4c1876 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.9</em:version> + <em:version>0.2.9.1</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL> <em:updateKey>-</em:updateKey>

1 0

[tor-browser-bundle/maint-5.5] We should bump the release version as well
by gk＠torproject.org 22 Apr '16

22 Apr '16

commit 707c1e6e6d0d4c1a56ad2cd8774215323edbe763 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 22 11:41:48 2016 +0000 We should bump the release version as well --- tools/update-responses/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 138aa50..89c484b 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -10,7 +10,7 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 5.5a6 - release: 5.5.4 + release: 5.5.5 versions: 5.5.5: platformVersion: 38.8.0

1 0

[torbutton/master] Translation updates
by gk＠torproject.org 22 Apr '16

22 Apr '16

commit 06f23d0a74e33fe4870c58763ea25e23c4c1946f Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 22 10:34:34 2016 +0000 Translation updates --- src/chrome/locale/ar/aboutDialog.dtd | 2 +- src/chrome/locale/ar/torbutton.properties | 1 + src/chrome/locale/de/torbutton.properties | 1 + src/chrome/locale/es/torbutton.properties | 1 + src/chrome/locale/eu/torbutton.properties | 1 + src/chrome/locale/fa/torbutton.properties | 1 + src/chrome/locale/fr/aboutTBUpdate.dtd | 4 ++-- src/chrome/locale/fr/aboutTor.dtd | 4 ++-- src/chrome/locale/fr/brand.properties | 2 +- src/chrome/locale/fr/torbutton.dtd | 2 +- src/chrome/locale/fr/torbutton.properties | 3 ++- src/chrome/locale/it/torbutton.properties | 1 + src/chrome/locale/ja/torbutton.properties | 1 + src/chrome/locale/ko/torbutton.properties | 1 + src/chrome/locale/nl/torbutton.properties | 1 + src/chrome/locale/pl/torbutton.properties | 1 + src/chrome/locale/pt/brand.properties | 2 +- src/chrome/locale/pt/torbutton.dtd | 2 +- src/chrome/locale/pt/torbutton.properties | 1 + src/chrome/locale/ru/aboutTor.properties | 2 +- src/chrome/locale/ru/torbutton.properties | 1 + src/chrome/locale/sv/torbutton.properties | 1 + src/chrome/locale/tr/aboutTor.dtd | 2 +- src/chrome/locale/tr/torbutton.dtd | 2 +- src/chrome/locale/tr/torbutton.properties | 7 ++++--- src/chrome/locale/vi/brand.properties | 2 +- src/chrome/locale/vi/torbutton.properties | 1 + src/chrome/locale/zh-CN/torbutton.dtd | 6 +++--- src/chrome/locale/zh-CN/torbutton.properties | 3 ++- 29 files changed, 38 insertions(+), 21 deletions(-) diff --git a/src/chrome/locale/ar/aboutDialog.dtd b/src/chrome/locale/ar/aboutDialog.dtd index 248786e..7297ce3 100644 --- a/src/chrome/locale/ar/aboutDialog.dtd +++ b/src/chrome/locale/ar/aboutDialog.dtd @@ -1,4 +1,4 @@ -<!ENTITY project.start "&brandShortName; is developed by "> +<!ENTITY project.start "مطوْر من طرف &brandShortName;">  <!ENTITY project.tpoLink "the &vendorShortName;"> <!ENTITY project.end "لاتهدف للربح تعمل على حماية خصوصيتك وحريتك على الأنترنت"> diff --git a/src/chrome/locale/ar/torbutton.properties b/src/chrome/locale/ar/torbutton.properties index 4603989..da247c7 100644 --- a/src/chrome/locale/ar/torbutton.properties +++ b/src/chrome/locale/ar/torbutton.properties @@ -76,3 +76,4 @@ profileProblemTitle=%Sمشكله في ملف شخصي profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. +profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. diff --git a/src/chrome/locale/de/torbutton.properties b/src/chrome/locale/de/torbutton.properties index 8b57de6..3e0623b 100644 --- a/src/chrome/locale/de/torbutton.properties +++ b/src/chrome/locale/de/torbutton.properties @@ -76,3 +76,4 @@ profileProblemTitle=%S-Profilproblem profileReadOnly=Es ist nicht möglich %S auf einem nur lesbaren Dateisystem zu starten. Bitte kopiere %S an einen anderen Ort bevor Sie es benutzen. profileReadOnlyMac=Es ist nicht möglich %S auf einem nur lesbaren Dateisystem zu starten. Bitte %S auf Ihren Schreibtisch oder den Anwendungsordner kopieren, bevor Sie es benutzen. profileAccessDenied=%S hat keine Berechtigung um dieses Profil abzurufen. Bitte die Berechtigungen Ihres Dateisystems einstellen und es noch einmal probieren. +profileMigrationFailed=Übernahme des bestehenden %S Profils ist fehlgeschlagen.\nEs werden neue Einstellungen verwendet. diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties index 0715b9c..a29234b 100644 --- a/src/chrome/locale/es/torbutton.properties +++ b/src/chrome/locale/es/torbutton.properties @@ -76,3 +76,4 @@ profileProblemTitle=Problema del perfil %S profileReadOnly=No puede ejecutar %S desde un sistema de ficheros de solo-lectura. Copie %S a otra ubicación antes de intentar usarlo. profileReadOnlyMac=No puede ejecutar %S desde un sistema de ficheros de solo-lectura. Copie %S a su escritorio o la carpeta de aplicaciones antes de intentar usarlo. profileAccessDenied=%S no tiene permiso para acceder al perfil. Ajuste los permisos de su sistema de ficheros e inténtelo de nuevo. +profileMigrationFailed=Ha ocurrido un error en la migración de su perfil %S. \nSe usarán los nuevos ajustes. diff --git a/src/chrome/locale/eu/torbutton.properties b/src/chrome/locale/eu/torbutton.properties index d4a905f..2136510 100644 --- a/src/chrome/locale/eu/torbutton.properties +++ b/src/chrome/locale/eu/torbutton.properties @@ -76,3 +76,4 @@ profileProblemTitle=%S Profilarekin Arazoa profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. +profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. diff --git a/src/chrome/locale/fa/torbutton.properties b/src/chrome/locale/fa/torbutton.properties index 4938af8..195b17b 100644 --- a/src/chrome/locale/fa/torbutton.properties +++ b/src/chrome/locale/fa/torbutton.properties @@ -76,3 +76,4 @@ profileProblemTitle=%S مشکل پروفایل profileReadOnly=شما نمی توانید اجرا %S از یک فایل سیستم فقط خواندنی. لطفا کپی کنید %S به محل دیگری قبل از تلاش برای استفاده از آن. profileReadOnlyMac=شما نمی توانید اجرا %S از یک فایل سیستم فقط خواندنی. لطفا کپی کنید %S به دسکتاپ خودتان یا پوشه برنامه قبل از تلاش برای استفاده از آن. profileAccessDenied=٪ S اجازه دسترسی به مشخصات ندارد. لطفا مجوزهای سیستم فایل خود را تنظیم و دوباره سعی کنید. +profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. diff --git a/src/chrome/locale/fr/aboutTBUpdate.dtd b/src/chrome/locale/fr/aboutTBUpdate.dtd index 22674be..bbc32e1 100644 --- a/src/chrome/locale/fr/aboutTBUpdate.dtd +++ b/src/chrome/locale/fr/aboutTBUpdate.dtd @@ -1,6 +1,6 @@ <!ENTITY aboutTBUpdate.title "Mise à jour du Navigateur Tor"> <!ENTITY aboutTBUpdate.updated "Le Navigateur Tor a été mis à jour"> <!ENTITY aboutTBUpdate.linkPrefix "Pour avoir les informations les plus récentes sur cette version,"> -<!ENTITY aboutTBUpdate.linkLabel "visiter notre site web"> +<!ENTITY aboutTBUpdate.linkLabel "visitez notre site web"> <!ENTITY aboutTBUpdate.linkSuffix "."> -<!ENTITY aboutTBUpdate.changeLogHeading "Changelog"> +<!ENTITY aboutTBUpdate.changeLogHeading "Changelog :"> diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd index ec76322..ab91620 100644 --- a/src/chrome/locale/fr/aboutTor.dtd +++ b/src/chrome/locale/fr/aboutTor.dtd @@ -8,11 +8,11 @@ <!ENTITY aboutTor.outOfDateTorOn.label "ATTENTION : ce navigateur n'est pas à jour."> <!ENTITY aboutTor.outOfDateTorOff.label "DE PLUS, ce navigateur n'est pas à jour."> -<!ENTITY aboutTor.outOfDate2.label "Cliquez sur l'oignon et choisissez ensuite Vérifier les mises à jour du navigateur Tor"> +<!ENTITY aboutTor.outOfDate2.label "Cliquez sur l'oignon et choisissez ensuite Vérifier les mises à jour du Navigateur Tor"> <!ENTITY aboutTor.check.label "Tester les paramètres du réseau Tor"> -<!ENTITY aboutTor.success.label "Bienvenue dans le navigateur Tor"> +<!ENTITY aboutTor.success.label "Bienvenue dans le Navigateur Tor"> <!ENTITY aboutTor.success2.label "Connecté au réseau Tor."> <!ENTITY aboutTor.success3.label "Vous pouvez maintenant naviguer sur Internet de manière anonyme."> <!ENTITY aboutTor.failure.label "Une erreur s'est produite !"> diff --git a/src/chrome/locale/fr/brand.properties b/src/chrome/locale/fr/brand.properties index 1e596f1..375e8b1 100644 --- a/src/chrome/locale/fr/brand.properties +++ b/src/chrome/locale/fr/brand.properties @@ -11,6 +11,6 @@ homePageSingleStartMain=Firefox Start, une page d'accueil rapide avec recherche homePageImport=Importez votre page d'accueil à partir de %S homePageMigrationPageTitle=Sélection de la Page d'accueil -homePageMigrationDescription=S'il vous plaît sélectionner la page d'accueil que vous souhaitez utiliser: +homePageMigrationDescription=S'il vous plaît sélectionnez la page d'accueil que vous souhaitez utiliser : syncBrandShortName=Sync diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd index c1cf801..ddc9137 100644 --- a/src/chrome/locale/fr/torbutton.dtd +++ b/src/chrome/locale/fr/torbutton.dtd @@ -34,7 +34,7 @@ <!ENTITY torbutton.context_menu.about.key "A"> <!ENTITY torbutton.context_menu.networksettings "Paramètres du réseau Tor"> <!ENTITY torbutton.context_menu.networksettings.key "S"> -<!ENTITY torbutton.context_menu.downloadUpdate "Vérifier les mises à jour du navigateur Tor"> +<!ENTITY torbutton.context_menu.downloadUpdate "Vérifier les mises à jour du Navigateur Tor"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Protections contre les cookies"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties index 7501c5b..e5161e2 100644 --- a/src/chrome/locale/fr/torbutton.properties +++ b/src/chrome/locale/fr/torbutton.properties @@ -5,7 +5,7 @@ torbutton.circuit_display.ip_unknown = IP inconnue torbutton.circuit_display.onion_site = Site onion torbutton.circuit_display.this_browser = Ce navigateur torbutton.circuit_display.relay = relais -torbutton.circuit_display.tor_bridge = Pont +torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Pays inconnu torbutton.content_sizer.margin_tooltip = Le navigateur Tor ajoute cette marge pour s'assurer que la largeur et la hauteur de votre fenêtre soit moins distinctive, et ainsi réduire la capacité des personnes à vous repérer en ligne. torbutton.panel.tooltip.disabled = Cliquer pour activer Tor @@ -76,3 +76,4 @@ profileProblemTitle=Problème de profil %S profileReadOnly=Vous ne pouvez pas exécuter %S à partir d'un système de fichiers en lecture seul. Veuillez copier %S vers un autre emplacement avant d'essayer de l'utiliser. profileReadOnlyMac=Vous ne pouvez pas exécuter %S à partir d'un système de fichiers en lecture seul. Veuillez copier %S vers votre dossier Bureau ou Applications avant d'essayer de l'utiliser. profileAccessDenied=%S n'a pas la permission d'accéder au profil. Veuillez ajuster les permissions de votre système de fichiers et ressayer. +profileMigrationFailed=La migration de votre profil existant %S a échoué.\nDe nouveaux paramètres vont être utilisés. diff --git a/src/chrome/locale/it/torbutton.properties b/src/chrome/locale/it/torbutton.properties index ab76409..a7f6173 100644 --- a/src/chrome/locale/it/torbutton.properties +++ b/src/chrome/locale/it/torbutton.properties @@ -76,3 +76,4 @@ profileProblemTitle=Problema Profilo %S profileReadOnly=Non puoi avviare %S da un file system di sola lettura. Per favore copia %S in un'altra posizione prima di usarlo. profileReadOnlyMac=Non puoi avviare %S da un file system di sola lettura. Per favore copia %S sulla tua scrivania o nella cartella Applicazioni prima di usarlo. profileAccessDenied=%S non ha i permessi per accedere al profilo. Per favore, modifica i permessi del tuo file system e riprova. +profileMigrationFailed=Migrazione del tuo profilo %S esistente fallita.\nVerranno usate nuove impostazioni. diff --git a/src/chrome/locale/ja/torbutton.properties b/src/chrome/locale/ja/torbutton.properties index 554cd6f..1f3cc35 100644 --- a/src/chrome/locale/ja/torbutton.properties +++ b/src/chrome/locale/ja/torbutton.properties @@ -76,3 +76,4 @@ profileProblemTitle=%S プロファイル問題 profileReadOnly=読み込み専用のファイルシステムでは %S を実行できません。 %S を別の場所に移動してからもう一度実行してください。 profileReadOnlyMac=読み込み専用のファイルシステムでは %S を実行できません。 %S をデスクトップやアプリケーションフォルダーに移動してからもう一度実行してください。 profileAccessDenied=%S はプロファイルにアクセスする権限がありません。権限を設定してからもう一度試してみてください。 +profileMigrationFailed=存在しているプロファイル %S へのマイグレーションに失敗しました。\n新しい設定が適用されます。 diff --git a/src/chrome/locale/ko/torbutton.properties b/src/chrome/locale/ko/torbutton.properties index 9476333..51c5601 100644 --- a/src/chrome/locale/ko/torbutton.properties +++ b/src/chrome/locale/ko/torbutton.properties @@ -76,3 +76,4 @@ profileProblemTitle=%S 프로필 문제 profileReadOnly=%S 에서 읽기전용 파일시스템으로 실행하실 수 없습니다. 사용하시기 전에 %S를 복사하여 다른 곳에서 테스트 해 보십시오. profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. +profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. diff --git a/src/chrome/locale/nl/torbutton.properties b/src/chrome/locale/nl/torbutton.properties index 08b77aa..234d62c 100644 --- a/src/chrome/locale/nl/torbutton.properties +++ b/src/chrome/locale/nl/torbutton.properties @@ -76,3 +76,4 @@ profileProblemTitle=%S Profiel probleem profileReadOnly=Je kan %S niet draaien vanaf een alleen-lezen bestands-systeem Kopieer %S naar een andere locatie voor je het opnieuw probeert. profileReadOnlyMac=Je kan %S niet draaien vanaf een alleen lezen bestands-systeem. Kopieer %S naar je Bureaublad of de Applicatie map voordat je het opnieuw probeert. profileAccessDenied=%S heeft niet de juiste permissies om toegang te krijgen tot het profiel. Pas de bestands-systeem permissies aan en probeer het opnieuw. +profileMigrationFailed=Migreren van uw bestaande %S profiel is mislukt.\nNieuwe instellingen zijn nu van toepassing. diff --git a/src/chrome/locale/pl/torbutton.properties b/src/chrome/locale/pl/torbutton.properties index 8b60e26..c3e9be2 100644 --- a/src/chrome/locale/pl/torbutton.properties +++ b/src/chrome/locale/pl/torbutton.properties @@ -76,3 +76,4 @@ profileProblemTitle=%S Problem profilu profileReadOnly=Nie możesz uruchomić %S z systemu plików tylko do odczytu. Prosimy o skopiowanie %S do innej lokalizacji przed ponownym jego użyciem. profileReadOnlyMac=Nie możesz uruchomić %S w systemie plików tylko do odczytu. Prosimy o skopiowanie %S na pulpit, lub do folderu aplikacji przed ponowną próbą uruchomienia. profileAccessDenied=%S nie posiada uprawnień, aby zobaczyć ten profil. Prosimy zmienić uprawnienia systemu plików i spróbować ponownie. +profileMigrationFailed=Migracja Twojego isniejącego profilu %S nie powiodła się.\nNowe ustawienia zostaną użyte. diff --git a/src/chrome/locale/pt/brand.properties b/src/chrome/locale/pt/brand.properties index 6d96fb0..68215bd 100644 --- a/src/chrome/locale/pt/brand.properties +++ b/src/chrome/locale/pt/brand.properties @@ -10,7 +10,7 @@ vendorShortName=Projeto Tor homePageSingleStartMain=Página Inicial do Firefox, uma página inicial rápida com procura incluída homePageImport=Importe a página inicial a do %S -homePageMigrationPageTitle=Seleção da Página Inicial +homePageMigrationPageTitle=Seleção da Página Inicial homePageMigrationDescription=Selecione a página inicial que deseja usar: syncBrandShortName=Sincronizar diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd index 678ccb7..5e0ef84 100644 --- a/src/chrome/locale/pt/torbutton.dtd +++ b/src/chrome/locale/pt/torbutton.dtd @@ -115,7 +115,7 @@ <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> <!ENTITY torbutton.prefs.no_proxies_on "Nenhum proxy para: "> <!ENTITY torbutton.prefs.no_proxy_warning "Aviso: evite utilizar quaisquer nomes de hospedeiro acima"> -<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh"> +<!ENTITY torbutton.prefs.spoofreresh "Refrescamento da falsificação"> <!ENTITY torbutton.prefs.refereroptions "Opções de falsificação do referente"> <!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)"> <!ENTITY torbutton.prefs.spoofroot "Enganar a pasta da página"> diff --git a/src/chrome/locale/pt/torbutton.properties b/src/chrome/locale/pt/torbutton.properties index 3f5026a..b65f4a4 100644 --- a/src/chrome/locale/pt/torbutton.properties +++ b/src/chrome/locale/pt/torbutton.properties @@ -76,3 +76,4 @@ profileProblemTitle=%S - Problema de Perfil profileReadOnly=Não pode executar %S a partir de um sistema de ficheiros só-de-leitura. Por favor, copie %S para outra localização antes de tentar utilizá-lo. profileReadOnlyMac=Não pode executar %S a partir de um ficheiro do sistema só-de-leitura. Por favor, copie %S para o seu Ambiente de Trabalho antes de tentar utilizá-lo. profileAccessDenied=%S não tem permissão para aceder ao perfil. Por favor, ajuste as suas permissões de ficheiro do sistema e tente de novo. +profileMigrationFailed=Migração do seu perfil %S existente falhou. \nNovas configurações serão utilizadas. diff --git a/src/chrome/locale/ru/aboutTor.properties b/src/chrome/locale/ru/aboutTor.properties index 6795b7c..07d591c 100644 --- a/src/chrome/locale/ru/aboutTor.properties +++ b/src/chrome/locale/ru/aboutTor.properties @@ -2,7 +2,7 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Ищите <a href="%1$S">конфиденциально</a> со <a href="%2$S">Startpage</a>. +aboutTor.searchSP.privacy=Ищите <a href="%1$S">конфиденциально</a> на <a href="%2$S">Стартовой странице</a>. # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.ht… # The following string is a link which replaces %2$S above. diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties index 00c3dd0..bdda36c 100644 --- a/src/chrome/locale/ru/torbutton.properties +++ b/src/chrome/locale/ru/torbutton.properties @@ -76,3 +76,4 @@ profileProblemTitle=Проблема с профилем %S profileReadOnly=Невозможно запустить %S из под системы с файловой системой "только для чтения". Пожалуйста, скопируйте %S в другое место перед использованием. profileReadOnlyMac=Невозможно запустить %S из файловой системы, доступной только для чтения. Пожалуйста, скопируйте %S на рабочий стол или в папку "Приложения" перед использованием. profileAccessDenied=У %S нет разрешения на доступ к профилю. Пожалуйста, измените права доступа и попробуйте снова. +profileMigrationFailed=Перемещение вашего существующего %S профиля не удалось.\nБудут использоваться новые настройки. diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties index 443bf1a..a7188c9 100644 --- a/src/chrome/locale/sv/torbutton.properties +++ b/src/chrome/locale/sv/torbutton.properties @@ -76,3 +76,4 @@ 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-katalogen innan användning. 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. diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd index 3e3db58..d68d838 100644 --- a/src/chrome/locale/tr/aboutTor.dtd +++ b/src/chrome/locale/tr/aboutTor.dtd @@ -33,7 +33,7 @@ <!ENTITY aboutTor.torInfo4.label "Bu sunucu ziyaretçiler hakkında herhangi bir bilgi toplamaz."> <!ENTITY aboutTor.whatnextQuestion.label "Şimdi ne olacak?"> <!ENTITY aboutTor.whatnextAnswer.label "Tor, anonim kalmanız için gerek duyacağınız her şeyi sağlamaz! Kimliğinizin güvende kalması için bazı İnternet alışkanlıklarınızı değiştirmeniz gerekebilir."> -<!ENTITY aboutTor.whatnext.label "Anonim Kalma İp Uçları »"> +<!ENTITY aboutTor.whatnext.label "Anonim Kalma İpuçları »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> <!ENTITY aboutTor.helpInfo1.label "Yardım Edebilirsiniz!"> <!ENTITY aboutTor.helpInfo2.label "Tor ağını daha hızlı güçlü kılmaya yardımcı olabilmenin çeşitli yolları var:"> diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index 62114b5..3a03b4d 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -170,7 +170,7 @@ <!ENTITY torbutton.prefs.sec_all_jit_desc "Tüm JavaScript başarım iyileştirmeleri devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_font_rend_desc "Bazı yazı tipi işleme özellikleri devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite yazı tipi görüntüleme düzeneği devre dışı bırakılır."> -<!ENTITY torbutton.prefs.sec_svg_desc "Bazı görsel tipleri devre dışı bırakılır."> +<!ENTITY torbutton.prefs.sec_svg_desc "Bazı görsel türleri devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG görselleri devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_js_https_desc "HTTPS kullanılmayan sitelerde JavaScript varsayılan olarak devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript, NoScript araç çubuğu düğmesi kullanılarak her site için ayrı ayrı etkinleştirilebilir."> diff --git a/src/chrome/locale/tr/torbutton.properties b/src/chrome/locale/tr/torbutton.properties index 8c03698..2e2cdff 100644 --- a/src/chrome/locale/tr/torbutton.properties +++ b/src/chrome/locale/tr/torbutton.properties @@ -29,9 +29,9 @@ torbutton.popup.test.auto_failed = Otomatik Tor vekil sunucu sınamasında Tor k torbutton.prefs.recommended = (önerilir) torbutton.prefs.optional = (isteğe bağlı) torbutton.prefs.crucial = (önemli) -torbutton.popup.external.title = Dış bir dosya tipi indirilsin mi? +torbutton.popup.external.title = Dış bir dosya türü indirilsin mi? torbutton.popup.external.app = Tor Browser bu dosyayı görüntüleyemiyor. Başka bir uygulamayla açmanız gerekecek.\n -torbutton.popup.external.note = Bazı dosya tipleri uygulamaların Tor kullanmadan İnternet bağlantısı kurmasına neden olabilir.\n\n +torbutton.popup.external.note = Bazı dosya türleri uygulamaların Tor kullanmadan İnternet bağlantısı kurmasına neden olabilir.\n torbutton.popup.external.suggest = Güvende olmak için, indirilen dosyaları yalnız çevrim dışı iken açmalı ya da Tails benzeri bir Çalışan Tor CD ortamı kullanmalısınız.\n torbutton.popup.launch = Dosyayı indir torbutton.popup.cancel = İptal\n @@ -59,7 +59,7 @@ torbutton.popup.confirm_newnym = Tor Browser tüm sekme ve pencereleri kapatacak torbutton.slider_notification = Yeşil soğan menüsünde artık güvenlik düzeyini ayarlayabileceğiniz bir güvenlik kaydırıcısı var. Deneyin! torbutton.slider_notification_button = Güvenlik ayarlarını aç -torbutton.maximize_warning = Tor Browser görüntüsünün tüm ekranı kaplaması, ekran boyutunuzu web siteleri tarafından öğrenilmesini ve bu bilginin sizi izlemek için kullanılmasını sağlayabilir. Tor Browser pencerelerini özgün varsayılan boyutlarında bırakmanız önerilir. +torbutton.maximize_warning = Tor Browser görüntüsünün tüm ekranı kaplaması, ekran boyutunuzun web siteleri tarafından öğrenilmesini ve bu bilginin sizi izlemek için kullanılmasını sağlayabilir. Tor Browser pencerelerini özgün varsayılan boyutlarında bırakmanız önerilir. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Bu web sitesi (%S) bilgisayarınızı benzersiz olarak tanımlayabilmek için kullanılabilen HTML5 tuvalindeki görsel verisine erişmeye çalıştı.\n\nTor Browser bu web sitesine HTML5 tuval, görsel verisini göndersin mi? @@ -76,3 +76,4 @@ profileProblemTitle=%S Profili Sorunu profileReadOnly=%S salt okunur bir dosya sisteminden çalıştırılamaz. Lütfen kullanmadan önce %S yazılımını farklı bir konuma kopyalayın. profileReadOnlyMac=%S salt okunur bir dosya sisteminden çalıştırılamaz. Lütfen kullanmadan önce %S yazılımını Masaüstü veya Uygulamalar klasörüne kopyalayın. profileAccessDenied=%S, profilinize erişemiyor. Lütfen dosya sistemi izinlerini ayarlayarak yeniden deneyin. +profileMigrationFailed=Mevcut %S profilinizin taşınma işlemi başarısız oldu.\nYeni ayarlar kullanılacak. diff --git a/src/chrome/locale/vi/brand.properties b/src/chrome/locale/vi/brand.properties index 87d9b23..bb1ea2d 100644 --- a/src/chrome/locale/vi/brand.properties +++ b/src/chrome/locale/vi/brand.properties @@ -2,7 +2,7 @@ # 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 +brandShorterName=Trình duyệt Tor brandShortName=Trình duyệt Tor brandFullName=Trình duyệt Tor vendorShortName=Dự án Tor diff --git a/src/chrome/locale/vi/torbutton.properties b/src/chrome/locale/vi/torbutton.properties index 98b2883..cc5d3c2 100644 --- a/src/chrome/locale/vi/torbutton.properties +++ b/src/chrome/locale/vi/torbutton.properties @@ -76,3 +76,4 @@ profileProblemTitle=%S Profile Problem profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. +profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index 1972a7a..d947470 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -22,9 +22,9 @@ <!ENTITY torbutton.pref_connection.more_info "更多信息"> <!ENTITY torbutton.pref_connection_more_info.title "帮助"> <!ENTITY torbutton.pref_connection_more_info.text "Torbutton 当前已启用。如需对 Tor 之外的代理设置进行更改，请禁用 Torbutton 后再返回这里。如需更改 Tor 的设置，请在 Torbutton 首选项窗口中进行设置。"> -<!ENTITY torbutton.context_menu.new_identity "新标识"> +<!ENTITY torbutton.context_menu.new_identity "新身份"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.new_circuit "为该站点新建 Tor 线路"> +<!ENTITY torbutton.context_menu.new_circuit "为此站点使用新 Tor 线路"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> <!ENTITY torbutton.context_menu.toggle "切换 Tor 状态"> <!ENTITY torbutton.context_menu.toggle.key "T"> @@ -181,5 +181,5 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc "某些字体和图标可能无法正确显示。"> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "禁用网站提供的字体文件。"> <!ENTITY torbutton.prefs.sec_custom "自定义"> -<!ENTITY torbutton.circuit_display.title "该站点所用的 Tor 线路"> +<!ENTITY torbutton.circuit_display.title "为此站点使用的 Tor 线路"> diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties index e67ae7a..5b241bb 100644 --- a/src/chrome/locale/zh-CN/torbutton.properties +++ b/src/chrome/locale/zh-CN/torbutton.properties @@ -7,7 +7,7 @@ torbutton.circuit_display.this_browser = 本浏览器 torbutton.circuit_display.relay = 中继 torbutton.circuit_display.tor_bridge = 网桥 torbutton.circuit_display.unknown_country = 未知国家 -torbutton.content_sizer.margin_tooltip = Tor 浏览器添加了一些边框，以降低窗口大小的独特性，从而令在线跟踪监控变得更加困难。 +torbutton.content_sizer.margin_tooltip = Tor 浏览器添加了一些边框，以降低窗口大小的独特性，令在线跟踪监控变得更加困难。 torbutton.panel.tooltip.disabled = 点击启用 Tor torbutton.panel.tooltip.enabled = 点击禁用 Tor torbutton.panel.plugins.disabled = 点击启用插件 @@ -76,3 +76,4 @@ profileProblemTitle=%S 配置文件问题 profileReadOnly=您不能在一个只读文件系统上运行 %S。请在尝试使用前复制 %S 到另一个位置。 profileReadOnlyMac=您不能在一个只读文件系统上运行 %S。请在尝试使用它前复制 %S 到您的桌面或者应用程序文件夹。 profileAccessDenied=%S 没有权限访问配置文件。请调整您的文件系统权限然后重试。 +profileMigrationFailed=转移您已有的配置文件 %S 失败。\n新设置将被使用。

1 0

[torbutton/master] Release preparations for 1.9.5.3
by gk＠torproject.org 22 Apr '16

22 Apr '16

commit ead9462a881ad89365866f29aac6765fef305723 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 22 10:37:44 2016 +0000 Release preparations for 1.9.5.3 Version bumps, changelog update --- src/CHANGELOG | 4 ++++ src/install.rdf | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 5f16834..6ab0827 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,7 @@ +1.9.5.3 + * Bug 18466: Make Torbutton compatible with Firefox ESR 45 + * Translation updates + 1.9.5.2 * Bug 18557: Exempt Graphite preference from Security Slider diff --git a/src/install.rdf b/src/install.rdf index 29c72ba..58f51b3 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.5.2</em:version> + <em:version>1.9.5.3</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL> @@ -16,7 +16,7 @@ <em:targetApplication> <Description> <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> - <em:minVersion>17.0</em:minVersion> + <em:minVersion>45.0</em:minVersion> <em:maxVersion>10000.0</em:maxVersion> </Description> </em:targetApplication>

1 0

[tor-launcher/master] Getting new strings translated
by gk＠torproject.org 22 Apr '16

22 Apr '16

commit 14c8fff57bcf60d11416cec46d9d560ae132a033 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 22 08:13:05 2016 +0000 Getting new strings translated --- src/chrome/locale/en/network-settings.dtd | 2 +- src/chrome/locale/en/torlauncher.properties | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 0ef4437..6b471a3 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.

1 0

[tor-browser-bundle/hardened-builds] fetch-inputs.sh: checkout git repositories with -f
by gk＠torproject.org 22 Apr '16

22 Apr '16

commit 55d7ae68564373617ee5a7bd54833ec203afedb0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 21 23:00:28 2016 +0200 fetch-inputs.sh: checkout git repositories with -f Update git repositories using "git checkout -f" to throw away local changes. This avoids an error when updating https-everywhere where a submodule was merged to the main repository. --- gitian/fetch-inputs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 7c9daee..4f3c886 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -99,7 +99,7 @@ update_git() { fi if [ -n "$tag" ]; then - (cd "$dir" && git checkout "$tag") + (cd "$dir" && git checkout -f "$tag") fi # If we're not verifying tags, then some of the tags

1 0

[tor-browser-bundle/master] fetch-inputs.sh: checkout git repositories with -f
by boklm＠torproject.org 22 Apr '16

22 Apr '16

commit 3fbe2d1801286eefceb1d83dfab4e6b62d38c720 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 21 23:00:28 2016 +0200 fetch-inputs.sh: checkout git repositories with -f Update git repositories using "git checkout -f" to throw away local changes. This avoids an error when updating https-everywhere where a submodule was merged to the main repository. --- gitian/fetch-inputs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index b423b48..da487f4 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -100,7 +100,7 @@ update_git() { fi if [ -n "$tag" ]; then - (cd "$dir" && git checkout "$tag") + (cd "$dir" && git checkout -f "$tag") fi # If we're not verifying tags, then some of the tags

1 0

[tor-browser-bundle/maint-5.5] fetch-inputs.sh: checkout git repositories with -f
by boklm＠torproject.org 22 Apr '16

22 Apr '16

commit cbd10de83965b6badaa86489801cf7a5ec78303e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 21 23:00:28 2016 +0200 fetch-inputs.sh: checkout git repositories with -f Update git repositories using "git checkout -f" to throw away local changes. This avoids an error when updating https-everywhere where a submodule was merged to the main repository. --- gitian/fetch-inputs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 7c55ba8..1ff49f8 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -99,7 +99,7 @@ update_git() { fi if [ -n "$tag" ]; then - (cd "$dir" && git checkout "$tag") + (cd "$dir" && git checkout -f "$tag") fi # If we're not verifying tags, then some of the tags

1 0

[tor-launcher/maint-0.2.7] Version bump
by gk＠torproject.org 21 Apr '16

21 Apr '16

commit 8a844acce82de241b5456d7160ae903b3806f037 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 21 19:15:35 2016 +0000 Version bump --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 06ebe1a..9118534 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.7.8</em:version> + <em:version>0.2.7.9</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL> <em:updateKey>-</em:updateKey>

1 0

[tor-launcher/maint-0.2.7] Translation updates
by gk＠torproject.org 21 Apr '16

21 Apr '16

commit 30fd4681784a9ec13395313da1ca6439d79bda49 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 21 19:14:17 2016 +0000 Translation updates --- src/chrome/locale/ar/torlauncher.properties | 1 + src/chrome/locale/de/torlauncher.properties | 1 + src/chrome/locale/es/torlauncher.properties | 1 + src/chrome/locale/fa/torlauncher.properties | 1 + src/chrome/locale/fr/torlauncher.properties | 1 + src/chrome/locale/it/torlauncher.properties | 1 + src/chrome/locale/ja/torlauncher.properties | 1 + src/chrome/locale/ko/torlauncher.properties | 1 + src/chrome/locale/nl/torlauncher.properties | 1 + src/chrome/locale/pl/torlauncher.properties | 1 + src/chrome/locale/pt/torlauncher.properties | 1 + src/chrome/locale/ru/torlauncher.properties | 1 + src/chrome/locale/tr/torlauncher.properties | 1 + src/chrome/locale/vi/torlauncher.properties | 1 + src/chrome/locale/zh-CN/torlauncher.properties | 1 + 15 files changed, 15 insertions(+) diff --git a/src/chrome/locale/ar/torlauncher.properties b/src/chrome/locale/ar/torlauncher.properties index 2fc973e..5e11dec 100644 --- a/src/chrome/locale/ar/torlauncher.properties +++ b/src/chrome/locale/ar/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=خروج torlauncher.done=تم torlauncher.forAssistance=للمساعدة, اتصل بـ %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=تم إكمال النسخ. %S من رسائل سجل تور جاهزة لنسخها في محرر نصوص أو رسالة بريد إلكتروني. diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties index 0da42da..4c4209e 100644 --- a/src/chrome/locale/de/torlauncher.properties +++ b/src/chrome/locale/de/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Beenden torlauncher.done=Fertig torlauncher.forAssistance=Falls Sie Hilfe benötigen, kontaktieren Sie %S +torlauncher.forAssistance2=Falls Sie Hilfe benötigen, besuchen Sie %S torlauncher.copiedNLogMessages=Kopie vollständig. %S Tor-Protokollnachrichten sind bereit, um in eine Textbearbeitung oder in eine E-Mail-Nachricht eingefügt zu werden. diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties index 42780e5..bc309d7 100644 --- a/src/chrome/locale/es/torlauncher.properties +++ b/src/chrome/locale/es/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Salir torlauncher.done=Listo torlauncher.forAssistance=Para obtener ayuda, contacte con %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copia completada. %S mensajes de registro ('log') de Tor están listos para ser pegados en un editor de texto o en un mensaje de correo electrónico. diff --git a/src/chrome/locale/fa/torlauncher.properties b/src/chrome/locale/fa/torlauncher.properties index bdd5c09..88d84f9 100644 --- a/src/chrome/locale/fa/torlauncher.properties +++ b/src/chrome/locale/fa/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=خروج torlauncher.done=انجام شد torlauncher.forAssistance=برای دریافت کمک٫ با %S تماس بگیرید +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=کپی کامل شد. %S پیامهای ثبت شده آماده است تا Paste شود در ویرایشگر متن یا یک ایمیل. diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties index 6949020..1fb7eb7 100644 --- a/src/chrome/locale/fr/torlauncher.properties +++ b/src/chrome/locale/fr/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Sortir torlauncher.done=Terminé torlauncher.forAssistance=Pour obtenir de l'aide, contactez %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=La copie est terminée. %S messages de journalisation de Tor sont prêts à être coller dans un éditeur de texte ou un courriel. diff --git a/src/chrome/locale/it/torlauncher.properties b/src/chrome/locale/it/torlauncher.properties index b5729ed..96273d2 100644 --- a/src/chrome/locale/it/torlauncher.properties +++ b/src/chrome/locale/it/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Esci torlauncher.done=Fatto torlauncher.forAssistance=Per richiedere assistenza, contattare %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copia completata. %S Messaggi di log Tor sono pronti per essere incollato in un editor di testo o un messaggio e-mail. diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties index c679f1d..293c25f 100644 --- a/src/chrome/locale/ja/torlauncher.properties +++ b/src/chrome/locale/ja/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=終了 torlauncher.done=完了 torlauncher.forAssistance=サポートについては、%Sにお問い合わせください +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=コピー成功。 %S個のTorログファイルがテキストエディターやEメールにペーストする準備ができました。 diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties index c20a6ac..a8feef9 100644 --- a/src/chrome/locale/ko/torlauncher.properties +++ b/src/chrome/locale/ko/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=종료 torlauncher.done=완료 torlauncher.forAssistance=지원자 연결 %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=복사 완료. %S Tor 로그 메시지는 텍스트 편집기 나 이메일 메시지에 붙여 넣을 수 있는 상태가 됩니다. diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties index 12c0bf7..1f54f8a 100644 --- a/src/chrome/locale/nl/torlauncher.properties +++ b/src/chrome/locale/nl/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Sluit af torlauncher.done=OK torlauncher.forAssistance=Voor hulp, contacteer %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Kopiëren klaar. %S Tor logberichten zijn klaar om in een teksteditor of een e-mailbericht te worden geplakt. diff --git a/src/chrome/locale/pl/torlauncher.properties b/src/chrome/locale/pl/torlauncher.properties index 7ba4f88..89e0ffb 100644 --- a/src/chrome/locale/pl/torlauncher.properties +++ b/src/chrome/locale/pl/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Wyjście torlauncher.done=Gotowe torlauncher.forAssistance=By uzyskać pomoc, skontaktuj się +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Kopia zakończona. %S logi Tora są gotowe do wklejenia do notatnika lub wiadomości email. diff --git a/src/chrome/locale/pt/torlauncher.properties b/src/chrome/locale/pt/torlauncher.properties index 45b7a61..f8ff150 100644 --- a/src/chrome/locale/pt/torlauncher.properties +++ b/src/chrome/locale/pt/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Sair torlauncher.done=Concluído torlauncher.forAssistance=Para assistência, contacte %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Cópia completa. Estão prontas %S mensagens do registo de eventos do Tor para serem coladas num editor de texto ou numa mensagem de correio eletrónico. diff --git a/src/chrome/locale/ru/torlauncher.properties b/src/chrome/locale/ru/torlauncher.properties index 0b68b18..bfae389 100644 --- a/src/chrome/locale/ru/torlauncher.properties +++ b/src/chrome/locale/ru/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Выход torlauncher.done=Готово torlauncher.forAssistance=Для помощи свяжитесь с %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Копирование завершено. %S собщение с логами Tor находятся в буфере обмена и могут быть вставлены в текстовый редактор или email. diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties index 3b88714..c8b7ced 100644 --- a/src/chrome/locale/tr/torlauncher.properties +++ b/src/chrome/locale/tr/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Çıkış torlauncher.done=Tamamlandı torlauncher.forAssistance=Yardım için %S ile görüşün +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Kopyalama tamamlandı. %S Tor günlük iletisi bir metin düzenleyici ya da e-posta iletisine kopyalanmaya hazır. diff --git a/src/chrome/locale/vi/torlauncher.properties b/src/chrome/locale/vi/torlauncher.properties index 4ced031..fdd811f 100644 --- a/src/chrome/locale/vi/torlauncher.properties +++ b/src/chrome/locale/vi/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Thoát torlauncher.done=Hoàn thành torlauncher.forAssistance=Để được trợ giúp, liên hệ %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/zh-CN/torlauncher.properties b/src/chrome/locale/zh-CN/torlauncher.properties index 828415a..a5c3e49 100644 --- a/src/chrome/locale/zh-CN/torlauncher.properties +++ b/src/chrome/locale/zh-CN/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=关闭 torlauncher.done=完成 torlauncher.forAssistance=如需帮助，请联系 %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=复制完成。%S 条 Tor 日志信息已准备好，可以将其粘贴到文本编辑器或电子邮件中。

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] Bug 18821: Disable libmdns for Android and Desktop
by gk＠torproject.org 21 Apr '16

21 Apr '16

commit 7ce38290aaac3b6351061f9ecc5cd6751d10edb4 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 20 14:34:50 2016 +0000 Bug 18821: Disable libmdns for Android and Desktop There should be no need to remove the OS X support introduced in https://bugzilla.mozilla.org/show_bug.cgi?id=1225726 as enabling this is governed by a preference (which is actually set to `false`). However, we remove it at build time as well (defense in depth). This is basically a backout of the relevant passages of https://hg.mozilla.org/mozilla-central/rev/6bfb430de85d, https://hg.mozilla.org/mozilla-central/rev/609b337bf7ab and https://hg.mozilla.org/mozilla-central/rev/8e092ec5fbbd. --- .../provider/PresentationDeviceProviderModule.cpp | 2 +- mobile/android/installer/package-manifest.in | 2 -- netwerk/dns/mdns/libmdns/moz.build | 22 +++++++--------------- netwerk/dns/mdns/libmdns/nsMulticastDNSModule.cpp | 2 +- 4 files changed, 9 insertions(+), 19 deletions(-) diff --git a/dom/presentation/provider/PresentationDeviceProviderModule.cpp b/dom/presentation/provider/PresentationDeviceProviderModule.cpp index aafbed0..1e65208 100644 --- a/dom/presentation/provider/PresentationDeviceProviderModule.cpp +++ b/dom/presentation/provider/PresentationDeviceProviderModule.cpp @@ -28,7 +28,7 @@ static const mozilla::Module::ContractIDEntry kPresentationDeviceProviderContrac }; static const mozilla::Module::CategoryEntry kPresentationDeviceProviderCategories[] = { -#if defined(MOZ_WIDGET_COCOA) || defined(MOZ_WIDGET_ANDROID) || (defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 16) +#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 16 { PRESENTATION_DEVICE_PROVIDER_CATEGORY, "MulticastDNSDeviceProvider", MULTICAST_DNS_PROVIDER_CONTRACT_ID }, #endif { nullptr } diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index ac6ef47..53dbb1c 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -328,8 +328,6 @@ @BINPATH@/components/BrowserComponents.manifest @BINPATH@/components/nsBrowserContentHandler.js @BINPATH@/components/nsBrowserGlue.js -@BINPATH@/components/nsDNSServiceDiscovery.manifest -@BINPATH@/components/nsDNSServiceDiscovery.js @BINPATH@/components/nsSetDefaultBrowser.manifest @BINPATH@/components/nsSetDefaultBrowser.js @BINPATH@/components/toolkitsearch.manifest diff --git a/netwerk/dns/mdns/libmdns/moz.build b/netwerk/dns/mdns/libmdns/moz.build index 6671b5c..dcae472 100644 --- a/netwerk/dns/mdns/libmdns/moz.build +++ b/netwerk/dns/mdns/libmdns/moz.build @@ -4,14 +4,7 @@ # 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/. -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': - EXTRA_COMPONENTS += [ - 'nsDNSServiceDiscovery.js', - 'nsDNSServiceDiscovery.manifest', - ] - -elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa' or \ - (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] >= '16'): +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] >= '16': UNIFIED_SOURCES += [ 'MDNSResponderOperator.cpp', 'MDNSResponderReply.cpp', @@ -19,15 +12,14 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa' or \ ] LOCAL_INCLUDES += [ - '/netwerk/base', + '%' + '%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ + 'external/mdnsresponder/mDNSShared', + ] ] - if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - LOCAL_INCLUDES += [ - '%' + '%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ - 'external/mdnsresponder/mDNSShared', - ] - ] + LOCAL_INCLUDES += [ + '/netwerk/base', + ] UNIFIED_SOURCES += [ 'nsDNSServiceInfo.cpp', diff --git a/netwerk/dns/mdns/libmdns/nsMulticastDNSModule.cpp b/netwerk/dns/mdns/libmdns/nsMulticastDNSModule.cpp index 22bad3b..1ab3993 100644 --- a/netwerk/dns/mdns/libmdns/nsMulticastDNSModule.cpp +++ b/netwerk/dns/mdns/libmdns/nsMulticastDNSModule.cpp @@ -3,7 +3,7 @@ * 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/. */ -#if defined(MOZ_WIDGET_COCOA) || (defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 16) +#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 16 #define ENABLE_DNS_SERVICE_DISCOVERY #endif

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 21 Apr '16

21 Apr '16

commit c659c00756a77d0ca923aa21ca4e429deec3b3c5 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 21 11:01:00 2016 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. We want to be sure mozTCPSocket is really disabled (bug 18863). --- browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index e98e5c4..fbe6fb4 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -202,6 +202,8 @@ pref("devtools.debugger.chrome-debugging-host", "127.0.0.1"); // is |true|. This helps to avoid confusion e.g. in case the browser is // sandboxed. See bug 17502 for details. pref("browser.download.forbid_open_with", false); +// Disable mozTCPSocket for sure (bug 18863) +pref("dom.mozTCPSocket.enabled", false); // Security slider pref("svg.in-content.enabled", true);

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] Bug 18800: Remove localhost DNS lookup in nsProfileLock.cpp
by gk＠torproject.org 21 Apr '16

21 Apr '16

commit 1afada0068a11265f291b8c836854391f532e754 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Apr 21 10:40:26 2016 -0400 Bug 18800: Remove localhost DNS lookup in nsProfileLock.cpp Instead of using the local computer's IP address within symlink-based profile lock signatures, always use 127.0.0.1. --- toolkit/profile/nsProfileLock.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/toolkit/profile/nsProfileLock.cpp b/toolkit/profile/nsProfileLock.cpp index 9b26087..d71816d 100644 --- a/toolkit/profile/nsProfileLock.cpp +++ b/toolkit/profile/nsProfileLock.cpp @@ -344,20 +344,16 @@ nsresult nsProfileLock::LockWithSymlink(nsIFile *aLockFile, bool aHaveFcntlLock) if (!mReplacedLockTime) aLockFile->GetLastModifiedTimeOfLink(&mReplacedLockTime); + // For Tor Browser, avoid a DNS lookup here so the Tor network is not + // bypassed. Instead, always use 127.0.0.1 for the IP address portion + // of the lock signature, which may cause the browser to refuse to + // start in the rare event that all of the following conditions are met: + // 1. The browser profile is on a network file system. + // 2. The file system does not support fcntl() locking. + // 3. Tor Browser is run from two different computers at the same time. struct in_addr inaddr; inaddr.s_addr = htonl(INADDR_LOOPBACK); - char hostname[256]; - PRStatus status = PR_GetSystemInfo(PR_SI_HOSTNAME, hostname, sizeof hostname); - if (status == PR_SUCCESS) - { - char netdbbuf[PR_NETDB_BUF_SIZE]; - PRHostEnt hostent; - status = PR_GetHostByName(hostname, netdbbuf, sizeof netdbbuf, &hostent); - if (status == PR_SUCCESS) - memcpy(&inaddr, hostent.h_addr, sizeof inaddr); - } - char *signature = PR_smprintf("%s:%s%lu", inet_ntoa(inaddr), aHaveFcntlLock ? "+" : "", (unsigned long)getpid());

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 21 Apr '16

21 Apr '16

commit c09f525e5fab36a204291a2cae018a98be92018a Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Apr 18 11:08:41 2016 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. We disable HTTP Alternative-Services (bug 16673). --- browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 4935bcd..e98e5c4 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -149,6 +149,8 @@ pref("privacy.thirdparty.isolate", 2); // Always enforce third party isolation pref("network.http.spdy.enabled.http2", false); // Temporarily disabled pending implementation review pref("network.http.spdy.enabled.http2draft", false); // Temporarily disabled pending implementation review pref("network.predictor.enabled", false); // Temporarily disabled. See https://bugs.torproject.org/16633 +pref("network.http.altsvc.enabled", false); // Temporarily disabled. See https://bugs.torproject.org/16673 +pref("network.http.altsvc.oe", false); // Temporarily disabled. See https://bugs.torproject.org/16673 // Proxy and proxy security pref("network.proxy.socks", "127.0.0.1");

1 0

[tor-launcher/master] Translation updates
by gk＠torproject.org 21 Apr '16

21 Apr '16

commit fffc7ee3e157198664cd5b1140773ad069dd3c5b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 21 07:02:13 2016 +0000 Translation updates --- src/chrome/locale/ach/torlauncher.properties | 6 +- src/chrome/locale/ady/torlauncher.properties | 6 +- src/chrome/locale/af/torlauncher.properties | 6 +- src/chrome/locale/ak/torlauncher.properties | 6 +- src/chrome/locale/am/torlauncher.properties | 6 +- src/chrome/locale/ar/network-settings.dtd | 24 ++--- src/chrome/locale/ar/progress.dtd | 2 +- src/chrome/locale/ar/torlauncher.properties | 6 +- src/chrome/locale/arn/torlauncher.properties | 6 +- src/chrome/locale/ast/torlauncher.properties | 6 +- src/chrome/locale/az/torlauncher.properties | 6 +- src/chrome/locale/be/torlauncher.properties | 6 +- src/chrome/locale/bg/network-settings.dtd | 20 ++-- src/chrome/locale/bg/progress.dtd | 2 +- src/chrome/locale/bg/torlauncher.properties | 6 +- src/chrome/locale/bn-BD/torlauncher.properties | 6 +- src/chrome/locale/bn-IN/torlauncher.properties | 6 +- src/chrome/locale/bn/torlauncher.properties | 6 +- src/chrome/locale/bo/torlauncher.properties | 6 +- src/chrome/locale/br/torlauncher.properties | 6 +- src/chrome/locale/bs/torlauncher.properties | 6 +- src/chrome/locale/ca/network-settings.dtd | 2 +- src/chrome/locale/ca/progress.dtd | 2 +- src/chrome/locale/ca/torlauncher.properties | 6 +- src/chrome/locale/cs/progress.dtd | 2 +- src/chrome/locale/cs/torlauncher.properties | 6 +- src/chrome/locale/csb/torlauncher.properties | 6 +- src/chrome/locale/cv/torlauncher.properties | 6 +- src/chrome/locale/cy/network-settings.dtd | 6 +- src/chrome/locale/cy/torlauncher.properties | 12 +-- src/chrome/locale/da/torlauncher.properties | 6 +- src/chrome/locale/de/network-settings.dtd | 20 ++-- src/chrome/locale/de/progress.dtd | 2 +- src/chrome/locale/de/torlauncher.properties | 6 +- src/chrome/locale/dz/torlauncher.properties | 6 +- src/chrome/locale/el/network-settings.dtd | 20 ++-- src/chrome/locale/el/progress.dtd | 2 +- src/chrome/locale/el/torlauncher.properties | 8 +- src/chrome/locale/en-GB/torlauncher.properties | 6 +- src/chrome/locale/en/network-settings.dtd | 2 +- src/chrome/locale/en/torlauncher.properties | 1 - src/chrome/locale/eo/torlauncher.properties | 6 +- src/chrome/locale/es-AR/network-settings.dtd | 2 +- src/chrome/locale/es-AR/torlauncher.properties | 6 +- src/chrome/locale/es-CL/torlauncher.properties | 6 +- src/chrome/locale/es-CO/network-settings.dtd | 6 +- src/chrome/locale/es-CO/torlauncher.properties | 6 +- src/chrome/locale/es-MX/progress.dtd | 2 +- src/chrome/locale/es-MX/torlauncher.properties | 6 +- src/chrome/locale/es/torlauncher.properties | 6 +- src/chrome/locale/et/torlauncher.properties | 8 +- src/chrome/locale/eu/torlauncher.properties | 6 +- src/chrome/locale/fa/network-settings.dtd | 4 +- src/chrome/locale/fa/torlauncher.properties | 6 +- src/chrome/locale/fi/network-settings.dtd | 6 +- src/chrome/locale/fi/progress.dtd | 3 +- src/chrome/locale/fi/torlauncher.properties | 6 +- src/chrome/locale/fil/torlauncher.properties | 6 +- src/chrome/locale/fo/torlauncher.properties | 6 +- src/chrome/locale/fr-CA/network-settings.dtd | 2 +- src/chrome/locale/fr-CA/torlauncher.properties | 6 +- src/chrome/locale/fr/network-settings.dtd | 28 +++--- src/chrome/locale/fr/progress.dtd | 2 +- src/chrome/locale/fr/torlauncher.properties | 10 +- src/chrome/locale/fur/torlauncher.properties | 6 +- src/chrome/locale/fy/torlauncher.properties | 6 +- src/chrome/locale/ga/torlauncher.properties | 6 +- src/chrome/locale/gl/torlauncher.properties | 6 +- src/chrome/locale/gu-IN/torlauncher.properties | 6 +- src/chrome/locale/gu/torlauncher.properties | 8 +- src/chrome/locale/gun/torlauncher.properties | 6 +- src/chrome/locale/ha/torlauncher.properties | 6 +- src/chrome/locale/he/torlauncher.properties | 6 +- src/chrome/locale/hi/torlauncher.properties | 6 +- src/chrome/locale/hr-HR/network-settings.dtd | 22 ++--- src/chrome/locale/hr-HR/progress.dtd | 2 +- src/chrome/locale/hr-HR/torlauncher.properties | 6 +- src/chrome/locale/hr/progress.dtd | 2 +- src/chrome/locale/hr/torlauncher.properties | 6 +- src/chrome/locale/ht/torlauncher.properties | 6 +- src/chrome/locale/hu/network-settings.dtd | 20 ++-- src/chrome/locale/hu/progress.dtd | 2 +- src/chrome/locale/hu/torlauncher.properties | 6 +- src/chrome/locale/hy/torlauncher.properties | 6 +- src/chrome/locale/ia/torlauncher.properties | 6 +- src/chrome/locale/id/network-settings.dtd | 16 +-- src/chrome/locale/id/torlauncher.properties | 6 +- src/chrome/locale/is/progress.dtd | 2 +- src/chrome/locale/is/torlauncher.properties | 6 +- src/chrome/locale/it/network-settings.dtd | 20 ++-- src/chrome/locale/it/progress.dtd | 2 +- src/chrome/locale/it/torlauncher.properties | 6 +- src/chrome/locale/ja/network-settings.dtd | 4 +- src/chrome/locale/ja/torlauncher.properties | 6 +- src/chrome/locale/jv/torlauncher.properties | 6 +- src/chrome/locale/ka/network-settings.dtd | 6 +- src/chrome/locale/ka/torlauncher.properties | 8 +- src/chrome/locale/kk/torlauncher.properties | 6 +- src/chrome/locale/km/torlauncher.properties | 6 +- src/chrome/locale/kn/torlauncher.properties | 6 +- src/chrome/locale/ko-KR/torlauncher.properties | 6 +- src/chrome/locale/ko/torlauncher.properties | 8 +- src/chrome/locale/ku/torlauncher.properties | 6 +- src/chrome/locale/kw/torlauncher.properties | 6 +- src/chrome/locale/ky/torlauncher.properties | 6 +- src/chrome/locale/lb/torlauncher.properties | 6 +- src/chrome/locale/lg/torlauncher.properties | 6 +- src/chrome/locale/ln/torlauncher.properties | 6 +- src/chrome/locale/lo/torlauncher.properties | 6 +- src/chrome/locale/lt/torlauncher.properties | 6 +- src/chrome/locale/lv/torlauncher.properties | 6 +- src/chrome/locale/mg/torlauncher.properties | 6 +- src/chrome/locale/mi/torlauncher.properties | 6 +- src/chrome/locale/mk/torlauncher.properties | 8 +- src/chrome/locale/ml/torlauncher.properties | 6 +- src/chrome/locale/mn/torlauncher.properties | 6 +- src/chrome/locale/mr/network-settings.dtd | 2 +- src/chrome/locale/mr/torlauncher.properties | 6 +- src/chrome/locale/ms-MY/torlauncher.properties | 8 +- src/chrome/locale/mt/torlauncher.properties | 6 +- src/chrome/locale/my/torlauncher.properties | 8 +- src/chrome/locale/nah/torlauncher.properties | 6 +- src/chrome/locale/nap/torlauncher.properties | 6 +- src/chrome/locale/nb/network-settings.dtd | 48 ++++----- src/chrome/locale/nb/progress.dtd | 4 +- src/chrome/locale/nb/torlauncher.properties | 22 ++--- src/chrome/locale/nds/torlauncher.properties | 6 +- src/chrome/locale/ne/torlauncher.properties | 6 +- src/chrome/locale/nl-BE/torlauncher.properties | 6 +- src/chrome/locale/nl/network-settings.dtd | 20 ++-- src/chrome/locale/nl/progress.dtd | 5 +- src/chrome/locale/nl/torlauncher.properties | 6 +- src/chrome/locale/nn/network-settings.dtd | 36 +++---- src/chrome/locale/nn/torlauncher.properties | 16 +-- src/chrome/locale/nso/torlauncher.properties | 6 +- src/chrome/locale/oc/torlauncher.properties | 6 +- src/chrome/locale/or/torlauncher.properties | 6 +- src/chrome/locale/pa/torlauncher.properties | 6 +- src/chrome/locale/pap/torlauncher.properties | 6 +- src/chrome/locale/pl/network-settings.dtd | 20 ++-- src/chrome/locale/pl/progress.dtd | 2 +- src/chrome/locale/pl/torlauncher.properties | 6 +- src/chrome/locale/pms/torlauncher.properties | 6 +- src/chrome/locale/ps/torlauncher.properties | 6 +- src/chrome/locale/pt-BR/network-settings.dtd | 20 ++-- src/chrome/locale/pt-BR/progress.dtd | 2 +- src/chrome/locale/pt-BR/torlauncher.properties | 6 +- src/chrome/locale/pt/network-settings.dtd | 30 +++--- src/chrome/locale/pt/torlauncher.properties | 6 +- src/chrome/locale/ro/network-settings.dtd | 20 ++-- src/chrome/locale/ro/progress.dtd | 2 +- src/chrome/locale/ro/torlauncher.properties | 6 +- src/chrome/locale/ru/network-settings.dtd | 20 ++-- src/chrome/locale/ru/progress.dtd | 2 +- src/chrome/locale/ru/torlauncher.properties | 6 +- .../locale/ru(a)petr1708/torlauncher.properties | 6 +- src/chrome/locale/sco/torlauncher.properties | 8 +- src/chrome/locale/si-LK/torlauncher.properties | 8 +- src/chrome/locale/sk-SK/torlauncher.properties | 6 +- src/chrome/locale/sk/torlauncher.properties | 6 +- src/chrome/locale/sl-SI/torlauncher.properties | 6 +- src/chrome/locale/sl/torlauncher.properties | 8 +- src/chrome/locale/sn/torlauncher.properties | 6 +- src/chrome/locale/so/torlauncher.properties | 6 +- src/chrome/locale/son/torlauncher.properties | 6 +- src/chrome/locale/sq/network-settings.dtd | 24 ++--- src/chrome/locale/sq/progress.dtd | 2 +- src/chrome/locale/sq/torlauncher.properties | 6 +- src/chrome/locale/sr/torlauncher.properties | 6 +- src/chrome/locale/sr(a)latin/network-settings.dtd | 2 +- src/chrome/locale/sr(a)latin/torlauncher.properties | 8 +- src/chrome/locale/st/torlauncher.properties | 6 +- src/chrome/locale/su/torlauncher.properties | 6 +- src/chrome/locale/sv/network-settings.dtd | 20 ++-- src/chrome/locale/sv/progress.dtd | 2 +- src/chrome/locale/sv/torlauncher.properties | 6 +- src/chrome/locale/sw/torlauncher.properties | 8 +- src/chrome/locale/szl/torlauncher.properties | 6 +- src/chrome/locale/ta/torlauncher.properties | 6 +- src/chrome/locale/te-IN/torlauncher.properties | 6 +- src/chrome/locale/te/torlauncher.properties | 6 +- src/chrome/locale/tg/torlauncher.properties | 6 +- src/chrome/locale/th/torlauncher.properties | 6 +- src/chrome/locale/ti/torlauncher.properties | 6 +- src/chrome/locale/tk/torlauncher.properties | 6 +- src/chrome/locale/tr/network-settings.dtd | 24 ++--- src/chrome/locale/tr/progress.dtd | 2 +- src/chrome/locale/tr/torlauncher.properties | 12 +-- src/chrome/locale/uk/network-settings.dtd | 20 ++-- src/chrome/locale/uk/progress.dtd | 2 +- src/chrome/locale/uk/torlauncher.properties | 6 +- src/chrome/locale/ur-PK/torlauncher.properties | 6 +- src/chrome/locale/ur/torlauncher.properties | 6 +- src/chrome/locale/uz/network-settings.dtd | 2 +- src/chrome/locale/uz/torlauncher.properties | 6 +- src/chrome/locale/ve/torlauncher.properties | 6 +- src/chrome/locale/vi/torlauncher.properties | 6 +- src/chrome/locale/wa/torlauncher.properties | 6 +- src/chrome/locale/wo/torlauncher.properties | 6 +- src/chrome/locale/zh-CN/network-settings.dtd | 22 ++--- src/chrome/locale/zh-CN/progress.dtd | 2 +- src/chrome/locale/zh-CN/torlauncher.properties | 6 +- src/chrome/locale/zh-HK/network-settings.dtd | 108 ++++++++++----------- src/chrome/locale/zh-HK/progress.dtd | 8 +- src/chrome/locale/zh-HK/torlauncher.properties | 86 ++++++++-------- src/chrome/locale/zh-TW/network-settings.dtd | 24 ++--- src/chrome/locale/zh-TW/progress.dtd | 6 +- src/chrome/locale/zh-TW/torlauncher.properties | 48 ++++----- src/chrome/locale/zu/torlauncher.properties | 6 +- 209 files changed, 909 insertions(+), 908 deletions(-) diff --git a/src/chrome/locale/ach/torlauncher.properties b/src/chrome/locale/ach/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/ach/torlauncher.properties +++ b/src/chrome/locale/ach/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/ady/torlauncher.properties b/src/chrome/locale/ady/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/ady/torlauncher.properties +++ b/src/chrome/locale/ady/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/af/torlauncher.properties b/src/chrome/locale/af/torlauncher.properties index c347389..fbe21f3 100644 --- a/src/chrome/locale/af/torlauncher.properties +++ b/src/chrome/locale/af/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/ak/torlauncher.properties b/src/chrome/locale/ak/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/ak/torlauncher.properties +++ b/src/chrome/locale/ak/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/am/torlauncher.properties b/src/chrome/locale/am/torlauncher.properties index 8329edd..9dc4e45 100644 --- a/src/chrome/locale/am/torlauncher.properties +++ b/src/chrome/locale/am/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd index 9d42278..4d98519 100644 --- a/src/chrome/locale/ar/network-settings.dtd +++ b/src/chrome/locale/ar/network-settings.dtd @@ -1,8 +1,8 @@ <!ENTITY torsettings.dialog.title "إعدادات الشبكة">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "لغة متصفح تور"> +<!ENTITY torlauncher.localePicker.prompt "الرجاء اختيار لغة">  @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "أي مما يلي يعتبر وصف افضل لموقفك؟"> <!ENTITY torSettings.configurePrompt1 "اتصال هذا الحاسب بالإنترنت محجوب أو له بروكسي."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "احتاج الى موافقه جسر او إعدادات بروكسي موضعي قبل الاتصال بشبكه  تور"> <!ENTITY torSettings.configure "تكوين"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "اود انشاء اتصال مباشر بشبكه تور."> <!ENTITY torSettings.connectPrompt3 "سيصلح هذا في معظم الحالات."> <!ENTITY torSettings.connect "اتصل"> <!ENTITY torSettings.proxyPageTitle "إعداد البروكسي المحلّي"> <!ENTITY torSettings.proxyQuestion "هل يحتاج هذا الكمبيوتر لاستخدام وكيل محلي للاتصال بالإنترنت؟">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "في معضم الحالات لايوجب استخدام بروكسي محلي، ولكننى نوصي باستخدامه عند انشاء اتصال من شبكه شركه، مدرسه، او جامعه."> +<!ENTITY torSettings.proxyExplanation2 "في حاله عدم معرفتك عن كيفيه اجابه هذا السؤال، يمكنك الاطلاع على متصفح آخر او اعدادات الشبكه لنظام التشغيل لمعرفه فيما اذا كان استخدام بروكسي مطلوب."> <!ENTITY torSettings.enterProxy "أدخل إعدادات البروكسي."> <!ENTITY torSettings.bridgePageTitle "إعداد جسور تور."> <!ENTITY torSettings.bridgeQuestion "هل يقوم مقدم خدمة الإنترنت (ISP) الذي تتعامل معه بحجب الاتصالات بشبكة Tor أو مراقبتها بطريقة أخرى؟"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "اذا لم تكن متاكدا على كيفيه اجابه هذا السؤال، الرجاء اختيار لا( اذا لم تتمكن من الاتصال بشبكه تور بدون جسر، يمكنك اضافه جسر لاحق)"> +<!ENTITY torSettings.bridgeExplanation2 "اذا قمت باختيار نعم، سيتم سؤالك عن اعدادات جسر تور، حيث انها مرحلات غير مدرجة تصعب عمليه حجب الاتصال بشبكه تور."> <!ENTITY torSettings.bridgeSettingsPrompt "يمكنك استخدام مجموعة الجسور المتوفرة أو الحصول على مجموعة مخصصة من الجسور.">  <!ENTITY torsettings.startingTor "في انتظار تور حتي يبدء بالعمل..."> <!ENTITY torsettings.restartTor "إعادة تشغيل تور"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "إعادة إعداد"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "قمت بضبت جسر تور او ادخلت اعدادات بروكسي محلي.  لانشاء اتصال مباشر بشبكه تور، يجب ازاله هذه الاعدادات."> +<!ENTITY torsettings.discardSettings.proceed "ازل الاعدادات ثم اتصل"> <!ENTITY torsettings.optional "اختياري"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "المنافذ المسموح بها:"> <!ENTITY torsettings.useBridges.checkbox "مزود خدمة الإنترنت الخاص بي (ISP) يمنع الاتصالات بشبكة تور"> <!ENTITY torsettings.useBridges.default "الاتصال بالجسور المتوفرة"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "كل جسر يستخدم طريقه مختلفه لتجنب الحجب.  في حاله عدم نجاح احد الجسور في العمل، قم بتجربه جسر مختلف."> <!ENTITY torsettings.useBridges.type "نوع النقل:"> <!ENTITY torsettings.useBridges.custom "إدخال جسور مخصصة"> <!ENTITY torsettings.useBridges.label "ادخل جسر او اكثر (جسر واحد في كل سطر)."> diff --git a/src/chrome/locale/ar/progress.dtd b/src/chrome/locale/ar/progress.dtd index ef4cfb9..90ac171 100644 --- a/src/chrome/locale/ar/progress.dtd +++ b/src/chrome/locale/ar/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "حالة تور"> <!ENTITY torprogress.openSettings "افتح الإعدادات"> <!ENTITY torprogress.heading "جاري الاتصال بشبكة تور"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "الرجاء الانتظار حتى نتمكن من تفعيل اتصال الى شبكه "تور" .  قد يستغرق الامر عده دقائق."> diff --git a/src/chrome/locale/ar/torlauncher.properties b/src/chrome/locale/ar/torlauncher.properties index 2fc973e..172dbcc 100644 --- a/src/chrome/locale/ar/torlauncher.properties +++ b/src/chrome/locale/ar/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=مُشغل تور @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S فشل(%2$S). torlauncher.unable_to_start_tor=غير قادر علي بدء تشغيل تور.\n\n%S torlauncher.tor_missing=الملف التنفيذي لتور مفقود. -torlauncher.torrc_missing=ملف torrc مفقود. -torlauncher.datadir_missing=مجلد data الخاص بتور غير موجود. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=فشل في الحصول على كلمة المرور المجزأة. torlauncher.failed_to_get_settings=غير قادر علي جلب إعدادات تور.\n\n%S diff --git a/src/chrome/locale/arn/torlauncher.properties b/src/chrome/locale/arn/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/arn/torlauncher.properties +++ b/src/chrome/locale/arn/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/ast/torlauncher.properties b/src/chrome/locale/ast/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/ast/torlauncher.properties +++ b/src/chrome/locale/ast/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/az/torlauncher.properties b/src/chrome/locale/az/torlauncher.properties index 55df92f..50fa4cb 100644 --- a/src/chrome/locale/az/torlauncher.properties +++ b/src/chrome/locale/az/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor İşlədici @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S xətası (%2$S). torlauncher.unable_to_start_tor=Tor başlaya bilmir.\n\n%S torlauncher.tor_missing=İcra edilə bilən Tor çatışmır. -torlauncher.torrc_missing=Torrc faylı çatışmır. -torlauncher.datadir_missing=Tor məlumat kataloqu mövcud deyil. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Qarışıd şifrə əldə edə bilmədi. torlauncher.failed_to_get_settings=Tor parametrlərinin bərpası mümkün olmadı.\n\n%S diff --git a/src/chrome/locale/be/torlauncher.properties b/src/chrome/locale/be/torlauncher.properties index 68ed6bf..4268916 100644 --- a/src/chrome/locale/be/torlauncher.properties +++ b/src/chrome/locale/be/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/bg/network-settings.dtd b/src/chrome/locale/bg/network-settings.dtd index 94bd5f1..3c4bc72 100644 --- a/src/chrome/locale/bg/network-settings.dtd +++ b/src/chrome/locale/bg/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "Кое от следните описва най-добре вашата ситуация?"> <!ENTITY torSettings.configurePrompt1 "Интернет връзката на този компютър е цензурирана или минава през proxy сървър."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Трябва да конфигурират bridge или proxy настройки преди свързване към Tor мрежата."> <!ENTITY torSettings.configure "Конфигурирай"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Бих искал да се свържа директно към Tor мрежата."> <!ENTITY torSettings.connectPrompt3 "Това ще работи при повечето ситуации."> <!ENTITY torSettings.connect "Свържи се"> <!ENTITY torSettings.proxyPageTitle "Локални прокси настройки"> <!ENTITY torSettings.proxyQuestion "Този компютър използва ли локално прокси за достъп до Интернет?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "В повечето случаи не е необходима локално прокси, но то може да се изисква, когато се свързвате от корпоративна, училищна или университетска мрежа."> +<!ENTITY torSettings.proxyExplanation2 "Ако не сте сигурни как да отговорите на този въпрос, погледнете настройките на Интернет в друг браузър или проверете мрежовите настройки на вашата система, за да видите дали е необходимо локално прокси."> <!ENTITY torSettings.enterProxy "Въведете настройките за прокси."> <!ENTITY torSettings.bridgePageTitle "Настройки на Тор бриджове"> <!ENTITY torSettings.bridgeQuestion "Блокирани или цензурирани ли са връзките към Tor Мрежата от вашият Интернет Доставчик(ISP)?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Ако не сте сигурни как да отговори на този въпрос, изберете Не (ако не сте в състояние да се свържете с Tor мрежата без bridge, може да го добавите по-късно)."> +<!ENTITY torSettings.bridgeExplanation2 "Ако изберете Да, ще бъдете помолени да изберете Tor Bridges, които са неофициални relays, което прави по-трудно да се блокира връзката към Tor мрежата."> <!ENTITY torSettings.bridgeSettingsPrompt "Вие може да използвате предложените комплекти от bridges или може да изисквате персонализиран комплект от тях.">  <!ENTITY torsettings.startingTor "Изчакване на Tor да стартира..."> <!ENTITY torsettings.restartTor "Рестартирайте Тор"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Преконфигуриране"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Вие сте конфигурирали Tor bridges или сте въвели местните настройките на прокси сървъра.  За да направите директно свързване към Tor мрежата, тези настройки трябва да бъдат отстранени."> +<!ENTITY torsettings.discardSettings.proceed "Премахване на Настройките и Свързване"> <!ENTITY torsettings.optional "Допълнителен"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Позволени портове:"> <!ENTITY torsettings.useBridges.checkbox "Моят Интернет Доставчик (ISP) блокира връзките към Tor мрежата"> <!ENTITY torsettings.useBridges.default "Свържи се с предоставените bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Всеки вид bridge използва различен метод, за да се избегне цензурата.  Ако един bridge не работи, опитайте отново като използвате друг."> <!ENTITY torsettings.useBridges.type "Тип транспортиране:"> <!ENTITY torsettings.useBridges.custom "Въведи персонални bridges"> <!ENTITY torsettings.useBridges.label "Въведи един или повече bridge relays (по един на линия)."> diff --git a/src/chrome/locale/bg/progress.dtd b/src/chrome/locale/bg/progress.dtd index 1c89f2e..134ee70 100644 --- a/src/chrome/locale/bg/progress.dtd +++ b/src/chrome/locale/bg/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Състояние на Тор"> <!ENTITY torprogress.openSettings "Отвори настройки"> <!ENTITY torprogress.heading "Свързване с Тор мрежата"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Моля изчакайте,докато установим връзка с Тор мрежата..  Toва може да отнеме няколко минути."> diff --git a/src/chrome/locale/bg/torlauncher.properties b/src/chrome/locale/bg/torlauncher.properties index af17760..d49e228 100644 --- a/src/chrome/locale/bg/torlauncher.properties +++ b/src/chrome/locale/bg/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Тор лънчер @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S несупя да (%2$S). torlauncher.unable_to_start_tor=Невъзможно е да се стартира Tor.\n\n%S torlauncher.tor_missing=Приложението "Tor" липсва. -torlauncher.torrc_missing=Файла "torrc" липсва. -torlauncher.datadir_missing=Дата директорията на Тор не съществува +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Проблем с изтеглянето на хеширани пароли. torlauncher.failed_to_get_settings=Невъзможно е получаването на настройките на Tor.\n\n%S diff --git a/src/chrome/locale/bn-BD/torlauncher.properties b/src/chrome/locale/bn-BD/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/bn-BD/torlauncher.properties +++ b/src/chrome/locale/bn-BD/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/bn-IN/torlauncher.properties b/src/chrome/locale/bn-IN/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/bn-IN/torlauncher.properties +++ b/src/chrome/locale/bn-IN/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/bn/torlauncher.properties b/src/chrome/locale/bn/torlauncher.properties index fd9face..2b81438 100644 --- a/src/chrome/locale/bn/torlauncher.properties +++ b/src/chrome/locale/bn/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S ব্যর্থ হয়েছে torlauncher.unable_to_start_tor=টর শুরু করা সম্ভব নয়।\n\n%S torlauncher.tor_missing= Tor executable নথিটি পাওয়া যাচ্ছে না। -torlauncher.torrc_missing=torrc নথিটি পাওয়া যাচ্ছে না। -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/bo/torlauncher.properties b/src/chrome/locale/bo/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/bo/torlauncher.properties +++ b/src/chrome/locale/bo/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/br/torlauncher.properties b/src/chrome/locale/br/torlauncher.properties index 5860c8a..715581c 100644 --- a/src/chrome/locale/br/torlauncher.properties +++ b/src/chrome/locale/br/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/bs/torlauncher.properties b/src/chrome/locale/bs/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/bs/torlauncher.properties +++ b/src/chrome/locale/bs/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/ca/network-settings.dtd b/src/chrome/locale/ca/network-settings.dtd index e344598..d160434 100644 --- a/src/chrome/locale/ca/network-settings.dtd +++ b/src/chrome/locale/ca/network-settings.dtd @@ -15,7 +15,7 @@ <!ENTITY torSettings.configurePrompt1 "La connexió a internet d'aquest ordinador està censurada o configurada amb un proxy. "> <!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> <!ENTITY torSettings.configure "Configura"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "M'agradaria fer una connexió directa a la red Tor."> <!ENTITY torSettings.connectPrompt3 "Això funciona en la majoria dels casos."> <!ENTITY torSettings.connect "Conectar"> diff --git a/src/chrome/locale/ca/progress.dtd b/src/chrome/locale/ca/progress.dtd index 331193c..06eba3a 100644 --- a/src/chrome/locale/ca/progress.dtd +++ b/src/chrome/locale/ca/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Estat de Tor"> <!ENTITY torprogress.openSettings "Obrir preferències."> <!ENTITY torprogress.heading "S'està connectant a la xarxa Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Per favor, esperi mentre establim la connexió amb la red de Tor.  L'acció pot durar varis minuts."> diff --git a/src/chrome/locale/ca/torlauncher.properties b/src/chrome/locale/ca/torlauncher.properties index 520ffda..493777c 100644 --- a/src/chrome/locale/ca/torlauncher.properties +++ b/src/chrome/locale/ca/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Inicialitzador Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S ha fallat (%2$S). torlauncher.unable_to_start_tor=Impossible iniciar Tor.\n%S torlauncher.tor_missing=Falta l'executable de Tor. -torlauncher.torrc_missing=Falta l'arxiu torrc. -torlauncher.datadir_missing=La carpeta de dades de Tor no existeix. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Ha fallat l'obtencio de la contrasenya hash. torlauncher.failed_to_get_settings=Impossible obtenir la configuració de Tor\n%S diff --git a/src/chrome/locale/cs/progress.dtd b/src/chrome/locale/cs/progress.dtd index e91a01f..0311994 100644 --- a/src/chrome/locale/cs/progress.dtd +++ b/src/chrome/locale/cs/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Stav"> <!ENTITY torprogress.openSettings "Otevřít nastavení"> <!ENTITY torprogress.heading "Připojuji se k síti Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Prosím čekejte zatímco se připojuji do Tor sítě.  Toto může trvat několik minut."> diff --git a/src/chrome/locale/cs/torlauncher.properties b/src/chrome/locale/cs/torlauncher.properties index 0701889..59cbb65 100644 --- a/src/chrome/locale/cs/torlauncher.properties +++ b/src/chrome/locale/cs/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor spouštěč @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S selhal (%2$S). torlauncher.unable_to_start_tor=Tor není schopen startovat\n\n%S torlauncher.tor_missing=Spustitelný soubor Tor chybí. -torlauncher.torrc_missing=Chybí soubor torrc. -torlauncher.datadir_missing=Adresář s daty Tor neexistuje. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Nepovedlo se získat hashované heslo. torlauncher.failed_to_get_settings=Nelze načíst Tor nastavení.\n\n%S diff --git a/src/chrome/locale/csb/torlauncher.properties b/src/chrome/locale/csb/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/csb/torlauncher.properties +++ b/src/chrome/locale/csb/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/cv/torlauncher.properties b/src/chrome/locale/cv/torlauncher.properties index f55f173..86270c5 100644 --- a/src/chrome/locale/cv/torlauncher.properties +++ b/src/chrome/locale/cv/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/cy/network-settings.dtd b/src/chrome/locale/cy/network-settings.dtd index e743cc1..7aa3ddc 100644 --- a/src/chrome/locale/cy/network-settings.dtd +++ b/src/chrome/locale/cy/network-settings.dtd @@ -1,8 +1,8 @@ <!ENTITY torsettings.dialog.title "Gosodiadau Rhwydwaith Tor">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Iaith Porwr Tor"> +<!ENTITY torlauncher.localePicker.prompt "Dewiswch iaith">  @@ -34,7 +34,7 @@  <!ENTITY torsettings.startingTor "Yn aros am Tor i gychwyn…"> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Ailgychwyn Tor"> <!ENTITY torsettings.reconfigTor "Reconfigure"> <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> diff --git a/src/chrome/locale/cy/torlauncher.properties b/src/chrome/locale/cy/torlauncher.properties index 5119e81..6781d61 100644 --- a/src/chrome/locale/cy/torlauncher.properties +++ b/src/chrome/locale/cy/torlauncher.properties @@ -1,10 +1,10 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Lansiwr Tor torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.tor_exited2=Ni fydd ailgychwyn Tor yn cau'ch tabiau porwr. torlauncher.tor_controlconn_failed=Ni allai gysylltu â'r porth rheolaeth Tor. torlauncher.tor_failed_to_start=Methodd Tor gychwyn. torlauncher.tor_control_failed=Methu cymryd rheolaeth o Tor. @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=Methodd %1$S (%2$S). torlauncher.unable_to_start_tor=Methu cychwyn Tor.\n\n%S torlauncher.tor_missing=Mae'r gweithredadwyn Tor ar goll. -torlauncher.torrc_missing=Mae'r ffeil torrc ar goll. -torlauncher.datadir_missing=Nid yw'r cyfeiriadur data Tor yn bodoli. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Methwyd gael cyfrinair stwnshlyd. torlauncher.failed_to_get_settings=Methwyd nôl gosodiadau Tor.\n\n%S @@ -30,14 +30,14 @@ torlauncher.error_bridge_bad_default_type=Does ddim pontiau a ddatparwyd gyda'r torlauncher.recommended_bridge=(awgrymwyd) torlauncher.connect=Cysylltu -torlauncher.restart_tor=Restart Tor +torlauncher.restart_tor=Ailgychwyn Tor torlauncher.quit=Cau torlauncher.quit_win=Gadael torlauncher.done=Wedi gorffen torlauncher.forAssistance=Am gymorth, cysylltu â %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Copio wedi gorffen. Mae %S o negeseuon log Tor yn barod i'u gludo mewn golygydd testun neu neges ebost. torlauncher.bootstrapStatus.conn_dir=Cysylltu i cyfeiriadur cyfnewid torlauncher.bootstrapStatus.handshake_dir=Yn sefydlu cysylltiad cyfeiriadur amgryptiedig diff --git a/src/chrome/locale/da/torlauncher.properties b/src/chrome/locale/da/torlauncher.properties index 2c7c9ca..81f11ad 100644 --- a/src/chrome/locale/da/torlauncher.properties +++ b/src/chrome/locale/da/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor starter @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S fejlede (%2$S). torlauncher.unable_to_start_tor=Kan ikke starte Tor.\n\n%S torlauncher.tor_missing=Kunne ikke finde Tor programmet. -torlauncher.torrc_missing=Torrc-filen mangler. -torlauncher.datadir_missing=Tor's data bibliotek eksisterer ikke. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Kunne ikke finde hash-værdi af kodeordet. torlauncher.failed_to_get_settings=Kunne ikke læse Tor indstillingerne..⏎\n⏎\n%S diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd index ef926d5..96edf34 100644 --- a/src/chrome/locale/de/network-settings.dtd +++ b/src/chrome/locale/de/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "Was beschreibt Ihre Situation am besten?"> <!ENTITY torSettings.configurePrompt1 "Die Internetverbindung dieses Rechner ist zensiert oder vermittelt."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Ich muss eine Netzwerkbrücke oder lokale Proxy-Einstellungen konfigurieren, bevor ich mich mit dem Tor Netzwerk verbinde."> <!ENTITY torSettings.configure "Konfigurieren"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Ich würde gerne eine direkte Verbindung mit dem Tor-Netzwerk herstellen"> <!ENTITY torSettings.connectPrompt3 "Das wird in den meisten Situationen funktionieren."> <!ENTITY torSettings.connect "Verbinden"> <!ENTITY torSettings.proxyPageTitle "Lokale Proxy-Konfiguration"> <!ENTITY torSettings.proxyQuestion "Benötigt dieser Rechner einen lokalen Proxy um auf das Internet zuzugreifen?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "In den meisten Fällen ist ein lokaler Proxy nicht nötig, er könnte aber notwendig werden, falls eine Verbindung durch ein Firmen-, Schul- oder Universitätsnetzwerk aufgebaut werden soll."> +<!ENTITY torSettings.proxyExplanation2 "Wenn Sie sich nicht sicher sind, wie Sie diese Frage beantworten sollen, sehen Sie sich die Interneteinstellungen in einem anderen Browser an oder überprüfen Sie die Netzwerkeinstellungen des Systems um zu bestimmen, ob sie einen lokalen Proxyserver benötigen."> <!ENTITY torSettings.enterProxy "Proxy-Einstellungen eingeben."> <!ENTITY torSettings.bridgePageTitle "Torbrücken-Konfiguration"> <!ENTITY torSettings.bridgeQuestion "Blockiert oder zensiert Ihr Internetdienstanbieter (ISP) Verbindungen zum Tor-Netzwerk?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Wenn Sie sich nicht sicher sind, wie Sie diese Frage beantworten sollen, wählen Sie nein (falls Sie nicht in der Lage sind, sich ohne Brücke mit dem Tor-Netzwerk zu verbinden, können Sie sie später hinzufügen)."> +<!ENTITY torSettings.bridgeExplanation2 "Wenn Sie Ja wählen, werden sie gebeten, Tor-Brücken zu konfigurieren. Tor-Brücken sind nicht gelistete Relais, die es erschweren, Verbindungen zum Tor-Netzwerk zu blockieren."> <!ENTITY torSettings.bridgeSettingsPrompt "Sie könne den bereitgestellten Satz an Brücken verwenden oder Sie können welche erhalten, und geben einen benutzerdefinierten Satz an Brücken ein.">  <!ENTITY torsettings.startingTor "Auf den Start von Tor wird gewartet …"> <!ENTITY torsettings.restartTor "Tor neu starten"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Neu einstellen"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Sie haben Tor-Brücken konfiguriert oder lokale Proxyeinstellungen eingetragen.  Um eine direkte Verbindung zum Tor-Netzwerk herzustellen, müssen diese Einstellungen entfernt werden."> +<!ENTITY torsettings.discardSettings.proceed "Einstellungen entfernen und verbinden"> <!ENTITY torsettings.optional "Optional"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Erlaubte Anschlüsse:"> <!ENTITY torsettings.useBridges.checkbox "Mein Internetdienstanbieter (ISP) blockiert Verbindungen zum Tor-Netzwerk"> <!ENTITY torsettings.useBridges.default "Mit bereitgestellten Brücken verbinden "> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Jede Art von Brücke verwendet eine andere Methode um Zensur zu umgehen. Wenn eine Brücke nicht funktioniert, versuchen Sie es erneut, unter Verwendung einer anderen Brücke."> <!ENTITY torsettings.useBridges.type "Übertragungstyp:"> <!ENTITY torsettings.useBridges.custom "Benutzerdefinierte Brücken eingeben"> <!ENTITY torsettings.useBridges.label "Ein oder mehrere Brückenrelais eingeben (eins pro Zeile)."> diff --git a/src/chrome/locale/de/progress.dtd b/src/chrome/locale/de/progress.dtd index d087f69..b3b893a 100644 --- a/src/chrome/locale/de/progress.dtd +++ b/src/chrome/locale/de/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor-Status"> <!ENTITY torprogress.openSettings "Einstellungen öffnen"> <!ENTITY torprogress.heading "Verbindung mit dem Tor-Netzwerk wird hergestellt"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Bitte warten Sie, während eine Verbindung zum Tor-Netzwerk hergestellt wird.  Das kann einige Minuten dauern."> diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties index 0da42da..20aa8b3 100644 --- a/src/chrome/locale/de/torlauncher.properties +++ b/src/chrome/locale/de/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor-Starter @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S gescheitert (%2$S). torlauncher.unable_to_start_tor=Tor kann nicht gestartet werden.\n\n%S torlauncher.tor_missing=Die Tor-Programmdatei ist nicht vorhanden. -torlauncher.torrc_missing=Die torrc-Datei ist nicht vorhanden. -torlauncher.datadir_missing=Das Tor-Datenverzeichniss existiert nicht. +torlauncher.torrc_missing=Die torrc Datei fehlt und konnte nicht erstellt werden. +torlauncher.datadir_missing=Das Tor Dateiverzeichnis existiert nicht und konnte nicht erstellt werden. torlauncher.password_hash_missing=Erhalt des Hash-Passwortes ist fehlgeschlagen. torlauncher.failed_to_get_settings=Die Tor-Einstellungen können nicht abgefragt werden.\n\n%S diff --git a/src/chrome/locale/dz/torlauncher.properties b/src/chrome/locale/dz/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/dz/torlauncher.properties +++ b/src/chrome/locale/dz/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd index d776892..48613cf 100644 --- a/src/chrome/locale/el/network-settings.dtd +++ b/src/chrome/locale/el/network-settings.dtd @@ -13,33 +13,33 @@ <!ENTITY torSettings.firstQuestion "Ποιο από τα παρακάτω περιγράφει καλύτερα την κατάστασή σας;"> <!ENTITY torSettings.configurePrompt1 "Σύνδεση στο Internet αυτού του υπολογιστή λογοκρίνεται ή προσεγγίζεται"> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Πριν συνδεθώ στο δίκτυο Tor πρέπει να προσαρμοσθούν οι γέφυρες ή οι ρυθμίσεις του τοπικού ενδιάμεσου."> <!ENTITY torSettings.configure "Ρύθμιση "> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Θέλω να συνδεθώ απ'ευθείας στο δίκτυο Tor."> <!ENTITY torSettings.connectPrompt3 "Αυτό θα λειτουργήσει στις περισσότερες περιπτώσεις."> <!ENTITY torSettings.connect "Σύνδεση"> <!ENTITY torSettings.proxyPageTitle "Τοπική διαμόρφωση Proxy"> <!ENTITY torSettings.proxyQuestion "Μήπως αυτός ο υπολογιστής πρέπει να χρησιμοποιήσει ένα τοπικό proxy για την πρόσβαση στο Διαδίκτυο;">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "Στις περισσότερες περιπτώσεις δε χρειάζεται κάποιος τοπικός ενδιάμεσος διακομιστής, ίσως όμως είναι αναγκαίος όταν συνδέεστε μέσω κάποιας εταιρίας, σχολείου ή πανεπιστημιακού δικτύου."> +<!ENTITY torSettings.proxyExplanation2 "Αν δεν είστε βέβαιοι/ες για την απάντηση σε αυτό το ερώτημα και για να διαπιστώσετε αν είναι αναγκαίος ένας τοπικός ενδιάμεσος, ελέγξτε τις ρυθμίσεις Διαδικτύου σε κάποιον άλλο περιηγητή ή τις ρυθμίσεις δικτύωσης του υπολογιστή σας ."> <!ENTITY torSettings.enterProxy "Εισάγωγη των ρυθμίσεων διακομιστή μεσολάβησης."> <!ENTITY torSettings.bridgePageTitle "Διαμόρφωση Γεφυρών Tor"> <!ENTITY torSettings.bridgeQuestion "Γνωρίζετε αν ο πάροχος (ISP) σας μπλοκάρει ή με οποιοδήποτε τρόπο ελέγχει συνδέσεις στο δίκτυο Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Αν δεν γνωρίζετε πως να απαντήσετε σε αυτή την ερώτηση, επιλέξτε Όχι (αν δεν μπορείτε να συνδεθείτε στο δίκτυο Tor χωρίς την χρήση κάποιας γέφυρας, μπορείτε να προσθέσετε αργότερα μια)."> +<!ENTITY torSettings.bridgeExplanation2 "Αν επιλέξετε Ναι θα σας ζητηθεί να ρυθμίσετε τις Γέφυρες Tor, οι οποίες είναι ακαταχώριστοι αναμεταδότες που δυσκολεύουν την παρεμπόδιση σύνδεσης στο Δίκτυο Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Μπορείτε να χρησιμοποιήσετε τις προκαθορισμένες γέφυρες, ή να αποκτήσετε και εισάγετε νέες διευθύνσεις γεφυρών.">  <!ENTITY torsettings.startingTor "Αναμονή για να ξεκινήσει το Tor... "> <!ENTITY torsettings.restartTor "Eπανεκκίνηση Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Αναδιαμόρφωση"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Έχετε ρυθμισμένες γέφυρες Tor ή έχετε εισάγει ρυθμίσεις για τον τοπικό ενδιάμεσο.  Για να πραγματοποιήσετε απευθείας σύνδεση με το δίκτυο Tor οι ρυθμίσεις αυτές πρέπει να απομακρυνθούν."> +<!ENTITY torsettings.discardSettings.proceed "Απομακρύνετε τις ρυθμίσεις και συνδεθείτε"> <!ENTITY torsettings.optional "Προεραιτικα"> @@ -57,7 +57,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Επιτρεπόμενες Θύρες:"> <!ENTITY torsettings.useBridges.checkbox "Ο πάροχος διαδικτυου (ISP) μπλοκάρει τις συνδέσεις στο δίκτυο του Tor"> <!ENTITY torsettings.useBridges.default "Σύνδεση με προκαθορισμένες γέφυρες"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Κάθε τύπος γέφυρας χρησιμοποιεί διαφορετική μέθοδο αποφυγής της λογοκρισίας.  Αν δεν λειτουργεί κάποια γέφυρα, προσπαθήστε και πάλι χρησιμοποιώντας κάποια άλλη, διαφορετική."> <!ENTITY torsettings.useBridges.type "Τύπος μεταφοράς:"> <!ENTITY torsettings.useBridges.custom "Εισαγωγή άλλων γεφυρών"> <!ENTITY torsettings.useBridges.label "Εισάγετε μια ή περισσότερες διευθύνσεις γεφυρών (μία ανά γραμμή)."> diff --git a/src/chrome/locale/el/progress.dtd b/src/chrome/locale/el/progress.dtd index 9f96b8d..e63961a 100644 --- a/src/chrome/locale/el/progress.dtd +++ b/src/chrome/locale/el/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Κατάσταση του Tor "> <!ENTITY torprogress.openSettings "Ανοιγμα ρυθμισεων"> <!ENTITY torprogress.heading "Δημιουργια σύνδεσης στο δίκτυο Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Παρακαλώ περιμένετε καθώς δημιουργήστε σύνδεση στο δίκτυο Tor.  Αυτό μπορεί να πάρει μερικά λεπτά."> diff --git a/src/chrome/locale/el/torlauncher.properties b/src/chrome/locale/el/torlauncher.properties index b257e45..90fdc3f 100644 --- a/src/chrome/locale/el/torlauncher.properties +++ b/src/chrome/locale/el/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S απέτυχε (%2$S). torlauncher.unable_to_start_tor=Αδυναμία εκκίνησης του Tor.⏎\n⏎\n%S torlauncher.tor_missing=Το Tor εκτελέσιμο λείπει. -torlauncher.torrc_missing=Το torrc αρχείο λείπει. -torlauncher.datadir_missing=Ο κατάλογος δεδομένων του Tor δεν υπάρχει. +torlauncher.torrc_missing=Το αρχείο torrc λείπει και δεν μπορεί να δημιουργηθεί. +torlauncher.datadir_missing=Ο κατάλογος δεδομένων Tor δεν υπάρχει και δεν μπορεί να δημιουργηθεί. torlauncher.password_hash_missing=Απέτυχε να πάρει διαγραμμισμένο κωδικό πρόσβασης. torlauncher.failed_to_get_settings=Αποτυχία διαγραφής των Tor ρυθμισεων.⏎\n⏎\n%S @@ -37,7 +37,7 @@ torlauncher.done=Τελος torlauncher.forAssistance=Για βοήθεια, επικοινωνήστε με το% S -torlauncher.copiedNLogMessages=Η αντιγραφή ολοκληρώθηκε. %S Τα μηνύματα καταγραφής είναι έτοιμα να επικολληθούν σε ένα κειμενογράφο ή ένα μήνυμα ηλεκτρονικού ταχυδρομείου. +torlauncher.copiedNLogMessages=Η αντιγραφή ολοκληρώθηκε. %S μηνύματα καταγραφής είναι έτοιμα να επικολληθούν σε ένα κειμενογράφο ή ένα μήνυμα ηλεκτρονικού ταχυδρομείου. torlauncher.bootstrapStatus.conn_dir=Σύνδεση σε ενδιάμεσο (relay) κατάλογο torlauncher.bootstrapStatus.handshake_dir=Πραγματοποιήθηκε σύνδεση σε κρυπτογραφημένο κατάλογο diff --git a/src/chrome/locale/en-GB/torlauncher.properties b/src/chrome/locale/en-GB/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/en-GB/torlauncher.properties +++ b/src/chrome/locale/en-GB/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 0d2e9dc..75ece3b 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 6b471a3..0ef4437 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -36,7 +36,6 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S -torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. diff --git a/src/chrome/locale/eo/torlauncher.properties b/src/chrome/locale/eo/torlauncher.properties index 7609a5c..52f3292 100644 --- a/src/chrome/locale/eo/torlauncher.properties +++ b/src/chrome/locale/eo/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor-startigilo @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S malsukcesis (%2$S). torlauncher.unable_to_start_tor=Ne eblas starti Tor.\n\n%S torlauncher.tor_missing=Tor-komandodosiero mankas. -torlauncher.torrc_missing=Konfigura dosiero torrc mankas. -torlauncher.datadir_missing=Datuma dosierujo de Tor ne ekzistas. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Malsukcesis ricevado de haketigita pasvorto. torlauncher.failed_to_get_settings=Ne eblas ricevi agordojn de Tor.\n\n%S diff --git a/src/chrome/locale/es-AR/network-settings.dtd b/src/chrome/locale/es-AR/network-settings.dtd index 9dd4ef3..afd960f 100644 --- a/src/chrome/locale/es-AR/network-settings.dtd +++ b/src/chrome/locale/es-AR/network-settings.dtd @@ -13,7 +13,7 @@ <!ENTITY torSettings.firstQuestion "¿Cuál de las siguientes opciones describe mejor su situación?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Necesito configurar un puente o proxy local anntes de conectarme a la red Tor."> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> <!ENTITY torSettings.connectPrompt3 "Esto debería funcionar en la mayoría de situaciones."> diff --git a/src/chrome/locale/es-AR/torlauncher.properties b/src/chrome/locale/es-AR/torlauncher.properties index 3c010cb..e972d0d 100644 --- a/src/chrome/locale/es-AR/torlauncher.properties +++ b/src/chrome/locale/es-AR/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Lanzador de Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S falló (%2$S). 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. -torlauncher.datadir_missing=El directorio de datos de Tor no existe. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. 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/es-CL/torlauncher.properties b/src/chrome/locale/es-CL/torlauncher.properties index 292e182..ca8e893 100644 --- a/src/chrome/locale/es-CL/torlauncher.properties +++ b/src/chrome/locale/es-CL/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/es-CO/network-settings.dtd b/src/chrome/locale/es-CO/network-settings.dtd index 8ec90ba..f7e9bb4 100644 --- a/src/chrome/locale/es-CO/network-settings.dtd +++ b/src/chrome/locale/es-CO/network-settings.dtd @@ -1,12 +1,12 @@ <!ENTITY torsettings.dialog.title "Configuraciones de red de Tor">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Idioma del Navegador Tor"> +<!ENTITY torlauncher.localePicker.prompt "Por favor selecciona un idioma.">  -<!ENTITY torsettings.prompt "Antes de conectar con la red de Tor, necesitas proveer informacion acerca de la coneccion de internet de este computador."> +<!ENTITY torsettings.prompt "Antes de conectar con la red de Tor, necesitas proveer información acerca de la conexión de internet de este computador."> <!ENTITY torSettings.yes "Si"> <!ENTITY torSettings.no "No"> diff --git a/src/chrome/locale/es-CO/torlauncher.properties b/src/chrome/locale/es-CO/torlauncher.properties index 8580f6e..7da56cd 100644 --- a/src/chrome/locale/es-CO/torlauncher.properties +++ b/src/chrome/locale/es-CO/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/es-MX/progress.dtd b/src/chrome/locale/es-MX/progress.dtd index d1d6bb5..3ee4849 100644 --- a/src/chrome/locale/es-MX/progress.dtd +++ b/src/chrome/locale/es-MX/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Estado de Tor"> <!ENTITY torprogress.openSettings "Abrir Ajustes"> <!ENTITY torprogress.heading "Conectando a la red Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Por favor, espera mientras establecemos una conexión con Tor network.  Esto puede llevar varios minutos."> diff --git a/src/chrome/locale/es-MX/torlauncher.properties b/src/chrome/locale/es-MX/torlauncher.properties index 77aa158..90cf753 100644 --- a/src/chrome/locale/es-MX/torlauncher.properties +++ b/src/chrome/locale/es-MX/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Lanzador Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S falló (%2$S). torlauncher.unable_to_start_tor=No se ha podido iniciar Tor.\n\n%S torlauncher.tor_missing=Falta el ejecutable de Tor. -torlauncher.torrc_missing=Falta el archivo torrc. -torlauncher.datadir_missing=El diccionario de datos de Tor no existe. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=No se pudo obtener la contraseña cifrada. torlauncher.failed_to_get_settings=No se puede recuperar la configuración de Tor. \n\n% S diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties index 42780e5..5283bd1 100644 --- a/src/chrome/locale/es/torlauncher.properties +++ b/src/chrome/locale/es/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Arranque de Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S falló (%2$S). torlauncher.unable_to_start_tor=Imposible 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" -torlauncher.datadir_missing=El directorio de datos de Tor no existe. +torlauncher.torrc_missing=No existe el fichero torcc y no puede ser creado. +torlauncher.datadir_missing=El directorio de datos de Tor no existe y no puede ser creado torlauncher.password_hash_missing=Fallo al obtener la contraseña cifrada. torlauncher.failed_to_get_settings=No se pudo recuperar las preferencias de Tor.\n\n%S diff --git a/src/chrome/locale/et/torlauncher.properties b/src/chrome/locale/et/torlauncher.properties index 1ebd50d..6aeb338 100644 --- a/src/chrome/locale/et/torlauncher.properties +++ b/src/chrome/locale/et/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tori käivitaja @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Ei suuda käivitada Tor-i.\n\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(soovitatud) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/eu/torlauncher.properties b/src/chrome/locale/eu/torlauncher.properties index 073e987..7ab719b 100644 --- a/src/chrome/locale/eu/torlauncher.properties +++ b/src/chrome/locale/eu/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor abiarazlea @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S huts egin du (%2$S). torlauncher.unable_to_start_tor=Ezin izan da Tor hasi.\n\n%S torlauncher.tor_missing=Tor exekutagarria falta da. -torlauncher.torrc_missing=torrc fitxategia falta da. -torlauncher.datadir_missing=Tor datu direktorioa ez da existitzen. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Huts egin du hash-eatutako pasahitza eskuratzen. torlauncher.failed_to_get_settings=Ezin izan dira Tor ezarpenak berreskuratu.\n\n%S diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd index 3a95731..1180719 100644 --- a/src/chrome/locale/fa/network-settings.dtd +++ b/src/chrome/locale/fa/network-settings.dtd @@ -35,10 +35,10 @@ <!ENTITY torsettings.startingTor "در انتظار آغاز به کار تور..."> <!ENTITY torsettings.restartTor "تور را دوباره شوروع کنید."> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "پیکربندی مجدد"> <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.proceed "حذف تنظیمات و اتصال"> <!ENTITY torsettings.optional "اختیاری"> diff --git a/src/chrome/locale/fa/torlauncher.properties b/src/chrome/locale/fa/torlauncher.properties index bdd5c09..81dda8d 100644 --- a/src/chrome/locale/fa/torlauncher.properties +++ b/src/chrome/locale/fa/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=اجرا کننده تور @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S ناموفق بود (%2$S). torlauncher.unable_to_start_tor=راه اندازی تور امکان پذیر نمی باشد.\n\n%S torlauncher.tor_missing=فایل اجرایی تور یافت نشد. -torlauncher.torrc_missing=فایل torrc یافت نشد. -torlauncher.datadir_missing=لیست داده تور وجود ندارد. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=کلمهٔ عبور رمزشده دریافت نشد. torlauncher.failed_to_get_settings=ناموفق در بازگردانی تنظیمات تور.\n\n%S diff --git a/src/chrome/locale/fi/network-settings.dtd b/src/chrome/locale/fi/network-settings.dtd index 6338e04..da9cf47 100644 --- a/src/chrome/locale/fi/network-settings.dtd +++ b/src/chrome/locale/fi/network-settings.dtd @@ -15,7 +15,7 @@ <!ENTITY torSettings.configurePrompt1 "Tämän tietokoneen internet-yhteys on sensuroitu tai kulkee välityspalvelimen kautta."> <!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> <!ENTITY torSettings.configure "Määritä"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Haluan tehdä suoran yhteyden Tor-verkkoon."> <!ENTITY torSettings.connectPrompt3 "Tämä toimii useimmissa tilanteissa."> <!ENTITY torSettings.connect "Yhdistä"> @@ -35,10 +35,10 @@ <!ENTITY torsettings.startingTor "Odotetaan Tor-sovelluksen käynnistymistä..."> <!ENTITY torsettings.restartTor "Käynnistä Tor uudelleen"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Uudelleenmääritä"> <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.proceed "Poista asetukset ja yhdistä"> <!ENTITY torsettings.optional "Vaihtoehtoinen"> diff --git a/src/chrome/locale/fi/progress.dtd b/src/chrome/locale/fi/progress.dtd index 5850aa9..69414cf 100644 --- a/src/chrome/locale/fi/progress.dtd +++ b/src/chrome/locale/fi/progress.dtd @@ -1,4 +1,5 @@ <!ENTITY torprogress.dialog.title "Tor-tila"> <!ENTITY torprogress.openSettings "Avaa asetukset"> <!ENTITY torprogress.heading "Yhdistetään Tor-verkkoon"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Odota pieni hetki, kun yhteys TOR-verkostoon luodaan.  +Tässä saattaa kestää muutama minuutti."> diff --git a/src/chrome/locale/fi/torlauncher.properties b/src/chrome/locale/fi/torlauncher.properties index 533f596..368261d 100644 --- a/src/chrome/locale/fi/torlauncher.properties +++ b/src/chrome/locale/fi/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor-käynnistin @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S epäonnistui (%2$S). torlauncher.unable_to_start_tor=Tor-sovelluksen käynnistys epäonnistui.\n\n%S torlauncher.tor_missing=Suoritettava Tor-tiedosto puuttuu. -torlauncher.torrc_missing=Tiedosto torrc puuttuu. -torlauncher.datadir_missing=Tor-tietohakemistoa ei ole. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Tiivistettyä salasanaa ei löytynyt. torlauncher.failed_to_get_settings=Tor-asetusten noutaminen epäonnistui.\n\n%S diff --git a/src/chrome/locale/fil/torlauncher.properties b/src/chrome/locale/fil/torlauncher.properties index 23dfc4d..14eb7ba 100644 --- a/src/chrome/locale/fil/torlauncher.properties +++ b/src/chrome/locale/fil/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tagapaglunsad ng Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S nabigo (%2$S). torlauncher.unable_to_start_tor=Hindi magawang simulan ang Tor.\n\n%S torlauncher.tor_missing=Ang Tor executable ay nawawala. -torlauncher.torrc_missing=Ang torrc file ay nawawala. -torlauncher.datadir_missing=Walang direktoryo ng data ang Tor. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Nabigong makakuha ng na-hash na password. torlauncher.failed_to_get_settings=Hindi nabawi ang mga setting ng Tor.\n\n%S diff --git a/src/chrome/locale/fo/torlauncher.properties b/src/chrome/locale/fo/torlauncher.properties index 954ef11..ce0c5a7 100644 --- a/src/chrome/locale/fo/torlauncher.properties +++ b/src/chrome/locale/fo/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/fr-CA/network-settings.dtd b/src/chrome/locale/fr-CA/network-settings.dtd index 111e80e..b38d8f9 100644 --- a/src/chrome/locale/fr-CA/network-settings.dtd +++ b/src/chrome/locale/fr-CA/network-settings.dtd @@ -13,7 +13,7 @@ <!ENTITY torSettings.firstQuestion "Laquelle des suivantes décrit le mieux votre situation?"> <!ENTITY torSettings.configurePrompt1 "La connexion Internet de cet ordinateur est censurée ou relayée."> -<!ENTITY torSettings.configurePrompt2 "Je dois paramétrer un pont ou un mandataire local avant de me connecter au réseau  Tor."> +<!ENTITY torSettings.configurePrompt2 "Je dois paramétrer un pont ou un mandataire local avant de me connecter au réseau Tor."> <!ENTITY torSettings.configure "Configurer"> <!ENTITY torSettings.connectPrompt2 "J'aimerais établir une connexion directe vers le réseau Tor."> <!ENTITY torSettings.connectPrompt3 "Ceci fonctionnera dans la plupart des situations."> diff --git a/src/chrome/locale/fr-CA/torlauncher.properties b/src/chrome/locale/fr-CA/torlauncher.properties index 2f7cc98..6bb09f0 100644 --- a/src/chrome/locale/fr-CA/torlauncher.properties +++ b/src/chrome/locale/fr-CA/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Lanceur Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S a échoué (%2$S). torlauncher.unable_to_start_tor=Impossible de démarrer Tor.\n\n%S torlauncher.tor_missing=L'exécutable Tor est manquant. -torlauncher.torrc_missing=Le fichier torrc est manquant. -torlauncher.datadir_missing=Le répertoire de données de Tor n'existe pas. +torlauncher.torrc_missing=Le fichier torrc est manquant et n'a pas pu être créé. +torlauncher.datadir_missing=Le répertoire de données Tor n'existe pas et n'a pas pu être créé. torlauncher.password_hash_missing=Impossible d'obtenir le mot de passe haché. torlauncher.failed_to_get_settings=Impossible de récupérer les paramètres de Tor.\n\n%S diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index e3b06af..23365e6 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Paramètres du réseau Tor">  -<!ENTITY torlauncher.localePicker.title "Language du navigateur Tor"> +<!ENTITY torlauncher.localePicker.title "Langue du Navigateur Tor"> <!ENTITY torlauncher.localePicker.prompt "Merci de sélectionner une langue.">  @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "Laquelle des phrases suivantes décrit le mieux votre situation ?"> <!ENTITY torSettings.configurePrompt1 "Le connexion internet de cet ordinateur est restreinte (censurée) ou passe par un proxy."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Je dois configurer le pont réseau ou les paramètres du proxy avant de me connecter au réseau Tor."> <!ENTITY torSettings.configure "Configurer"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Je voudrais faire une connexion directe au réseau Tor."> <!ENTITY torSettings.connectPrompt3 "Cela fonctionnera dans la plupart des situations."> <!ENTITY torSettings.connect "Se connecter"> <!ENTITY torSettings.proxyPageTitle "Configuration du proxy local"> <!ENTITY torSettings.proxyQuestion "Est-ce que cet ordinateur a besoin d'utiliser un proxy pour accéder à internet ?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "Dans la plupart des cas le proxy local n'est pas nécessaire, mais il peut être exigé pour une connexion dans un réseau d'entreprise, d'école ou universitaire."> +<!ENTITY torSettings.proxyExplanation2 "Si vous n'êtes pas certain de savoir comment répondre à cette question, regardez les paramètres Internet d'un autre navigateur ou les paramètres réseaux de votre système afin de vérifier si vous avez besoin d'un proxy."> <!ENTITY torSettings.enterProxy "Entrez les paramètres de votre proxy."> <!ENTITY torSettings.bridgePageTitle "Configuration des relais TOR"> <!ENTITY torSettings.bridgeQuestion "Est-ce que votre Fournisseur d'Accès Internet (FAI) bloque les connexions au réseau Tor ?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "Vous pouvez utiliser les ponts fournis ou bien saisir votre liste de ponts personnels."> +<!ENTITY torSettings.bridgeExplanation1 "Si vous ne savez par comment répondre à cette question, choisissez Non (si vous ne pouvez pas vous connecter au réseau Tor sans un bridge, vous pourrez le rajouter plus tard)."> +<!ENTITY torSettings.bridgeExplanation2 "Si vous choisissez Oui, il vous sera demandé de configurer les bridges Tor qui sont des relais non listés et qui rendent plus difficile le blocage du réseau Tor."> +<!ENTITY torSettings.bridgeSettingsPrompt "Vous pouvez utiliser les bridges fournis ou bien saisir votre liste de bridges personnels.">  <!ENTITY torsettings.startingTor "En attente du démarrage de Tor..."> <!ENTITY torsettings.restartTor "Relancer Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Reconfigurer"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Vous avez configuré les bridges Tor ou vous avez entré les paramètres de proxy local. Pour faire une connexion directe avec le réseau Tor, ces configurations doivent être supprimés."> +<!ENTITY torsettings.discardSettings.proceed "Supprimer les paramètres et se connecter"> <!ENTITY torsettings.optional "Optionnel"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Ports autorisés :"> <!ENTITY torsettings.useBridges.checkbox "Mon Fournisseur d'Accès à Internet (FAI) bloque les connexions au réseau Tor"> <!ENTITY torsettings.useBridges.default "Se connecter en utilisant les ponts pré-configurés"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Chaque type de pont utilise une méthode différente pour éviter la censure. Si un pont ne marche pas, essayez de nouveau avec un autre."> <!ENTITY torsettings.useBridges.type "Mode de transport:"> <!ENTITY torsettings.useBridges.custom "Entrez vos ponts personnels"> <!ENTITY torsettings.useBridges.label "Saisir un ou davantage de ponts relais (un par ligne)."> @@ -64,8 +64,8 @@ <!ENTITY torsettings.copyLog "Copier le journal des messages de Tor dans le presse-papier"> <!ENTITY torsettings.bridgeHelpTitle "Aide pour les ponts"> -<!ENTITY torsettings.bridgeHelp1 "Si vous ne pouvez pas vous connecter au réseau Tor, il se pourrait que votre fournisseur d'accès à Internet (FAI) ou une autre agence bloque le Tor.  Souvent, vous pouvez contourner ce problème en utilisant des ponts Tor, qui sont des relais non listés qui sont plus difficiles à bloquer."> -<!ENTITY torsettings.bridgeHelp1B "Vous pouvez utiliser les liste de ponts pré-configurés par défaut ou en obtenir une liste personnalisée d'adresses en utilisant l'une des trois méthodes ci-dessous :"> +<!ENTITY torsettings.bridgeHelp1 "Si vous ne pouvez pas vous connecter au réseau Tor, il se pourrait que votre fournisseur d'accès à Internet (FAI) ou une autre agence bloque le Tor.  Souvent, vous pouvez contourner ce problème en utilisant des bridges Tor, qui sont des relais non listés qui sont plus difficiles à bloquer."> +<!ENTITY torsettings.bridgeHelp1B "Vous pouvez utiliser les liste de bridges pré-configurés par défaut ou en obtenir une liste personnalisée d'adresses en utilisant l'une des trois méthodes ci-dessous :"> <!ENTITY torsettings.bridgeHelp2Heading "Par le Web"> <!ENTITY torsettings.bridgeHelp2 "Utilisez un navigateur web pour visiter https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Par le répondeur automatique de courriel"> diff --git a/src/chrome/locale/fr/progress.dtd b/src/chrome/locale/fr/progress.dtd index 157276d..a7d1857 100644 --- a/src/chrome/locale/fr/progress.dtd +++ b/src/chrome/locale/fr/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "État de Tor"> <!ENTITY torprogress.openSettings "Ouvrir les paramètres"> <!ENTITY torprogress.heading "Connexion au réseau Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que la connexion au réseau Tor s'établit. Cela peut prendre quelques minutes."> diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties index 209755b..a90027b 100644 --- a/src/chrome/locale/fr/torlauncher.properties +++ b/src/chrome/locale/fr/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Lanceur Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S échoué (%2$S). torlauncher.unable_to_start_tor=Impossible de démarrer Tor.\n\n%S torlauncher.tor_missing=L'exécutable Tor est introuvable. -torlauncher.torrc_missing=Le fichier torrc est manquant. -torlauncher.datadir_missing=Le répertoire de données de Tor n'existe pas. +torlauncher.torrc_missing=Le fichier torrc est manquant et n'a pas pu être créé. +torlauncher.datadir_missing=Le dossier de données de Tor n'existe pas et n'a pas pu être créé. torlauncher.password_hash_missing=Impossible d'obtenir le mot de passe chiffré. torlauncher.failed_to_get_settings=Impossible de récupérer les paramètres de Tor.\n\n%S @@ -24,8 +24,8 @@ torlauncher.ensure_tor_is_running=Veuillez-vous assurer que Tor est lancé. torlauncher.error_proxy_addr_missing=Pour configurer Tor afin qu'il utilise un proxy, vous devez spécifier une adresse IP ou un nom d'hôte ainsi qu'un numéro de port. torlauncher.error_proxy_type_missing=Vous devez sélectionner un type de proxy. torlauncher.error_bridges_missing=Vous devez spécifier un ou plusieurs bridges. -torlauncher.error_default_bridges_type_missing=Vous devez sélectionner un type de transport pour les ponts fournis. -torlauncher.error_bridge_bad_default_type=Aucun des ponts fournis n'a le type de transport %S. Merci d'ajuster vos paramètres. +torlauncher.error_default_bridges_type_missing=Vous devez sélectionner un type de transport pour les bridges fournis. +torlauncher.error_bridge_bad_default_type=Aucun des bridges fournis n'a le type de transport %S. Merci d'ajuster vos paramètres. torlauncher.recommended_bridge=(recommandé) diff --git a/src/chrome/locale/fur/torlauncher.properties b/src/chrome/locale/fur/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/fur/torlauncher.properties +++ b/src/chrome/locale/fur/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/fy/torlauncher.properties b/src/chrome/locale/fy/torlauncher.properties index d735f57..7088f15 100644 --- a/src/chrome/locale/fy/torlauncher.properties +++ b/src/chrome/locale/fy/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/ga/torlauncher.properties b/src/chrome/locale/ga/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/ga/torlauncher.properties +++ b/src/chrome/locale/ga/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/gl/torlauncher.properties b/src/chrome/locale/gl/torlauncher.properties index 038d926..4161e75 100644 --- a/src/chrome/locale/gl/torlauncher.properties +++ b/src/chrome/locale/gl/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Lanzador do Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Non se puido iniciar o Tor.⏎\n⏎\n%S torlauncher.tor_missing=Falta o executábel do Tor. -torlauncher.torrc_missing=Falta o ficheiro torrc -torlauncher.datadir_missing=Non existe o directorio de datos do Tor. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Non se puido obter o contrasinal cifrado. torlauncher.failed_to_get_settings=Non se pode recuperar a configuración do Tor.⏎\n⏎\n%S diff --git a/src/chrome/locale/gu-IN/torlauncher.properties b/src/chrome/locale/gu-IN/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/gu-IN/torlauncher.properties +++ b/src/chrome/locale/gu-IN/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/gu/torlauncher.properties b/src/chrome/locale/gu/torlauncher.properties index 02be756..7501f9d 100644 --- a/src/chrome/locale/gu/torlauncher.properties +++ b/src/chrome/locale/gu/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(સૂચવેલ) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/gun/torlauncher.properties b/src/chrome/locale/gun/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/gun/torlauncher.properties +++ b/src/chrome/locale/gun/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/ha/torlauncher.properties b/src/chrome/locale/ha/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/ha/torlauncher.properties +++ b/src/chrome/locale/ha/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/he/torlauncher.properties b/src/chrome/locale/he/torlauncher.properties index 66cd550..abdcc14 100644 --- a/src/chrome/locale/he/torlauncher.properties +++ b/src/chrome/locale/he/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=תוכנת ההפעלה של Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S נכשל (%2$S). torlauncher.unable_to_start_tor=אין אפשרות להפעיל את Tor.\n\n%S torlauncher.tor_missing=קובץ ההפעלה של Tor איננו קיים. -torlauncher.torrc_missing=קובץ torrc איננו קיים. -torlauncher.datadir_missing=תיקיית הנתונים Tor איננה קיימת. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=כשל בהשגת סיסמה מעורבלת. torlauncher.failed_to_get_settings=אין אפשרות לאחזר הגדרות Tor.\n\n%S diff --git a/src/chrome/locale/hi/torlauncher.properties b/src/chrome/locale/hi/torlauncher.properties index f093ec6..ab169f7 100644 --- a/src/chrome/locale/hi/torlauncher.properties +++ b/src/chrome/locale/hi/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/hr-HR/network-settings.dtd b/src/chrome/locale/hr-HR/network-settings.dtd index 657b7f9..fea9644 100644 --- a/src/chrome/locale/hr-HR/network-settings.dtd +++ b/src/chrome/locale/hr-HR/network-settings.dtd @@ -14,33 +14,33 @@ internetskoj vezi ovog računala."> <!ENTITY torSettings.firstQuestion "Koje od sljedećeg najbolje opisuje Vašu situaciju?"> <!ENTITY torSettings.configurePrompt1 "Veza ovog računal s Internetom je cenzurirana ili iza proxy-a."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Trebam konfigurirati postavke mosta ili lokalnog proxy-a prije nego se spojim na Tor mrežu."> <!ENTITY torSettings.configure "Podesi"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Želim direktnu vezu s Tor mrežom."> <!ENTITY torSettings.connectPrompt3 "Ovo će raditi u većini situacija."> -<!ENTITY torSettings.connect "Spajanje"> +<!ENTITY torSettings.connect "Spoji"> <!ENTITY torSettings.proxyPageTitle "Konfiguracija lokalnog proxy-a"> <!ENTITY torSettings.proxyQuestion "Treba li ovo računalo koristiti lokalni proxy da pristupi Internetu?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "U većini slučaja lokalni proxy nije potreban, ali može biti kad se spajate kroz mržu tvrtke, škole ili fakulteta."> +<!ENTITY torSettings.proxyExplanation2 "Ako niste sigurni kako odgovoriti na ovo pitanje, pogledajte Internet postavke u drugom pregledniku ili provjerite mrežne postavke Vašeg sustava kako bi vidjeli da li je potreban lokalni proxy."> <!ENTITY torSettings.enterProxy "Unesite postavke proxyj-a."> <!ENTITY torSettings.bridgePageTitle "Konfiguracija Tor mostova"> <!ENTITY torSettings.bridgeQuestion "Blokira li Vaš davetelj Internet usluge (ISP) ili drugačije cenzurira veze s Tor mrežom?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Ako niste sigurni kako odgovoriti na ovo pitanje, odaberite Ne (ako se ne možete spojiti na Tor mrežu bez mosta, možete kasnije dodati jedan)."> +<!ENTITY torSettings.bridgeExplanation2 "Ako odaberete Da, od Vas će se tražiti da konfigurirate Tor mostove, koji su nepopisani releji koji otežavaju blokiranje veza na Tor mrežu."> <!ENTITY torSettings.bridgeSettingsPrompt "Možete koristiti osigurani set adresa mostova ili možete unijeti vlasiti set mostova.">  <!ENTITY torsettings.startingTor "Čekanje da se Tor pokrene..."> <!ENTITY torsettings.restartTor "Ponovno pokreni Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Rekonfiguriraj"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Konfigurirali ste Tor mostove ili ste unijeli postavke lokalnog proxy-a.  Kako bi ostvarili direktnu vezu s Tor mrežom, ove postavke moraju biti uklonjene."> +<!ENTITY torsettings.discardSettings.proceed "Ukloni postavke i poveži"> <!ENTITY torsettings.optional "Opcionalno"> @@ -58,7 +58,7 @@ s Tor mrežom?"> <!ENTITY torsettings.firewall.allowedPorts "Dozvoljeni portovi:"> <!ENTITY torsettings.useBridges.checkbox "Moj pružatelj internetskih usluga (ISP) blokira veze prema Tor mreži"> <!ENTITY torsettings.useBridges.default "Spoji se s osiguranim mostovima"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Svaka vrsta mosta koristi drugačiju metodu kako bi izbjegla cenzuru.&#160: Ako jedan most ne radi, probajte koristiti drugi."> <!ENTITY torsettings.useBridges.type "Tip transporta:"> <!ENTITY torsettings.useBridges.custom "Unesi vlastite mostove"> <!ENTITY torsettings.useBridges.label "Unesite jedan ili više mostova (jedan po retku)."> diff --git a/src/chrome/locale/hr-HR/progress.dtd b/src/chrome/locale/hr-HR/progress.dtd index 405b87e..da9a846 100644 --- a/src/chrome/locale/hr-HR/progress.dtd +++ b/src/chrome/locale/hr-HR/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Otvori Postavke"> <!ENTITY torprogress.heading "Spajanje na Tor mrežu"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Molimo pričekajte dok ne uspostavimo vezu s Tor mrežom.  To bi moglo potrajati nekoliko minuta."> diff --git a/src/chrome/locale/hr-HR/torlauncher.properties b/src/chrome/locale/hr-HR/torlauncher.properties index dc68e08..4307f32 100644 --- a/src/chrome/locale/hr-HR/torlauncher.properties +++ b/src/chrome/locale/hr-HR/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Pokretač Tor-a @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S neuspjelo (%2$S). 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=Nije moguće pronaći torrc datoteku. -torlauncher.datadir_missing=Podatkovna mapa za Tor ne postoji. +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.password_hash_missing=Nije moguće dobiti hash lozinke. torlauncher.failed_to_get_settings=Nije moguće dobaviti Tor postavke.\n\n%S diff --git a/src/chrome/locale/hr/progress.dtd b/src/chrome/locale/hr/progress.dtd index 4bacee4..da8dda4 100644 --- a/src/chrome/locale/hr/progress.dtd +++ b/src/chrome/locale/hr/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Status Tor-a"> <!ENTITY torprogress.openSettings "Otvori Postavke"> <!ENTITY torprogress.heading "Spajanje na Tor mrežu"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Molimo pričekajte dok uspostavljamo vezu sa Tor mrežom.   Ovo može potrajati nekoliko minuta."> diff --git a/src/chrome/locale/hr/torlauncher.properties b/src/chrome/locale/hr/torlauncher.properties index fd08f79..3cccba0 100644 --- a/src/chrome/locale/hr/torlauncher.properties +++ b/src/chrome/locale/hr/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/ht/torlauncher.properties b/src/chrome/locale/ht/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/ht/torlauncher.properties +++ b/src/chrome/locale/ht/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/hu/network-settings.dtd b/src/chrome/locale/hu/network-settings.dtd index 0f7de0c..68d90eb 100644 --- a/src/chrome/locale/hu/network-settings.dtd +++ b/src/chrome/locale/hu/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "A következők közül melyik illik jobban a szituációhoz?"> <!ENTITY torSettings.configurePrompt1 "Ennek a számítógépnek a forgalma cenzorált vagy proxizott."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "A Tor  hálózathoz való csatlakozás előtt be kell állítanom a hálózati hidat vagy a helyi proxyt."> <!ENTITY torSettings.configure "Beállít"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Közvetlen kapcsolatot szeretnék létesíteni a Tor hálózattal."> <!ENTITY torSettings.connectPrompt3 "A legtöbb esetben ez működni fog."> <!ENTITY torSettings.connect "Csatlakozás"> <!ENTITY torSettings.proxyPageTitle "Helyi proxybeállítások"> <!ENTITY torSettings.proxyQuestion "Ez a számítgép helyi proxyn keresztül éri el az Internetet? ">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "A helyi proxy a legtöbb esetben nem kell, de vállalati, iskolai vagy egyetemi hálózat esetén elfordulhat, hogy szükséges beállítani."> +<!ENTITY torSettings.proxyExplanation2 "Ha nem vagy biztos benne, hogyan válaszolj erre a kérdésre, akkor nézd meg egy másik böngésző vagy a rendszer hálózati beállításait, hogy szükséges-e proxyt beállítani."> <!ENTITY torSettings.enterProxy "Adja meg a proxy beállításokat."> <!ENTITY torSettings.bridgePageTitle "Tor hidak konfigurálása"> <!ENTITY torSettings.bridgeQuestion "Az internet szolgáltatód (ISP) blokkolja vagy cenzúrázza a kapcsolatot a Tor hálózathoz?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Ha nem vagy biztos benne, hogyan válaszolj erre a kérdésre, válaszd a Nem lehetőséget (ha hálózati híd nélkül nem tudsz kapcsolódni a Tor hálózathoz, akkor később is hozzáadhatsz egyet)."> +<!ENTITY torSettings.bridgeExplanation2 " Ha az Igen-t választod neked kell konfigurálni a Tor Hidak-et, maleyek nem listázott csomópontok, így lehetővé nehezebbé teszik a Tor hálózathoz kapcsolódás blokkolását."> <!ENTITY torSettings.bridgeSettingsPrompt "Használhatod a szolgáltatott bridge címeket vagy beszerezhetsz egyedi bridge címeket.">  <!ENTITY torsettings.startingTor "Várakozás a Tor indulására..."> <!ENTITY torsettings.restartTor "Tor újraindítása"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Újrakonfigurál"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Beállított Tor Hidakat, vagy megadott egy helyi proxy-t.  A közvetlen kapcsolódáshoz ezeket a beállításokat el kell távolítania."> +<!ENTITY torsettings.discardSettings.proceed "Beállítások eltávolítása és Csatlakozás"> <!ENTITY torsettings.optional "Opcionális"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Engedélyezett portok:"> <!ENTITY torsettings.useBridges.checkbox "Az internet szolgáltatóm (ISP) blokkolja a Tor hálózathoz való csatlakozásokat"> <!ENTITY torsettings.useBridges.default "Csatlakozás a szolgáltatott bridge címekkel."> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Minden híd más megoldást használ a cenzorálás elkerülésére.  Ha egyik nem működik, próbálkozzon újra egy másikkal."> <!ENTITY torsettings.useBridges.type "Átvitel típusa:"> <!ENTITY torsettings.useBridges.custom "Addj meg egyedi bridge címeket"> <!ENTITY torsettings.useBridges.label "Addj meg egy vagy több bridge relay címet (soronként egy)"> diff --git a/src/chrome/locale/hu/progress.dtd b/src/chrome/locale/hu/progress.dtd index bdcab7a..e4565a2 100644 --- a/src/chrome/locale/hu/progress.dtd +++ b/src/chrome/locale/hu/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor állapot"> <!ENTITY torprogress.openSettings "Beállítások megnyitása"> <!ENTITY torprogress.heading "Kapcsolódás a Tor hálózathoz"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Kérlek várj, amíg létrehozunk egy kapcsolatot a Tor hálózathoz.  Ez eltarthat néhány percig."> diff --git a/src/chrome/locale/hu/torlauncher.properties b/src/chrome/locale/hu/torlauncher.properties index d2b6ea2..82ef206 100644 --- a/src/chrome/locale/hu/torlauncher.properties +++ b/src/chrome/locale/hu/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Indító @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S hiba (%2$S). 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. -torlauncher.datadir_missing=A Tor adat könyvtár nem létezik. +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.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 diff --git a/src/chrome/locale/hy/torlauncher.properties b/src/chrome/locale/hy/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/hy/torlauncher.properties +++ b/src/chrome/locale/hy/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/ia/torlauncher.properties b/src/chrome/locale/ia/torlauncher.properties index 44c40ed..851277f 100644 --- a/src/chrome/locale/ia/torlauncher.properties +++ b/src/chrome/locale/ia/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/id/network-settings.dtd b/src/chrome/locale/id/network-settings.dtd index 990cbac..15c16e8 100644 --- a/src/chrome/locale/id/network-settings.dtd +++ b/src/chrome/locale/id/network-settings.dtd @@ -13,7 +13,7 @@ <!ENTITY torSettings.firstQuestion "Mana dari yang berikut ini tepat menjelaskan situasi Anda?"> <!ENTITY torSettings.configurePrompt1 "Koneksi Internet komputer ini disensor atau terproksi."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Saya perlu untuk mengatur jembatan atau pengaturan proksi lokal sebelum saya terkoneksi ke jaringan Tor."> <!ENTITY torSettings.configure "Konfigur"> <!ENTITY torSettings.connectPrompt2 "Saya ingin membuat koneksi langsung ke jaringan Tor."> <!ENTITY torSettings.connectPrompt3 "Ini akan bekerja dalam kebanyakan situasi."> @@ -22,22 +22,22 @@ <!ENTITY torSettings.proxyPageTitle "Konfigurasi Proksi Lokal"> <!ENTITY torSettings.proxyQuestion "Apakah komputer ini memerlukan proksi lokal untuk dapat mengakses Internet?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "Dalam banyak kasus proksi lokal tidah dibutuhkan, tapi mungkin dibutuhkan ketika menghubungkan lewat jaringan perusahaan, sekolah, atau universitas."> +<!ENTITY torSettings.proxyExplanation2 "Jika anda tidak yakin bagaimana untuk menjawab pertanyaan ini, lihat dipengaturan Internet diperamban lainnya atau periksa pengaturan sistem jaringan anda untuk melihat apakah proksi lokal dibutuhkan."> <!ENTITY torSettings.enterProxy "Masuk ke pengaturan proksi."> <!ENTITY torSettings.bridgePageTitle "Konfigurasi Jembatan Tor"> <!ENTITY torSettings.bridgeQuestion "Apakah Penyedia Layanan Internet (ISP) Anda memblokir atau menyensor sambungan ke Jaringan Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Jika anda tidak yakin bagaimana untuk menjawab pertanyaan ini, pilih Tidak (jika anda tidak dapat menyambungkan ke jaringan Tor tanpa jembatan, anda dapat menambahkannya nanti)."> +<!ENTITY torSettings.bridgeExplanation2 "Jika anda pilih Ya, anda akan ditanyakan untuk mengatur Tor Bridges, dimana relai tak terdaftar yang membuatnya lebih susah untuk menghalangi koneksi ke Tor Network."> <!ENTITY torSettings.bridgeSettingsPrompt "Anda dapat menggunakan setelan jembatan yang disediakan atau Anda dapat memperoleh dan memasukkan setelan jembatan ubahsuai.">  <!ENTITY torsettings.startingTor "Menunggu Tor untuk memulai..."> <!ENTITY torsettings.restartTor "Muat Ulang Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Konfigurasi ulang"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> +<!ENTITY torsettings.discardSettings.prompt "Kamu telah mengatur jembatan Tor atau kamu telah memasukkan pengaturan proksi lokal.  Untuk membuat koneksi langsung ke jaringan Tor, pengaturan ini harus dihapus."> <!ENTITY torsettings.discardSettings.proceed "Buang Pengaturan dan Sambung"> <!ENTITY torsettings.optional "Opsional"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Port yang diizinkan:"> <!ENTITY torsettings.useBridges.checkbox "Internet Service Provider (ISP) saya memblokir koneksi ke jaringan Tor"> <!ENTITY torsettings.useBridges.default "Terhubung dengan bridge yang disediakan"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Setiap tipe jembatan menggunakan metode berbeda untuk menghindari penyaringan.  Jika satu jembatan tidak dapat bekerja, coba gunakan lagi jembatan lainnya."> <!ENTITY torsettings.useBridges.type "Jenis Transport :"> <!ENTITY torsettings.useBridges.custom "Masukkan bridge yang biasa digunakan"> <!ENTITY torsettings.useBridges.label "Masukkan satu atau beberapa jembatan penyambung (satu per baris)."> diff --git a/src/chrome/locale/id/torlauncher.properties b/src/chrome/locale/id/torlauncher.properties index cc23057..3605b08 100644 --- a/src/chrome/locale/id/torlauncher.properties +++ b/src/chrome/locale/id/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S gagal (%2$S). torlauncher.unable_to_start_tor=Tidak dapat memulai Tor\n\n%S torlauncher.tor_missing=Tor executable hilang -torlauncher.torrc_missing=File torrc hilang -torlauncher.datadir_missing=Direktori data Tor tidak ada. +torlauncher.torrc_missing=Berkas torrc hilang dan tidak dapat dibuat. +torlauncher.datadir_missing=Direktori data tor tidak ada dan tidak dapat dibuat. torlauncher.password_hash_missing=Gagal mendapatkan kata sandi hashed. torlauncher.failed_to_get_settings=Gagal mendapatkan pengaturan Tor.\n\n%S diff --git a/src/chrome/locale/is/progress.dtd b/src/chrome/locale/is/progress.dtd index c6f500e..4cc7f46 100644 --- a/src/chrome/locale/is/progress.dtd +++ b/src/chrome/locale/is/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Staða Tor"> <!ENTITY torprogress.openSettings "Opna stillingar"> <!ENTITY torprogress.heading "Tengist Tor-netinu"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Bíddu aðeins á meðan tengingu er komið á við Tor-netið.  Það getur tekið nokkrar mínútur."> diff --git a/src/chrome/locale/is/torlauncher.properties b/src/chrome/locale/is/torlauncher.properties index 9a238cc..9a47c1b 100644 --- a/src/chrome/locale/is/torlauncher.properties +++ b/src/chrome/locale/is/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor-ræsir @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S mistókst (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd index 4d67204..d1252a5 100644 --- a/src/chrome/locale/it/network-settings.dtd +++ b/src/chrome/locale/it/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "Quale delle seguenti descrizioni raffigura meglio la tua situazione?"> <!ENTITY torSettings.configurePrompt1 "La connessione a Internet di questo computer è bloccata da censura o utilizza un proxy."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Ho bisogno di configurare le impostazioni del bridge o del proxy locale prima di connettermi alla rete Tor."> <!ENTITY torSettings.configure "Configura"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Vorrei connettermi direttamente alla rete Tor."> <!ENTITY torSettings.connectPrompt3 "Questo funzionerà nella maggior parte delle situazioni."> <!ENTITY torSettings.connect "Connetti"> <!ENTITY torSettings.proxyPageTitle "Configurazione Proxy locale"> <!ENTITY torSettings.proxyQuestion "Questo computer richiede l'uso di un proxy locale per accedere ad Internet?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "Nella maggior parte dei casi un proxy locale non è necessario, ma può essere richiesto quando ci si connette da una rete scolastica, universitaria o aziendale."> +<!ENTITY torSettings.proxyExplanation2 "Se non sei sicuro su come rispondere a questa domanda, controlla le impostazioni di Rete in un altro browser o nelle impostazioni del tuo sistema per vedere se è necessario un proxy locale."> <!ENTITY torSettings.enterProxy "Inserisci le impostazioni del proxy."> <!ENTITY torSettings.bridgePageTitle "Configurazione Bridge di Tor"> <!ENTITY torSettings.bridgeQuestion "Il tuo fornitore di servizi internet (ISP) blocca o censura la connessione alla rete Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Se non sei sicuro su come rispondere a questa domanda, scegli No (se non riesci a connetterti alla rete Tor senza un bridge puoi aggiungerlo in seguito)."> +<!ENTITY torSettings.bridgeExplanation2 "Se scegli Si, ti verrà chiesto di configurare i Bridge Tor, che sono relay non listati che rendono più difficile il blocco delle connessioni alla rete Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Puoi usare il set preconfigurato di bridge o ottenere ed inserire un set personale di bridge.">  <!ENTITY torsettings.startingTor "In attesa di avviare Tor..."> <!ENTITY torsettings.restartTor "Riavvia Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Riconfigura"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Tu hai configurato i bridge Tor o hai inserito le impostazioni per il proxy locale.  Per effettuare una connessione diretta alla rete Tor, queste impostazioni devono essere rimosse."> +<!ENTITY torsettings.discardSettings.proceed "Rimuovi Impostazioni e Connetti"> <!ENTITY torsettings.optional "Facoltativo"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Porte consentite:"> <!ENTITY torsettings.useBridges.checkbox "Il mio fornitore di servizi Internet (ISP) blocca le connessioni alla rete Tor"> <!ENTITY torsettings.useBridges.default "Collegati usando i bridge preconfigurati"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Ogni tipo di bridge usa un metodo differente per scavalcare la censura.  Se un bridge non funziona, prova di nuovo usandone uno diverso. "> <!ENTITY torsettings.useBridges.type "Tipo di trasporto:"> <!ENTITY torsettings.useBridges.custom "Inserire bridge personaizzati"> <!ENTITY torsettings.useBridges.label "Inserisci uno o più bridge relay (uno per riga)"> diff --git a/src/chrome/locale/it/progress.dtd b/src/chrome/locale/it/progress.dtd index ef30289..cf758aa 100644 --- a/src/chrome/locale/it/progress.dtd +++ b/src/chrome/locale/it/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Stato di Tor"> <!ENTITY torprogress.openSettings "Apertura impostazioni"> <!ENTITY torprogress.heading "Connessione in corso alla rete Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Perfavore attendi finche non viene stabilita una connessione alla rete Tor.  Potrebbe richiedere alcuni minuti."> diff --git a/src/chrome/locale/it/torlauncher.properties b/src/chrome/locale/it/torlauncher.properties index b5729ed..f89dd16 100644 --- a/src/chrome/locale/it/torlauncher.properties +++ b/src/chrome/locale/it/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Avviatore di Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Impossibile avviare Tor.⏎\n⏎\n%S torlauncher.tor_missing=Il file eseguibile di Tor è mancante. -torlauncher.torrc_missing=Il file di configurazione torrc è mancante. -torlauncher.datadir_missing=La directory dei dati di Tor non esiste. +torlauncher.torrc_missing=Il file torrc non è presente e non è stato possibile crearlo. +torlauncher.datadir_missing=La cartella dei dati di Tor non esiste e non è stato possibile crearla. torlauncher.password_hash_missing=Tentativo di ottenere la password fallito. torlauncher.failed_to_get_settings=Impossibile recuperare le impostazioni di Tor.⏎\n⏎\n%S diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd index 6fe3ede..9b5a1a1 100644 --- a/src/chrome/locale/ja/network-settings.dtd +++ b/src/chrome/locale/ja/network-settings.dtd @@ -35,10 +35,10 @@ <!ENTITY torsettings.startingTor "Torの開始を待っています..."> <!ENTITY torsettings.restartTor "Torを再起動する"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "再設定"> <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.proceed "設定と接続を削除"> <!ENTITY torsettings.optional "オプション"> diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties index c679f1d..da5c840 100644 --- a/src/chrome/locale/ja/torlauncher.properties +++ b/src/chrome/locale/ja/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S 失敗 (%2$S)。 torlauncher.unable_to_start_tor=Torを開始出来ません。\n\n%S torlauncher.tor_missing=Torの実行可能ファイルが見つかりません。 -torlauncher.torrc_missing=torrcファイルが見つかりません。 -torlauncher.datadir_missing=Torのデータディレクトリが存在しません。 +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=ハッシュ化されたパスワードの入手に失敗しました torlauncher.failed_to_get_settings=Torの設定を回復出来ません。\n\n%S diff --git a/src/chrome/locale/jv/torlauncher.properties b/src/chrome/locale/jv/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/jv/torlauncher.properties +++ b/src/chrome/locale/jv/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/ka/network-settings.dtd b/src/chrome/locale/ka/network-settings.dtd index 135c799..8d22f27 100644 --- a/src/chrome/locale/ka/network-settings.dtd +++ b/src/chrome/locale/ka/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> +<!ENTITY torSettings.yes "დიახ"> +<!ENTITY torSettings.no "არა"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> @@ -48,7 +48,7 @@ <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "პორტი:"> <!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.password "პაროლი"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> diff --git a/src/chrome/locale/ka/torlauncher.properties b/src/chrome/locale/ka/torlauncher.properties index 02be756..e85cf5f 100644 --- a/src/chrome/locale/ka/torlauncher.properties +++ b/src/chrome/locale/ka/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -33,7 +33,7 @@ torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit torlauncher.quit_win=Exit -torlauncher.done=Done +torlauncher.done=შესრულებულია torlauncher.forAssistance=For assistance, contact %S diff --git a/src/chrome/locale/kk/torlauncher.properties b/src/chrome/locale/kk/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/kk/torlauncher.properties +++ b/src/chrome/locale/kk/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/km/torlauncher.properties b/src/chrome/locale/km/torlauncher.properties index b93eb81..f93bbf4 100644 --- a/src/chrome/locale/km/torlauncher.properties +++ b/src/chrome/locale/km/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=កម្មវិធីចាប់ផ្ដើម Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=បានបរាជ័យ %1$S (% torlauncher.unable_to_start_tor=មិនអាចចាប់ផ្ដើម Tor ។\n\n%S torlauncher.tor_missing=បាត់ឯកសារអាចប្រតិបត្តិរបស់ Tor ។ -torlauncher.torrc_missing=បាត់ឯកសារ torrc ។ -torlauncher.datadir_missing=មិនមានថតទិន្នន័យ Tor ។ +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=បានបរាជ័យក្នុងការទទួលពាក្យសម្ងាត់។ torlauncher.failed_to_get_settings=មិនអាចទៅយកការកំណត់ Tor ។\n\n%S diff --git a/src/chrome/locale/kn/torlauncher.properties b/src/chrome/locale/kn/torlauncher.properties index a4ad1c9..0f15993 100644 --- a/src/chrome/locale/kn/torlauncher.properties +++ b/src/chrome/locale/kn/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/ko-KR/torlauncher.properties b/src/chrome/locale/ko-KR/torlauncher.properties index c793562..9607599 100644 --- a/src/chrome/locale/ko-KR/torlauncher.properties +++ b/src/chrome/locale/ko-KR/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties index c20a6ac..6f79f3e 100644 --- a/src/chrome/locale/ko/torlauncher.properties +++ b/src/chrome/locale/ko/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor 브라우저 Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S 실패 (%2$S) torlauncher.unable_to_start_tor=Tor를 시작할 수 없습니다.\n\n%S torlauncher.tor_missing=Tor 실행 파일이 없습니다. -torlauncher.torrc_missing=torrc 파일이 없습니다. -torlauncher.datadir_missing=Tor 데이터 목록이 존재하지 않습니다. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=해쉬 암호 획득 실패 torlauncher.failed_to_get_settings=Tor 설정을 찾을 수 없습니다.\n\n%S @@ -52,7 +52,7 @@ torlauncher.bootstrapStatus.done=Tor 네트워크에 연결 성공! torlauncher.bootstrapWarning.done=완료 torlauncher.bootstrapWarning.connectrefused=연결이 거부됨 -torlauncher.bootstrapWarning.misc=잡동사니 +torlauncher.bootstrapWarning.misc=기타 torlauncher.bootstrapWarning.resourcelimit=리소스 부족 torlauncher.bootstrapWarning.identity=계정 불일치 torlauncher.bootstrapWarning.timeout=연결 타임아웃 diff --git a/src/chrome/locale/ku/torlauncher.properties b/src/chrome/locale/ku/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/ku/torlauncher.properties +++ b/src/chrome/locale/ku/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/kw/torlauncher.properties b/src/chrome/locale/kw/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/kw/torlauncher.properties +++ b/src/chrome/locale/kw/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/ky/torlauncher.properties b/src/chrome/locale/ky/torlauncher.properties index 66f9e15..4421de0 100644 --- a/src/chrome/locale/ky/torlauncher.properties +++ b/src/chrome/locale/ky/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/lb/torlauncher.properties b/src/chrome/locale/lb/torlauncher.properties index 9edd40f..8d0c343 100644 --- a/src/chrome/locale/lb/torlauncher.properties +++ b/src/chrome/locale/lb/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/lg/torlauncher.properties b/src/chrome/locale/lg/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/lg/torlauncher.properties +++ b/src/chrome/locale/lg/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/ln/torlauncher.properties b/src/chrome/locale/ln/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/ln/torlauncher.properties +++ b/src/chrome/locale/ln/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/lo/torlauncher.properties b/src/chrome/locale/lo/torlauncher.properties index 10e34b0..a63122d 100644 --- a/src/chrome/locale/lo/torlauncher.properties +++ b/src/chrome/locale/lo/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=ໂຕເປີດ Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/lt/torlauncher.properties b/src/chrome/locale/lt/torlauncher.properties index 99962c4..ec15294 100644 --- a/src/chrome/locale/lt/torlauncher.properties +++ b/src/chrome/locale/lt/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Leistuvas @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S nepavyko (%2$S). torlauncher.unable_to_start_tor=Nepavyksta paleisti Tor.\n\n%S torlauncher.tor_missing=Trūksta Tor vykdomojo failo. -torlauncher.torrc_missing=Trūksta torrc failo -torlauncher.datadir_missing=Nesukurtas Tor duomenų aplankas +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Nepavyko perskaityti slaptažodžio santrumpos torlauncher.failed_to_get_settings=Nepavyko perskaityti Tor nustatymo parametrų.\n\n%S diff --git a/src/chrome/locale/lv/torlauncher.properties b/src/chrome/locale/lv/torlauncher.properties index fff24bf..ac4ae63 100644 --- a/src/chrome/locale/lv/torlauncher.properties +++ b/src/chrome/locale/lv/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor palaidējs @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S neizdevas (%2$S). torlauncher.unable_to_start_tor=Nespēj startēt Tor:\n⏎\n%S torlauncher.tor_missing=Trūkst Tor'a izpildāmā moduļa. -torlauncher.torrc_missing=Trūkst datnes torrc . -torlauncher.datadir_missing=Tor'a datu direktorijs nepastāv. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Neizdevās saņemt jaukto paroli. torlauncher.failed_to_get_settings=Neizdevās izgūt Tor'a iestatījumus.\n\n%S diff --git a/src/chrome/locale/mg/torlauncher.properties b/src/chrome/locale/mg/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/mg/torlauncher.properties +++ b/src/chrome/locale/mg/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/mi/torlauncher.properties b/src/chrome/locale/mi/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/mi/torlauncher.properties +++ b/src/chrome/locale/mi/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/mk/torlauncher.properties b/src/chrome/locale/mk/torlauncher.properties index 3b8e9fa..c3b5603 100644 --- a/src/chrome/locale/mk/torlauncher.properties +++ b/src/chrome/locale/mk/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(препорачано) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/ml/torlauncher.properties b/src/chrome/locale/ml/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/ml/torlauncher.properties +++ b/src/chrome/locale/ml/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/mn/torlauncher.properties b/src/chrome/locale/mn/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/mn/torlauncher.properties +++ b/src/chrome/locale/mn/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/mr/network-settings.dtd b/src/chrome/locale/mr/network-settings.dtd index c31e040..d64287e 100644 --- a/src/chrome/locale/mr/network-settings.dtd +++ b/src/chrome/locale/mr/network-settings.dtd @@ -8,7 +8,7 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> -<!ENTITY torSettings.yes "Yes"> +<!ENTITY torSettings.yes "होय"> <!ENTITY torSettings.no "नाही"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> diff --git a/src/chrome/locale/mr/torlauncher.properties b/src/chrome/locale/mr/torlauncher.properties index 010b0d4..559c038 100644 --- a/src/chrome/locale/mr/torlauncher.properties +++ b/src/chrome/locale/mr/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=टॉर लाँचर @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=टॉर सुरू करण्यात अपयश.\n\n%S torlauncher.tor_missing=टॉरची प्रोग्राम फाइल अनुपस्थित. -torlauncher.torrc_missing=torrc फाइल अनुपस्थित. -torlauncher.datadir_missing=टॉर माहिती संच अस्तित्वात नाही. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=हॅश्ड परवलीचा शब्द मिळवण्यात अपयश. torlauncher.failed_to_get_settings=टॉरच्या सेटिंग्स मिळवण्यात अपयश. diff --git a/src/chrome/locale/ms-MY/torlauncher.properties b/src/chrome/locale/ms-MY/torlauncher.properties index c403773..787edec 100644 --- a/src/chrome/locale/ms-MY/torlauncher.properties +++ b/src/chrome/locale/ms-MY/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Pelancar Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Tidak dapat memulakan Tor.\n\n%S torlauncher.tor_missing=Tor executable hilang. -torlauncher.torrc_missing=Fail torrc hilang. -torlauncher.datadir_missing=Direktori data Tor tidak wujud. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Gagal untuk mendapatkan kata laluan hashes. torlauncher.failed_to_get_settings=Gagal mendapatkan tetapan Tor.\n\n%S @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=Anda mesti menentukan satu atau lebih bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(digalakkan) torlauncher.connect=Menyambung torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/mt/torlauncher.properties b/src/chrome/locale/mt/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/mt/torlauncher.properties +++ b/src/chrome/locale/mt/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/my/torlauncher.properties b/src/chrome/locale/my/torlauncher.properties index 9c1d74c..857796d 100644 --- a/src/chrome/locale/my/torlauncher.properties +++ b/src/chrome/locale/my/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=Bridge တစ်ခု (သို့) တ torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(အကြံပြုထားသည်) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/nah/torlauncher.properties b/src/chrome/locale/nah/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/nah/torlauncher.properties +++ b/src/chrome/locale/nah/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/nap/torlauncher.properties b/src/chrome/locale/nap/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/nap/torlauncher.properties +++ b/src/chrome/locale/nap/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/nb/network-settings.dtd b/src/chrome/locale/nb/network-settings.dtd index 802253c..c36b0ea 100644 --- a/src/chrome/locale/nb/network-settings.dtd +++ b/src/chrome/locale/nb/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Tor Nettverksinnstillinger"> +<!ENTITY torsettings.dialog.title "Nettverksinnstillinger for Tor">  <!ENTITY torlauncher.localePicker.title "Språk i Tor-nettleser"> @@ -6,44 +6,44 @@  -<!ENTITY torsettings.prompt "Før du kan koble til Tor-nettverket, må du gi informasjon om denne datamaskinens internett-tilkobling."> +<!ENTITY torsettings.prompt "Før du kan koble til Tor-nettverket, må du gi informasjon om denne datamaskinens Internett-tilkobling."> <!ENTITY torSettings.yes "Ja"> <!ENTITY torSettings.no "Nei"> <!ENTITY torSettings.firstQuestion "Hvilket av følgende beskriver best din situasjon?"> -<!ENTITY torSettings.configurePrompt1 "Computeren's internett tilkobling er sensurert eller under proxy."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> -<!ENTITY torSettings.configure "Konfigurer"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.configurePrompt1 "Datamaskinens Internett-tilkobling er sensurert eller bak mellomtjener."> +<!ENTITY torSettings.configurePrompt2 "Jeg trenger å sette opp bro eller lokale mellomtjenerinnstillinger før jeg kobler til Tor nettverket."> +<!ENTITY torSettings.configure "Sett opp"> +<!ENTITY torSettings.connectPrompt2 "Jeg ønsker å opprette en direkte forbindelse til Tor-nettverket."> <!ENTITY torSettings.connectPrompt3 "Dette vil fungere i de fleste situasjoner."> <!ENTITY torSettings.connect "Koble til"> -<!ENTITY torSettings.proxyPageTitle "Lokal proxy-konfigurasjon"> +<!ENTITY torSettings.proxyPageTitle "Lokalt mellomtjener-oppsett"> <!ENTITY torSettings.proxyQuestion "Trenger denne maskinen å bruke en lokal mellomtjener for å nå Internett?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Skriv inn proxy-innstillingene."> +<!ENTITY torSettings.proxyExplanation1 "I de fleste tilfeller en lokal mellomtjener ikke er nødvendig, men det kan være påkrevd når du kobler til gjennom et firma, skole eller universitetsnettverk."> +<!ENTITY torSettings.proxyExplanation2 "Hvis du er usikker på hvordan du skal svare på dette spørsmålet, se på Internett-innstillingene i en annen nettleser eller sjekk nettverksinnstillingene systemets å se om en lokal mellomtjener er nødvendig."> +<!ENTITY torSettings.enterProxy "Skriv inn mellomtjenings-innstillingene."> <!ENTITY torSettings.bridgePageTitle "Oppsett av Tor-broer."> -<!ENTITY torSettings.bridgeQuestion "Blokkerer eller sensurerer internettleverandøren (ISP) din tilkoblinger til Tor-nettverket?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeQuestion "Blokkerer eller på annet vis sensurerer Internettleverandøren (ISP) dine tilkoblinger til Tor-nettverket?"> +<!ENTITY torSettings.bridgeExplanation1 "Hvis du er usikker på hvordan du skal svare på dette spørsmålet, velg Nei (hvis du ikke klarer å koble til Tor-nettverket uten en bro, kan du legge til en senere)."> +<!ENTITY torSettings.bridgeExplanation2 "Hvis du velger Ja, vil du bli bedt om å sette opp Tor-broer, som er unoterte rutingsstafettoppsett som gjør det vanskeligere å blokkere tilkoblinger til Tor-nettverket."> <!ENTITY torSettings.bridgeSettingsPrompt "Du kan bruke de angitte broene eller du kan skaffe og oppgi egendefinerte broer.">  -<!ENTITY torsettings.startingTor "Venter på at Tor skal starte..."> +<!ENTITY torsettings.startingTor "Venter på at Tor skal starte…"> <!ENTITY torsettings.restartTor "Omstart av Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Sett opp på ny"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Du har satt opp Tor-broer eller du har angitt lokale mellomtjeningsinnstillinger.   For å gjøre en direkte forbindelse til Tor-nettverket, må disse innstillingene fjernes."> +<!ENTITY torsettings.discardSettings.proceed "Fjern innstillinger og koble til"> <!ENTITY torsettings.optional "Valgfritt"> <!ENTITY torsettings.useProxy.checkbox "Denne maskinen trenger å bruke en mellomtjener for å nå Internett"> -<!ENTITY torsettings.useProxy.type "Proxytype:"> +<!ENTITY torsettings.useProxy.type "Mellomtjeningstype:"> <!ENTITY torsettings.useProxy.address "Adresse:"> <!ENTITY torsettings.useProxy.address.placeholder "IP-adresse, eller vertsnavn"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -53,19 +53,19 @@ <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Denne datamaskinen går gjennom en brannmur som kun tillater tilkoblinger til visse porter"> -<!ENTITY torsettings.firewall.allowedPorts "Tillatte Porter:"> +<!ENTITY torsettings.firewall.allowedPorts "Tillatte porter:"> <!ENTITY torsettings.useBridges.checkbox "Min Internettleverandør (ISP) blokkerer tilkoblinger til Tor-nettverket"> <!ENTITY torsettings.useBridges.default "Koble til med angitte broer"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Hver type bro bruker en annen metode for å unngå sensur.  Hvis en bro ikke virker, prøv på nytt med en annen."> <!ENTITY torsettings.useBridges.type "Tilkoblingstype:"> <!ENTITY torsettings.useBridges.custom "Angi egendefinerte broer"> -<!ENTITY torsettings.useBridges.label "Angi én eller flere bro-reléer (én per linje)."> +<!ENTITY torsettings.useBridges.label "Angi én eller flere bro-rutingsstafettoppsett (ett per linje)."> <!ENTITY torsettings.useBridges.placeholder "type adresse:port"> <!ENTITY torsettings.copyLog "Kopier Torloggen til Utklippstavlen"> -<!ENTITY torsettings.bridgeHelpTitle "Bro-relé Hjelp"> -<!ENTITY torsettings.bridgeHelp1 "Hvis du ikke får koblet til Tor-nettverket, kan det være at internettleverandøren din (ISP), eller et annet byrå/institusjon/etat blokkerer Tor.  Som regel kan du omgå dette problemet ved å bruke Tor-broer, som er ulistede reléer og derfor vanskeligere å blokkere."> -<!ENTITY torsettings.bridgeHelp1B "Du kan bruke de prekonfigurerte, angitte bro-adressene eller du kan skaffe deg egendefinerte adresser ved å bruke en av følgende tre metoder:"> +<!ENTITY torsettings.bridgeHelpTitle "Hjelp med Bro-rutingsstafettoppsett"> +<!ENTITY torsettings.bridgeHelp1 "Hvis du ikke får koblet til Tor-nettverket, kan det være at internettleverandøren din (ISP), eller et annet byrå/institusjon/etat blokkerer Tor.  Som regel kan du omgå dette problemet ved å bruke Tor-broer, som er ulistede rutingsstafettoppsett og derfor vanskeligere å blokkere."> +<!ENTITY torsettings.bridgeHelp1B "Du kan bruke forvalgsoppsatte bro-adressene eller du kan skaffe deg egendefinerte adresser ved å bruk av en av følgende tre metoder:"> <!ENTITY torsettings.bridgeHelp2Heading "Via nettet"> <!ENTITY torsettings.bridgeHelp2 "Bruk en nettleser for å besøke https://bridges.torproject.org/?lang=nb"> <!ENTITY torsettings.bridgeHelp3Heading "Via e-post autosvar"> diff --git a/src/chrome/locale/nb/progress.dtd b/src/chrome/locale/nb/progress.dtd index 2d7049a..82cf290 100644 --- a/src/chrome/locale/nb/progress.dtd +++ b/src/chrome/locale/nb/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> +<!ENTITY torprogress.dialog.title "Tor-status"> <!ENTITY torprogress.openSettings "Åpne Innstillinger"> <!ENTITY torprogress.heading "Kobler til Tor-nettverket"> -<!ENTITY torprogress.pleaseWait "Vennligst vent mens vi oppretter en tilkobling til Tor-nettverket.  Dette kan ta flere minutter."> +<!ENTITY torprogress.pleaseWait "Vent mens tilkobling til Tor-nettverket.  opprettes. Dette kan ta flere minutter."> diff --git a/src/chrome/locale/nb/torlauncher.properties b/src/chrome/locale/nb/torlauncher.properties index cdbad0e..8123d5d 100644 --- a/src/chrome/locale/nb/torlauncher.properties +++ b/src/chrome/locale/nb/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,19 +13,19 @@ torlauncher.tor_bootstrap_failed_details=%1$S feilet (%2$S). torlauncher.unable_to_start_tor=Kunne ikke starte Tor.\n\n%S torlauncher.tor_missing=Den kjørbare Tor-filen finnes ikke. -torlauncher.torrc_missing=torrc filen finnes ikke. -torlauncher.datadir_missing=Datamappen til Tor finnes ikke. +torlauncher.torrc_missing=torrc-fila mangler og kunne ikke opprettes. +torlauncher.datadir_missing=Datakatalogen til Tor finnes ikke og kunne ikke opprettes. torlauncher.password_hash_missing=Kunne ikke hente kryptert passord. torlauncher.failed_to_get_settings=Kunne ikke hente Tor-innstillinger.\n\n%S torlauncher.failed_to_save_settings=Kunne ikke lagre Tor-innstillinger.\n\n%S -torlauncher.ensure_tor_is_running=Vennligst sjekk at Tor kjører. +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 å konfigurere Tor til å bruke en proxy for å koble til Internett. -torlauncher.error_proxy_type_missing=Du må velge proxytypen +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 melomtjenertypen 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_bridge_bad_default_type=Ingen angitte broer som har tilkoblingstypen %S er tilgjengelige. Vennligst juster innstillingene dine. +torlauncher.error_bridge_bad_default_type=Ingen angitte broer som har tilkoblingstypen %S er tilgjengelige. Juster innstillingene dine. torlauncher.recommended_bridge=(anbefalt) @@ -37,15 +37,15 @@ torlauncher.done=Ferdig torlauncher.forAssistance=For hjelp, kontakt %S -torlauncher.copiedNLogMessages=Kopiering ferdig. %S Tor log meldinger er klare til å bli sent til et skriveprogram eller en email. +torlauncher.copiedNLogMessages=Kopiering ferdig. %S Torloggførings-meldinger er klare til å bli sent til et skriveprogram eller en e-post. -torlauncher.bootstrapStatus.conn_dir=Kobler til en relékatalog +torlauncher.bootstrapStatus.conn_dir=Kobler til en rutingsstafettoppsetts-katalog torlauncher.bootstrapStatus.handshake_dir=Etablerer en kryptert katalogforbindelse torlauncher.bootstrapStatus.requesting_status=Mottar nettverkstatus torlauncher.bootstrapStatus.loading_status=Laster nettverkstatus torlauncher.bootstrapStatus.loading_keys=Laster serfikater for autoritet -torlauncher.bootstrapStatus.requesting_descriptors=Sender forespørsel om reléinformasjon -torlauncher.bootstrapStatus.loading_descriptors=Laster reléinformasjon +torlauncher.bootstrapStatus.requesting_descriptors=Sender forespørsel om rutingsstafettoppsettsinformasjon +torlauncher.bootstrapStatus.loading_descriptors=Laster inn rutingsstafettoppsetts-informasjon torlauncher.bootstrapStatus.conn_or=Kobler til Tor-nettverket torlauncher.bootstrapStatus.handshake_or=Etablerer en Tor-rute torlauncher.bootstrapStatus.done=Koblet til Tor-nettverket! diff --git a/src/chrome/locale/nds/torlauncher.properties b/src/chrome/locale/nds/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/nds/torlauncher.properties +++ b/src/chrome/locale/nds/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/ne/torlauncher.properties b/src/chrome/locale/ne/torlauncher.properties index ddd7834..d3c501d 100644 --- a/src/chrome/locale/ne/torlauncher.properties +++ b/src/chrome/locale/ne/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=टोर सुरुवातकर्ता @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=टोरको सेटिङ भेटिएन diff --git a/src/chrome/locale/nl-BE/torlauncher.properties b/src/chrome/locale/nl-BE/torlauncher.properties index e231325..802f2b5 100644 --- a/src/chrome/locale/nl-BE/torlauncher.properties +++ b/src/chrome/locale/nl-BE/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Kan Tor niet starten.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=Het torcc bestand ontbreekt -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd index ab35d6b..5ca3415 100644 --- a/src/chrome/locale/nl/network-settings.dtd +++ b/src/chrome/locale/nl/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "Welke van de volgende beschrijft het best jouw situatie?"> <!ENTITY torSettings.configurePrompt1 "De internetverbinding van deze computer is gecensureerd of loopt via een proxy."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Ik moet een bridge of lokale proxy instellingen voordat ik verbinding kan maken met het Tor netwerk."> <!ENTITY torSettings.configure "Configureren"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Ik wil een directe verbinding met het Tor netwerk maken."> <!ENTITY torSettings.connectPrompt3 "Dit zal in de meeste omstandigheden werken."> <!ENTITY torSettings.connect "Verbinden"> <!ENTITY torSettings.proxyPageTitle "Lokale proxy-configuratie"> <!ENTITY torSettings.proxyQuestion "Heeft deze computer een lokale proxy nodig om toegang tot het internet te krijgen?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "In de meeste gevallen is een locale proxy niet nodig, maar kan het wel worden vereist bij het verbinden met een bedrijf, school of universitair netwerk."> +<!ENTITY torSettings.proxyExplanation2 "Als je niet zeker bent over het antwoord op deze vraag, bekijk dan de verbindingsinstellingen van een andere browser om te zien of die is ingesteld om gebruik te maken van een proxy."> <!ENTITY torSettings.enterProxy "Voer de proxy-instellingen in."> <!ENTITY torSettings.bridgePageTitle "Tor bridge-configuratie"> <!ENTITY torSettings.bridgeQuestion "Blokkeert of filtert je Internet Service Provider (ISP) verbindingen met het Tor-netwerk?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Als je niet zeker bent hoe je deze vraag moet beantwoorden, kies dan Nee (als je niet kunt verbinden met het Tor netwerk zonder een bridge, kun je later een toevoegen)."> +<!ENTITY torSettings.bridgeExplanation2 "Als je Ja kiest, moet je zelf Tor Bridges instellen, maar omdat het geen vertrouwde relays zijn is het moeilijker om verbindingen te blokkeren naar het Tor Netwerk."> <!ENTITY torSettings.bridgeSettingsPrompt "Je ka de opgegeven bridges gebruiken, of je kan je eigen bridges verkrijgen en instellen. ">  <!ENTITY torsettings.startingTor "Wachten tot Tor gestart is…"> <!ENTITY torsettings.restartTor "Herstart Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Herconfigureer"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "U heeft Tor bridges geconfigureerd of u heeft locale proxy instellingen ingevuld.  Om een directe verbinding tot het Tor netwerk te kunnen maken, dient u deze instellingen te verwijderen."> +<!ENTITY torsettings.discardSettings.proceed "Instellingen Verwijderen en Verbinden"> <!ENTITY torsettings.optional "Facultatief"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Toegestane poorten:"> <!ENTITY torsettings.useBridges.checkbox "Mijn Internet Service Provider (ISP) blokkeert verbindingen naar het Tor-netwerk"> <!ENTITY torsettings.useBridges.default "Verbinden met ingestelde bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Elk type bridge gebruikt een verschillende methode om censorship te voorkomen.  Als een van de bridges niet werkt, probeert u het dan opnieuw met een andere."> <!ENTITY torsettings.useBridges.type "Transporttype:"> <!ENTITY torsettings.useBridges.custom "Eigen bridge-instellingen"> <!ENTITY torsettings.useBridges.label "Voer een of meer bridge relays in (een per regel)."> diff --git a/src/chrome/locale/nl/progress.dtd b/src/chrome/locale/nl/progress.dtd index fb513ad..a7ced45 100644 --- a/src/chrome/locale/nl/progress.dtd +++ b/src/chrome/locale/nl/progress.dtd @@ -1,4 +1,5 @@ -<!ENTITY torprogress.dialog.title "Tor status"> +<!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Instellingen"> <!ENTITY torprogress.heading "Bezig met verbinden met het Tor-netwerk"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Even geduld terwijl we verbinding maken met het Tor netwerk.  +Dit kan enkele minuten duren."> diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties index 12c0bf7..0a54610 100644 --- a/src/chrome/locale/nl/torlauncher.properties +++ b/src/chrome/locale/nl/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Starter @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S mislukte (%2$S). torlauncher.unable_to_start_tor=Kon Tor niet starten.\n\n%S torlauncher.tor_missing=Het Tor uitvoerbare bestand ontbreekt. -torlauncher.torrc_missing=Het torrc bestand ontbreekt. -torlauncher.datadir_missing=De Tor data map bestaat niet. +torlauncher.torrc_missing=Het torrc bestand is missend en kon niet worden aangemaakt. +torlauncher.datadir_missing=De Tor data directory bestaat niet en kon niet worden aangemaakt. torlauncher.password_hash_missing=Ophalen van een gehashed wachtwoord is mislukt. torlauncher.failed_to_get_settings=Kon Tor instellingen niet ophalen.\n\n%S diff --git a/src/chrome/locale/nn/network-settings.dtd b/src/chrome/locale/nn/network-settings.dtd index 4bd82f0..d52677d 100644 --- a/src/chrome/locale/nn/network-settings.dtd +++ b/src/chrome/locale/nn/network-settings.dtd @@ -1,41 +1,41 @@ <!ENTITY torsettings.dialog.title "Tor nettverksinnstillingar">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Tor nettlesarspråk"> +<!ENTITY torlauncher.localePicker.prompt "Vel eit språk.">  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Før du koplar til Tor-nettverket må du oppgje korleis maskina di koplar til internett."> <!ENTITY torSettings.yes "Ja"> <!ENTITY torSettings.no "Nei"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "Dette vil fungera i dei fleste høve"> +<!ENTITY torSettings.firstQuestion "Kva trur du passar best?"> +<!ENTITY torSettings.configurePrompt1 "Internett-sambandet til denne maskina er anten sensurert eller går gjennom ein proxy-tenar."> +<!ENTITY torSettings.configurePrompt2 "Eg må konfigurera bru- eller lokale proxyinnstillingar før eg koplar til Tor-nettverket."> +<!ENTITY torSettings.configure "Konfigurer"> +<!ENTITY torSettings.connectPrompt2 "Eg vil kopla til Tor-nettverket direkte."> +<!ENTITY torSettings.connectPrompt3 "Dette vil fungera i dei fleste høve."> <!ENTITY torSettings.connect "Kopla til"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyPageTitle "Konfigurasjon av lokal proxy"> +<!ENTITY torSettings.proxyQuestion "For å kopla til internett, treng denne maskina å nytta ein lokal proxy?">  <!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> <!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> <!ENTITY torSettings.enterProxy "Skriv inn mellomtenarinnstillingane."> <!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.bridgeQuestion "Sensurerer eller blokkerer internettleverandøren din (ISP) på noko vis tilgang til Tor-nettverket?"> +<!ENTITY torSettings.bridgeExplanation1 "Viss du ikkje er viss på dette, så vel Nei (viss du ikkje klarer å kopla til Tor-nettverket utan ei bru, kan du sete opp dette seinare)."> +<!ENTITY torSettings.bridgeExplanation2 "Viss du vel Ja, vert du spurt om du vil konfigurere bruer med Tor. Bruer er ulista relear som gjer det vanskelegare å blokkere samband til Tor-nettverket."> +<!ENTITY torSettings.bridgeSettingsPrompt "Du kan nytta bruene som følgjer med eller skaffa og skriva inn dine eigne.">  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> +<!ENTITY torsettings.startingTor "Ventar på at Tor startar..."> <!ENTITY torsettings.restartTor "Start Tor på nytt"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Konfigurer på nytt."> <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> <!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> @@ -67,7 +67,7 @@ <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> <!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp2 "Nytt ein nettlesar for å vitja https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> <!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> diff --git a/src/chrome/locale/nn/torlauncher.properties b/src/chrome/locale/nn/torlauncher.properties index 062fb5c..20106f3 100644 --- a/src/chrome/locale/nn/torlauncher.properties +++ b/src/chrome/locale/nn/torlauncher.properties @@ -1,20 +1,20 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher +torlauncher.error_title=Tor-oppstartar torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. -torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -torlauncher.tor_failed_to_start=Tor failed to start. +torlauncher.tor_controlconn_failed=Kunne ikkje kopla til Tor-kontrollport. +torlauncher.tor_failed_to_start=Tor klarte ikkje å starta opp. torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. +torlauncher.tor_bootstrap_failed=Tor klarte ikkje å kopla til eit samband med Tor-nettverket. torlauncher.tor_bootstrap_failed_details=%1$S feila (%2$S). -torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S +torlauncher.unable_to_start_tor=Tor kunne ikkje starta.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=torrc-fila manglar -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/nso/torlauncher.properties b/src/chrome/locale/nso/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/nso/torlauncher.properties +++ b/src/chrome/locale/nso/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/oc/torlauncher.properties b/src/chrome/locale/oc/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/oc/torlauncher.properties +++ b/src/chrome/locale/oc/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/or/torlauncher.properties b/src/chrome/locale/or/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/or/torlauncher.properties +++ b/src/chrome/locale/or/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/pa/torlauncher.properties b/src/chrome/locale/pa/torlauncher.properties index 4246cf6..db520b5 100644 --- a/src/chrome/locale/pa/torlauncher.properties +++ b/src/chrome/locale/pa/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=ਟੋਰ ਲਾਂਚਰ @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/pap/torlauncher.properties b/src/chrome/locale/pap/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/pap/torlauncher.properties +++ b/src/chrome/locale/pap/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd index 42180fa..d613408 100644 --- a/src/chrome/locale/pl/network-settings.dtd +++ b/src/chrome/locale/pl/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "Które z poniższych najlepiej opisuje Twoją sytuację?"> <!ENTITY torSettings.configurePrompt1 "Połączenie internetowe tego komputera jest ocenzurowane lub przepuszczane przez proxy."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Muszę skonfigurować ustawienia mostka lub lokalne proxy przed podłączyć do sieci Tor."> <!ENTITY torSettings.configure "Konfiguruj"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Chciałbym nawiązać bezpośrednie połączenie do sieci Tor."> <!ENTITY torSettings.connectPrompt3 "To zadziała w większości sytuacji."> <!ENTITY torSettings.connect "Połącz"> <!ENTITY torSettings.proxyPageTitle "Ustawienia lokalnego proxy"> <!ENTITY torSettings.proxyQuestion "Czy ten komputer musi używać lokalnego proxy, aby połączyć się z Internetem?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "W większości przypadków lokalny serwer proxy nie jest potrzebny, jednakże może to być konieczne w przypadku podłączenia przez firmy, szkoły lub sieci uniwersyteckiej."> +<!ENTITY torSettings.proxyExplanation2 "Jeśli nie jesteś pewien, jak odpowiedzieć na to pytanie, przejrzyj ustawienia opcji internetowych w innej przeglądarce lub sprawdzić ustawienia sieci danego systemu, aby sprawdzić, czy lokalny serwer proxy jest potrzebny."> <!ENTITY torSettings.enterProxy "Wprowadź ustawienia serwera proxy"> <!ENTITY torSettings.bridgePageTitle "Ustawienia Tor Bridges"> <!ENTITY torSettings.bridgeQuestion "Czy Twój dostawca usług internetowych (ISP) blokuje lub cenzuruje połączenia sieci Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Jeśli nie jesteś pewien, jak odpowiedzieć na to pytanie, wybierz opcję Nie (jeśli nie jesteś w stanie połączyć się z siecią Tor bez mostu, możesz dodać jeden później)."> +<!ENTITY torSettings.bridgeExplanation2 "Jeśli wybierzesz Tak, zostaniesz poproszony o skonfigurowanie Mostu Tor, który jest przekaźnikiem nie listowanym, sprawia to, że trudniej zablokować połączenia do sieci Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Możesz wybrać dostępny zestaw mostków, albo możesz uzyskać i wprowadzić niestandardowy zestaw mostów.">  <!ENTITY torsettings.startingTor "Uruchamianie oprogramowania Tor"> <!ENTITY torsettings.restartTor "Zrestartuj Tora"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Przekonfiguruj"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.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.optional "(opcjonalnie)"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Dozwolone porty:"> <!ENTITY torsettings.useBridges.checkbox "Mój dostawca internetu blokuje połączenia do sieci Tor"> <!ENTITY torsettings.useBridges.default "Połącz z dostępnymi mostami."> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Każdy rodzaj mostu używa innej metody, aby uniknąć cenzury..  Jeśli jeden most nie działa, spróbuj użyć innego."> <!ENTITY torsettings.useBridges.type "Typ Transportu:"> <!ENTITY torsettings.useBridges.custom "Wprowadź własne mosty"> <!ENTITY torsettings.useBridges.label "Dodaj jeden lub więcej przekaźników mostowych (jeden w każdej linijce)"> diff --git a/src/chrome/locale/pl/progress.dtd b/src/chrome/locale/pl/progress.dtd index f30af87..6896d3c 100644 --- a/src/chrome/locale/pl/progress.dtd +++ b/src/chrome/locale/pl/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Status sieci Tor"> <!ENTITY torprogress.openSettings "Ustawienia"> <!ENTITY torprogress.heading "Łączenie z siecią Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Proszę zaczekać, aż ustanowimy połączenie do sieci Tor.  To może zająć kilka minut."> diff --git a/src/chrome/locale/pl/torlauncher.properties b/src/chrome/locale/pl/torlauncher.properties index 7ba4f88..71ec771 100644 --- a/src/chrome/locale/pl/torlauncher.properties +++ b/src/chrome/locale/pl/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S błąd (%2$S). torlauncher.unable_to_start_tor=Nie można wystartować aplikacji Tor.\n\n%S torlauncher.tor_missing=Brakuje pliku wykonywalnego Tora. -torlauncher.torrc_missing=Brakuje pliku torrc -torlauncher.datadir_missing=Katalog danych Tora nie istnieje. +torlauncher.torrc_missing=Brakuje pliku torrc, nie mógł on być utworzony. +torlauncher.datadir_missing=Katalog Tora nie istnieje i nie mógł być utworzony. torlauncher.password_hash_missing=Nie można uzyskać hasha hasła. torlauncher.failed_to_get_settings=Nie można odzyskać ustawień Tora.\n\n%S diff --git a/src/chrome/locale/pms/torlauncher.properties b/src/chrome/locale/pms/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/pms/torlauncher.properties +++ b/src/chrome/locale/pms/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/ps/torlauncher.properties b/src/chrome/locale/ps/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/ps/torlauncher.properties +++ b/src/chrome/locale/ps/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/pt-BR/network-settings.dtd b/src/chrome/locale/pt-BR/network-settings.dtd index 1379f93..4049a4f 100644 --- a/src/chrome/locale/pt-BR/network-settings.dtd +++ b/src/chrome/locale/pt-BR/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "Quais opções descrevem melhor a sua situação?"> <!ENTITY torSettings.configurePrompt1 "A conexão à Internet deste computador foi censurada, filtrada ou limitada por um proxy."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Eu preciso configurar as definições de conexão de ponte ou proxy local antes de conectar à rede Tor."> <!ENTITY torSettings.configure "Configurar"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Eu gostaria de fazer uma conexão direta com a rede Tor."> <!ENTITY torSettings.connectPrompt3 "Isso funcionará na maioria dos casos."> <!ENTITY torSettings.connect "Conectar"> <!ENTITY torSettings.proxyPageTitle "Configuração de Proxy Local"> <!ENTITY torSettings.proxyQuestion "Este computador necessita de um proxy local para acessar a Internet?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "Na maioria dos casos, um proxy local não é necessário, mas é requerido quando estiver conectando através de uma rede de empresa, escola ou universidade."> +<!ENTITY torSettings.proxyExplanation2 "Se você não tem certeza de como responder essa questão, procure nas configurações de Internet de outro navegador ou verifique as configurações de rede do seu sistema para ver se um proxy local é necessário."> <!ENTITY torSettings.enterProxy "Insira as configurações de proxy."> <!ENTITY torSettings.bridgePageTitle "Configuração de Pontes Tor"> <!ENTITY torSettings.bridgeQuestion "Seu provedor de serviços de internet (ISP) bloqueia ou censura conexões à rede Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Se você não tem certeza de como responder essa questão, escolha Não (se você não conseguir conectar à rede Tor sem uma conexão de ponte, você pode adicionar uma mais tarde)."> +<!ENTITY torSettings.bridgeExplanation2 "Se você escolher Sim, será solicitado que você configure Conexões de Ponte Tor, que são transmissores não-listados que dificultam mais o bloqueio de conexões à Rede Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Você pode usar o conjunto de pontes fornecidas ou obter e adicionar um conjunto de pontes personalizadas. ">  <!ENTITY torsettings.startingTor "Esperando que Tor inicie..."> <!ENTITY torsettings.restartTor "Reiniciar o Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Reconfigurar"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Você configurou as definições de conexões de ponte Tor ou inseriu um proxy local.  Para fazer uma conexão direta à rede Tor, essas definições devem ser removidas."> +<!ENTITY torsettings.discardSettings.proceed "Remover Definições e Conectar"> <!ENTITY torsettings.optional "Opcional"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Portas habilitadas:"> <!ENTITY torsettings.useBridges.checkbox "Meu Provedor de Serviços Internet (ISP) bloqueia as conexões à rede Tor"> <!ENTITY torsettings.useBridges.default "Conectar com as pontes fornecidas"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Cada tipo de conexão de ponte usa um método diferente para evitar censura.  Se uma não funcionar, tente novamente usando uma diferente."> <!ENTITY torsettings.useBridges.type "Tipo de transporte:"> <!ENTITY torsettings.useBridges.custom "Adicionar pontes personalizadas"> <!ENTITY torsettings.useBridges.label "Insira um ou mais relés de pontes (um por linha)."> diff --git a/src/chrome/locale/pt-BR/progress.dtd b/src/chrome/locale/pt-BR/progress.dtd index b2f8eb3..1c07b36 100644 --- a/src/chrome/locale/pt-BR/progress.dtd +++ b/src/chrome/locale/pt-BR/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Status do Tor"> <!ENTITY torprogress.openSettings "Abrir Configurações "> <!ENTITY torprogress.heading "Conectando à rede Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Por favor, aguarde enquanto estabelecemos uma conexão com a rede Tor.  Isso pode demorar alguns minutos."> diff --git a/src/chrome/locale/pt-BR/torlauncher.properties b/src/chrome/locale/pt-BR/torlauncher.properties index 295770d..73e724f 100644 --- a/src/chrome/locale/pt-BR/torlauncher.properties +++ b/src/chrome/locale/pt-BR/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Inicializador do Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S falhou (%2$S). torlauncher.unable_to_start_tor=Impossível iniciar Tor. torlauncher.tor_missing=Falta o programa de execução de Tor. -torlauncher.torrc_missing=Falta o arquivo torrc. -torlauncher.datadir_missing=O diretório de dados de Tor não existe. +torlauncher.torrc_missing=O arquivo torrc está faltando e não pôde ser criado. +torlauncher.datadir_missing=O diretório de dados Tor não existe e não pode ser criado. torlauncher.password_hash_missing=Falha ao obter a senha criptografada. torlauncher.failed_to_get_settings=Impossível recuperar as configurações de Tor. diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd index 03dfb80..0ef6cc6 100644 --- a/src/chrome/locale/pt/network-settings.dtd +++ b/src/chrome/locale/pt/network-settings.dtd @@ -1,8 +1,8 @@ <!ENTITY torsettings.dialog.title "Configurações da Rede Tor">  -<!ENTITY torlauncher.localePicker.title "Linguagem do Navegador Tor"> -<!ENTITY torlauncher.localePicker.prompt "Por favor seleccione um idioma."> +<!ENTITY torlauncher.localePicker.title "Idioma do Navegador Tor"> +<!ENTITY torlauncher.localePicker.prompt "Por favor, selecione um idioma.">  @@ -11,16 +11,16 @@ <!ENTITY torSettings.yes "Sim"> <!ENTITY torSettings.no "Não"> -<!ENTITY torSettings.firstQuestion "Qual das seguintes frases melhor descreve a sua situação?"> +<!ENTITY torSettings.firstQuestion "Qual das seguintes frases descreve melhor a sua situação?"> <!ENTITY torSettings.configurePrompt1 "Esta ligação à Internet deste computador está censurada ou é efetuada via proxy."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Eu preciso de configurar a ponte ou as definições do proxy local antes de ligar à rede Tor ."> <!ENTITY torSettings.configure "Configurar"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "Isto irá funcionar na maior parte das situações."> +<!ENTITY torSettings.connectPrompt2 "Eu gostaria de efetuar uma ligação direta à rede Tor."> +<!ENTITY torSettings.connectPrompt3 "Isto irá funcionar na maioria das situações."> <!ENTITY torSettings.connect "Ligar"> <!ENTITY torSettings.proxyPageTitle "Configuração do Proxy Local"> -<!ENTITY torSettings.proxyQuestion "Este computador precisa de utilizar um proxy para aceder à Internet."> +<!ENTITY torSettings.proxyQuestion "Este computador precisa de utilizar um proxy para aceder à Internet?">  <!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> <!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> @@ -34,11 +34,11 @@  <!ENTITY torsettings.startingTor "A aguardar que o Tor inicie..."> -<!ENTITY torsettings.restartTor "Reiniciar o Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.restartTor "Reiniciar Tor"> +<!ENTITY torsettings.reconfigTor "Reconfigurar"> <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.proceed "Remover Definições e Ligar"> <!ENTITY torsettings.optional "Opcional"> @@ -52,7 +52,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 "Este computador atravessa uma firewall que só permite ligações a algumas portas."> +<!ENTITY torsettings.firewall.checkbox "Este computador liga através de uma firewall que só permite ligações para determinadas portas."> <!ENTITY torsettings.firewall.allowedPorts "Portas permitidas:"> <!ENTITY torsettings.useBridges.checkbox "O meu Provedor de Serviço da Internet (ISP) bloqueia as ligações à rede Tor"> <!ENTITY torsettings.useBridges.default "Ligar com as pontes fornecidas"> @@ -64,12 +64,12 @@ <!ENTITY torsettings.copyLog "Copiar o Registo do Tor para a Área de Transferência"> <!ENTITY torsettings.bridgeHelpTitle "Ajuda da Retransmissão de Ponte"> -<!ENTITY torsettings.bridgeHelp1 "Se não consegue ligar-se à rede Tor, pode ser devido a algum bloqueio do seu provedor de internet (ISP) ou outro intermediário está a bloquear o Tor.  Normalmente, pode contornar este problema usando Tor Bridges, que são pontos de passagem não listados mais difíceis de bloquear."> -<!ENTITY torsettings.bridgeHelp1B "Pode usar o conjunto de bridges pré-configurado fornecido, ou pode obter um conjunto de endereços personalizados usando um dos três métodos:"> +<!ENTITY torsettings.bridgeHelp1 "Se não consegue ligar-se à rede Tor, pode ser devido a algum bloqueio do seu Provedor de Serviço de Internet (ISP) ou outra agência está a bloquear o Tor.  Frequentemente, pode contornar este problema utilizando Tor Bridges, o qual são pontos de passagem não listados que são mais difíceis de bloquear."> +<!ENTITY torsettings.bridgeHelp1B "Poderá utilizar o conjunto de bridges pré-configurado fornecido, ou poderá obter um conjunto de endereços personalizados utilizando um destes três métodos:"> <!ENTITY torsettings.bridgeHelp2Heading "Através da Web"> <!ENTITY torsettings.bridgeHelp2 "Utilize um navegador da Web para visitar https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Através do Respondedor Automático do Correio Eletrónico"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Enviar mensagem para bridges(a)torproject.org com a linha 'get bridges' sozinha no corpo da mensagem.  Contudo, para tornar mais difícil para os atacantes aprenderem sobre os endereços de pontes, tem de enviar a mensagem de um dos seguintes fornecedores de serviços de correio eletrónico (por esta ordem de preferência):"> +<!ENTITY torsettings.bridgeHelp3Heading "Através do Respondedor Automático de Correio Eletrónico"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Envie uma mensagem para bridges(a)torproject.org com a linha 'get bridges' no corpo da mensagem.  Contudo, para tornar mais difícil para um atacante aprender sobre os endereços de pontes, deve enviar este pedido a partir dos seguintes provedores de serviços de correio eletrónico (listados pela ordem de preferência):"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ou https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Através do Suporte"> <!ENTITY torsettings.bridgeHelp4 "Em último caso, pode solicitar os endereços de ponte, enviando uma mensagem elegante para help(a)rt.torproject.org.  Por favor, note que uma pessoa irá precisar de responder a cada pedido."> diff --git a/src/chrome/locale/pt/torlauncher.properties b/src/chrome/locale/pt/torlauncher.properties index 61b4aa9..4833bc3 100644 --- a/src/chrome/locale/pt/torlauncher.properties +++ b/src/chrome/locale/pt/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Executor Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S falhou (%2$S). torlauncher.unable_to_start_tor=Não é possível iniciar o Tor.\n\n %S torlauncher.tor_missing=O executável do Tor está em falta. -torlauncher.torrc_missing=O ficheiro torrc está em falta. -torlauncher.datadir_missing=A pasta dos dados do Tor não existe. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Não foi possível obter a senha "hashed". torlauncher.failed_to_get_settings=Não é possível obter as configurações do Tor\n\n %S diff --git a/src/chrome/locale/ro/network-settings.dtd b/src/chrome/locale/ro/network-settings.dtd index 1ab990d..148796e 100644 --- a/src/chrome/locale/ro/network-settings.dtd +++ b/src/chrome/locale/ro/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "Care din următoarele descrie cel mai bine situația dvs?"> <!ENTITY torSettings.configurePrompt1 "Această conexiune la internet a computerului este cenzurată sau prin proxy."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Trebuie să configurez setările bridge sau proxy locale înainte de conectarea la rețeaua Tor "> <!ENTITY torSettings.configure "Configuraţi "> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Aș dori o conexiune directă la rețeaua Tor."> <!ENTITY torSettings.connectPrompt3 "Aceasta funcționează în cele mai multe situații."> <!ENTITY torSettings.connect "Conectare"> <!ENTITY torSettings.proxyPageTitle "Configurare Proxy local"> <!ENTITY torSettings.proxyQuestion "Are nevoie acest computer să utilizeze un proxy local pentru accesarea internetului?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "În cele mai multe cazuri un proxy local nu este necesar dar poate fi necesară atunci când conectarea se face printr-o rețea a unei firme, școli sau universități."> +<!ENTITY torSettings.proxyExplanation2 "Dacă nu sunteți sigur cum să răspundeți la această întrebare uitași-vă la setările de internet în alt browser sau verificați setările de rețea ale sistemului dvs. pentru a vedea dacă este nevoie de un proxy local."> <!ENTITY torSettings.enterProxy "Introduceţi setările pentru proxy ."> <!ENTITY torSettings.bridgePageTitle "Configurare Punți Tor "> <!ENTITY torSettings.bridgeQuestion "Internet Service Providerul (ISP) dvs blochează sau cenzurează conexiunile către rețeaua Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Dacă nu sunteți sigur cum să răspundeți la această întrebare, alegeți Nu (dacă nu vă puteți conecta la rețeaua Tor fără un bridge, puteți adăuga unul mai târziu)."> +<!ENTITY torSettings.bridgeExplanation2 "Dacă alegeți Da vi se va cere să configurați Tor Bridges, care sunt relee nelistate ce fac mai dificilă blocarea conexiunilor la Rețeaua Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Puteți folosi setul de punți oferit sau puteți obține și introduce un set particular de punți.">  <!ENTITY torsettings.startingTor "Aștept Tor să pornească..."> <!ENTITY torsettings.restartTor "Repornește Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Reconfigurare"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Ați configurat bridge-uri Tor sau ați introdus setări proxu locale.  Pentru a face o conexiune directă la rețeaua Tor aceste setări trebuiesc eliminate."> +<!ENTITY torsettings.discardSettings.proceed "Eliminați Setări și Conectare"> <!ENTITY torsettings.optional "Opțional"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Porturi permise:"> <!ENTITY torsettings.useBridges.checkbox "Internet Service Providerul (ISP) meu blochează conexiunile către rețeaua Tor"> <!ENTITY torsettings.useBridges.default "Conectați-vă punțile oferite"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Fiecare tip de bridge folosește o metodă diferită de a evita cenzura.  Dacă un bridge nu funcționează, încercați să folosiți unul diferit."> <!ENTITY torsettings.useBridges.type "Tip de transport:"> <!ENTITY torsettings.useBridges.custom "Introduceți punți personalizate"> <!ENTITY torsettings.useBridges.label "Introduceți una sau mai multe bridge relays (una pe linie)."> diff --git a/src/chrome/locale/ro/progress.dtd b/src/chrome/locale/ro/progress.dtd index bda4ccc..9efa695 100644 --- a/src/chrome/locale/ro/progress.dtd +++ b/src/chrome/locale/ro/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Stare Tor"> <!ENTITY torprogress.openSettings "Setări"> <!ENTITY torprogress.heading "Conctare la reţeaua Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Vă rugăm așteptați în timp ce stabilim o conexiune la rețeaua Tor.  Acest proces poate dura câteva minute."> diff --git a/src/chrome/locale/ro/torlauncher.properties b/src/chrome/locale/ro/torlauncher.properties index 9d0257b..487d806 100644 --- a/src/chrome/locale/ro/torlauncher.properties +++ b/src/chrome/locale/ro/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Lansator Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S eșec (%2$S). torlauncher.unable_to_start_tor=Tor nu poate porni. torlauncher.tor_missing=Fișierul executabil Tor lipsește. -torlauncher.torrc_missing=Fișierul torrc lipsește -torlauncher.datadir_missing=Tor data directory nu există. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Eșec parole hashed. torlauncher.failed_to_get_settings=Nu pot obține Tor settings.\n\n%S diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd index fbf9702..51ecf24 100644 --- a/src/chrome/locale/ru/network-settings.dtd +++ b/src/chrome/locale/ru/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "Что лучше описывает вашу ситуацию?"> <!ENTITY torSettings.configurePrompt1 "Интернет-соединение этого компьютера цензурируется или находится за прокси."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Необходимо настроить параметры моста или локальный прокси, прежде чем подключаться к сети Tor. "> <!ENTITY torSettings.configure "Настроить"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Я хочу напрямую подключиться к сети Tor."> <!ENTITY torSettings.connectPrompt3 "Это должно работать в большинстве ситуаций."> <!ENTITY torSettings.connect "Соединиться"> <!ENTITY torSettings.proxyPageTitle "Настройки локального прокси"> <!ENTITY torSettings.proxyQuestion "Требуется ли этому компьютеру локальный прокси для доступа к Интернету?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "В большинстве случаев локальный прокси не нужен, но он может потребоваться при подключении через сеть компании, школы или университета."> +<!ENTITY torSettings.proxyExplanation2 "Если вы не знаете, как ответить на этот вопрос, проверьте настройки интернета другого браузера или проверьте системные настройки своей сети, чтобы посмотреть, нужен ли локальный прокси."> <!ENTITY torSettings.enterProxy "Введите настройки прокси."> <!ENTITY torSettings.bridgePageTitle "Настройки шлюзов Tor"> <!ENTITY torSettings.bridgeQuestion "Ваш провайдер (ISP) блокирует или как-либо цензурирует подключения к сети Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Если вы не знаете, как ответить на данный вопрос, выберите "Нет" (если вы не можете подключиться к сети Tor, вы можете ответить позже)."> +<!ENTITY torSettings.bridgeExplanation2 "Если вы выберете "Да", Вам будет предложено настроить Tor мосты, что усложняет блокировку подключения к сети Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Вы можете использовать предопределенный набор мостов или получить и ввести список мостов вручную.">  <!ENTITY torsettings.startingTor "Ожидание запуска Tor..."> <!ENTITY torsettings.restartTor "Перезапустить Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Изменить конфигурацию"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Вы настроили Tor мосты или ввели локальные настройки прокси-сервера.  Для прямого подключения к сети Tor эти параметры должны быть удалены."> +<!ENTITY torsettings.discardSettings.proceed "Удалить настройки и подключиться"> <!ENTITY torsettings.optional "Необязательно"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Разрешенные порты:"> <!ENTITY torsettings.useBridges.checkbox "Мой провайдер блокирует доступ к сети Tor"> <!ENTITY torsettings.useBridges.default "Подключиться к предопределенным мостам"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Каждый тип моста использует различные способы избежания цензуры.  Если мост не работает, попробуйте еще раз, используя другой."> <!ENTITY torsettings.useBridges.type "Тип транспорта:"> <!ENTITY torsettings.useBridges.custom "Ввести мосты вручную"> <!ENTITY torsettings.useBridges.label "Введите один или несколько ретрансляторов типа мост (один на строку)"> diff --git a/src/chrome/locale/ru/progress.dtd b/src/chrome/locale/ru/progress.dtd index aa09819..7d7ae9d 100644 --- a/src/chrome/locale/ru/progress.dtd +++ b/src/chrome/locale/ru/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Статус Tor"> <!ENTITY torprogress.openSettings "Открыть Настройки"> <!ENTITY torprogress.heading "Подключение к сети Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Пожалуйста, подождите, пока мы установим подключение к сети Tor.  Это может занять несколько минут."> diff --git a/src/chrome/locale/ru/torlauncher.properties b/src/chrome/locale/ru/torlauncher.properties index 0b68b18..849861c 100644 --- a/src/chrome/locale/ru/torlauncher.properties +++ b/src/chrome/locale/ru/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Загрузчик Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S неудачно (%2$S). torlauncher.unable_to_start_tor=Невозможно запустить Tor.\n\n%S torlauncher.tor_missing=Исполняемый файл Tor отсутствует. -torlauncher.torrc_missing=Файл torrc отсутствует. -torlauncher.datadir_missing=Каталог данных Tor не существует. +torlauncher.torrc_missing=torrc файл отсутствует и не может быть создан. +torlauncher.datadir_missing=Директория данных Tor не существует и не может быть создана. torlauncher.password_hash_missing=Не удаётся получить хэшированный пароль. torlauncher.failed_to_get_settings=Не удаётся загрузить настройки Tor.\n\n%S diff --git a/src/chrome/locale/ru(a)petr1708/torlauncher.properties b/src/chrome/locale/ru(a)petr1708/torlauncher.properties index 77dc4e7..05a0e7b 100644 --- a/src/chrome/locale/ru(a)petr1708/torlauncher.properties +++ b/src/chrome/locale/ru(a)petr1708/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/sco/torlauncher.properties b/src/chrome/locale/sco/torlauncher.properties index 02be756..45d3b8d 100644 --- a/src/chrome/locale/sco/torlauncher.properties +++ b/src/chrome/locale/sco/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(recommendit) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/si-LK/torlauncher.properties b/src/chrome/locale/si-LK/torlauncher.properties index a132cff..65d6395 100644 --- a/src/chrome/locale/si-LK/torlauncher.properties +++ b/src/chrome/locale/si-LK/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor පුරනය @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Tor ආරම්භ කිරීමට නොහැක.\n\n%S torlauncher.tor_missing=Tor විධානය අස්ථානගත වී ඇත. -torlauncher.torrc_missing=torrc ගොනුව අස්ථානගත වී ඇත. -torlauncher.datadir_missing=Tor දත්ත නාමාවලිය නොපවතී. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=පුරණය කරනලද මුරපදය ලබාගැනීමට අපොහොසත්ය. torlauncher.failed_to_get_settings=Tor සිටුවම් සොයා ලබාගැනීමට අපොහොසත්ය.\n\n%S @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=ඔබ විසින් සේතු එක torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(නිර්දේශිත) torlauncher.connect=සම්බන්ධ වෙන්න torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/sk-SK/torlauncher.properties b/src/chrome/locale/sk-SK/torlauncher.properties index 63c1b2c..72bcd48 100644 --- a/src/chrome/locale/sk-SK/torlauncher.properties +++ b/src/chrome/locale/sk-SK/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S zlyhaných (%2$S). torlauncher.unable_to_start_tor=Nie je možné spustiť Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=Torrc súbor chýba. -torlauncher.datadir_missing=Data adresár pre Tor neexistuje. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Nebolo možné prevziať zašifrované heslo. torlauncher.failed_to_get_settings=Nepodarilo sa získať Tor nastavenia.\n\n%S diff --git a/src/chrome/locale/sk/torlauncher.properties b/src/chrome/locale/sk/torlauncher.properties index 17de31a..0b75b58 100644 --- a/src/chrome/locale/sk/torlauncher.properties +++ b/src/chrome/locale/sk/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Spúšťač Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S zlyhalo (%2$S). torlauncher.unable_to_start_tor=Nie je možné spustiť Tor.\n\n%S torlauncher.tor_missing=Spustiteľný súbor programu Tor chýba. -torlauncher.torrc_missing=Súbor torrc chýba. -torlauncher.datadir_missing=Dátový priečinok Tor neexistuje. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Nepodarilo sa získať zabezpečené heslo. torlauncher.failed_to_get_settings=Nie je možné prijať nastavenia Tor.\n\n%S diff --git a/src/chrome/locale/sl-SI/torlauncher.properties b/src/chrome/locale/sl-SI/torlauncher.properties index e083df9..119e69b 100644 --- a/src/chrome/locale/sl-SI/torlauncher.properties +++ b/src/chrome/locale/sl-SI/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor zaganjalnik @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S neuspešno (%2$S). torlauncher.unable_to_start_tor=Nemogoče zagnati Tor,\n\n%S torlauncher.tor_missing=Tor zagonska manjka. -torlauncher.torrc_missing=Torrc datoteka manjka. -torlauncher.datadir_missing=Tor imenik podatkov ne obstoja. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Neuspelo pridobivanje hash gesla. torlauncher.failed_to_get_settings=Ni moč pridobiti nastavitve Tor,\n\n%S diff --git a/src/chrome/locale/sl/torlauncher.properties b/src/chrome/locale/sl/torlauncher.properties index c1f7981..9d02d12 100644 --- a/src/chrome/locale/sl/torlauncher.properties +++ b/src/chrome/locale/sl/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor zaganjalnik @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Tor se ne zažene.\n\n%S torlauncher.tor_missing=Manjka Torjeva izvršljiva datoteka. -torlauncher.torrc_missing=Manjka datoteka torrc. -torlauncher.datadir_missing=Torjev podatkovni imenik ne obstaja. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Spodletelo pridobivanje zgoščene vrednosti gesla. torlauncher.failed_to_get_settings=Ni uspela pridobitev Tor nastavitev.\n\n%S @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=Morate določiti vsaj en ali več mostov. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(priporočeno) torlauncher.connect=Poveži torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/sn/torlauncher.properties b/src/chrome/locale/sn/torlauncher.properties index 6e5b1e9..191fdd9 100644 --- a/src/chrome/locale/sn/torlauncher.properties +++ b/src/chrome/locale/sn/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/so/torlauncher.properties b/src/chrome/locale/so/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/so/torlauncher.properties +++ b/src/chrome/locale/so/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/son/torlauncher.properties b/src/chrome/locale/son/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/son/torlauncher.properties +++ b/src/chrome/locale/son/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/sq/network-settings.dtd b/src/chrome/locale/sq/network-settings.dtd index 228d865..ce7a03b 100644 --- a/src/chrome/locale/sq/network-settings.dtd +++ b/src/chrome/locale/sq/network-settings.dtd @@ -1,8 +1,8 @@ <!ENTITY torsettings.dialog.title "Konfigurimi i Rrjetit të Tor">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Gjuha e Tor Browser"> +<!ENTITY torlauncher.localePicker.prompt "Ju lutemi zgjidhni një gjuhë.">  @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "Cila nga këto e përshkruan më mirë situatën tuaj të tanishme?"> <!ENTITY torSettings.configurePrompt1 "Lidhja e Internetit të këtij kompjuteri është e censuruar ose me proxy"> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Më duhet të konfigurojë urën ose proxy-n lokal, përpara se të lidhem tek rrjeti Tor."> <!ENTITY torSettings.configure "Konfiguroni"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Do pëlqeja të bëja një lidhje të drejtpërdrejtë tek rrjeti i Tor."> <!ENTITY torSettings.connectPrompt3 "Kjo do të funksionojë në shumë situata."> <!ENTITY torSettings.connect "Lidhuni"> <!ENTITY torSettings.proxyPageTitle "Konfigurimi i Proxy-t Lokal "> <!ENTITY torSettings.proxyQuestion "A i nevojitet këtij kompjuteri që të përdorë një proxy lokal, për t'u qasur në Internet?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "Në shumë raste, një proxy lokal nuk nevojitet, por ai mund të kërkohet kur lidhesh përmes një rrejti kompanie, shkolle, ose universiteti."> +<!ENTITY torSettings.proxyExplanation2 "Nëse s'jeni i sigurt sesi t'i përgjigjeni kësaj pyetje, shikoni tek konfigurimi i Internetit në një tjetër shfletues, ose kontrolloni konfigurimin e rrjetit, për të parë nëse nevojitet një proxy lokal."> <!ENTITY torSettings.enterProxy "Futni konfigurimin e proxy-t."> <!ENTITY torSettings.bridgePageTitle "Konfigurimi i Urave të Tor"> <!ENTITY torSettings.bridgeQuestion "A i pengon ose censuron lidhjet për tek Rrjeti Tor, Ofruesi juaj i Shërbimit Internet (ISP)?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Nëse s'jeni i sigurt sesi t'i përgjigjeni kësaj pyetje, zgjidhni "Jo" (nëse e keni të pamundur që të lidheni me rrjetin Tor pa pasur një urë, mund ta shtoni një më vonë)."> +<!ENTITY torSettings.bridgeExplanation2 "Nëse përzgjidhni "Po", do t'ju kërkohet të konfiguroni Tor bridges, të cilat janë rele të palistuara, që e bëjnë më të vështirë pengimin e lidhjeve për tek Rrjeti Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Ju mund të përdorni grupin e dhënë të urave, ose mund të përftoni dhe futni një sasi të personalizuar urash.">  <!ENTITY torsettings.startingTor "Duke pritur që Tor të nisë..."> <!ENTITY torsettings.restartTor "Riniseni Tor-in"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Rikonfiguroni"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Ju keni konfiguruar urat Tor ose keni futur konfigurimin e proxy-t.  Për të bërë një lidhje të drejtpërdrejtë tek rrjeti Tor, ky konfigurim duhet të hiqet."> +<!ENTITY torsettings.discardSettings.proceed "Hiqeni Konfigurimin dhe Lidhuni"> <!ENTITY torsettings.optional "Me zgjedhje"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Portat e Lejuara:"> <!ENTITY torsettings.useBridges.checkbox "Ofruesi im i Shërbimit të Internetit (ISP) pengon lidhjet drejt rrjetit Tor"> <!ENTITY torsettings.useBridges.default "Lidhuni me urat e ofruara"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Çdo lloj ure përdor një mënyrë të ndryshme për të shmangur censurën.  Nëse njëra urë nuk punon, provoni sërish duke përdorur një tjetër."> <!ENTITY torsettings.useBridges.type "Lloji i Transportit:"> <!ENTITY torsettings.useBridges.custom "Futini urat e përshtatura"> <!ENTITY torsettings.useBridges.label "Futni një ose më shumë rele urë (një për rresht)"> diff --git a/src/chrome/locale/sq/progress.dtd b/src/chrome/locale/sq/progress.dtd index 167ecd2..f680a4c 100644 --- a/src/chrome/locale/sq/progress.dtd +++ b/src/chrome/locale/sq/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Gjendja e Tor"> <!ENTITY torprogress.openSettings "Hapeni Konfigurimin"> <!ENTITY torprogress.heading "Duke u lidhur me rrjetin Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Ju lutemi prisni derisa të vendosim një lidhje me rrjetin e Tor.  Kjo mund të kërkojë disa minuta."> diff --git a/src/chrome/locale/sq/torlauncher.properties b/src/chrome/locale/sq/torlauncher.properties index b32ee99..caceb7b 100644 --- a/src/chrome/locale/sq/torlauncher.properties +++ b/src/chrome/locale/sq/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Lëshuesi Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S dështoi (%2$S). torlauncher.unable_to_start_tor=E pamundur që të niset Tor.\n\n%S torlauncher.tor_missing=Skedari i ekzekutueshëm Tor, mungon. -torlauncher.torrc_missing=Skedari torrc mungon. -torlauncher.datadir_missing=Direktoria e të dhënave të Tor nuk ekziston. +torlauncher.torrc_missing=Skedari torrc mungon dhe s'mund të krijohet. +torlauncher.datadir_missing=Të dhënat e direktorisë Tor data nuk ekzistojnë dhe s'mund të krijohen. torlauncher.password_hash_missing=Dështuam të përftonim fjalëkalimin me thurje. torlauncher.failed_to_get_settings=Dështuam të gjenim konfigurimin e Tor.\n\n%S diff --git a/src/chrome/locale/sr/torlauncher.properties b/src/chrome/locale/sr/torlauncher.properties index d714f9a..aef3157 100644 --- a/src/chrome/locale/sr/torlauncher.properties +++ b/src/chrome/locale/sr/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Тоr Покретач @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Тоr се не може покренути\n\n%Ѕ torlauncher.tor_missing=Tor извршни фајл недостаје -torlauncher.torrc_missing=torrc фајл недостаје -torlauncher.datadir_missing=Директоријум за Тоr податке не постоји +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Узимање хеширане лозинке није успело torlauncher.failed_to_get_settings=Немогућност повратка Tor подешавања\n\n%Ѕ diff --git a/src/chrome/locale/sr(a)latin/network-settings.dtd b/src/chrome/locale/sr(a)latin/network-settings.dtd index dcb6891..3256a58 100644 --- a/src/chrome/locale/sr(a)latin/network-settings.dtd +++ b/src/chrome/locale/sr(a)latin/network-settings.dtd @@ -60,7 +60,7 @@ <!ENTITY torsettings.useBridges.type "Transport type:"> <!ENTITY torsettings.useBridges.custom "Enter custom bridges"> <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.placeholder "tip adrese: port "> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> diff --git a/src/chrome/locale/sr(a)latin/torlauncher.properties b/src/chrome/locale/sr(a)latin/torlauncher.properties index a5e87ea..3553d2a 100644 --- a/src/chrome/locale/sr(a)latin/torlauncher.properties +++ b/src/chrome/locale/sr(a)latin/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(preporučeno) torlauncher.connect=Povezivanje torlauncher.restart_tor=Restartovanje Tor-a diff --git a/src/chrome/locale/st/torlauncher.properties b/src/chrome/locale/st/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/st/torlauncher.properties +++ b/src/chrome/locale/st/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/su/torlauncher.properties b/src/chrome/locale/su/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/su/torlauncher.properties +++ b/src/chrome/locale/su/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv/network-settings.dtd index 19fcb74..31b3ac3 100644 --- a/src/chrome/locale/sv/network-settings.dtd +++ b/src/chrome/locale/sv/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "Vilket av följande beskriver bäst din situation?"> <!ENTITY torSettings.configurePrompt1 "Den här datorns Internetanslutning är censorerad eller går genom en proxy."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Jag behöver konfigurera en brygga eller inställningar för lokal proxy innan jag ansluter till Tor-nätverket."> <!ENTITY torSettings.configure "Konfigurera"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Jag vill göra en direktanslutning till Tor-nätverket."> <!ENTITY torSettings.connectPrompt3 "Detta fungerar i de flesta situationer."> <!ENTITY torSettings.connect "Anslut"> <!ENTITY torSettings.proxyPageTitle "Lokal proxy-konfiguration"> <!ENTITY torSettings.proxyQuestion "Behöver den här datorn använda en lokal proxy för att ansluta till Internet?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "I de flesta fallen behövs ingen lokal proxy, men det kan behövas om du ansluter via ett nätverk på ett företag, en skola eller ett universitet."> +<!ENTITY torSettings.proxyExplanation2 "Om du är osäker på hur du ska svara på den här frågan, titta på internetinställningarna i en annan webbläsare eller kontrollera ditt systems nätverksinställningar för att se om en lokal proxy behövs."> <!ENTITY torSettings.enterProxy "Ange proxyinställningarna."> <!ENTITY torSettings.bridgePageTitle "Konfiguration av Tor-bryggor"> <!ENTITY torSettings.bridgeQuestion "Blockerar eller censurerar din internetleverantör anslutningar till Tor-nätverket?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Om du är osäker på hur du ska besvara den här frågan, välj Nej (om du inte kan ansluta till Tor-nätverket utan en brygga så kan du lägga till en senare)."> +<!ENTITY torSettings.bridgeExplanation2 "Om du väljer Ja kommer du att tillfrågas om att konfigurera Tor-bryggor, vilka är olistade reläer som gör det svårare att blockera anslutningarna till Tor-nätverket."> <!ENTITY torSettings.bridgeSettingsPrompt "Du kan använda de förkonfigurerade bryggorna, eller skaffa och ange bryggor själv.">  <!ENTITY torsettings.startingTor "Väntar på att Tor ska starta..."> <!ENTITY torsettings.restartTor "Starta om Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Omkonfigurera"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Du har konfigurerat Tor-bryggor eller så har du angett lokala proxyinställningar.  För att göra en direktanslutning till Tor-nätverket måste de här inställningarna tas bort."> +<!ENTITY torsettings.discardSettings.proceed "Ta bort inställningar och anslut"> <!ENTITY torsettings.optional "Valfri"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Tillåtna portar:"> <!ENTITY torsettings.useBridges.checkbox "Min internetleverantör blockerar anslutningar till Tor-nätverket"> <!ENTITY torsettings.useBridges.default "Anslut med tillgängliga bryggor"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Varje typ av brygga använder en egen metod för att undvika censur.  Om en brygga inte fungerar, försök igen genom att använda en annan."> <!ENTITY torsettings.useBridges.type "Transport-typ:"> <!ENTITY torsettings.useBridges.custom "Fyll i anpassade bryggor"> <!ENTITY torsettings.useBridges.label "Ange en eller flera Tor-bryggor (en per rad)."> diff --git a/src/chrome/locale/sv/progress.dtd b/src/chrome/locale/sv/progress.dtd index 7ac45ca..1df097b 100644 --- a/src/chrome/locale/sv/progress.dtd +++ b/src/chrome/locale/sv/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor-status"> <!ENTITY torprogress.openSettings "Öppna inställningar"> <!ENTITY torprogress.heading "Ansluter till Tor-nätverket"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Vänligen vänta medan vi sätter upp en anslutning till Tor-nätverket.  Detta kan ta flera minuter."> diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties index 095d0b7..cb7b8f5 100644 --- a/src/chrome/locale/sv/torlauncher.properties +++ b/src/chrome/locale/sv/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S misslyckades (%2$S). torlauncher.unable_to_start_tor=Kan inte starta Tor.\n\n%S torlauncher.tor_missing=Tors körbara programfil saknas. -torlauncher.torrc_missing=Filen torrc saknas. -torlauncher.datadir_missing=Tors data-katalog saknas. +torlauncher.torrc_missing=Torrc-fil saknas och kunde inte skapas. +torlauncher.datadir_missing=Tor datakatalog finns inte och kunde inte skapas. torlauncher.password_hash_missing=Misslyckades med att hämta hashat lösenord. torlauncher.failed_to_get_settings=Kunde inte läsa in inställningar för Tor.\n\n%S diff --git a/src/chrome/locale/sw/torlauncher.properties b/src/chrome/locale/sw/torlauncher.properties index 02be756..c260ae1 100644 --- a/src/chrome/locale/sw/torlauncher.properties +++ b/src/chrome/locale/sw/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(imependekezwa) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/szl/torlauncher.properties b/src/chrome/locale/szl/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/szl/torlauncher.properties +++ b/src/chrome/locale/szl/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/ta/torlauncher.properties b/src/chrome/locale/ta/torlauncher.properties index 079d758..80b8e76 100644 --- a/src/chrome/locale/ta/torlauncher.properties +++ b/src/chrome/locale/ta/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor துவக்கி @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Tor தொடங்க முடியவில்லை.\n\n%S torlauncher.tor_missing=Tor இயங்கக்கூடியது காணவில்லை. -torlauncher.torrc_missing=Torrc கோப்பை காணவில்லை. -torlauncher.datadir_missing=Tor தரவு அடைவு இல்லை. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Hashed கடவுச்சொல்லை பெற முடியவில்லை. torlauncher.failed_to_get_settings=Tor அமைப்புகளை மீட்டெடுக்க முடியவில்லை.\n\n%S diff --git a/src/chrome/locale/te-IN/torlauncher.properties b/src/chrome/locale/te-IN/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/te-IN/torlauncher.properties +++ b/src/chrome/locale/te-IN/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/te/torlauncher.properties b/src/chrome/locale/te/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/te/torlauncher.properties +++ b/src/chrome/locale/te/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/tg/torlauncher.properties b/src/chrome/locale/tg/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/tg/torlauncher.properties +++ b/src/chrome/locale/tg/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/th/torlauncher.properties b/src/chrome/locale/th/torlauncher.properties index b451784..b2da93c 100644 --- a/src/chrome/locale/th/torlauncher.properties +++ b/src/chrome/locale/th/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=ตัวเปิด Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=ไม่สามารถเริ่มการทำงานของ Tor ได้\n\n%S torlauncher.tor_missing=แฟ้มโปรแกรม Tor ขาดหายไป -torlauncher.torrc_missing=แฟ้ม torrc หายไป -torlauncher.datadir_missing=ไม่มีไดเรกทอรีข้อมูลของ Tor +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=ล้มเหลวในการเรียกรหัสผ่านที่ถูกแฮช torlauncher.failed_to_get_settings=ไม่สามารถเรียกการตั้งค่า Tor ได้\n\n%S diff --git a/src/chrome/locale/ti/torlauncher.properties b/src/chrome/locale/ti/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/ti/torlauncher.properties +++ b/src/chrome/locale/ti/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/tk/torlauncher.properties b/src/chrome/locale/tk/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/tk/torlauncher.properties +++ b/src/chrome/locale/tk/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd index eb86388..c52f41f 100644 --- a/src/chrome/locale/tr/network-settings.dtd +++ b/src/chrome/locale/tr/network-settings.dtd @@ -13,37 +13,37 @@ <!ENTITY torSettings.firstQuestion "Aşağıdakilerden hangisi durumunuzu en iyi açıklıyor?"> <!ENTITY torSettings.configurePrompt1 "Bu bilgisayarın İnternet bağlantısı sansürlü ya da vekil sunucu arkasında."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Tor ağına bağlanmadan önce köprü ya da yerel vekil sunucu ayarlarını yapmalıyım"> <!ENTITY torSettings.configure "Yapılandır"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Tor ağı ile doğrudan bir bağlantı kurmak istiyorum."> <!ENTITY torSettings.connectPrompt3 "Bu çoğu durumda çalışır."> <!ENTITY torSettings.connect "Bağlan"> <!ENTITY torSettings.proxyPageTitle "Yerel Vekil Sunucu Ayarları"> <!ENTITY torSettings.proxyQuestion "Bu bilgisayarın İnternet'e erişmesi için bir yerel vekil sunucu kullanması gerekiyor mu?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "Çoğu durumda bir yerel vekil sunucu gerekmez. Ancak bir kurum, okul ya da üniversite ağından bağlanırken gerekli olabilir."> +<!ENTITY torSettings.proxyExplanation2 "Bu sorunun yanıtından emin değilseniz, farklı bir web tarayıcıdaki İnternet ayarlarına bakın ya da vekil sunucu kullanmanın gerekip gerekmediğini anlamak için sisteminizin ağ ayarlarına bakın."> <!ENTITY torSettings.enterProxy "Vekil sunucu ayarlarını girin."> <!ENTITY torSettings.bridgePageTitle "Tor Köprüleri Ayarları"> <!ENTITY torSettings.bridgeQuestion "İnternet Servis Sağlayıcınız (ISS) Tor Ağına olan bağlantıları engelliyor ya da sansürlüyor mu?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Bu sorunun yanıtından emin değilseniz, Hayır seçin (bir köprü olmadan Tor ağına bağlanamıyorsanız, daha sonra ekleyebilirsiniz)."> +<!ENTITY torSettings.bridgeExplanation2 "Evet olarak seçerseniz, Tor Ağı bağlantılarını engellemeyi zorlaştıran listelenmemiş aktarıcılar olan Tor Köprülerini ayarlamanız istenir."> <!ENTITY torSettings.bridgeSettingsPrompt "Sağlanan köprüleri kullanabilir ya da özel köprüler edinip yazabilirsiniz.">  <!ENTITY torsettings.startingTor "Tor'un başlaması bekleniyor…"> <!ENTITY torsettings.restartTor "Tor'u Yeniden Başlat"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Yeniden Ayarla"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Tor Köprülerini ayarladınız ya da yerel vekil sunucu ayarlarını yazdınız.  Tor ağına doğrudan bağlanmak için bu ayarlar kaldırılmalıdır."> +<!ENTITY torsettings.discardSettings.proceed "Ayarları Kaldır ve Bağlan"> <!ENTITY torsettings.optional "İsteğe bağlı"> <!ENTITY torsettings.useProxy.checkbox "Bu bilgisayarın İnternet'e erişmesi için bir yerel vekil sunucu kullanması gerekiyor"> -<!ENTITY torsettings.useProxy.type "Vekil Sunucu Tipi:"> +<!ENTITY torsettings.useProxy.type "Vekil Sunucu Türü:"> <!ENTITY torsettings.useProxy.address "Adres:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresi ya da sunucu adı"> <!ENTITY torsettings.useProxy.port "Bağlantı noktası:"> @@ -56,8 +56,8 @@ <!ENTITY torsettings.firewall.allowedPorts "İzin Verilen Bağlantı Noktaları:"> <!ENTITY torsettings.useBridges.checkbox "İnternet Servis Sağlayıcım (ISS) Tor ağına olan bağlantıları engelliyor"> <!ENTITY torsettings.useBridges.default "Sağlanan köprüler ile bağlan"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Aktarım tipi:"> +<!ENTITY torsettings.useBridges.note "Her bir köprü türünde engellemeyi aşmak için farklı yöntemler kullanılır.  Bir köprü çalışmazsa farklı bir tanesini deneyin."> +<!ENTITY torsettings.useBridges.type "Aktarım tür:"> <!ENTITY torsettings.useBridges.custom "Özel köprüler yazın"> <!ENTITY torsettings.useBridges.label "Bir ya da birkaç köprü aktarıcısı yazın (her satıra bir tane)."> <!ENTITY torsettings.useBridges.placeholder "adres:bağlantı noktası şeklinde yazın"> diff --git a/src/chrome/locale/tr/progress.dtd b/src/chrome/locale/tr/progress.dtd index e9d4e5c..2b9b2b9 100644 --- a/src/chrome/locale/tr/progress.dtd +++ b/src/chrome/locale/tr/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Durumu"> <!ENTITY torprogress.openSettings "Ayarları Aç"> <!ENTITY torprogress.heading "Tor ağına bağlanılıyor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Lütfen Tor ağı ile bağlantı kurulurken bekleyin. Bu işlem bir kaç dakika sürebilir."> diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties index cbf467d..8794242 100644 --- a/src/chrome/locale/tr/torlauncher.properties +++ b/src/chrome/locale/tr/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Başlatıcı @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S başarısız oldu (%2$S). torlauncher.unable_to_start_tor=Tor başlatılamadı.\n\n%S torlauncher.tor_missing=Çalıştırılabilecek Tor dosyası bulunamadı. -torlauncher.torrc_missing=torrc dosyası bulunamadı. -torlauncher.datadir_missing=Tor veri klasörü bulunamadı. +torlauncher.torrc_missing="Torcc" dosyası eksik ve oluşturulamadı. +torlauncher.datadir_missing=Tor veri dizini bulunamadı ve oluşturulamadı. torlauncher.password_hash_missing=Karılmış parola alınamadı. torlauncher.failed_to_get_settings=Tor ayarları alınamadı.\n\n%S @@ -22,10 +22,10 @@ torlauncher.failed_to_save_settings=Tor ayarları kaydedilemedi.\n\n%S torlauncher.ensure_tor_is_running=Lütfen Tor'un çalıştığından emin olun. torlauncher.error_proxy_addr_missing=İnternet'e bir vekil sunucu üzerinden bağlanmak için bir IP adresi ya da sunucu adı ile bağlantı noktası numarasının yazılması gereklidir. -torlauncher.error_proxy_type_missing=Vekil sunucu tipini seçmelisiniz. +torlauncher.error_proxy_type_missing=Vekil sunucu türünü seçmelisiniz. torlauncher.error_bridges_missing=Bir ya da birkaç köprü belirtmelisiniz. -torlauncher.error_default_bridges_type_missing=Sağlanan köprüler için bir aktarım tipi seçmelisiniz. -torlauncher.error_bridge_bad_default_type=Sağlanan köprüler %S aktarım tipi için kullanılamıyor. Lütfen ayarlarınızı değiştirin. +torlauncher.error_default_bridges_type_missing=Sağlanan köprüler için bir aktarım türü seçmelisiniz. +torlauncher.error_bridge_bad_default_type=Sağlanan köprüler %S aktarım türü için kullanılamıyor. Lütfen ayarlarınızı değiştirin. torlauncher.recommended_bridge=(önerilir) diff --git a/src/chrome/locale/uk/network-settings.dtd b/src/chrome/locale/uk/network-settings.dtd index ed17b65..25f17b3 100644 --- a/src/chrome/locale/uk/network-settings.dtd +++ b/src/chrome/locale/uk/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "Яке з наступних тверджень найкраще описує Вашу ситуацію?"> <!ENTITY torSettings.configurePrompt1 "Мережеве з'єднання цього комп'ютера цензурується або йде через проксі-сервер."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Мені потрібно налаштувати міст або локальний проксі перед під'єданням до мережі Tor."> <!ENTITY torSettings.configure "Налаштування"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Я бажаю підключитися до мережі Tor напряму."> <!ENTITY torSettings.connectPrompt3 "Це має працювати у більшості ситуацій."> <!ENTITY torSettings.connect "З'єднатися"> <!ENTITY torSettings.proxyPageTitle "Локальна конфігурація проксі-сервера"> <!ENTITY torSettings.proxyQuestion "Чи потрібно цьому комп'ютеру використовувати локальний проксі для доступу в Інтернет?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "У більшості випадків локальний проксі не потрібний, але він може вимагатися при підключенні через мережу компанії, школи чи університету."> +<!ENTITY torSettings.proxyExplanation2 "Якщо Ви не впевнені, як відповісти на це запитання, подивіться налаштування Інтернету в іншому браузері або мережні налаштування Вашої системи, щоб побачити чи потрібне використання проксі."> <!ENTITY torSettings.enterProxy "Задати параметри проксі"> <!ENTITY torSettings.bridgePageTitle "Конфігурації Tor-мостів"> <!ENTITY torSettings.bridgeQuestion "Ваш Інтернет-провайдер (ISP) блокує чи яким-небудь чином цензурує підключення до Tor мережі?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Якщо Ви не впевнені, як відповісти на це запитання, виберіть Ні. (Якщо Ви не можете під'єднатися до мережі Tor без моста, його можна додати пізніше)."> +<!ENTITY torSettings.bridgeExplanation2 "Якщо Ви виберете Так, Вам буде запропоновано налаштувати мости Tor, які є приватними трансляторами, що ускладнюють блокування з'єднань з мережею Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Ви можете використати визначений перелік мостів або можете отримати і ввести набір мостів вручну.">  <!ENTITY torsettings.startingTor "Підключення до Tor..."> <!ENTITY torsettings.restartTor "Перезапустити Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Переналаштувати"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Ви налаштували мости Tor або ввели налаштування локального проксі.  Для прямого з'єднання з мережею Tor ці налаштування треба вилучити."> +<!ENTITY torsettings.discardSettings.proceed "Вилучити налаштування і під'єднатися"> <!ENTITY torsettings.optional "Додатково"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Дозволенні порти:"> <!ENTITY torsettings.useBridges.checkbox "Мій провайдер блокує доступ до мережі Tor"> <!ENTITY torsettings.useBridges.default "Підключитися з визначеними мостами"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Кожен тип мостів викорисовує інший метод уникнення цензури.  Якщо один міст не працює, спробуйте ще раз через інший."> <!ENTITY torsettings.useBridges.type "Тип транспорту:"> <!ENTITY torsettings.useBridges.custom "Ввести мости вручну"> <!ENTITY torsettings.useBridges.label "Введіть один або кілька ретрансляторів типу міст (по одному в рядок)."> diff --git a/src/chrome/locale/uk/progress.dtd b/src/chrome/locale/uk/progress.dtd index 192f5d3..4e5e458 100644 --- a/src/chrome/locale/uk/progress.dtd +++ b/src/chrome/locale/uk/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Статус Tor"> <!ENTITY torprogress.openSettings "Відкрити Налаштування"> <!ENTITY torprogress.heading "Підключення до мережі Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Будь ласка, зачекайте, поки ми підключаємося до мережі Tor.  Це може зайняти кілька хвилин."> diff --git a/src/chrome/locale/uk/torlauncher.properties b/src/chrome/locale/uk/torlauncher.properties index 8287a1f..afb6786 100644 --- a/src/chrome/locale/uk/torlauncher.properties +++ b/src/chrome/locale/uk/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Завантажувач Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S невдало (%2$S). torlauncher.unable_to_start_tor=Неможливо запустити Tor.\n\n%S torlauncher.tor_missing=Виконуваний файл Tor відсутній. -torlauncher.torrc_missing=Файл torrc відсутній. -torlauncher.datadir_missing=Каталог даних Tor не існує. +torlauncher.torrc_missing=Файл torrc відсутній та не може бути створена. +torlauncher.datadir_missing=Директорія для даних Tor не існує і не може бути створена. torlauncher.password_hash_missing=Не вдалося отримати хеширований пароль. torlauncher.failed_to_get_settings=Не вдалося отримати налаштування Tor.\n\n%S diff --git a/src/chrome/locale/ur-PK/torlauncher.properties b/src/chrome/locale/ur-PK/torlauncher.properties index f5a81fc..bc25a05 100644 --- a/src/chrome/locale/ur-PK/torlauncher.properties +++ b/src/chrome/locale/ur-PK/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/ur/torlauncher.properties b/src/chrome/locale/ur/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/ur/torlauncher.properties +++ b/src/chrome/locale/ur/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/uz/network-settings.dtd b/src/chrome/locale/uz/network-settings.dtd index f8795c1..b9a3947 100644 --- a/src/chrome/locale/uz/network-settings.dtd +++ b/src/chrome/locale/uz/network-settings.dtd @@ -17,7 +17,7 @@ <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.connect "Ulanish"> <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> diff --git a/src/chrome/locale/uz/torlauncher.properties b/src/chrome/locale/uz/torlauncher.properties index 9ead70b..a5e0932 100644 --- a/src/chrome/locale/uz/torlauncher.properties +++ b/src/chrome/locale/uz/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=torrc fayli mavjud emas. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/ve/torlauncher.properties b/src/chrome/locale/ve/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/ve/torlauncher.properties +++ b/src/chrome/locale/ve/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/vi/torlauncher.properties b/src/chrome/locale/vi/torlauncher.properties index e5d7acd..2dd940e 100644 --- a/src/chrome/locale/vi/torlauncher.properties +++ b/src/chrome/locale/vi/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=Tập tin thực thi của Tor bị thiếu. -torlauncher.torrc_missing=Thiếu tập tin torrc. -torlauncher.datadir_missing=Thư mục data trong Tor không tồn tại. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Không thể nhận được cài đặt Tor. diff --git a/src/chrome/locale/wa/torlauncher.properties b/src/chrome/locale/wa/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/wa/torlauncher.properties +++ b/src/chrome/locale/wa/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/wo/torlauncher.properties b/src/chrome/locale/wo/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/wo/torlauncher.properties +++ b/src/chrome/locale/wo/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd index 813cd80..c9619ae 100644 --- a/src/chrome/locale/zh-CN/network-settings.dtd +++ b/src/chrome/locale/zh-CN/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "以下哪个描述与你的情况最为匹配？"> <!ENTITY torSettings.configurePrompt1 "网络连接受到审查或需要代理。"> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "我需要配置网桥或本地代理设置才能连接到 Tor 网络。"> <!ENTITY torSettings.configure "配置"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "我想直接连接 Tor 网络。"> <!ENTITY torSettings.connectPrompt3 "通常这种方式是有效的。"> <!ENTITY torSettings.connect "连接"> <!ENTITY torSettings.proxyPageTitle "本地代理配置"> <!ENTITY torSettings.proxyQuestion "是否需要本地代理访问互联网？">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "大多数情况下不需要使用本地代理，但在使用公司、校园等网络时这可能必需。"> +<!ENTITY torSettings.proxyExplanation2 "如果您不确定此问题的答案，请查看其他网络浏览器或者您的系统中的网络设置，检查其是否使用了一个本地代理。"> <!ENTITY torSettings.enterProxy "输入代理设置。"> <!ENTITY torSettings.bridgePageTitle "Tor 网桥配置"> <!ENTITY torSettings.bridgeQuestion "互联网服务提供商 (ISP) 是否对 Tor 网络连接进行了封锁或审查？"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "如果您不确定此问题的答案，请选择否（如果您在不使用网桥时无法连接到 Tor 网络，您可以在稍后回来添加一个）"> +<!ENTITY torSettings.bridgeExplanation2 "如果您选择“是”，那么需要对 Tor 网桥进行配置。网桥指用于连接 Tor 网络的非公开网络中继，更难被封锁。"> <!ENTITY torSettings.bridgeSettingsPrompt "可以使用集成的网桥，也可以获取网桥，以自定义方式手动输入。">  <!ENTITY torsettings.startingTor "等待 Tor 启动..."> <!ENTITY torsettings.restartTor "重新启动 Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "重新配置"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "您已配置 Tor 网桥，或者您已输入本地代理设置。若要直接连接到 Tor 网络，这些设置必须被移除。"> +<!ENTITY torsettings.discardSettings.proceed "移除设置并连接"> <!ENTITY torsettings.optional "可选"> @@ -55,8 +55,8 @@ <!ENTITY torsettings.firewall.checkbox "该计算机的防火墙仅允许特定端口的互联网连接"> <!ENTITY torsettings.firewall.allowedPorts "允许的端口："> <!ENTITY torsettings.useBridges.checkbox "我的互联网服务提供商 (ISP) 封锁了 Tor 网络连接"> -<!ENTITY torsettings.useBridges.default "使用集成的网桥进行连接"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.default "使用集成的网桥连接"> +<!ENTITY torsettings.useBridges.note "每种网桥使用不同的方法以避免被封锁。如果某个网桥不工作，请换用另一种重试。"> <!ENTITY torsettings.useBridges.type "传输类型："> <!ENTITY torsettings.useBridges.custom "输入自定义网桥"> <!ENTITY torsettings.useBridges.label "输入一个或多个网桥中继(一行一个)。"> diff --git a/src/chrome/locale/zh-CN/progress.dtd b/src/chrome/locale/zh-CN/progress.dtd index 838d88e..dc816a5 100644 --- a/src/chrome/locale/zh-CN/progress.dtd +++ b/src/chrome/locale/zh-CN/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor 状态"> <!ENTITY torprogress.openSettings "打开设置"> <!ENTITY torprogress.heading "正在连接 Tor 网络"> -<!ENTITY torprogress.pleaseWait "请等待我们建立到 Tor 网络的连接。这可能会需要几分钟。"> +<!ENTITY torprogress.pleaseWait "正在与 Tor 网络建立连接。这可能需要几分钟，请耐心等待。"> diff --git a/src/chrome/locale/zh-CN/torlauncher.properties b/src/chrome/locale/zh-CN/torlauncher.properties index 828415a..b74e3f7 100644 --- a/src/chrome/locale/zh-CN/torlauncher.properties +++ b/src/chrome/locale/zh-CN/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S 失败 (%2$S)。 torlauncher.unable_to_start_tor=无法启动 Tor。\n\n%S torlauncher.tor_missing=缺少 Tor 可执行文件。 -torlauncher.torrc_missing=缺少 torrc 文件。 -torlauncher.datadir_missing=Tor 数据目录不存在。 +torlauncher.torrc_missing=torrc 文件丢失且无法被创建。 +torlauncher.datadir_missing=Tor 数据目录不存在且无法被创建。 torlauncher.password_hash_missing=无法获取哈希密码。 torlauncher.failed_to_get_settings=无法获取 Tor 设置。\n\n%S diff --git a/src/chrome/locale/zh-HK/network-settings.dtd b/src/chrome/locale/zh-HK/network-settings.dtd index 03178e9..2967069 100644 --- a/src/chrome/locale/zh-HK/network-settings.dtd +++ b/src/chrome/locale/zh-HK/network-settings.dtd @@ -1,75 +1,75 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "設定Tor洋蔥路由網絡">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Tor洋蔥路由瀏覽器嘅語言"> +<!ENTITY torlauncher.localePicker.prompt "請選取一種語言。">  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "連接到Tor洋蔥路由網絡前，請提供呢部電腦網絡連線嘅相關資訊。"> <!ENTITY torSettings.yes "是"> <!ENTITY torSettings.no "否"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.firstQuestion "下列邊項最符合你嘅實際情況？"> +<!ENTITY torSettings.configurePrompt1 "呢部電腦嘅網絡連線有被監控過濾或有透過代理伺服器。"> +<!ENTITY torSettings.configurePrompt2 "我必須喺連上Tor洋蔥路由 網絡之前，先設定好橋接器或本地代理伺服器。"> +<!ENTITY torSettings.configure "設定"> +<!ENTITY torSettings.connectPrompt2 "我想直接連上Tor洋蔥路由網絡"> +<!ENTITY torSettings.connectPrompt3 "呢樣可以喺大多數情況下正常運作。"> <!ENTITY torSettings.connect "連接"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyPageTitle "設定本地代理伺服器"> +<!ENTITY torSettings.proxyQuestion "呢部電腦需要使用本地代理伺服器嚟存取網絡嗎？">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.proxyExplanation1 "大部份情況係唔需要本地代理伺服器，但當使用嘅係企業或學校等嘅內部網絡時，就有可能需要。"> +<!ENTITY torSettings.proxyExplanation2 "如果唔確定，可參考其他網絡瀏覽器嘅網際網絡設定或者作業系統嘅網絡相關設定，以確定係咪需要設定本地代理伺服器。"> +<!ENTITY torSettings.enterProxy "輸入代理伺服器設定。"> +<!ENTITY torSettings.bridgePageTitle "設定Tor洋蔥路由橋接器"> +<!ENTITY torSettings.bridgeQuestion "你嘅互聯網服務提供者(ISP)會唔會阻擋或過濾連接到Tor洋蔥路由嘅網絡活動？"> +<!ENTITY torSettings.bridgeExplanation1 "唔確定，請選「否」(往後若發現唔使用橋接器無法連上Tor洋蔥路由網絡嘅話，可以返嚟加入此設定)。"> +<!ENTITY torSettings.bridgeExplanation2 "若選取「是」，則須進行Tor洋蔥路由橋接器設定。橋接器係未被列表嘅秘密Tor洋蔥路由節點，可令阻擋連接Tor洋蔥路由網絡更加困難。"> +<!ENTITY torSettings.bridgeSettingsPrompt "你可以使用提供嘅橋接器，也可輸入一組自訂嘅橋接器。">  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.startingTor "等待Tor洋蔥路由啟動…"> +<!ENTITY torsettings.restartTor "重新啟動Tor洋蔥路由"> +<!ENTITY torsettings.reconfigTor "重新設定"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "你已設定Tor洋蔥路由嘅橋接器或本地代理伺服器。  若想要直接連上Tor洋蔥路由網絡嘅話，必須要先移除呢部份嘅設定。"> +<!ENTITY torsettings.discardSettings.proceed "移除設定值並且連線"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "選用"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "密碼:"> +<!ENTITY torsettings.useProxy.checkbox "呢部電腦需要透過本地代理伺服器存取互聯網"> +<!ENTITY torsettings.useProxy.type "代理伺服器類型："> +<!ENTITY torsettings.useProxy.address "位址："> +<!ENTITY torsettings.useProxy.address.placeholder "IP位址或主機名稱"> +<!ENTITY torsettings.useProxy.port "連接埠："> +<!ENTITY torsettings.useProxy.username "用戶名："> +<!ENTITY torsettings.useProxy.password "密碼："> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useProxy.type.http "http╱https"> +<!ENTITY torsettings.firewall.checkbox "呢部電腦通過某個只容許連接至特定連線埠嘅防火牆"> +<!ENTITY torsettings.firewall.allowedPorts "容許嘅連接埠："> +<!ENTITY torsettings.useBridges.checkbox "我嘅互聯網服務提供者(ISP)會阻擋連接到Tor洋蔥路由嘅網絡活動"> +<!ENTITY torsettings.useBridges.default "使用提供嘅橋接器連線"> +<!ENTITY torsettings.useBridges.note "每種橋接器都使用唔同嘅方式去規避網絡封包過濾，  如果發現使用咗某個橋接器仍無法順利連線嘅話，可以更換另一個橋接器再行嘗試。"> +<!ENTITY torsettings.useBridges.type "傳輸類型："> +<!ENTITY torsettings.useBridges.custom "輸入自訂嘅橋接器"> +<!ENTITY torsettings.useBridges.label "輸入一個或多個橋接轉向站(每行一個)。"> +<!ENTITY torsettings.useBridges.placeholder "請輸入「位址:連接埠」"> -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.copyLog "將Tor洋蔥路由嘅日誌複製到剪貼簿"> +<!ENTITY torsettings.bridgeHelpTitle "橋接轉向站嘅說明"> +<!ENTITY torsettings.bridgeHelp1 "若無法連接到Tor洋蔥路由網絡，可能係因為你嘅互聯網服務提供者(ISP)或其他機構正在封鎖Tor洋蔥路由網絡。  通常你可以使用橋接器連上Tor洋蔥路由網絡，以解決此問題。呢類橋接器係未被羅列於清單中嘅秘密轉向站，非常難以被過濾阻擋。"> +<!ENTITY torsettings.bridgeHelp1B "你可使用預先設定好嘅橋接器位址，或使用下列三種方法嘅任何一種以取得一組自訂嘅位址："> +<!ENTITY torsettings.bridgeHelp2Heading "透過網絡"> +<!ENTITY torsettings.bridgeHelp2 "使用瀏覽器到訪 https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "透過電郵自動回覆"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "傳送郵件到 bridges(a)torproject.org 並在內文中輸入「get bridges」字串。  然而，要使網絡攻擊者更難取得橋接器位址，你必須使用以下電郵提供者之一嚟寄送呢個要求(順序係依照優先建議)："> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net 、 https://mail.google.com 或 https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp4Heading "透過服務台"> +<!ENTITY torsettings.bridgeHelp4 "最後方法係：寄電郵到 help(a)rt.torproject.org.  請注意，此類郵件我哋須一封封手動回覆。"> diff --git a/src/chrome/locale/zh-HK/progress.dtd b/src/chrome/locale/zh-HK/progress.dtd index e93a82a..fbd63d4 100644 --- a/src/chrome/locale/zh-HK/progress.dtd +++ b/src/chrome/locale/zh-HK/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor的狀態"> -<!ENTITY torprogress.openSettings "打開設定"> -<!ENTITY torprogress.heading "連接至Tor的網絡中"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.dialog.title "Tor洋蔥路由狀態"> +<!ENTITY torprogress.openSettings "開啟設定"> +<!ENTITY torprogress.heading "連接到Tor洋蔥路由網絡"> +<!ENTITY torprogress.pleaseWait "我哋正在建立通往Tor洋蔥路由網絡嘅連線，請稍候， 呢樣可能會需要幾分鐘時間。"> diff --git a/src/chrome/locale/zh-HK/torlauncher.properties b/src/chrome/locale/zh-HK/torlauncher.properties index 151dc4b..0a84bcf 100644 --- a/src/chrome/locale/zh-HK/torlauncher.properties +++ b/src/chrome/locale/zh-HK/torlauncher.properties @@ -1,61 +1,61 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor啟動器 +torlauncher.error_title=Tor洋蔥路由啟動器 -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. -torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -torlauncher.tor_failed_to_start=Tor failed to start. -torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_exited=意外咁Tor洋蔥路由自行關閉。呢樣可能係Tor洋蔥路由本身、其他應用程式或硬體產生嘅問題。除非重新啟動Tor洋蔥路由，否則Tor洋蔥路由瀏覽器將無法連接任何網站。如果問題仍然存在，請複製並發送你嘅Tor洋蔥路由歷程紀錄到支援團隊。 +torlauncher.tor_exited2=重新啟動Tor洋蔥路由將唔會關閉你瀏覽器嘅分頁。 +torlauncher.tor_controlconn_failed=無法連接到Tor洋蔥路由控制連接埠。 +torlauncher.tor_failed_to_start=無法啟動Tor洋蔥路由。 +torlauncher.tor_control_failed=無法控制Tor洋蔥路由。 +torlauncher.tor_bootstrap_failed=Tor洋蔥路無法連接Tor洋蔥路由網絡。 +torlauncher.tor_bootstrap_failed_details=%1$S失敗(%2$S)。 -torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S -torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. -torlauncher.password_hash_missing=Failed to get hashed password. +torlauncher.unable_to_start_tor=無法啟動Tor洋蔥路由。\n\n%S +torlauncher.tor_missing=遺失Tor洋蔥路由嘅執行檔。 +torlauncher.torrc_missing=遺失Torrc檔案，並且無法建立。 +torlauncher.datadir_missing=Tor洋蔥路由嘅資料夾路徑不存在，並且無法建立。 +torlauncher.password_hash_missing=無法取得驗證碼嘅密碼。 -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=請確定Tor運作中。 +torlauncher.failed_to_get_settings=無法取得Tor洋蔥路由設定\n\n%S +torlauncher.failed_to_save_settings=無法儲存洋蔥路由嘅設定。\n\n%S +torlauncher.ensure_tor_is_running=請確定Tor洋蔥路由運作中。 -torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -torlauncher.error_proxy_type_missing=You must select the proxy type. -torlauncher.error_bridges_missing=You must specify one or more bridges. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_proxy_addr_missing=須指定一個IP位址或主機名，以及連接埠編號，Tor洋蔥路由才可使用代理伺服器嚟存取網絡。 +torlauncher.error_proxy_type_missing=須選擇代理伺服器類型。 +torlauncher.error_bridges_missing=須指定一個或多個橋接器。 +torlauncher.error_default_bridges_type_missing=須為橋接器選取傳輸類型。 +torlauncher.error_bridge_bad_default_type=未提供傳輸類型為%S嘅橋接器。請重選。 torlauncher.recommended_bridge=(建議) torlauncher.connect=連接 -torlauncher.restart_tor=Restart Tor +torlauncher.restart_tor=重新啟動Tor洋蔥路由 torlauncher.quit=離開 torlauncher.quit_win=離開 torlauncher.done=完成 -torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance=如需協助，請聯絡%S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=複製完成。%S Tor洋蔥路由日誌已準備好被貼到文字編輯器或電郵。 -torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory -torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection -torlauncher.bootstrapStatus.requesting_status=Retrieving network status -torlauncher.bootstrapStatus.loading_status=Loading network status -torlauncher.bootstrapStatus.loading_keys=Loading authority certificates -torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information -torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.conn_or=連接上Tor的網絡 -torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit -torlauncher.bootstrapStatus.done=Connected to the Tor network! +torlauncher.bootstrapStatus.conn_dir=正連接至轉向目錄 +torlauncher.bootstrapStatus.handshake_dir=正在建立加密嘅目錄連線 +torlauncher.bootstrapStatus.requesting_status=正在取得網絡狀態 +torlauncher.bootstrapStatus.loading_status=正在載入網絡狀態 +torlauncher.bootstrapStatus.loading_keys=正在載入授權憑證 +torlauncher.bootstrapStatus.requesting_descriptors=正在索取轉向站資訊 +torlauncher.bootstrapStatus.loading_descriptors=正在載入轉向站資訊 +torlauncher.bootstrapStatus.conn_or=正連接到Tor洋蔥路由網絡 +torlauncher.bootstrapStatus.handshake_or=正在建立Tor洋蔥路由線路 +torlauncher.bootstrapStatus.done=已連接到Tor洋蔥路由網絡！ torlauncher.bootstrapWarning.done=完成 -torlauncher.bootstrapWarning.connectrefused=connection refused -torlauncher.bootstrapWarning.misc=miscellaneous -torlauncher.bootstrapWarning.resourcelimit=insufficient resources -torlauncher.bootstrapWarning.identity=identity mismatch -torlauncher.bootstrapWarning.timeout=connection timeout -torlauncher.bootstrapWarning.noroute=no route to host -torlauncher.bootstrapWarning.ioerror=read/write error -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.connectrefused=連線遭到拒絕 +torlauncher.bootstrapWarning.misc=其他 +torlauncher.bootstrapWarning.resourcelimit=資源唔夠 +torlauncher.bootstrapWarning.identity=身份唔相符 +torlauncher.bootstrapWarning.timeout=連接逾時 +torlauncher.bootstrapWarning.noroute=無前往主機嘅路由 +torlauncher.bootstrapWarning.ioerror=讀寫錯誤 +torlauncher.bootstrapWarning.pt_missing=遺失Pluggable transport diff --git a/src/chrome/locale/zh-TW/network-settings.dtd b/src/chrome/locale/zh-TW/network-settings.dtd index 5e54ea1..59596fd 100644 --- a/src/chrome/locale/zh-TW/network-settings.dtd +++ b/src/chrome/locale/zh-TW/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "下列哪一項敘述最符合您的實際情況？"> <!ENTITY torSettings.configurePrompt1 "這部電腦的網路連線有被監控過濾或是有透過代理伺服器。"> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "我必須要在連上洋蔥路由 網路之前，先設定好橋接器或本地端代理伺服器。"> <!ENTITY torSettings.configure "設定"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "我想要直接連上洋蔥路由網路。"> <!ENTITY torSettings.connectPrompt3 "這將在大多數情況下正常運作。"> <!ENTITY torSettings.connect "連接"> <!ENTITY torSettings.proxyPageTitle "本地端代理伺服器的設定"> <!ENTITY torSettings.proxyQuestion "這台電腦需要使用本地代理伺服器來存取網路嗎？">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "在大部分的情況中是不需要本地端代理伺服器的，但是當所使用的網路服務是公司企業或學校等之內部網路時，就有可能會需要。"> +<!ENTITY torSettings.proxyExplanation2 "如果您不確定如何回答這個問題的話，可以參考其他網路瀏覽器的網際網路設定或者是作業系統中的網路相關設定，以確定是否需要設定本地端代理伺服器。"> <!ENTITY torSettings.enterProxy "輸入代理伺服器設定。"> <!ENTITY torSettings.bridgePageTitle "洋蔥路由橋接器的設定"> <!ENTITY torSettings.bridgeQuestion "您的網際網路服務提供者(ISP)是否會阻擋或監控過濾連接到洋蔥路由的網路活動？"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "若您不確定如何回答這個問題的話，請選擇「否」(若之後您發現沒有使用橋接器無法連上洋蔥路由網路的話，可以再回頭來增加此設定)。"> +<!ENTITY torSettings.bridgeExplanation2 "若您選擇「是」的話，您將必須要進行洋蔥路由的橋接器設定，橋接器是未被列表的祕密洋蔥路由節點，它可以讓對通往洋蔥路由網路連線的阻擋，變得更加困難。"> <!ENTITY torSettings.bridgeSettingsPrompt "您可以使用提供的橋接器，您也可以輸入一組自訂的橋接器。">  <!ENTITY torsettings.startingTor "正在等待洋蔥路由啟動…"> <!ENTITY torsettings.restartTor "重新啟動洋蔥路由"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "重新設定"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "您已經有設定洋蔥路由的橋接器或本地端代理伺服器。  若想要直接連上洋蔥路由網路的話，必須要先移除這部份的設定。"> +<!ENTITY torsettings.discardSettings.proceed "移除設定值並且連線"> <!ENTITY torsettings.optional "選用"> @@ -52,11 +52,11 @@ <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "這台電腦通過只允許連接至特定連線埠的防火牆"> +<!ENTITY torsettings.firewall.checkbox "這台電腦通過某個只允許連接至特定連線埠的防火牆"> <!ENTITY torsettings.firewall.allowedPorts "允許的連接埠："> <!ENTITY torsettings.useBridges.checkbox "我的網際網路服務提供者(ISP)會過濾阻擋連接至洋蔥路由的網路活動"> <!ENTITY torsettings.useBridges.default "使用提供的橋接器連線"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "每種橋接器都使用不同的方式去規避網路封包過濾，  如果發現使用了某個橋接器仍然無法順利連上線的話，可以更換另一個橋接器再行嘗試。"> <!ENTITY torsettings.useBridges.type "傳輸類型："> <!ENTITY torsettings.useBridges.custom "輸入自訂的橋接器"> <!ENTITY torsettings.useBridges.label "輸入一個或多個橋接中繼器 (每行一個)。"> @@ -64,7 +64,7 @@ <!ENTITY torsettings.copyLog "將洋蔥路由的訊息記錄複製到剪貼簿"> <!ENTITY torsettings.bridgeHelpTitle "橋接中繼器之說明"> -<!ENTITY torsettings.bridgeHelp1 "若您無法連接到洋蔥路由網路，可能是因為您的網際網路服務提供者 (ISP) 或其它機構正在封鎖洋蔥路由網路。  通常您可以使用更難以被封鎖之橋接中繼器來連上洋蔥路由，以便解決此問題。"> +<!ENTITY torsettings.bridgeHelp1 "若您無法連接到洋蔥路由網路，可能是因為您的網際網路服務提供者 (ISP) 或其它機構正在封鎖洋蔥路由網路。  通常您可以使用橋接中繼器來連上洋蔥路由網路，以便解決此問題。該種中繼器是未被羅列於清單中的秘密中繼節點，非常難以被過濾阻擋。"> <!ENTITY torsettings.bridgeHelp1B "您可以使用預先設定好的橋接器位址，或您也可以使用下列三種方法的任一種以獲取一組自訂的位址："> <!ENTITY torsettings.bridgeHelp2Heading "透過網路"> <!ENTITY torsettings.bridgeHelp2 "使用網路瀏覽器造訪 https://bridges.torproject.org"> diff --git a/src/chrome/locale/zh-TW/progress.dtd b/src/chrome/locale/zh-TW/progress.dtd index 65b0d3e..fda5971 100644 --- a/src/chrome/locale/zh-TW/progress.dtd +++ b/src/chrome/locale/zh-TW/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor 狀態"> +<!ENTITY torprogress.dialog.title "洋蔥路由狀態"> <!ENTITY torprogress.openSettings "開啟設定"> -<!ENTITY torprogress.heading "正在連線至 Tor 網路"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.heading "正在連線至洋蔥路由網路"> +<!ENTITY torprogress.pleaseWait "我們正在建立通往洋蔥路由網路的連線，敬請稍作等待， 因為這可能會需要幾分鐘的時間。"> diff --git a/src/chrome/locale/zh-TW/torlauncher.properties b/src/chrome/locale/zh-TW/torlauncher.properties index 6fadc66..a706916 100644 --- a/src/chrome/locale/zh-TW/torlauncher.properties +++ b/src/chrome/locale/zh-TW/torlauncher.properties @@ -1,57 +1,57 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor 啟動工具 +torlauncher.error_title=洋蔥路由啟動工具 -torlauncher.tor_exited=Tor 意外地結束。這有可能是 Tor 本身的程式錯誤、您系統上的其它程式或是硬體故障。直到您重新啟動 Tor，Tor Browser將不會造訪任何網站。如果問題仍然存在，請發送您的 Tor 紀錄副本到支援團隊。 +torlauncher.tor_exited=洋蔥路由程式意外地中止了。這有可能是洋蔥路由本身的程式錯誤、您系統上的其它程式或是硬體故障。除非您重新啟動洋蔥路由，否則洋蔥路由瀏覽器將無法連接上任何網站。如果此問題持續發生，請發複製並發送您的洋蔥路由歷程紀錄到支援團隊。 torlauncher.tor_exited2=重新啟動洋蔥路由將不會關閉您瀏覽器的分頁。 -torlauncher.tor_controlconn_failed=無法連接至 Tor 控制連接埠。 +torlauncher.tor_controlconn_failed=無法連接至洋蔥路由控制連接埠。 torlauncher.tor_failed_to_start=洋蔥路由無法啟動。 -torlauncher.tor_control_failed=無法控制 Tor。 -torlauncher.tor_bootstrap_failed=Tor 無法建立 Tor 網路連線。 +torlauncher.tor_control_failed=無法控制洋蔥路由。 +torlauncher.tor_bootstrap_failed=洋蔥路由系統無法建立起通往洋蔥路由網路的連線。 torlauncher.tor_bootstrap_failed_details=%1$S 失敗 (%2$S)。 -torlauncher.unable_to_start_tor=無法啟動 Tor。\n\n%S -torlauncher.tor_missing=Tor 可執行檔遺失。 -torlauncher.torrc_missing=torrc 檔案遺失。 -torlauncher.datadir_missing=Tor 資料目錄不存在。 +torlauncher.unable_to_start_tor=無法啟動洋蔥路由。\n\n%S +torlauncher.tor_missing=洋蔥路由可執行檔遺失。 +torlauncher.torrc_missing=洋蔥路由的配置文件遺失而且無法創建。 +torlauncher.datadir_missing=洋蔥路由的資料路徑並不存在，且無法被創建。 torlauncher.password_hash_missing=無法取得雜湊過的密碼。 -torlauncher.failed_to_get_settings=無法擷取 Tor 設定。\n\n%S -torlauncher.failed_to_save_settings=無法儲存 Tor 的設定。\n\n%S -torlauncher.ensure_tor_is_running=請確定 Tor 正在執行。 +torlauncher.failed_to_get_settings=無法擷取洋蔥路由設定。\n\n%S +torlauncher.failed_to_save_settings=無法儲存洋蔥路由的設定。\n\n%S +torlauncher.ensure_tor_is_running=請確定洋蔥路由正在執行。 -torlauncher.error_proxy_addr_missing=想要設定 Tor 使用代理伺服器來存取網路，您必須指定一個 IP 位址或主機名稱以及連接埠號碼。 +torlauncher.error_proxy_addr_missing=您必須指定一個 IP 位址或主機名稱以及連接埠號碼，才能夠讓洋蔥路由使用代理伺服器來存取網路。 torlauncher.error_proxy_type_missing=您必須選擇代理伺服器類型。 torlauncher.error_bridges_missing=您必須指定一個或多個橋接。 -torlauncher.error_default_bridges_type_missing=您必須選擇一種傳輸類型才能提供橋接。 -torlauncher.error_bridge_bad_default_type=沒有可用的傳輸類型為 %S 的橋接。請調整您的設定。 +torlauncher.error_default_bridges_type_missing=您必須為該橋接器選擇一種傳輸類型。 +torlauncher.error_bridge_bad_default_type=沒有提供傳輸類型為 %S 的橋接器。請調整您的設定。 torlauncher.recommended_bridge=(建議使用) torlauncher.connect=連線 -torlauncher.restart_tor=重新啟動 Tor +torlauncher.restart_tor=重新啟動洋蔥路由 torlauncher.quit=離開 torlauncher.quit_win=結束 torlauncher.done=完成 torlauncher.forAssistance=如需協助，請聯絡 %S -torlauncher.copiedNLogMessages=複製完成。%S Tor 紀錄訊息已準備好被貼到文字編輯器或是一封電子郵件訊息。 +torlauncher.copiedNLogMessages=複製完成。%S 洋蔥路由紀錄訊息已準備好被貼到文字編輯器或是一封電子郵件訊息。 torlauncher.bootstrapStatus.conn_dir=正連接至中繼目錄 torlauncher.bootstrapStatus.handshake_dir=正在建立加密的目錄連線 torlauncher.bootstrapStatus.requesting_status=正在擷取網路狀態 torlauncher.bootstrapStatus.loading_status=正在載入網路狀態 torlauncher.bootstrapStatus.loading_keys=正在載入授權憑證 -torlauncher.bootstrapStatus.requesting_descriptors=正在要求中繼資訊 -torlauncher.bootstrapStatus.loading_descriptors=正在載入中繼資訊 -torlauncher.bootstrapStatus.conn_or=正連接至 Tor 網路 -torlauncher.bootstrapStatus.handshake_or=正在建立 Tor 迴路 -torlauncher.bootstrapStatus.done=已連接到 Tor 網路! +torlauncher.bootstrapStatus.requesting_descriptors=正在索取中繼節點資訊 +torlauncher.bootstrapStatus.loading_descriptors=正在載入中繼節點資訊 +torlauncher.bootstrapStatus.conn_or=正連接至洋蔥路由網路 +torlauncher.bootstrapStatus.handshake_or=正在建立洋蔥路由迴路 +torlauncher.bootstrapStatus.done=已連接到洋蔥路由網路! torlauncher.bootstrapWarning.done=完成 -torlauncher.bootstrapWarning.connectrefused=連線遭拒 +torlauncher.bootstrapWarning.connectrefused=連線遭到拒絕 torlauncher.bootstrapWarning.misc=雜項 torlauncher.bootstrapWarning.resourcelimit=資源不足 torlauncher.bootstrapWarning.identity=識別不符 diff --git a/src/chrome/locale/zu/torlauncher.properties b/src/chrome/locale/zu/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/zu/torlauncher.properties +++ b/src/chrome/locale/zu/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S

1 0

[tor-browser-bundle/maint-5.5] Release preparations for 5.5.5
by gk＠torproject.org 21 Apr '16

21 Apr '16

commit f98b5e82b3244b58d9e9c5be5ce810ca27b06658 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 21 06:50:30 2016 +0000 Release preparations for 5.5.5 Changelog update, versions bumps, config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 9 +++++++++ gitian/versions | 10 +++++----- tools/update-responses/config.yml | 11 +++++------ 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 3796be0..ef982de 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,12 @@ +Tor Browser 5.5.5 -- April 26 2016 + * All Platforms + * Update Firefox to 38.8.0esr + * Update Tor Launcher to 0.2.7.9 + * Bug 10534: Don't advertise the help desk directly anymore + * Translation updates + * Update HTTPS-Everywhere to 5.1.6 + * Bug 18726: Add new default obfs4 bridge (GreenBelt) + Tor Browser 5.5.4 -- March 16 2016 * All Platforms * Update Firefox to 38.7.1esr diff --git a/gitian/versions b/gitian/versions index 1fefb42..8cf38e0 100755 --- a/gitian/versions +++ b/gitian/versions @@ -7,15 +7,15 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=38.7.1esr +FIREFOX_VERSION=38.8.0esr TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build1 TOR_TAG=tor-0.2.7.6 -TORLAUNCHER_TAG=0.2.7.8 +TORLAUNCHER_TAG=0.2.7.9 TORBUTTON_TAG=1.9.4.5 -HTTPSE_TAG=5.1.4 +HTTPSE_TAG=5.1.6 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -59,7 +59,7 @@ GO_VER=1.4.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.4-fx+fn+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.11-fn+sm+fx.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -93,7 +93,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=94d036ff45116023bde97e6dee6c79daf2d28804764bfa8937f5d4d3463173f5 +NOSCRIPT_HASH=fdd965a69188ac651b08a7d3ada54821a89db10a4685aa73ba59edc0b8243390 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 943a367..138aa50 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -12,13 +12,12 @@ channels: alpha: 5.5a6 release: 5.5.4 versions: - 5.5.4: - platformVersion: 38.7.1 - detailsURL: https://blog.torproject.org/blog/tor-browser-554-released - download_url: https://www.torproject.org/dist/torbrowser/5.5.4 + 5.5.5: + platformVersion: 38.8.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-555-released + download_url: https://www.torproject.org/dist/torbrowser/5.5.5 incremental_from: - - 5.5.2 - - 5.5.3 + - 5.5.4 migrate_archs: osx32: osx64 osx32:

1 0

[tor-launcher/maint-0.2.9] fixup! Bug 13252 - Do not store data in the app bundle
by gk＠torproject.org 21 Apr '16

21 Apr '16

commit 4442562704fc5df803cd0134209e5cacad29cb12 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Mar 25 10:08:15 2016 -0400 fixup! Bug 13252 - Do not store data in the app bundle Mac OS: account for the fact that user data is sometimes stored under ~/Library/Application Support/TorBrowser-Data. --- src/components/tl-process.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 7adb5a7..aba6456 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -801,12 +801,13 @@ TorProcessService.prototype = if (this.mIsUserDataOutsideOfAppDir == undefined) { // Determine if we are using a "side-by-side" data model by checking - // for the existence of the TorBrowser-Data/ directory. + // whether the user profile is outside of the app directory. try { - let f = this._appDir.parent; - f.append("TorBrowser-Data"); - this.mIsUserDataOutsideOfAppDir = f.exists() && f.isDirectory(); + let ds = Cc["@mozilla.org/file/directory_service;1"] + .getService(Ci.nsIProperties); + let profDir = ds.get("ProfD", Ci.nsIFile); + this.mIsUserDataOutsideOfAppDir = !this._appDir.contains(profDir); } catch (e) { @@ -860,14 +861,16 @@ TorProcessService.prototype = }, // get _appDir // Returns an nsIFile that points to the TorBrowser-Data/ directory. + // This function is only used when this._isUserDataOutsideOfAppDir == true. // May throw. get _dataDir() { if (!this.mDataDir) { - let f = this._appDir.parent.clone(); - f.append("TorBrowser-Data"); - this.mDataDir = f; + let ds = Cc["@mozilla.org/file/directory_service;1"] + .getService(Ci.nsIProperties); + let profDir = ds.get("ProfD", Ci.nsIFile); + this.mDataDir = profDir.parent.parent; } return this.mDataDir;

1 0

[tor-launcher/maint-0.2.9] Bug 13252 - Do not store data in the app bundle
by gk＠torproject.org 21 Apr '16

21 Apr '16

commit e9ed8e28de7963d825a743257c0e00f89106137c Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Mar 14 11:15:43 2016 -0400 Bug 13252 - Do not store data in the app bundle Add support for a "side-by-side" directory structure where the writable data is stored in the TorBrowser-Data/ directory next to the application directory. --- src/chrome/locale/en/torlauncher.properties | 6 +- src/components/tl-process.js | 232 +++++++++++++++++++++------- src/defaults/preferences/prefs.js | 9 +- 3 files changed, 184 insertions(+), 63 deletions(-) diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 216c962..7adb5a7 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -1,4 +1,4 @@ -// Copyright (c) 2015, The Tor Project, Inc. +// Copyright (c) 2016, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -16,6 +16,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherUtil", "resource://torlauncher/modules/tl-util.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger", "resource://torlauncher/modules/tl-logger.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "FileUtils", + "resource://gre/modules/FileUtils.jsm"); function TorProcessService() { @@ -290,7 +292,11 @@ TorProcessService.prototype = mProtocolSvc: null, mTorProcess: null, // nsIProcess mTorProcessStartTime: null, // JS Date.now() - mTorFileBaseDir: null, // nsIFile (cached) + // mIsUserDataOutsideOfAppDir is true when TorBrowser-Data is used. + // (cached; access via this._isUserDataOutsideOfAppDir) + mIsUserDataOutsideOfAppDir: undefined, + mAppDir: null, // nsIFile (cached; access via this._appDir) + mDataDir: null, // nsIFile (cached; access via this._dataDir) mControlConnTimer: null, mControlConnDelayMS: 0, mQuitSoon: false, // Quit was requested by the user; do so soon. @@ -309,10 +315,13 @@ TorProcessService.prototype = // Ideally, we would cd to the Firefox application directory before // starting tor (but we don't know how to do that). Instead, we // rely on the TBB launcher to start Firefox from the right place. - var exeFile = this._getTorFile("tor"); - var torrcFile = this._getTorFile("torrc"); - var torrcDefaultsFile = this._getTorFile("torrc-defaults"); - var dataDir = this._getTorFile("tordatadir"); + + // Get the Tor data directory first so it is created before we try to + // construct paths to files that will be inside it. + var dataDir = this._getTorFile("tordatadir", true); + var exeFile = this._getTorFile("tor", false); + var torrcFile = this._getTorFile("torrc", true); + var torrcDefaultsFile = this._getTorFile("torrc-defaults", false); var hashedPassword = this.mProtocolSvc.TorGetPassword(true); var detailsKey; @@ -335,11 +344,13 @@ TorProcessService.prototype = return; } - var geoipFile = dataDir.clone(); - geoipFile.append("geoip"); - var geoip6File = dataDir.clone(); - geoip6File.append("geoip6"); + // The geoip and geoip6 files are in the same directory as torrc-defaults. + var geoipFile = torrcDefaultsFile.clone(); + geoipFile.leafName = "geoip"; + + var geoip6File = torrcDefaultsFile.clone(); + geoip6File.leafName = "geoip6"; var args = []; if (torrcDefaultsFile) @@ -642,25 +653,65 @@ TorProcessService.prototype = }, // Returns an nsIFile. - // If file doesn't exist, null is returned. - _getTorFile: function(aTorFileType) + // If aCreate is true and the file doesn't exist, it is created. + _getTorFile: function(aTorFileType, aCreate) { if (!aTorFileType) return null; - var isRelativePath = true; - var prefName = "extensions.torlauncher." + aTorFileType + "_path"; - var path = TorLauncherUtil.getCharPref(prefName); + let isRelativePath = true; + let isUserData = (aTorFileType != "tor") && + (aTorFileType != "torrc-defaults"); + let prefName = "extensions.torlauncher." + aTorFileType + "_path"; + let path = TorLauncherUtil.getCharPref(prefName); if (path) { - var re = (TorLauncherUtil.isWindows) ? /^[A-Za-z]:\\/ : /^\//; + let re = (TorLauncherUtil.isWindows) ? /^[A-Za-z]:\\/ : /^\//; isRelativePath = !re.test(path); } else { // Get default path. - if (TorLauncherUtil.isWindows) + if (this._isUserDataOutsideOfAppDir) { + // This block is used for the TorBrowser-Data/ case. + if (TorLauncherUtil.isWindows) + { + if ("tor" == aTorFileType) + path = "TorBrowser\\Tor\\tor.exe"; + else if ("torrc-defaults" == aTorFileType) + path = "TorBrowser\\Tor\\torrc-defaults"; + else if ("torrc" == aTorFileType) + path = "Tor\\torrc"; + else if ("tordatadir" == aTorFileType) + path = "Tor"; + } + else if (TorLauncherUtil.isMac) + { + if ("tor" == aTorFileType) + path = "Contents/Resources/TorBrowser/Tor/tor"; + else if ("torrc-defaults" == aTorFileType) + path = "Contents/Resources/TorBrowser/Tor/torrc-defaults"; + else if ("torrc" == aTorFileType) + path = "Tor/torrc"; + else if ("tordatadir" == aTorFileType) + path = "Tor"; + } + else // Linux and others. + { + if ("tor" == aTorFileType) + path = "TorBrowser/Tor/tor"; + else if ("torrc-defaults" == aTorFileType) + path = "TorBrowser/Tor/torrc-defaults"; + else if ("torrc" == aTorFileType) + path = "Tor/torrc"; + else if ("tordatadir" == aTorFileType) + path = "Tor"; + } + } + else if (TorLauncherUtil.isWindows) + { + // This block is used for the non-TorBrowser-Data/ case. if ("tor" == aTorFileType) path = "Tor\\tor.exe"; else if ("torrc-defaults" == aTorFileType) @@ -672,6 +723,7 @@ TorProcessService.prototype = } else // Linux, Mac OS and others. { + // This block is also used for the non-TorBrowser-Data/ case. if ("tor" == aTorFileType) path = "Tor/tor"; else if ("torrc-defaults" == aTorFileType) @@ -679,7 +731,7 @@ TorProcessService.prototype = else if ("torrc" == aTorFileType) path = "Data/Tor/torrc"; else if ("tordatadir" == aTorFileType) - path = "Data/Tor/"; + path = "Data/Tor"; } } @@ -688,51 +740,20 @@ TorProcessService.prototype = try { - var f; + let f; if (isRelativePath) { - // Turn into an absolute path. - if (!this.mTorFileBaseDir) + // Turn 'path' into an absolute path. + if (this._isUserDataOutsideOfAppDir) { - var topDir; - var appInfo = Cc["@mozilla.org/xre/app-info;1"] - .getService(Ci.nsIXULAppInfo); - if (appInfo.ID == this.kThunderbirdID || appInfo.ID == this.kInstantbirdID) - { - topDir = Cc["@mozilla.org/file/directory_service;1"] - .getService(Ci.nsIProperties).get("CurProcD", Ci.nsIFile); - topDir.append("extensions"); - topDir.append(this.kTorLauncherExtPath); - } - else - { - // For Firefox, paths are relative to the top of the TBB install. - var tbbBrowserDepth = 0; // Windows and Linux - if (TorLauncherUtil.isAppVersionAtLeast("21.0")) - { - // In FF21+, CurProcD is the "browser" directory that is next to - // the firefox binary, e.g., <TorFileBaseDir>/Browser/browser - ++tbbBrowserDepth; - } - if (TorLauncherUtil.isMac) - tbbBrowserDepth += 2; - - topDir = Cc["@mozilla.org/file/directory_service;1"] - .getService(Ci.nsIProperties).get("CurProcD", Ci.nsIFile); - while (tbbBrowserDepth > 0) - { - var didRemove = (topDir.leafName != "."); - topDir = topDir.parent; - if (didRemove) - tbbBrowserDepth--; - } - } - - topDir.append("TorBrowser"); - this.mTorFileBaseDir = topDir; + let baseDir = isUserData ? this._dataDir : this._appDir; + f = baseDir.clone(); + } + else + { + f = this._appDir.clone(); + f.append("TorBrowser"); } - - f = this.mTorFileBaseDir.clone(); f.appendRelativePath(path); } else @@ -741,6 +762,22 @@ TorProcessService.prototype = f.initWithPath(path); } + if (!f.exists() && aCreate) + { + try + { + if ("tordatadir" == aTorFileType) + f.create(f.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY); + else + f.create(f.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE); + } + catch (e) + { + TorLauncherLogger.safelog(4, "unable to create " + f.path + ": ", e); + return null; + } + } + if (f.exists()) { try { f.normalize(); } catch(e) {} @@ -759,6 +796,83 @@ TorProcessService.prototype = return null; // File not found or error (logged above). }, // _getTorFile() + get _isUserDataOutsideOfAppDir() + { + if (this.mIsUserDataOutsideOfAppDir == undefined) + { + // Determine if we are using a "side-by-side" data model by checking + // for the existence of the TorBrowser-Data/ directory. + try + { + let f = this._appDir.parent; + f.append("TorBrowser-Data"); + this.mIsUserDataOutsideOfAppDir = f.exists() && f.isDirectory(); + } + catch (e) + { + this.mIsUserDataOutsideOfAppDir = false; + } + } + + return this.mIsUserDataOutsideOfAppDir; + }, // get _isUserDataOutsideOfAppDir + + // Returns an nsIFile that points to the application directory. + // May throw. + get _appDir() + { + if (!this.mAppDir) + { + let topDir = Cc["@mozilla.org/file/directory_service;1"] + .getService(Ci.nsIProperties).get("CurProcD", Ci.nsIFile); + let appInfo = Cc["@mozilla.org/xre/app-info;1"] + .getService(Ci.nsIXULAppInfo); + if ((appInfo.ID == this.kThunderbirdID) || + (appInfo.ID == this.kInstantbirdID)) + { + // For TorBirdy and Tor Messenger the Tor Launcher extension + // directory is returned. + topDir.append("extensions"); + topDir.append(this.kTorLauncherExtPath); + } + else // Tor Browser + { + // On Linux and Windows, we want to return the Browser/ directory. + // Because topDir ("CurProcD") points to Browser/browser on those + // platforms, we need to go up one level. + // On Mac OS, we want to return the TorBrowser.app/ directory. + // Because topDir points to Contents/Resources/browser on Mac OS, + // we need to go up 3 levels. + let tbbBrowserDepth = (TorLauncherUtil.isMac) ? 3 : 1; + while (tbbBrowserDepth > 0) + { + let didRemove = (topDir.leafName != "."); + topDir = topDir.parent; + if (didRemove) + tbbBrowserDepth--; + } + } + + this.mAppDir = topDir; + } + + return this.mAppDir; + }, // get _appDir + + // Returns an nsIFile that points to the TorBrowser-Data/ directory. + // May throw. + get _dataDir() + { + if (!this.mDataDir) + { + let f = this._appDir.parent.clone(); + f.append("TorBrowser-Data"); + this.mDataDir = f; + } + + return this.mDataDir; + }, // get _dataDir + _getpid: function() { // Use nsIXULRuntime.processID if it is available. diff --git a/src/defaults/preferences/prefs.js b/src/defaults/preferences/prefs.js index 34bf1a7..ac1af21 100644 --- a/src/defaults/preferences/prefs.js +++ b/src/defaults/preferences/prefs.js @@ -8,8 +8,15 @@ pref("extensions.torlauncher.control_port", 9151); pref("extensions.torlauncher.start_tor", true); pref("extensions.torlauncher.prompt_at_startup", true); -// All path prefs. are relative to the firefox executable's directory +// The tor_path is relative to the application directory. On Linux and +// Windows this is the Browser/ directory that contains the firefox +// executables, and on Mac OS it is the TorBrowser.app directory. pref("extensions.torlauncher.tor_path", ""); + +// The torrc_path and tordatadir_path are relative to the data directory, +// which is TorBrowser-Data/ if it exists as a sibling of the application +// directory. If TorBrowser-Data/ does not exist, these paths are relative +// to the TorBrowser/ directory within the application directory. pref("extensions.torlauncher.torrc_path", ""); pref("extensions.torlauncher.tordatadir_path", "");

1 0

[tor-launcher/maint-0.2.9] Bug 10534: Let's not advertise help desk emails directly
by gk＠torproject.org 21 Apr '16

21 Apr '16

commit 8d94cc4e5de9bdce74fce3a7d5e1a438b435b7d2 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Apr 12 11:27:10 2016 -0400 Bug 10534: Let's not advertise help desk emails directly Do not display the help(a)rt.torproject.org email address (currently, no one is responding to help desk email). In the wizard and network settings window, point users to torproject.org/about/contact.html#support for assistance. --- src/chrome/content/network-settings-overlay.xul | 4 +++- src/chrome/content/network-settings.js | 8 +++++--- src/chrome/locale/en/network-settings.dtd | 2 +- src/chrome/locale/en/torlauncher.properties | 1 + 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index af9ddf9..10751d1 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -1,6 +1,6 @@ <?xml version="1.0"?>  @@ -118,10 +118,12 @@ <html:div>&torsettings.bridgeHelp3.emailDesc;</html:div> <html:div>&torsettings.bridgeHelp3.emailList;</html:div> </html:li> + </html:ol> </vbox> <panel id="copyLogFeedbackPanel" type="arrow" fade="slow" diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index f4ed746..2736f08 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -1,4 +1,4 @@ -// Copyright (c) 2015, The Tor Project, Inc. +// Copyright (c) 2016, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -19,7 +19,9 @@ const kPrefDefaultBridgeRecommendedType = "extensions.torlauncher.default_bridge_recommended_type"; const kPrefDefaultBridgeType = "extensions.torlauncher.default_bridge_type"; -const kSupportAddr = "help(a)rt.torproject.org"; +// As of April 2016, no one is responding to help desk email. Hopefully this will change soon. +//const kSupportAddr = "help(a)rt.torproject.org"; +const kSupportURL = "torproject.org/about/contact.html#support"; const kTorProcessReadyTopic = "TorProcessIsReady"; const kTorProcessExitedTopic = "TorProcessExited"; @@ -79,7 +81,7 @@ function initDialog() if (forAssistance) { forAssistance.textContent = TorLauncherUtil.getFormattedLocalizedString( - "forAssistance", [kSupportAddr], 1); + "forAssistance2", [kSupportURL], 1); } var cancelBtn = document.documentElement.getButton("cancel"); diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 0ef4437..6b471a3 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.

1 0

[tor-launcher/master] Bug 10534: Let's not advertise help desk emails directly
by gk＠torproject.org 21 Apr '16

21 Apr '16

commit 3635ee8a79bc1ef6457250082d3937d7f1633911 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Apr 12 11:27:10 2016 -0400 Bug 10534: Let's not advertise help desk emails directly Do not display the help(a)rt.torproject.org email address (currently, no one is responding to help desk email). In the wizard and network settings window, point users to torproject.org/about/contact.html#support for assistance. --- src/chrome/content/network-settings-overlay.xul | 4 +++- src/chrome/content/network-settings.js | 8 +++++--- src/chrome/locale/en/network-settings.dtd | 2 +- src/chrome/locale/en/torlauncher.properties | 1 + 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index af9ddf9..10751d1 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -1,6 +1,6 @@ <?xml version="1.0"?>  @@ -118,10 +118,12 @@ <html:div>&torsettings.bridgeHelp3.emailDesc;</html:div> <html:div>&torsettings.bridgeHelp3.emailList;</html:div> </html:li> + </html:ol> </vbox> <panel id="copyLogFeedbackPanel" type="arrow" fade="slow" diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index d145f77..e0d7d1c 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -1,4 +1,4 @@ -// Copyright (c) 2015, The Tor Project, Inc. +// Copyright (c) 2016, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -23,7 +23,9 @@ const kPrefDefaultBridgeRecommendedType = "extensions.torlauncher.default_bridge_recommended_type"; const kPrefDefaultBridgeType = "extensions.torlauncher.default_bridge_type"; -const kSupportAddr = "help(a)rt.torproject.org"; +// As of April 2016, no one is responding to help desk email. Hopefully this will change soon. +//const kSupportAddr = "help(a)rt.torproject.org"; +const kSupportURL = "torproject.org/about/contact.html#support"; const kTorProcessReadyTopic = "TorProcessIsReady"; const kTorProcessExitedTopic = "TorProcessExited"; @@ -89,7 +91,7 @@ function initDialogCommon(aHasQuitButton) if (forAssistance) { forAssistance.textContent = TorLauncherUtil.getFormattedLocalizedString( - "forAssistance", [kSupportAddr], 1); + "forAssistance2", [kSupportURL], 1); } if (aHasQuitButton) diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 0ef4437..6b471a3 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.

1 0

[tor-launcher/maint-0.2.7] Bug 10534: Let's not advertise help desk emails directly
by gk＠torproject.org 21 Apr '16

21 Apr '16

commit 7c51ef35a36ede48dd00d2269d5a953ab150b217 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Apr 12 11:27:10 2016 -0400 Bug 10534: Let's not advertise help desk emails directly Do not display the help(a)rt.torproject.org email address (currently, no one is responding to help desk email). In the wizard and network settings window, point users to torproject.org/about/contact.html#support for assistance. --- src/chrome/content/network-settings-overlay.xul | 4 +++- src/chrome/content/network-settings.js | 8 +++++--- src/chrome/locale/en/network-settings.dtd | 2 +- src/chrome/locale/en/torlauncher.properties | 1 + 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index af9ddf9..10751d1 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -1,6 +1,6 @@ <?xml version="1.0"?>  @@ -118,10 +118,12 @@ <html:div>&torsettings.bridgeHelp3.emailDesc;</html:div> <html:div>&torsettings.bridgeHelp3.emailList;</html:div> </html:li> + </html:ol> </vbox> <panel id="copyLogFeedbackPanel" type="arrow" fade="slow" diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index e4ebeaa..561f0b4 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -1,4 +1,4 @@ -// Copyright (c) 2015, The Tor Project, Inc. +// Copyright (c) 2016, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -19,7 +19,9 @@ const kPrefDefaultBridgeRecommendedType = "extensions.torlauncher.default_bridge_recommended_type"; const kPrefDefaultBridgeType = "extensions.torlauncher.default_bridge_type"; -const kSupportAddr = "help(a)rt.torproject.org"; +// As of April 2016, no one is responding to help desk email. Hopefully this will change soon. +//const kSupportAddr = "help(a)rt.torproject.org"; +const kSupportURL = "torproject.org/about/contact.html#support"; const kTorProcessReadyTopic = "TorProcessIsReady"; const kTorProcessExitedTopic = "TorProcessExited"; @@ -76,7 +78,7 @@ function initDialog() if (forAssistance) { forAssistance.textContent = TorLauncherUtil.getFormattedLocalizedString( - "forAssistance", [kSupportAddr], 1); + "forAssistance2", [kSupportURL], 1); } var cancelBtn = document.documentElement.getButton("cancel"); diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 07d3d09..9939cdb 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -54,7 +54,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 02be756..15d965c 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 20 Apr '16

20 Apr '16

commit 08b28fedbf5eb3a57fb1f5a2e38a830366d5f78d Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Apr 20 11:12:20 2016 -0400 fixup! TB4: Tor Browser's Firefox preference overrides. Disable the WebGL failIfMajorPerformanceCaveat feature because it can be used as a fingerprinting vector (bug 18603). --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 15f7d14..4935bcd 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -101,6 +101,7 @@ pref("privacy.trackingprotection.pbmode.enabled", false); // Fingerprinting pref("webgl.min_capability_mode", true); pref("webgl.disable-extensions", true); +pref("webgl.disable-fail-if-major-performance-caveat", true); pref("dom.battery.enabled", false); // fingerprinting due to differing OS implementations pref("dom.network.enabled",false); // fingerprinting due to differing OS implementations pref("browser.display.max_font_attempts",10);

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 20 Apr '16

20 Apr '16

commit 5d9a6f8007e36a0276f3333fd5bcad2ffe69a2f7 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 20 09:35:56 2016 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Disabling additional startup URLs (bug 18848) --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 3b859bc..15f7d14 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -8,6 +8,9 @@ pref("browser.search.update", false); pref("browser.rights.3.shown", true); pref("startup.homepage_welcome_url", ""); +pref("startup.homepage_welcome_url.additional", ""); +// Not set Windows 10 users would get a special introduction on first start. +pref("browser.usedOnWindows10", true); // Set a generic, default URL that will be opened in a tab after an update. // Typically, this will not be used; instead, the <update> element within

1 0

[tor-browser-bundle/master] Bug 16224: No need to set BUILD_HOSTNAME anymore
by gk＠torproject.org 20 Apr '16

20 Apr '16

commit aa737d315bab537d94a14d7f2dca16d7b54edc38 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 19 08:58:05 2016 +0000 Bug 16224: No need to set BUILD_HOSTNAME anymore Mozilla got rid of exposing the hostname of the machine that built Firefox in https://bugzilla.mozilla.org/show_bug.cgi?id=1168316. We therefore don't need to set it anymore to avoid reproducibility issues. --- gitian/descriptors/linux/gitian-firefox.yml | 2 +- gitian/descriptors/mac/gitian-firefox.yml | 2 +- gitian/descriptors/windows/gitian-firefox.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index b206bf5..22dcbd4 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -115,7 +115,7 @@ script: | export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" export FAKETIME_SKIP_CMDS="python2.7,bash,make" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build + make $MAKEOPTS -f client.mk build # Packaging is broken with libfaketime enabled, thus we disable it again. See # #12461 comments 11 and 12 for details. export LD_PRELOAD="" diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 601a095..17c4c8b 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -76,7 +76,7 @@ script: | # stall otherwise right at the beginning. See #13877 for details. export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" export FAKETIME_SKIP_CMDS="python2.7,rsync,make" - make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build + make $MAKEOPTS -f client.mk build # make -C obj-macos package INNER_MAKE_PACKAGE=true cp -a obj-macos/dist/firefox/* $INSTDIR diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index 7358922..2686c5f 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -100,7 +100,7 @@ script: | # stall otherwise right at the beginning. See #13877 for details. export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" export FAKETIME_SKIP_CMDS="python2.7,make" - make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build + make $MAKEOPTS -f client.mk build # make -C obj-* package INNER_MAKE_PACKAGE=true cp -a obj-*/dist/firefox/* $INSTDIR/Browser/

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] fixup! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 19 Apr '16

19 Apr '16

commit 833436c0e36649d47df22567b23343c76985243a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 31 12:43:33 2016 +0000 fixup! TB3: Tor Browser's official .mozconfigs. Bug 18331: Update .mozconfig for new cross-compiler --- .mozconfig-mac | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/.mozconfig-mac b/.mozconfig-mac index dc77c3b..c5ca087 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -1,28 +1,45 @@ -CROSS_COMPILE=1 +# ld needs libLTO.so from llvm +mk_add_options "export LD_LIBRARY_PATH=$topsrcdir/clang/lib" -SYSROOTDIR="$HOME/build/MacOSX10.7.sdk" -CROSS_PRIVATE_FRAMEWORKS="$SYSROOTDIR/System/Library/PrivateFrameworks" -ROOTDIR="$HOME/build/x-tools/x86_64-apple-darwin10/bin" -TOOLCHAIN_PREFIX="$ROOTDIR/x86_64-apple-darwin10-" +CROSS_CCTOOLS_PATH=$topsrcdir/cctools +CROSS_SYSROOT=$topsrcdir/MacOSX10.7.sdk +CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks +FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT" -FLAGS="-arch x86_64 -isysroot $SYSROOTDIR" -CC="$ROOTDIR/x86_64-apple-darwin10-clang $FLAGS" -CXX="$ROOTDIR/x86_64-apple-darwin10-clang++ $FLAGS" +export CC="$topsrcdir/clang/bin/clang $FLAGS" +export CXX="$topsrcdir/clang/bin/clang++ $FLAGS" +export CPP="$topsrcdir/clang/bin/clang $FLAGS -E" +export LLVMCONFIG=$topsrcdir/clang/bin/llvm-config +export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip" +export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin10- +#TODO: bug 1184202 - would be nice if these could be detected with TOOLCHAIN_PREFIX automatically +export AR=${TOOLCHAIN_PREFIX}ar +export RANLIB=${TOOLCHAIN_PREFIX}ranlib +export STRIP=${TOOLCHAIN_PREFIX}strip +export OTOOL=${TOOLCHAIN_PREFIX}otool +export DSYMUTIL=$topsrcdir/clang/bin/llvm-dsymutil + +export HOST_CC="$topsrcdir/clang/bin/clang" +export HOST_CXX="$topsrcdir/clang/bin/clang++" +export HOST_CPP="$topsrcdir/clang/bin/clang -E" +export HOST_CFLAGS="-g" +export HOST_CXXFLAGS="-g" +export HOST_LDFLAGS="-g" + +ac_add_options --target=x86_64-apple-darwin +ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-macos mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 -ac_add_options --target=x86_64-apple-darwin10 ac_add_options --enable-application=browser ac_add_options --enable-strip ac_add_options --enable-official-branding ac_add_options --enable-optimize ac_add_options --disable-debug -ac_add_options --with-macos-private-frameworks="$CROSS_PRIVATE_FRAMEWORKS" - ac_add_options --enable-tor-browser-data-outside-app-dir ac_add_options --enable-tor-browser-update ac_add_options --enable-update-packaging

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 19 Apr '16

19 Apr '16

commit be482a800166d85c2f52d39f34c1d620abc07c87 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 19 13:31:25 2016 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. We disable Selfsupport and Unified Telemetry (and set another datareporting URL to "data:text/plain,"). This is bug 18738. --- browser/app/profile/000-tor-browser.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 6ec7c26..3b859bc 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -72,6 +72,10 @@ pref("datareporting.policy.dataSubmissionEnabled", false); // Don't fetch a localized remote page that Tor Browser interacts with, see // #16727. And, yes, it is "reportUrl" and not "reportURL". pref("datareporting.healthreport.about.reportUrl", "data:text/plain,"); +// Make sure Selfsupport and Unified Telemetry are really disabled, see: #18738. +pref("datareporting.healthreport.about.reportUrlUnified", "data:text/plain,"); +pref("browser.selfsupport.enabled", false); +pref("toolkit.telemetry.unified", false); pref("security.mixed_content.block_active_content", false); // Disable until https://bugzilla.mozilla.org/show_bug.cgi?id=878890 is patched pref("browser.syncPromoViewsLeftMap", "{\"addons\":0, \"passwords\":0, \"bookmarks\":0}"); // Don't promote sync pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or tabs with other browsers

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 19 Apr '16

19 Apr '16

commit 60916de81de12775e7d172b0cb46b9d71b3f6736 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 18 13:59:00 2016 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Enforce SHA1 deprecation (bug 18042) --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 7d05149..6ec7c26 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -268,6 +268,9 @@ pref("security.tls.unrestricted_rc4_fallback", false); // Enforce certificate pinning, see: https://bugs.torproject.org/16206 pref("security.cert_pinning.enforcement_level", 2); +// Enforce SHA1 deprecation, see: bug 18042. +pref("security.pki.sha1_enforcement_level", 2); + // Workaround for https://bugs.torproject.org/13579. Progress on // `about:downloads` is only shown if the following preference is set to `true` // in case the download panel got removed from the toolbar.

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] Bug 13419: Fix ICU cross-compilation for Windows
by gk＠torproject.org 19 Apr '16

19 Apr '16

commit 76b0760ee1315c1d726673d99ecd3f277671132b Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 18 09:27:11 2016 +0000 Bug 13419: Fix ICU cross-compilation for Windows This patch fixes bug 16874 and 18767 as well. --- .mozconfig-mingw | 3 --- build/autoconf/icu.m4 | 4 ---- config/external/icu/Makefile.in | 2 +- intl/icu/source/config/mh-mingw | 4 ++-- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.mozconfig-mingw b/.mozconfig-mingw index 392a910..c40881c 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -18,9 +18,6 @@ ac_add_options --enable-update-packaging ac_add_options --enable-signmar ac_add_options --enable-verify-mar -# ICU seems still to have cross-compiling issues: -# https://bugzilla.mozilla.org/show_bug.cgi?id=1019744#c19 -ac_add_options --without-intl-api # We can't build the sandbox code with mingw-w64: # https://bugzilla.mozilla.org/show_bug.cgi?id=1042426 ac_add_options --disable-sandbox diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4 index 65d10cd..ada0ed6 100644 --- a/build/autoconf/icu.m4 +++ b/build/autoconf/icu.m4 @@ -79,10 +79,6 @@ if test -n "$USE_ICU"; then fi MOZ_ICU_VERSION="$version" - if test "$OS_TARGET" = WINNT; then - MOZ_SHARED_ICU=1 - fi - if test -z "${JS_STANDALONE}" -a -n "${JS_SHARED_LIBRARY}${MOZ_NATIVE_ICU}"; then MOZ_SHARED_ICU=1 fi diff --git a/config/external/icu/Makefile.in b/config/external/icu/Makefile.in index 7781b23..b6a57eb 100644 --- a/config/external/icu/Makefile.in +++ b/config/external/icu/Makefile.in @@ -26,7 +26,7 @@ ifdef USE_ICU else # !MOZ_SHARED_ICU ifeq ($(OS_ARCH),WINNT) ICU_LIB_RENAME = $(foreach libname,$(ICU_LIB_NAMES),\ - cp -p $(DEPTH)/intl/icu/target/lib/s$(libname)$(MOZ_ICU_DBG_SUFFIX).lib $(DEPTH)/intl/icu/target/lib/$(libname)$(MOZ_ICU_DBG_SUFFIX).lib;) + cp -p $(DEPTH)/intl/icu/target/lib/libs$(libname)$(MOZ_ICU_DBG_SUFFIX).a $(DEPTH)/intl/icu/target/lib/lib$(libname)$(MOZ_ICU_DBG_SUFFIX).a;) endif endif # MOZ_SHARED_ICU endif # !MOZ_NATIVE_ICU diff --git a/intl/icu/source/config/mh-mingw b/intl/icu/source/config/mh-mingw index 5e6acad..9559c10 100644 --- a/intl/icu/source/config/mh-mingw +++ b/intl/icu/source/config/mh-mingw @@ -66,13 +66,13 @@ SO_TARGET_VERSION_SUFFIX = endif # Static library prefix and file extension -LIBSICU = lib$(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) +LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) A = a ## An import library is needed for z/OS and MSVC IMPORT_LIB_EXT = .dll.a -LIBPREFIX= +LIBPREFIX=lib # Change the stubnames so that poorly working FAT disks and installation programs can work. # This is also for backwards compatibility.

1 0

[tor-browser-bundle/master] Switching over to ESR45 in nightly builds
by gk＠torproject.org 19 Apr '16

19 Apr '16

commit e76404c172298aba06cfe8b6e4e5ed95fac8bc98 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 19 08:05:47 2016 +0000 Switching over to ESR45 in nightly builds Bumping NoScript version and ESR version Tor Browser is using --- gitian/versions.nightly | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index e0bc33c..bf2e2a6 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,11 +17,11 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=38.7.1esr +FIREFOX_VERSION=45.0.2esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.x-1 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master @@ -72,7 +72,7 @@ GO_VER=1.4.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.10-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.11-fn+sm+fx.xpi TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -103,7 +103,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=9861b1e0bf5d12f773f4b26c3268d4257c3dc47a27b732ad4c280cd34bf45dd8 +NOSCRIPT_HASH=fdd965a69188ac651b08a7d3ada54821a89db10a4685aa73ba59edc0b8243390 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Bug 18699: Stripping fails due to missing Browser/components
by gk＠torproject.org 19 Apr '16

19 Apr '16

commit b88da4141fa6b0b423047023939f151890e4af70 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 1 07:16:19 2016 +0000 Bug 18699: Stripping fails due to missing Browser/components --- gitian/descriptors/linux/gitian-firefox.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 6398af5..b206bf5 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -156,7 +156,7 @@ script: | # Strip and generate debuginfo for the firefox binary that we keep, all *.so # files, the plugin-container, and the updater (see ticket #10126) cd $INSTDIR - for LIB in Browser/*.so Browser/webapprt-stub Browser/firefox Browser/plugin-container Browser/components/*.so Browser/browser/components/*.so Browser/updater + for LIB in Browser/*.so Browser/webapprt-stub Browser/firefox Browser/plugin-container Browser/browser/components/*.so Browser/updater do objcopy --only-keep-debug $LIB Debug/$LIB strip $LIB

1 0

[tor-browser-bundle/master] Bump mingw-w64 version for nightlies
by gk＠torproject.org 19 Apr '16

19 Apr '16

commit 97dc7b3f74282270a3f8dc11b79e62fae450a83f Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 19 07:53:42 2016 +0000 Bump mingw-w64 version for nightlies --- gitian/versions.nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index a300a51..e0bc33c 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -32,7 +32,7 @@ LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74 # r247539 CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539 -MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 +MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 PYPTLIB_TAG=master OBFSPROXY_TAG=master LIBFTE_TAG=master

1 0

[tor-browser-bundle/master] Bug 18331: Update OS X toolchain for ESR 45
by gk＠torproject.org 19 Apr '16

19 Apr '16

commit 128bcfb6f781adb8cfaff2815a191432ce0d62b5 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 31 13:52:34 2016 +0000 Bug 18331: Update OS X toolchain for ESR 45 Our old cross-compiler does not cope with ICU changes made in ESR 45. We switch to the tools Mozilla uses itself instead of creating new ones based solely on crosstools-ng. This has a number of advantages. The most important ones are: 1) Using the same toolchain as Mozilla (even if they are not using it in official builds) gives us a high degree of confidence that bugfix releases will work with our cross-compiler. 2) Using clang both as the host and cross-compiler makes building GCC just for being used as host compiler in our Ubuntu Precise environment superfluous. To make it easier compiling clang from source this patch set switches to Debian Wheezy for the Gitian VMs used to build Tor Browser for OS X. This fixes #18690. --- gitian/build-helpers/ddmg.sh | 2 +- gitian/descriptors/mac/gitian-bundle.yml | 4 ++- gitian/descriptors/mac/gitian-firefox.yml | 23 ++++++--------- .../mac/gitian-pluggable-transports.yml | 3 +- gitian/descriptors/mac/gitian-tor.yml | 3 +- gitian/descriptors/mac/gitian-utils.yml | 32 ++++++++++++++------- gitian/fetch-inputs.sh | 15 ++++++++-- gitian/gpg/cmake.gpg | Bin 0 -> 16939 bytes gitian/mkbundle-mac.sh | 9 +++--- gitian/record-inputs.sh | 2 +- gitian/verify-tags.sh | 5 +++- gitian/versions | 3 -- gitian/versions.alpha | 3 -- gitian/versions.beta | 3 -- gitian/versions.nightly | 10 +++++-- 15 files changed, 69 insertions(+), 48 deletions(-) diff --git a/gitian/build-helpers/ddmg.sh b/gitian/build-helpers/ddmg.sh index c37a1fd..cb513e8 100755 --- a/gitian/build-helpers/ddmg.sh +++ b/gitian/build-helpers/ddmg.sh @@ -15,7 +15,7 @@ cd $@ find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > ~/build/filelist.txt find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> ~/build/filelist.txt -mkisofs -D -V "Tor Browser" -no-pad -R -apple -o ~/build/tbb-uncompressed.dmg -path-list ~/build/filelist.txt -graft-points -gid 20 -dir-mode 0750 -new-dir-mode 0750 +genisoimage -D -V "Tor Browser" -no-pad -R -apple -o ~/build/tbb-uncompressed.dmg -path-list ~/build/filelist.txt -graft-points -gid 20 -dir-mode 0750 -new-dir-mode 0750 cd ~/build diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index a7ef7bc..00cd4d1 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -1,7 +1,8 @@ --- name: "bundle-mac" +distro: "debian" suites: -- "precise" +- "wheezy" architectures: - "amd64" packages: @@ -12,6 +13,7 @@ packages: - "python-lxml" - "libxml2-utils" - "sqlite3" +- "rsync" # Needed for the .dmgs - "genisoimage" - "cmake" diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 1a35eab..601a095 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -1,13 +1,15 @@ --- name: "torbrowser-mac" +distro: "debian" suites: -- "precise" +- "wheezy" architectures: - "amd64" packages: - "autoconf2.13" - "unzip" - "yasm" +- "rsync" - "zip" reference_datetime: "2000-01-01 00:00:00" remotes: @@ -16,9 +18,9 @@ remotes: - "url": "https://github.com/wolfcw/libfaketime" "dir": "faketime" files: -- "gcc-linux64-precise-utils.zip" +- "clang-linux64-wheezy-utils.zip" +- "cctools.tar.gz" - "MacOSX10.7.sdk.tar.gz" -- "x86_64-apple-darwin10.tar.xz" - "re-dzip.sh" - "dzip.sh" - "fix-info-plist.py" @@ -46,18 +48,11 @@ script: | export FAKETIME=$REFERENCE_DATETIME cd .. - unzip -d $INSTDIR ~/build/gcc-linux64-precise-utils.zip - # We need a link to our GCC, otherwise the system cc gets used which points to - # /usr/bin/gcc. - ln -s gcc $INSTDIR/gcc/bin/cc - export LD_LIBRARY_PATH=$INSTDIR/gcc/lib64 - # XXX: cross-compiler path is needed for ICU - export PATH=/home/ubuntu/build/x-tools/x86_64-apple-darwin10/bin:$INSTDIR/gcc/bin:$PATH - - tar xaf x86_64-apple-darwin10.tar.xz - tar xaf MacOSX10.7.sdk.tar.gz - # cd tor-browser + # Extracting all the necessary tools + tar xaf ../MacOSX10.7.sdk.tar.gz + tar xaf ../cctools.tar.gz + unzip ../clang-linux64-wheezy-utils.zip TB_COMMIT_DATE=$(git show -s --format='%ci') COPYRIGHT_YEAR=${TB_COMMIT_DATE%%-*} mv .mozconfig-mac .mozconfig diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 5a578ba..e2b51c4 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -1,7 +1,8 @@ --- name: "pluggable-transports-mac" +distro: "debian" suites: -- "precise" +- "wheezy" architectures: - "i386" packages: diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index bbcf8c3..94d3eb1 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -1,7 +1,8 @@ --- name: "tor-mac" +distro: "debian" suites: -- "precise" +- "wheezy" architectures: - "i386" packages: diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index d457fef..5288471 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -1,7 +1,8 @@ --- name: "utils-mac" +distro: "debian" suites: -- "precise" +- "wheezy" architectures: - "i386" - "amd64" @@ -10,18 +11,21 @@ packages: - "automake" - "libtool" - "zip" -# Needed for compiling GCC. -- "libmpc-dev" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/libevent/libevent.git" "dir": "libevent" - "url": "https://github.com/wolfcw/libfaketime" "dir": "faketime" +- "url": "https://github.com/llvm-mirror/llvm" + "dir": "llvm" +- "url": "https://github.com/llvm-mirror/clang" + "dir": "clang" +- "url": "https://cmake.org/cmake.git" + "dir": "cmake" files: - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" -- "gcc.tar.bz2" - "openssl.tar.gz" - "gmp.tar.bz2" - "versions" @@ -36,15 +40,23 @@ script: | if [ $GBUILD_BITS == "64" ]; then - # Building GCC. We need this as Firefox ESR 38 has GCC 4.7 as minimum - # requirement for the host compiler but Ubuntu Precise is only shipping 4.6. - tar xaf gcc.tar.bz2 - cd gcc-* - ./configure --prefix=$INSTDIR/gcc --disable-multilib --enable-languages=c,c++ + # Cmake first + cd cmake + ./bootstrap --prefix=$INSTDIR/cmake + make $MAKEOPTS + make install + export PATH=$PATH:$INSTDIR/cmake/bin + # Clang + cd ../llvm + mv ../clang tools/ + export LLVM_HOME=`pwd` + mkdir build + cd build + cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$INSTDIR/clang -DCMAKE_BUILD_TYPE:STRING=Release $LLVM_HOME make $MAKEOPTS make install cd $INSTDIR - ~/build/dzip.sh gcc-$GCC_VER-linux64-precise-utils.zip gcc + ~/build/dzip.sh clang-$CLANG_VER-linux64-wheezy-utils.zip clang cp *utils.zip $OUTDIR/ else # Building libfaketime. diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 7c9daee..b423b48 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -6,6 +6,7 @@ MIRROR_URL=https://people.torproject.org/~mikeperry/mirrors/sources/ MIRROR_URL_DCF=https://people.torproject.org/~dcf/mirrors/sources/ MIRROR_URL_ASN=https://people.torproject.org/~asn/mirrors/sources/ +MIRROR_URL_GK=https://people.torproject.org/~gk/mirrors/sources/ set -e set -u umask 0022 @@ -131,13 +132,20 @@ do fi done -for i in TOOLCHAIN4 TOOLCHAIN4_OLD OSXSDK OSXSDK_OLD MSVCR100 +for i in TOOLCHAIN4_OLD OSXSDK OSXSDK_OLD MSVCR100 do PACKAGE="${i}_PACKAGE" URL="${MIRROR_URL}${!PACKAGE}" get "${!PACKAGE}" "${MIRROR_URL}${!PACKAGE}" done +for i in CCTOOLS +do + PACKAGE="${i}_PACKAGE" + URL="${MIRROR_URL_GK}${!PACKAGE}" + get "${!PACKAGE}" "${MIRROR_URL_GK}${!PACKAGE}" +done + # XXX: Omit googlecode.com packages because Google won't allow wget -N # and because the download seems to 404 about 50% of the time. for i in ARGPARSE @@ -166,7 +174,7 @@ wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4_OLD CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -257,6 +265,9 @@ https-everywhere https://git.torproject.org/https-everywhere.git $HTTPSE_TA torbutton https://git.torproject.org/torbutton.git $TORBUTTON_TAG tor-launcher https://git.torproject.org/tor-launcher.git $TORLAUNCHER_TAG tor-browser https://git.torproject.org/tor-browser.git $TORBROWSER_TAG +cmake https://cmake.org/cmake.git $CMAKE_TAG +llvm https://github.com/llvm-mirror/llvm $LLVM_TAG +clang https://github.com/llvm-mirror/clang $CLANG_TAG mingw-w64-git http://git.code.sf.net/p/mingw-w64/mingw-w64 $MINGW_TAG pyptlib https://git.torproject.org/pluggable-transports/pyptlib.git $PYPTLIB_TAG obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git $OBFSPROXY_TAG diff --git a/gitian/gpg/cmake.gpg b/gitian/gpg/cmake.gpg new file mode 100644 index 0000000..51f19e7 Binary files /dev/null and b/gitian/gpg/cmake.gpg differ diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 682e02f..eaec986 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -131,11 +131,12 @@ then PYPTLIB_TAG=refs/tags/$PYPTLIB_TAG OBFSPROXY_TAG=refs/tags/$OBFSPROXY_TAG OBFS4_TAG=refs/tags/$OBFS4_TAG + CMAKE_TAG=refs/tags/$CMAKE_TAG fi cd $GITIAN_DIR -if [ ! -f inputs/gcc-$GCC_VER-linux64-precise-utils.zip -o \ +if [ ! -f inputs/clang-$CLANG_VER-linux64-wheezy-utils.zip -o \ ! -f inputs/openssl-$OPENSSL_VER-mac64-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-mac64-utils.zip -o \ ! -f inputs/gmp-$GMP_VER-mac64-utils.zip ]; @@ -143,7 +144,7 @@ then echo echo "****** Starting Utilities Component of Mac Bundle (1/5 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libevent=$LIBEVENT_TAG,faketime=$FAKETIME_TAG $DESCRIPTOR_DIR/mac/gitian-utils.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libevent=$LIBEVENT_TAG,faketime=$FAKETIME_TAG,cmake=$CMAKE_TAG,llvm=$LLVM_TAG,clang=$CLANG_TAG $DESCRIPTOR_DIR/mac/gitian-utils.yml if [ $? -ne 0 ]; then #mv var/build.log ./utils-fail-mac.log.`date +%Y%m%d%H%M%S` @@ -152,7 +153,7 @@ then cd inputs cp -a ../build/out/*-utils.zip . - ln -sf gcc-$GCC_VER-linux64-precise-utils.zip gcc-linux64-precise-utils.zip + ln -sf clang-$CLANG_VER-linux64-wheezy-utils.zip clang-linux64-wheezy-utils.zip ln -sf openssl-$OPENSSL_VER-mac64-utils.zip openssl-mac64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-mac64-utils.zip libevent-mac64-utils.zip ln -sf gmp-$GMP_VER-mac64-utils.zip gmp-mac64-utils.zip @@ -166,7 +167,7 @@ else # We might have built the utilities in the past but maybe the links are # pointing to the wrong version. Refresh them. cd inputs - ln -sf gcc-$GCC_VER-linux64-precise-utils.zip gcc-linux64-precise-utils.zip + ln -sf clang-$CLANG_VER-linux64-wheezy-utils.zip clang-linux64-wheezy-utils.zip ln -sf openssl-$OPENSSL_VER-mac64-utils.zip openssl-mac64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-mac64-utils.zip libevent-mac64-utils.zip ln -sf gmp-$GMP_VER-mac64-utils.zip gmp-mac64-utils.zip diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index afcd70d..ac63ba5 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -25,7 +25,7 @@ rm -f bundle.inputs sha256sum $OSXSDK_PACKAGE >> bundle.inputs sha256sum $OPENSSL_PACKAGE >> bundle.inputs -sha256sum $TOOLCHAIN4_PACKAGE >> bundle.inputs +sha256sum $CCTOOLS_PACKAGE >> bundle.inputs echo >> bundle.inputs sha256sum noscript(a)noscript.net.xpi >> bundle.inputs echo >> bundle.inputs diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 7bc2683..95bdaf1 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -102,11 +102,14 @@ goptlib goptlib.gpg $GOPTLIB_TAG meek meek.gpg $MEEK_TAG obfs4 obfs4proxy.gpg $OBFS4_TAG https-everywhere https-everywhere.gpg $HTTPSE_TAG +cmake cmake.gpg $CMAKE_TAG EOF while read dir commit; do check_git_hash "$dir" "$commit" done << EOF +llvm $LLVM_TAG +clang $CLANG_TAG mingw-w64-git $MINGW_TAG libdmg-hfsplus $LIBDMG_TAG libfte $LIBFTE_TAG @@ -140,7 +143,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4_OLD CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index 101b428..4dd8aa5 100755 --- a/gitian/versions +++ b/gitian/versions @@ -59,7 +59,6 @@ GO_VER=1.4.2 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.2-sm+fx+fn.xpi -TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -88,7 +87,6 @@ OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc -TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=f3c9dec710e02d809fa85ac76750e5f074656105c1bde03d400cb597b2eb1fba MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 @@ -112,7 +110,6 @@ NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} -TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_PACKAGE} TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 06584b4..75b3089 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -62,7 +62,6 @@ GO_VER=1.4.2 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.4-fx+fn+sm.xpi -TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -91,7 +90,6 @@ OPENSSL_HASH=e7e81d82f3cd538ab0cdba494006d44aab9dd96b7f6233ce9971fb7c7916d511 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc -TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=94d036ff45116023bde97e6dee6c79daf2d28804764bfa8937f5d4d3463173f5 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 @@ -115,7 +113,6 @@ NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} -TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_PACKAGE} TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} diff --git a/gitian/versions.beta b/gitian/versions.beta index 7374d04..9df153b 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -55,7 +55,6 @@ GO_VER=1.4.2 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.22-sm+fx+fn.xpi -TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip @@ -84,7 +83,6 @@ NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc -TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=5ec75d2f6fbf3ff7950a8eea2c7878d887ed3916aa89f99ec76b322b1e140c08 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f @@ -109,7 +107,6 @@ NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} -TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_PACKAGE} TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index fe94a04..701962d 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -29,6 +29,9 @@ HTTPSE_TAG=master NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable +CMAKE_TAG=v2.8.12.2 +LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74 # r247539 +CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539 MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 PYPTLIB_TAG=master OBFSPROXY_TAG=master @@ -54,6 +57,7 @@ FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.1.0 +CLANG_VER=r247539 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 @@ -69,8 +73,8 @@ GO_VER=1.4.2 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.4-fx+fn+sm.xpi -TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz +CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll @@ -98,8 +102,8 @@ OPENSSL_HASH=e7e81d82f3cd538ab0cdba494006d44aab9dd96b7f6233ce9971fb7c7916d511 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc -TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 +CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 NOSCRIPT_HASH=94d036ff45116023bde97e6dee6c79daf2d28804764bfa8937f5d4d3463173f5 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c @@ -122,8 +126,8 @@ NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} -TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_PACKAGE} TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources… +CCTOOLS_URL=https://people.torproject.org/~gk/mirrors/sources/${CCTOOLS_PACKAGE} OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE}

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'boklm/bug_18331_v6'
by gk＠torproject.org 19 Apr '16

19 Apr '16

commit dbb924b5d86201bcd8cbc923f1e416c4c62e3036 Merge: bc9d708 da14737 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 19 07:39:11 2016 +0000 Merge remote-tracking branch 'boklm/bug_18331_v6' gitian/build-helpers/ddmg.sh | 2 +- gitian/descriptors/mac/gitian-bundle.yml | 4 ++- gitian/descriptors/mac/gitian-firefox.yml | 23 ++++++-------- .../mac/gitian-pluggable-transports.yml | 5 ++- gitian/descriptors/mac/gitian-tor.yml | 8 ++--- gitian/descriptors/mac/gitian-utils.yml | 34 +++++++++++++++------ gitian/fetch-inputs.sh | 15 +++++++-- gitian/gpg/cmake.gpg | Bin 0 -> 16939 bytes gitian/mkbundle-mac.sh | 9 +++--- gitian/record-inputs.sh | 2 +- gitian/verify-tags.sh | 5 ++- gitian/versions | 3 -- gitian/versions.alpha | 3 -- gitian/versions.beta | 3 -- gitian/versions.nightly | 10 ++++-- 15 files changed, 75 insertions(+), 51 deletions(-) diff --cc gitian/versions.nightly index 17f3476,701962d..a300a51 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@@ -68,9 -72,9 +72,9 @@@ GO_VER=1.4. ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.4-fx+fn+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.10-sm+fx+fn.xpi - TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz + CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll @@@ -98,9 -102,9 +102,9 @@@ OPENSSL_HASH=e7e81d82f3cd538ab0cdba4940 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc - TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 +NOSCRIPT_HASH=9861b1e0bf5d12f773f4b26c3268d4257c3dc47a27b732ad4c280cd34bf45dd8 + CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 -NOSCRIPT_HASH=94d036ff45116023bde97e6dee6c79daf2d28804764bfa8937f5d4d3463173f5 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/master] Bug 18331: drop faketime in mac/gitian-tor.yml
by gk＠torproject.org 19 Apr '16

19 Apr '16

commit da14737254245cfa6b849dc8ac94a52cb3d9a61d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 11 19:30:00 2016 +0200 Bug 18331: drop faketime in mac/gitian-tor.yml After updating the OSX toolchain, faketime is causing an error in tor's configure script. As faketime in mac/gitian-tor.yml is no longer required to get the builds reproducible, we drop it. Following this change, the intermediary archive tor-mac64-gbuilt.zip won't be reproducible because of the timestamp of the included files. However this file is not exposed to users. This should be fixed when we implement #18845. --- gitian/descriptors/mac/gitian-tor.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 687b1d6..fdc6afa 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -6,7 +6,6 @@ suites: architectures: - "i386" packages: -- "faketime" - "unzip" - "automake" - "zip" @@ -32,8 +31,6 @@ script: | TORBINDIR="$TBDIR/TorBrowser/Tor" TORCONFIGDIR="$TBDIR/TorBrowser/Data/Tor" fi - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 - export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export LC_ALL=C umask 0022

1 0

[tor-browser-bundle/master] Bug 18331: add /usr/sbin:/sbin to the PATH
by gk＠torproject.org 19 Apr '16

19 Apr '16

commit 8c71dad38b58aa138872d1f8827ea2813763ab1b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 11 19:28:16 2016 +0200 Bug 18331: add /usr/sbin:/sbin to the PATH On Debian wheezy, dpkg -i fails when the PATH does not include /sbin and /usr/sbin, so we add them. As a policy, Debian does not include them by default in regular users PATH. This change is not required when building using LXC as the commands are run using sudo which overrides the PATH with the value in "secure_path" which includes sbin directories. --- gitian/descriptors/mac/gitian-pluggable-transports.yml | 2 ++ gitian/descriptors/mac/gitian-tor.yml | 2 ++ gitian/descriptors/mac/gitian-utils.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index e2b51c4..6b1a99e 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -79,6 +79,8 @@ script: | mkdir -p $PTDIR/ mkdir -p $OUTDIR/ # + # dpkg requires sbin directories in the PATH + export PATH="/usr/sbin:/sbin:$PATH" sudo dpkg -i *.deb tar xaf multiarch-darwin*tar.xz export PATH="$PATH:$HOME/build/apple-osx/bin/" diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 94d3eb1..687b1d6 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -43,6 +43,8 @@ script: | mkdir -p $TORCONFIGDIR/ mkdir -p $OUTDIR/ # + # dpkg requires sbin directories in the PATH + export PATH="/usr/sbin:/sbin:$PATH" sudo dpkg -i *.deb tar xaf multiarch-darwin*tar.xz export PATH="$PATH:$HOME/build/apple-osx/bin/" diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index 5288471..cef1533 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -71,6 +71,8 @@ script: | export FAKETIME=$REFERENCE_DATETIME cd .. + # dpkg requires sbin directories in the PATH + export PATH="/usr/sbin:/sbin:$PATH" sudo dpkg -i *.deb tar xaf multiarch-darwin*tar.xz export PATH="$PATH:$HOME/build/apple-osx/bin/"

1 0

[gitian-builder/tor-browser-builder-4] Bug 18331: install sudo in Debian VMs with KVM too
by gk＠torproject.org 19 Apr '16

19 Apr '16

commit ae90ac520dbdf6b1267b099b654b58352ee86ef0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 8 13:45:55 2016 +0200 Bug 18331: install sudo in Debian VMs with KVM too --- bin/make-base-vm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/make-base-vm b/bin/make-base-vm index fe1df94..59f0734 100755 --- a/bin/make-base-vm +++ b/bin/make-base-vm @@ -118,11 +118,12 @@ if [ $DISTRO = "ubuntu" ]; then GRUB_PKG=grub-pc fi +if [ $DISTRO = "debian" ]; then + addpkg=$addpkg,sudo +fi + if [ $LXC = "1" ]; then addpkg=$addpkg,lxc - if [ $DISTRO = "debian" ]; then - addpkg=$addpkg,sudo - fi else # Lack of comma after KERNEL_PKG is not a typo addpkg=$addpkg,${KERNEL_PKG}${GRUB_PKG},openssh-server

1 0

[tor-browser-bundle/hardened-builds] Bug 18127: use $GITIAN_TAG in fetch-inputs.sh
by gk＠torproject.org 11 Apr '16

11 Apr '16

commit 954e6d2d88c49fe7f243aa90b47e56ff616daf7f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Feb 16 19:30:02 2016 +0100 Bug 18127: use $GITIAN_TAG in fetch-inputs.sh --- gitian/fetch-inputs.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 5aed842..7c9daee 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -243,8 +243,7 @@ cd .. git remote set-url origin https://git.torproject.org/builders/gitian-builder.git git fetch origin git fetch --tags origin # XXX - why do we fetch tags specifically? -git checkout tor-browser-builder-3 -git merge origin/tor-browser-builder-3 +git checkout "$GITIAN_TAG" cd inputs while read dir url tag; do

1 0

[tor-browser-bundle/hardened-builds] Bumping gitian-builder tag for nightlies
by gk＠torproject.org 11 Apr '16

11 Apr '16

commit db4f5aa9836c36f3cad96c3677bd058f5a9cd19c Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 29 12:26:41 2016 +0000 Bumping gitian-builder tag for nightlies --- gitian/versions.nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 43c3c9a..e7c5b3d 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -43,7 +43,7 @@ GO_X_NET_TAG=master OBFS4_TAG=master NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 -GITIAN_TAG=tor-browser-builder-3.x-9 +GITIAN_TAG=tor-browser-builder-4 OPENSSL_VER=1.0.1q GMP_VER=5.1.3

1 0

[tor-browser-bundle/hardened-builds] Bug 18698: Include libgconf2-dev for our Linux builds
by gk＠torproject.org 11 Apr '16

11 Apr '16

commit 988566ec934df8b440bc83cee5b6ac34a21149fe Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Apr 1 01:16:09 2016 +0000 Bug 18698: Include libgconf2-dev for our Linux builds --- gitian/descriptors/linux/gitian-firefox.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index c49636a..d21b342 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -19,6 +19,8 @@ packages: - "python-dev" # To pass configure since ESR 31. - "libpulse-dev" +# To pass configure since ESR 45. +- "libgconf2-dev" # We built GCC but not the libmpc2, thus we need to install it. - "libmpc2" reference_datetime: "2000-01-01 00:00:00"

1 0

[tor-browser-bundle/hardened-builds] Bug 18127: fix base-vm file name when using KVM
by gk＠torproject.org 11 Apr '16

11 Apr '16

commit eb7ae40c498029994daa38d48a64a152ca1129e1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 29 17:27:41 2016 +0200 Bug 18127: fix base-vm file name when using KVM The base-vm file name is different if we are using LXC or KVM. --- gitian/make-vms.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitian/make-vms.sh b/gitian/make-vms.sh index 554cc27..089865b 100755 --- a/gitian/make-vms.sh +++ b/gitian/make-vms.sh @@ -25,7 +25,8 @@ build_and_test_vm() { local arch="$1"; shift local bits="$1"; shift - if [ ! -f ./base-$dist-$arch ]; + if [ "z$USE_LXC" = "z1" -a ! -f ./base-$dist-$arch ] \ + || [ "z$USE_LXC" != "z1" -a ! -f ./base-$dist-$arch.qcow2 ]; then if [ "z$USE_LXC" = "z1" ]; then

1 0

[tor-browser-bundle/hardened-builds] Bug 18127: install debian-archive-keyring on Ubuntu
by gk＠torproject.org 11 Apr '16

11 Apr '16

commit 770346a8468f18bbb395c695208118c1dc6c6f2d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 1 12:39:33 2016 +0100 Bug 18127: install debian-archive-keyring on Ubuntu The Debian keyring is required by debootstrap when generating a Debian chroot. --- gitian/check-prerequisites.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index a5f8393..6b88a90 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -17,7 +17,7 @@ then VERSION=`cat /etc/issue | grep -Eo '[0-9]{2}' | head -1` if [ "$VERSION" -ge "14" ]; then - dpkg -s ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion torsocks tor 2>/dev/null >/dev/null + dpkg -s ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion debian-archive-keyring torsocks tor 2>/dev/null >/dev/null if [ $? -ne 0 ]; then @@ -25,7 +25,7 @@ then echo echo "Please run:" echo " sudo apt-get install torsocks tor" - echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion" + echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion debian-archive-keyring" exit 1 fi else

1 0

[tor-browser-bundle/hardened-builds] Bug 18127: Add LXC support for building with Debian guest VMs
by gk＠torproject.org 11 Apr '16

11 Apr '16

commit f02e6d9110b390f97af0dd8c0ee3b525f6e5d8b8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Feb 7 12:59:46 2016 +0100 Bug 18127: Add LXC support for building with Debian guest VMs --- gitian/descriptors/linux/gitian-bundle.yml | 1 + gitian/descriptors/linux/gitian-pluggable-transports.yml | 2 +- gitian/make-vms.sh | 11 +++++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index fdc1bf6..b9bf0f9 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -14,6 +14,7 @@ packages: - "libxml2-utils" - "sqlite3" - "python-lxml" +- "rsync" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-launcher.git" diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index a886572..3aaec92 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -146,7 +146,7 @@ script: | # it downloaded during building. Just pretending and thus avoiding another # dependency should be fine here as txsocksx catches the exception due to # missing __version__ and __sha__ . - mkdir vcversioner-1.14.1.1-py2.6.egg + mkdir vcversioner-1.14.1.1-py2.7.egg $PYTHON setup.py build --build-lib build cp -a build/txsocksx $PTDIR/ cd .. diff --git a/gitian/make-vms.sh b/gitian/make-vms.sh index 469a9ca..554cc27 100755 --- a/gitian/make-vms.sh +++ b/gitian/make-vms.sh @@ -25,13 +25,20 @@ build_and_test_vm() { local arch="$1"; shift local bits="$1"; shift - if [ ! -f ./base-$dist-$arch.qcow2 ]; + if [ ! -f ./base-$dist-$arch ]; then if [ "z$USE_LXC" = "z1" ]; then export LXC_SUITE=$dist export LXC_ARCH=$arch - ./bin/make-base-vm --suite $dist --lxc --arch $arch + if [ "$dist" = "wheezy" ]; + then + export DISTRO=debian + ./bin/make-base-vm --distro debian --suite $dist --lxc --arch $arch + else + export DISTRO=ubuntu + ./bin/make-base-vm --suite $dist --lxc --arch $arch + fi else if [ "$dist" = "wheezy" ]; then

1 0

[torbutton/master] Bug 18466: Get domain isolator working with FF45
by gk＠torproject.org 08 Apr '16

08 Apr '16

commit d454bd4ac3eb71b3945ff64704bb87fdb211d711 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Mar 2 16:45:08 2016 -0800 Bug 18466: Get domain isolator working with FF45 --- src/components/domain-isolator.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/components/domain-isolator.js b/src/components/domain-isolator.js index caf45cf..2639322 100644 --- a/src/components/domain-isolator.js +++ b/src/components/domain-isolator.js @@ -18,7 +18,7 @@ let logger = Cc["@torproject.org/torbutton-logger;1"] // ## mozilla namespace. // Useful functionality for interacting with Mozilla services. -let mozilla = mozilla || {}; +let mozilla = {}; // __mozilla.protocolProxyService__. // Mozilla's protocol proxy service, useful for managing proxy connections made @@ -47,7 +47,7 @@ mozilla.registerProxyChannelFilter = function (filterFunction, positionIndex) { }; // ## tor functionality. -let tor = tor || {}; +let tor = {}; // __tor.noncesForDomains__. // A mutable map that records what nonce we are using for each domain. @@ -73,13 +73,14 @@ tor.socksProxyCredentials = function (originalProxy, domain) { } let proxy = originalProxy.QueryInterface(Ci.nsIProxyInfo); return mozilla.protocolProxyService - .newSOCKSProxyInfo(proxy.host, - proxy.port, - domain, // username - tor.noncesForDomains[domain].toString(), // password - proxy.flags, - proxy.failoverTimeout, - proxy.failoverProxy); + .newProxyInfoWithAuth("socks", + proxy.host, + proxy.port, + domain, // username + tor.noncesForDomains[domain].toString(), // password + proxy.flags, + proxy.failoverTimeout, + proxy.failoverProxy); }; tor.newCircuitForDomain = function(domain) {

1 0

[torbutton/master] Bug 18466: Make Torbutton compatible with ESR45
by gk＠torproject.org 08 Apr '16

08 Apr '16

commit e4f7079dd5d4ae44b8d10b48889d165eba20a660 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 7 09:51:05 2016 +0000 Bug 18466: Make Torbutton compatible with ESR45 Our usage of |let| does not work anymore since changes in Firefox 44 landed. See: https://bugzilla.mozilla.org/show_bug.cgi?id=589199. --- src/components/domain-isolator.js | 6 +++--- src/modules/tor-control-port.js | 2 +- src/modules/utils.js | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/domain-isolator.js b/src/components/domain-isolator.js index 2639322..6cfd21e 100644 --- a/src/components/domain-isolator.js +++ b/src/components/domain-isolator.js @@ -30,7 +30,7 @@ mozilla.protocolProxyService = Cc["@mozilla.org/network/protocol-proxy-service;1 // Mozilla's Thirdy Party Utilities, for figuring out first party domain. mozilla.thirdPartyUtil = Cc["@mozilla.org/thirdpartyutil;1"] .getService(Ci.mozIThirdPartyUtil); - + // __mozilla.registerProxyChannelFilter(filterFunction, positionIndex)__. // Registers a proxy channel filter with the Mozilla Protocol Proxy Service, // which will help to decide the proxy to be used for a given channel. @@ -63,7 +63,7 @@ tor.unknownDirtySince = Date.now(); // __tor.socksProxyCredentials(originalProxy, domain)__. // Takes a proxyInfo object (originalProxy) and returns a new proxyInfo -// object with the same properties, except the username is set to the +// object with the same properties, except the username is set to the // the domain, and the password is a nonce. tor.socksProxyCredentials = function (originalProxy, domain) { // Check if we already have a nonce. If not, create @@ -113,7 +113,7 @@ tor.isolateCircuitsByDomain = function () { proxy = aProxy.QueryInterface(Ci.nsIProxyInfo), replacementProxy = tor.socksProxyCredentials(aProxy, firstPartyDomain); logger.eclog(3, "tor SOCKS: " + channel.URI.spec + " via " + - replacementProxy.username + ":" + replacementProxy.password); + replacementProxy.username + ":" + replacementProxy.password); return replacementProxy; } catch (err) { logger.eclog(3, err.message); diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index 1cef898..63c2cd9 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -641,7 +641,7 @@ tor.controller = function (host, port, password, onError) { // let replyPromise = c.getInfo("ip-to-country/16.16.16.16"); // // Close the controller permanently // c.close(); -let controller = function (host, port, password, onError) { +var controller = function (host, port, password, onError) { let dest = host + ":" + port, maybeController = tor.controllerCache[dest]; return (tor.controllerCache[dest] = diff --git a/src/modules/utils.js b/src/modules/utils.js index de3cca6..eb0746b 100644 --- a/src/modules/utils.js +++ b/src/modules/utils.js @@ -14,7 +14,7 @@ let prefs = Services.prefs; // __getPrefValue(prefName)__ // Returns the current value of a preference, regardless of its type. -let getPrefValue = function (prefName) { +var getPrefValue = function (prefName) { switch(prefs.getPrefType(prefName)) { case prefs.PREF_BOOL: return prefs.getBoolPref(prefName); case prefs.PREF_INT: return prefs.getIntPref(prefName); @@ -27,7 +27,7 @@ let getPrefValue = function (prefName) { // Applies prefHandler to the current value of pref specified by prefName. // Re-applies prefHandler whenever the value of the pref changes. // Returns a zero-arg function that unbinds the pref. -let bindPrefAndInit = function (prefName, prefHandler) { +var bindPrefAndInit = function (prefName, prefHandler) { let update = () => { prefHandler(getPrefValue(prefName)); }, observer = { observe : function (subject, topic, data) { if (data === prefName) { @@ -48,7 +48,7 @@ let env = Components.classes["@mozilla.org/process/environment;1"] // __getEnv(name)__. // Reads the environment variable of the given name. -let getEnv = function (name) { +var getEnv = function (name) { return env.exists(name) ? env.get(name) : undefined; };

1 0

[torbutton/master] Bug 18466: Prevent ReferenceErrors in tor-control-port.js
by gk＠torproject.org 08 Apr '16

08 Apr '16

commit e6939a0043b8fc944ecfa4559efbd503d1d758c1 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Mar 2 17:27:25 2016 -0800 Bug 18466: Prevent ReferenceErrors in tor-control-port.js --- src/modules/tor-control-port.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index e1ee6bc..1cef898 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -39,7 +39,7 @@ log("Loading tor-control-port.js\n"); // ## io // I/O utilities namespace -let io = io || {}; +let io = {}; // __io.asyncSocketStreams(host, port)__. // Creates a pair of asynchronous input and output streams for a socket at the @@ -286,7 +286,7 @@ io.controlSocket = function (host, port, password, onError) { // ## utils // A namespace for utility functions -let utils = utils || {}; +let utils = {}; // __utils.identity(x)__. // Returns its argument unchanged. @@ -390,7 +390,7 @@ utils.rejectPromise = errorMessage => Promise.reject(new Error(errorMessage)); // ## info // A namespace for functions related to tor's GETINFO and GETCONF command. -let info = info || {}; +let info = {}; // __info.keyValueStringsFromMessage(messageText)__. // Takes a message (text) response to GETINFO or GETCONF and provides @@ -567,7 +567,7 @@ info.getConf = function (aControlSocket, key) { // ## event // Handlers for events -let event = event || {}; +let event = {}; // __event.parsers__. // A map of EVENT keys to parsing functions, which convert result strings to JavaScript @@ -603,7 +603,7 @@ event.watchEvent = function (controlSocket, type, filter, onData) { // ## tor // Things related to the main controller. -let tor = tor || {}; +let tor = {}; // __tor.controllerCache__. // A map from "host:port" to controller objects. Prevents redundant instantiation

1 0