tor-commits April 2015

tor-commits@lists.torproject.org

19 participants
1110 discussions

[torbutton/master] Update changelog for 1.9.2.1.
by mikeperry＠torproject.org 22 Apr '15

22 Apr '15

commit d215393de112d742c5d88336a71bc7a4dab8e4f5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 22 00:57:47 2015 -0700 Update changelog for 1.9.2.1. --- src/CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index e50f5b6..4a3353d 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,6 @@ +1.9.2.1: + * Bug 14429: Disable window resizing for now. + 1.9.2.0: * Bug 15562: Bind SharedWorkers to thirdparty pref * Bug 15533: Restore default security level when restoring defaults

1 0

[torbutton/master] Bug 14429: Disable resizing for now.
by mikeperry＠torproject.org 22 Apr '15

22 Apr '15

commit 0e20a8156e86111281e4d8a0684b753056e52ea7 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 22 00:56:55 2015 -0700 Bug 14429: Disable resizing for now. --- src/defaults/preferences/preferences.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 85fd953..68c4f60 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -159,7 +159,7 @@ pref("extensions.torbutton.close_newnym",true); pref("extensions.torbutton.block_js_history",true); pref("extensions.torbutton.resize_on_toggle",true); pref("extensions.torbutton.resize_new_windows",true); -pref("extensions.torbutton.resize_windows",true); +pref("extensions.torbutton.resize_windows",false); pref("extensions.torbutton.banned_ports","9050,9051,9150,9151"); pref("extensions.torbutton.block_tor_file_net",true); pref("extensions.torbutton.block_nontor_file_net",false);

1 0

[tor-browser-bundle/master] Update versions files (alpha and stable) for 4.5.
by mikeperry＠torproject.org 22 Apr '15

22 Apr '15

commit 750efb38def19147d1c363ceb8738920784f0b48 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 21 20:02:26 2015 -0700 Update versions files (alpha and stable) for 4.5. --- gitian/versions | 29 +++++++++++++++++------------ gitian/versions.alpha | 12 ++++++------ 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/gitian/versions b/gitian/versions index 3b74f27..653b4b1 100755 --- a/gitian/versions +++ b/gitian/versions @@ -4,19 +4,19 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=31.2.0esr +FIREFOX_VERSION=31.6.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build3 -TOR_TAG=tor-0.2.5.10 -TORLAUNCHER_TAG=0.2.7.0.1 -TORBUTTON_TAG=1.7.0.1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build2 +TOR_TAG=tor-0.2.6.7 +TORLAUNCHER_TAG=0.2.7.4 +TORBUTTON_TAG=1.9.2.0 HTTPSE_TAG=5.0.2 -NSIS_TAG=v0.2 +NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable -MINGW_TAG=469ed5d227202b373409c8a3b4c1358be39b9983 # XXX: ??? +MINGW_TAG=e712bb8b106d059914388e6ccd93c584a6416082 # XXX: ??? PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 FLASHPROXY_TAG=1.6 @@ -27,13 +27,18 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GOPTLIB_TAG=0.2 MEEK_TAG=0.17 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 +GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de +GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd +GO_X_CRYPTO_TAG=4ed45ec682102c643324fae5dff8dab085b6c300 +GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 +OBFS4_TAG=obfs4proxy-0.0.5 GITIAN_TAG=tor-browser-builder-3.x-7 -OPENSSL_VER=1.0.1i +OPENSSL_VER=1.0.1m GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build1 +FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=4.9.1 PYTHON_VER=2.7.5 @@ -52,7 +57,7 @@ GO_VER=1.4.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.3-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.22-sm+fn+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 @@ -74,12 +79,12 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7 +OPENSSL_HASH=095f0b7b09116c0c5526422088058dc7e6e000aa14d22acca6a4e2babcdfef74 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=d399d724953fe032ccca758e577c2136b8fd6c377cea0e3f42ed999b796d290a +NOSCRIPT_HASH=0c6774cd5479a315253eb403c6a7c074658154630ac9c4bc481aa0aba6eb16a8 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 718019b..6419111 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -8,10 +8,10 @@ FIREFOX_VERSION=31.6.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build1 -TOR_TAG=tor-0.2.6.6 -TORLAUNCHER_TAG=0.2.7.3 -TORBUTTON_TAG=1.9.1.0 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build2 +TOR_TAG=tor-0.2.6.7 +TORLAUNCHER_TAG=0.2.7.4 +TORBUTTON_TAG=1.9.2.0 HTTPSE_TAG=5.0.2 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 @@ -57,7 +57,7 @@ GO_VER=1.4.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.19-fx+fn+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.22-sm+fn+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 @@ -84,7 +84,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=2579b91fb2f5491a12c49e543a9d2b2583dc82e2393ce1b0ab92b170dcc7c6ad +NOSCRIPT_HASH=0c6774cd5479a315253eb403c6a7c074658154630ac9c4bc481aa0aba6eb16a8 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/master] List 4.5 in update-responses for alpha users.
by mikeperry＠torproject.org 22 Apr '15

22 Apr '15

commit 4ac8af0dccc5e63fbfe44ca7deb98db019ba5a80 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 21 20:02:49 2015 -0700 List 4.5 in update-responses for alpha users. --- tools/update-responses/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index d06be81..1475195 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -9,14 +9,14 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 4.5a5 + alpha: 4.5 versions: - 4.5a5: + 4.5: platformVersion: 31.6.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.5a5 + download_url: https://www.torproject.org/dist/torbrowser/4.5 incremental_from: - - 4.5a4 + - 4.5a5 migrate_archs: osx32: osx64 osx32:

1 0

[torbutton/master] Import translations.
by mikeperry＠torproject.org 22 Apr '15

22 Apr '15

