- tbb-commits - lists.torproject.org

[torbutton/master] Dear Turkish Translators: Don't translate the homepage URL, yo.
by mikeperry＠torproject.org 11 Apr '14

11 Apr '14

commit 5393b528462d265b87972bc1279d024b0efb9eb8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Apr 10 22:35:39 2014 -0700 Dear Turkish Translators: Don't translate the homepage URL, yo. (Or the search engine names, but we'll deal with that later). I fixed this in transifex too, but don't want to wait for transifex to get pulled again. --- src/chrome/locale/tr/browser.properties | 2 +- src/install.rdf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chrome/locale/tr/browser.properties b/src/chrome/locale/tr/browser.properties index 55550a3..c30bc36 100644 --- a/src/chrome/locale/tr/browser.properties +++ b/src/chrome/locale/tr/browser.properties @@ -1,5 +1,5 @@ # Default home page -browser.startup.homepage=hakkında:tor +browser.startup.homepage=about:tor # Spell checker dictionary spellchecker.dictionary=en_US diff --git a/src/install.rdf b/src/install.rdf index 370cad8..87db08f 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.6.8.0</em:version> + <em:version>1.6.8.1</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>

1 0

[tor-browser-bundle/master] Document JS option changes in changelog.
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit 47dba349261163d41bcd0102f1e712fa2fe43f35 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Apr 10 09:49:43 2014 -0700 Document JS option changes in changelog. --- 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 9b66b5e..194ce0f 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -2,6 +2,7 @@ Tor Browser Bundle 3.6-beta-2 -- Apr 8 2014 * All Platforms * Update OpenSSL to 1.0.1g * Bug 9010: Add Turkish language support. + * Bug 9387 testing: Disable JS JIT, type inference, asmjs, and ion. * Update fte transport to 0.2.12 * Update NoScript to 2.6.8.19 * Update Torbutton to 1.6.8.0

1 0

[tor-browser-bundle/master] Fix changelog for obfsproxy3.
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit 751c60a211bfea3156f34d63f47a10eabb18f2d8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 9 15:19:21 2014 -0700 Fix changelog for obfsproxy3. --- Bundle-Data/Docs/ChangeLog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 42c764c..af9b59d 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -2,7 +2,6 @@ Tor Browser Bundle 3.6-beta-2 -- Apr 8 2014 * All Platforms * Update OpenSSL to 1.0.1g * Bug 9010: Add Turkish language support. - * Update obfs3 transport to 0.2.8 * Update fte transport to 0.2.12 * Update NoScript to 2.6.8.19 * Update Torbutton to 1.6.8.0

1 0

[tor-browser-bundle/master] Bump versions for 3.6beta2.
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit c133d234c81d82b2ec94c6afd178897f88f6abb7 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 7 20:05:30 2014 -0700 Bump versions for 3.6beta2. --- Bundle-Data/Docs/ChangeLog.txt | 21 +++++++++++++++++++++ gitian/versions | 4 ++-- gitian/versions.alpha | 6 +++--- gitian/versions.beta | 14 +++++++------- gitian/versions.nightly | 4 ++-- 5 files changed, 35 insertions(+), 14 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 3f12ac9..42c764c 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,24 @@ +Tor Browser Bundle 3.6-beta-2 -- Apr 8 2014 + * All Platforms + * Update OpenSSL to 1.0.1g + * Bug 9010: Add Turkish language support. + * Update obfs3 transport to 0.2.8 + * Update fte transport to 0.2.12 + * Update NoScript to 2.6.8.19 + * Update Torbutton to 1.6.8.0 + * Bug 11242: Fix improper "update needed" message after in-place upgrade. + * Bug 10398: Ease translation of about:tor page elements + * Update Tor Launcher to 0.2.5.2 + * Bug 9665: Localize Tor's unreachable bridges bootstrap error + * Backport Pending Tor Patches: + * Bug 9665: Report a bootstrap error if all bridges are unreachable + * Bug 11200: Prevent spurious error message prior to enabling network. + * Linux: + * Bug 11190: Switch linux PT build process to python2 + * Bug 10383: Enable NIST P224 and P256 accel support for 64bit builds. + * Windows: + * Bug 11286: Fix fte transport launch error + Tor Browser Bundle 3.5.4 -- Apr 7 2014 * All Platforms * Update OpenSSL to 1.0.1g diff --git a/gitian/versions b/gitian/versions index 570656d..b49c276 100755 --- a/gitian/versions +++ b/gitian/versions @@ -39,7 +39,7 @@ SETUPTOOLS_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.6.8.17-fx+sm+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.19-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=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -63,7 +63,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=8d3246153054c92f850ea8a85b19a2e493a17979751087e4c7bf11f4056282f1 +NOSCRIPT_HASH=6cf5387e3501923a22673887151c76187e1cd14a63b5d0b5d774a26db21ed69a MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.alpha b/gitian/versions.alpha index baee44a..498bcb6 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -16,7 +16,7 @@ ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 -OBFSPROXY_TAG=obfsproxy-0.2.4 +OBFSPROXY_TAG=obfsproxy-0.2.6 FLASHPROXY_TAG=1.6 FTEPROXY_TAG=0.2.6 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 @@ -40,7 +40,7 @@ SETUPTOOLS_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.6.8.17-fx+sm+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.19-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=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -64,7 +64,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=8d3246153054c92f850ea8a85b19a2e493a17979751087e4c7bf11f4056282f1 +NOSCRIPT_HASH=6cf5387e3501923a22673887151c76187e1cd14a63b5d0b5d774a26db21ed69a MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.beta b/gitian/versions.beta index 53060ca..2d9c3af 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=3.6-beta-1 +TORBROWSER_VERSION=3.6-beta-2 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 @@ -6,17 +6,17 @@ VERIFY_TAGS=1 FIREFOX_VERSION=24.4.0esr -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2 TOR_TAG=tor-0.2.4.21 -TORLAUNCHER_TAG=0.2.5.1a -TORBUTTON_TAG=1.6.7.0 +TORLAUNCHER_TAG=0.2.5.2 +TORBUTTON_TAG=1.6.8.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 -OBFSPROXY_TAG=obfsproxy-0.2.4 +OBFSPROXY_TAG=obfsproxy-0.2.6 FLASHPROXY_TAG=1.6 FTEPROXY_TAG=0.2.6 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 @@ -40,7 +40,7 @@ SETUPTOOLS_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.6.8.17-fx+sm+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.19-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=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -64,7 +64,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=8d3246153054c92f850ea8a85b19a2e493a17979751087e4c7bf11f4056282f1 +NOSCRIPT_HASH=6cf5387e3501923a22673887151c76187e1cd14a63b5d0b5d774a26db21ed69a MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.nightly b/gitian/versions.nightly index f3f0dca..911898d 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -40,7 +40,7 @@ SETUPTOOLS_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.6.8.17-fx+sm+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.19-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=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -64,7 +64,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=8d3246153054c92f850ea8a85b19a2e493a17979751087e4c7bf11f4056282f1 +NOSCRIPT_HASH=6cf5387e3501923a22673887151c76187e1cd14a63b5d0b5d774a26db21ed69a MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Update to bump fteproxy to 0.2.12: a simplified build process and fixes for Windows/Linux
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit 53a8b3a994be27762c98bc3fa58f38a46532babc Author: Kevin P. Dyer <kpdyer(a)gmail.com> Date: Sun Apr 6 17:53:46 2014 -0700 Update to bump fteproxy to 0.2.12: a simplified build process and fixes for Windows/Linux --- .../linux/gitian-pluggable-transports.yml | 3 ++- .../windows/gitian-pluggable-transports.yml | 23 ++++++++++---------- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 6619a1c..fbea855 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -133,8 +133,9 @@ script: | cd .. # cd fteproxy + ln -s $INSTDIR/gmp thirdparty/gmp find -type f | xargs touch --date="$REFERENCE_DATETIME" - CFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include" CXXFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include" make + make cp -a bin/fteproxy $PTDIR/ cp -ra fte $PTDIR/ mkdir -p $INSTDIR/Docs/fteproxy diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 9b0e8ec..d2a3005 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -97,7 +97,6 @@ script: | make make install cp -an $INSTDIR/gmp/bin/*dll* $INSTDIR/Tor - cp -an $INSTDIR/gmp/lib/*dll* $INSTDIR/Tor cd .. # # @@ -119,6 +118,7 @@ script: | # http://wiki.winehq.org/msiexec # /qn disables user interface; /i installs. LD_PRELOAD= msiexec /qn /i python.msi TARGETDIR=$INSTDIR/python + sed -i 's/self.dll_libraries = get_msvcr()/pass#self.dll_libraries = get_msvcr()/g' $INSTDIR/python/Lib/distutils/cygwinccompiler.py INSTPYTHON="wine $INSTDIR/python/python.exe" # 7z x py2exe.exe @@ -226,21 +226,20 @@ script: | cd .. # cd fteproxy - cp $INSTDIR/gmp/bin/*dll* . - cp $INSTDIR/gmp/lib/*dll* . ln -s $INSTDIR/gmp thirdparty/gmp + cp -a $INSTDIR/gmp/bin/libgmp-*.dll . find -type f | xargs touch --date="$REFERENCE_DATETIME" - make win32 - make thirdparty/re2/obj/libre2.a - LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 --inplace - LD_PRELOAD= $INSTPYTHON setup.py py2exe + WINDOWS_BUILD=1 CROSS_COMPILE=1 make thirdparty/re2/obj/libre2.a + LD_PRELOAD= $INSTPYTHON setup_tbb.py build_ext -c mingw32 + LD_PRELOAD= $INSTPYTHON setup_tbb.py py2exe py2exe_zip_timestomp dist/fteproxy.zip - mkdir -p $PTDIR/fte - mkdir -p $PTDIR/fte/tests cp -an dist/{*.pyd,*.exe,*.zip} $PTDIR/ - cp -an fte/VERSION $PTDIR/fte - cp -ran fte/defs $PTDIR/fte - cp -ran fte/tests/dfas $PTDIR/fte/tests + mkdir -p $PTDIR/fte + cp -a fte/VERSION $PTDIR/fte + mkdir -p $PTDIR/fte/defs + cp -a fte/defs/*.json $PTDIR/fte/defs + mkdir -p $PTDIR/fte/tests/dfas + cp -a fte/tests/dfas/{*.dfa,*.regex} $PTDIR/fte/tests/dfas mkdir -p $INSTDIR/Docs/fteproxy cp -an {COPYING,README.md} $INSTDIR/Docs/fteproxy cd .. diff --git a/gitian/versions b/gitian/versions index b49c276..673cf32 100755 --- a/gitian/versions +++ b/gitian/versions @@ -17,7 +17,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 -FTEPROXY_TAG=0.2.6 +FTEPROXY_TAG=0.2.12 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 498bcb6..5447d76 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -18,7 +18,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.6 FLASHPROXY_TAG=1.6 -FTEPROXY_TAG=0.2.6 +FTEPROXY_TAG=0.2.12 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 diff --git a/gitian/versions.beta b/gitian/versions.beta index 2d9c3af..8c8433d 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -18,7 +18,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.6 FLASHPROXY_TAG=1.6 -FTEPROXY_TAG=0.2.6 +FTEPROXY_TAG=0.2.12 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5

1 0

[tor-browser-bundle/master] Update default PT Bridges.
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit ae9d19adf7935782d926919c84977f703b7ebadf Author: Kevin P. Dyer <kpdyer(a)gmail.com> Date: Tue Apr 8 12:24:27 2014 -0700 Update default PT Bridges. --- Bundle-Data/PTConfigs/bridge_prefs.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 47d20e8..2d9777c 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -2,13 +2,13 @@ pref("extensions.torlauncher.default_bridge_recommended_type", "obfs3"); // Default bridges. -pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 83.212.101.3:60475 A09D536DD1752D542E1FBB3C9CE4449D51298239"); +pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 83.212.101.3:80 A09D536DD1752D542E1FBB3C9CE4449D51298239"); pref("extensions.torlauncher.default_bridge.obfs3.2", "obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); pref("extensions.torlauncher.default_bridge.obfs3.3", "obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2"); pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F"); -pref("extensions.torlauncher.default_bridge.obfs3.6", "obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD"); -pref("extensions.torlauncher.default_bridge.obfs3.7", "obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E"); +pref("extensions.torlauncher.default_bridge.obfs3.6", "obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED"); +pref("extensions.torlauncher.default_bridge.obfs3.7", "obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A"); pref("extensions.torlauncher.default_bridge.flashproxy.1", "flashproxy 0.0.1.0:1"); pref("extensions.torlauncher.default_bridge.flashproxy.2", "flashproxy 0.0.1.0:2"); @@ -18,3 +18,6 @@ pref("extensions.torlauncher.default_bridge.flashproxy.5", "flashproxy 0.0.1.0:5 pref("extensions.torlauncher.default_bridge.fte.1", "fte 131.252.210.150:8080 271EC1874E40FE65C145C6397AA34FFF7008E50E"); pref("extensions.torlauncher.default_bridge.fte.2", "fte 79.125.3.12:8080 17AF9F9F4E57614A060B7221DCCEDB8BB546DD73"); +pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); +pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); +pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9");

1 0

[tor-browser-bundle/master] Bump Tor Launcher version.
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit 6d2934c93e402e544e8df8e248134bd3305d26ce Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Apr 10 08:46:44 2014 -0700 Bump Tor Launcher version. Turkish DTDs were missing. --- Bundle-Data/Docs/ChangeLog.txt | 2 +- gitian/versions.beta | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index af9b59d..9b66b5e 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -7,7 +7,7 @@ Tor Browser Bundle 3.6-beta-2 -- Apr 8 2014 * Update Torbutton to 1.6.8.0 * Bug 11242: Fix improper "update needed" message after in-place upgrade. * Bug 10398: Ease translation of about:tor page elements - * Update Tor Launcher to 0.2.5.2 + * Update Tor Launcher to 0.2.5.3 * Bug 9665: Localize Tor's unreachable bridges bootstrap error * Backport Pending Tor Patches: * Bug 9665: Report a bootstrap error if all bridges are unreachable diff --git a/gitian/versions.beta b/gitian/versions.beta index 9ec3927..ca59070 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -8,7 +8,7 @@ FIREFOX_VERSION=24.4.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2 TOR_TAG=tor-0.2.4.21 -TORLAUNCHER_TAG=0.2.5.2 +TORLAUNCHER_TAG=0.2.5.3 TORBUTTON_TAG=1.6.8.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1

1 0