commit 6530c29c248f035050dc978018230e3df83243dd Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 21 19:55:55 2015 -0700 Import translations. --- src/chrome/locale/ar/torbutton.properties | 2 +- src/chrome/locale/de/torbutton.dtd | 4 +- src/chrome/locale/de/torbutton.properties | 4 +- src/chrome/locale/es/torbutton.properties | 2 +- src/chrome/locale/eu/aboutTor.dtd | 2 +- src/chrome/locale/eu/torbutton.dtd | 8 ++-- src/chrome/locale/eu/torbutton.properties | 2 +- src/chrome/locale/fa/torbutton.properties | 4 +- src/chrome/locale/fr/torbutton.dtd | 34 ++++++++--------- src/chrome/locale/fr/torbutton.properties | 6 +-- src/chrome/locale/it/torbutton.properties | 12 +++--- src/chrome/locale/ja/torbutton.properties | 2 +- src/chrome/locale/ko/torbutton.properties | 2 +- src/chrome/locale/nl/torbutton.dtd | 30 +++++++-------- src/chrome/locale/nl/torbutton.properties | 2 +- src/chrome/locale/pl/torbutton.properties | 2 +- src/chrome/locale/pt/torbutton.properties | 2 +- src/chrome/locale/ru/torbutton.dtd | 50 ++++++++++++------------- src/chrome/locale/ru/torbutton.properties | 18 ++++----- src/chrome/locale/sv/torbutton.dtd | 52 +++++++++++++------------- src/chrome/locale/sv/torbutton.properties | 14 +++---- src/chrome/locale/tr/torbutton.properties | 6 +-- src/chrome/locale/vi/torbutton.properties | 2 +- src/chrome/locale/zh-CN/aboutTor.dtd | 2 +- src/chrome/locale/zh-CN/torbutton.dtd | 18 ++++----- src/chrome/locale/zh-CN/torbutton.properties | 22 +++++------ 26 files changed, 152 insertions(+), 152 deletions(-) diff --git a/src/chrome/locale/ar/torbutton.properties b/src/chrome/locale/ar/torbutton.properties index 456399a..ef6dd71 100644 --- a/src/chrome/locale/ar/torbutton.properties +++ b/src/chrome/locale/ar/torbutton.properties @@ -55,7 +55,7 @@ torbutton.popup.confirm_plugins = البرامج الإضافية مثل فلا torbutton.popup.never_ask_again = لا تسألني مرة اخري torbutton.popup.confirm_newnym = متصفح تور -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! +torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! torbutton.slider_notification_button = Open security settings torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd index 622cfc1..dbf16ac 100644 --- a/src/chrome/locale/de/torbutton.dtd +++ b/src/chrome/locale/de/torbutton.dtd @@ -163,8 +163,8 @@ <!ENTITY torbutton.prefs.sec_some_jit_desc "Einige JavaScript Ausführungsoptimierungen sind unterbunden."> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Typinferenz, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "JIT-Basis."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts können auf manchen seiten langsamer laufen."> -<!ENTITY torbutton.prefs.sec_jar_desc "JAR-Dateieen sind im Web extrem selten, können aaber eine Quelle von XSS und anderen Attacken sein."> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts können auf manchen Seiten langsamer laufen."> +<!ENTITY torbutton.prefs.sec_jar_desc "JAR-Dateien sind im Web extrem selten, können aber eine Quelle von XSS und anderen Attacken sein."> <!ENTITY torbutton.prefs.sec_jar_tooltip "JAR-Dateien sind sehr selten im Internet, aber sie können eine Quelle von XSS (Webseitenübergreifendes Skripting) und anderer Angriffe sein."> <!ENTITY torbutton.prefs.sec_mathml_desc "Manche Vorgänge zur Anzeige von mathematischen Gleichungen sind deaktiviert."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML ist blockiert."> diff --git a/src/chrome/locale/de/torbutton.properties b/src/chrome/locale/de/torbutton.properties index ed2941d..53bc747 100644 --- a/src/chrome/locale/de/torbutton.properties +++ b/src/chrome/locale/de/torbutton.properties @@ -55,10 +55,10 @@ torbutton.popup.confirm_plugins = Erweiterungen wie Flash können ihre Privatsph torbutton.popup.never_ask_again = Nicht mehr nachfragen torbutton.popup.confirm_newnym = Tor-Browser wird alle Fenster und Reiter schließen. Alle Internetseitensitzungen gehen verloren.\n\nTor-Browser jetzt neu starten, um Ihre Identität zurückzusetzen?\n\n -torbutton.slider_notification = Das grüne Onion Menü hat jetzt einen Sicherheits-Regler welches Ihr Sicherheits-Level einstellt. Probier's aus! +torbutton.slider_notification = Das grüne Onion-Menü hat jetzt einen Sicherheitsschieberegler, mit dem Sie Ihre Sicherheitsstufe anpassen können. Probieren Sie es aus! torbutton.slider_notification_button = Öffne Sicherheits-Einstellungen -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = Die Maximierung des Tor-Browsers kann Webseiten die Bestimmung Ihrer Bildschirmgröße ermöglichen, um damit Ihre Spur zu verfolgen. Wir empfehlen Ihnen, das Tor-Browser-Fenster in seiner ursprünglichen Standardgröße zu belassen. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Die Internetseite (%S) hat versucht, HTML5-Canvas-Bilddaten zu extrahieren, die verwendet werden können, um Ihren Rechner eindeutig zu identifizieren. \n\nSoll Tor-Browser es dieser Internetseite erlauben HTML5-Canvas-Bilddaten zu extrahieren? diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties index 6edea41..3812a7a 100644 --- a/src/chrome/locale/es/torbutton.properties +++ b/src/chrome/locale/es/torbutton.properties @@ -55,7 +55,7 @@ torbutton.popup.confirm_plugins = Complementos (plugins) como Flash pueden daña torbutton.popup.never_ask_again = No volver a preguntar torbutton.popup.confirm_newnym = El Navegador Tor cerrará todas las ventanas y pestañas. Todas las sesiones de sitios web se perderán.\n\n¿Reiniciar el Navegador Tor para restablecer su identidad?\n\n -torbutton.slider_notification = El menú de la cebolla verde incluye ahora un panel deslizante que le permite ajustar el nivel de seguridad. ¡Pruébelo! +torbutton.slider_notification = El menú de la cebolla verde ahora tiene un control deslizante que le permite ajustar su nivel de seguridad. ¡Échele un vistazo! torbutton.slider_notification_button = Abrir ajustes de seguridad torbutton.maximize_warning = Maximizar el navegador Tor puede permitir a los sitios web determinar el tamaño de su monitor, lo que se puede usar para rastrearle. Le recomendamos que deje las ventanas del navegador Tor a su tamaño predeterminado original. diff --git a/src/chrome/locale/eu/aboutTor.dtd b/src/chrome/locale/eu/aboutTor.dtd index 692e1d1..03bf31d 100644 --- a/src/chrome/locale/eu/aboutTor.dtd +++ b/src/chrome/locale/eu/aboutTor.dtd @@ -8,7 +8,7 @@ <!ENTITY aboutTor.outOfDateTorOn.label "HALA ERE, nabigatzaile hau zaharkituta dago."> <!ENTITY aboutTor.outOfDateTorOff.label "BAITA, nabigatzaile hau zaharkituta dago."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update."> +<!ENTITY aboutTor.outOfDate2.label "Tipulan sakatu eta ondoren Tor Browser Bundlea egiaztatu hautatu"> <!ENTITY aboutTor.check.label "Tor sare ezarpenak frogatu"> diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd index 0511ec4..9bb8698 100644 --- a/src/chrome/locale/eu/torbutton.dtd +++ b/src/chrome/locale/eu/torbutton.dtd @@ -24,19 +24,19 @@ <!ENTITY torbutton.pref_connection_more_info.text "Une honetan Torbutton gaituta dago. Zure ez-Tor proxy ezarpenak aldatu nahi badituzu, mesedez ezgaitu Torbutton eta hona bueltatu. Zure Tor ezarpenak aldatu nahi badituzu, mesedez erabili Torbutton ezarpen leihoa."> <!ENTITY torbutton.context_menu.new_identity "Nortasun berria"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site"> +<!ENTITY torbutton.context_menu.new_circuit "Tor zirkuitu berria gune honetarako"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> <!ENTITY torbutton.context_menu.toggle "Aldatu Toren egoera"> <!ENTITY torbutton.context_menu.toggle.key "T"> -<!ENTITY torbutton.context_menu.preferences "Privacy and Security Settings…"> +<!ENTITY torbutton.context_menu.preferences "Pribatutasun eta segurtasun ezarpenak..."> <!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.about "Torbuttoni buruz..."> <!ENTITY torbutton.context_menu.about.key "A"> <!ENTITY torbutton.context_menu.networksettings "Tor Sarearen Ezarpenak..."> <!ENTITY torbutton.context_menu.networksettings.key "S"> -<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update…"> +<!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser eguneraketa egiaztatu"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections…"> +<!ENTITY torbutton.context_menu.cookieProtections "Cookie babesak..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.context_menu.copyTor "Kopiatu Tor URLa"> <!ENTITY torbutton.context_menu.copyTor.key "p"> diff --git a/src/chrome/locale/eu/torbutton.properties b/src/chrome/locale/eu/torbutton.properties index 671940d..ae01c49 100644 --- a/src/chrome/locale/eu/torbutton.properties +++ b/src/chrome/locale/eu/torbutton.properties @@ -55,7 +55,7 @@ torbutton.popup.confirm_plugins = Flash bezalako pluginek zure pribatutasuna eta torbutton.popup.never_ask_again = Ez nazazu galdetu berriz torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! +torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! torbutton.slider_notification_button = Open security settings torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. diff --git a/src/chrome/locale/fa/torbutton.properties b/src/chrome/locale/fa/torbutton.properties index 2a4b86e..e19af7f 100644 --- a/src/chrome/locale/fa/torbutton.properties +++ b/src/chrome/locale/fa/torbutton.properties @@ -55,10 +55,10 @@ torbutton.popup.confirm_plugins = پلاگینها مانند فلش، میتو torbutton.popup.never_ask_again = دیگر هیچگاه این را از من نپرس torbutton.popup.confirm_newnym = مرورگر Tor همه پنجره ها و تب ها را می بندد. همه جلسات وب سایت شود از دست خواهد رفت\n\nآیا می خواهید راه اندازی مجدد مرورگر Tor الان انجام شود تا هویت خود را تنظیم مجدد کنید؟\n -torbutton.slider_notification = منوی پیاز سبز در حال حاضر یک نوار لغزنده امنیتی که به شما اجازه می دهد سطح امنیتی خود را تنظیم کنید. آن را چک کنید! +torbutton.slider_notification = منوی پیاز سبز در حال حاضر یک نوار لغزنده امنیتی است که به شما اجازه می دهد سطح امنیتی خود را تنظیم کنید. آن را چک کنید! torbutton.slider_notification_button = باز کردن تنظیمات امنیتی -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = ماکسیمایز کردن مرورگر تُر به وبسایت ها این امکان را می دهد که از روی سایز صفحه نمایش، شما را ردگیری کنند. پیشنهاد می کنیم که از سایز پیش فرض مرورگر تُر استفاده کنید. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=این وب‌سایت (%S) سعی دارد اطلاعات بوم تصویر HTML5 را دریافت کند که ممکن است برای شناسایی منحصر به فرد کامپیوتر شما استفاده شود.\n\nآیا مرورگر تور میبایست اجازه دریافت این اطلاعات را بدهد؟ diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd index f972f41..ad6f07a 100644 --- a/src/chrome/locale/fr/torbutton.dtd +++ b/src/chrome/locale/fr/torbutton.dtd @@ -157,31 +157,31 @@ <!ENTITY torbutton.prefs.sec_low_desc "A ce niveau de sécurité, toutes les fonctions de navigation sont activés."> <!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Le mécanisme SVG OpenType de rendu des polices est désactivé."> <!ENTITY torbutton.prefs.sec_med_low "Moyen-Bas"> -<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):"> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled."> +<!ENTITY torbutton.prefs.sec_gen_desc "À ce niveau de sécurité, les changements suivants s'appliquent (passez la souris au dessus pour afficher des détails) :"> +<!ENTITY torbutton.prefs.sec_html5_desc "Les vidéos et médias audio HTML5 deviennent jouable d'un clic via NoScript."> +<!ENTITY torbutton.prefs.sec_html5_tooltip "Sur quelques sites, vous pourriez devoir utiliser le bouton de barre d'outils de NoScript pour permettre ces objets médiatiques."> +<!ENTITY torbutton.prefs.sec_some_jit_desc "Quelques optimisations de performance liés à Javascript sont désactivées."> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> -<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "Les scripts sur quelques sites peuvent fonctionner plus lentement."> +<!ENTITY torbutton.prefs.sec_jar_desc "Les fichiers distants JAR sont bloqués."> +<!ENTITY torbutton.prefs.sec_jar_tooltip "Les fichiers JAR sont extrêmement rares sur le Web, mais peuvent être une source d'attaques XSS et autres."> +<!ENTITY torbutton.prefs.sec_mathml_desc "Quelques mécanismes d'affichage d'équations mathématiques sont désactivés."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML est désactivé."> <!ENTITY torbutton.prefs.sec_med_high "Moyen-Haut"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "All JavaScript performance optimizations are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled."> +<!ENTITY torbutton.prefs.sec_all_jit_desc "Toutes les optimisations de performance de Javascript sont désactivées."> +<!ENTITY torbutton.prefs.sec_font_rend_desc "Certaines fonctionnalités de rendu de police sont désactivées."> +<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Le mécanisme de rendu de police de caractères Graphite est désactivé."> +<!ENTITY torbutton.prefs.sec_svg_desc "Quelques types d'images sont désactivés."> <!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Les images SVG sont désactivées."> <!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript est désactivé par défaut sur tous les sites non-HTTPS."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript peut être activé selon le site via le bouton de barre d'outils NoScript."> <!ENTITY torbutton.prefs.sec_high "Haut"> <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript est désactivé par défaut sur tous les sites."> -<!ENTITY torbutton.prefs.sec_audio_video_desc "Most audio and video formats are disabled."> -<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM is the only codec that remains enabled."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> +<!ENTITY torbutton.prefs.sec_audio_video_desc "La plupart des formats audio et vidéo sont désactivés."> +<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM est le seul codec qui reste permis."> +<!ENTITY torbutton.prefs.sec_webfonts_desc "Certaines polices de caractères et icônes peuvent être affichées de façon incorrecte."> +<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Les fichiers de police de caractères fournis par des sites Web sont bloqués."> <!ENTITY torbutton.prefs.sec_custom "Valeurs personnalisées"> <!ENTITY torbutton.circuit_display.title "Circuit Tor pour ce site"> diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties index bb5a6ae..c6a109e 100644 --- a/src/chrome/locale/fr/torbutton.properties +++ b/src/chrome/locale/fr/torbutton.properties @@ -55,10 +55,10 @@ torbutton.popup.confirm_plugins = Les greffons tels que Flash peuvent nuire à v torbutton.popup.never_ask_again = Ne plus me poser la question. torbutton.popup.confirm_newnym = Le navigateur Tor va fermer toutes les fenêtres et onglets. Tous les sessions ouvertes seront perdues.\n\nVoulez-vous redémarrer le navigateur Tor maintenant pour réinitialiser votre identité ?\n\n -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +torbutton.slider_notification = Le menu de l'oignon vert a maintenant un curseur de sécurité qui vous laisse ajuster votre niveau de sécurité. Découvrez le ! +torbutton.slider_notification_button = Ouvrir préférences de sécurité -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = Maximiser le navigateur Tor à l'écran peut permettre aux sites Web de déterminer votre taille de moniteur, laquelle peut être utilisée pour vous suivre à la trace. Nous recommandons que vous laissiez les fenêtres du navigateur Tor dans leur taille d'origine. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Ce site (%S) tente d'extraire des informations d'image canvas HTML5 qui pourraient être utilisées comme identifiant unique pour votre ordinateur.\n\nTor Browser doit-il autoriser le site à extraire les informations d'image canvas HTML5 ? diff --git a/src/chrome/locale/it/torbutton.properties b/src/chrome/locale/it/torbutton.properties index e3929a4..9187d15 100644 --- a/src/chrome/locale/it/torbutton.properties +++ b/src/chrome/locale/it/torbutton.properties @@ -53,15 +53,15 @@ torbutton.popup.short_torbrowser = Informazioni importanti su Torbutton!\n\nTorb torbutton.popup.confirm_plugins = Alcuni plugin come Flash possono violare la tua privacy e anonimità.\n\nPossono anche eludere Tor per rivelare la tua posizione attuale e il tuo indirizzo IP.\n\nSei sicuro di volere attivare i plugin?\n torbutton.popup.never_ask_again = Non chiedermelo più -torbutton.popup.confirm_newnym = Tor Browser chiuderà tutte le schede e finestre. Tutte le sezioni dei siti andranno perse.\n\nRiavviare ora Tor Browser per azzerare la tua identità?\n\n +torbutton.popup.confirm_newnym = Tor Browser chiuderà tutte le schede e finestre. Tutte le sessioni dei siti andranno perse.\n\nRiavviare ora Tor Browser per azzerare la tua identità?\n\n torbutton.slider_notification = Il menù della cipolla verde ha ora una slider di sicurezza che ti permette di regolare il livello di sicurezza. Dai un'occhiata! torbutton.slider_notification_button = Apri impostazioni sicurezza -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = Massimizzando Tor Browser, i siti web possono risalire alle dimensioni del tuo schermo, e questo può servire a rintracciarti. Ti raccomandiamo di mantenere invariate le dimensioni iniziali di default delle finestre di Tor Browser. # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=Questo sito (%S) tentato di estrarre i dati di immagine HTML5 canvas, che possono essere utilizzati per identificare in modo univoco il computer.\n\nPermettere a Tor Browser di estrarre l'immagine HTML5 canvas per questo sito? +canvas.siteprompt=Questo sito (%S) ha tentato di estrarre i dati di immagine HTML5 canvas, che possono essere utilizzati per identificare in modo univoco il computer.\n\nPermettere a Tor Browser di estrarre l'immagine HTML5 canvas per questo sito? canvas.notNow=Non ora canvas.notNowAccessKey=N canvas.allow=acconsenti in futuro @@ -72,6 +72,6 @@ canvas.neverAccessKey=e # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. profileProblemTitle=Problema Profilo %S -profileReadOnly=Non puoi avviare %S da un file system di sola lettura. Per favore copia %S in un altra posizione prima di usarlo. -profileReadOnlyMac=Non puoi avviare %S da un file system di sola lettura. Per favore copia %S nel tuo desktop o nella cartella Applicazioni prima di usarlo. -profileAccessDenied=%S non ha i permessi per accedere al profilo. Per favore, controlla i permessi del tuo file system e riprova. +profileReadOnly=Non puoi avviare %S da un file system di sola lettura. Per favore copia %S in un'altra posizione prima di usarlo. +profileReadOnlyMac=Non puoi avviare %S da un file system di sola lettura. Per favore copia %S sulla tua scrivania o nella cartella Applicazioni prima di usarlo. +profileAccessDenied=%S non ha i permessi per accedere al profilo. Per favore, modifica i permessi del tuo file system e riprova. diff --git a/src/chrome/locale/ja/torbutton.properties b/src/chrome/locale/ja/torbutton.properties index 133ad88..fe40735 100644 --- a/src/chrome/locale/ja/torbutton.properties +++ b/src/chrome/locale/ja/torbutton.properties @@ -55,7 +55,7 @@ torbutton.popup.confirm_plugins = Flashなどのプラグインはあなたの torbutton.popup.never_ask_again = 次からはたずねない torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! +torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! torbutton.slider_notification_button = Open security settings torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. diff --git a/src/chrome/locale/ko/torbutton.properties b/src/chrome/locale/ko/torbutton.properties index df9ddbf..1c3bf03 100644 --- a/src/chrome/locale/ko/torbutton.properties +++ b/src/chrome/locale/ko/torbutton.properties @@ -55,7 +55,7 @@ torbutton.popup.confirm_plugins = 플래시와 같은 플러그인들은 당신 torbutton.popup.never_ask_again = 다시는 물어보지 않기 torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! +torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! torbutton.slider_notification_button = Open security settings torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd index b9209b4..365da9e 100644 --- a/src/chrome/locale/nl/torbutton.dtd +++ b/src/chrome/locale/nl/torbutton.dtd @@ -153,34 +153,34 @@ <!ENTITY torbutton.prefs.resist_fingerprinting "Verander details die je onderscheiden van andere Tor Browser gebruikers"> <!ENTITY torbutton.prefs.sec_caption "Beveiligingsniveau"> <!ENTITY torbutton.prefs.sec_low "Laag (standaard)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience."> -<!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled."> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled."> +<!ENTITY torbutton.prefs.sec_low_usable_desc "Dit verschaft de meest bruikbare ervaring"> +<!ENTITY torbutton.prefs.sec_low_desc "Op dit beveiligingsniveau worden alle browser functies ingeschakeld."> +<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "De SVG OpenType font rendering mechanisme is uitgeschakeld."> <!ENTITY torbutton.prefs.sec_med_low "Medium-Laag"> -<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):"> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled."> +<!ENTITY torbutton.prefs.sec_gen_desc "Op dit veiligheidsniveau , gelden de volgende wijzigingen ( muis over voor meer informatie) "> +<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video en audio media geworden click-to-play via NoScript."> +<!ENTITY torbutton.prefs.sec_html5_tooltip "Op sommige sites , zou je de NoScript werkbalk knop moeten gebruiken om deze media -objecten mogelijk te maken."> +<!ENTITY torbutton.prefs.sec_some_jit_desc "Sommige JavaScript performance optimizations zijn uitgeschakeld."> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts kunnen op sommige websites trager zijn."> -<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> +<!ENTITY torbutton.prefs.sec_jar_desc "Externe JAR bestanden worden geblokkeerd."> +<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR-bestanden zijn uiterst zeldzaam op het web, maar kan een bron van XSS en andere attacks"> +<!ENTITY torbutton.prefs.sec_mathml_desc "Sommige mechanismen van het weergeven van wiskundige vergelijkingen zijn uitgeschakeld."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is uitgeschakeld."> <!ENTITY torbutton.prefs.sec_med_high "Medium-Hoog"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "All JavaScript performance optimizations are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> +<!ENTITY torbutton.prefs.sec_all_jit_desc "Alle JavaScript performance optimizations zijn uitgeschakeld."> +<!ENTITY torbutton.prefs.sec_font_rend_desc "Sommige lettertype rendering functies zijn uitgeschakeld."> +<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "De Graphite lettertype rendering mechanisme is uitgeschakeld."> <!ENTITY torbutton.prefs.sec_svg_desc "Sommige afbeeldingtypes zijn uitgeschakeld."> <!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG afbeeldingen zijn uitgeschakeld."> <!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is standaard uitgeschakeld op alle niet-HTTPS websites."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript kan worden ingeschakeld op een basis per - site via de NoScript werkbalk knop."> <!ENTITY torbutton.prefs.sec_high "Hoog"> <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is standaard uitgeschakeld op alle websites."> <!ENTITY torbutton.prefs.sec_audio_video_desc "Meeste audio en video formaten zijn uitgeschakeld."> <!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM blijft de enige codec die is ingeschakeld."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> +<!ENTITY torbutton.prefs.sec_webfonts_desc "Sommige lettertypen en pictogrammen worden mogelijk niet goed weergegeven. "> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Door websites aangeleverde lettertypes worden geblokkeerd."> <!ENTITY torbutton.prefs.sec_custom "Aangepaste waarden"> <!ENTITY torbutton.circuit_display.title "Tor circuit voor deze website"> diff --git a/src/chrome/locale/nl/torbutton.properties b/src/chrome/locale/nl/torbutton.properties index 3ed9ef3..5beed1e 100644 --- a/src/chrome/locale/nl/torbutton.properties +++ b/src/chrome/locale/nl/torbutton.properties @@ -55,7 +55,7 @@ torbutton.popup.confirm_plugins = plug-ins zoals flash kunnen u privacy en anoni torbutton.popup.never_ask_again = Vraag me dit nooit meer. torbutton.popup.confirm_newnym = De Tor Browser zal alle windows en tabs sluiten. Alle website sessies zullen verloren gaan.\n\nHerstart de Tor Browser om je identiteit te resetten?\n\n -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! +torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! torbutton.slider_notification_button = Open de beveiligingsvoorkeuren torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. diff --git a/src/chrome/locale/pl/torbutton.properties b/src/chrome/locale/pl/torbutton.properties index c04c876..4846677 100644 --- a/src/chrome/locale/pl/torbutton.properties +++ b/src/chrome/locale/pl/torbutton.properties @@ -55,7 +55,7 @@ torbutton.popup.confirm_plugins = Wtyczki takie jak Flash mogą szkodzić Twojej torbutton.popup.never_ask_again = Nie pytaj mnie więcej torbutton.popup.confirm_newnym = Tor Browser zamknie wszystkie otwarte okna i karty. Wszystkie sesje zostaną utracone.\n\nCzy chcesz zrestartować Tor Browser teraz, aby zmienić tożsamość?\n\n -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! +torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! torbutton.slider_notification_button = Open security settings torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. diff --git a/src/chrome/locale/pt/torbutton.properties b/src/chrome/locale/pt/torbutton.properties index f343a97..787dbd1 100644 --- a/src/chrome/locale/pt/torbutton.properties +++ b/src/chrome/locale/pt/torbutton.properties @@ -55,7 +55,7 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an torbutton.popup.never_ask_again = Não voltar a perguntar-me torbutton.popup.confirm_newnym = O Navegador Tor irá fechar todas as janela e separadores. Estarão perdidas todas sessões do sítio da Web.\n\nReiniciar o Navegador Tor para repor a sua identidade?\n\n -torbutton.slider_notification = O menu cebola verde tem agora um cursor de segurança que o deixa ajustar o seu nível de segurança. Dê uma vista de olhos! +torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! torbutton.slider_notification_button = Abra as definições de segurança torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd index 4d472cb..2b0156a 100644 --- a/src/chrome/locale/ru/torbutton.dtd +++ b/src/chrome/locale/ru/torbutton.dtd @@ -153,35 +153,35 @@ <!ENTITY torbutton.prefs.resist_fingerprinting "Изменить сведения, отличающие вас от других пользователей Tor Browser"> <!ENTITY torbutton.prefs.sec_caption "Уровень безопасности"> <!ENTITY torbutton.prefs.sec_low "Низкий (по умолчанию)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience."> -<!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled."> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled."> +<!ENTITY torbutton.prefs.sec_low_usable_desc "Наиболее простой вариант использования."> +<!ENTITY torbutton.prefs.sec_low_desc "На этом уровне безопасности, все функции браузера включены."> +<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Механизм визуализации шрифта SVG OpenType отключен."> <!ENTITY torbutton.prefs.sec_med_low "Средний"> -<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):"> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled."> +<!ENTITY torbutton.prefs.sec_gen_desc "На этом уровне безопасности, следующие изменения применяются (при наведении курсора мыши):"> +<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 видео и аудио воспроизводятся только после щелчка благодаря NoScript."> +<!ENTITY torbutton.prefs.sec_html5_tooltip "На некоторых сайтах, вам может потребоваться использовать кнопку NoScript панели инструментов, чтобы включить эти мультимедийные объекты."> +<!ENTITY torbutton.prefs.sec_some_jit_desc "Некоторые оптимизации производительности JavaScript отключены."> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> -<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> -<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled."> +<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Базовый JIT."> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "Сценарии на некоторых сайтах могут работать медленнее."> +<!ENTITY torbutton.prefs.sec_jar_desc "Сторонние JAR файлы заблокированы."> +<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR файлы крайне редки в Интернете, но могут быть источником XSS и других атак."> +<!ENTITY torbutton.prefs.sec_mathml_desc "Некоторые механизмы отображения математических уравнений отключены."> +<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML отключен."> <!ENTITY torbutton.prefs.sec_med_high "Умеренно высокий"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "All JavaScript performance optimizations are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> +<!ENTITY torbutton.prefs.sec_all_jit_desc "Все оптимизации производительности JavaScript отключены."> +<!ENTITY torbutton.prefs.sec_font_rend_desc "Некоторые функции отрисовки шрифтов отключены."> +<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Механизм визуализации шрифта Graphite отключен."> +<!ENTITY torbutton.prefs.sec_svg_desc "Некоторые типы изображений отключены."> +<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG изображения отключены"> +<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript отключен по умолчанию на всех не HTTPS сайтах."> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript может быть включен на сайте с помощью кнопки NoScript на панели инструментов."> <!ENTITY torbutton.prefs.sec_high "Высокий"> -<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites."> -<!ENTITY torbutton.prefs.sec_audio_video_desc "Most audio and video formats are disabled."> -<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM is the only codec that remains enabled."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> +<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript отключен по умолчанию на всех сайтах."> +<!ENTITY torbutton.prefs.sec_audio_video_desc "Большинство аудио и видео форматов отключены."> +<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM является только кодеком, который остается включенным."> +<!ENTITY torbutton.prefs.sec_webfonts_desc "Некоторые шрифты и значки могут отображаться некорректно."> +<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Файлы шрифтов, предоставленные сайтом, заблокированы"> <!ENTITY torbutton.prefs.sec_custom "Собственные значения"> <!ENTITY torbutton.circuit_display.title "Цепочка Tor для этого сайта"> diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties index 7e06f17..d70db02 100644 --- a/src/chrome/locale/ru/torbutton.properties +++ b/src/chrome/locale/ru/torbutton.properties @@ -2,9 +2,9 @@ torbutton.button.tooltip.disabled = Включить Tor torbutton.button.tooltip.enabled = Отключить Tor torbutton.circuit_display.internet = Интернет torbutton.circuit_display.ip_unknown = IP неизвестен -torbutton.circuit_display.onion_site = Onion site +torbutton.circuit_display.onion_site = "Луковый" сайт torbutton.circuit_display.this_browser = Этот браузер -torbutton.circuit_display.relay = relay +torbutton.circuit_display.relay = узел torbutton.circuit_display.tor_bridge = Ретранслятор torbutton.circuit_display.unknown_country = Неизвестная страна torbutton.panel.tooltip.disabled = Нажмите, чтобы включить Tor @@ -55,10 +55,10 @@ torbutton.popup.confirm_plugins = Плагины вроде Flash могут н torbutton.popup.never_ask_again = Больше не спрашивать torbutton.popup.confirm_newnym = Tor Browser закроет все окна и вкладки. Все сессии веб-сайта будут потеряны.\n\nПерезапустить сейчас Tor Browser, чтобы изменить Вашу личность?\n\n -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +torbutton.slider_notification = Зеленое "луковое" меню имеет бегунок безопасности, который позволяет настраивать уровень безопасности. Оцените его! +torbutton.slider_notification_button = Открыть настройки безопасности -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = Открытие браузера Tor на максимальную величину может позволить веб-сайтам определить размер Вашего монитора, чтобы отследить Вас. Мы рекомендуем оставлять окна браузера в их первоначальном размере. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Этот веб-сайт (%S) пытается извлечь данные изображения HTML5 canvas, что может быть использовано для получения информации о вашем компьютере.\n\nДолжен ли Tor Browser разрешить этому сайту извлечь данные изображения HTML5 canvas? @@ -71,7 +71,7 @@ canvas.neverAccessKey=e # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. -profileProblemTitle=%S Profile Problem -profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. -profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. -profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. +profileProblemTitle=Проблема с профилем %S +profileReadOnly=Невозможно запустить %S из под системы с файловой системой "только для чтения". Пожалуйста, скопируйте %S в другое место перед использованием. +profileReadOnlyMac=Невозможно запустить %S из файловой системы, доступной только для чтения. Пожалуйста, скопируйте %S на рабочий стол или в папку "Приложения" перед использованием. +profileAccessDenied=У %S нет разрешения на доступ к профилю. Пожалуйста, измените права доступа и попробуйте снова. diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd index d4de340..07e8fa5 100644 --- a/src/chrome/locale/sv/torbutton.dtd +++ b/src/chrome/locale/sv/torbutton.dtd @@ -24,7 +24,7 @@ <!ENTITY torbutton.pref_connection_more_info.text "Torbutton är aktiverad. Om du vill ändra inställningar för proxy utan Tor, inaktivera Tor och kom tillbaka hit. Om du vill ändra inställningar för Tor, använd Torbutton-inställningarna."> <!ENTITY torbutton.context_menu.new_identity "Ny identitet"> <!ENTITY torbutton.context_menu.new_identity_key "N"> -<!ENTITY torbutton.context_menu.new_circuit "Ny Tor circuit för den här sajten"> +<!ENTITY torbutton.context_menu.new_circuit "Ny Tor-krets för den här webbsidan"> <!ENTITY torbutton.context_menu.new_circuit_key "S"> <!ENTITY torbutton.context_menu.toggle "Slå på/av Tor"> <!ENTITY torbutton.context_menu.toggle.key "T"> @@ -153,35 +153,35 @@ <!ENTITY torbutton.prefs.resist_fingerprinting "Ändra detailjer som utmärker dig ifrån andra Tor Browser användare"> <!ENTITY torbutton.prefs.sec_caption "Säkerhetsnivå"> <!ENTITY torbutton.prefs.sec_low "Låg (förvald)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience."> -<!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled."> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled."> +<!ENTITY torbutton.prefs.sec_low_usable_desc "Detta skapar den mest användbara upplevelsen."> +<!ENTITY torbutton.prefs.sec_low_desc "På den här säkerhetsnivån är webbläsarens alla funktioner aktiverade."> +<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Användande av SVG OpenType-typsnitt är avaktiverad."> <!ENTITY torbutton.prefs.sec_med_low "Medium-låg"> -<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):"> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled."> +<!ENTITY torbutton.prefs.sec_gen_desc "På den här säkerhetsnivån gäller följande förändringar (håll markören över för detaljer):"> +<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 ljud- och bildmedia blir click-to-play via NoScript."> +<!ENTITY torbutton.prefs.sec_html5_tooltip "På vissa webbsidor kan du vara tvungen att aktivera dessa mediatyper via NoScript-knappen."> +<!ENTITY torbutton.prefs.sec_some_jit_desc "Vissa prestandaoptimeringar av JavaScript är inaktiverade."> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> -<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled."> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "Skript på vissa webbsidor kan gå långsammare."> +<!ENTITY torbutton.prefs.sec_jar_desc "JAR-filer blockeras."> +<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR-filer är extremt ovanliga på webben men kan innehålla XSS och andra typer av attacker."> +<!ENTITY torbutton.prefs.sec_mathml_desc "Vissa funktioner för att visa matematiska formler är avaktiverade."> +<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML är inaktiverat."> <!ENTITY torbutton.prefs.sec_med_high "Medium-hög"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "All JavaScript performance optimizations are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> +<!ENTITY torbutton.prefs.sec_all_jit_desc "Alla prestandaoptimeringar av JavaScript är inaktiverade."> +<!ENTITY torbutton.prefs.sec_font_rend_desc "Vissa funktioner för gestaltning av typsnitt är avaktiverad."> +<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Användande av Graphite-typsnitt är avaktiverad."> +<!ENTITY torbutton.prefs.sec_svg_desc "Vissa typer av bilder är inaktiverade."> +<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG-bilder är inaktiverade."> +<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript är normalt avaktiverat på alla webbsidor som inte använder HTTPS."> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript kan aktiveras för enskilda webbsidor via NoScript-knappen."> <!ENTITY torbutton.prefs.sec_high "Hög"> -<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites."> -<!ENTITY torbutton.prefs.sec_audio_video_desc "Most audio and video formats are disabled."> -<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM is the only codec that remains enabled."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> +<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript är normalt avaktiverat på alla webbsidor."> +<!ENTITY torbutton.prefs.sec_audio_video_desc "De flesta ljud- och bildformat är avaktiverade."> +<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM är den enda codec som förblir aktiverad."> +<!ENTITY torbutton.prefs.sec_webfonts_desc "Vissa typsnitt ock ikoner kan visas felaktigt."> +<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Typsnitt som tillhandahålls av webbsidor är blockerade."> <!ENTITY torbutton.prefs.sec_custom "Anpassad nivå"> -<!ENTITY torbutton.circuit_display.title "Tor circuit för den här sajten"> +<!ENTITY torbutton.circuit_display.title "Tor-krets för den här webbsidan"> diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties index 80da57f..6c2d180 100644 --- a/src/chrome/locale/sv/torbutton.properties +++ b/src/chrome/locale/sv/torbutton.properties @@ -55,10 +55,10 @@ torbutton.popup.confirm_plugins = Insticksmoduler så som Flash kan äventyra di torbutton.popup.never_ask_again = Fråga aldrig igen torbutton.popup.confirm_newnym = Tor Browser kommer att stänga alla fönster och flikar. Alla webbplatssessioner kommer att gå förlorade.\n\nStarta om Tor Browser nu för att återställa din identitet?\n\n -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +torbutton.slider_notification = Den gröna onion menyn har nu en säkerhetsinställning. Kolla in den! +torbutton.slider_notification_button = Öppna säkerhetsinställningar -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = Att maximera Tor Browser kan ge webbsajter möjlighet att upptäcka din monitors storlek, vilket kan användas för att spåra dig. Vi rekommenderar att du lämnar Tor Browser fönstret i dess ursprungliga storlek. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Denna webbsida (%S) försökte komma åt HTML5-bilddata på ett kanvas, som skulle kunna användas för att identifiera just din dator.\n\nSka Tor Browser tillåta den här webbsidan att använda HTML5-bilddata på kanvas? @@ -71,7 +71,7 @@ canvas.neverAccessKey=e # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. -profileProblemTitle=%S Profile Problem -profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. -profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. -profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. +profileProblemTitle=%S Profilproblem +profileReadOnly=Du kan inte köra %S från ett read-only filsystem. Kopiera först %S till ett annat ställe innan användning. +profileReadOnlyMac=Du kan inte köra %S från ett read-only filsystem. Kopiera först %S till Skrivbordet eller Applications-katalogen innan användning. +profileAccessDenied=%S har inte rättighet att använda profilen. Vänligen ändra dina rättigheter i filsystemet och försök igen! diff --git a/src/chrome/locale/tr/torbutton.properties b/src/chrome/locale/tr/torbutton.properties index 59dafbd..b42c784 100644 --- a/src/chrome/locale/tr/torbutton.properties +++ b/src/chrome/locale/tr/torbutton.properties @@ -55,10 +55,10 @@ torbutton.popup.confirm_plugins = Flash gibi eklentiler gizliliğinizi ve anonim torbutton.popup.never_ask_again = Bir daha sorma torbutton.popup.confirm_newnym = Tor Tarayıcısı tüm sekmeleri ve pencereleri kapatacak. Tüm web sitesi oturumları kaybolacaktır.\n\nOturumunuzu sıfırlamak için Tor tarayıcı yeniden başlatılsın mı?\n -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +torbutton.slider_notification = Yeşil soğan menüsü artık güvenlik seviyesini ayarlayabileceğiniz bir güvenlik kaydırıcısını içeriyor. Deneyin! +torbutton.slider_notification_button = Güvenlik ayarlarını aç -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = Tor Tarayıcısı'nın ekranı kaplamasını etkinleştirmek web sitelerinin ekran boyutunuzu öğrenmesine; dolayısıyla sizi izlemede bu bilgiyi kullanmalarını sağlayabilir. Tor Tarayıcı pencerelerini özgün varsayılan boyutlarında bırakmanızı tavsiye ediyoruz. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Bu web sitesi (%S) bilgisayarınızı benzersiz olarak tanımlayabilmek için kullanılabilen HTML5 tuvalindeki resim verisine erişmeye çalıştı.\n\nTor Tarayıcı bu web sitesine HTML5 tuval resim verisini çıkarmasına izin vermeli mi? diff --git a/src/chrome/locale/vi/torbutton.properties b/src/chrome/locale/vi/torbutton.properties index 9ae81f9..aa129d5 100644 --- a/src/chrome/locale/vi/torbutton.properties +++ b/src/chrome/locale/vi/torbutton.properties @@ -55,7 +55,7 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an torbutton.popup.never_ask_again = Never ask me again torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! +torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! torbutton.slider_notification_button = Open security settings torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd index 5403ed9..dca1bba 100644 --- a/src/chrome/locale/zh-CN/aboutTor.dtd +++ b/src/chrome/locale/zh-CN/aboutTor.dtd @@ -33,7 +33,7 @@ <!ENTITY aboutTor.torInfo4.label "本服务器不记录有关访问者的任何信息。"> <!ENTITY aboutTor.whatnextQuestion.label "下一步？"> <!ENTITY aboutTor.whatnextAnswer.label "仅仅使用 Tor 无法实现匿名浏览。为了确保身份安全，你可能需要改变某些浏览习惯。"> -<!ENTITY aboutTor.whatnext.label "保持匿名小技巧 »"> +<!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 网络变得更快更强大："> diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index 90076de..76910e8 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -144,26 +144,26 @@ <!ENTITY torbutton.prefs.engine3 "Yahoo.com"> <!ENTITY torbutton.prefs.engine4 "startpage.com"> <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> -<!ENTITY torbutton.prefs.fix_google_srch "在 Google 搜索栏搜索时分割平台和语言信息。"> +<!ENTITY torbutton.prefs.fix_google_srch "在 Google 搜索栏搜索时去掉平台和语言信息。"> <!ENTITY torbutton.prefs.transparentTor "Tor 强化透明代理（需要自设 TransProxy 或 Tor 路由）"> <!ENTITY torbutton.prefs.priv_caption "隐私设置"> <!ENTITY torbutton.prefs.block_disk "禁止记录浏览历史或网站数据（启用隐私浏览模式）"> <!ENTITY torbutton.prefs.restrict_thirdparty "限制第三方 cookie 和其他数据跟踪程序"> <!ENTITY torbutton.prefs.block_plugins "禁用浏览器插件（比如 Flash）"> -<!ENTITY torbutton.prefs.resist_fingerprinting "请修改区别你与其他 Tor 浏览器用户的详细信息"> +<!ENTITY torbutton.prefs.resist_fingerprinting "对相关 Tor 浏览器信息进行修改，以区别你与其他 Tor 用户"> <!ENTITY torbutton.prefs.sec_caption "安全等级"> <!ENTITY torbutton.prefs.sec_low "低（默认）"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "该选项提供最具可用性的用户体验。"> +<!ENTITY torbutton.prefs.sec_low_usable_desc "该选项可提供最佳的用户体验。"> <!ENTITY torbutton.prefs.sec_low_desc "该安全级别将启用所有浏览器功能。"> <!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "禁用 SVG OpenType 字体渲染功能。"> <!ENTITY torbutton.prefs.sec_med_low "中低"> -<!ENTITY torbutton.prefs.sec_gen_desc "该安全级别具有以下更改（鼠标悬停可查看细节）："> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 视频和音频媒体通过 NoScript 实现点击播放。"> -<!ENTITY torbutton.prefs.sec_html5_tooltip "在某些网站，可使用 NoScript 工具栏按钮来启用这些媒体对象。"> +<!ENTITY torbutton.prefs.sec_gen_desc "该安全级别设置如下（光标悬停查看更多信息）："> +<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 视频和音频需通过 NoScript 点击播放。"> +<!ENTITY torbutton.prefs.sec_html5_tooltip "在某些网站，可通过 NoScript 工具栏按钮播放这些媒体。"> <!ENTITY torbutton.prefs.sec_some_jit_desc "禁用某些 JavaScript 性能优化。"> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT、类型推断、ASM.JS。"> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT。"> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "一些网站的脚本可能运行更慢。"> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "一些网站脚本执行变慢。"> <!ENTITY torbutton.prefs.sec_jar_desc "禁用远程 JAR 文件。"> <!ENTITY torbutton.prefs.sec_jar_tooltip "网站上很少出现 JAR 文件，但可能成为 XSS 及其他攻击的源头。"> <!ENTITY torbutton.prefs.sec_mathml_desc "禁用数学方程式的某些显示机制。"> @@ -174,8 +174,8 @@ <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "禁用 Graphite 字体渲染。"> <!ENTITY torbutton.prefs.sec_svg_desc "禁用某些图像类型。"> <!ENTITY torbutton.prefs.sec_svg_desc_tooltip "禁用 SVG 图像。"> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript 在所有非 HTTPS 网站上被禁用。"> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "可按站点通过 NoScript 工具栏按钮上启用 JavaScript。"> +<!ENTITY torbutton.prefs.sec_js_https_desc "对于非 HTTPS 网站，默认禁用 JavaScript。"> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "可通过工具栏上的 NoScript 按钮，启用某个网站上的 JavaScript。"> <!ENTITY torbutton.prefs.sec_high "高"> <!ENTITY torbutton.prefs.sec_all_js_desc "默认禁用所有网站 JavaScript。"> <!ENTITY torbutton.prefs.sec_audio_video_desc "禁用大多数音频和视频格式。"> diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties index 7461488..0546132 100644 --- a/src/chrome/locale/zh-CN/torbutton.properties +++ b/src/chrome/locale/zh-CN/torbutton.properties @@ -15,12 +15,12 @@ torbutton.panel.label.disabled = Tor 已禁用 torbutton.panel.label.enabled = Tor 已启用 extensions.torbutton(a)torproject.org.description = Torbutton 是一个按钮，可对“Tor 设置”进行修改，并可快速而方便地清除浏览器隐私数据。 torbutton.popup.history.warning = Torbutton 屏蔽了在其他 Tor 状态下加载的标签的活动。\n\n这是用于暂时解决 Firefox Bug 409737 和 417869。\n如果这个弹出窗口在您不知情的情况下弹出，则您的标签之一正试图在后台重新载入自己，然而这样的行为是被屏蔽的。\n\n要刷新当前 Tor 状态下的标签，将焦点置于在地址栏并按回车键。\n\n -torbutton.popup.plugin.warning = Torbutton 阻止了浏览器戴 Tor 时直接加载需要插件支持的内容。\n\n请使用“另存为”(保存后浏览)。\n\n -torbutton.popup.confirm_ca_certs = Torbutton 注意：浏览器似乎缺少自定义的CA(证书颁发机构)。检查CA列表是一项耗时的操作，障碍Tor的切换。您是否希望禁用对CA证书的隔离？)如果您不懂，可以选择“确定”) -torbutton.popup.ff3.warning = 警告！\n\nFirefox 3 会通过 Tor 泄露您的时区及 Livemark (书签栏的RSS链接)，Torbutton 对此无能为力。\n\n您是否要继续？ -torbutton.popup.toggle.warning = 您需要切换 Tor 或重新启动您的设置才会生效。 +torbutton.popup.plugin.warning = Torbutton 阻止通过 Tor 直接加载插件内容。\n\n请使用“另存为”。\n\n +torbutton.popup.confirm_ca_certs = Torbutton 注意：浏览器似乎缺少自定义的CA(证书颁发机构)。检查CA列表是一项耗时的操作，Tor 切换将变慢。是否希望禁用对CA证书的隔离？（如果不明白该问题，可以选择“确定”) +torbutton.popup.ff3.warning = 警告！\n\nFirefox 3 可能通过 Tor 泄露时区及 Livemark (书签栏的RSS链接)。\n\n是否仍要继续操作？ +torbutton.popup.toggle.warning = 为了应用设置，需切换 Tor 或重新启动。 torbutton.popup.test.success = Tor 代理测试成功！ -torbutton.popup.test.failure = Tor 代理测试失败！请检查您的代理和 Polipo 设置。 +torbutton.popup.test.failure = Tor 代理测试失败！请检查代理和 Polipo 设置。 torbutton.popup.test.confirm_toggle = 上一次 Tor 代理测试失败。\n\n您还要启用代理吗？\n\n注意：如果您已经解决了代理问题，请打开 Torbutton 代理设置窗口，消除此警告。 torbutton.popup.test.ff3_notice = 单击“确定”测试 Tor 的代理设置。测试将在后台进行，请耐心等待。 torbutton.panel.label.verified = Tor 验证通过 @@ -41,24 +41,24 @@ torbutton.popup.captcha.ask = Torbutton 检测到了一个 Google Captcha，您 torbutton.popup.captcha.always = 此后总是使用此操作 torbutton.popup.redirect = 重定向 torbutton.popup.no_redirect = 不要重定向 -torbutton.popup.prompted_language = 为了更好地保护您的隐私， Torbutton 可以请求网页的英语版本。这可能导致您希望浏览的本土语言的网页以英语显示。\n\n您要为了更好地保护隐私，以英语语言请求网页吗？ +torbutton.popup.prompted_language = 为了更好地保护隐私， Torbutton 可以请求网页的英语版本。这可能导致您希望浏览的本土语言的网页以英语显示。\n\n为了更好地保护隐私，是否请求网页以英语显示？ torbutton.popup.no_newnym = Torbutton 无法安全地为您切换一个新身份。它无法访问 Tor 的控制端口。\n\n您目前正在使用 Tor 浏览器套件吗？ torbutton.popup.use_tbb = 您似乎正在 Firefox 中使用 Torbutton，而我们不再推荐此配置。\n\n我们推荐您使用最新的 Tor 浏览器套件，您可以发电邮给 gettor(a)torproject.org 获得此套件或从如下链接下载： -torbutton.popup.pref_error = Torbutton 无法更新 Tor 浏览器配置目录中的配置。 +torbutton.popup.pref_error = Torbutton 无法更新 Tor 浏览器配置目录中的首选项。 torbutton.popup.permission_denied = 请重置 Tor 浏览器目录的文件权限或将其复制到一个新位置。 torbutton.popup.device_full = 硬盘空间已满。请释放一些空间或将 Tor 浏览器移动至其他新设备。 torbutton.title.prompt_torbrowser = Torbutton 重要信息 torbutton.popup.prompt_torbrowser = Torbutton 工作方式有所改变：它不再支持临时关闭。\n\n做出这种改变是因为在非匿名浏览的浏览器中，同时使用 Torbutton 并不安全。有太多无法克服的错误。\n\n如果您希望正常使用 Firefox ，请卸载 Torbutton 插件，下载 Tor 浏览器套件。Tor 浏览器的隐私特性优于普通的 Firefox ，即使Firefox中使用了Torbutton。\n\n移除 Torbutton，请到工具Tools->附加组件Addons->扩展Extensions 中，在 Torbutton 旁点击卸载。 -torbutton.popup.short_torbrowser = Torbutton的重要信息！\n\nTorbutton 目前已知处于启用状态。\n\n点击 Torbutton 获取更多信息。 +torbutton.popup.short_torbrowser = Torbutton 重要信息！\n\nTorbutton 目前已知处于启用状态。\n\n点击 Torbutton 获取更多信息。 torbutton.popup.confirm_plugins = Flash 之类的插件可对用户的隐私与匿名性造成危害。\n\n它们还可能绕过 Tor 而泄漏用户的当前位置和 IP 地址。\n\n是否确定启用插件？\n\n torbutton.popup.never_ask_again = 不再询问 -torbutton.popup.confirm_newnym = Tor Browser 将关闭所有窗口和标签页。所有网站登录状态都将丢失。\n\n重新启动 Tor Browser 以重置您的身份？\n\n +torbutton.popup.confirm_newnym = Tor Browser 将关闭全部窗口和标签页。所有网站会话都将丢失。\n\n是否马上重启 Tor Browser 以重置身份标识？\n\n -torbutton.slider_notification = 绿色的洋葱菜单中现在有了一个安全滑块，您可以用它来调整您的安全级别。试试吧！ +torbutton.slider_notification = 绿色的洋葱菜单内置安全滑块，可用以调整安全级别。试试吧！ torbutton.slider_notification_button = 打开安全设置 -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = 最大化 Tor Browser 窗口之后，网站可获取显示器尺寸信息，从而可跟踪用户。建议使用默认的Tor Browser 窗口大小。 # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=此网站 (%S) 试图获取 HTML5 Canva 图像数据，该数据可用作你所用计算机的唯一标识。\n\nTor Browser 是否应允许此网站获取 HTML5 Canva 图像数据？

1 0

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

22 Apr '15

commit 1be49192e9d29f2b541f723068c3c7cb986ccbd5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 21 19:56:40 2015 -0700 Update translations. --- src/chrome/locale/bg/network-settings.dtd | 6 ++-- src/chrome/locale/ca/network-settings.dtd | 2 +- src/chrome/locale/ca/progress.dtd | 2 +- src/chrome/locale/cs/network-settings.dtd | 8 ++--- src/chrome/locale/eu/network-settings.dtd | 8 ++--- src/chrome/locale/id/network-settings.dtd | 8 ++--- src/chrome/locale/lv/network-settings.dtd | 8 ++--- src/chrome/locale/sr/network-settings.dtd | 2 +- src/chrome/locale/sr(a)latin/network-settings.dtd | 34 ++++++++++----------- src/chrome/locale/sr(a)latin/torlauncher.properties | 4 +-- src/chrome/locale/zh-CN/network-settings.dtd | 4 +-- 11 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/chrome/locale/bg/network-settings.dtd b/src/chrome/locale/bg/network-settings.dtd index 3813505..6b1c255 100644 --- a/src/chrome/locale/bg/network-settings.dtd +++ b/src/chrome/locale/bg/network-settings.dtd @@ -9,7 +9,7 @@ <!ENTITY torSettings.firstQuestion "Кое от следните описва най-добре вашата ситуация?"> <!ENTITY torSettings.configurePrompt1 "Интернет връзката на този компютър е цензурирана или минава през proxy сървър."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Трябва да конфигурирам bridge или proxy настройки."> <!ENTITY torSettings.configure "Конфигурирай"> <!ENTITY torSettings.connectPrompt2 "Бих искал да се свържа директно към Tor мрежата."> <!ENTITY torSettings.connectPrompt3 "Това ще работи при повечето ситуации."> @@ -17,7 +17,7 @@ <!ENTITY torSettings.proxyQuestion "Този компютър използва ли локално прокси за достъп до Интернет?">  -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy."> +<!ENTITY torSettings.proxyHelp "Ако не сте сигурни как да отговорите на този въпрос проверете интернет настройките на друг браузър,за да видите дали е настроен да използва прокси."> <!ENTITY torSettings.enterProxy "Въведете настройките за прокси."> <!ENTITY torSettings.bridgeQuestion "Блокирани или цензурирани ли са връзките към Tor Мрежата от вашият Интернет Доставчик(ISP)?"> <!ENTITY torSettings.bridgeHelp "Ако не сте сигурни как да отговорите на този въпрос, изберете No.  Ако изберете Yes, вие ще бъдете помолен да конфигурирате Tor Bridges, непубликувани relays които правят блокирането на връзката към Tor Network по трудна."> @@ -30,7 +30,7 @@ <!ENTITY torsettings.optional "Допълнителен"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Необходимо е използването на локален прокси сървър за достъп до Интернет"> <!ENTITY torsettings.useProxy.type "Прокси Тип:"> <!ENTITY torsettings.useProxy.address "Адрес:"> <!ENTITY torsettings.useProxy.address.placeholder "IP адрес или хост"> diff --git a/src/chrome/locale/ca/network-settings.dtd b/src/chrome/locale/ca/network-settings.dtd index a8996f7..7bf1ca5 100644 --- a/src/chrome/locale/ca/network-settings.dtd +++ b/src/chrome/locale/ca/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Configuració Xarxa Tor"> +<!ENTITY torsettings.dialog.title "Configuració de la Xarxa Tor">  diff --git a/src/chrome/locale/ca/progress.dtd b/src/chrome/locale/ca/progress.dtd index 18b34e0..cb62f1b 100644 --- a/src/chrome/locale/ca/progress.dtd +++ b/src/chrome/locale/ca/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Estat del Tor"> +<!ENTITY torprogress.dialog.title "Estat de Tor"> <!ENTITY torprogress.openSettings "Obrir preferències."> <!ENTITY torprogress.heading "S'està connectant a la xarxa Tor"> <!ENTITY torprogress.pleaseWait "Si us plau, espereu mentre establim una connexió a la xarxa Tor."> diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd index ad8842d..7554d91 100644 --- a/src/chrome/locale/cs/network-settings.dtd +++ b/src/chrome/locale/cs/network-settings.dtd @@ -9,15 +9,15 @@ <!ENTITY torSettings.firstQuestion "Která možnost nejlépe popisuje Vaši situaci?"> <!ENTITY torSettings.configurePrompt1 "Připojení k internetu u tohoto pořítače je cenzorováno nebo proxováno."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Potřebuji nastavit most, nebo lokální nastavení proxy."> <!ENTITY torSettings.configure "Konfigurovat"> <!ENTITY torSettings.connectPrompt2 "Chtěl bych se přímo připojit k Tor síti."> <!ENTITY torSettings.connectPrompt3 "Toto bude fungovat ve většině případů."> <!ENTITY torSettings.connect "Připojit"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "Potřebuje tento počítač zapnutí lokální proxy, aby se připojil k internetu?">  -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy."> +<!ENTITY torSettings.proxyHelp "Pokud nevíte, jak odpovědět, podívejte se na nastavení sítě Internet v jiném prohlížeči, abyste zjistili, zda je nakonfigurován k používání proxy."> <!ENTITY torSettings.enterProxy "Zadejte nastavení serveru proxy."> <!ENTITY torSettings.bridgeQuestion "Blokuje nebo jinak cenzuruje váš poskytovatel internetového připojení (ISP) spojení se sítí TORu?"> <!ENTITY torSettings.bridgeHelp "Pokud si nejste jistí jak odpovědět na tuto otázku, zvolte No.  Pokud vyberete Ano, budete vyzváni k nastavení Mostů TORu, což jsou přenašeče neuvedené v seznamu, které dělají blokování spojení se sítí TORu složitější."> @@ -30,7 +30,7 @@ <!ENTITY torsettings.optional "Volitelný"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Tento počítač potřebuje použití proxy, aby se připojil k internetu."> <!ENTITY torsettings.useProxy.type "Typ Proxy:"> <!ENTITY torsettings.useProxy.address "Adresa:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresa nebo jméno hosta"> diff --git a/src/chrome/locale/eu/network-settings.dtd b/src/chrome/locale/eu/network-settings.dtd index c6da9ae..e96f95c 100644 --- a/src/chrome/locale/eu/network-settings.dtd +++ b/src/chrome/locale/eu/network-settings.dtd @@ -9,15 +9,15 @@ <!ENTITY torSettings.firstQuestion "Hurrengoetako zeinek deskribatzen du zure egoera hobekien?"> <!ENTITY torSettings.configurePrompt1 "Ordenagailu honen Interneteko konexioa zentsuratuta dago edo proxy batetik igarotzen da."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Zubi edo proxy lokalaren ezarpenak konfiguratu behar ditut."> <!ENTITY torSettings.configure "Konfiguratu"> <!ENTITY torSettings.connectPrompt2 "Tor sarera zuzenean konektatu nahiko nuke."> <!ENTITY torSettings.connectPrompt3 "Hau egoera gehienetan funtzionatuko du."> <!ENTITY torSettings.connect "Konektatu"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "Ordenagailu honek Internetera sartzeko proxy lokalen bat erabili behar al du?">  -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy."> +<!ENTITY torSettings.proxyHelp "Galdera hau nola erantzuteaz zalantzan bazaude, begiratu beste nabigatzaile batean Interneteko ezarpenak proxy lokal bat erabiltzeko konfiguratuta dagoen ikusteko."> <!ENTITY torSettings.enterProxy "Sartu proxy ezarpenak."> <!ENTITY torSettings.bridgeQuestion "Zure Interneteko Zerbitzu Hornitzaileak (ISP ingeleraz) Tor sarera doazen konexioak blokeatu edo zentsuratu egiten ditu?"> <!ENTITY torSettings.bridgeHelp "Galdera hau nola erantzuteaz ziur ez bazaude, aukeratu Ez.  Bai aukeratzen baduzu, Tor zubiak konfigura ditzazun eskatuko zaizu, hau da zerrendatuta ez dauden eta Tor sarera doazen konexioak blokeatzea zailago egiten duten erreleak."> @@ -30,7 +30,7 @@ <!ENTITY torsettings.optional "Hautazkoa"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Ordenagailu honek proxy lokal bat erabili behar du Internetera sartzeko"> <!ENTITY torsettings.useProxy.type "Proxy mota:"> <!ENTITY torsettings.useProxy.address "Helbidea:"> <!ENTITY torsettings.useProxy.address.placeholder "IP helbide edo ostalari izena"> diff --git a/src/chrome/locale/id/network-settings.dtd b/src/chrome/locale/id/network-settings.dtd index 428626b..2033052 100644 --- a/src/chrome/locale/id/network-settings.dtd +++ b/src/chrome/locale/id/network-settings.dtd @@ -30,7 +30,7 @@ <!ENTITY torsettings.optional "Opsional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Komputer ini perlu menggunakan proxy lokal untuk mengakses internet"> <!ENTITY torsettings.useProxy.type "Tipe Proxy:"> <!ENTITY torsettings.useProxy.address "Alamat:"> <!ENTITY torsettings.useProxy.address.placeholder "alamat IP atau nama host"> @@ -54,9 +54,9 @@ <!ENTITY torsettings.bridgeHelp1 "Jika Anda tidak dapat terhubung ke jaringan Tor, bisa jadi Provider Layanan Internet (ISP) atau lembaga lain yang menghalangi Tor.   Sering kali, Anda dapat mengatasi masalah ini dengan menggunakan Tor Bridges, yang relai terdaftar yang lebih sulit untuk memblokir."> <!ENTITY torsettings.bridgeHelp1B "Anda dapat menggunakan prekonfigurasi, disediakan alamat set bridge atau Anda mungkin mendapatkan satu set kebiasaan alamat dengan menggunakan salah satu dari tiga metode ini:"> <!ENTITY torsettings.bridgeHelp2Heading "Lewat web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> +<!ENTITY torsettings.bridgeHelp2 "Menggunakan applikasi penjelajah interet untuk mengunjungi https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Melalui Email Autoresponder"> <!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, atau https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> +<!ENTITY torsettings.bridgeHelp4Heading "Melalui Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/lv/network-settings.dtd b/src/chrome/locale/lv/network-settings.dtd index 94ab0a3..a08b592 100644 --- a/src/chrome/locale/lv/network-settings.dtd +++ b/src/chrome/locale/lv/network-settings.dtd @@ -9,15 +9,15 @@ <!ENTITY torSettings.firstQuestion "Kura situācija vislabāk atbilst jūsējai?"> <!ENTITY torSettings.configurePrompt1 "Datora savienojums ar internetu ir cenzēts vai starpniekots."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Man jānokonfigurē tiltu vai lokālo starpniekserveru iestatījumi."> <!ENTITY torSettings.configure "Konfigurēt"> <!ENTITY torSettings.connectPrompt2 "Es vēlos tieši pieslēgties tīklam Tor."> <!ENTITY torSettings.connectPrompt3 "Šis strādās vairumā gadījumu."> <!ENTITY torSettings.connect "Veidot savienojumu"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "Vai šim datoram jāizmanto lokālais starpniekserveris, lai piekļūtu internetam?">  -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy."> +<!ENTITY torSettings.proxyHelp "Ja neesat pārliecināts par atbildi uz šo jautājumu, apskatiet cita pārlūka interneta iestatījumus, lai redzētu vai pārlūks ir nokonfigurēts lokāla starpniekservera izmantošanai. "> <!ENTITY torSettings.enterProxy "Ievadiet starpnieka iestatījumus."> <!ENTITY torSettings.bridgeQuestion "Vai Jūsu interneta pakalpojumu sniedzējs (ISP) bloķē vai savādāk cenzē savienojumus ar tīklu Tor?"> <!ENTITY torSettings.bridgeHelp "Ja nezināt atbildi, izvēlieties No.  ja izvēlēsities Jā, Jums lūgs konfigurēt Tor tiltus jeb Tor Bridges, proti, neuzskaitītus retranslatorus, kuri apgrūtina savienojumu bloķēšanu ar tīklu Tor."> @@ -30,7 +30,7 @@ <!ENTITY torsettings.optional "Neobligāts"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Šajā datorā interneta piekļuvei ir jāizmanto lokālais starpniekserveris."> <!ENTITY torsettings.useProxy.type "Starpnieka tips:"> <!ENTITY torsettings.useProxy.address "Adrese:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adrese vai resursdatora nosaukums"> diff --git a/src/chrome/locale/sr/network-settings.dtd b/src/chrome/locale/sr/network-settings.dtd index 4c14d3d..c9f028b 100644 --- a/src/chrome/locale/sr/network-settings.dtd +++ b/src/chrome/locale/sr/network-settings.dtd @@ -15,7 +15,7 @@ <!ENTITY torSettings.connectPrompt3 "Ово ће радити у већини ситуација."> <!ENTITY torSettings.connect "Повежи се"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "Da li ovaj kompjuter koristi lokalni proksi kao pristup internetu?">  <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy."> <!ENTITY torSettings.enterProxy "Унесите proxy подешавања."> diff --git a/src/chrome/locale/sr(a)latin/network-settings.dtd b/src/chrome/locale/sr(a)latin/network-settings.dtd index ec16b2b..5f9422f 100644 --- a/src/chrome/locale/sr(a)latin/network-settings.dtd +++ b/src/chrome/locale/sr(a)latin/network-settings.dtd @@ -1,24 +1,24 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "Podešavanja Tor mreže">  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Pre nego što se konektujete na Tor mrežu, potrebno je da pružite informacije o internet konekciji ovog kompjutera."> <!ENTITY torSettings.yes "Da"> <!ENTITY torSettings.no "Ne"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> +<!ENTITY torSettings.firstQuestion "Koji od ponuđenih najbolje opisuje vašu situaciju?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> <!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.configure "Konfiguriši"> +<!ENTITY torSettings.connectPrompt2 "Želim da se direktno povežem na Tor mrežu."> +<!ENTITY torSettings.connectPrompt3 "Ovo će raditi u većini situacija."> +<!ENTITY torSettings.connect "Povezivanje"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "Da li ovaj kompjuter koristi lokalni proksi za pristup internetu?">  <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> +<!ENTITY torSettings.enterProxy "Unesite vaša proksi podešavanja."> <!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.  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."> @@ -26,22 +26,22 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Restartovanje Tor-a"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "Opciono"> <!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Adresa:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> +<!ENTITY torsettings.useProxy.username "Korisničko ime:"> <!ENTITY torsettings.useProxy.password "Lozinka:"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> +<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4 "> +<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5 "> +<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS "> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> +<!ENTITY torsettings.firewall.allowedPorts "Dozvoljeni portovi: "> <!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> <!ENTITY torsettings.useBridges.default "Connect with provided bridges"> <!ENTITY torsettings.useBridges.type "Transport type:"> diff --git a/src/chrome/locale/sr(a)latin/torlauncher.properties b/src/chrome/locale/sr(a)latin/torlauncher.properties index 02be756..a5e87ea 100644 --- a/src/chrome/locale/sr(a)latin/torlauncher.properties +++ b/src/chrome/locale/sr(a)latin/torlauncher.properties @@ -29,8 +29,8 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) -torlauncher.connect=Connect -torlauncher.restart_tor=Restart Tor +torlauncher.connect=Povezivanje +torlauncher.restart_tor=Restartovanje Tor-a torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd index 4e6d5e1..37e815e 100644 --- a/src/chrome/locale/zh-CN/network-settings.dtd +++ b/src/chrome/locale/zh-CN/network-settings.dtd @@ -47,9 +47,9 @@ <!ENTITY torsettings.useBridges.type "传输类型："> <!ENTITY torsettings.useBridges.custom "输入自定义网桥"> <!ENTITY torsettings.useBridges.label "输入一个或多个网桥中继(一行一个)。"> -<!ENTITY torsettings.useBridges.placeholder "输入地址:端口"> +<!ENTITY torsettings.useBridges.placeholder "类型地址:端口"> -<!ENTITY torsettings.copyLog "请将 Tor 日志复制到剪贴板"> +<!ENTITY torsettings.copyLog "点击复制 Tor 日志"> <!ENTITY torsettings.bridgeHelpTitle "网桥中继帮助"> <!ENTITY torsettings.bridgeHelp1 "如果 Tor 网络无法连接，可能是因为互联网服务提供商 (ISP) 或其他机构对 Tor 进行了封锁。通常，使用 Tor 网桥可以解决这种问题。网桥指未公开的网络中继，更难于封锁。"> <!ENTITY torsettings.bridgeHelp1B "你可以使用本软件集成的一组网桥，也可以通过以下三种方法获取网桥。">