[tor-browser-bundle/master] Remove busted FTE bridges (bad fingerprints).
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit e58aabac8234b4115cef70030e213caf6444607f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Apr 10 09:01:34 2014 -0700 Remove busted FTE bridges (bad fingerprints). --- Bundle-Data/PTConfigs/bridge_prefs.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 2d9777c..bb000cd 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -16,8 +16,10 @@ pref("extensions.torlauncher.default_bridge.flashproxy.3", "flashproxy 0.0.1.0:3 pref("extensions.torlauncher.default_bridge.flashproxy.4", "flashproxy 0.0.1.0:4"); pref("extensions.torlauncher.default_bridge.flashproxy.5", "flashproxy 0.0.1.0:5"); -pref("extensions.torlauncher.default_bridge.fte.1", "fte 131.252.210.150:8080 271EC1874E40FE65C145C6397AA34FFF7008E50E"); -pref("extensions.torlauncher.default_bridge.fte.2", "fte 79.125.3.12:8080 17AF9F9F4E57614A060B7221DCCEDB8BB546DD73"); -pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); -pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); -pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); +pref("extensions.torlauncher.default_bridge.fte.1", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); +pref("extensions.torlauncher.default_bridge.fte.2", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); +pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); +// XXX: Fingerprints changed: +//pref("extensions.torlauncher.default_bridge.fte.4", "fte 131.252.210.150:8080 271EC1874E40FE65C145C6397AA34FFF7008E50E"); +//pref("extensions.torlauncher.default_bridge.fte.5", "fte 79.125.3.12:8080 17AF9F9F4E57614A060B7221DCCEDB8BB546DD73"); +

1 0

[tor-browser-bundle/master] Move obfsproxy back to 0.2.4.
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit 13dd293a1888d6faac8fcb39d10c4938c639b443 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 9 11:32:49 2014 -0700 Move obfsproxy back to 0.2.4. Moving back to last known-good. 0.2.6 won't launch either. --- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 5447d76..2bdbb2d 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -16,7 +16,7 @@ ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 -OBFSPROXY_TAG=obfsproxy-0.2.6 +OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 FTEPROXY_TAG=0.2.12 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 diff --git a/gitian/versions.beta b/gitian/versions.beta index 8c8433d..9ec3927 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -16,7 +16,7 @@ ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 -OBFSPROXY_TAG=obfsproxy-0.2.6 +OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 FTEPROXY_TAG=0.2.12 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014

1 0

[tor-browser-bundle/master] Backport fix for Bug9665.
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit ab04781bdb01977b9b122681474bfecb96017169 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 7 20:05:47 2014 -0700 Backport fix for Bug9665. --- gitian/descriptors/linux/gitian-tor.yml | 4 +- gitian/descriptors/mac/gitian-tor.yml | 2 + gitian/descriptors/windows/gitian-tor.yml | 2 + gitian/patches/bug9665.patch | 108 +++++++++++++++++++++++++++++ 4 files changed, 115 insertions(+), 1 deletion(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 698fcba..15ba469 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -28,8 +28,9 @@ files: - "bug5018.patch" - "bug9229.patch" - "bug11156.patch" -- "bug11069.patch" - "bug11200.patch" +- "bug11069.patch" +- "bug9665.patch" - "dzip.sh" - "openssl.tar.gz" script: | @@ -98,6 +99,7 @@ script: | git am ~/build/bug11156.patch fi git am ~/build/bug11200.patch + git am ~/build/bug9665.patch fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 30c23bb..5ea3b4e 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -31,6 +31,7 @@ files: - "bug11156.patch" - "bug11200.patch" - "bug11069.patch" +- "bug9665.patch" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" @@ -109,6 +110,7 @@ script: | git am ~/build/bug11156.patch fi git am ~/build/bug11200.patch + git am ~/build/bug9665.patch fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 1698726..6369e7f 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -30,6 +30,7 @@ files: - "bug11156.patch" - "bug11200.patch" - "bug11069.patch" +- "bug9665.patch" - "binutils.tar.bz2" - "dzip.sh" - "openssl.tar.gz" @@ -105,6 +106,7 @@ script: | git am ~/build/bug11156.patch fi git am ~/build/bug11200.patch + git am ~/build/bug9665.patch fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/patches/bug9665.patch b/gitian/patches/bug9665.patch new file mode 100644 index 0000000..aeab37b --- /dev/null +++ b/gitian/patches/bug9665.patch @@ -0,0 +1,108 @@ +From 08ae53e400ff6fa2d8147aad440c38173c106cae Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?F=C3=A1bio=20J=2E=20Bertinatto?= <fabiojrb(a)gmail.com> +Date: Tue, 5 Nov 2013 00:50:16 -0200 +Subject: [PATCH 1/3] Fix bug9665 + +--- + src/or/connection_or.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/or/connection_or.c b/src/or/connection_or.c +index 04ad2cc..ba3ac00 100644 +--- a/src/or/connection_or.c ++++ b/src/or/connection_or.c +@@ -1195,6 +1195,11 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port, + "your pluggable transport proxy stopped running.", + fmt_addrport(&TO_CONN(conn)->addr, TO_CONN(conn)->port), + transport_name, transport_name); ++ ++ control_event_bootstrap_problem( ++ "Can't connect to bridge", ++ END_OR_CONN_REASON_NO_ROUTE); ++ + } else { + log_warn(LD_GENERAL, "Tried to connect to '%s' through a proxy, but " + "the proxy address could not be found.", +-- +1.8.1.2 + +From 754a50592c412d95d2eb48038784d0ef725a7dc2 Mon Sep 17 00:00:00 2001 +From: Nick Mathewson <nickm(a)torproject.org> +Date: Mon, 7 Apr 2014 13:41:07 -0400 +Subject: [PATCH 2/3] Forward-port bug9665 fix to work with our fix for 11069 + +--- + src/or/connection_or.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/or/connection_or.c b/src/or/connection_or.c +index ba3ac00..01ff4dc 100644 +--- a/src/or/connection_or.c ++++ b/src/or/connection_or.c +@@ -1198,7 +1198,8 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port, + + control_event_bootstrap_problem( + "Can't connect to bridge", +- END_OR_CONN_REASON_NO_ROUTE); ++ END_OR_CONN_REASON_NO_ROUTE, ++ conn); + + } else { + log_warn(LD_GENERAL, "Tried to connect to '%s' through a proxy, but " +-- +1.8.1.2 + +From 90341b4852bf88f1fdf9fd150fa2f5c47f88b2cb Mon Sep 17 00:00:00 2001 +From: Nick Mathewson <nickm(a)torproject.org> +Date: Mon, 7 Apr 2014 13:44:22 -0400 +Subject: [PATCH 3/3] For missing transport, say "PT_MISSING" not "NO_ROUTE" + +--- + src/or/connection_or.c | 2 +- + src/or/or.h | 3 ++- + src/or/reasons.c | 2 ++ + 3 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/or/connection_or.c b/src/or/connection_or.c +index 01ff4dc..6572a91 100644 +--- a/src/or/connection_or.c ++++ b/src/or/connection_or.c +@@ -1198,7 +1198,7 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port, + + control_event_bootstrap_problem( + "Can't connect to bridge", +- END_OR_CONN_REASON_NO_ROUTE, ++ END_OR_CONN_REASON_PT_MISSING, + conn); + + } else { +diff --git a/src/or/or.h b/src/or/or.h +index 38ab176..1b35c1f 100644 +--- a/src/or/or.h ++++ b/src/or/or.h +@@ -604,7 +604,8 @@ typedef enum { + #define END_OR_CONN_REASON_NO_ROUTE 6 /* no route to host/net */ + #define END_OR_CONN_REASON_IO_ERROR 7 /* read/write error */ + #define END_OR_CONN_REASON_RESOURCE_LIMIT 8 /* sockets, buffers, etc */ +-#define END_OR_CONN_REASON_MISC 9 ++#define END_OR_CONN_REASON_PT_MISSING 9 /* PT failed or not available */ ++#define END_OR_CONN_REASON_MISC 10 + + /* Reasons why we (or a remote OR) might close a stream. See tor-spec.txt for + * documentation of these. The values must match. */ +diff --git a/src/or/reasons.c b/src/or/reasons.c +index 0674474..750e89b 100644 +--- a/src/or/reasons.c ++++ b/src/or/reasons.c +@@ -231,6 +231,8 @@ orconn_end_reason_to_control_string(int r) + return "RESOURCELIMIT"; + case END_OR_CONN_REASON_MISC: + return "MISC"; ++ case END_OR_CONN_REASON_PT_MISSING: ++ return "PT_MISSING"; + case 0: + return ""; + default: +-- +1.8.1.2 +

1 0

[tor-launcher/master] Add turkish dtd files, bump version.
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit 773de03a2ce611a5ddf4a5162f9c5d1cf9ef1b2c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Apr 10 08:43:30 2014 -0700 Add turkish dtd files, bump version. Also update translations. --- src/chrome/locale/ar/torlauncher.properties | 1 + src/chrome/locale/de/torlauncher.properties | 1 + src/chrome/locale/es/torlauncher.properties | 1 + src/chrome/locale/eu/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/sv/torlauncher.properties | 1 + src/chrome/locale/tr/network-settings.dtd | 64 ++++++++++++++++++++++++ src/chrome/locale/tr/progress.dtd | 4 ++ src/chrome/locale/tr/torlauncher.properties | 1 + src/chrome/locale/vi/torlauncher.properties | 1 + src/chrome/locale/zh-CN/torlauncher.properties | 1 + src/install.rdf | 2 +- 20 files changed, 86 insertions(+), 1 deletion(-) diff --git a/src/chrome/locale/ar/torlauncher.properties b/src/chrome/locale/ar/torlauncher.properties index c7ee50d..ff393f7 100644 --- a/src/chrome/locale/ar/torlauncher.properties +++ b/src/chrome/locale/ar/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=لم تتطابق الهوية torlauncher.bootstrapWarning.timeout=الاتصال عاطل torlauncher.bootstrapWarning.noroute=لا طريق للمضيف torlauncher.bootstrapWarning.ioerror=خطأ في القراءة/الكتابة +torlauncher.bootstrapWarning.pt_missing=missing pluggable transport diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties index bcbb64e..8ba8ae1 100644 --- a/src/chrome/locale/de/torlauncher.properties +++ b/src/chrome/locale/de/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=Nichtübereinstimmung der Identitäten torlauncher.bootstrapWarning.timeout=Verbindungszeitüberschreitung torlauncher.bootstrapWarning.noroute=Kein Pfad zum Rechner torlauncher.bootstrapWarning.ioerror=Lese-/Schreibfehler +torlauncher.bootstrapWarning.pt_missing=Pluggable Transport fehlt diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties index 9739b50..4c1fc30 100644 --- a/src/chrome/locale/es/torlauncher.properties +++ b/src/chrome/locale/es/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=las identidades no coinciden torlauncher.bootstrapWarning.timeout=tiempo de espera de conexión agotado torlauncher.bootstrapWarning.noroute=no hay ruta hacia el servidor ('host') torlauncher.bootstrapWarning.ioerror=error de lectura/escritura +torlauncher.bootstrapWarning.pt_missing=transporte enchufable desaparecido diff --git a/src/chrome/locale/eu/torlauncher.properties b/src/chrome/locale/eu/torlauncher.properties index 2d57a88..3f4fb59 100644 --- a/src/chrome/locale/eu/torlauncher.properties +++ b/src/chrome/locale/eu/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=nortasuna ez dator bat torlauncher.bootstrapWarning.timeout=konexioa denboraz kanpo torlauncher.bootstrapWarning.noroute=ez dago biderik ostalarira torlauncher.bootstrapWarning.ioerror=irakurketa/idazketa akatsa +torlauncher.bootstrapWarning.pt_missing=missing pluggable transport diff --git a/src/chrome/locale/fa/torlauncher.properties b/src/chrome/locale/fa/torlauncher.properties index 0571889..4914fb2 100644 --- a/src/chrome/locale/fa/torlauncher.properties +++ b/src/chrome/locale/fa/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=عدم تطبیق هویت torlauncher.bootstrapWarning.timeout=اتمام وقت اتصال torlauncher.bootstrapWarning.noroute=نبود مسیر به میزبان torlauncher.bootstrapWarning.ioerror=خطای خواندن/نوشتن +torlauncher.bootstrapWarning.pt_missing=missing pluggable transport diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties index 807e901..d113f54 100644 --- a/src/chrome/locale/fr/torlauncher.properties +++ b/src/chrome/locale/fr/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=identité incorrecte torlauncher.bootstrapWarning.timeout=temps de connexion expiré torlauncher.bootstrapWarning.noroute=pas de route vers l'hôte torlauncher.bootstrapWarning.ioerror=erreur de lecture/écriture +torlauncher.bootstrapWarning.pt_missing=un transport câblé est manquant diff --git a/src/chrome/locale/it/torlauncher.properties b/src/chrome/locale/it/torlauncher.properties index 0d71880..9fc125d 100644 --- a/src/chrome/locale/it/torlauncher.properties +++ b/src/chrome/locale/it/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=discordanza di identità torlauncher.bootstrapWarning.timeout=timeout della connessione torlauncher.bootstrapWarning.noroute=nessun rotta per l'host torlauncher.bootstrapWarning.ioerror=errore di lettura/scrittura +torlauncher.bootstrapWarning.pt_missing=missing pluggable transport diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties index 3ab1b23..ad50a92 100644 --- a/src/chrome/locale/ja/torlauncher.properties +++ b/src/chrome/locale/ja/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=識別子の不一致 torlauncher.bootstrapWarning.timeout=接続タイムアウト torlauncher.bootstrapWarning.noroute=ホストへの経路が見つかりません torlauncher.bootstrapWarning.ioerror=読み書きエラー +torlauncher.bootstrapWarning.pt_missing=プラグ可能な転送が見つかりません diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties index 3629f23..8714f80 100644 --- a/src/chrome/locale/ko/torlauncher.properties +++ b/src/chrome/locale/ko/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=계정 불일치 torlauncher.bootstrapWarning.timeout=연결 타임아웃 torlauncher.bootstrapWarning.noroute=호스트로의 연결 경로가 없음 torlauncher.bootstrapWarning.ioerror=읽기 / 쓰기 오류 +torlauncher.bootstrapWarning.pt_missing=missing pluggable transport diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties index 39fd76a..c4b2760 100644 --- a/src/chrome/locale/nl/torlauncher.properties +++ b/src/chrome/locale/nl/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=identiteitsfout torlauncher.bootstrapWarning.timeout=verbindingstimeout torlauncher.bootstrapWarning.noroute=geen route naar de server torlauncher.bootstrapWarning.ioerror=lees/schrijffout +torlauncher.bootstrapWarning.pt_missing=missing pluggable transport diff --git a/src/chrome/locale/pl/torlauncher.properties b/src/chrome/locale/pl/torlauncher.properties index d982fb7..7651ef2 100644 --- a/src/chrome/locale/pl/torlauncher.properties +++ b/src/chrome/locale/pl/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=niezgodność tożsamości torlauncher.bootstrapWarning.timeout=upłynął czas połączenia torlauncher.bootstrapWarning.noroute=brak trasy do hosta torlauncher.bootstrapWarning.ioerror=błąd zapisu/odczytu +torlauncher.bootstrapWarning.pt_missing=missing pluggable transport diff --git a/src/chrome/locale/pt/torlauncher.properties b/src/chrome/locale/pt/torlauncher.properties index 08961b1..87b8aeb 100644 --- a/src/chrome/locale/pt/torlauncher.properties +++ b/src/chrome/locale/pt/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=identidade não correspondente torlauncher.bootstrapWarning.timeout=Tempo de ligação expirado torlauncher.bootstrapWarning.noroute=sem rota para o hospedeiro torlauncher.bootstrapWarning.ioerror=Erro de leitura/escrita +torlauncher.bootstrapWarning.pt_missing=missing pluggable transport diff --git a/src/chrome/locale/ru/torlauncher.properties b/src/chrome/locale/ru/torlauncher.properties index f9f81a7..ad50365 100644 --- a/src/chrome/locale/ru/torlauncher.properties +++ b/src/chrome/locale/ru/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=несоответствие иденти torlauncher.bootstrapWarning.timeout=Тайм-аут соединения torlauncher.bootstrapWarning.noroute=не указан путь к хосту torlauncher.bootstrapWarning.ioerror=ошибка чтения / записи +torlauncher.bootstrapWarning.pt_missing=отсутствует подключаемый транспорт diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties index 7efa755..375bd8c 100644 --- a/src/chrome/locale/sv/torlauncher.properties +++ b/src/chrome/locale/sv/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=identitet felmatchad torlauncher.bootstrapWarning.timeout=tidsgränsen överskreds torlauncher.bootstrapWarning.noroute=framkomlig väg till värddatorn saknas torlauncher.bootstrapWarning.ioerror=läs-/skrivfel +torlauncher.bootstrapWarning.pt_missing=missing pluggable transport diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd new file mode 100644 index 0000000..4f465de --- /dev/null +++ b/src/chrome/locale/tr/network-settings.dtd @@ -0,0 +1,64 @@ +<!ENTITY torsettings.dialog.title "Tor Ağ Ayarları"> + + + +<!ENTITY torsettings.prompt "Tor ağa bağlanmadan önce, bu bilgisayarın İnternet bağlantısı hakkında bilgi vermeniz gerekir."> + +<!ENTITY torSettings.yes "Evet"> +<!ENTITY torSettings.no "Hayır"> + +<!ENTITY torSettings.firstQuestion "Aşağıdakilerden hangisi durumunuzu en iyi açıklıyor?"> +<!ENTITY torSettings.configurePrompt1 "İnternet bağlantınız sansürlenmiş,filtrelenmiş veyahut proxylenmiş."> +<!ENTITY torSettings.configurePrompt2 "Köprü, güvenlik duvarı ve vekil sunucu ayarlarının konfigürasyonunu yapmam lazım."> +<!ENTITY torSettings.configure "Yapılandır"> +<!ENTITY torSettings.connectPrompt2 "Doğrudan Tor ağına bağlanmak istiyorum"> +<!ENTITY torSettings.connectPrompt3 "Bu çoğu durumlarda çalışır."> +<!ENTITY torSettings.connect "Bağlan"> + +<!ENTITY torSettings.proxyQuestion "Bu bilgisayarın İnternete erişirken bir vekil kullanması gerekiyor mu?"> + +<!ENTITY torSettings.proxyHelp "Eğer bu soruyu nasıl yanıtlayacağınızdan emin değilseniz, farklı bir tarayıcıda İnternet seçeneklerine bakın ve bir vekil kullanmak üzere yapılandırılıp yapılandırılmadığına bakın"> +<!ENTITY torSettings.enterProxy "Vekil ayarlarını girin."> +<!ENTITY torSettings.firewallQuestion "Bu bilgisayarın İnternet bağlantısı, sadece belirli bağlantı noktalarına izin veren bir güvenlik duvarından geçiyor mu?"> +<!ENTITY torSettings.firewallHelp "Eğer bu soruya nasıl cevap vereceğinizden emin değilseniz, Hayır seçin. Eğer Tor ağına bağlanırken sorunla karşılaşırsanız, bu ayarı değiştirin."> +<!ENTITY torSettings.enterFirewall "Güvenlik duvarı tarafından izin verilen bağlantı noktalarının virgülle ayrılmış bir listesini girin."> +<!ENTITY torSettings.bridgeQuestion "İnternet Servis Sağlayıcınızı (ISS) engellesin veya ayrıcaTor Bağlantınızı sansürlesin mi?"> +<!ENTITY torSettings.bridgeHelp "Bu soruyu nasıl cevaplayacağınızdan emin değilseniz Hayır 'ı Secin.&#160; Eğer Evet'i seçerseniz, Tor Ağ bağlantıları engellemek için, daha zor hale getirilip listelenmeyen aktarmalar için Tor Köprülerini yapılandırmanız istenecektir."> +<!ENTITY torSettings.bridgeSettingsPrompt "Sağlanan köprülerin kümesini kullanabilirsiniz veya özel bir köprü seti girebilir veya sağlayabilirsiniz."> + + + +<!ENTITY torsettings.startingTor "Tor'un başlaması bekleniyor..."> +<!ENTITY torsettings.restart "Yeniden Başlat"> + +<!ENTITY torsettings.optional "İsteğe Bağlı"> + +<!ENTITY torsettings.useProxy.checkbox "Bu bilgisayarın İnternet'e erişebilmek için bir vekil sunucu kullanması gerekiyor"> +<!ENTITY torsettings.useProxy.type "Vekil Sunucu Türü:"> +<!ENTITY torsettings.useProxy.address "Adres:"> +<!ENTITY torsettings.useProxy.address.placeholder "IP adresi veya sunucu adı"> +<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.username "Kullanıcı adı:"> +<!ENTITY torsettings.useProxy.password "Parola:"> +<!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 "Bu bilgisayar, sadece belirli bağlantı noktalarına izin veren bir güvenlik duvarı ile bağlanıyor"> +<!ENTITY torsettings.firewall.allowedPorts "İzin verilen portlar:"> +<!ENTITY torsettings.useBridges.checkbox "İnternet Servis Sağlayıcım (İSS) Tor Ağı ile bağlantılarımı engelliyor"> +<!ENTITY torsettings.useBridges.default "Sağlanan köprüler ile bağlan"> +<!ENTITY torsettings.useBridges.type "Taşıma türü:"> +<!ENTITY torsettings.useBridges.custom "Özel köprüler girin"> +<!ENTITY torsettings.useBridges.label "Bir veya daha fazla köprü aynası girin (her satıra bir tane)."> +<!ENTITY torsettings.useBridges.placeholder "adresi yazın:port"> + +<!ENTITY torsettings.copyLog "Tor Günlüğünü Panoya Kopyala"> +<!ENTITY torsettings.bridgeHelpTitle "Köprü Ayna Yardımı"> +<!ENTITY torsettings.bridgeHelp1 "Tor ağına bağlanamıyorsanız, nedeni kullandığınız İnternet Servis Sağlayıcısı (ISS) veya başka bir kurum Tor'u engelliyor olabilir.&#160; Çoğunlukla bu problemi Tor köprüleri ile çözebilirisiniz bunlar engellenmesi daha zor olan listede olmayan aktarma noktalarıdır"> +<!ENTITY torsettings.bridgeHelp1B "Önceden yapılandırılan sağlanan köprü adresleri setini kullanabilirsiniz veya bu üç yöntemden birini kullanarak adres kümesinden özel bir set sağlayabilirsiniz:"> +<!ENTITY torsettings.bridgeHelp2Heading "Web aracılığıyla."> +<!ENTITY torsettings.bridgeHelp2 "https://bridges.torproject.org sitesini ziyaret etmek için web tarayıcısı kullanın."> +<!ENTITY torsettings.bridgeHelp3Heading "Eposta otomatik cevaplandırıcı aracılığıyla."> +<!ENTITY torsettings.bridgeHelp3 "bridges(a)torproject.org adresine, iletide sadece 'get bridges' satırını yazarak bir e-posta gönderin.&#160; Ancak, bir saldırganın çok sayıda köprü adresi öğrenmesini zorlaştırmak için bu epostayı gmail.com veya yahoo.com adreslerinden yollamanız gerekmektedir."> +<!ENTITY torsettings.bridgeHelp4Heading "Help Desk aracılığıyla."> +<!ENTITY torsettings.bridgeHelp4 "Son bir çare olarak köprü adres taleplerini help(a)rt.torproject.org adresine posta göndererek rica edebilirsiniz.&#160 Birisinin bu talebi cevaplayacağını unutmayın."> diff --git a/src/chrome/locale/tr/progress.dtd b/src/chrome/locale/tr/progress.dtd new file mode 100644 index 0000000..c61e5ac --- /dev/null +++ b/src/chrome/locale/tr/progress.dtd @@ -0,0 +1,4 @@ +<!ENTITY torprogress.dialog.title "Tor Durumu"> +<!ENTITY torprogress.openSettings "Ayarları Aç"> +<!ENTITY torprogress.heading "Tor ağına bağlanıyor"> +<!ENTITY torprogress.pleaseWait "Biz Tor şebekesi ile bağlantı kurana lütfen bekleyin."> diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties index 874951b..1a0226b 100644 --- a/src/chrome/locale/tr/torlauncher.properties +++ b/src/chrome/locale/tr/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=kimlik uyumsuz torlauncher.bootstrapWarning.timeout=Zaman aşımı torlauncher.bootstrapWarning.noroute=Yönlendirilecek sunucu yok torlauncher.bootstrapWarning.ioerror=Okuma/yazma hatası +torlauncher.bootstrapWarning.pt_missing=takılabilir taşıma kayıp diff --git a/src/chrome/locale/vi/torlauncher.properties b/src/chrome/locale/vi/torlauncher.properties index 9cfc93d..e57776c 100644 --- a/src/chrome/locale/vi/torlauncher.properties +++ b/src/chrome/locale/vi/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=nhận dạng không phù hợp torlauncher.bootstrapWarning.timeout=kết nối timeout torlauncher.bootstrapWarning.noroute=không có lộ trình để lưu trữ torlauncher.bootstrapWarning.ioerror=lỗi đọc / ghi +torlauncher.bootstrapWarning.pt_missing=missing pluggable transport diff --git a/src/chrome/locale/zh-CN/torlauncher.properties b/src/chrome/locale/zh-CN/torlauncher.properties index adc973e..6c9d920 100644 --- a/src/chrome/locale/zh-CN/torlauncher.properties +++ b/src/chrome/locale/zh-CN/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=身份不一致 torlauncher.bootstrapWarning.timeout=连接超时 torlauncher.bootstrapWarning.noroute=没有可用链路 torlauncher.bootstrapWarning.ioerror=读写错误 +torlauncher.bootstrapWarning.pt_missing=missing pluggable transport diff --git a/src/install.rdf b/src/install.rdf index f523acf..0e8614e 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.5.2</em:version> + <em:version>0.2.5.3</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>https://127.0.0.1/</em:updateURL> <!--

1 0

[torbutton/master] Update translations.
by mikeperry＠torproject.org 08 Apr '14

08 Apr '14

commit ab0ce9a4cb71c390eea357282330ed045a4e1870 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 7 19:06:18 2014 -0700 Update translations. --- src/chrome/locale/de/aboutTor.dtd | 20 ++++---- src/chrome/locale/de/torbutton.dtd | 2 +- src/chrome/locale/de/torbutton.properties | 70 ++++++++++++++-------------- src/chrome/locale/eu/aboutTor.dtd | 9 ---- src/chrome/locale/fr/torbutton.properties | 4 +- src/chrome/locale/it/aboutTor.dtd | 2 +- src/chrome/locale/it/torbutton.dtd | 2 +- src/chrome/locale/ko/aboutTor.dtd | 70 ++++++++++++++-------------- src/chrome/locale/ko/brand.dtd | 8 ++-- src/chrome/locale/ko/brand.properties | 16 +++---- src/chrome/locale/ko/browser.properties | 12 ++--- src/chrome/locale/ko/torbutton.dtd | 64 ++++++++++++------------- src/chrome/locale/pl/brand.dtd | 4 +- src/chrome/locale/pl/brand.properties | 4 +- src/chrome/locale/pl/torbutton.dtd | 6 +-- src/chrome/locale/pl/torbutton.properties | 12 ++--- src/chrome/locale/pt/brand.properties | 2 +- src/chrome/locale/sv/aboutTor.dtd | 55 +++++++++++----------- src/chrome/locale/sv/brand.dtd | 6 +-- src/chrome/locale/sv/brand.properties | 14 +++--- src/chrome/locale/sv/browser.properties | 2 +- src/chrome/locale/sv/torbutton.dtd | 12 ++--- src/chrome/locale/sv/torbutton.properties | 4 +- src/chrome/locale/tr/aboutTor.dtd | 55 +++++++++++----------- src/chrome/locale/tr/brand.dtd | 8 ++-- src/chrome/locale/tr/brand.properties | 16 +++---- src/chrome/locale/tr/browser.properties | 6 +-- src/chrome/locale/tr/torbutton.dtd | 12 ++--- src/chrome/locale/tr/torbutton.properties | 32 ++++++------- src/chrome/locale/vi/aboutTor.dtd | 72 ++++++++++++++--------------- src/chrome/locale/vi/brand.dtd | 8 ++-- src/chrome/locale/vi/brand.properties | 16 +++---- src/chrome/locale/vi/browser.properties | 12 ++--- src/chrome/locale/vi/torbutton.dtd | 72 ++++++++++++++--------------- src/chrome/locale/zh-CN/aboutTor.dtd | 4 +- src/chrome/locale/zh-CN/torbutton.dtd | 32 ++++++------- 36 files changed, 369 insertions(+), 376 deletions(-) diff --git a/src/chrome/locale/de/aboutTor.dtd b/src/chrome/locale/de/aboutTor.dtd index 7948f5f..c517faa 100644 --- a/src/chrome/locale/de/aboutTor.dtd +++ b/src/chrome/locale/de/aboutTor.dtd @@ -6,22 +6,22 @@ <!ENTITY aboutTor.title "Über Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "Dieser Browser ist nicht mehr Aktuell"> -<!ENTITY aboutTor.outOfDateTorOff.label "DIESER Browser ist auch veraltet"> -<!ENTITY aboutTor.outOfDate2.label "Klicken Sie auf die Zwiebel und wählen Sie Tor Browser Bundle Update herunterladen."> +<!ENTITY aboutTor.outOfDateTorOn.label "Dieser Browser ist nicht mehr aktuell."> +<!ENTITY aboutTor.outOfDateTorOff.label "DIESER Browser ist auch veraltet."> +<!ENTITY aboutTor.outOfDate2.label "Auf die Zwiebel klicken und dann die Aktualisierung des Tor-Browser-Paketes herunterladen."> <!ENTITY aboutTor.check.label "Tor-Netzwerkeinstellungen testen"> <!ENTITY aboutTor.success.label "Herzlichen Glückwunsch!"> -<!ENTITY aboutTor.success2.label "Dieser Browser ist konfiguriert, Tor zu nutzen."> +<!ENTITY aboutTor.success2.label "Dieser Browser ist für die Benutzung von Tor eingestellt."> <!ENTITY aboutTor.success3.label "Sie können jetzt anonym im Internet surfen."> -<!ENTITY aboutTor.failure.label "Irgendetwas ist schiefgegangen!"> +<!ENTITY aboutTor.failure.label "Irgend etwas lief schief!"> <!ENTITY aboutTor.failure2.label "Tor funktioniert mit diesem Browser nicht."> -<!ENTITY aboutTor.failure3prefix.label "Um Hilfe zu erhalten kontaktieren Sie"> +<!ENTITY aboutTor.failure3prefix.label "Um Hilfe zu erhalten, kontaktieren Sie bitte"> <!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> <!ENTITY aboutTor.failure3suffix.label "."> -<!ENTITY aboutTor.search.label "Suchen"> +<!ENTITY aboutTor.search.label "Suche"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> @@ -35,14 +35,14 @@ <!ENTITY aboutTor.whatnext.label "Tipps um anonym zu bleiben »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> <!ENTITY aboutTor.helpInfo1.label "Sie können helfen!"> -<!ENTITY aboutTor.helpInfo2.label "Es gibt viele Möglichkeiten, das Tor-Netzwerk schneller und stärker zu machen:"> -<!ENTITY aboutTor.helpInfo3.label "Einen Tor-Knoten betreiben »"> +<!ENTITY aboutTor.helpInfo2.label "Es gibt viele Möglichkeiten, um das Tor-Netzwerk schneller und stärker zu machen:"> +<!ENTITY aboutTor.helpInfo3.label "Einen Tor-Relaisknoten betreiben »"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> <!ENTITY aboutTor.helpInfo4.label "Ihre Dienste bereitstellen »"> <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> <!ENTITY aboutTor.helpInfo5.label "Etwas spenden »"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> -<!ENTITY aboutTor.footer.label "Die Organisation "The Tor Project" ist nach dem US-Gesetz US 501(c)(3) als gemeinnützig eingestuft und widmet sich Forchung, Entwicklung und Schulung von Anonymität und Datenschutz."> +<!ENTITY aboutTor.footer.label "Die Organisation »The Tor Project« ist nach dem US-Gesetz US 501(c)(3) als gemeinnützig eingestuft und widmet sich Forschung, Entwicklung und Schulung von Anonymität und Datenschutz."> <!ENTITY aboutTor.learnMore.label "Mehr über das Tor-Projekt erfahren »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd index e431027..9b90090 100644 --- a/src/chrome/locale/de/torbutton.dtd +++ b/src/chrome/locale/de/torbutton.dtd @@ -1,5 +1,5 @@ <!ENTITY torbutton.prefs.title "Einstellungen für Torbutton"> -<!ENTITY torbutton.prefs.tor_settings "Proxy-Einstellungen"> +<!ENTITY torbutton.prefs.tor_settings "Vermittlungsservereinstellungen"> <!ENTITY torbutton.prefs.recommended_settings "Benutze die empfohlenen Proxy-Einstellungen für meine Firefox-Version"> <!ENTITY torbutton.prefs.use_privoxy "Privoxy verwenden"> <!ENTITY torbutton.prefs.use_polipo "Polipo verwenden"> diff --git a/src/chrome/locale/de/torbutton.properties b/src/chrome/locale/de/torbutton.properties index 6e9dff2..c968c32 100644 --- a/src/chrome/locale/de/torbutton.properties +++ b/src/chrome/locale/de/torbutton.properties @@ -2,54 +2,54 @@ torbutton.button.tooltip.disabled = Tor aktivieren torbutton.button.tooltip.enabled = Tor deaktivieren torbutton.panel.tooltip.disabled = Klicken, um Tor zu aktivieren torbutton.panel.tooltip.enabled = Klicken, um Tor zu deaktivieren -torbutton.panel.plugins.disabled = Klicken, um Plugins zu aktivieren -torbutton.panel.plugins.enabled = Klicken, um Plugins zu deaktivieren +torbutton.panel.plugins.disabled = Klicken, um die Erweiterungen zu aktivieren +torbutton.panel.plugins.enabled = Klicken, um die Erweiterungen zu deaktivieren torbutton.panel.label.disabled = Tor deaktiviert torbutton.panel.label.enabled = Tor aktiviert extensions.torbutton(a)torproject.org.description = Torbutton gibt ihnen die Möglichkeit, Einstellungen von Tor schnell und einfach zu verändern und die Browser-Daten zu löschen. -torbutton.popup.history.warning = Torbutton hat aktivitäten in einem Tab blockiert, welches in einem anderen Tor-Status geladen wurde.\n\nDas ist nötig, um die Firefox Bugs 409737 und 417869 zu umgehen.\n\nSollte dieses PopUp anscheinlich grundlos auftauchen, so versucht gerade einer Ihrer Tabs sich im Hintergrund neu zu laden, und wurde deshalb blockiert.\n\nUm das Tab in diesem Tor-Status neu zu laden, drücken Sie 'Enter' in der URL eingabebox\n\n -torbutton.popup.plugin.warning = Torbutton hat das direkte laden von Plugin-Inhalten über Tor blockiert.\n\nBenutzen Sie stattdessen 'Speichern unter'.\n\n -torbutton.popup.confirm_ca_certs = Anmerkung: Es scheint, als seien keinerlei eigene Zertifikatsautoritäten in Ihrer Konfiguration vorhanden. Die Auswertung der globalen Zertifikationsautoritäten-Liste ist aufwändig und verlangsamt das schnelle An- und Abschalten von Tor. Möchten Sie die Isolation von Zertifikatsautoritäten abschalten? (Wenn Sie nicht wissen, was gemeint ist, können Sie ruhig auf OK klicken) -torbutton.popup.ff3.warning = Warnung!\n\nEs ist bekannt, dass Torbutton auf Firefox 3 deine Zeitzone und Livemarks via Tor mitteilt.\n\nWillst du trotzem fortfahren? -torbutton.popup.toggle.warning = Die Einstellungen werden erst nach einem Neustart von Tor wirksam -torbutton.popup.test.success = Tor-Proxy Test erfolgreich! -torbutton.popup.test.failure = Tor Proxy Test FEHLGESCHLAGEN! Überprüfen Sie Ihre Proxy- und Polipo-Einstellungen. -torbutton.popup.test.confirm_toggle = Der letzte Tor Proxy Test konnte Tor nicht benutzen.\n\nSind Sie sicher, dass Sie diesen trotzdem aktivieren möchten?\n\nAnmerkung: Falls Sie das Problem gelöst haben, können Sie den Test im Fenster Torbutton Proxy Einstellungen wiederholen, um diese Warnung zu löschen. -torbutton.popup.test.ff3_notice = Klicken Sie OK um die Proxyeinstellungen zu testen. Dieser Test arbeitet im Hintergrund. Bitte warten Sie einen Augenblick. +torbutton.popup.history.warning = Torbutton hat Aktivitäten in einem Reiter blockiert, welcher in einem anderen Tor-Status geladen wurde.\n\nDas ist nötig, um die Firefox-Fehler 409737 und 417869 zu umgehen.\n\nSollte dieses PopUp augenscheinlich grundlos auftauchen, so versucht gerade, einer Ihrer Reiter, sich im Hintergrund neu zu laden, und wurde deshalb blockiert.\n\nUm den Reiter in diesem Tor-Status neu zu laden, drücken Sie »Eingabe« im Adresseingabefeld.\n\n +torbutton.popup.plugin.warning = Torbutton hat das direkte laden von Erweiterungsinhalten über Tor blockiert.\n\nBenutzen Sie stattdessen »Speichern unter«.\n\n +torbutton.popup.confirm_ca_certs = Anmerkung: Es scheint, als seien keinerlei eigene Zertifikatsautoritäten in Ihrer Konfiguration vorhanden. Die Auswertung der globalen Zertifikationsautoritätenliste ist aufwändig und verlangsamt das schnelle An- und Abschalten von Tor. Möchten Sie die Isolation von Zertifikatsautoritäten abschalten? (Wenn Sie nicht wissen, was gemeint ist, können Sie ruhig auf OK klicken). +torbutton.popup.ff3.warning = Warnung!\n\nEs ist bekannt, dass Torbutton auf Firefox 3 deine Zeitzone und Livemarks über Tor mitteilt.\n\nWollen Sie trotzdem fortfahren? +torbutton.popup.toggle.warning = Die Einstellungen werden erst nach einem Neustart von Tor wirksam. +torbutton.popup.test.success = Test des Tor-Vermittlungsservers erfolgreich! +torbutton.popup.test.failure = Test des Tor-Vermittlungsservers FEHLGESCHLAGEN! Überprüfen Sie Ihre Proxy- und Polipo-Einstellungen. +torbutton.popup.test.confirm_toggle = Der letzte Tor-Vermittlungsservertest konnte Tor nicht benutzen.\n\nSind Sie sicher, dass Sie diesen trotzdem aktivieren möchten?\n\nAnmerkung: Falls Sie das Problem gelöst haben, können Sie den Test im Einstellungsfenster vom Torbutton-Vermittlungsserver wiederholen, um diese Warnung zu löschen. +torbutton.popup.test.ff3_notice = Klicken Sie OK um die Vermittlungsservereinstellungen zu testen. Dieser Test arbeitet im Hintergrund. Bitte warten Sie einen Augenblick. torbutton.panel.label.verified = Tor überprüft -torbutton.popup.test.auto_failed = Der automatische Tor Proxy Test ist fehlgeschlagen.\n\nSind Sie sicher, dass Sie ihn trotzdem aktivieren möchten? +torbutton.popup.test.auto_failed = Der automatische Tor-Vermittlungsservertest ist fehlgeschlagen.\n\nSind Sie sicher, dass Sie ihn trotzdem aktivieren möchten? torbutton.prefs.recommended = (empfohlen) torbutton.prefs.optional = (optional) torbutton.prefs.crucial = (kritisch) torbutton.popup.external.title = Externen Inhalt laden? -torbutton.popup.external.app = Eine externe Applikation wird benötigt, um mit dem folgenden Objekt umzugehen:\n\n -torbutton.popup.external.note = \n\nAnmerkung: Externe Applikationen sind im Allgemeinen NICHT Tor gesichert und können Sie verraten!\n -torbutton.popup.external.suggest = \nSollte dieser Datei nicht vertraut werden, speichern sie sie ab um sie offline oder in einer VM anzusehen,\noder ziehen sie in betracht einen transperenten Tor-Proxy wie die Tails LiveCD oder torsocks zu benutzen.\n -torbutton.popup.launch = Applikation starten +torbutton.popup.external.app = Eine externe Anwendung wird benötigt, um mit dem folgenden Objekt umzugehen:\n\n +torbutton.popup.external.note = \n\nAnmerkung: Externe Anwendungen sind im Allgemeinen NICHT Tor gesichert und können Sie verraten!\n +torbutton.popup.external.suggest = \nSollte dieser Datei nicht vertraut werden, speichern sie sie ab um sie offline oder in einer VM anzusehen,\noder ziehen sie in betracht einen transparenten Tor-Vermittlungsserver wie die Tails-LiveCD oder torsocks zu benutzen.\n +torbutton.popup.launch = Anwendung starten torbutton.popup.cancel = Abbrechen -torbutton.popup.dontask = Von nun an immer Applikationen laden -torbutton.popup.test.no_http_proxy = Tor proxy test: Lokaler HTTP Proxy ist unerreichbar. Läuft Polipo korrekt? -torbutton.popup.captcha.title = Google Captchas vermeiden? -torbutton.popup.captcha.ask = Torbutton hat ein Google Captcha festgestellt. Möchten Sie für Ihre Suchanfrage zu einer anderen Suchmaschine umgeleitet werden? +torbutton.popup.dontask = Von nun an Anwendungen immer laden +torbutton.popup.test.no_http_proxy = Tor-Vermittlungsservertest: Lokaler HTTP-Vermittlungsserver ist unerreichbar. Läuft Polipo korrekt? +torbutton.popup.captcha.title = Google-Captchas vermeiden? +torbutton.popup.captcha.ask = Torbutton hat ein Google-Captcha festgestellt. Möchten Sie für Ihre Suchanfrage zu einer anderen Suchmaschine umgeleitet werden? torbutton.popup.captcha.always = Von nun an immer diese Aktion durchführen torbutton.popup.redirect = Umleiten torbutton.popup.no_redirect = Nicht umleiten -torbutton.popup.prompted_language = Um Ihre Privatsphäre zu erhöhen, kann Torbutton die jeweilige englische Version einer Website anfordern. Dies kann zur Folge haben, dass Websites, die sie lieber in Ihrer Muttersprache lesen würden, nun in Englisch dargestellt werden. \n\nSollen nun - zur Erhöhung Ihrer Privatsphäre - Websites in Englisch geladen werden? -torbutton.popup.no_newnym = Torbutton kann dir keine neue Identität geben, da es keinen Zugriff auf den Tor-Control-Port hatt.\n\nBenutzt du das Tor-Browser-Paket? -torbutton.popup.use_tbb = Es scheint, als würdest du Torbutton zusammen mit Freifox benutzen. Diese Kombination ist nicht länger eine empfohlene, sichere, Konfiguration.\n\nAnstelle dieser Konfiguration, empfehlen wir dir das neueste Tor-Browser-Paket zu benutzen, das du durch eine E-Mail an gettor(a)torproject.org oder von der Downloadseite bekommen kannst: -torbutton.popup.pref_error = Torbutton kann Einstellungen in dem Tor-Browser Verzeichniss nicht aktualisieren. -torbutton.popup.permission_denied = Bitte setze entweder die Berechtigungen des Tor-Browser Verzeichnisses zurück, oder kopiere es an einen neuen Ort. -torbutton.popup.device_full = Es scheint als würde die Disk voll sein. Bitte machen sie etwas Platz frei, oder bewegen sie den Tor-Browser auf ein neues Gerät. -torbutton.title.prompt_torbrowser = Wichtige Torbutton Information -torbutton.popup.prompt_torbrowser = Torbutton funktioniert jetzt anders als vorher: es kann nichtmehr abgeschaltet werden.\n\nWir haben diese Änderung vorgenommen, da es nicht sicher ist, Torbutton auch in einem Browser zu benutzen, der auch für den Betrieb ohne Tor gedacht ist. Es gab zu viele Fehler, die wir sonst nicht hätten beheben können.\n\nWenn Sie Firefox weiterhin normal benutzen möchten, sollten Sie Torbutton deinstallieren, und das Tor Browser Bundle runterladen. Die Privatsphäre-Einstellungen des Tor Browsers sind außerdem denen des normalen Firefox überlegen, selbst wenn Firefox mit Torbutton benutzt wird.\n\nUm Torbutton zu entfernen, gehen Sie einfach auf Extras->Add-ons->Erweiterungen und klicken Sie auf Entfernen neben dem Torbutton. +torbutton.popup.prompted_language = Um Ihre Privatsphäre zu erhöhen, kann Torbutton die jeweilige englische Version einer Webseite anfordern. Dies kann zur Folge haben, dass Webseiten, die sie lieber in Ihrer Muttersprache lesen würden, nun in Englisch dargestellt werden. \n\nSollen nun - zur Erhöhung Ihrer Privatsphäre - Webseiten in Englisch geladen werden? +torbutton.popup.no_newnym = Torbutton kann Ihnen keine neue Identität geben, da es keinen Zugriff auf den Tor-Steueranschluss hatt.\n\nBenutzen Sie das Tor-Browser-Paket? +torbutton.popup.use_tbb = Es scheint, als würden Sie Torbutton zusammen mit Firefox benutzen. Diese Kombination ist nicht länger eine empfohlene und sichere Konfiguration.\n\nAnstelle dieser Konfiguration, empfehlen wir Ihnen das neueste Tor-Browser-Paket zu benutzen, das Sie durch eine E-Mail an gettor(a)torproject.org oder von der Herunterladeseite bekommen können: +torbutton.popup.pref_error = Torbutton kann die Einstellungen von Tor-Browser im Profilordner nicht aktualisieren. +torbutton.popup.permission_denied = Bitte entweder die Berechtigungen des Tor-Browser-Ordners zurücksetzen, oder es an einen neuen Ort kopieren. +torbutton.popup.device_full = Es scheint als würde das Medium voll sein. Bitte machen Sie etwas Platz frei, oder bewegen sie den Tor-Browser auf ein neues Gerät. +torbutton.title.prompt_torbrowser = Wichtige Torbutton-Information +torbutton.popup.prompt_torbrowser = Torbutton funktioniert jetzt anders als vorher: es kann nicht mehr abgeschaltet werden.\n\nWir haben diese Änderung vorgenommen, da es nicht sicher ist, Torbutton auch in einem Browser zu benutzen, der auch für den Betrieb ohne Tor gedacht ist. Es gab zu viele Fehler, die wir sonst nicht hätten beheben können.\n\nWenn Sie Firefox weiterhin normal benutzen möchten, sollten Sie Torbutton deinstallieren, und das Tor-Browser-Paket herunterladen. Die Privatsphäreeinstellungen des Tor-Browsers sind außerdem denen des normalen Firefox überlegen, selbst wenn Firefox mit Torbutton benutzt wird.\n\nUm Torbutton zu entfernen, gehen Sie einfach auf Extras->Add-ons->Erweiterungen und klicken Sie auf Entfernen neben dem Torbutton. torbutton.popup.short_torbrowser = Wichtige Torbutton Information!\n\nTorbutton ist jetzt immer aktiviert.\n\nKlicken sie auf den Torbutton, um mehr Informationen zu erhalten. -torbutton.popup.confirm_plugins = Plugins wie Flash können ihre Privatsphäre und Anonymität schädigen.\n\nSie können auch das Tor-Netzwerk umgehen, und ihren derzeitigen aufenthalsort und ihre IP-Adresse verraten.\n\nSind Sie sicher, dass Sie Plugins aktivieren wollen?\n\n -torbutton.popup.never_ask_again = Nichtmehr nachfragen +torbutton.popup.confirm_plugins = Erweiterungen wie Flash können ihre Privatsphäre und Anonymität schädigen.\n\nSie können auch das Tor-Netzwerk umgehen, und Ihren derzeitigen Aufenthaltsort und ihre IP-Adresse verraten.\n\nSind Sie sicher, dass Sie Erweiterungen aktivieren wollen?\n\n +torbutton.popup.never_ask_again = Nicht mehr nachfragen # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=Diese Website (%S) hat versucht, auf Image-Daten von einem Canvas zuzugreifen. Da Canvas Image-Daten dazu benutzt werden können, um Informationen über ihren Computer zu bekommen, wurden diesmal leere Image-Daten an die Website geschickt -canvas.allow=In zukunft Erlauben -canvas.allowAccessKey=A -canvas.never=Niemlas für diese Website -canvas.neverAccessKey=e +canvas.siteprompt=Diese Webseite (%S) hat versucht, auf Bilddaten von einem Canvas zuzugreifen. Da Canvas Bilddaten dazu benutzt werden können, um Informationen über ihren Rechner zu bekommen, wurden diesmal leere Bilddaten an die Webseite geschickt +canvas.allow=In Zukunft Erlauben +canvas.allowAccessKey=I +canvas.never=Niemals für diese Website +canvas.neverAccessKey=N diff --git a/src/chrome/locale/eu/aboutTor.dtd b/src/chrome/locale/eu/aboutTor.dtd index 157346e..7afe64b 100644 --- a/src/chrome/locale/eu/aboutTor.dtd +++ b/src/chrome/locale/eu/aboutTor.dtd @@ -23,15 +23,6 @@ <!ENTITY aboutTor.search.label "Bilatu"> - <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties index 2b24b73..2204e2f 100644 --- a/src/chrome/locale/fr/torbutton.properties +++ b/src/chrome/locale/fr/torbutton.properties @@ -24,7 +24,7 @@ torbutton.prefs.crucial = (indispensable) torbutton.popup.external.title = Charger un contenu externe ? torbutton.popup.external.app = Une application externe est requise pour gérer :\n\n torbutton.popup.external.note = \n\nNOTE : les applications externes ne sont a priori pas sécuritaires pour Tor et peuvent vous démasquer !\n -torbutton.popup.external.suggest = \nSi vous n'avez pas confiance dans ce fichier, vous devriez soit l'enregistrer et le consulter hors-ligne ou dans une machine virtuelle VM sans réseau,⏎\nou envisager d'utiliser un proxy transparent Tor tel que Tails LiveCD ou torsocks.⏎\n +torbutton.popup.external.suggest = \nSi vous n'avez pas confiance dans ce fichier, vous devriez soit l'enregistrer et le consulter hors-ligne ou dans une machine virtuelle VM sans réseau,\nou envisager d'utiliser un proxy transparent Tor tel que Tails LiveCD ou torsocks.\n torbutton.popup.launch = Lancer l'application torbutton.popup.cancel = Annuler torbutton.popup.dontask = Toujours lancer les applications à partir de maintenant @@ -34,7 +34,7 @@ torbutton.popup.captcha.ask = Torbutton a détecté un captcha Google. Voulez-vo torbutton.popup.captcha.always = Toujours effectuer cette action à partir de maintenant torbutton.popup.redirect = Rediriger torbutton.popup.no_redirect = Ne pas rediriger -torbutton.popup.prompted_language = Pour renforcer votre anonymat, Torbutton peut demander une version anglaise de la page Web. Les pages que vous préférez lire dans votre langue préférée pourraient alors s'afficher en anglais.⏎\n⏎\nVoulez-vous demander des pages Web en anglais pour améliorer votre anonymat ? +torbutton.popup.prompted_language = Pour renforcer votre anonymat, Torbutton peut demander une version anglaise de la page Web. Les pages que vous préférez lire dans votre langue préférée pourraient alors s'afficher en anglais.\n\nVoulez-vous demander des pages Web en anglais afin d'améliorer votre anonymat ? torbutton.popup.no_newnym = Torbutton ne peut pas délivrer une nouvelle identité de manière sécuritaire. Il n'a pas accès au port de contrôle de Tor.\n\nUtilisez-vous le paquet du Navigateur Tor ? torbutton.popup.use_tbb = Il semble que vous utilisez Torbutton avec Firefox, ce qui n'est plus une configuration sécuritaire recommandée.\n\nEn remplacement, nous vous recommandons d'obtenir le dernier paquet du Navigateur Tor en envoyant un courriel à gettor(a)torproject.org ou en le téléchargeant depuis l'adresse URL suivante : torbutton.popup.pref_error = Torbutton ne peut pas mettre à jour les préférences dans le répertoire du profil du Navigateur Tor. diff --git a/src/chrome/locale/it/aboutTor.dtd b/src/chrome/locale/it/aboutTor.dtd index 151a7d5..09e2064 100644 --- a/src/chrome/locale/it/aboutTor.dtd +++ b/src/chrome/locale/it/aboutTor.dtd @@ -30,7 +30,7 @@ <!ENTITY aboutTor.torInfo2.label "Nazione & Indirizzo IP:"> <!ENTITY aboutTor.torInfo3.label "Nodo di Uscita:"> <!ENTITY aboutTor.torInfo4.label "Questo server non registra alcuna informazione circa i visitatori."> -<!ENTITY aboutTor.whatnextQuestion.label "E Dopo?"> +<!ENTITY aboutTor.whatnextQuestion.label "E adesso?"> <!ENTITY aboutTor.whatnextAnswer.label "Tor NON è tutto ciò che ti serve per navigare anonimamente! Potresti aver bisogno di cambiare le tue abitudini di navigazione per accertarti che la tua identità rimanga al sicuro."> <!ENTITY aboutTor.whatnext.label "Consigli Per Restare Anonimo »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd index 0372363..a512ba7 100644 --- a/src/chrome/locale/it/torbutton.dtd +++ b/src/chrome/locale/it/torbutton.dtd @@ -14,7 +14,7 @@ <!ENTITY torbutton.about.version "Versione:"> <!ENTITY torbutton.about.summary "Proteggi la privacy della navigazione Tor"> <!ENTITY torbutton.about.code "Sviluppatori:"> -<!ENTITY torbutton.about.maintainer "Mantenitori:"> +<!ENTITY torbutton.about.maintainer "Maintainer:"> <!ENTITY torbutton.about.security_review "Revisori per la sicurezza:"> <!ENTITY torbutton.about.donate "Se apprezzate Tor, prendete in considerazione di"> <!ENTITY torbutton.about.make_donation "fare una donazione."> diff --git a/src/chrome/locale/ko/aboutTor.dtd b/src/chrome/locale/ko/aboutTor.dtd index d388ca4..2817dd6 100644 --- a/src/chrome/locale/ko/aboutTor.dtd +++ b/src/chrome/locale/ko/aboutTor.dtd @@ -4,45 +4,45 @@ - vim: set sw=2 sts=2 ts=8 et syntax=xml: --> -<!ENTITY aboutTor.title ""> +<!ENTITY aboutTor.title "Tor란?"> -<!ENTITY aboutTor.outOfDateTorOn.label ""> -<!ENTITY aboutTor.outOfDateTorOff.label ""> -<!ENTITY aboutTor.outOfDate2.label ""> +<!ENTITY aboutTor.outOfDateTorOn.label "그러나, 이 브라우저가 업데이트 되지 않았습니다."> +<!ENTITY aboutTor.outOfDateTorOff.label "또한, 이 브라우저가 업데이트 되지 않았습니다."> +<!ENTITY aboutTor.outOfDate2.label "양파 모양을 클릭하고 Tor 브라우저 번들 업데이트를 다운로드 합니다."> -<!ENTITY aboutTor.check.label ""> +<!ENTITY aboutTor.check.label "Tor 네트워크 설정 테스트"> -<!ENTITY aboutTor.success.label ""> -<!ENTITY aboutTor.success2.label ""> -<!ENTITY aboutTor.success3.label ""> -<!ENTITY aboutTor.failure.label ""> -<!ENTITY aboutTor.failure2.label ""> -<!ENTITY aboutTor.failure3prefix.label ""> -<!ENTITY aboutTor.failure3Link ""> +<!ENTITY aboutTor.success.label "축하합니다!"> +<!ENTITY aboutTor.success2.label "이 브라우저는 Tor를 사용하도록 구성되었습니다."> +<!ENTITY aboutTor.success3.label "여러분은 이제 익명으로 자유롭게 인터넷을 탐색 할 수 있습니다."> +<!ENTITY aboutTor.failure.label "뭔가 문제가 발생하였습니다."> +<!ENTITY aboutTor.failure2.label "Tor가 이 브라우저에서 작동하지 않습니다."> +<!ENTITY aboutTor.failure3prefix.label "도움이 필요한 경우 접속하시길 바랍니다."> +<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> <!ENTITY aboutTor.failure3suffix.label " "> <!ENTITY aboutTor.search.label "검색"> -<!ENTITY aboutTor.searchSPPost.link ""> -<!ENTITY aboutTor.searchDDGPost.link ""> - -<!ENTITY aboutTor.torInfo1.label ""> -<!ENTITY aboutTor.torInfo2.label ""> -<!ENTITY aboutTor.torInfo3.label ""> -<!ENTITY aboutTor.torInfo4.label ""> -<!ENTITY aboutTor.whatnextQuestion.label ""> -<!ENTITY aboutTor.whatnextAnswer.label ""> -<!ENTITY aboutTor.whatnext.label ""> -<!ENTITY aboutTor.whatnext.link ""> -<!ENTITY aboutTor.helpInfo1.label ""> -<!ENTITY aboutTor.helpInfo2.label ""> -<!ENTITY aboutTor.helpInfo3.label ""> -<!ENTITY aboutTor.helpInfo3.link ""> -<!ENTITY aboutTor.helpInfo4.label ""> -<!ENTITY aboutTor.helpInfo4.link ""> -<!ENTITY aboutTor.helpInfo5.label ""> -<!ENTITY aboutTor.helpInfo5.link ""> - -<!ENTITY aboutTor.footer.label ""> -<!ENTITY aboutTor.learnMore.label ""> -<!ENTITY aboutTor.learnMore.link ""> +<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> +<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> + +<!ENTITY aboutTor.torInfo1.label "추가 정보 :"> +<!ENTITY aboutTor.torInfo2.label "국가 & IP 주소 :"> +<!ENTITY aboutTor.torInfo3.label "출구 node : "> +<!ENTITY aboutTor.torInfo4.label "이 서버는 방문자에 대한 정보를 기록하지 않습니다."> +<!ENTITY aboutTor.whatnextQuestion.label "그 다음은?"> +<!ENTITY aboutTor.whatnextAnswer.label "Tor는 절대로 '완벽한' 익명을 보장하는 브라우저가 아닙니다. 때문에 '완벽한' 익명을 위해서는 브라우저 사용 습관을 바꾸셔야 합니다."> +<!ENTITY aboutTor.whatnext.label "익명으로 알짱거릴 때의 팁 >>"> +<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.helpInfo1.label "여러분도 도울 수 있습니다!"> +<!ENTITY aboutTor.helpInfo2.label "여러분이 Tor 네트워크를 보다 빠르고 강하게 만들 수 있는 방법이 있습니다."> +<!ENTITY aboutTor.helpInfo3.label "Tor 중계 서버 node 실행 >>"> +<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> +<!ENTITY aboutTor.helpInfo4.label "자원 봉사로 Tor 돕기 >>"> +<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> +<!ENTITY aboutTor.helpInfo5.label "기부하기 >>"> +<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> + +<!ENTITY aboutTor.footer.label "Tor 프로젝트란? 온라인 익명 및 개인 정보 보호의 연구, 개발 및 교육에 힘쓰는 US 501(c)(3) 비영리 단체입니다."> +<!ENTITY aboutTor.learnMore.label "Tor 프로젝트에 대하여 더 알고 싶으시다면 >>"> +<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> diff --git a/src/chrome/locale/ko/brand.dtd b/src/chrome/locale/ko/brand.dtd index e34f480..4b55e20 100644 --- a/src/chrome/locale/ko/brand.dtd +++ b/src/chrome/locale/ko/brand.dtd @@ -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/. --> -<!ENTITY brandShortName ""> -<!ENTITY brandFullName ""> -<!ENTITY vendorShortName ""> -<!ENTITY trademarkInfo.part1 ""> +<!ENTITY brandShortName "Tor 브라우저"> +<!ENTITY brandFullName "Tor 브라우저"> +<!ENTITY vendorShortName "Tor 프로젝트"> +<!ENTITY trademarkInfo.part1 "파이어폭스와 파이어폭스 로고들은 모질라 재단의 등록 상표입니다."> diff --git a/src/chrome/locale/ko/brand.properties b/src/chrome/locale/ko/brand.properties index 6598ccd..8273888 100644 --- a/src/chrome/locale/ko/brand.properties +++ b/src/chrome/locale/ko/brand.properties @@ -2,14 +2,14 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -# brandShortName=TorBrowser -# brandFullName=Tor Browser -# vendorShortName=Tor Project +brandShortName=Tor 브라우저 +brandFullName=Tor 브라우저 +vendorShortName=Tor 프로젝트 -# homePageSingleStartMain=Firefox Start, a fast home page with built-in search -# homePageImport=Import your home page from %S +homePageSingleStartMain=파이어폭스를 시작합니다. +homePageImport=%S 에서 홈페이지 가져오기 -# homePageMigrationPageTitle=Home Page Selection -# homePageMigrationDescription=Please select the home page you wish to use: +homePageMigrationPageTitle=홈페이지 선택 +homePageMigrationDescription=사용하고 싶으신 홈페이지를 선택하십시오. -# syncBrandShortName=Sync +syncBrandShortName=동기화 diff --git a/src/chrome/locale/ko/browser.properties b/src/chrome/locale/ko/browser.properties index fd25b10..a2b61b5 100644 --- a/src/chrome/locale/ko/browser.properties +++ b/src/chrome/locale/ko/browser.properties @@ -1,13 +1,13 @@ # Default home page -# browser.startup.homepage=about:tor +browser.startup.homepage=Tor에 관하여 # Spell checker dictionary -# spellchecker.dictionary=en_US +spellchecker.dictionary=영어-미국 # Default search engine -# browser.search.defaultenginename=Startpage +browser.search.defaultenginename=시작 페이지 # Search engine order (order displayed in the search bar dropdown) -# browser.search.order.1=Startpage -# browser.search.order.2=DuckDuckGo -# browser.search.order.3=Google +browser.search.order.1=시작 페이지 +browser.search.order.2=DuckDuckGo +browser.search.order.3=구글 diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd index b9f6feb..c936759 100644 --- a/src/chrome/locale/ko/torbutton.dtd +++ b/src/chrome/locale/ko/torbutton.dtd @@ -1,30 +1,30 @@ <!ENTITY torbutton.prefs.title "Torbutton 환경 설정"> -<!ENTITY torbutton.prefs.tor_settings "프록시 서버 설정"> -<!ENTITY torbutton.prefs.recommended_settings "내가 사용하고 있는 파이어폭스를 위한 추천 설정 사용"> +<!ENTITY torbutton.prefs.tor_settings "프록시 설정"> +<!ENTITY torbutton.prefs.recommended_settings "현재 추천된 프록시 설정 사용"> <!ENTITY torbutton.prefs.use_privoxy "Privoxy 사용"> <!ENTITY torbutton.prefs.use_polipo "Polipo 사용"> <!ENTITY torbutton.prefs.custom_settings "사용자 지정 프록시 설정 사용"> <!ENTITY torbutton.prefs.proxy.host.http "HTTP 프록시 주소:"> <!ENTITY torbutton.prefs.proxy.host.https "SSL 프록시 주소:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP 프록시 :"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher 프록시 :"> +<!ENTITY torbutton.prefs.proxy.host.ftp "FTP 프록시 주소:"> +<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher 프록시 주소:"> <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS :"> <!ENTITY torbutton.prefs.proxy.port "포트 : "> <!ENTITY torbutton.about.title "Torbutton에 대하여"> <!ENTITY torbutton.about.version "버전:"> -<!ENTITY torbutton.about.summary "Tor 브라우징의 프라이버시 보호"> +<!ENTITY torbutton.about.summary "Tor 브라우징의 사생활 보호"> <!ENTITY torbutton.about.code "코드 공헌자:"> <!ENTITY torbutton.about.maintainer "관리자 :"> <!ENTITY torbutton.about.security_review "보안 리뷰:"> -<!ENTITY torbutton.about.donate "Tor를 사용하는 것이 좋으시다면, 기여할 수 있습니다"> -<!ENTITY torbutton.about.make_donation "기부하기"> -<!ENTITY torbutton.pref_connection.notice "이 설정을 바꾸는 것을 비활성화합니다"> -<!ENTITY torbutton.pref_connection.more_info "추가 "> +<!ENTITY torbutton.about.donate "Tor를 사용하는 것이 좋으시다면 모르겠소만,"> +<!ENTITY torbutton.about.make_donation "후원하기"> +<!ENTITY torbutton.pref_connection.notice "이렇게 설정을 바꿀 수 없습니다."> +<!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.pref_connection_more_info.text "Torbutton이 현재 활성화되었습니다. 만약 Tor 프록시가 아닌 일반 프록시 서버 설정을 하시려면, Torbutton을 비활성화하고 이 창으로 돌아오십시오. 혹시 Tor 프록시 설정을 바꾸고 싶으시다면, Torbutton 설정 화면을 사용해 주세요."> <!ENTITY torbutton.context_menu.new_identity "새로운 신원"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.toggle "Tor-Toggle 상태"> +<!ENTITY torbutton.context_menu.toggle "Tor 작동 상태"> <!ENTITY torbutton.context_menu.toggle.key "T"> <!ENTITY torbutton.context_menu.preferences "설정..."> <!ENTITY torbutton.context_menu.preferences.key "P"> @@ -34,7 +34,7 @@ <!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Tor browser bundle 업데이트 다운로드"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "쿠키 "> +<!ENTITY torbutton.context_menu.cookieProtections "쿠키 보호"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.context_menu.copyTor "Tor URL 복사"> <!ENTITY torbutton.context_menu.copyTor.key "P"> @@ -43,36 +43,36 @@ <!ENTITY torbutton.context_menu.openTorWindow "Tor URL을 새 창에서 열기"> <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> -<!ENTITY torbutton.button.tooltip "Torbutton 초기화"> +<!ENTITY torbutton.button.tooltip "Torbutton 설정 초기화"> <!ENTITY torbutton.prefs.sec_settings "보안 설정"> -<!ENTITY torbutton.prefs.block_thread "Tor 사용하는 동안 히스토리를 외부에서 읽어가는 것을 막기 (중요)"> -<!ENTITY torbutton.prefs.block_thwrite "Tor 사용중 히스토리 쓰기 막기 (추천)"> -<!ENTITY torbutton.prefs.block_nthread "Tor를 사용하지 않을 때 히스토리를 외부에서 읽어가는 것을 막기 (선택)"> -<!ENTITY torbutton.prefs.block_nthwrite "Tor를 사용하지 않을 때 히스토리를 쓰는 것을 막기 (선택)"> -<!ENTITY torbutton.prefs.clear_history "Tor Toggle시 히스토리 초기화 (선택)"> -<!ENTITY torbutton.prefs.clear_cache " Tor Toggle 시 Tor 디스크 캐시를 막고 모든 캐시 초기화"> -<!ENTITY torbutton.prefs.block_cache "Tor 작동중 디스크와 메모리 캐시 접근 차단"> -<!ENTITY torbutton.prefs.cookie_jars "보호되는 영역에 일반 쿠키 저장"> -<!ENTITY torbutton.prefs.cookie_protection "선택하기 위한 쿠키 보호 다이어로그 사용"> -<!ENTITY torbutton.prefs.mmm_cookies "수동으로 3사 쿠키 관리(위험)"> -<!ENTITY torbutton.prefs.clear_cookies "Tor toggle에서 쿠키 초기화"> -<!ENTITY torbutton.prefs.disable_plugins "Tor 사용중 플러그인 비활성화 (중요)"> +<!ENTITY torbutton.prefs.block_thread "Tor 사용 시, 사용 기록을 외부에서 읽어가는 것을 차단 (중요)"> +<!ENTITY torbutton.prefs.block_thwrite "Tor 사용 시, 사용 기록을 남기지 않기 (추천)"> +<!ENTITY torbutton.prefs.block_nthread "Tor를 사용하지 않을 때, 사용 기록을 외부에서 읽어가는 것을 차단 (선택)"> +<!ENTITY torbutton.prefs.block_nthwrite "Tor를 사용하지 않을 때, 사용 기록 쓰는 것을 막기 (선택)"> +<!ENTITY torbutton.prefs.clear_history "Tor 작동 시 사용 기록 초기화 (선택)"> +<!ENTITY torbutton.prefs.clear_cache "Tor 작동 시 Tor가 임시폴더에 기록되는 것을 차단하고, 임시폴더 초기화"> +<!ENTITY torbutton.prefs.block_cache "Tor 작동 중 Tor가 임시폴더에 기록되는 것을 차단"> +<!ENTITY torbutton.prefs.cookie_jars "보호되는 영역에 일반 임시파일 저장"> +<!ENTITY torbutton.prefs.cookie_protection "쿠키 보호 선택 사용"> +<!ENTITY torbutton.prefs.mmm_cookies "수동으로 임시파일 관리 (위험)"> +<!ENTITY torbutton.prefs.clear_cookies "Tor 작동 시 모든 임시파일 삭제"> +<!ENTITY torbutton.prefs.disable_plugins "Tor 사용 중 플러그인 비활성화 (중요)"> <!ENTITY torbutton.prefs.kill_bad_js "위험한 자바스크립트 차단 (중요)"> -<!ENTITY torbutton.prefs.isolate_content "Tor 상태에서 동적인 콘텐츠 격리 (중요)"> +<!ENTITY torbutton.prefs.isolate_content "자동 실행되는 콘텐츠를 Tor 상태에서 격리 (중요)"> <!ENTITY torbutton.prefs.no_updates "Tor 브라우저 사용중 업데이트 비활성화"> -<!ENTITY torbutton.prefs.set_uagent "Tor 사용시 유저 에이전트 설정 (중요)"> -<!ENTITY torbutton.prefs.dynamic "동적 콘텐츠"> +<!ENTITY torbutton.prefs.set_uagent "Tor 사용 시 사용자 에이전트 설정 (중요)"> +<!ENTITY torbutton.prefs.dynamic "자동 실행 콘텐츠"> <!ENTITY torbutton.prefs.cookies "쿠키"> <!ENTITY torbutton.prefs.cache "캐시"> <!ENTITY torbutton.prefs.history "방문/탐색 기록"> -<!ENTITY torbutton.prefs.no_search "Tor 사용중 검색 엔진 제안 비활성화 (추천)"> +<!ENTITY torbutton.prefs.no_search "Tor 사용중 검색 엔진의 추천을 비활성화 (추천)"> <!ENTITY torbutton.prefs.shutdown "종료"> -<!ENTITY torbutton.prefs.tor_shutdown "Tor가 활성화된 브라우저가 종료 시 3사 쿠키 삭제"> -<!ENTITY torbutton.prefs.all_shutdown "전체 인터넷 브라우저 종료 시 3사 쿠키 삭제"> +<!ENTITY torbutton.prefs.tor_shutdown "Tor가 활성화된 브라우저가 종료 시 모든 쿠키 삭제"> +<!ENTITY torbutton.prefs.all_shutdown "전체 인터넷 브라우저 종료 시 모든 쿠키 삭제"> <!ENTITY torbutton.prefs.no_shutdown "종료시 쿠키를 삭제하지 않음"> <!ENTITY torbutton.prefs.disable_sessionstore "세션을 저장하지 않음 (추천)"> <!ENTITY torbutton.prefs.headers "헤더"> -<!ENTITY torbutton.prefs.spoof_english "US 영어 브라우저로 조작"> +<!ENTITY torbutton.prefs.spoof_english "미국식 영어 브라우저로 조작"> <!ENTITY torbutton.prefs.refererspoofing "리퍼러 스푸핑"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.prefs.smartspoof "Tor 사용시 스마트 리퍼러 조작 (도메인 리퍼러를 가로질러 조작)"> diff --git a/src/chrome/locale/pl/brand.dtd b/src/chrome/locale/pl/brand.dtd index 4cc23fd..5f8db34 100644 --- a/src/chrome/locale/pl/brand.dtd +++ b/src/chrome/locale/pl/brand.dtd @@ -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/. --> -<!ENTITY brandShortName "PrzeglądarkaTor'a"> -<!ENTITY brandFullName "Przeglądarka Tor'a"> +<!ENTITY brandShortName "Przeglądarka Tor"> +<!ENTITY brandFullName "Przeglądarka Tor"> <!ENTITY vendorShortName "Project Tor"> <!ENTITY trademarkInfo.part1 "Firefox i jego loga są znakami towarowymi Mozilla Foundation."> diff --git a/src/chrome/locale/pl/brand.properties b/src/chrome/locale/pl/brand.properties index 6283369..d40c141 100644 --- a/src/chrome/locale/pl/brand.properties +++ b/src/chrome/locale/pl/brand.properties @@ -2,8 +2,8 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=PrzeglądarkaTor'a -brandFullName=Przeglądarka Tor'a +brandShortName=Przeglądarka Tor +brandFullName=Przeglądarka Tor vendorShortName=Project Tor homePageSingleStartMain=Firefox Start, szybka strona domowa z wbudowana wyszukiwarką diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd index bb88dbe..3e93e2d 100644 --- a/src/chrome/locale/pl/torbutton.dtd +++ b/src/chrome/locale/pl/torbutton.dtd @@ -16,7 +16,7 @@ <!ENTITY torbutton.about.code "Wkłady kodu:"> <!ENTITY torbutton.about.maintainer "Opiekun:"> <!ENTITY torbutton.about.security_review "Przegląd bezpieczeństwa:"> -<!ENTITY torbutton.about.donate "Jeśil lubisz korzystać z Tora, możesz rozważyć"> +<!ENTITY torbutton.about.donate "Jeśli lubisz korzystać z Tora, możesz rozważyć"> <!ENTITY torbutton.about.make_donation "złożenie dotacji."> <!ENTITY torbutton.pref_connection.notice "Aby zmienić te ustawienia wyłącz Torbutton."> <!ENTITY torbutton.pref_connection.more_info "Więcej informacji"> @@ -24,7 +24,7 @@ <!ENTITY torbutton.pref_connection_more_info.text "Torbutton jest włączony. Jeśli chcesz zmienić inne ustawienia proxy musisz wyłączyć Torbutton i powrócić tutaj. Jeśli chcesz zmienić ustawienia proxy Tor, zrób to tutaj."> <!ENTITY torbutton.context_menu.new_identity "Nowa Tożsamość"> <!ENTITY torbutton.context_menu.new_identity_key "o"> -<!ENTITY torbutton.context_menu.toggle "Zmień status Tor"> +<!ENTITY torbutton.context_menu.toggle "Zmień status Tora"> <!ENTITY torbutton.context_menu.toggle.key "Z"> <!ENTITY torbutton.context_menu.preferences "Ustawienia"> <!ENTITY torbutton.context_menu.preferences.key "U"> @@ -60,7 +60,7 @@ <!ENTITY torbutton.prefs.kill_bad_js "Nadzoruj niebezpieczne skrypty (krytyczne)"> <!ENTITY torbutton.prefs.isolate_content "Izoluj treść dynamiczną (krytyczne)"> <!ENTITY torbutton.prefs.no_updates "Wyłącz uaktualnienia podczas używanie Tora"> -<!ENTITY torbutton.prefs.set_uagent "Ustaw identyfikację przeglądarki podczas używania Tora (ważne)"> +<!ENTITY torbutton.prefs.set_uagent "Ustaw identyfikację przeglądarki podczas używania Tora (krytyczne)"> <!ENTITY torbutton.prefs.dynamic "Zawartość dynamiczna"> <!ENTITY torbutton.prefs.cookies "Ciasteczka"> <!ENTITY torbutton.prefs.cache "Pamięć podręczna"> diff --git a/src/chrome/locale/pl/torbutton.properties b/src/chrome/locale/pl/torbutton.properties index ddc1acb..3cbc268 100644 --- a/src/chrome/locale/pl/torbutton.properties +++ b/src/chrome/locale/pl/torbutton.properties @@ -16,15 +16,15 @@ torbutton.popup.test.success = Test proxy zakończony pomyślnie! torbutton.popup.test.failure = Test proxy się NIE POWIÓDŁ! Sprawdź swoje ustawienia proxy i Polipo. torbutton.popup.test.confirm_toggle = Najnowszemu testowi proxy Tor nie udało się skorzystać z Tora.\n\nNa pewno chcesz włączyć mimo tego?\n\nUwaga: Jeśli problem został poprawiony, możesz ponownie uruchomić test w oknie Preferencji Proxy Torbuttona, aby wyłączyć to ostrzeżenie. torbutton.popup.test.ff3_notice = Kliknij OK aby przetestować ustawienia proxy. Testowanie odbywa się w tle. Prosimy o cierpliwość. -torbutton.panel.label.verified = Tor obecny +torbutton.panel.label.verified = Tor zweryfikowany torbutton.popup.test.auto_failed = Automatyczny test proxy Tora zakończył się niepowodzeniem.\n\nCzy mimo to chcesz kontynuować? torbutton.prefs.recommended = (zalecane) torbutton.prefs.optional = (opcjonalnie) -torbutton.prefs.crucial = (wymagane) +torbutton.prefs.crucial = (krytyczne) torbutton.popup.external.title = Załadować zewnętrzną zawartość? -torbutton.popup.external.app = Zawnętrzna aplikacja jest wymagana, aby obsłużyć:\n\n +torbutton.popup.external.app = Zewnętrzna aplikacja jest wymagana, aby obsłużyć:\n\n torbutton.popup.external.note = \n\nUWAGA: Zewnętrzne aplikacje NIE są domyślnie bezpieczne przy używaniu Tora i mogą Cię odkryć!\n -torbutton.popup.external.suggest = \nJesli ten plik jest niezaufany, powinno się go zachować do oglądania offline lub w maszynie wirtualnej,\nlub rozważyć używanie przezroczystego proxy Tor, jak Tails LiveCD lub torsocks.\n +torbutton.popup.external.suggest = \nJeśli ten plik jest niezaufany, powinno się go zachować do oglądania offline lub w maszynie wirtualnej,\nlub rozważyć używanie przezroczystego proxy Tor, jak Tails LiveCD lub torsocks.\n torbutton.popup.launch = Uruchom aplikację torbutton.popup.cancel = Anuluj torbutton.popup.dontask = Od teraz zawsze uruchamiaj aplikacje @@ -33,9 +33,9 @@ torbutton.popup.captcha.title = Unikać Google Captcha? torbutton.popup.captcha.ask = Torbutton wykrył Google Captcha. Czy chcesz, aby Cię przekierować na inną wyszukiwarkę dla tego zapytania? torbutton.popup.captcha.always = Od teraz zawsze wykonuj tę akcję torbutton.popup.redirect = Przekieruj -torbutton.popup.no_redirect = Nie przekierowywuj +torbutton.popup.no_redirect = Nie przekierowuj torbutton.popup.prompted_language = Aby dać Ci więcej prywatności, Torbutton może żądać angielskich wersji stron internetowych. To może spowodować, że strony, które wolisz czytać we własnym języku będą się zamiast tego wyświetlać po angielsku.\n\nCzy chcesz żądać stron w języku angielskim dla lepszej prywatności? -torbutton.popup.no_newnym = Torbutton nie może bezpiecznie dać Ci nowej tożsamości. Nie ma dostępu do Portu Kontrolnego Tora.\n\nUzywasz Paczki Tora z Przeglądarką? +torbutton.popup.no_newnym = Torbutton nie może bezpiecznie dać Ci nowej tożsamości. Nie ma dostępu do Portu Kontrolnego Tora.\n\nUżywasz Paczki Tora z Przeglądarką? torbutton.popup.use_tbb = Wygląda na to, że używasz Torbuttona z Firefoksem, co już nie jest zalecaną bezpieczną konfiguracją.\n\nZamiast tego, zalecamy pobranie najnowszej Paczki Tora z Przeglądarką poprzez wysłanie e-maila na gettor(a)torproject.org lub pobranie jej pod następującym adresem: torbutton.popup.pref_error = Torbutton nie może zaktualizować preferencji w katalogu profilowym Przeglądarki Tora. torbutton.popup.permission_denied = Proszę albo ponownie ustawić uprawnienia do katalogu Przeglądarki Tora albo skopiować go w nowe miejsce. diff --git a/src/chrome/locale/pt/brand.properties b/src/chrome/locale/pt/brand.properties index 2277fd1..e08b760 100644 --- a/src/chrome/locale/pt/brand.properties +++ b/src/chrome/locale/pt/brand.properties @@ -6,7 +6,7 @@ brandShortName=Navegador Tor brandFullName=Navegador Tor vendorShortName=Projeto Tor -homePageSingleStartMain=Página inicial Firefox, uma página inicial com busca incluída +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 diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv/aboutTor.dtd index 9f14022..d3b5e1f 100644 --- a/src/chrome/locale/sv/aboutTor.dtd +++ b/src/chrome/locale/sv/aboutTor.dtd @@ -4,44 +4,45 @@ - vim: set sw=2 sts=2 ts=8 et syntax=xml: --> -<!ENTITY aboutTor.title "About Tor"> +<!ENTITY aboutTor.title "Om Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date."> -<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update."> +<!ENTITY aboutTor.outOfDateTorOn.label "EMELLERTID, denna webbläsare är ej uppdaterad."> +<!ENTITY aboutTor.outOfDateTorOff.label "DESSUTOM, denna webbläsare är ej uppdaterad."> +<!ENTITY aboutTor.outOfDate2.label "Klicka på löken och välj sedan Ladda ner uppdatering för Tor Browser Bundle."> -<!ENTITY aboutTor.check.label "Test Tor Network Settings"> +<!ENTITY aboutTor.check.label "Testa nätverksinställningarna för Tor"> -<!ENTITY aboutTor.success.label "Congratulations!"> -<!ENTITY aboutTor.success2.label "This browser is configured to use Tor."> -<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously."> -<!ENTITY aboutTor.failure.label "Something Went Wrong!"> -<!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> -<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact "> +<!ENTITY aboutTor.success.label "Gratulerar!"> +<!ENTITY aboutTor.success2.label "Denna webbläsare är konfigurerad att använda Tor."> +<!ENTITY aboutTor.success3.label "Du kan nu surfa på nätet anonymt."> +<!ENTITY aboutTor.failure.label "Någonting gick fel!"> +<!ENTITY aboutTor.failure2.label "Tor fungerar inte i den här webbläsaren."> +<!ENTITY aboutTor.failure3prefix.label "För assistans (på engelska), vänligen kontakta"> <!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> <!ENTITY aboutTor.failure3suffix.label "."> -<!ENTITY aboutTor.search.label "Search"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> +<!ENTITY aboutTor.search.label "Sök"> + +<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.torInfo1.label "Additional Info:"> -<!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> -<!ENTITY aboutTor.torInfo3.label "Exit Node:"> -<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors."> -<!ENTITY aboutTor.whatnextQuestion.label "What Next?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> -<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »"> +<!ENTITY aboutTor.torInfo1.label "Ytterligare information:"> +<!ENTITY aboutTor.torInfo2.label "Land och IP-adress:"> +<!ENTITY aboutTor.torInfo3.label "Exit nod:"> +<!ENTITY aboutTor.torInfo4.label "Den här servern sparar inte någon information om besökare."> +<!ENTITY aboutTor.whatnextQuestion.label "Och nu då?"> +<!ENTITY aboutTor.whatnextAnswer.label "Tor är INTE allt som behövs för att vara anonym på nätet! Du behöver kanske ändra några av dina vanor för att försäkra att din identitet förblir skyddad."> +<!ENTITY aboutTor.whatnext.label "Tips på hur man förblir anonym »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.helpInfo1.label "You Can Help!"> -<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> -<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »"> +<!ENTITY aboutTor.helpInfo1.label "Du kan hjälpa till!"> +<!ENTITY aboutTor.helpInfo2.label "Det finns många sätt du kan hjälpa till med att göra Tor-nätverket snabbare och säkrare:"> +<!ENTITY aboutTor.helpInfo3.label "Kör ett Tor-relä »"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services »"> +<!ENTITY aboutTor.helpInfo4.label "Erbjud din hjälp »"> <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "Make a Donation »"> +<!ENTITY aboutTor.helpInfo5.label "Donera »"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> -<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy."> -<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project »"> +<!ENTITY aboutTor.footer.label "Tor projektet är en US 501(c)(3) non-profit organisation som utför forskning, utveckling, och utbildning inom online anonymitet och integritet."> +<!ENTITY aboutTor.learnMore.label "Mer information om Tor-projektet »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> diff --git a/src/chrome/locale/sv/brand.dtd b/src/chrome/locale/sv/brand.dtd index 76e405d..bb0174f 100644 --- a/src/chrome/locale/sv/brand.dtd +++ b/src/chrome/locale/sv/brand.dtd @@ -3,6 +3,6 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <!ENTITY brandShortName "TorBrowser"> -<!ENTITY brandFullName "Tor Browser"> -<!ENTITY vendorShortName "Tor Project"> -<!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> +<!ENTITY brandFullName "Tor webbläsaren"> +<!ENTITY vendorShortName "Tor projektet"> +<!ENTITY trademarkInfo.part1 "Firefox och Firefox logotypen är varumärken tillhörande Mozilla Foundation."> diff --git a/src/chrome/locale/sv/brand.properties b/src/chrome/locale/sv/brand.properties index 9ae168e..3bf264b 100644 --- a/src/chrome/locale/sv/brand.properties +++ b/src/chrome/locale/sv/brand.properties @@ -3,13 +3,13 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. brandShortName=TorBrowser -brandFullName=Tor Browser -vendorShortName=Tor Project +brandFullName=Tor webbläsaren +vendorShortName=Tor projektet -homePageSingleStartMain=Firefox Start, a fast home page with built-in search -homePageImport=Import your home page from %S +homePageSingleStartMain=Firefox Start, en snabb hemsida med inbyggd sökfunktion +homePageImport=Importera din hemsida från %S -homePageMigrationPageTitle=Home Page Selection -homePageMigrationDescription=Please select the home page you wish to use: +homePageMigrationPageTitle=Val av hemsida +homePageMigrationDescription=Välj den hemsida du önskar använda: -syncBrandShortName=Sync +syncBrandShortName=Synka diff --git a/src/chrome/locale/sv/browser.properties b/src/chrome/locale/sv/browser.properties index 295a03a..cade860 100644 --- a/src/chrome/locale/sv/browser.properties +++ b/src/chrome/locale/sv/browser.properties @@ -2,7 +2,7 @@ browser.startup.homepage=about:tor # Spell checker dictionary -spellchecker.dictionary=en_US +spellchecker.dictionary=sv_SE # Default search engine browser.search.defaultenginename=Startpage diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd index 975c25b..fa580d4 100644 --- a/src/chrome/locale/sv/torbutton.dtd +++ b/src/chrome/locale/sv/torbutton.dtd @@ -31,7 +31,7 @@ <!ENTITY torbutton.context_menu.about "Om Torbutton..."> <!ENTITY torbutton.context_menu.about.key "O"> <!ENTITY torbutton.context_menu.networksettings "Öppna nätverksinställningar..."> -<!ENTITY torbutton.context_menu.networksettings.key "S"> +<!ENTITY torbutton.context_menu.networksettings.key "Ö"> <!ENTITY torbutton.context_menu.downloadUpdate "Ladda ner uppdatering för Tor Browser Bundle..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Skyddade kakor"> @@ -113,13 +113,13 @@ <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> <!ENTITY torbutton.prefs.no_proxies_on "Ingen proxy för:"> -<!ENTITY torbutton.prefs.no_proxy_warning "Varning: Undvik att använda värdnamn ovanför"> +<!ENTITY torbutton.prefs.no_proxy_warning "Varning: Undvik att använda värdnamn här ovan"> <!ENTITY torbutton.prefs.spoofreresh "Spoof Uppdatering"> <!ENTITY torbutton.prefs.refereroptions "Referens Spoofing Alternativ"> -<!ENTITY torbutton.prefs.nospoof "Spoofa inte referens"> +<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)"> <!ENTITY torbutton.prefs.spoofroot "Spoofa den innefattande mappen av sidan"> <!ENTITY torbutton.prefs.spoofdomain "Spoofa domain som referens"> -<!ENTITY torbutton.prefs.spoofblank "Gör referens blank"> +<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.cookiedialog.title "Hantera skyddade kakor"> <!ENTITY torbutton.cookiedialog.lockCol "Skyddad"> <!ENTITY torbutton.cookiedialog.domainCol "Värd"> @@ -131,7 +131,7 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Ta bort alla icke-skyddade"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Skydda nya kakor"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Skydda inte nya kakor"> -<!ENTITY torbutton.prefs.disable_livemarks "Inaktivera Livemark uppdateringar när Tor används"> +<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> <!ENTITY torbutton.prefs.dtd_recommended "(rekommenderat)"> <!ENTITY torbutton.prefs.dtd_optional "(valfritt)"> <!ENTITY torbutton.prefs.dtd_crucial "(viktigt)"> @@ -143,7 +143,7 @@ <!ENTITY torbutton.prefs.engine4 "startpage.com"> <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> <!ENTITY torbutton.prefs.fix_google_srch "Ta bort plattform och språk från Google Sök Box förfrågningar"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torifikation (Kräver skräddarsydd transproxy eller Tor router)"> +<!ENTITY torbutton.prefs.transparentTor "Transparent torifikation (Kräver skräddarsydd transproxy eller Tor router)"> <!ENTITY torbutton.prefs.block_disk "Spara ingen historik eller webbplatsdata (aktiverar privat surfning)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Begränsa tredjepartskakor och annan tracking data"> <!ENTITY torbutton.prefs.block_plugins "Inaktivera insticksmoduler (så som Flash)"> diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties index ac3858d..0a13a4e 100644 --- a/src/chrome/locale/sv/torbutton.properties +++ b/src/chrome/locale/sv/torbutton.properties @@ -34,14 +34,14 @@ torbutton.popup.captcha.ask = Torbutton upptäckte en Google Captcha. Vill du at torbutton.popup.captcha.always = Utför alltid denna åtgärd från och med nu torbutton.popup.redirect = Omdirigera torbutton.popup.no_redirect = Omdirigera inte -torbutton.popup.prompted_language = För att ge dig mer privatliv kan Torbutton begära en Engelsk version av webbsidor. Detta kan göra att webbsidor som du föredrar att läsa på ett annat språk visas på Engelska istället.\\n\\n Vill du visa sidor på Engelska för bättre privatliv? +torbutton.popup.prompted_language = För att ge dig mer privatliv kan Torbutton begära en Engelsk version av webbsidor. Detta kan göra att webbsidor som du föredrar att läsa på ett annat språk visas på Engelska istället.\\\n\\\n Vill du visa sidor på Engelska för bättre privatliv? torbutton.popup.no_newnym = Torbutton kan inte säkert ge dig en ny identitet. Det har inte tillgång till Tor Control Port.\n\nKör du Tor Browser Bundle? torbutton.popup.use_tbb = Det verkar som om du använder Torknappen med Firefox, vilket inte längre är en rekommenderad säker konfiguration.\n\nIstället rekommenderar vi dig att ladda ner den senaste Tor Browser Bundle genom att skicka ett mail till gettor(a)torproject.org eller ladda ner den på följande URL: torbutton.popup.pref_error = Torbutton kan inte uppdatera inställningar i Tor Browser profilen katalog. torbutton.popup.permission_denied = Du antingen återställa behörigheterna Tor Browser katalogen eller kopiera den till en ny plats. torbutton.popup.device_full = Skivan verkar vara full. Vänligen frigöra utrymme eller flytta Tor webbläsare till en ny enhet. torbutton.title.prompt_torbrowser = Viktig Torbutton Information -torbutton.popup.prompt_torbrowser = Torbutton fungerar annorlunda nu: Du kan inte slå av den längre.\n\nVi gjorde denna förändring eftersom det inte är säkert att använda Torbutton i en webbläsare som också används för icke-Tor surfning. Det var för många buggar som vi inte kunde fixa på något annat sätt.\n\nOm du vill fortsätta använda Firefox normalt så bör du avinstallera Torknappen och ladda ner Tor Browser Bundle. Tor Webbläsaren skyddar ditt privatliv bättre än vanliga Firefox, även när Firefox används med Torknappen.\n\nFör att ta bort Torbutton, gå till Verktyg->Tillägg->Tillägg och klicka på Ta Bort knappen bredvid Torknappen. +torbutton.popup.prompt_torbrowser = Torbutton fungerar annorlunda nu: Du kan inte slå av den längre.\n\nVi gjorde denna förändring eftersom det inte är säkert att använda Torbutton i en webbläsare som också används för icke-Tor surfning. Det var för många buggar som vi inte kunde fixa på något annat sätt.\n\nOm du vill fortsätta använda Firefox normalt så bör du avinstallera Torknappen och ladda ner Tor Browser Bundle. Tor Webbläsaren skyddar ditt privatliv bättre än vanliga Firefox, även när Firefox används med Torknappen.\n\nFör att ta bort Torbutton, gå till Verktyg->Tillägg->Tillägg och klicka på Ta Bort knappen bredvid Torknappen. torbutton.popup.short_torbrowser = Viktig Torbutton information!\n\nTorbutton är nu alltid aktiverad.\n\nKlicka på Torbutton för mer information. torbutton.popup.confirm_plugins = Insticksmoduler så som Flash kan äventyra din anonymitet och personliga integritet.\n\nDe kan också kringgå Tor för att avslöja var du befinner dig och vad din IP-adress är.\n\nÄr du säker på att du vill aktivera insticksmoduler?\n\n diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd index 9f14022..8000e0f 100644 --- a/src/chrome/locale/tr/aboutTor.dtd +++ b/src/chrome/locale/tr/aboutTor.dtd @@ -4,44 +4,45 @@ - vim: set sw=2 sts=2 ts=8 et syntax=xml: --> -<!ENTITY aboutTor.title "About Tor"> +<!ENTITY aboutTor.title "Tor Hakkında"> -<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date."> -<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update."> +<!ENTITY aboutTor.outOfDateTorOn.label "AMA, bu tarayıcı güncel değil."> +<!ENTITY aboutTor.outOfDateTorOff.label "AYRICA, bu tarayıcı güncel değil."> +<!ENTITY aboutTor.outOfDate2.label "Soğan'a tıklayın ve Tor Tarayıcı'yı güncelleyin."> -<!ENTITY aboutTor.check.label "Test Tor Network Settings"> +<!ENTITY aboutTor.check.label "Tor Ağ ayarlarını test edin"> -<!ENTITY aboutTor.success.label "Congratulations!"> -<!ENTITY aboutTor.success2.label "This browser is configured to use Tor."> -<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously."> -<!ENTITY aboutTor.failure.label "Something Went Wrong!"> -<!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> -<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact "> +<!ENTITY aboutTor.success.label "Tebrikler!"> +<!ENTITY aboutTor.success2.label "Bu tarayıcı Tor kullanımı için yapılandırılmıştır."> +<!ENTITY aboutTor.success3.label "Şimdi İnternet'i anonim olarak kullanmakta özgürsünüz!"> +<!ENTITY aboutTor.failure.label "Üzgünüz, bir şeyler yanlış gitti!"> +<!ENTITY aboutTor.failure2.label "Bu tarayıcıda Tor çalışmıyor."> +<!ENTITY aboutTor.failure3prefix.label "Yardım için %S ile bağlantıya geçin."> <!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> <!ENTITY aboutTor.failure3suffix.label "."> -<!ENTITY aboutTor.search.label "Search"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> +<!ENTITY aboutTor.search.label "Ara"> + +<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.torInfo1.label "Additional Info:"> -<!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> -<!ENTITY aboutTor.torInfo3.label "Exit Node:"> -<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors."> -<!ENTITY aboutTor.whatnextQuestion.label "What Next?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> -<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »"> +<!ENTITY aboutTor.torInfo1.label "Ek bilgi:"> +<!ENTITY aboutTor.torInfo2.label "Ülke ve IP Adresi:"> +<!ENTITY aboutTor.torInfo3.label "Çıkış düğümü:"> +<!ENTITY aboutTor.torInfo4.label "Bu sunucu ziyaretçiler ile ilgili herhangi bir bilgi toplamaz."> +<!ENTITY aboutTor.whatnextQuestion.label "Sırada ne var?"> +<!ENTITY aboutTor.whatnextAnswer.label "Tor, anonim kalmanız için tüm ihtiyacınız olan şey değildir! Kimliğinizin güvende kalması için bazı İnternet alışkanlıklarınızı değiştirmeniz gerekebilir."> +<!ENTITY aboutTor.whatnext.label "Anonim kalmak için püf noktalar »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.helpInfo1.label "You Can Help!"> -<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> -<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »"> +<!ENTITY aboutTor.helpInfo1.label "Yardım edebilirsiniz!"> +<!ENTITY aboutTor.helpInfo2.label "Tor ağını daha hızlı ve daha güçlü yapmamız konusunda yardım edebilmeniz için bir çok yol var:"> +<!ENTITY aboutTor.helpInfo3.label "Tor aktarım düğümünü çalıştır »"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services »"> +<!ENTITY aboutTor.helpInfo4.label "Servislerinizi gönüllü yapın »"> <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "Make a Donation »"> +<!ENTITY aboutTor.helpInfo5.label "Yardımda bulunun »"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> -<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy."> -<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project »"> +<!ENTITY aboutTor.footer.label "Tor Projesi çevrimiçi gizlilik ve mahremiyet araştırma, geliştirme ve eğitime adanmış bir ABD 501(c)(3) kar amacı gütmeyen bir kuruluştur."> +<!ENTITY aboutTor.learnMore.label "Tor Projesi hakkında daha çok şey öğrenin »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> diff --git a/src/chrome/locale/tr/brand.dtd b/src/chrome/locale/tr/brand.dtd index 76e405d..68f8c1c 100644 --- a/src/chrome/locale/tr/brand.dtd +++ b/src/chrome/locale/tr/brand.dtd @@ -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/. --> -<!ENTITY brandShortName "TorBrowser"> -<!ENTITY brandFullName "Tor Browser"> -<!ENTITY vendorShortName "Tor Project"> -<!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> +<!ENTITY brandShortName "TorTarayıcı"> +<!ENTITY brandFullName "Tor Tarayıcı"> +<!ENTITY vendorShortName "Tor Projesi"> +<!ENTITY trademarkInfo.part1 "Firefox ve Firefox logoları Mozilla Vakfı'nın ticari markalarıdır."> diff --git a/src/chrome/locale/tr/brand.properties b/src/chrome/locale/tr/brand.properties index 9ae168e..a4220f9 100644 --- a/src/chrome/locale/tr/brand.properties +++ b/src/chrome/locale/tr/brand.properties @@ -2,14 +2,14 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser -brandFullName=Tor Browser -vendorShortName=Tor Project +brandShortName=TorTarayıcı +brandFullName=Tor Tarayıcı +vendorShortName=Tor Projesi -homePageSingleStartMain=Firefox Start, a fast home page with built-in search -homePageImport=Import your home page from %S +homePageSingleStartMain=Firefox Başlangıç, dahili arama barındıran hızlı bir başlangıç sayfası +homePageImport=%S 'deb başlangıç sayfanızı kopyalayın. -homePageMigrationPageTitle=Home Page Selection -homePageMigrationDescription=Please select the home page you wish to use: +homePageMigrationPageTitle=Başlangıç sayfası seçimi +homePageMigrationDescription=Lütfen kullanmak istediğiniz başlangıç sayfasını seçin: -syncBrandShortName=Sync +syncBrandShortName=Eşleştirme diff --git a/src/chrome/locale/tr/browser.properties b/src/chrome/locale/tr/browser.properties index 295a03a..55550a3 100644 --- a/src/chrome/locale/tr/browser.properties +++ b/src/chrome/locale/tr/browser.properties @@ -1,13 +1,13 @@ # Default home page -browser.startup.homepage=about:tor +browser.startup.homepage=hakkında:tor # Spell checker dictionary spellchecker.dictionary=en_US # Default search engine -browser.search.defaultenginename=Startpage +browser.search.defaultenginename=BaşlagıçSayfası # Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage +browser.search.order.1=BaşlagıçSayfası browser.search.order.2=DuckDuckGo browser.search.order.3=Google diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index f7e3030..3ebfeae 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -52,7 +52,7 @@ <!ENTITY torbutton.prefs.clear_history "Tor başlatılırken geçmişi temizle(önerilen)"> <!ENTITY torbutton.prefs.clear_cache "Tor devredeyken tüm önbelleklemeleri temizle"> <!ENTITY torbutton.prefs.block_cache "Disk ve önbellek erişimini engelle"> -<!ENTITY torbutton.prefs.cookie_jars 'Çerezleri korumalı "jar" dosyasında tut'> +<!ENTITY torbutton.prefs.cookie_jars "Çerezleri korumalı "jar" dosyasında tut"> <!ENTITY torbutton.prefs.cookie_protection "Seçmek için çerez seçenekleri dialogunu kullan"> <!ENTITY torbutton.prefs.mmm_cookies "Çerezlerimi kendim yönetmek istiyorum (tehlikeli)"> <!ENTITY torbutton.prefs.clear_cookies "Tor çalışırken tüm çerezleri temizle"> @@ -65,7 +65,7 @@ <!ENTITY torbutton.prefs.cookies "Çerezler"> <!ENTITY torbutton.prefs.cache "Önbellek"> <!ENTITY torbutton.prefs.history "Geçmiş"> -<!ENTITY torbutton.prefs.no_search 'Arama yaparken "öneriler" özelliğini devredışı bırak(tavsiye edilen)\'> +<!ENTITY torbutton.prefs.no_search "Arama yaparken "öneriler" özelliğini devredışı bırak(tavsiye edilen)\"> <!ENTITY torbutton.prefs.shutdown "Kapat"> <!ENTITY torbutton.prefs.tor_shutdown "Etkin-Devredışı bırakırken tüm çerezleri temizle"> <!ENTITY torbutton.prefs.all_shutdown "Tarayıcıyı kapattığımda tüm çerezleri temizle"> @@ -85,7 +85,7 @@ <!ENTITY torbutton.prefs.non_tor "Non-Tor"> <!ENTITY torbutton.prefs.restore_tor "Oturumunda restore başlangıç, Tor devlet ayarlamak için:"> <!ENTITY torbutton.prefs.startup_tor "Tarayıcı başlatıldığında Tor durumunu şu şekilde ayarla:"> -<!ENTITY torbutton.prefs.reload_crashed_jar 'Firefox çöktüğünde, çerezleri "jar" dosyalarından geri yükle(Tavsiye edilen)'> +<!ENTITY torbutton.prefs.reload_crashed_jar "Firefox çöktüğünde, çerezleri "jar" dosyalarından geri yükle(Tavsiye edilen)"> <!ENTITY torbutton.prefs.dual_cookie_jars "Tüm çerezleri korunan jar dosyalarında tut(tehlikeli)"> <!ENTITY torbutton.prefs.clear_http_auth "HTTP oturum doğrulamalarının tümünü temizle(önerilen)"> <!ENTITY torbutton.prefs.block_js_history "Tor çalışıyorken geçmiş bilgisinde gezinmeyi yasakla(kritik)"> @@ -116,10 +116,10 @@ <!ENTITY torbutton.prefs.no_proxy_warning "Uyarı: kaçının üzerinde herhangi bir sunucu isimleri kullanarak"> <!ENTITY torbutton.prefs.spoofreresh "Aldatmaca Yenile"> <!ENTITY torbutton.prefs.refereroptions "Referans Aldatmacası Ayarları"> -<!ENTITY torbutton.prefs.nospoof "Referanslarda aldatma yapma"> +<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)"> <!ENTITY torbutton.prefs.spoofroot "Geçerli klasör için aldatmaca kullan"> <!ENTITY torbutton.prefs.spoofdomain "Referans olarak alanı aldat"> -<!ENTITY torbutton.prefs.spoofblank "Refere edeni boş bırak"> +<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.cookiedialog.title "Çerez korumasını yönet"> <!ENTITY torbutton.cookiedialog.lockCol "Korunmuş"> <!ENTITY torbutton.cookiedialog.domainCol "Sunucu"> @@ -131,7 +131,7 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Korunanlar hariç tümünü sil"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Yeni çerezleri koru"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Yeni çerezleri koruma"> -<!ENTITY torbutton.prefs.disable_livemarks "Tor kullanımı sırasında devre dışı Livemark güncellemeleri"> +<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> <!ENTITY torbutton.prefs.dtd_recommended "(önerilen)"> <!ENTITY torbutton.prefs.dtd_optional "(isteğe bağlı)"> <!ENTITY torbutton.prefs.dtd_crucial "(kritik)"> diff --git a/src/chrome/locale/tr/torbutton.properties b/src/chrome/locale/tr/torbutton.properties index b5c560e..e7a3b1c 100644 --- a/src/chrome/locale/tr/torbutton.properties +++ b/src/chrome/locale/tr/torbutton.properties @@ -7,39 +7,39 @@ torbutton.panel.plugins.enabled = Eklentileri pasif hale getirmek için tıklay torbutton.panel.label.disabled = Tor Devredışı torbutton.panel.label.enabled = Tor Etkin extensions.torbutton(a)torproject.org.description = Torbutton Tor ayarlarını yapabileceğiniz ve hızlı ve kolayca gizli tarama verilerini silebileceğiniz bir düğme sağlar. -torbutton.popup.history.warning = Bu sekmeyi Tor aktifken kullanırken, Tor'u devre dışı bırakıp yenileyip ya da kullanmaya devam ederseniz, içerik otomatik olarak bloklanır.\n\nBu Firefox 409737 ve 417869 nolu hata raporlarını için bir çözümdür.\n\nHiçbir sebep yokken bu uyarı aldıysanız, muhtelemelen sekme kendini yenilemeye çalıştığı için engellenmiş olabilir.\n\nSekmeyi yenilemek için lütfen adres çubuğunu tıklayıp devam etmeyi deneyin.\n\n +torbutton.popup.history.warning = Torbutton, farklı bir Tor durumunda yüklenmiş bir sekmeden gelen etkinliği engelledi.\n\nBu Firefox 409737 ve 417869 nolu hata raporlarını için bir çözümdür.\n\nHiçbir sebep yokken bu uyarı aldıysanız, muhtelemelen sekme kendini yenilemeye çalıştığı için engellenmiş olabilir.\n\nSekmeyi yenilemek için lütfen adres çubuğunu tıklayıp 'enter' tuşuna basın.\n\n torbutton.popup.plugin.warning = Torbutton Tor'un eklenti içeriğini yüklemesini blokladı.\n\nFarklı Kaydet ile yapmayı deneyin.\n\n -torbutton.popup.confirm_ca_certs = Torbuton hatırlatma: Anlaşılan özel sertifakanız yok. Doğrulama bilgisi her zaman işlemleri yavaşlatır. Sertifika doğrulamalarını devredışı bırakmak ister misiniz? (Açıklamayı anlamadıysan, Tamam'a tıkla)\n +torbutton.popup.confirm_ca_certs = Torbuton hatırlatma: Anlaşılan özel sertifakanız yok. Doğrulama bilgisi her zaman işlemleri yavaşlatır. Sertifika doğrulamalarını devredışı bırakmak ister misiniz? (Açıklamayı anlamadıysan, Tamam'a tıkla)\n torbutton.popup.ff3.warning = Dikkat!\n\nFirefox 3'teki Torbuton yerel saatinizi bazı yerel bilgilerinizi gizlice gönderebilir?\n\nDevam etmek istiyor musunuz? -torbutton.popup.toggle.warning = Ayarların uygulanması için Tor'u yeniden başlatmanız gerekiyor.\n +torbutton.popup.toggle.warning = Ayarların uygulanması için Tor'u yeniden başlatmanız gerekiyor.\n torbutton.popup.test.success = Proxy testi başarılı! torbutton.popup.test.failure = Proxy testi başarısız oldu!Lütfen proxyinizi,Polippo ayarlarını kontrol ediniz. -torbutton.popup.test.confirm_toggle = Proxy başlatılamadı\n\nGenede başlatmak istermisin?\n\nNot: Problem çözüldüyse, tekrar proxy testini başlatıp, bu uyarı devredışı bırakabilirsin. +torbutton.popup.test.confirm_toggle = Proxy başlatılamadı\n\nGenede başlatmak istermisin?\n\nNot: Problem çözüldüyse, tekrar proxy testini başlatıp, bu uyarı devredışı bırakabilirsin. torbutton.popup.test.ff3_notice = Tamama tıklayarak proxy ayarlarını test edin. Test arkaplanda gerçekleşiyor.Lütfen bekleyin. torbutton.panel.label.verified = Doğrulandı torbutton.popup.test.auto_failed = Otomatik gerçekleşen proxy testi başarız oldu.\n\nDevam etmek ister misiniz? torbutton.prefs.recommended = (tavsiye edilir) torbutton.prefs.optional = (isteğe bağlı) -torbutton.prefs.crucial = -torbutton.popup.external.title = +torbutton.prefs.crucial = = +torbutton.popup.external.title = = torbutton.popup.external.app = Kullanmak için harici bir uygulama seç:\n\n torbutton.popup.external.note = \n\nNOT: Başka bir uyguluma sizin için güvenli olmayabilir!\n\n torbutton.popup.external.suggest = \nBu dosya güvenli değilse, ona internete bağlı değilken veya VM icinde kaydedin,\nya da Tails LiveCD gibi şeffaf bir Tor proxy veya torsocks tercih edin.\n -torbutton.popup.launch = Uygulamayı çalıştır\n -torbutton.popup.cancel = İptal\n -torbutton.popup.dontask = Şu andan itibaren uygulamayı sürekli çalıştır\r\n -torbutton.popup.test.no_http_proxy = Proxy test: Yerel proxy'e ulaşımıyor. Polippo düzgün çalışıyormu?\n -torbutton.popup.captcha.title = Google Captchas'ı atla -torbutton.popup.captcha.ask = Google Captcha algılandı. Aramana devam etmek için başka bir arama moturuna yönlendirmek istermisin? -torbutton.popup.captcha.always = Bu ayarı şu andan itibaren sürekli hale getir\n -torbutton.popup.redirect = Yönlendir -torbutton.popup.no_redirect = Yönlendirme +torbutton.popup.launch = Uygulamayı çalıştır\n +torbutton.popup.cancel = İptal\n +torbutton.popup.dontask = Şu andan itibaren uygulamayı sürekli çalıştır\r\n +torbutton.popup.test.no_http_proxy = Proxy test: Yerel proxy'e ulaşımıyor. Polippo düzgün çalışıyormu?\n +torbutton.popup.captcha.title = Google Captchas'ı atla +torbutton.popup.captcha.ask = Google Captcha algılandı. Aramana devam etmek için başka bir arama moturuna yönlendirmek istermisin? +torbutton.popup.captcha.always = Bu ayarı şu andan itibaren sürekli hale getir\n +torbutton.popup.redirect = Yönlendir +torbutton.popup.no_redirect = Yönlendirme torbutton.popup.prompted_language = Daha fazla gizlilik icin, Torbutton sayfaların İngilizce versiyonlarını göstermeye çalışır. Bu özellik sayfaları anadilinizde görememenize sebep olabilir.\n\nSiz de daha fazla gizlilik için sayfaların İngilizce versiyonarını görüntülemek ister misiniz? torbutton.popup.no_newnym = Torbutton size güvenli yeni bir kimlik sağlayamadı. Tor Control Port una giriş yapılamıyor.\n\nTor Browser Bundle nin çalıştığından emin olun. torbutton.popup.use_tbb = Görünüşe göre Turbutton u Firefox ile kullanıyorsunuz, bu tavsiye edilen bir güvenlik ayarlaması değildir.\n\nAslında, Size tavsiyemiz Tor Browseri gettor(a)torproject.org adresine mail göndererek veya şu adrese girerek edinmenizdir. torbutton.popup.pref_error = Torbutton, Tor Browser profil klasörünün içinde seçenekleri güncelleyemez. torbutton.popup.permission_denied = Lütfen Tor Browser klasörünün izinlerini sıfırlayın ya da O nu farklı bir konuma taşıyın. -torbutton.popup.device_full = Disk dolu gözüküyor. Lütfen diskte yer açın ya da Tor Browser i farklı bir konuma taşıyın. +torbutton.popup.device_full = Disk dolu gözüküyor. Lütfen diskte yer açın ya da Tor Browser i farklı bir konuma taşıyın. torbutton.title.prompt_torbrowser = Önemli Torbutton Bilgisi torbutton.popup.prompt_torbrowser = Torbutton şimdi farklı çalışıyor: artık kapatamıyorsunuz.\n\nBu değişikliği yaptık çünkü Tor kullanmadan da kullanılan tarayıcıyı Torbutton ile kullanmak güvenli değil. Başka türlü çözemeyeceğimiz birçok hata vardı.\n\nFirefox'u normal olarak kullanmak istiyorsanız, Torbutton'ı silmeli ve Tor Tarayıcı Paketini indirebilrsiniz. Tor tarayıcısının gizlilik ayarları da normal Firefox'dan, hatta Torbutton ile kullanan Firefox'dan daha üstün.\n\nTorbutton'ı kaldırmak için, Araçlar->Eklentiler->Uzantılar'a gidin ve Torbutton'ın yanındaki Kaldır düğmesine tıklayın. torbutton.popup.short_torbrowser = Önemli Torbutton bilgisi!\nTorbutton şimdi tamamen etkinleştirildi.\nDaha fazla bilgi için Torbutton'a tıklayınız. diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd index 7aa92ba..afb7da7 100644 --- a/src/chrome/locale/vi/aboutTor.dtd +++ b/src/chrome/locale/vi/aboutTor.dtd @@ -4,45 +4,45 @@ - vim: set sw=2 sts=2 ts=8 et syntax=xml: --> -<!ENTITY aboutTor.title ""> +<!ENTITY aboutTor.title "Thông tin về Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label ""> -<!ENTITY aboutTor.outOfDateTorOff.label ""> -<!ENTITY aboutTor.outOfDate2.label ""> +<!ENTITY aboutTor.outOfDateTorOn.label "Tuy nhiên, trình duyệt này đã lỗi thời."> +<!ENTITY aboutTor.outOfDateTorOff.label "Ngoài ra, trình duyệt này đã lỗi thời."> +<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update."> -<!ENTITY aboutTor.check.label ""> +<!ENTITY aboutTor.check.label "Test Tor Network Settings"> -<!ENTITY aboutTor.success.label ""> -<!ENTITY aboutTor.success2.label ""> -<!ENTITY aboutTor.success3.label ""> -<!ENTITY aboutTor.failure.label ""> -<!ENTITY aboutTor.failure2.label ""> -<!ENTITY aboutTor.failure3prefix.label ""> -<!ENTITY aboutTor.failure3Link ""> -<!ENTITY aboutTor.failure3suffix.label ""> +<!ENTITY aboutTor.success.label "Chúc mừng"> +<!ENTITY aboutTor.success2.label "Trình duyệt này được cấu hình để dùng Tor."> +<!ENTITY aboutTor.success3.label "Bây giờ bạn sẽ tự do lướt web ẩn danh."> +<!ENTITY aboutTor.failure.label "Có sai sót gì đó!"> +<!ENTITY aboutTor.failure2.label "Tor không hoạt động trên trình duyệt này."> +<!ENTITY aboutTor.failure3prefix.label "Để trợ giúp, vui lòng liên lạc"> +<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> +<!ENTITY aboutTor.failure3suffix.label "."> <!ENTITY aboutTor.search.label "Tìm kiếm"> -<!ENTITY aboutTor.searchSPPost.link ""> -<!ENTITY aboutTor.searchDDGPost.link ""> - -<!ENTITY aboutTor.torInfo1.label ""> -<!ENTITY aboutTor.torInfo2.label ""> -<!ENTITY aboutTor.torInfo3.label ""> -<!ENTITY aboutTor.torInfo4.label ""> -<!ENTITY aboutTor.whatnextQuestion.label ""> -<!ENTITY aboutTor.whatnextAnswer.label ""> -<!ENTITY aboutTor.whatnext.label ""> -<!ENTITY aboutTor.whatnext.link ""> -<!ENTITY aboutTor.helpInfo1.label ""> -<!ENTITY aboutTor.helpInfo2.label ""> -<!ENTITY aboutTor.helpInfo3.label ""> -<!ENTITY aboutTor.helpInfo3.link ""> -<!ENTITY aboutTor.helpInfo4.label ""> -<!ENTITY aboutTor.helpInfo4.link ""> -<!ENTITY aboutTor.helpInfo5.label ""> -<!ENTITY aboutTor.helpInfo5.link ""> - -<!ENTITY aboutTor.footer.label ""> -<!ENTITY aboutTor.learnMore.label ""> -<!ENTITY aboutTor.learnMore.link ""> +<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> +<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> + +<!ENTITY aboutTor.torInfo1.label "Additional Info:"> +<!ENTITY aboutTor.torInfo2.label "Quốc gia & Địa chỉ IP:"> +<!ENTITY aboutTor.torInfo3.label "Exit Node:"> +<!ENTITY aboutTor.torInfo4.label "Máy chủ này không ghi lại bất kỳ thông tin nào của khách truy cập."> +<!ENTITY aboutTor.whatnextQuestion.label "Điều gì tiếp theo?"> +<!ENTITY aboutTor.whatnextAnswer.label "Tor KHÔNG phải là tất cả những gì bạn cần để ẩn danh! Bạn cần nên thay đổi một vài thói quen lướt net để chắc chắn rằng danh tính của mình sẽ an toàn."> +<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »"> +<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.helpInfo1.label "You Can Help!"> +<!ENTITY aboutTor.helpInfo2.label "Có nhiều cách mà bạn có thể giúp mạng Tor nhanh hơn và tốt hơn."> +<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »"> +<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> +<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services »"> +<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> +<!ENTITY aboutTor.helpInfo5.label "Make a Donation »"> +<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> + +<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy."> +<!ENTITY aboutTor.learnMore.label "Tìm hiểu thêm về Tor Project"> +<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> diff --git a/src/chrome/locale/vi/brand.dtd b/src/chrome/locale/vi/brand.dtd index e34f480..76e405d 100644 --- a/src/chrome/locale/vi/brand.dtd +++ b/src/chrome/locale/vi/brand.dtd @@ -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/. --> -<!ENTITY brandShortName ""> -<!ENTITY brandFullName ""> -<!ENTITY vendorShortName ""> -<!ENTITY trademarkInfo.part1 ""> +<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandFullName "Tor Browser"> +<!ENTITY vendorShortName "Tor Project"> +<!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/vi/brand.properties b/src/chrome/locale/vi/brand.properties index 6598ccd..8f3610e 100644 --- a/src/chrome/locale/vi/brand.properties +++ b/src/chrome/locale/vi/brand.properties @@ -2,14 +2,14 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -# brandShortName=TorBrowser -# brandFullName=Tor Browser -# vendorShortName=Tor Project +brandShortName=TorBrowser +brandFullName=Tor Browser +vendorShortName=Tor Project -# homePageSingleStartMain=Firefox Start, a fast home page with built-in search -# homePageImport=Import your home page from %S +homePageSingleStartMain=Firefox Start, a fast home page with built-in search +homePageImport=Import your home page from %S -# homePageMigrationPageTitle=Home Page Selection -# homePageMigrationDescription=Please select the home page you wish to use: +homePageMigrationPageTitle=Home Page Selection +homePageMigrationDescription=Vui lòng chọn trang chủ mà bạn muốn dùng: -# syncBrandShortName=Sync +syncBrandShortName=Sync diff --git a/src/chrome/locale/vi/browser.properties b/src/chrome/locale/vi/browser.properties index fd25b10..295a03a 100644 --- a/src/chrome/locale/vi/browser.properties +++ b/src/chrome/locale/vi/browser.properties @@ -1,13 +1,13 @@ # Default home page -# browser.startup.homepage=about:tor +browser.startup.homepage=about:tor # Spell checker dictionary -# spellchecker.dictionary=en_US +spellchecker.dictionary=en_US # Default search engine -# browser.search.defaultenginename=Startpage +browser.search.defaultenginename=Startpage # Search engine order (order displayed in the search bar dropdown) -# browser.search.order.1=Startpage -# browser.search.order.2=DuckDuckGo -# browser.search.order.3=Google +browser.search.order.1=Startpage +browser.search.order.2=DuckDuckGo +browser.search.order.3=Google diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd index dd4b70e..13a3351 100644 --- a/src/chrome/locale/vi/torbutton.dtd +++ b/src/chrome/locale/vi/torbutton.dtd @@ -1,58 +1,58 @@ <!ENTITY torbutton.prefs.title "Tùy chỉnh Torbutton"> -<!ENTITY torbutton.prefs.tor_settings "Thiết lập Proxy"> -<!ENTITY torbutton.prefs.recommended_settings "Dùng thiết lập proxy đã khuyến nghị cho Firefox của tôi"> +<!ENTITY torbutton.prefs.tor_settings "Các Thiết lập Proxy"> +<!ENTITY torbutton.prefs.recommended_settings "Dùng thiết lập proxy khuyến nghị cho phiên bản trình duyệt Firefox của tôi"> <!ENTITY torbutton.prefs.use_privoxy "Dùng Privoxy"> <!ENTITY torbutton.prefs.use_polipo "Dùng Polipo"> <!ENTITY torbutton.prefs.custom_settings "Dùng thiết lập proxy tùy biến"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> +<!ENTITY torbutton.prefs.proxy.host.http "Proxy giao thức HTTP:"> +<!ENTITY torbutton.prefs.proxy.host.https "Proxy giao thức SSL:"> +<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy giao thức FTP:"> <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> <!ENTITY torbutton.prefs.proxy.port "Cổng:"> <!ENTITY torbutton.about.title "Thông tin về Torbutton"> -<!ENTITY torbutton.about.version "Version:"> -<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing."> -<!ENTITY torbutton.about.code "Code Contributors:"> -<!ENTITY torbutton.about.maintainer "Maintainer:"> -<!ENTITY torbutton.about.security_review "Security Review:"> -<!ENTITY torbutton.about.donate "If you like using Tor, you might consider"> -<!ENTITY torbutton.about.make_donation "making a donation."> -<!ENTITY torbutton.pref_connection.notice "Tắt Torbutton để thay đổi các thiết lập này."> -<!ENTITY torbutton.pref_connection.more_info "Thông tin thêm"> +<!ENTITY torbutton.about.version "Phiên bản:"> +<!ENTITY torbutton.about.summary "Bảo vệ sự riêng tư cho trình duyệt Tor của bạn."> +<!ENTITY torbutton.about.code "Mã số Cộng sự:"> +<!ENTITY torbutton.about.maintainer "Bộ Duy Trì:"> +<!ENTITY torbutton.about.security_review "Đánh giá tính Bảo mật:"> +<!ENTITY torbutton.about.donate "Nếu bạn muốn sử dụng Tor, bạn cần cân nhắc"> +<!ENTITY torbutton.about.make_donation "gửi đóng góp ủng hộ."> +<!ENTITY torbutton.pref_connection.notice "Vô hiệu Torbutton để thay đổi các thiết đặt này."> +<!ENTITY torbutton.pref_connection.more_info "Thêm thông tin"> <!ENTITY torbutton.pref_connection_more_info.title "Trợ giúp"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton hiện đang được bật. Nếu bạn muốn thay đổi thiết lập proxy không-Tor của bạn, vui lòng tắt Torbutton và quay trở lại đây. Nếu bạn muốn thay đổi thiết lập Tor, vui lòng dùng cửa sổ tùy chỉnh Torbutton."> +<!ENTITY torbutton.pref_connection_more_info.text "Torbutton hiện đang được hiệu hóa. Nếu bạn muốn thay đổi thiết lập proxy không thuộc chương trình Tor, vui lòng tắt Torbutton và quay trở lại đây. Nếu bạn muốn thay đổi thiết lập từ Tor, vui lòng dùng cửa sổ tùy chỉnh Torbutton."> <!ENTITY torbutton.context_menu.new_identity "Giám định Mới"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.toggle "Bật/tắt trạng thái Tor"> -<!ENTITY torbutton.context_menu.toggle.key "B"> +<!ENTITY torbutton.context_menu.toggle "Bật/tắt trạng thái của Tor"> +<!ENTITY torbutton.context_menu.toggle.key "T"> <!ENTITY torbutton.context_menu.preferences "Tùy chỉnh..."> -<!ENTITY torbutton.context_menu.preferences.key "y"> +<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.about "Thông tin về Torbutton..."> -<!ENTITY torbutton.context_menu.about.key "T"> -<!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> +<!ENTITY torbutton.context_menu.about.key "A"> +<!ENTITY torbutton.context_menu.networksettings "Mở các Thiết đặt Mạng..."> <!ENTITY torbutton.context_menu.networksettings.key "S"> -<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> -<!ENTITY torbutton.context_menu.downloadUpdate.key "T"> -<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> +<!ENTITY torbutton.context_menu.downloadUpdate "Tải về Bản cập nhật Bổ trợ cho Trình duyệt Tor..."> +<!ENTITY torbutton.context_menu.downloadUpdate.key "U"> +<!ENTITY torbutton.context_menu.cookieProtections "Cơ chế bảo vệ Cookie"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> -<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL"> -<!ENTITY torbutton.context_menu.copyTor.key "y"> -<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab"> +<!ENTITY torbutton.context_menu.copyTor "Sao chép địa chỉ URL của Tor"> +<!ENTITY torbutton.context_menu.copyTor.key "p"> +<!ENTITY torbutton.context_menu.openTorTab "Mở liên kết Tor URL trong Thẻ mới"> <!ENTITY torbutton.context_menu.openTorTab.key "r"> -<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window"> +<!ENTITY torbutton.context_menu.openTorWindow "Mở liên kết Tor URL trong Cửa sổ mới"> <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> -<!ENTITY torbutton.button.tooltip "Nhấn để nhận diện Torbutton"> +<!ENTITY torbutton.button.tooltip "Nhấp để nhận diện Torbutton"> <!ENTITY torbutton.prefs.sec_settings "Thiết lập Bảo mật"> -<!ENTITY torbutton.prefs.block_thread "Chặn việc đọc lược sử trong quá trình Tor (cấp thiết)"> -<!ENTITY torbutton.prefs.block_thwrite "Chặn việc ghi lược sử trong quá trình Tor (khuyến cáo)"> -<!ENTITY torbutton.prefs.block_nthread "Chặn việc đọc lược sử trong quá trình Không-Tor (phụ)"> -<!ENTITY torbutton.prefs.block_nthwrite "Chặn việc ghi lược sử trong quá trình Không-Tor (phụ)"> -<!ENTITY torbutton.prefs.clear_history "Xóa lược sử khi bật tắt Tor (phụ)"> -<!ENTITY torbutton.prefs.clear_cache "Chặn bộ đệm đĩa Tor và xóa tất cả các tập tin đệm khi bật tắt Tor"> -<!ENTITY torbutton.prefs.block_cache "Chặn truy cập bộ đệm trên đĩa và bộ nhớ trong quá trình Tor"> -<!ENTITY torbutton.prefs.cookie_jars "Lưu trữ cookie Không-Tor trong một tập tin jar được bảo vệ"> +<!ENTITY torbutton.prefs.block_thread "Chặn việc đọc lịch sử h.đ trong quá trình dùng Tor (cấp thiết)"> +<!ENTITY torbutton.prefs.block_thwrite "Chặn việc ghi lịch sử h.đ trong quá trình dùng Tor (khuyến cáo)"> +<!ENTITY torbutton.prefs.block_nthread "Chặn việc đọc lịch sử trong quá trình không dùng Tor (tùy chọn)"> +<!ENTITY torbutton.prefs.block_nthwrite "Chặn việc ghi lịch sử h.đ trong quá trình không dùng Tor (tùy chọn)"> +<!ENTITY torbutton.prefs.clear_history "Xóa lịch sử khi bật/tắt Tor (tùy chọn)"> +<!ENTITY torbutton.prefs.clear_cache "Chặn bộ nhớ đệm từ Tor và xóa tất cả các tập tin đệm khi bật tắt Tor"> +<!ENTITY torbutton.prefs.block_cache "Chặn truy cập bộ đệm trên đĩa và bộ nhớ trong quá trình dùng Tor"> +<!ENTITY torbutton.prefs.cookie_jars "Lưu trữ cookie không thuộc Tor trong một tập tin *.jar được bảo vệ"> <!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose"> <!ENTITY torbutton.prefs.mmm_cookies "Tôi sẽ tự quản lí cookie của tôi (nguy hiểm)"> <!ENTITY torbutton.prefs.clear_cookies "Xóa cookie khi bật tắt Tor"> diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd index 5d06afd..8e84ded 100644 --- a/src/chrome/locale/zh-CN/aboutTor.dtd +++ b/src/chrome/locale/zh-CN/aboutTor.dtd @@ -12,7 +12,7 @@ <!ENTITY aboutTor.check.label "测试 Tor 网络设置"> -<!ENTITY aboutTor.success.label "成功！"> +<!ENTITY aboutTor.success.label "恭喜！"> <!ENTITY aboutTor.success2.label "该浏览器已配置为使用 Tor 网络。"> <!ENTITY aboutTor.success3.label "现在即可自由地匿名访问互联网。"> <!ENTITY aboutTor.failure.label "出错了！"> @@ -21,7 +21,7 @@ <!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> <!ENTITY aboutTor.failure3suffix.label "。"> -<!ENTITY aboutTor.search.label "搜索"> +<!ENTITY aboutTor.search.label "安全的搜索引擎"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index 7c77238..2b1894e 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -12,18 +12,18 @@ <!ENTITY torbutton.prefs.proxy.port "端口："> <!ENTITY torbutton.about.title "关于 Torbutton"> <!ENTITY torbutton.about.version "版本："> -<!ENTITY torbutton.about.summary "正使用 Tor 进行浏览保护您的隐私。"> -<!ENTITY torbutton.about.code "代码提供者："> +<!ENTITY torbutton.about.summary "使用 Tor 进行浏览保护在线隐私。"> +<!ENTITY torbutton.about.code "代码贡献者："> <!ENTITY torbutton.about.maintainer "维护人员："> -<!ENTITY torbutton.about.security_review "安全审查："> -<!ENTITY torbutton.about.donate "如果您喜欢使用 Tor，您也可以考虑"> +<!ENTITY torbutton.about.security_review "安全评审："> +<!ENTITY torbutton.about.donate "如果喜欢使用 Tor，你可以"> <!ENTITY torbutton.about.make_donation "给予捐赠。"> <!ENTITY torbutton.pref_connection.notice "禁止 Torbutton 更改这些设置。"> <!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_key "我"> +<!ENTITY torbutton.pref_connection_more_info.text "Torbutton 当前已启用。如需对 Tor 之外的代理设置进行更改，请禁用 Torbutton 后再返回这里。如需更改Tor 的设置，请在 Torbutton 首选项窗口中进行设置。"> +<!ENTITY torbutton.context_menu.new_identity "新标识"> +<!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.toggle "切换 Tor 状态"> <!ENTITY torbutton.context_menu.toggle.key "T"> <!ENTITY torbutton.context_menu.preferences "首选项..."> @@ -45,21 +45,21 @@ <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "点此初始化 Torbutton"> <!ENTITY torbutton.prefs.sec_settings "安全设置"> -<!ENTITY torbutton.prefs.block_thread "使用 Tor 时禁止读取历史（重要）"> -<!ENTITY torbutton.prefs.block_thwrite "使用 Tor 时禁止写入历史（推荐）"> -<!ENTITY torbutton.prefs.block_nthread "使用 Tor 之外的代理时禁止读取历史（可选）"> -<!ENTITY torbutton.prefs.block_nthwrite "停用 Tor 时禁止历史写入（可选）"> -<!ENTITY torbutton.prefs.clear_history "切换 Tor 状态时清除历史（可选）"> +<!ENTITY torbutton.prefs.block_thread "使用 Tor 时禁止读取历史记录（重要）"> +<!ENTITY torbutton.prefs.block_thwrite "使用 Tor 时禁止写入历史记录（推荐）"> +<!ENTITY torbutton.prefs.block_nthread "使用 Tor 之外的代理时禁止读取历史记录（可选）"> +<!ENTITY torbutton.prefs.block_nthwrite "停用 Tor 时禁止历史记录写入（可选）"> +<!ENTITY torbutton.prefs.clear_history "切换 Tor 状态时清除历史记录（可选）"> <!ENTITY torbutton.prefs.clear_cache "切换 Tor 时禁用磁盘缓存并清除所有缓存"> <!ENTITY torbutton.prefs.block_cache "使用 Tor 时禁止访问磁盘和内存缓存"> -<!ENTITY torbutton.prefs.cookie_jars "在受保护的 jar 中保存非 Tor 的 Cookie"> +<!ENTITY torbutton.prefs.cookie_jars "在受保护的 jar 中保存 Tor 之外的 Cookie"> <!ENTITY torbutton.prefs.cookie_protection "请在 Cookie 隐私保护对话框内选择"> -<!ENTITY torbutton.prefs.mmm_cookies "我要手动管理我的 cookies （危险）"> +<!ENTITY torbutton.prefs.mmm_cookies "手动管理我的 cookies （危险）"> <!ENTITY torbutton.prefs.clear_cookies "切换 Tor 时清除 cookie"> <!ENTITY torbutton.prefs.disable_plugins "使用 Tor 时禁用插件（重要）"> <!ENTITY torbutton.prefs.kill_bad_js "挂勾危险的 Java 脚本（重要）"> -<!ENTITY torbutton.prefs.isolate_content "根据 Tor 状态隔离动态网页内容（(重要）"> -<!ENTITY torbutton.prefs.no_updates "使用 Tor 时禁止浏览器更新"> +<!ENTITY torbutton.prefs.isolate_content "将动态内容与 Tor 状态隔离（重要）"> +<!ENTITY torbutton.prefs.no_updates "使用 Tor 时禁用浏览器更新"> <!ENTITY torbutton.prefs.set_uagent "使用 Tor 作为用户代理设置（重要）"> <!ENTITY torbutton.prefs.dynamic "动态网页内容"> <!ENTITY torbutton.prefs.cookies "Cookies">

1 0

[torbutton/master] Write changelog and bump version for 1.6.8.0.
by mikeperry＠torproject.org 08 Apr '14

08 Apr '14

commit 0bd903fc9d1446c250fb107812cdd0d89a446497 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 7 19:03:35 2014 -0700 Write changelog and bump version for 1.6.8.0. --- src/CHANGELOG | 18 ++++++++++++------ src/install.rdf | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 321e2b9..e5b7c62 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,9 @@ +1.6.8.0: + 7 Apr 2014: + * Bug 9010: Add Turkish to update locales. + * Bug 11242: Fix improper "update needed" message after in-place upgrade. + * Bug 10398: Ease translation of about:tor page elements + 1.6.7.0: 7 Mar 2014: * Bug 9901: Fix browser freeze due to content type sniffing @@ -5,15 +11,15 @@ 1.6.6.0: 3 Feb 2014 - * Bug #10800: Prevent exception in New Identity - * Bug #10640: Fix about:tor's pointer position for RTL languages. + * Bug 10800: Prevent exception in New Identity + * Bug 10640: Fix about:tor's pointer position for RTL languages. * Bug 10095: Make inner window a multiple of 200x100 * Bug 10285: Clear permissions on New Identity * Bug 9738: Fix for auto-maximizing on browser start - * Bug #10682: Workaround to really disable updates for Torbutton. - * Bug #10419: Don't allow connections to localhost - * Bug #10140: Move Japanese to extra locales - * Bug #10687: Add Basque (eu) to extra locales + * Bug 10682: Workaround to really disable updates for Torbutton. + * Bug 10419: Don't allow connections to localhost + * Bug 10140: Move Japanese to extra locales + * Bug 10687: Add Basque (eu) to extra locales 1.6.5.5: 20 Jan 2014 diff --git a/src/install.rdf b/src/install.rdf index 0c8c486..370cad8 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.6.7.0</em:version> + <em:version>1.6.8.0</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>

1 0

[tor-launcher/master] Update translations.
by mikeperry＠torproject.org 08 Apr '14

08 Apr '14

commit 7f6f1f6535d8c84d6dd3944ed54ff596fbc6c8b9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 7 18:28:39 2014 -0700 Update translations. --- src/chrome/locale/ar/network-settings.dtd | 32 +++++++-------- src/chrome/locale/ar/progress.dtd | 2 +- src/chrome/locale/ar/torlauncher.properties | 4 +- src/chrome/locale/eu/torlauncher.properties | 8 ++-- src/chrome/locale/it/network-settings.dtd | 9 +++-- src/chrome/locale/ko/network-settings.dtd | 22 +++++----- src/chrome/locale/ko/progress.dtd | 2 +- src/chrome/locale/ko/torlauncher.properties | 4 +- src/chrome/locale/pl/network-settings.dtd | 2 +- src/chrome/locale/pl/torlauncher.properties | 4 +- src/chrome/locale/pt/network-settings.dtd | 56 +++++++++++++------------- src/chrome/locale/sv/torlauncher.properties | 4 +- src/chrome/locale/tr/torlauncher.properties | 35 +++++++++++++++- src/chrome/locale/vi/network-settings.dtd | 8 ++-- src/chrome/locale/vi/progress.dtd | 6 +-- src/chrome/locale/vi/torlauncher.properties | 24 +++++------ src/chrome/locale/zh-CN/network-settings.dtd | 28 ++++++------- 17 files changed, 142 insertions(+), 108 deletions(-) diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd index b3f0dca..a2cbdb6 100644 --- a/src/chrome/locale/ar/network-settings.dtd +++ b/src/chrome/locale/ar/network-settings.dtd @@ -2,17 +2,17 @@  -<!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 "أي مما يلي يعتبر وصف افضل لموقفك؟"> <!ENTITY torSettings.configurePrompt1 " اتصال الإنترنت لهذا الكمبيوتر مُراقب، أو مصفى، أو يعمل ببروكسي."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> +<!ENTITY torSettings.configurePrompt2 "علي تكوين إعدادات الجسر أو جدار الحماية أو الوكيل."> <!ENTITY torSettings.configure "تكوين"> <!ENTITY torSettings.connectPrompt2 "أود الاتصال مباشرة إلى شبكة تور."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connectPrompt3 "سيفيد هذا في معظم الحالات."> <!ENTITY torSettings.connect "اتصل"> <!ENTITY torSettings.proxyQuestion "هل يحتاج هذا الجهاز إلي بروكسي حتي يصل إلي شبكة الإنترنت؟"> @@ -22,9 +22,9 @@ <!ENTITY torSettings.firewallQuestion "هل اتصال الإنترنت لهذا الكمبيوتر يمر بجدار حماية يسمح بالاتصال فقط من خلال منافذ معينة؟"> <!ENTITY torSettings.firewallHelp "إذا لم تكن متأكدا من كيفية الإجابة على هذا السؤال، اختار لا. إذا واجهتك مشاكل في الاتصال بشبكة تور, غيير هذا الإعداد."> <!ENTITY torSettings.enterFirewall "إدخل قائمة مفصولة بفواصل من المنافذ التي يسمح بها جدار الحماية."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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 "هل يقوم مقدم خدمة الإنترنت (ISP) الذي تتعامل معه بحجب الاتصالات بشبكة Tor أو مراقبتها بطريقة أخرى؟"> +<!ENTITY torSettings.bridgeHelp "إذا لم تكن متأكدا من إجابة هذا السؤال، قم باختيار لا. &#160; إذا قمت باختيار نعم، فسيطلب منك تكوين جسور Tor والتي هي منافذ ترحيل غير مدرجة تصعب عملية حظر الاتصالات بشبكة Tor."> +<!ENTITY torSettings.bridgeSettingsPrompt "يمكنك استخدام مجموعة الجسور المتوفرة أو الحصول على مجموعة مخصصة من الجسور.">  @@ -46,19 +46,19 @@ <!ENTITY torsettings.firewall.checkbox "اتصال الإنترنت لهذا الكمبيوتر يمر بجدار حماية يسمح بالاتصال فقط من خلال منافذ معينة"> <!ENTITY torsettings.firewall.allowedPorts "المنافذ المسموح بها:"> <!ENTITY torsettings.useBridges.checkbox "مزود خدمة الإنترنت الخاص بي (ISP) يمنع الاتصالات بشبكة تور"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> +<!ENTITY torsettings.useBridges.default "الاتصال بالجسور المتوفرة"> +<!ENTITY torsettings.useBridges.type "نوع النقل:"> +<!ENTITY torsettings.useBridges.custom "إدخال جسور مخصصة"> <!ENTITY torsettings.useBridges.label "ادخل جسر او اكثر (جسر واحد في كل سطر)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.placeholder "اكتب العنوان:المنفذ"> <!ENTITY torsettings.copyLog "نسخ سجل تور إلي الحافظة"> <!ENTITY torsettings.bridgeHelpTitle "المساعدة الخاصة بالجسور المُرحلة"> <!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 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.bridgeHelp1B "يمكنك استخدام مجموعة عناوين الجسور المتوفرة التي تم تكوينها مسبقا أو الحصول على مجموعة مخصصة من العناوين باستخدام إحدى هذه الطرق الثلاث:"> +<!ENTITY torsettings.bridgeHelp2Heading "من خلال الويب"> +<!ENTITY torsettings.bridgeHelp2 "استخدم متصفح ويب لزيارة https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "من خلال المستجيب التلقائي للبريد الإلكتروني"> <!ENTITY torsettings.bridgeHelp3 "ارسل بريد إلكتروني إلى bridges(a)torproject.org يحتوي علي 'get bridges' في قلب البريد. و حتي تضمن وصول ذلك البريد لنا بنجاح استخدم إما gmail.com أو 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.&#160; Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp4Heading "من خلال مكتب المساعدة"> +<!ENTITY torsettings.bridgeHelp4 "يمكنك طلب عناوين الجسر، كحل أخير، من خلال إرسال رسالة بريد إلكتروني مهذبة إلى help(a)rt.torproject.org.&#160; يرجى ملاحظة أنه يجب أن يرد شخص ما على كل طلب."> diff --git a/src/chrome/locale/ar/progress.dtd b/src/chrome/locale/ar/progress.dtd index e12a12f..6f4907d 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."> +<!ENTITY torprogress.pleaseWait "الرجاء الانتظار، يتم الان إنشاء اتصال بشبكة تور."> diff --git a/src/chrome/locale/ar/torlauncher.properties b/src/chrome/locale/ar/torlauncher.properties index 06171de..c7ee50d 100644 --- a/src/chrome/locale/ar/torlauncher.properties +++ b/src/chrome/locale/ar/torlauncher.properties @@ -24,8 +24,8 @@ torlauncher.ensure_tor_is_running=الرجاء التأكد أن تور يعمل torlauncher.error_proxy_addr_missing=من الضروري تحديد كل من عنوان الانترنت IP أو عنوان مستضيف واحد و منفذ وذلك لتهيئة تور لأستخدام بروكسي حتي يستطيع الوصول إلي شبكة الانترنت. torlauncher.error_proxy_type_missing=من الضروري تحديد نوع البروكسي. 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.error_default_bridges_type_missing=يجب عليك تحديد نوع الجسور المقدمة مع المتصفح. +torlauncher.error_bridge_bad_default_type=هذا النوع غير متوفر بداخل الجسور المقدمة مع المتصفح. الرجاء تعديل إعداداتك. torlauncher.recommended_bridge=(موصى به) diff --git a/src/chrome/locale/eu/torlauncher.properties b/src/chrome/locale/eu/torlauncher.properties index a104c27..2d57a88 100644 --- a/src/chrome/locale/eu/torlauncher.properties +++ b/src/chrome/locale/eu/torlauncher.properties @@ -7,7 +7,7 @@ torlauncher.tor_exited=Tor ustekabean irten da. torlauncher.please_restart_app=Mesedez aplikazio hau berrabiarazi ezazu. torlauncher.tor_controlconn_failed=Tor kontrol atakara ezin konektatu. torlauncher.tor_failed_to_start=Torek huts egin du abiarazterakoan. -# torlauncher.tor_control_failed=Failed to take control of Tor. +torlauncher.tor_control_failed=Huts Toren kontrola hartzerakoan. torlauncher.tor_bootstrap_failed=Torek huts egin du Tor sare konexio bat ezartzerakoan. torlauncher.tor_bootstrap_failed_details=%1$S huts egin du (%2$S). @@ -24,10 +24,10 @@ torlauncher.ensure_tor_is_running=Mesedez egiaztatu Tor exekutatzen ari dela. torlauncher.error_proxy_addr_missing=Torek proxy bat erabiliz Interneten sartzeko konfiguratu nahi baduzu edo IP helbidea edo ostalari-izena edo portu zenbakia zehaztu behar duzu. torlauncher.error_proxy_type_missing=Proxy mota hautatu behar duzu. torlauncher.error_bridges_missing=Zubi bat edo gehiago zehaztu behar duzu. -# 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_default_bridges_type_missing=Emandako zubietarako garraio mota bat hautatu behar duzu. +torlauncher.error_bridge_bad_default_type=Ez daude eskuragarri %S garraio mota duten emandako zubirik. Mesedez doitu zure ezarpenak. -# torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(gomendatuta) torlauncher.connect=Konektatu torlauncher.quit=Irten diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd index 54d07c3..c319724 100644 --- a/src/chrome/locale/it/network-settings.dtd +++ b/src/chrome/locale/it/network-settings.dtd @@ -2,7 +2,7 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Prima di connetterti alla rete Tor, devi fornire le informazioni riguardo la connessione internet di questo computer."> <!ENTITY torSettings.yes "Sì"> <!ENTITY torSettings.no "No"> @@ -22,7 +22,7 @@ <!ENTITY torSettings.firewallQuestion "La connessione ad Internet di questo computer passa attraverso un firewall che permette le connessioni solo ad alcune porte?"> <!ENTITY torSettings.firewallHelp "Se non sei sicuro su come rispondere a questa domanda, seleziona No. Nel caso in cui si verifichino problemi di connessione alla rete Tor, cambia queste impostazioni."> <!ENTITY torSettings.enterFirewall "Inserisci una lista di porte consentite dal firewall, separate da una virgola."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> +<!ENTITY torSettings.bridgeQuestion "Il tuo fornitore di servizi internet (ISP) blocca o censura la connessione alla rete Tor?"> <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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."> @@ -46,11 +46,12 @@ <!ENTITY torsettings.firewall.checkbox "Questo computer passa attraverso un firewall che permette le connessioni solo ad alcune porte"> <!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 "Connect with provided bridges"> +<!ENTITY torsettings.useBridges.default " +"> <!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)"> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.placeholder "Tipo indirizzo:porta"> <!ENTITY torsettings.copyLog "Copia il log di Tor negli "appunti" di sistema"> <!ENTITY torsettings.bridgeHelpTitle "Aiuto per i ponti relé"> diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd index 0fc76e1..9b4465d 100644 --- a/src/chrome/locale/ko/network-settings.dtd +++ b/src/chrome/locale/ko/network-settings.dtd @@ -2,14 +2,14 @@  -<!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 "어떤 것이 귀하의 상황에 가깝습니까?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> +<!ENTITY torSettings.configurePrompt1 "이 컴퓨터의 인터넷 연결은 검열되거나 필터링되거나 프록시를 사용하고 있습니다."> +<!ENTITY torSettings.configurePrompt2 "브릿지, 방화벽, 프록시 설정 구성을 해야 합니다."> <!ENTITY torSettings.configure "구성"> <!ENTITY torSettings.connectPrompt2 "Tor 네트워크에 직접 연결하고 싶습니다."> <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> @@ -22,7 +22,7 @@ <!ENTITY torSettings.firewallQuestion "이 컴퓨터의 인터넷 연결은 방화벽을 통해서 특정 포트 접속만 허가합니까?"> <!ENTITY torSettings.firewallHelp "이 질문에 어떻게 대답해야 할지 확신이 서지 않으면 아니오를 선택하세요. Tor 네트워크에 접속할 때 문제를 만났다면 이 설정을 변경해 주세요."> <!ENTITY torSettings.enterFirewall "방화벽에 따라 허가되고 있는 포트 목록 입력해 주세요. 포트 번호는 콤마로 구분됩니다."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> +<!ENTITY torSettings.bridgeQuestion "인터넷 서비스 공급자(ISP)가 Tor 네트워크 접속을 차단하거나 검열하고 있나요?"> <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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."> @@ -46,19 +46,19 @@ <!ENTITY torsettings.firewall.checkbox "이 컴퓨터는 특정 포트만 통과하는 방화벽을 지나 연결됩니다."> <!ENTITY torsettings.firewall.allowedPorts "허용된 포트:"> <!ENTITY torsettings.useBridges.checkbox "인터넷 서비스 공급자(ISP)가 Tor 네트워크 접속을 차단합니다."> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> +<!ENTITY torsettings.useBridges.default "제공된 브릿지에 연결"> <!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.custom "이용자 브릿지 접속"> +<!ENTITY torsettings.useBridges.label "1개 이상의 브릿지 중계 서버를 입력해 주세요. (각 줄에 한 개씩)"> +<!ENTITY torsettings.useBridges.placeholder "주소 입력 : 포트 번호"> <!ENTITY torsettings.copyLog "Tor log를 클립보드에 복사하기"> <!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.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> +<!ENTITY torsettings.bridgeHelp1 "Tor 네트워크에 접속할 수 없는 경우, 귀하의 인터넷 서비스 공급자(ISP)나 별도의 기관이 Tor를 차단하고 있을 가능성이 있습니다.&#160; 그럴 때는 숨겨진 중계 서버를 통해 Tor 브릿지를 사용함으로써 이 문제를 해결할 수도 있습니다."> <!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 "https://bridges.torproject.org 를 방문하십시오."> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> +<!ENTITY torsettings.bridgeHelp3 "공개 브릿지 주소를 찾는 또 하나의 방법은 본문에 'get bridges'라고 적은 E-mail을 bridges(a)torproject.org 앞으로 보내는 것입니다.&#160; 단, 브릿지 주소를 크래커들이 수집하기 어렵게 하기 위해 gmail.com 이나 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.&#160; Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/ko/progress.dtd b/src/chrome/locale/ko/progress.dtd index dabaa61..bb931d0 100644 --- a/src/chrome/locale/ko/progress.dtd +++ b/src/chrome/locale/ko/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."> +<!ENTITY torprogress.pleaseWait "Tor네트워크로 확실히 연결할 때까지 기다리세요."> diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties index 3e3771f..3629f23 100644 --- a/src/chrome/locale/ko/torlauncher.properties +++ b/src/chrome/locale/ko/torlauncher.properties @@ -24,8 +24,8 @@ torlauncher.ensure_tor_is_running=Tor가 실행중인 지 확인하여 주십시 torlauncher.error_proxy_addr_missing=인터넷에 접속하기 위해 프록시를 사용한다면, Ip주소나 호스트 이름, 그리고 포트 번호를 입력해야 합니다. torlauncher.error_proxy_type_missing=프록시 유형을 선택해 주십시오. 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.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=(권장함) diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd index 149647e..435536a 100644 --- a/src/chrome/locale/pl/network-settings.dtd +++ b/src/chrome/locale/pl/network-settings.dtd @@ -22,7 +22,7 @@ <!ENTITY torSettings.firewallQuestion "Czy połączenie internetowe Twojego komputera pozwala przejść przez zaporę sieciową w celu nawiązania połączenia z ustalonymi portami?"> <!ENTITY torSettings.firewallHelp "Jeśli nie jesteś pewien jak odpowiedzieć na to pytanie, wybierz Nie. W przypadku wystąpienia problemów z połączeniem, zmień tą opcję."> <!ENTITY torSettings.enterFirewall "Wprowadź listę portów dozwolonych przez zaporę (kolejne porty oddzielaj przecinkiem)."> -<!ENTITY torSettings.bridgeQuestion "Czy Twój dostawca usług internetowych (ISP) blokuje lub ocenzurowuje połączenia sieci Tor?"> +<!ENTITY torSettings.bridgeQuestion "Czy Twój dostawca usług internetowych (ISP) blokuje lub cenzuruje połączenia sieci Tor?"> <!ENTITY torSettings.bridgeHelp "Jeśli nie jesteś pewny odpowiedzi na to pytanie proszę wybrać odpowiedź Nie.&#160; Jeśli wybierzesz Tak, to będziesz poproszony o skonfigurowanie mostków Tora, które nie są publicznie wymienione, dzięki czemu będzie 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."> diff --git a/src/chrome/locale/pl/torlauncher.properties b/src/chrome/locale/pl/torlauncher.properties index 847d994..d982fb7 100644 --- a/src/chrome/locale/pl/torlauncher.properties +++ b/src/chrome/locale/pl/torlauncher.properties @@ -8,7 +8,7 @@ torlauncher.please_restart_app=Proszę zrestartuj tą aplikację. torlauncher.tor_controlconn_failed=Nie można połączyć się z portem kontrolnym Tora. torlauncher.tor_failed_to_start=Nie powiodło się włączenie Tora. torlauncher.tor_control_failed=Nie udało się przejąć kontroli nad Tor'em. -torlauncher.tor_bootstrap_failed=Błąd Tor, nie udało się nawiązać połączenia z siecią Tora. +torlauncher.tor_bootstrap_failed=Tor nie nawiązał połączenia z siecią Tora. 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 @@ -40,7 +40,7 @@ torlauncher.bootstrapStatus.conn_dir=Podłączanie do katalogu węzłów torlauncher.bootstrapStatus.handshake_dir=Ustanawianie szyfrowanego połączenia z katalogiem torlauncher.bootstrapStatus.requesting_status=Odczytywanie stanu sieci torlauncher.bootstrapStatus.loading_status=Wczytywanie stanu sieci -torlauncher.bootstrapStatus.loading_keys=Wczytywanie certyfikatów +torlauncher.bootstrapStatus.loading_keys=Wczytywanie certyfikatów uwierzytelnienia torlauncher.bootstrapStatus.requesting_descriptors=Żądanie informacji o węźle torlauncher.bootstrapStatus.loading_descriptors=Wczytywanie informacji o węźle torlauncher.bootstrapStatus.conn_or=Łączenie z siecią Tor diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd index 9c5b2f1..57bd038 100644 --- a/src/chrome/locale/pt/network-settings.dtd +++ b/src/chrome/locale/pt/network-settings.dtd @@ -2,29 +2,29 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Antes de se ligar à rede Tor precisa de fornecer informações sobre a ligação deste computador à Internet."> <!ENTITY torSettings.yes "Sim"> <!ENTITY torSettings.no "Não"> <!ENTITY torSettings.firstQuestion "Qual das seguintes frases melhor descreve a sua situação?"> <!ENTITY torSettings.configurePrompt1 "A ligação à Internet deste computador está a ser censurada, filtrada ou utilizada através de um proxy."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Eu preciso de configurar o bridge, o firewall e as definições do proxy."> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connectPrompt2 "Gostaria de me ligar diretamente à rede Tor."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connectPrompt3 "Isto funciona na maior parte das situações."> <!ENTITY torSettings.connect "Ligar"> -<!ENTITY torSettings.proxyQuestion "Este computador precisa de usar um proxy para aceder a Internet?"> +<!ENTITY torSettings.proxyQuestion "Este computador precisa de usar uma proxy para aceder a Internet?">  <!ENTITY torSettings.proxyHelp "Se não tem a certeza de como responder esta questão, olhe para as definições de Internet noutro navegador para ver se está configurado para usar um proxy."> <!ENTITY torSettings.enterProxy "Introduza as definições de proxy."> -<!ENTITY torSettings.firewallQuestion "A ligação à Internet deste computador atravessa um firewall que só permite algumas ligações a certas portas?"> -<!ENTITY torSettings.firewallHelp "Se não tem a certeza de como responder esta questão, escolha Não. Se encontrar quaisquer problemas ao ligar-se á rede Tor, mude esta definição."> -<!ENTITY torSettings.enterFirewall "Introduza uma lista de portas separada por vírgulas que são permitidas pela firewall."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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.firewallQuestion "A ligação à Internet deste computador atravessa uma firewall que só permite algumas ligações a certos portos?"> +<!ENTITY torSettings.firewallHelp "Se não tem a certeza de como responder esta questão, escolha Não. Se encontrar quaisquer problemas ao ligar-se à rede Tor, mude esta definição."> +<!ENTITY torSettings.enterFirewall "Introduza uma lista de portos separada por vírgulas que são permitidas pela firewall."> +<!ENTITY torSettings.bridgeQuestion "O seu fornecedor de serviços de internet bloqueia ou censura ligações à rede Tor ?"> +<!ENTITY torSettings.bridgeHelp "Se não tem a certeza de como responder a esta questão, escolha o Nº.&#160; Se escolher Sim, vai-lhe ser pedido para configurar as Tor Bridges, que são pontos de passagem não listados mais difíceis de bloquear ligações à rede Tor."> +<!ENTITY torSettings.bridgeSettingsPrompt "Pode usar o conjunto de bridges pré-configurado fornecido, ou pode obter um conjunto de bridges personalizadas.">  @@ -33,32 +33,32 @@ <!ENTITY torsettings.optional "Opcional"> -<!ENTITY torsettings.useProxy.checkbox "Este computador precisa de usar um proxy para aceder à Internet."> +<!ENTITY torsettings.useProxy.checkbox "Este computador precisa de usar uma proxy para aceder à Internet."> <!ENTITY torsettings.useProxy.type "Tipo de Proxy:"> <!ENTITY torsettings.useProxy.address "Endereço:"> -<!ENTITY torsettings.useProxy.address.placeholder "Endereço IP ou hostname"> -<!ENTITY torsettings.useProxy.port "Porta:"> +<!ENTITY torsettings.useProxy.address.placeholder "Endereço IP ou nome de anfitrião"> +<!ENTITY torsettings.useProxy.port "Porto:"> <!ENTITY torsettings.useProxy.username "Nome do utilizador:"> <!ENTITY torsettings.useProxy.password "Palavra-Chave:"> <!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 está protegido por um firewall que permite apenas algumas ligações a algumas portas."> -<!ENTITY torsettings.firewall.allowedPorts "Portas permitidas:"> +<!ENTITY torsettings.firewall.checkbox "Este computador está protegido por um firewall que permite apenas algumas ligações a alguns portos."> +<!ENTITY torsettings.firewall.allowedPorts "Portos permitidos:"> <!ENTITY torsettings.useBridges.checkbox "O meu Internet Service Provider (ISP) bloqueia ligações à rede Tor"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> +<!ENTITY torsettings.useBridges.default "Ligar com as bridges fornecidas"> +<!ENTITY torsettings.useBridges.type "Tipo de transporte:"> +<!ENTITY torsettings.useBridges.custom "Introduza bridges personalizadas"> <!ENTITY torsettings.useBridges.label "Introduza um ou mais relays bridge (um por linha)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.placeholder "escreva endereço:porto"> -<!ENTITY torsettings.copyLog "Copiar o Tor Log para o Clipboard"> +<!ENTITY torsettings.copyLog "Copiar o log Tor para a Área de Transferência"> <!ENTITY torsettings.bridgeHelpTitle "Ajuda 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.&#160; 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 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!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.&#160; Please note that a person will need to respond to each request."> +<!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.&#160; 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.bridgeHelp2Heading "Pela rede"> +<!ENTITY torsettings.bridgeHelp2 "Use um navegador internet para visitar https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Pelo respondedor de email automático"> +<!ENTITY torsettings.bridgeHelp3 "Envie um email para bridges(a)torproject.org com a linha 'get bridges' no próprio corpo da mensagem.&#160; No entanto, para tornar mais difícil para um atacante apreender o conjunto de endereços de bridge, tem que enviar este pedido de uma conta gmail.com ou yahoo.com."> +<!ENTITY torsettings.bridgeHelp4Heading "Pelo Helpdesk"> +<!ENTITY torsettings.bridgeHelp4 "Em último caso, pode pedir endereços bridge enviando um email cordial para help(a)rt.torproject.org.&#160; Por favor tenha em conta que cada pedido será respondido por uma pessoa."> diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties index 985868c..7efa755 100644 --- a/src/chrome/locale/sv/torlauncher.properties +++ b/src/chrome/locale/sv/torlauncher.properties @@ -24,8 +24,8 @@ torlauncher.ensure_tor_is_running=Försäkra dig om att Tor är startad. torlauncher.error_proxy_addr_missing=Du måste ange både en IP-adress eller värdnamn, samt ett port-nummer för att konfigurera Tor till att använda en proxy för att nå Internet. torlauncher.error_proxy_type_missing=Du måste välja typ av proxy. torlauncher.error_bridges_missing=Du måste ange en eller flera bryggor. -# 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_default_bridges_type_missing=Du måste välja en transporttyp för de förkonfigurerade bryggorna. +torlauncher.error_bridge_bad_default_type=Det finns inga förkonfigurerade bryggor för transporttypen %S tillgängliga. Du behöver ändra dina inställningar. torlauncher.recommended_bridge=(rekommenderas) diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties index d175b3f..874951b 100644 --- a/src/chrome/locale/tr/torlauncher.properties +++ b/src/chrome/locale/tr/torlauncher.properties @@ -1,7 +1,40 @@ ### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.tor_bootstrap_failed_details=%1$S hata (%2$S). +torlauncher.error_title=Tor Başlatıcı + +torlauncher.tor_exited=Tor beklenmedik bir şekilde kapandı. +torlauncher.please_restart_app=Lütfen bu uygulamayı yeniden başlatın. +torlauncher.tor_controlconn_failed=Tor yönetim portuna bağlanılamadı. +torlauncher.tor_failed_to_start=Tor başlatılamadı. +torlauncher.tor_control_failed=Tor'u kontrol altına alma başarısız +torlauncher.tor_bootstrap_failed=Tor'un ağ bağlantısı kurulumu başarısız oldu. +torlauncher.tor_bootstrap_failed_details=%1$S başarısız oldu (%2$S). + +torlauncher.unable_to_start_tor=Tor başlatılamıyor.\n\n%S +torlauncher.tor_missing=Çalıştırılabilir Tor dosyası bulunamadı. +torlauncher.torrc_missing=torrc dosyası kayıp. +torlauncher.datadir_missing=Tor veri klasörü bulunamadı. +torlauncher.password_hash_missing=Hash'lenmiş şifreye ulaşılamadı. + +torlauncher.failed_to_get_settings=Tor ayarlarına ulaşılamıyor.\n\n%S +torlauncher.failed_to_save_settings=Tor ayarları kaydedilemiyor.\n\n%S +torlauncher.ensure_tor_is_running=Lütfen Tor'un çalıştığından emin olun. + +torlauncher.error_proxy_addr_missing=İnternet bağlanırken proxy kullanmak için IP adresi veya Sunucu ve port numarası girmeniz gerekiyor. +torlauncher.error_proxy_type_missing=Vekil sunucu türünü seçmelisiniz. +torlauncher.error_bridges_missing=Bir ya da daha fazla köprü belirtmelisiniz. +torlauncher.error_default_bridges_type_missing=Sağlanan köprüler için bir taşıma türü seçmelisiniz. +torlauncher.error_bridge_bad_default_type=%S taşıma türü için sağlanan kullanılabilir köprüler yok. Ayarlarınızı lütfen ayarlayın. + +torlauncher.recommended_bridge=(önerilen) + +torlauncher.connect=Bağlan +torlauncher.quit=Çık +torlauncher.quit_win=Çıkış +torlauncher.done=Tamamlandı + +torlauncher.forAssistance=Yardım için %S ile bağlantıya geçin. torlauncher.bootstrapStatus.conn_dir=Aktarım klasörüne bağlanıyor torlauncher.bootstrapStatus.handshake_dir=Şifrelenmiş dizin bağlantısı kuruluyor diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd index e42c83b..8283781 100644 --- a/src/chrome/locale/vi/network-settings.dtd +++ b/src/chrome/locale/vi/network-settings.dtd @@ -2,14 +2,14 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Trước khi kết nối đến mạng lưới Tor, bạn cần phải cung cấp thông tin về kết nối Internet của máy tính này."> <!ENTITY torSettings.yes "Có"> <!ENTITY torSettings.no "Không"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> +<!ENTITY torSettings.firstQuestion "Những mục này có miêu tả đúng vị trí của bạn không?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Tôi cần phải cấu hình cầu nối, tường lửa, hoặc thiết lập máy chủ uỷ quyền."> <!ENTITY torSettings.configure "Cấu hình"> <!ENTITY torSettings.connectPrompt2 "Tôi muốn kết nối trực tiếp đến mạng Tor,"> <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> @@ -22,7 +22,7 @@ <!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> <!ENTITY torSettings.firewallHelp "Nếu như bạn không chắc chắn làm thế nào trả lời câu hỏi này, chọn Không. Nếu như bạn gặp vấn đề kết nối đến mạng Tor, thay đổi thiết lập này."> <!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> +<!ENTITY torSettings.bridgeQuestion "Nhà cung cấp dịch vụ (ISP) của bạn có ngăn chặn hoặc kiểm duyệt kết nối đến mạng Tor không?"> <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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."> diff --git a/src/chrome/locale/vi/progress.dtd b/src/chrome/locale/vi/progress.dtd index cbafae0..507803b 100644 --- a/src/chrome/locale/vi/progress.dtd +++ b/src/chrome/locale/vi/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> +<!ENTITY torprogress.dialog.title "Trạng thái Tor"> +<!ENTITY torprogress.openSettings "Cài đặt Mở"> <!ENTITY torprogress.heading "Kết nối với mạng Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Vui lòng chờ đợi để chúng tôi kết nối đến mạng lưới Tor."> diff --git a/src/chrome/locale/vi/torlauncher.properties b/src/chrome/locale/vi/torlauncher.properties index 8566a15..9cfc93d 100644 --- a/src/chrome/locale/vi/torlauncher.properties +++ b/src/chrome/locale/vi/torlauncher.properties @@ -1,40 +1,40 @@ ### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. -# torlauncher.error_title=Tor Launcher +torlauncher.error_title=Tor Launcher -# torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_exited=Tor unexpectedly exited. torlauncher.please_restart_app=Vui lòng khởi động lại ứng dụng này. -# torlauncher.tor_controlconn_failed=Could not connect to Tor control port. +torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Chạy Tor thất bại. -# torlauncher.tor_control_failed=Failed to take control of Tor. +torlauncher.tor_control_failed=Failed to take control of Tor. torlauncher.tor_bootstrap_failed=Tor đã thất bại khi thiết lập kết nối đến mạng Tor -# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). -# torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%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.password_hash_missing=Failed to get hashed password. +torlauncher.password_hash_missing=Failed to get hashed password. -# torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S +torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S torlauncher.failed_to_save_settings=Không thể lưu lại các cài đặt của Tor. torlauncher.ensure_tor_is_running=Hãy chắc chắn rằng Tor đang chạy. torlauncher.error_proxy_addr_missing=Bạn phải xác định cả hai một địa chỉ IP hay tên máy và số cổng để cấu hình Tor để sử dụng một proxy ủy quyền truy cập vào Liên mạng torlauncher.error_proxy_type_missing=Bạn phải chọn kiểu proxy. torlauncher.error_bridges_missing=Bạn phải chỉ dẫn một hoặc nhiều cầu nối. -# 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_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=(khuyên dùng) torlauncher.connect=Kết nối torlauncher.quit=Thoát torlauncher.quit_win=Thoát torlauncher.done=Hoàn thành -# torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance=Để được trợ giúp, liên hệ %S torlauncher.bootstrapStatus.conn_dir=Kết nối vào một thư mục chuyển tiếp torlauncher.bootstrapStatus.handshake_dir=Thành lập một kết nối thư mục được mã hóa diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd index 8bbe5f7..28b973d 100644 --- a/src/chrome/locale/zh-CN/network-settings.dtd +++ b/src/chrome/locale/zh-CN/network-settings.dtd @@ -2,7 +2,7 @@  -<!ENTITY torsettings.prompt "在您连接到Tor网络之前，需要提供本机的英特网连接信息。"> +<!ENTITY torsettings.prompt "在连接 Tor 网络之前，需提供相关的网络连接信息。"> <!ENTITY torSettings.yes "是"> <!ENTITY torSettings.no "否"> @@ -12,7 +12,7 @@ <!ENTITY torSettings.configurePrompt2 "我需要配置网桥、防火墙或者代理设置。"> <!ENTITY torSettings.configure "配置"> <!ENTITY torSettings.connectPrompt2 "我想要直接连接 Tor 网络。"> -<!ENTITY torSettings.connectPrompt3 "这在大多数情况下正常工作。"> +<!ENTITY torSettings.connectPrompt3 "通常这种方式是有效的。"> <!ENTITY torSettings.connect "连接"> <!ENTITY torSettings.proxyQuestion "该计算机是否需要通过代理访问互联网？"> @@ -22,9 +22,9 @@ <!ENTITY torSettings.firewallQuestion "该计算机的防火墙是否仅允许特定端口的互联网连接？"> <!ENTITY torSettings.firewallHelp "如果不知道如何回答该问题，请选择否。如果连接 Tor 网络时出现问题，请更改该设置。"> <!ENTITY torSettings.enterFirewall "请输入防火墙允许的端口，中间用逗号隔开。"> -<!ENTITY torSettings.bridgeQuestion "您的互联网服务提供商 (ISP) 阻挡或审查与 Tor 网络的连接吗？"> -<!ENTITY torSettings.bridgeHelp "如果您不知道此问题的答案，请选择否。&#160; 如果您选择是，您将被要求配置 Tor 网桥，它们是未被公开的中继点，可以使得 Tor 网络的连接更难以被封掉。"> -<!ENTITY torSettings.bridgeSettingsPrompt "您可以使用网桥的默认设置，您也可以获取和输入自定义的网桥地址。"> +<!ENTITY torSettings.bridgeQuestion "互联网服务提供商 (ISP) 是否对 Tor 网络连接进行了封锁或审查？"> +<!ENTITY torSettings.bridgeHelp "如果不理解该问题，请选择“否”。如果选择“是”，那么需要对 Tor 网桥进行配置。网桥指用于连接 Tor 网络的非公开网络中继，更难于封锁。"> +<!ENTITY torSettings.bridgeSettingsPrompt "可以使用集成的网桥，也可以获取网桥，以自定义方式手动输入。">  @@ -46,7 +46,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.type "传输类型："> <!ENTITY torsettings.useBridges.custom "输入自定义网桥"> <!ENTITY torsettings.useBridges.label "输入一个或多个网桥中继(一行一个)。"> @@ -54,11 +54,11 @@ <!ENTITY torsettings.copyLog "请将 Tor 日志复制到剪贴板"> <!ENTITY torsettings.bridgeHelpTitle "网桥中继帮助"> -<!ENTITY torsettings.bridgeHelp1 "如果您无法连接到 Tor 网络，可能是您的互联网服务提供商 (ISP) 或其他机构在阻挡 Tor。&#160; 通常来说，你可以使用 Tor 网桥解决此问题，因为它们是未公开的中继点，更不容易被封锁。"> -<!ENTITY torsettings.bridgeHelp1B "您可以使用预先配置好的默认设置的网桥地址；或者，您也可以使用以下三种方法之一获取自定义的地址。"> -<!ENTITY torsettings.bridgeHelp2Heading "通过万维网"> -<!ENTITY torsettings.bridgeHelp2 "使用网页浏览器访问 https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "通过电子邮件自动回复系统"> -<!ENTITY torsettings.bridgeHelp3 "发送邮件到 bridges(a)torproject.xn--org,-t85f28s26bzx6dy9kx14gz6r get bridges 行。&#160; 然而，这也可能致使攻击者获知大量网桥地址，所以你必须从 gmail.com 或者 yahoo.com 的电子邮件地址发送这一请求。"> -<!ENTITY torsettings.bridgeHelp4Heading "通过帮助台"> -<!ENTITY torsettings.bridgeHelp4 "作为最后的手段，你可以写一封礼貌的邮件发送到 help(a)rt.torproject.org 以请求网桥地址。&#160; 请注意，每个请求需要人工响应。"> +<!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 "发送电子邮件至 bridges(a)torproject.xn--org,get-z36cn781bfha600c2kdv79bwxu38tcq3n bridges” 2 个单词（如需获取 obfs3 网桥，请写“transport obfs3”）。由于为了防止封锁者获取大量网桥地址，你必须使用 gmail.com 或者 yahoo.com 的电子邮件地址发送这一请求。"> +<!ENTITY torsettings.bridgeHelp4Heading "联系客服方式"> +<!ENTITY torsettings.bridgeHelp4 "如果以上方式无法获取所需网桥，作为最后的网桥获取方式，你可以写一封礼貌的邮件发送到 help(a)rt.torproject.xn--org(-3f5fw21a8fn84kbq7c8m3a help-zh(a)rt.torproject.org).xn--,-ny6a9go5tm3jb1cb9a7ykqznm8ni2c559c8l1c0mll5cfqb.">

1 0

[tor-launcher/master] Bump version to 0.2.5.2.
by mikeperry＠torproject.org 08 Apr '14

08 Apr '14

commit f9d7c77f71c3596a66b8026b06fe6ee6fdea00e2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 7 18:29:43 2014 -0700 Bump version to 0.2.5.2. --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 1cd36da..f523acf 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.5.1</em:version> + <em:version>0.2.5.2</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>https://127.0.0.1/</em:updateURL> <!--

1 0

[tor-browser-bundle/master] Really add the OpenSSL keyring.
by mikeperry＠torproject.org 07 Apr '14

07 Apr '14

commit ada623c4cbc145521980e6bce08611cff7e81cad Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 7 16:46:07 2014 -0700 Really add the OpenSSL keyring. I wonder where GPG put it last time? --- gitian/gpg/OPENSSL.gpg | Bin 0 -> 6924 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/OPENSSL.gpg b/gitian/gpg/OPENSSL.gpg new file mode 100644 index 0000000..d8c115b Binary files /dev/null and b/gitian/gpg/OPENSSL.gpg differ

1 0

[tor-browser-bundle/master] Update OpenSSL signing key and hashes.
by mikeperry＠torproject.org 07 Apr '14

07 Apr '14

commit 06d2d07bdfbfd2361df94ef588f1f2513b6d3d12 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 7 16:34:42 2014 -0700 Update OpenSSL signing key and hashes. --- gitian/gpg/OPENSSL.gpg | Bin 4316 -> 0 bytes gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/gpg/OPENSSL.gpg b/gitian/gpg/OPENSSL.gpg deleted file mode 100644 index 1b282b7..0000000 Binary files a/gitian/gpg/OPENSSL.gpg and /dev/null differ diff --git a/gitian/versions b/gitian/versions index 739badc..570656d 100755 --- a/gitian/versions +++ b/gitian/versions @@ -58,7 +58,7 @@ PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a +OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 9a7ac2f..baee44a 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -59,7 +59,7 @@ PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a +OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 diff --git a/gitian/versions.beta b/gitian/versions.beta index 4d152dc..53060ca 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -59,7 +59,7 @@ PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a +OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 6717ad2..f3f0dca 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -59,7 +59,7 @@ PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a +OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645

1 0

[tor-browser-bundle/master] Update OpenSSL to 1.0.1g
by mikeperry＠torproject.org 07 Apr '14

07 Apr '14

commit 0dc9b5d20c312916ffec28dd0adc014a7cfae4a9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 7 16:04:19 2014 -0700 Update OpenSSL to 1.0.1g --- Bundle-Data/Docs/ChangeLog.txt | 4 ++++ gitian/versions | 4 ++-- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 4a95497..3f12ac9 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,7 @@ +Tor Browser Bundle 3.5.4 -- Apr 7 2014 + * All Platforms + * Update OpenSSL to 1.0.1g + Tor Browser Bundle 3.5.3 -- Mar 19 2014 * All Platforms * Update Firefox to 24.4.0esr diff --git a/gitian/versions b/gitian/versions index f007100..739badc 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=3.5.3 +TORBROWSER_VERSION=3.5.4 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 @@ -22,7 +22,7 @@ LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 -OPENSSL_VER=1.0.1f +OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.22 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 176477a..9a7ac2f 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -23,7 +23,7 @@ LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 -OPENSSL_VER=1.0.1f +OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.22 diff --git a/gitian/versions.beta b/gitian/versions.beta index 4c66e6b..4d152dc 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -23,7 +23,7 @@ LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 -OPENSSL_VER=1.0.1f +OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.22 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 57157c0..6717ad2 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -23,7 +23,7 @@ LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 -OPENSSL_VER=1.0.1f +OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.22

1 0

[tor-launcher/master] Bug #9665: Report error if no bridges are usable.
by brade＠torproject.org 07 Apr '14

07 Apr '14

commit 61ff5d51649158dc07353e2034473ba6287bdfe0 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Apr 7 16:46:22 2014 -0400 Bug #9665: Report error if no bridges are usable. --- src/chrome/locale/en/torlauncher.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index a2550db..d04cac5 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -55,3 +55,4 @@ 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

1 0

[tor-browser/tor-browser-24.4.0esr-1] fixup! Add security enhancements suggested by Jesse Ruderman.
by mikeperry＠torproject.org 02 Apr '14

02 Apr '14

commit 0ae8ff689e7f6f0c07d15bfd7ad13d9f7bd54d55 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 2 04:42:20 2014 -0700 fixup! Add security enhancements suggested by Jesse Ruderman. It might be nice if I could cut and paste properly... --- browser/app/profile/000-tor-browser.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 91f8697..4198843 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -143,9 +143,9 @@ pref("layers.acceleration.disabled", true); // Security enhancements // https://trac.torproject.org/projects/tor/ticket/9387#comment:17 pref("javascript.options.ion.content", false); -pref("javascripjavascript.options.baselinejit.content", false); -pref("javascripjavascript.options.asmjs", false); -pref("javascripjavascript.options.typeinference", false); +pref("javascript.options.baselinejit.content", false); +pref("javascript.options.asmjs", false); +pref("javascript.options.typeinference", false); // Version placeholder

1 0

[tor-browser-bundle/master] Bug 11240: Don't run chmod on (dangling) symlinks.
by gk＠torproject.org 02 Apr '14

02 Apr '14

commit 681b1598bbbb0704f620bc0e27624a46d6f51f89 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 2 10:30:11 2014 +0000 Bug 11240: Don't run chmod on (dangling) symlinks. --- gitian/build-helpers/dtar.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gitian/build-helpers/dtar.sh b/gitian/build-helpers/dtar.sh index 282ec2d..e8ec340 100755 --- a/gitian/build-helpers/dtar.sh +++ b/gitian/build-helpers/dtar.sh @@ -5,7 +5,8 @@ export LC_ALL=C TARFILE=$1 shift -find $@ -executable -exec chmod 700 {} \; -find $@ ! -executable -exec chmod 600 {} \; +# No need to execute chmod on (possibly) dangling symlinks. +find $@ ! -type l -executable -exec chmod 700 {} \; +find $@ ! -type l ! -executable -exec chmod 600 {} \; find $@ | sort | tar --no-recursion -Jcvf $TARFILE -T -

1 0

[tor-browser/tor-browser-24.4.0esr-1] Add security enhancements suggested by Jesse Ruderman.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit 8896b493c0487ac7402514257d6e4acdde00ff64 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 23:58:04 2014 -0700 Add security enhancements suggested by Jesse Ruderman. We were going to put these in the security slider, but perhaps they should be set by default. There will be a perf impact, but let's see if anyone notices and complains, at least for a beta or two. If not, maybe we can even set these in a release. --- browser/app/profile/000-tor-browser.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 7e2efc9..91f8697 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -140,5 +140,13 @@ pref("keyword.URL", "https://startpage.com/do/search?q="); pref("gfx.direct2d.disabled", true); pref("layers.acceleration.disabled", true); +// Security enhancements +// https://trac.torproject.org/projects/tor/ticket/9387#comment:17 +pref("javascript.options.ion.content", false); +pref("javascripjavascript.options.baselinejit.content", false); +pref("javascripjavascript.options.asmjs", false); +pref("javascripjavascript.options.typeinference", false); + + // Version placeholder pref("torbrowser.version", "UNKNOWN");

1 0

[tor-browser-bundle/master] Add tools directory with scripts for nightly builds.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit 784bac5f84c7b4b02e11e74070d57c944d1dc291 Author: Linus Nordberg <linus(a)nordberg.se> Date: Sat Mar 15 16:42:50 2014 +0100 Add tools directory with scripts for nightly builds. --- tools/continuous-builds/README | 14 ++++++ tools/continuous-builds/build-tbb.sh | 48 +++++++++++++++++++++ tools/continuous-builds/checkout-tbb.sh | 8 ++++ tools/continuous-builds/park-nightly.sh | 42 ++++++++++++++++++ tools/continuous-builds/setup-gitian-build-env.sh | 3 ++ 5 files changed, 115 insertions(+) diff --git a/tools/continuous-builds/README b/tools/continuous-builds/README new file mode 100644 index 0000000..c60f19f --- /dev/null +++ b/tools/continuous-builds/README @@ -0,0 +1,14 @@ +Nightly builds can be produced and uploaded to a publishing host by +running build-tbb.sh. The checkout-tbb.sh script can be used to check +out the latest master before starting a build. + +The publishing host should handle uploaded tar file using the +park-nightly.sh script through the command option in sshd's +AuthorizedKeysFile. + + command="[ $(hostname) = perdulce ] && ~/park-nightly.sh",no-pty ssh-rsa ... + +In order to not grow the disk usage too much on the publishing host, +the following script can be run by cron: +https://github.com/boklm/prune-old-builds. + diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh new file mode 100755 index 0000000..c44e0fd --- /dev/null +++ b/tools/continuous-builds/build-tbb.sh @@ -0,0 +1,48 @@ +#! /bin/sh +# usage: +# build-tbb.sh [TARGET [PUBLISH-HOST [PUBLISH-KEY [BUILDDIR [DESTDIR [N]]]]]] +# +# Build TARGET in BUILDDIR, which will end up in DESTDIR +# Try doing it N times. +# Upload result to PUBLISH-HOST using SSH key PUBLISH-KEY. + +# TODO: +# - if there's no new commits, don't build but make sure there's a symlink on perdulce + +TARGET=$1; [ -z "$TARGET" ] && TARGET=nightly +PUBLISH_HOST=$2; [ -z "$PUBLISH_HOST" ] && PUBLISH_HOST=perdulce.torproject.org +PUBLISH_KEY=$3; [ -z "$PUBLISH_KEY" ] && PUBLISH_KEY=~/.ssh/perdulce-upload +BUILDDIR=$4; [ -z "$BUILDDIR" ] && BUILDDIR=~/usr/src/tor-browser-bundle/gitian +DESTDIR=$5; [ -z "$DESTDIR" ] && DESTDIR=$BUILDDIR/tbb-$TARGET +N=$6; [ -z "$N" ] && N=16 + +logfile=$(date -u +%s).log + +. ~/setup-gitian-build-env.sh +cd $BUILDDIR || exit 1 +status=init +n=0 +while [ $status != done ]; do + n=$(expr $n + 1) + printf "%s: Starting build number %d. target=$TARGET.\n" $0 $n | tee -a $logfile + date | tee -a $logfile + killall qemu-system-i386 qemu-system-x86_64 + make $TARGET > build-$(date -u +%s).log && status=done + printf "%s: Tried building $TARGET %d times. Status: %s.\n" $0 $n $status | tee -a $logfile + TARGET=build-nightly + [ $n -ge $N ] && break +done + +if [ $status = done ]; then + NEWDESTDIR=$DESTDIR-$(date +%F) + echo "$0: renaming $DESTDIR -> $NEWDESTDIR" | tee -a $logfile + mv $DESTDIR $NEWDESTDIR + cd $NEWDESTDIR || exit 3 + sha256sum *.tar.xz *.zip *.exe > sha256sums.txt + gpg -a --clearsign --local-user 0x984496E7 sha256sums.txt || exit 2 + cd .. + D=$(basename $NEWDESTDIR) + tar cf - $D/sha256sums* $D/*.tar.xz $D/*.zip $D/*.exe | ssh -i $PUBLISH_KEY $PUBLISH_HOST | tee -a $logfile +else + echo "$0: giving up after $n tries" | tee -a $logfile +fi diff --git a/tools/continuous-builds/checkout-tbb.sh b/tools/continuous-builds/checkout-tbb.sh new file mode 100755 index 0000000..f8a7929 --- /dev/null +++ b/tools/continuous-builds/checkout-tbb.sh @@ -0,0 +1,8 @@ +#! /bin/sh + +BUILDDIR=$1 +[ -z "$BUILDDIR" ] && BUILDDIR=~/usr/src/tor-browser-bundle/gitian + +cd $BUILDDIR || exit 1 +git checkout master +git pull diff --git a/tools/continuous-builds/park-nightly.sh b/tools/continuous-builds/park-nightly.sh new file mode 100755 index 0000000..1ac5b2c --- /dev/null +++ b/tools/continuous-builds/park-nightly.sh @@ -0,0 +1,42 @@ +#! /bin/sh +# usage: park-nightly.sh [DIR] + +V=1 #debug is enabled by default for now + +if [ "$1" = "-v" ]; then + V=1 + shift +fi + +DIR=$1 +[ -z "$DIR" ] && DIR=~/public_html/builds + +DSTDIR=tbb-nightly-$(date +%F) +[ -z "$V" ] || echo "Aiming to fill up $DSTDIR" + +do_check() { + [ -z "$1" ] || cd $1 || exit 5 + [ -z "$V" ] || echo "Verifying sha256sums.txt" + gpg -q --verify sha256sums.txt.asc > /dev/null || exit 3 + [ -z "$V" ] || echo "Checking sha256sums.txt" + sha256sum --strict --quiet -c sha256sums.txt || exit 4 +} + +if [ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ]; then + [ -z "$V" ] || echo "Files already here, just doing the checking" + do_check $DIR/$DSTDIR + exit +fi + +[ -d .staging ] || mkdir .staging +chmod 700 .staging; cd .staging +[ -z "$V" ] || echo "Saving files to disk" +TAROPT=x +[ -z "$V" ] || TAROPT=${TAROPT}v +tar $TAROPT -f - || exit 6 +touch $DSTDIR/tbb-nightly.stamp + +do_check $DSTDIR || exit 2 +[ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ] && rm -rf $DIR/$DSTDIR +cd ..; mv $DSTDIR $DIR/ || exit 1 +[ -z "$V" ] || echo "All good, all good" diff --git a/tools/continuous-builds/setup-gitian-build-env.sh b/tools/continuous-builds/setup-gitian-build-env.sh new file mode 100644 index 0000000..e9f435a --- /dev/null +++ b/tools/continuous-builds/setup-gitian-build-env.sh @@ -0,0 +1,3 @@ +# source me! +export LC_ALL=C +export NUM_PROCS=10

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'linus/tools'
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit ce74f8c3a85927cb70d2f5c1dc61a445662e9c1b Merge: 9dbf4b4 f7a5306 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 22:13:23 2014 -0700 Merge remote-tracking branch 'linus/tools' tools/continuous-builds/README | 14 ++++++ tools/continuous-builds/build-tbb.sh | 51 +++++++++++++++++++++ tools/continuous-builds/checkout-tbb.sh | 8 ++++ tools/continuous-builds/park-nightly.sh | 44 ++++++++++++++++++ tools/continuous-builds/setup-gitian-build-env.sh | 3 ++ 5 files changed, 120 insertions(+)

1 0

[tor-browser-bundle/master] Use an environment variable for selecting PGP key to sign with.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit c8fe0baedb139b4798dc484e993b417a2bb1ab0f Author: Linus Nordberg <linus(a)nordberg.se> Date: Tue Mar 25 17:22:21 2014 +0100 Use an environment variable for selecting PGP key to sign with. --- tools/continuous-builds/build-tbb.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index c44e0fd..3ae1c92 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -1,6 +1,6 @@ #! /bin/sh # usage: -# build-tbb.sh [TARGET [PUBLISH-HOST [PUBLISH-KEY [BUILDDIR [DESTDIR [N]]]]]] +# build-tbb.sh [TARGET [PUBLISH-HOST [PUBLISH-SSH-KEY [BUILDDIR [DESTDIR [N]]]]]] # # Build TARGET in BUILDDIR, which will end up in DESTDIR # Try doing it N times. @@ -8,14 +8,17 @@ # TODO: # - if there's no new commits, don't build but make sure there's a symlink on perdulce +# - copy build logs to publish-host, at least when failing the build TARGET=$1; [ -z "$TARGET" ] && TARGET=nightly PUBLISH_HOST=$2; [ -z "$PUBLISH_HOST" ] && PUBLISH_HOST=perdulce.torproject.org -PUBLISH_KEY=$3; [ -z "$PUBLISH_KEY" ] && PUBLISH_KEY=~/.ssh/perdulce-upload +PUBLISH_SSH_KEY=$3; [ -z "$PUBLISH_SSH_KEY" ] && PUBLISH_SSH_KEY=~/.ssh/perdulce-upload BUILDDIR=$4; [ -z "$BUILDDIR" ] && BUILDDIR=~/usr/src/tor-browser-bundle/gitian DESTDIR=$5; [ -z "$DESTDIR" ] && DESTDIR=$BUILDDIR/tbb-$TARGET N=$6; [ -z "$N" ] && N=16 +[ -z "$PGPKEYID" ] && PGPKEYID=0x984496E7 + logfile=$(date -u +%s).log . ~/setup-gitian-build-env.sh @@ -39,10 +42,10 @@ if [ $status = done ]; then mv $DESTDIR $NEWDESTDIR cd $NEWDESTDIR || exit 3 sha256sum *.tar.xz *.zip *.exe > sha256sums.txt - gpg -a --clearsign --local-user 0x984496E7 sha256sums.txt || exit 2 + gpg -a --clearsign --local-user $PGPKEYID sha256sums.txt || exit 2 cd .. D=$(basename $NEWDESTDIR) - tar cf - $D/sha256sums* $D/*.tar.xz $D/*.zip $D/*.exe | ssh -i $PUBLISH_KEY $PUBLISH_HOST | tee -a $logfile + tar cf - $D/sha256sums* $D/*.tar.xz $D/*.zip $D/*.exe | ssh -i $PUBLISH_SSH_KEY $PUBLISH_HOST | tee -a $logfile else echo "$0: giving up after $n tries" | tee -a $logfile fi

1 0