1 0

[tor-launcher/master] Bump version to 0.2.7.4.
by mikeperry＠torproject.org 22 Apr '15

22 Apr '15

commit 360f70048a5e2338c52112a6507ee220ea330866 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 21 19:58:25 2015 -0700 Bump version to 0.2.7.4. --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index c27be00..b2ca19c 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.7.3</em:version> + <em:version>0.2.7.4</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] Update changelog for bug 15502.
by mikeperry＠torproject.org 22 Apr '15

22 Apr '15

commit 44c07072325b31478b06a874d700d518389932f4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 21 19:46:08 2015 -0700 Update changelog for bug 15502. --- 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 bbd4bd8..7e4b01c 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -22,6 +22,7 @@ Tor Browser 4.5 -- Apr 28 2015 * Bug 13875: Spoof window.devicePixelRatio to avoid DPI fingerprinting * Bug 15411: Remove old (and unused) cacheDomain cache isolation mechanism * Bug 14716: Fix issues with HTTP Auth usage and TLS connection info display + * Bug 15502: Isolate blob URI scope to URL domain; block WebWorker access * Bug 15562: Disable Javascript SharedWorkers due to third party tracking * Bug 15757: Disable Mozilla video statistics API extensions * Bug 15758: Disable Device Sensor APIs

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] Bug #15502. Isolate blob URLs to first party; no blobURLs in Web Workers
by mikeperry＠torproject.org 22 Apr '15

22 Apr '15

commit 0d67ab406bdd3cf095802cb25c081641aa1f0bcc Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sun Apr 12 13:47:55 2015 -0700 Bug #15502. Isolate blob URLs to first party; no blobURLs in Web Workers --- content/base/src/ThirdPartyUtil.cpp | 9 +++++++++ content/base/src/nsHostObjectProtocolHandler.cpp | 23 ++++++++++++++++++++-- dom/workers/URL.cpp | 7 +++++++ netwerk/base/public/mozIThirdPartyUtil.idl | 15 ++++++++++++++ 4 files changed, 52 insertions(+), 2 deletions(-) diff --git a/content/base/src/ThirdPartyUtil.cpp b/content/base/src/ThirdPartyUtil.cpp index 695392f..0e037d1 100644 --- a/content/base/src/ThirdPartyUtil.cpp +++ b/content/base/src/ThirdPartyUtil.cpp @@ -635,3 +635,12 @@ ThirdPartyUtil::GetFirstPartyHostForIsolation(nsIURI *aFirstPartyURI, aHost.Append("--"); return NS_OK; } + +NS_IMETHODIMP +ThirdPartyUtil::GetFirstPartyHostFromCaller(nsACString& aHost) { + nsCOMPtr<nsIURI> uri; + nsresult rv = GetFirstPartyIsolationURI(nullptr, + nsContentUtils::GetDocumentFromCaller(), getter_AddRefs(uri)); + NS_ENSURE_SUCCESS(rv, rv); + return GetFirstPartyHostForIsolation(uri, aHost); +} diff --git a/content/base/src/nsHostObjectProtocolHandler.cpp b/content/base/src/nsHostObjectProtocolHandler.cpp index 10ec44c..e578804 100644 --- a/content/base/src/nsHostObjectProtocolHandler.cpp +++ b/content/base/src/nsHostObjectProtocolHandler.cpp @@ -15,6 +15,7 @@ #include "mozilla/dom/MediaSource.h" #include "nsIMemoryReporter.h" #include "mozilla/Preferences.h" +#include "mozIThirdPartyUtil.h" // ----------------------------------------------------------------------- // Hash table @@ -24,9 +25,20 @@ struct DataInfo nsCOMPtr<nsISupports> mObject; nsCOMPtr<nsIPrincipal> mPrincipal; nsCString mStack; + nsCString mFirstPartyHost; }; static nsClassHashtable<nsCStringHashKey, DataInfo>* gDataTable; +static nsCOMPtr<mozIThirdPartyUtil> gThirdPartyUtilService; + +static nsCString GetFirstPartyHostFromCaller() { + if (!gThirdPartyUtilService) { + gThirdPartyUtilService = do_GetService(THIRDPARTYUTIL_CONTRACTID); + } + nsCString host; + gThirdPartyUtilService->GetFirstPartyHostFromCaller(host); + return host; +} // Memory reporting for the hash table. namespace mozilla { @@ -290,6 +302,8 @@ nsHostObjectProtocolHandler::AddDataEntry(const nsACString& aScheme, info->mObject = aObject; info->mPrincipal = aPrincipal; + // Record the first party host that originated this object. + info->mFirstPartyHost = GetFirstPartyHostFromCaller(); mozilla::BlobURLsReporter::GetJSStackForBlob(info); gDataTable->Put(aUri, info); @@ -401,7 +415,10 @@ GetDataObject(nsIURI* aURI) aURI->GetSpec(spec); DataInfo* info = GetDataInfo(spec); - return info ? info->mObject : nullptr; + // Deny access to this object if the current first-party host + // doesn't match the originating first-party host. + return (info && info->mFirstPartyHost == GetFirstPartyHostFromCaller()) + ? info->mObject : nullptr; } // ----------------------------------------------------------------------- @@ -457,7 +474,9 @@ nsHostObjectProtocolHandler::NewChannel(nsIURI* uri, nsIChannel* *result) DataInfo* info = GetDataInfo(spec); - if (!info) { + // Deny access to this URI if the current first party host + // doesn't match the first party host when it was created. + if (!info || (info->mFirstPartyHost != GetFirstPartyHostFromCaller())) { return NS_ERROR_DOM_BAD_URI; } nsCOMPtr<nsIDOMBlob> blob = do_QueryInterface(info->mObject); diff --git a/dom/workers/URL.cpp b/dom/workers/URL.cpp index f80594e..d52e4c6 100644 --- a/dom/workers/URL.cpp +++ b/dom/workers/URL.cpp @@ -894,6 +894,13 @@ URL::CreateObjectURL(const GlobalObject& aGlobal, JSObject* aBlob, JSContext* cx = aGlobal.GetContext(); WorkerPrivate* workerPrivate = GetWorkerPrivateFromContext(cx); + if (!workerPrivate->IsChromeWorker()) { + workerPrivate->ReportError(cx, "Worker attempted to use createObjectURL; denied.", nullptr); + NS_NAMED_LITERAL_STRING(argStr, "URL.createObjectURL"); + aRv.ThrowTypeError(MSG_METHOD_THIS_UNWRAPPING_DENIED, &argStr); + return; + } + nsCOMPtr<nsIDOMBlob> blob = file::GetDOMBlobFromJSObject(aBlob); if (!blob) { SetDOMStringToNull(aResult); diff --git a/netwerk/base/public/mozIThirdPartyUtil.idl b/netwerk/base/public/mozIThirdPartyUtil.idl index 0bb632b..0b0f410 100644 --- a/netwerk/base/public/mozIThirdPartyUtil.idl +++ b/netwerk/base/public/mozIThirdPartyUtil.idl @@ -246,6 +246,21 @@ interface mozIThirdPartyUtil : nsISupports * for which we generate a pseudo host. */ AUTF8String getFirstPartyHostForIsolation(in nsIURI aFirstPartyURI); + + /** + * getFirstPartyHostFromCaller + * + * Obtain the host or pseudo-host for the first party URI belonging + * to the calling document. See getFirstPartyHostForIsolation(...) for + * examples. + * + * @return host or pseudo host. + * + * @throws if the calling document's first party URI lacks a host + * and the scheme is not a whitelisted one for which we + * generate a pseudo host. + */ + AUTF8String getFirstPartyHostFromCaller(); }; %{ C++

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] Bug #15502, Part 2: Regression tests for blob URL isolation
by mikeperry＠torproject.org 22 Apr '15

22 Apr '15

commit f4f2caa26dd2d15e8f99d0a1357361da43e4fd2f Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sat Apr 18 17:37:21 2015 -0700 Bug #15502, Part 2: Regression tests for blob URL isolation --- content/base/test/bug15502_page_blobify.html | 26 ++++++ content/base/test/bug15502_page_deblobify.html | 31 +++++++ content/base/test/bug15502_tab.html | 39 ++++++++ content/base/test/bug15502_utils.js | 104 ++++++++++++++++++++++ content/base/test/bug15502_worker_blobify.html | 28 ++++++ content/base/test/bug15502_worker_blobify.js | 12 +++ content/base/test/bug15502_worker_deblobify.html | 30 +++++++ content/base/test/bug15502_worker_deblobify.js | 24 +++++ content/base/test/mochitest.ini | 9 ++ content/base/test/test_tor_bug15502.html | 92 +++++++++++++++++++ 10 files changed, 395 insertions(+) diff --git a/content/base/test/bug15502_page_blobify.html b/content/base/test/bug15502_page_blobify.html new file mode 100644 index 0000000..d883929 --- /dev/null +++ b/content/base/test/bug15502_page_blobify.html @@ -0,0 +1,26 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Page blobifier for Tor Browser Bug 15502</title> + <script type="text/javascript;version=1.7" src="bug15502_utils.js"></script> +</head> +<body> +<div id="display" style="white-space:pre; font-family:monospace; display:inline;"></div> + +<script type="text/javascript;version=1.7"> + +Task.spawn(function* () { + sendMessage(window.parent, "ready"); + let message = yield receiveMessage(window.parent), + blobURL = stringToBlobURL(message); + sendMessage(window.parent, blobURL); + appendLine("display", message + " -> " + blobURL); +}); + +</script> +</body> +</html> diff --git a/content/base/test/bug15502_page_deblobify.html b/content/base/test/bug15502_page_deblobify.html new file mode 100644 index 0000000..e8cbd51 --- /dev/null +++ b/content/base/test/bug15502_page_deblobify.html @@ -0,0 +1,31 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Page deblobifier for Tor Browser Bug 15502</title> + <script type="text/javascript;version=1.7" src="bug15502_utils.js"></script> +</head> +<body> +<div id="display" style="white-space:pre; font-family:monospace; display:inline;"></div> + +<script type="text/javascript;version=1.7"> + +Task.spawn(function* () { + sendMessage(window.parent, "ready"); + let blobURL = yield receiveMessage(window.parent), + string; + try { + string = yield blobURLtoString(blobURL); + } catch (e) { + string = e.message; + } + sendMessage(window.parent, string); + appendLine("display", blobURL + " -> " + string); +}); + +</script> +</body> +</html> diff --git a/content/base/test/bug15502_tab.html b/content/base/test/bug15502_tab.html new file mode 100644 index 0000000..7bd4744 --- /dev/null +++ b/content/base/test/bug15502_tab.html @@ -0,0 +1,39 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Tab for Tor Browser Bug 15502</title> + <script type="text/javascript;version=1.7" src="bug15502_utils.js"></script> +</head> +<body> + +<div id="display"></div> +<iframe id="child" width="100%"></iframe> + +<script type="text/javascript;version=1.7"> + +let iframe = document.getElementById("child"); + +let connect = function (sourceObject, destinationObject) { + Task.spawn(function* () { + for (;;) { + let message = yield receiveMessage(sourceObject); + sendMessage(destinationObject, message); + } + }); +}; + +Task.spawn(function* () { + sendMessage(window.opener, "ready"); + let firstParentMessage = yield receiveMessage(window.opener); + iframe.src = firstParentMessage; + connect(window.opener, iframe.contentWindow); + connect(iframe.contentWindow, window.opener); +}); +</script> + +</body> +</html> diff --git a/content/base/test/bug15502_utils.js b/content/base/test/bug15502_utils.js new file mode 100644 index 0000000..9d69c12 --- /dev/null +++ b/content/base/test/bug15502_utils.js @@ -0,0 +1,104 @@ +// Import Task.jsm +let { Task } = SpecialPowers.Cu.import("resource://gre/modules/Task.jsm"); + +// __listen(target, eventType, timeoutMs, useCapture)__. +// Calls addEventListener on target, with the given eventType. +// Returns a Promise that resolves to an Event object, if the event fires. +// If a timeout occurs, then Promise is rejected with a "Timed out" error. +// For use with Task.jsm. +let listen = function (target, eventType, timeoutMs, useCapture) { + return new Promise(function (resolve, reject) { + let listenFunction = function (event) { + target.removeEventListener(eventType, listenFunction, useCapture); + resolve(event); + }; + target.addEventListener(eventType, listenFunction, useCapture); + setTimeout(() => reject(new Error("Timed out")), timeoutMs); + }); +}; + +// __receiveMessage(source)__. +// Returns an event object for the next message received from source. +// A Task.jsm coroutine. +let receiveMessage = function* (source) { + let event; + do { + event = yield listen(self, "message", 5000, false); + } while (event.source !== source); + return event.data; +}; + +// __sendMessage(destination, message)__. +// Sends a message to destination. +let sendMessage = function (destination, message) { + destination.postMessage(message, "*"); +}; + +// __appendLine(id, lineString)__. +// Add a line of text to the innerHTML of element with id. +let appendLine = function (id, lineString) { + document.getElementById(id).innerHTML += lineString + "\n"; +}; + +// __xhr(method, url, responseType__. +// A simple async XMLHttpRequest call. +// Returns a promise with the response. +let xhr = function (method, url, responseType) { + return new Promise(function (resolve, reject) { + let xhr = new XMLHttpRequest(); + xhr.open(method, url, true); + xhr.onload = function () { + resolve(xhr.response); + }; + xhr.responseType = responseType; + xhr.send(); + }); +}; + +// __blobURLtoBlob(blobURL)__. +// Asynchronously retrieves a blob object +// from a blob URL. Returns a promise. +let blobURLtoBlob = function (blobURL) { + return xhr("GET", blobURL, "blob"); +}; + +// __blobToString(blob)__. +// Asynchronously reads the contents +// of a blob object into a string. Returns a promise. +let blobToString = function (blob) { + return new Promise(function (resolve, reject) { + let fileReader = new FileReader(); + fileReader.onload = function () { + resolve(fileReader.result); + }; + fileReader.readAsText(blob); + }); +}; + +// __blobURLtoString(blobURL)__. +// Asynchronous coroutine that takes a blobURL +// and returns the contents in a string. +let blobURLtoString = function* (blobURL) { + let blob = yield blobURLtoBlob(blobURL); + return yield blobToString(blob); +}; + +// __stringToBlobURL(s)__. +// Converts string s into a blob, and returns +// a blob URL. +let stringToBlobURL = function (s) { + let blob = new Blob([s]); + return URL.createObjectURL(blob); +}; + +// __workerIO(scriptFile, inputString)__. +// Sends inputString for the worker, and waits +// for the worker to return an outputString. +// Task.jsm coroutine. +let workerIO = function* (scriptFile, inputString) { + let worker = new Worker(scriptFile); + worker.postMessage(inputString); + let result = yield listen(worker, "message", 5000, false); + worker.terminate(); + return result.data; +}; diff --git a/content/base/test/bug15502_worker_blobify.html b/content/base/test/bug15502_worker_blobify.html new file mode 100644 index 0000000..3dd7926 --- /dev/null +++ b/content/base/test/bug15502_worker_blobify.html @@ -0,0 +1,28 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Worker blobifier for Tor Browser Bug 15502</title> + <script type="text/javascript;version=1.7" src="bug15502_utils.js"></script> +</head> +<body> +<div id="display" style="white-space:pre; font-family:monospace; display:inline;"></div> + +<pre id="test"> +<script type="text/javascript;version=1.7"> + +Task.spawn(function* () { + sendMessage(window.parent, "ready"); + let message = yield receiveMessage(window.parent), + blobURL = yield workerIO("bug15502_worker_blobify.js", message); + sendMessage(window.parent, blobURL); + appendLine("display", message + " -> " + blobURL); +}); + +</script> +</pre> +</body> +</html> diff --git a/content/base/test/bug15502_worker_blobify.js b/content/base/test/bug15502_worker_blobify.js new file mode 100644 index 0000000..4aef347 --- /dev/null +++ b/content/base/test/bug15502_worker_blobify.js @@ -0,0 +1,12 @@ +// Wait for a string to be posted to this worker. +// Create a blob containing this string, and then +// post back a blob URL pointing to the blob. +self.addEventListener("message", function (e) { + try { + var blob = new Blob([e.data]), + blobURL = URL.createObjectURL(blob); + postMessage(blobURL); + } catch (e) { + postMessage(e.message); + } +}, false); diff --git a/content/base/test/bug15502_worker_deblobify.html b/content/base/test/bug15502_worker_deblobify.html new file mode 100644 index 0000000..30ec6b4 --- /dev/null +++ b/content/base/test/bug15502_worker_deblobify.html @@ -0,0 +1,30 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Worker deblobifier for Tor Browser Bug 15502</title> + <script type="text/javascript;version=1.7" src="bug15502_utils.js"></script> +</head> +<body> +<div id="display" style="white-space:pre; font-family:monospace; display:inline;"></div> + +<pre id="test"> +<script type="text/javascript;version=1.7"> + +Task.spawn(function* () { + sendMessage(window.parent, "ready"); + let blobURL = yield receiveMessage(window.parent), + result = yield workerIO("bug15502_worker_deblobify.js", blobURL); + sendMessage(window.parent, result); + appendLine("display", blobURL + " -> " + result); +}); + + + +</script> +</pre> +</body> +</html> diff --git a/content/base/test/bug15502_worker_deblobify.js b/content/base/test/bug15502_worker_deblobify.js new file mode 100644 index 0000000..8556311 --- /dev/null +++ b/content/base/test/bug15502_worker_deblobify.js @@ -0,0 +1,24 @@ +// Wait for a blob URL to be posted to this worker. +// Obtain the blob, and read the string contained in it. +// Post back the string. + +var postStringInBlob = function (blobObject) { + var fileReader = new FileReaderSync(), + result = fileReader.readAsText(blobObject); + postMessage(result); +}; + +self.addEventListener("message", function (e) { + var blobURL = e.data, + xhr = new XMLHttpRequest(); + try { + xhr.open("GET", blobURL, true); + xhr.onload = function () { + postStringInBlob(xhr.response); + }; + xhr.responseType = "blob"; + xhr.send(); + } catch (e) { + postMessage(e.message); + } +}, false); diff --git a/content/base/test/mochitest.ini b/content/base/test/mochitest.ini index c3cffb3..e59a70a 100644 --- a/content/base/test/mochitest.ini +++ b/content/base/test/mochitest.ini @@ -12,6 +12,14 @@ support-files = badMessageEvent.eventsource^headers^ badMessageEvent2.eventsource badMessageEvent2.eventsource^headers^ + bug15502_page_blobify.html + bug15502_page_deblobify.html + bug15502_tab.html + bug15502_utils.js + bug15502_worker_blobify.js + bug15502_worker_blobify.html + bug15502_worker_deblobify.js + bug15502_worker_deblobify.html bug282547.sjs bug298064-subframe.html bug313646.txt @@ -604,6 +612,7 @@ skip-if = toolkit == 'android' || e10s #RANDOM [test_textnode_normalize_in_selection.html] [test_textnode_split_in_selection.html] [test_title.html] +[test_tor_bug15502.html] [test_treewalker_nextsibling.xml] [test_viewport_scroll.html] [test_viewsource_forbidden_in_object.html] diff --git a/content/base/test/test_tor_bug15502.html b/content/base/test/test_tor_bug15502.html new file mode 100644 index 0000000..9ed3d70 --- /dev/null +++ b/content/base/test/test_tor_bug15502.html @@ -0,0 +1,92 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Test for Tor Browser Bug 15502</title> + <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> + <script type="text/javascript;version=1.7" src="bug15502_utils.js"></script> + <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> +</head> +<body> +<p id="display"></p> +<div id="content"></div> + +<script class="testbody" type="application/javascript;version=1.7"> +SimpleTest.waitForExplicitFinish(); + +// __prefs__. Import the `Serivces.prefs` object. +let prefs = SpecialPowers.Cu.import("resource://gre/modules/Services.jsm").Services.prefs; + +// ## Testing constants +let domain1 = "http://example.com", + domain2 = "http://example.net", + path = "/tests/content/base/test/", + page_blob = "bug15502_page_blobify.html", + page_deblob = "bug15502_page_deblobify.html" + worker_blob = "bug15502_worker_blobify.html", + worker_deblob = "bug15502_worker_deblobify.html"; + +// __tabIO(domain, child, input)__. +// Open a tab at the given `domain` and `child` page. Post an +// `input` message to the tab. +let tabIO = function* (domain, child, input) { + tab = window.open(domain + path + "bug15502_tab.html", "_blank"); + yield receiveMessage(tab); // ready message + sendMessage(tab, "http://example.org" + path + child); + yield receiveMessage(tab); // ready message + sendMessage(tab, input); + return yield receiveMessage(tab); +}; + +// __blobTest(isolationOn, domainA, domainB, blobPage, deblobPage)__. +// Run a test where we set the pref "privacy.thirdparty.isolate` to on or off, +// and then create a blob URL in `domainA`, using the page `blobPage`, +// and then attempt to retrieve the object from the blobURL in `domainB`, using +// the page `deblobPage`. +let blobTest = function* (isolationOn, domainA, domainB, blobPage, deblobPage) { + prefs.setIntPref("privacy.thirdparty.isolate", isolationOn ? 2 : 0); + let input = "" + Math.random(), + blobURL = yield tabIO(domainA, blobPage, input), + result = yield tabIO(domainB, deblobPage, blobURL), + description = domainA + ":" + blobPage + "->" + domainB + ":" + deblobPage + ", isolation " + (isolationOn ? "on." : "off."); + if (blobPage === worker_blob) { + // Remove this case when we write a patch that properly isolates web worker blob URLs + // by first party domain. + ok(blobURL.contains("Permission to call 'URL.createObjectURL' denied."), description + " Deny blob URL creation in web worker"); + } else if (deblobPage === worker_deblob && isolationOn) { + // Remove this case when we write a patch that properly isolates web worker blob URLs + // by first party domain. + ok(result.contains("Access to restricted URI denied"), description + " Isolated blobs not available to web workers"); + } else { + if (isolationOn && domainA !== domainB) { + ok(input !== result, description + " Deny retrieval"); + } else { + ok(input === result, description + " Allow retrieval"); + } + } +}; + + +// ## The main test +// Run a Task.jsm coroutine that tests various combinations of domains +// methods, and isolation states for reading and writing blob URLs. +Task.spawn(function* () { + for (let isolate of [false, true]) { + for (let domainB of [domain1, domain2]) { + for (let blob of [page_blob, worker_blob]) { + for (let deblob of [page_deblob, worker_deblob]) { + yield blobTest(isolate, domain1, domainB, blob, deblob); + } + } + } + } + SimpleTest.finish(); +}); + +</script> + +</body> +</html>

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2015