- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 26475: Disable building Rust with Thin LTO
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit e2da10a29f46762a8561e30c36915f8568d18c71 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 15 09:48:59 2018 +0000 Bug 26475: Disable building Rust with Thin LTO Building Rust with Thin LTO enabled leads to Tor Browser builds on macOS and probably Linux not being reproducible. The exact reason for that is unknown at the moment, although it seems fixed testing nightly Rust source tarballs as of mid-September 2018. We therefore disable Thin LTO for now by setting `codegen-units` to `1`. --- projects/firefox/mozconfig-osx-x86_64 | 3 --- projects/rust/build | 10 ++++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 5d56ad3..a87bf35 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -49,9 +49,6 @@ ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests -# We need to disable for Stylo right now, as we have reproducibility issues on -# macOS with it enabled, see: #26475. -ac_add_options --disable-stylo # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme # ac_add_options --disable-ctypes diff --git a/projects/rust/build b/projects/rust/build index 936f49f..61a5d50 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -65,6 +65,16 @@ cd /var/tmp/build/rustc-[% c('version') %]-src mkdir build cd build ../configure --prefix=$distdir [% c("var/configure_opt") %] + +# We need to disable Thin LTO due to reproducibility issues on macOS and +# probably Linux. Alas, there is no direct option available in the config.toml +# in 1.26.1 yet, so we need to toggle this indirectly via `codegen-units`. +[% IF c("var/osx") || c("var/linux") %] + # It seems hard to pass the proper value via ./configure so we resort to our + # old friend `sed`. + sed -i 's/#codegen-units = 1/codegen-units = 1/' config.toml +[% END %] + make -j[% c("buildconf/num_procs") %] make install cd /var/tmp/dist

1 0

[tor-browser-build/master] Merge branch 'bug_26475_v2'
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 0166d3d70e81c6c1072e03f6b950c8b2eb181343 Merge: 8d7c170 e2da10a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 18 09:11:14 2018 +0000 Merge branch 'bug_26475_v2' projects/firefox/mozconfig-osx-x86_64 | 3 --- projects/rust/build | 10 ++++++++++ 2 files changed, 10 insertions(+), 3 deletions(-)

1 0

[tor-browser-build/maint-8.0] Release preparations for 8.0.3
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 7e115d85dbf25e55efd95c271d29e407e42b4246 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 18 07:51:43 2018 +0000 Release preparations for 8.0.3 Version bumps and Changelog update --- projects/firefox/config | 2 +- projects/https-everywhere/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 14 ++++++++++++++ projects/tor-browser/config | 4 ++-- projects/torbutton/config | 2 +- rbm.conf | 4 ++-- 6 files changed, 21 insertions(+), 7 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index debff32..bad1ac5 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -7,7 +7,7 @@ git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 60.2.1 + firefox_platform_version: 60.3.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.0 torbrowser_update_channel: alpha diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 03edcee..e189eb9 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2018.8.22 +version: 2018.9.19 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index ec0bf46..b98edcb 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,17 @@ +Tor Browser 8.0.3 -- October 23 2018 + * All platforms + * Update Firefox to 60.3.0esr + * Update Torbutton to 2.0.8 + * Bug 23925+27959: Donation banner for year end 2018 campaign + * Bug 24172: Donation banner clobbers Tor Browser version string + * Bug 27760: Use new NoScript API for IPC and fix about:blank issue + * Translations update + * Update HTTPS Everywhere to 2018.9.19 + * Update NoScript to 10.1.9.9 + * Linux + * Bug 27546: Fix vertical scrollbar behavior in Tor Browser 8 with Gtk3 + * Bug 27552: Use bundled dir on CentOS/RHEL 6 + Tor Browser 8.0.2 -- October 2 2018 * All platforms * Update Firefox to 60.2.1esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 1647b77..50d67e0 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -67,9 +67,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 336ae26d0a70688e6c2b3c14267c9e80f52f6f36c31f23b8242e0edae3666d42 + sha256sum: e7ec0345c2174e64c7552ab708a59c8efd7c1078fedda64d9c9ad06a899194b9 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/torbutton/config b/projects/torbutton/config index 2b2df85..df0d674 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.0.7 +version: 2.0.8 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index fbc9776..b4f58ed 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.0.2' + torbrowser_version: '8.0.3' torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.0.1 + - 8.0.2 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[torbutton/maint-2.0] Release preparations for 2.0.8
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit f0a1bc906ad1808600a55af7f146c061a66779e0 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 18 07:22:00 2018 +0000 Release preparations for 2.0.8 Changelog update and version bump --- src/CHANGELOG | 6 ++++++ src/install.rdf | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 562842e9..91f32c9b 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,9 @@ +2.0.8 + * Bug 23925+27959: Donation banner for year end 2018 campaign + * Bug 24172: Donation banner clobbers Tor Browser version string + * Bug 27760: Use new NoScript API for IPC and fix about:blank issue + * Translations update + 2.0.7 * Bug 27097: Tor News signup banner * Bug 27663: Add New Identity menuitem again diff --git a/src/install.rdf b/src/install.rdf index cd14a7dd..544f9468 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>2.0.7</em:version> + <em:version>2.0.8</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/maint-2.0] Bug 23925: Donation banner for YE 2018 Campaign
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 5d427ef536bd152ba7ba1471604a36aca8699407 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Oct 15 21:15:09 2018 -0700 Bug 23925: Donation banner for YE 2018 Campaign Design by Antonela Debiasi --- src/chrome/content/aboutTor/aboutTor-content.js | 30 +++++-- src/chrome/content/aboutTor/aboutTor.xhtml | 49 +++++++--- src/chrome/content/torbutton.js | 18 ++-- src/chrome/skin/aboutTor.css | 114 +++++++++++++++++------- src/chrome/skin/donation_banner_image_3x.png | Bin 0 -> 71927 bytes src/chrome/skin/newsletter_3x.png | Bin 6735 -> 0 bytes src/defaults/preferences/preferences.js | 2 +- 7 files changed, 152 insertions(+), 61 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index ff5a970b..e8f5ffa2 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -24,7 +24,7 @@ let { bindPrefAndInit, show_torbrowser_manual } = Cu.import("resource://torbutto var AboutTorListener = { kAboutTorLoadedMessage: "AboutTor:Loaded", kAboutTorChromeDataMessage: "AboutTor:ChromeData", - kAboutTorHideTorNewsBanner: "AboutTor:HideTorNewsBanner", + kAboutTorHideDonationBanner: "AboutTor:HideDonationBanner", get isAboutTor() { return content.document.documentURI.toLowerCase() == "about:tor"; @@ -61,20 +61,24 @@ var AboutTorListener = { setupBannerClosing: function () { let that = this; - let closer = content.document.getElementById("tornews-banner-closer"); + let closer = content.document.getElementById("donation-banner-closer"); closer.addEventListener("click", function () { - sendAsyncMessage(that.kAboutTorHideTorNewsBanner); + sendAsyncMessage(that.kAboutTorHideDonationBanner); }); - let link = content.document.querySelector("#tornews-banner-message a"); - link.addEventListener("click", function () { + let button = content.document.getElementById("donation-banner-button"); + button.addEventListener("click", function () { // Wait until page unloads so we don't hide banner before that. content.addEventListener("unload", function () { - sendAsyncMessage(that.kAboutTorHideTorNewsBanner); + sendAsyncMessage(that.kAboutTorHideDonationBanner); }); }); - bindPrefAndInit("extensions.torbutton.tornews_banner_countdown", - countdown => content.document.body.setAttribute( - "show-tornews-banner", countdown > 0)); + bindPrefAndInit("extensions.torbutton.donation_banner_countdown", + countdown => { + if (content.document && content.document.body) { + content.document.body.setAttribute( + "show-donation-banner", countdown > 0); + } + }); }, onPageLoad: function() { @@ -124,6 +128,14 @@ var AboutTorListener = { content.document.getElementById("manualLink").href = "https://tb-manual.torproject.org/" + aLocale; + // Don't use "Count Me In" phrase in non-en-US locales + if (!aLocale.startsWith("en")) { + let button = content.document.getElementById("donation-banner-button"); + button.innerHTML = button.getAttribute("data-0"); + let theURL = button.getAttribute("href"); + button.setAttribute("href", theURL.slice(0,-2)); + } + // Display the Tor Browser product name and version. try { const kBrandBundle = "chrome://branding/locale/brand.properties"; diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 87fe8307..9256748e 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -31,21 +31,48 @@ window.addEventListener("pageshow", function() { </script> </head> <body dir="&locale.dir;"> - <div id="tornews-banner"> - <div></div> - <div id="tornews-banner-message"> - <div id="tornews-banner-icon"></div> - <div>&aboutTor.newsletter.tagline; - <a href="https://newsletter.torproject.org"> - &aboutTor.newsletter.link_text; - </a> + <div id="donation-banner"> + <div id="donation-banner-image"></div> + <div id="donation-banner-lines"> + <div id="donation-banner-line1">&aboutTor.donationBanner.line1;</div> + <div id="donation-banner-line2" + data-0="&aboutTor.donationBanner.line2a;" + data-1="&aboutTor.donationBanner.line2b;" + data-2="&aboutTor.donationBanner.line2c;" + data-3="&aboutTor.donationBanner.line2d;" + data-4="&aboutTor.donationBanner.line2e;" + data-5="&aboutTor.donationBanner.line2f;"> + &aboutTor.donationBanner.line2a; </div> + <div id="donation-banner-line3">&aboutTor.donationBanner.line3;</div> + <a id="donation-banner-button" + href="https://www.torproject.org/donate/donate-sin-tbd0-0" + type="button" + data-0="&aboutTor.donationBanner.buttonA;" + data-1="&aboutTor.donationBanner.buttonB;"> + &aboutTor.donationBanner.buttonA; + </a> </div> - <div id="tornews-banner-closer">×</div> + <div id="donation-banner-closer">×</div> </div> - +<script type="text/javascript"> + <![CDATA[ + let lineChoice = Math.floor(Math.random() * 6); + let line2 = document.getElementById("donation-banner-line2"); + let line2text = line2.getAttribute(`data-${lineChoice}`); + let line2pieces = line2text.split(" "); + let line2end = '<span>' + line2pieces.pop() + '</span>'; + line2pieces.push(line2end); + line2.innerHTML = line2pieces.join(" "); + let buttonChoice = Math.floor(Math.random() * 2); + let button = document.getElementById("donation-banner-button"); + button.innerHTML = button.getAttribute(`data-${buttonChoice}`); + button.setAttribute("href", + `https://www.torproject.org/donate/donate-sin-tbd${lineChoice}-${buttonChoice}`); +]]> +</script> + <div id="torstatus-version"/> <div class="torcontent-container"> - <div id="torstatus-version"/> <div id="torstatus" class="top"> <div id="torstatus-on-container" class="hideIfTorOff torstatus-container"> <div class="heading1">&aboutTor.ready.label;</div> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 03dc3563..fc1a38d8 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -19,7 +19,7 @@ const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion" const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed"; -const k_tb_tornews_banner_countdown = "extensions.torbutton.tornews_banner_countdown"; +const k_tb_donation_banner_countdown = "extensions.torbutton.donation_banner_countdown"; var m_tb_prefs = Services.prefs; @@ -233,10 +233,10 @@ function torbutton_init_toolbutton() } // Show the Sign Up for Tor News banner a finite number of times. -function torbutton_tornews_banner_countdown() { - let count = m_tb_prefs.getIntPref(k_tb_tornews_banner_countdown, 0); +function torbutton_donation_banner_countdown() { + let count = m_tb_prefs.getIntPref(k_tb_donation_banner_countdown, 0); if (count > 0) { - m_tb_prefs.setIntPref(k_tb_tornews_banner_countdown, count - 1); + m_tb_prefs.setIntPref(k_tb_donation_banner_countdown, count - 1); } } @@ -348,10 +348,10 @@ function torbutton_init() { // Add about:tor IPC message listener. window.messageManager.addMessageListener("AboutTor:Loaded", torbutton_abouttor_message_handler); - window.messageManager.addMessageListener("AboutTor:HideTorNewsBanner", + window.messageManager.addMessageListener("AboutTor:HideDonationBanner", torbutton_abouttor_message_handler); - torbutton_tornews_banner_countdown(); + torbutton_donation_banner_countdown(); setupPreferencesForMobile(); @@ -431,9 +431,9 @@ var torbutton_abouttor_message_handler = { aMessage.target.messageManager.sendAsyncMessage("AboutTor:ChromeData", this.chromeData); break; - case "AboutTor:HideTorNewsBanner": - torbutton_log(5, "message AboutTor:HideTorNewsBanner received"); - m_tb_prefs.setIntPref(k_tb_tornews_banner_countdown, 0); + case "AboutTor:HideDonationBanner": + torbutton_log(5, "message AboutTor:HideDonationBanner received"); + m_tb_prefs.setIntPref(k_tb_donation_banner_countdown, 0); break; } }, diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index ce0a2f29..9f195cfd 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -272,74 +272,126 @@ body:not([showmanual]) .showForManual { border-radius: 50px 50px 0 0; } -/* Tor News Signup Banner +/* Donation Banner * While this banner is present, we need to * offset the elements normally at the top of * the window. */ -#tornews-banner { +#donation-banner { display: flex; - align-items: center; + align-items: stretch; background-color: white; color: var(--abouttor-bg-toron-color); font-size: 16px; - height: 60px; - justify-content: space-between; + height: 200px; + justify-content: center; left: 0px; right: 0px; top: 0px; - transform: translateY(-60px); + position: absolute; + transform: translateY(-200px); transition: transform 200ms; + z-index: 1; } -body[show-tornews-banner="true"] #tornews-banner { +body[show-donation-banner="true"] #donation-banner { transform: translateY(0px); transition: transform 0ms; } -#tornews-banner-message { - align-items: center; - display: flex; - justify-content: center; -} - -#tornews-banner-message a { - color: var(--abouttor-bg-toron-color); -} - -#tornews-banner-icon { - background: url('chrome://torbutton/skin/newsletter_3x.png') no-repeat center center; - background-size: cover; - height: 32px; - margin: 0px 16px; - width: 32px; +#donation-banner-image { + background: url('chrome://torbutton/skin/donation_banner_image_3x.png') no-repeat center center; + background-size: contain; + height: 190px; + margin: 10px 10px 0px 0px; + width: 400px; } -#tornews-banner-closer { +#donation-banner-closer { display: flex; align-items: center; font-size: 20px; height: 22px; justify-content: center; - margin: 4px 20px; + margin: 4px; padding: 4px; + position: absolute; + offset-inline-end: 0px; + top: 0px; width: 22px; -moz-user-select: none; } -#tornews-banner-closer:hover { +#donation-banner-closer:hover { background-color: gray; cursor: pointer; } -body[show-tornews-banner="false"] #torstatus-version, -body[show-tornews-banner="false"] #onboarding-overlay-button { +#donation-banner-lines { + align-items: start; + display: flex; + flex-direction: column; + justify-content: space-around; + padding: 20px 0px; +} + +#donation-banner-line1 { + font-size: 11px; + font-weight: bold; + text-transform: uppercase; +} + +#donation-banner-line2 { + font-size: 20px; + font-weight: bold; +} + +#donation-banner-line2 span { + background-color: #a9fef8; +} + +#donation-banner-line3 { + font-size: 14px; +} + +#donation-banner-button { + background-color: var(--abouttor-bg-toron-color); + border-radius: 3px; + border: 0px; + color: white; + font-size: 14px; + font-weight: bold; + margin: 10px 0px; + padding: 10px 24px; + text-decoration: none; +} + +#donation-banner-button:hover { + background-color: #683d7d; + cursor: pointer; +} + +body[show-donation-banner="false"] .torcontent-container, +body[show-donation-banner="false"] .onion-pattern-container, +body[show-donation-banner="false"] #torstatus-version, +body[show-donation-banner="false"] #onboarding-overlay-button { transition: transform 200ms; } -body[show-tornews-banner="true"] #torstatus-version, -body[show-tornews-banner="true"] #onboarding-overlay-button { - transform: translateY(60px); +body[show-donation-banner="true"] .torcontent-container, +body[show-donation-banner="true"] .onion-pattern-container { + transform: translateY(80px); transition: transform 0ms; } + +body[show-donation-banner="true"] .onion-pattern-container { + position: fixed; +} + +body[show-donation-banner="true"] #torstatus-version, +body[show-donation-banner="true"] #onboarding-overlay-button { + transform: translateY(200px); + transition: transform 0ms; + position: absolute; +} diff --git a/src/chrome/skin/donation_banner_image_3x.png b/src/chrome/skin/donation_banner_image_3x.png new file mode 100644 index 00000000..6eb7fbbb Binary files /dev/null and b/src/chrome/skin/donation_banner_image_3x.png differ diff --git a/src/chrome/skin/newsletter_3x.png b/src/chrome/skin/newsletter_3x.png deleted file mode 100644 index 821572fa..00000000 Binary files a/src/chrome/skin/newsletter_3x.png and /dev/null differ diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index fecf0e69..e9496c08 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -6,7 +6,7 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglo pref("extensions.torbutton.display_circuit", true); pref("extensions.torbutton(a)torproject.org.description", "chrome://torbutton/locale/torbutton.properties"); pref("extensions.torbutton.updateNeeded", false); -pref("extensions.torbutton.tornews_banner_countdown", 4); +pref("extensions.torbutton.donation_banner_countdown", 12); // Tor check and proxy prefs pref("extensions.torbutton.test_enabled",true);

1 0

[torbutton/maint-2.0] Bug 27959: 2018 Donation banner text ready for translation
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit a2ef9fd16c64b3f7c9b7e5fbd429225f8faaf359 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Oct 5 10:21:45 2018 -0700 Bug 27959: 2018 Donation banner text ready for translation --- src/chrome/locale/en/aboutTor.dtd | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd index 1400d7b5..6efb202e 100644 --- a/src/chrome/locale/en/aboutTor.dtd +++ b/src/chrome/locale/en/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> +<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> +<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> + +<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In">

1 0

[torbutton/maint-2.0] Update translations
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 7fcfd07a4a031e86cb2c9000993319c62ae9c0e2 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 18 07:13:01 2018 +0000 Update translations --- src/chrome/locale/ar/aboutTBUpdate.dtd | 2 +- src/chrome/locale/ar/aboutTor.dtd | 26 ++++++-- src/chrome/locale/bn-BD/aboutTor.dtd | 14 ++++ src/chrome/locale/ca/aboutTor.dtd | 14 ++++ src/chrome/locale/da/aboutTor.dtd | 14 ++++ src/chrome/locale/da/browserOnboarding.properties | 16 ++--- src/chrome/locale/da/torbutton.dtd | 2 +- src/chrome/locale/de/aboutDialog.dtd | 8 +-- src/chrome/locale/de/aboutTBUpdate.dtd | 2 +- src/chrome/locale/de/aboutTor.dtd | 28 ++++++-- src/chrome/locale/de/brand.dtd | 4 +- src/chrome/locale/de/brand.properties | 4 +- src/chrome/locale/de/browserOnboarding.properties | 12 ++-- src/chrome/locale/de/torbutton.dtd | 12 ++-- src/chrome/locale/de/torbutton.properties | 32 ++++----- src/chrome/locale/es/aboutTBUpdate.dtd | 4 +- src/chrome/locale/es/aboutTor.dtd | 14 ++++ src/chrome/locale/es/browserOnboarding.properties | 34 +++++----- src/chrome/locale/es/torbutton.properties | 4 +- src/chrome/locale/eu/aboutTor.dtd | 14 ++++ src/chrome/locale/fa/aboutTBUpdate.dtd | 2 +- src/chrome/locale/fa/aboutTor.dtd | 32 ++++++--- src/chrome/locale/fa/torbutton.dtd | 4 +- src/chrome/locale/fr/aboutTBUpdate.dtd | 2 +- src/chrome/locale/fr/aboutTor.dtd | 14 ++++ src/chrome/locale/fr/browserOnboarding.properties | 70 ++++++++++---------- src/chrome/locale/fr/torbutton.properties | 6 +- src/chrome/locale/ga/aboutTor.dtd | 14 ++++ src/chrome/locale/he/aboutDialog.dtd | 4 +- src/chrome/locale/he/aboutTor.dtd | 18 ++++- src/chrome/locale/he/browserOnboarding.properties | 14 ++-- src/chrome/locale/he/torbutton.dtd | 2 +- src/chrome/locale/he/torbutton.properties | 2 +- src/chrome/locale/id/aboutTor.dtd | 14 ++++ src/chrome/locale/is/aboutTBUpdate.dtd | 4 +- src/chrome/locale/is/aboutTor.dtd | 14 ++++ src/chrome/locale/is/browserOnboarding.properties | 80 +++++++++++------------ src/chrome/locale/is/torbutton.dtd | 8 +-- src/chrome/locale/is/torbutton.properties | 26 ++++---- src/chrome/locale/it/aboutTor.dtd | 14 ++++ src/chrome/locale/ja/aboutTor.dtd | 14 ++++ src/chrome/locale/ko/aboutTor.dtd | 16 ++++- src/chrome/locale/ko/browserOnboarding.properties | 6 +- src/chrome/locale/nb/aboutTor.dtd | 14 ++++ src/chrome/locale/nl/aboutTBUpdate.dtd | 4 +- src/chrome/locale/nl/aboutTor.dtd | 24 +++++-- src/chrome/locale/nl/browserOnboarding.properties | 46 ++++++------- src/chrome/locale/nl/torbutton.properties | 2 +- src/chrome/locale/pl/aboutTor.dtd | 14 ++++ src/chrome/locale/pt-BR/aboutTor.dtd | 24 +++++-- src/chrome/locale/ru/aboutDialog.dtd | 2 +- src/chrome/locale/ru/aboutTBUpdate.dtd | 10 +-- src/chrome/locale/ru/aboutTor.dtd | 22 +++++-- src/chrome/locale/ru/brand.dtd | 2 +- src/chrome/locale/ru/browserOnboarding.properties | 44 ++++++------- src/chrome/locale/ru/torbutton.dtd | 2 +- src/chrome/locale/sv/aboutTor.dtd | 14 ++++ src/chrome/locale/tr/aboutTor.dtd | 14 ++++ src/chrome/locale/vi/aboutTor.dtd | 34 +++++++--- src/chrome/locale/zh-CN/aboutTor.dtd | 14 ++++ src/chrome/locale/zh-CN/torbutton.dtd | 2 +- src/chrome/locale/zh-TW/aboutTor.dtd | 14 ++++ src/chrome/locale/zh-TW/torbutton.dtd | 6 +- 63 files changed, 656 insertions(+), 292 deletions(-) diff --git a/src/chrome/locale/ar/aboutTBUpdate.dtd b/src/chrome/locale/ar/aboutTBUpdate.dtd index c4e08b80..eee3db56 100644 --- a/src/chrome/locale/ar/aboutTBUpdate.dtd +++ b/src/chrome/locale/ar/aboutTBUpdate.dtd @@ -5,6 +5,6 @@ <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "سجل التغييرات:"> -<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> +<!ENTITY aboutTBUpdate.circuitDisplayHeading "تصميم جديد لطريقة عرض الدوائر"> <!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> <!ENTITY aboutTBUpdate.learnMore "إعرف/ي أكثر "> diff --git a/src/chrome/locale/ar/aboutTor.dtd b/src/chrome/locale/ar/aboutTor.dtd index 2c80fc4d..183d47f8 100644 --- a/src/chrome/locale/ar/aboutTor.dtd +++ b/src/chrome/locale/ar/aboutTor.dtd @@ -7,22 +7,36 @@ <!ENTITY aboutTor.title "عن تور"> <!ENTITY aboutTor.ready.label "تصفح بهوية خفية"> -<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> +<!ENTITY aboutTor.ready2.label "أنت جاهز الآن لتجربة التصفح الأكثر خصوصية في العالم."> <!ENTITY aboutTor.failure.label "حدث خطأ ما!"> <!ENTITY aboutTor.failure2.label "تور لا يعمل في هذا المتصفح."> -<!ENTITY aboutTor.search.label "البحث بواسطة داك داك غو"> +<!ENTITY aboutTor.search.label "ابحث بواسطة داك داك غو"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "أية أسئلة؟"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "إطّلع على دليلنا باستخدام متصفح تور "> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "اطّلع على دليل استخدام متصفح تور ">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "س"> <!ENTITY aboutTor.torbrowser_user_manual.label "دليل استخدام متصفّح تور"> -<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding."> +<!ENTITY aboutTor.tor_mission.label "مشرع تور منظمة غير ربحية أميريكية خاضعة لقانون 501(c)(3)، تعمل على تقدم حقوق الإنسان وحرياته، عبر إنشاء واستخدام تقنيات حرة ومفتوحة المصدر للمجهولية والخصوصية، وتدعم توفرها واستخدامها دون قيود، وتدعم تقدم الفهم العلمي والشعبي لهذه التقنيات."> <!ENTITY aboutTor.getInvolved.label "شارك"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> -<!ENTITY aboutTor.newsletter.link_text "اشترك للحصول على مستجدات تور."> +<!ENTITY aboutTor.newsletter.tagline "احصل على آخر أخبار تور مباشرة على بريدك"> +<!ENTITY aboutTor.newsletter.link_text "اشترك للحصول على أخبار تور."> + +<!ENTITY aboutTor.donationBanner.line1 "تور: نقاط القوة"> + +<!ENTITY aboutTor.donationBanner.line2a "المجهولية تحتاج لصحبة."> +<!ENTITY aboutTor.donationBanner.line2b "ساعد في تقدم حقوق الإنسان."> +<!ENTITY aboutTor.donationBanner.line2c "انتصر للحرية."> +<!ENTITY aboutTor.donationBanner.line2d "احم خصوصية الملايين."> +<!ENTITY aboutTor.donationBanner.line2e "حافظ على قوة تور."> +<!ENTITY aboutTor.donationBanner.line2f "نحتاج دعمك."> + +<!ENTITY aboutTor.donationBanner.line3 "تبرع اليوم، وستجاريك موزيلا وتبرع بنفس المبلغ."> + +<!ENTITY aboutTor.donationBanner.buttonA "تبرع الآن"> +<!ENTITY aboutTor.donationBanner.buttonB "سأشارك"> diff --git a/src/chrome/locale/bn-BD/aboutTor.dtd b/src/chrome/locale/bn-BD/aboutTor.dtd index 0896f075..a7458617 100644 --- a/src/chrome/locale/bn-BD/aboutTor.dtd +++ b/src/chrome/locale/bn-BD/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "টর থেকে সর্বশেষ খবর নিন সোজা আপনার ইনবক্সে ।"> <!ENTITY aboutTor.newsletter.link_text "টর নিউজ-এর জন্য সাইন আপ করুন ।"> + +<!ENTITY aboutTor.donationBanner.line1 "টর: সংখ্যাই শক্তি"> + +<!ENTITY aboutTor.donationBanner.line2a "ছদ্মনাম বেশী ব্যবহারকারীর মধ্যে কার্যকরী।"> +<!ENTITY aboutTor.donationBanner.line2b "সার্বজনীন মানবাধিকারকে এগিয়ে নিন। "> +<!ENTITY aboutTor.donationBanner.line2c "স্বাধীনতার জন্য এগিয়ে আসুন "> +<!ENTITY aboutTor.donationBanner.line2d "লাখো লোকের ব্যক্তিগত গোপনীয়তা রক্ষা করুন। "> +<!ENTITY aboutTor.donationBanner.line2e "টরকে শক্তিশালী রাখুন। "> +<!ENTITY aboutTor.donationBanner.line2f "আপনাদের সাহায্য দরকার! "> + +<!ENTITY aboutTor.donationBanner.line3 "অর্থ সাহায্য করুন, এবং মজিলা সমপরিমাণ সাহায্য করবে। "> + +<!ENTITY aboutTor.donationBanner.buttonA "এখুনি দান করুন! "> +<!ENTITY aboutTor.donationBanner.buttonB "আমাকেও সাথে নিন"> diff --git a/src/chrome/locale/ca/aboutTor.dtd b/src/chrome/locale/ca/aboutTor.dtd index ca8aee1c..91132da8 100644 --- a/src/chrome/locale/ca/aboutTor.dtd +++ b/src/chrome/locale/ca/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Obteniu les darreres novetats de Tor directament a la safata d'entrada."> <!ENTITY aboutTor.newsletter.link_text "Inscriviu-vos a les noticies de Tor."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> +<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> +<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> + +<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/da/aboutTor.dtd b/src/chrome/locale/da/aboutTor.dtd index 902a84fa..7a2df3b0 100644 --- a/src/chrome/locale/da/aboutTor.dtd +++ b/src/chrome/locale/da/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Få de seneste nyheder fra Tor direkte i din indbakke."> <!ENTITY aboutTor.newsletter.link_text "Tilmeld Tor-nyheder."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Styrke i antal"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymitet elsker selskab."> +<!ENTITY aboutTor.donationBanner.line2b "Avancerede universelle menneskerettigheder."> +<!ENTITY aboutTor.donationBanner.line2c "Slå et slag for frihed."> +<!ENTITY aboutTor.donationBanner.line2d "Beskyt privatlivet af millioner."> +<!ENTITY aboutTor.donationBanner.line2e "Hold Tor stærk."> +<!ENTITY aboutTor.donationBanner.line2f "Vi har brug for din støtte!"> + +<!ENTITY aboutTor.donationBanner.line3 "Giv i dag, og Mozilla vil matche din donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donér nu"> +<!ENTITY aboutTor.donationBanner.buttonB "Jeg er med"> diff --git a/src/chrome/locale/da/browserOnboarding.properties b/src/chrome/locale/da/browserOnboarding.properties index 7ebc3b54..dd257df4 100644 --- a/src/chrome/locale/da/browserOnboarding.properties +++ b/src/chrome/locale/da/browserOnboarding.properties @@ -9,32 +9,32 @@ onboarding.tour-tor-welcome.button=Start nu onboarding.tour-tor-privacy=Privatliv onboarding.tour-tor-privacy.title=Sæt en stopper for trackere og snoopers. -onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. +onboarding.tour-tor-privacy.description=Tor Browser isolerer cookies og sletter din browserhistorik efter din session. Ændringerne sikre dit privatliv, og sikkerheden beskyttes i browseren. Klik på ‘Tor-netværk’ for at lære hvordan vi beskytter dig på netværksniveauet. onboarding.tour-tor-privacy.button=Gå til Tor-netværk onboarding.tour-tor-network=Tor-netværk onboarding.tour-tor-network.title=Rejs på et decentraliseret netværk. -onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. +onboarding.tour-tor-network.description=Tor Browser opretter forbindelse for dig til Tor-netværket, som køres af tusindvis af frivillige verden over. I modsætning til en VPN, er der ikke ét punkt som kan få det til at fejle, eller centraliseret indgang som du skal have tillid til for at bruge internettet privat. onboarding.tour-tor-network.button=Gå til kredsløb-visning onboarding.tour-tor-circuit-display=Kredsløb-visning onboarding.tour-tor-circuit-display.title=Se din sti. -onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. +onboarding.tour-tor-circuit-display.description=Hver gang du besøger et domæne, videresendes og krypteres din trafik i et kredsløb hen over tre Tor-relæ verden over. Webstederne kan ikke se hvor du opretter forbindelse fra. Du kan anmode om et nyt kredsløb ved at klikke på ‘Nyt kredsløb til dette sted’ på vores kredsløb-display. onboarding.tour-tor-circuit-display.button=Se min sti onboarding.tour-tor-security=Sikkerhed onboarding.tour-tor-security.title=Vælg din oplevelse. -onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. +onboarding.tour-tor-security.description=Vi giver dig også yderligere sikkerhedsindstillinger for at øge din browsersikkerhed. Vores sikkerhedsindstillinger giver dig mulighed for at blokere elementer der kan bruges til at angribe din computer. Klik nedenfor for at se hvad de forskellige valgmuligheder gør. onboarding.tour-tor-security.button=Gennemgå indstillinger onboarding.tour-tor-expect-differences=Oplevelesestips onboarding.tour-tor-expect-differences.title=Forvent nogen forskelle. -onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. +onboarding.tour-tor-expect-differences.description=Med alle de sikkerheds- og privatlivsfunktionaliteter som gives af Tor, kan din oplevelse på internettet være lidt anderledes. Ting man være lidt langsommere, og afhængig af dit sikkerhedsniveau, kan det være at nogle elementer ikke virker eller ikke indlæses. Du bliver måske også spurgt om du er et menneske eller en robot. onboarding.tour-tor-expect-differences.button=Se FAQ'er onboarding.tour-tor-onion-services=Onion-tjenester onboarding.tour-tor-onion-services.title=Vær ekstra beskyttet. -onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. +onboarding.tour-tor-onion-services.description=Onion-tjenester er steder som slutter med .onion som giver yderligere beskyttelse til udgivere og besøgende, inklusiv tilføjelse af sikkhedsforanstaltninger mod censur. Onion-tjenester giver alle mulighed for at levere indhold og tjenester anonymt. Klik nedenfor for at besøge DuckDuckGo's onion-sted. onboarding.tour-tor-onion-services.button=Besøg et onion # Circuit Display onboarding. @@ -45,10 +45,10 @@ onboarding.tor-circuit-display.two-of-three=2 af 3 onboarding.tor-circuit-display.three-of-three=3 af 3 onboarding.tor-circuit-display.intro.title=Hvordan virker kredsløb? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.msg=Kredsløb består af relæ, som er tildelt tilfældigt, hvilket er computere verden over som er konfigureret til at videresende Tor-trafik. Kredskøb giver dig mulighed for at bruge internettet privat og at oprette forbindelse til onion-tjenester. onboarding.tor-circuit-display.diagram.title=Kredsløb-visning -onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. +onboarding.tor-circuit-display.diagram.msg=Diagrammet viser relæene som opgør kredsløbet til webstedet. For at forhindre sammenkædning af aktivitet på tværs af forskellige steder, så får hvert websted et andet kredsløb. onboarding.tor-circuit-display.new-circuit.title=Har du brug for et nyt kredsløb? onboarding.tor-circuit-display.new-circuit.msg=Hvis du ikke kan oprette forbindelse til det websted du prøver at besøge, eller det ikke indlæser ordentligt, så kan du bruge denne knap til at genindlæse stedet med et nyt kredsløb. diff --git a/src/chrome/locale/da/torbutton.dtd b/src/chrome/locale/da/torbutton.dtd index 694792e8..f0be1e85 100644 --- a/src/chrome/locale/da/torbutton.dtd +++ b/src/chrome/locale/da/torbutton.dtd @@ -31,7 +31,7 @@ <!ENTITY torbutton.prefs.resist_fingerprinting "Tilpas detaljer som adskiller dig fra andre Tor Browser-brugere"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Lad denne boks være valgt til for at skjule ting fra websteder som er unikke for dig, inklusiv din computerydelse, tastaturlayout, sprog, placeringen af installerede plugins, listen af installerede plugins, din netværksstatus, skærmorientering, skærmstørrelse, stedspecifikke zoomniveauer, understøttede filtyper, systemfarver og WebGL-formåenheder."> -<!ENTITY torbutton.prefs.sec_caption "Sikkerheds Niveau"> +<!ENTITY torbutton.prefs.sec_caption "Sikkerhedsniveau"> <!ENTITY torbutton.prefs.sec_caption_tooltip "Sikkerhedsskyderen giver dig mulighed for at deaktivere bestemte browserfunktionaliteter som kan gøre din browser sårbar overfor forsøg på hacking."> <!ENTITY torbutton.prefs.sec_standard_label "Standard"> <!ENTITY torbutton.prefs.sec_standard_description "Alle Tor Browser- og webstedsfunktionaliteter er aktiveret."> diff --git a/src/chrome/locale/de/aboutDialog.dtd b/src/chrome/locale/de/aboutDialog.dtd index cf8b77d5..d2853db2 100644 --- a/src/chrome/locale/de/aboutDialog.dtd +++ b/src/chrome/locale/de/aboutDialog.dtd @@ -1,19 +1,19 @@ <!ENTITY project.start "&brandShortName; wird entwickelt von ">  <!ENTITY project.tpoLink "das &vendorShortName;"> -<!ENTITY project.end ", eine gemeinnützige Organisation, um Ihre Privatsphäre und Freiheit im Internet zu verteidigen."> +<!ENTITY project.end ", eine gemeinnützige Organisation, um deine Privatsphäre und Freiheit im Internet zu verteidigen."> -<!ENTITY help.start "Sie wollen helfen? "> +<!ENTITY help.start "Du willst helfen? ">  <!ENTITY help.donateLink "Spenden"> <!ENTITY help.or "oder">  -<!ENTITY help.getInvolvedLink "machen Sie mit"> +<!ENTITY help.getInvolvedLink "mach mit"> <!ENTITY help.end "!">  <!ENTITY bottomLinks.questions "Fragen?">  -<!ENTITY bottomLinks.grow "Helfen Sie beim Ausweiten des Tor-Netzwerks!"> +<!ENTITY bottomLinks.grow "Hilf beim Vergrössern des Tor-Netzwerks!">  <!ENTITY bottomLinks.license "Lizenzinformationen"> <!ENTITY tor.TrademarkStatement "»Tor« und das »Zwiebel-Logo« sind eingetragene Warenzeichen von Tor Project, Inc."> diff --git a/src/chrome/locale/de/aboutTBUpdate.dtd b/src/chrome/locale/de/aboutTBUpdate.dtd index 047db091..9b0d0bfa 100644 --- a/src/chrome/locale/de/aboutTBUpdate.dtd +++ b/src/chrome/locale/de/aboutTBUpdate.dtd @@ -1,7 +1,7 @@ <!ENTITY aboutTBUpdate.title "Tor Browser Update"> <!ENTITY aboutTBUpdate.updated "Tor Browser wurde aktualisiert."> <!ENTITY aboutTBUpdate.linkPrefix "Für die aktuellsten Informationen zu diesem Release, "> -<!ENTITY aboutTBUpdate.linkLabel "besuchen Sie unsere Website"> +<!ENTITY aboutTBUpdate.linkLabel "besuche unsere Website"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> diff --git a/src/chrome/locale/de/aboutTor.dtd b/src/chrome/locale/de/aboutTor.dtd index 4b29fbb0..6c43e2c6 100644 --- a/src/chrome/locale/de/aboutTor.dtd +++ b/src/chrome/locale/de/aboutTor.dtd @@ -7,7 +7,7 @@ <!ENTITY aboutTor.title "Über Tor"> <!ENTITY aboutTor.ready.label "Entdecken. Privat."> -<!ENTITY aboutTor.ready2.label "Sie sind bereit für das privateste Browsing-Erlebnis der Welt."> +<!ENTITY aboutTor.ready2.label "Du bist bereit für das privateste Browsing-Erlebnis der Welt."> <!ENTITY aboutTor.failure.label "Irgend etwas lief schief!"> <!ENTITY aboutTor.failure2.label "Tor funktioniert mit diesem Browser nicht."> @@ -15,14 +15,28 @@ <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Fragen?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Schauen Sie unser Tor-Browser-Handbuch an »"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Schaue unser Tor Browser Handbuch an »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor-Browser-Handbuch"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser-Handbuch"> -<!ENTITY aboutTor.tor_mission.label "Projekt Tor ist eine in den USA als "The Tor Project" (US 501(c)(3)) registrierte nicht-kommerzielle Organisation für Menschenrechte und Freiheit, die freie und quelloffene Technologien für Anonymität und Privatsphäre entwickelt und bereitstellt und die Forschung und das öffentliche Verständnis auf diesen Gebieten voranbringt."> -<!ENTITY aboutTor.getInvolved.label "Machen Sie mit »"> +<!ENTITY aboutTor.tor_mission.label "Projekt Tor ist eine in den USA als "The Tor Project" US 501(c)(3) registrierte nicht-kommerzielle Organisation für Menschenrechte und Freiheit, die freie und quelloffene Technologien für Anonymität und Privatsphäre entwickelt und bereitstellt und die Forschung und das öffentliche Verständnis auf diesen Gebieten voranbringt."> +<!ENTITY aboutTor.getInvolved.label "Mach mit »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Erhalte die neuesten Nachrichten von Tor direkt in den Posteingang"> -<!ENTITY aboutTor.newsletter.link_text "Tor-Nachrichten abonnieren"> +<!ENTITY aboutTor.newsletter.tagline "Erhalte die neuesten Nachrichten von Tor direkt in den Posteingang."> +<!ENTITY aboutTor.newsletter.link_text "Tor-Nachrichten abonnieren."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Stärke in Zahlen"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymität liebt Gemeinschaft"> +<!ENTITY aboutTor.donationBanner.line2b "Verbessere die Menschenrechte"> +<!ENTITY aboutTor.donationBanner.line2c "Setz dich ein für Freiheit."> +<!ENTITY aboutTor.donationBanner.line2d "Schütze die Privatsphäre von Millionen Menschen."> +<!ENTITY aboutTor.donationBanner.line2e "Mache Tor stark."> +<!ENTITY aboutTor.donationBanner.line2f "Wir brauchen deine Unterstützung."> + +<!ENTITY aboutTor.donationBanner.line3 "Gib noch heute, und Mozilla wird deiner Spende entsprechen."> + +<!ENTITY aboutTor.donationBanner.buttonA "Spende jetzt"> +<!ENTITY aboutTor.donationBanner.buttonB "Zähl mich mit"> diff --git a/src/chrome/locale/de/brand.dtd b/src/chrome/locale/de/brand.dtd index 55f35060..c7c9feaf 100644 --- a/src/chrome/locale/de/brand.dtd +++ b/src/chrome/locale/de/brand.dtd @@ -9,7 +9,7 @@ <!ENTITY trademarkInfo.part1 "Firefox und die Firefox-Logos sind Warenzeichen der Mozilla Foundation.">  -<!ENTITY plugins.installed.find "Klicken Sie, um System-Erweiterungen zu laden"> +<!ENTITY plugins.installed.find "Klicke, um System-Erweiterungen zu laden"> <!ENTITY plugins.installed.enable "Erweiterungen aktivieren"> <!ENTITY plugins.installed.disable "Erweiterungen deaktivieren"> -<!ENTITY plugins.installed.disable.tip "Klicken Sie, um das Laden von System-Erweiterungen zu verhindern"> +<!ENTITY plugins.installed.disable.tip "Klicke, um das Laden von System-Erweiterungen zu verhindern"> diff --git a/src/chrome/locale/de/brand.properties b/src/chrome/locale/de/brand.properties index 9bdc2621..40e650bf 100644 --- a/src/chrome/locale/de/brand.properties +++ b/src/chrome/locale/de/brand.properties @@ -8,9 +8,9 @@ brandFullName=Tor-Browser vendorShortName=Tor-Projekt homePageSingleStartMain=Firefox-Start, eine schnelle Startseite mit eingebauter Suche -homePageImport=Ihre Startseite von %S importieren +homePageImport=Deine Startseite von %S importieren homePageMigrationPageTitle=Startseitenauswahl -homePageMigrationDescription=Bitte wählen Sie die Startseite aus, die Sie benutzen wollen: +homePageMigrationDescription=Bitte wähle die Startseite aus, die du benutzen willst: syncBrandShortName=Sync diff --git a/src/chrome/locale/de/browserOnboarding.properties b/src/chrome/locale/de/browserOnboarding.properties index b9d841ea..1243128c 100644 --- a/src/chrome/locale/de/browserOnboarding.properties +++ b/src/chrome/locale/de/browserOnboarding.properties @@ -4,17 +4,17 @@ onboarding.tour-tor-welcome=Willkommen onboarding.tour-tor-welcome.title=Fertig. -onboarding.tour-tor-welcome.description=Tor Browser bietet höchste Privatsphäre und Sicherheit beim Surfen im Internet. Es schützt jetzt auch gegen Tracker, Überwachung und Zensur. Diese Einführung zeigt, wie. +onboarding.tour-tor-welcome.description=Tor Browser bietet höchste Privatsphäre und Sicherheit beim Surfen im Internet. Sie sind jetzt auch gegen Tracker, Überwachung und Zensur geschützt. Diese Einführung zeigt, wie. onboarding.tour-tor-welcome.button=Jetzt starten onboarding.tour-tor-privacy=Privatsphäre onboarding.tour-tor-privacy.title=Tracker und Schnüffler abweisen. -onboarding.tour-tor-privacy.description=Tor Browser isoliert Cookies und löscht den Verlauf nach jeder Benutzung. Diese Veränderungen garantieren, dass Privatsphäre und Sicherheit im Browser geschützt sind. Klicke auf "Tor-Netzwerk", um zu erfahren wir Tor auf Netzwerkebene schützt. +onboarding.tour-tor-privacy.description=Tor Browser isoliert Cookies und löscht den Verlauf nach jeder Benutzung. Diese Veränderungen garantieren, dass Privatsphäre und Sicherheit im Browser geschützt sind. Klicken Sie auf "Tor-Netzwerk", um zu erfahren, wie Tor auf Netzwerkebene schützt. onboarding.tour-tor-privacy.button=Öffne Tor-Netzwerk onboarding.tour-tor-network=Tor-Netzwerk onboarding.tour-tor-network.title=Bereise ein dezentrales Netzwerk. -onboarding.tour-tor-network.description=Tor Browser verbindet sich mit dem Tor-Netzwerk, das von tausenden Freiwilligen betrieben wird. Anders als andere VPN gibt es keinen zentralen Punkt, dem vertraut werden muss, um das Internet privat zu nutzen. +onboarding.tour-tor-network.description=Der Tor Browser verbindet sich mit dem Tor-Netzwerk, das von tausenden Freiwilligen betrieben wird. Anders als bei einem VPN gibt es keinen zentralen Punkt, dem vertraut werden muss, um das Internet privat zu nutzen. onboarding.tour-tor-network.button=Circuit-Ansicht öffnen onboarding.tour-tor-circuit-display=Circuit-Ansicht @@ -24,7 +24,7 @@ onboarding.tour-tor-circuit-display.button=Meinen Pfad sehen onboarding.tour-tor-security=Sicherheit onboarding.tour-tor-security.title=Wähle deine Erfahrung -onboarding.tour-tor-security.description=Wir bieten zusätzliche Einstellungen, um die Sicherheit zu erhöhen. In den Sicherheitseinstellungen können verschiedene Objekte und Funktionen deaktiviert werden, welche die Sicherheit des Computers gefährden können. Klicke, um zu erfahren, was die verschiedenen Optionen bewirken. +onboarding.tour-tor-security.description=Wir bieten zusätzliche Einstellungen, um die Sicherheit zu erhöhen. In den Sicherheitseinstellungen können verschiedene Objekte und Funktionen deaktiviert werden, welche die Sicherheit des Computers gefährden können. Klicken Sie, um zu erfahren, was die verschiedenen Optionen bewirken. onboarding.tour-tor-security.button=Einstellungen überprüfen onboarding.tour-tor-expect-differences=Erfahrungswerte @@ -48,7 +48,7 @@ onboarding.tor-circuit-display.intro.title=Wie funktionieren Circuits? onboarding.tor-circuit-display.intro.msg=Circuits bestehen aus zufällig zugeordneten Relays, d.h. Computern auf der ganzen Welt, die konfiguriert sind, um Torverkehr weiterzuleiten. Circuits ermöglichen es Ihnen, privat zu surfen und sich mit Onion-Diensten zu verbinden.\n onboarding.tor-circuit-display.diagram.title=Circuit-Ansicht -onboarding.tor-circuit-display.diagram.msg=Dieses Diagramm zeigt die Relais, aus denen die Circuits für diese Website besteht. Um zu verhindern, dass Aktivitäten zwischen verschiedenen Standorten verlinkt werden, erhält jede Website einen anderen Circuit. +onboarding.tor-circuit-display.diagram.msg=Dieses Diagramm zeigt die Relays, aus denen die Circuits für diese Website besteht. Um zu verhindern, dass Aktivitäten zwischen verschiedenen Standorten verlinkt werden, erhält jede Website einen anderen Circuit. onboarding.tor-circuit-display.new-circuit.title=Brauchen Sie einen neuen Circuit? -onboarding.tor-circuit-display.new-circuit.msg=Wenn Sie keine Verbindung zu der Website herstellen können, die Sie besuchen möchten, oder wenn sie nicht richtig geladen wird, können Sie diese Schaltfläche verwenden um die Website über einen neuen Circuit zu laden. +onboarding.tor-circuit-display.new-circuit.msg=Wenn Sie keine Verbindung zu der Website herstellen können, die Sie besuchen möchten, oder wenn sie nicht richtig geladen wird, können Sie diese Schaltfläche verwenden, um die Website über einen neuen Circuit zu laden. diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd index 0b22921a..ccc834b3 100644 --- a/src/chrome/locale/de/torbutton.dtd +++ b/src/chrome/locale/de/torbutton.dtd @@ -13,7 +13,7 @@ <!ENTITY torbutton.button.tooltip "Klicken, um Torbutton zu aktivieren"> <!ENTITY torbutton.prefs.security_settings "Tor-Browser-Sicherheitseinstellungen"> <!ENTITY torbutton.prefs.restore_defaults "Standardeinstellungen wiederherstellen"> -<!ENTITY torbutton.prefs.custom_warning "Ihre benutzerdefinierten Browser-Einstellungen haben zu ungewöhnlichen Sicherheitseinstellungen geführt. Aus Gründen der Sicherheit und Privatsphäre empfehlen wir Ihnen eine der vorgegebenen Sicherheitsstufen auszuwählen."> +<!ENTITY torbutton.prefs.custom_warning "Ihre benutzerdefinierten Browser-Einstellungen haben zu ungewöhnlichen Sicherheitseinstellungen geführt. Aus Gründen der Sicherheit und Privatsphäre empfehlen wir dir eine der vorgegebenen Sicherheitsstufen auszuwählen."> <!ENTITY torbutton.cookiedialog.title "Cookie-Schutz verwalten"> <!ENTITY torbutton.cookiedialog.lockCol "Geschützt"> <!ENTITY torbutton.cookiedialog.domainCol "Rechner"> @@ -27,12 +27,12 @@ <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Neue Cookies nicht schützen"> <!ENTITY torbutton.prefs.restrict_thirdparty "Cookies von Drittanbietern und andere Überwachungsdaten einschränken"> <!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "E"> -<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Lassen Sie dieses Feld ausgewählt, um zu verhindern, dass verschiedene Browserfunktionen ausgenutzt werden, um Ihr Surfverhalten nachzuverfolgen. Die veränderten Funktionen betreffen: BLOB-URLs, Rundruf-Kanäle, den Browser-Puffer, Cookies, Favicons, HTTP-Authentifizierungs-Kopfdaten, Verknüpfungs-Vorverbindungen, den lokalen Speicher, URLs von Medienquellen, OCSP-Anfragen, gemeinsame JavaScript-Instanzen und Tickets von TLS-Sitzungen."> -<!ENTITY torbutton.prefs.resist_fingerprinting "Details ändern, die Sie von anderen Tor-Browser-Benutzern unterscheiden"> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Lasse dieses Feld ausgewählt, um zu verhindern, dass verschiedene Browserfunktionen ausgenutzt werden, um dein Surfverhalten nachzuverfolgen. Die veränderten Funktionen betreffen: BLOB-URLs, Rundruf-Kanäle, den Browser-Puffer, Cookies, Favicons, HTTP-Authentifizierungs-Kopfdaten, Verknüpfungs-Vorverbindungen, den lokalen Speicher, URLs von Medienquellen, OCSP-Anfragen, gemeinsame JavaScript-Instanzen und Tickets von TLS-Sitzungen."> +<!ENTITY torbutton.prefs.resist_fingerprinting "Details ändern, die dich von anderen Tor-Browser-Benutzern unterscheiden"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Lassen Sie dieses Feld ausgewählt um bestimmte einzigartige Informationen Ihres Systems vor Webportalen zu verbergen, wie die Rechnerleistung, Tastaturbelegung, das Sprachprofil, den Installationsort von Erweiterungen, die Liste der installierten Erweiterungen, Ihren Netzwerkstatus, die Bildschirmausrichtung, Bildschirmgröße, seitenspezifische Vergrößerungseinstellungen, unterstützte Dateitypen, Farbschemata und WebGL-Fähigkeiten."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Lasse dieses Feld ausgewählt, um bestimmte einzigartige Informationen deines Systems vor Webportalen zu verbergen, wie die Rechnerleistung, Tastaturbelegung, das Sprachprofil, den Installationsort von Erweiterungen, die Liste der installierten Erweiterungen, deinen Netzwerkstatus, die Bildschirmausrichtung, Bildschirmgröße, seitenspezifische Vergrößerungseinstellungen, unterstützte Dateitypen, Farbschemata und WebGL-Fähigkeiten."> <!ENTITY torbutton.prefs.sec_caption "Sicherheitsstufe"> -<!ENTITY torbutton.prefs.sec_caption_tooltip "Mit dem Sicherheitsschieberegler können Sie bestimmte Browserfunktionen, die Ihren Browser für mögliche Attacken anfälliger machen, deaktivieren."> +<!ENTITY torbutton.prefs.sec_caption_tooltip "Mit dem Sicherheitsschieberegler kannst du bestimmte Browserfunktionen, die deinen Browser für mögliche Attacken anfälliger machen, deaktivieren."> <!ENTITY torbutton.prefs.sec_standard_label "Standard "> <!ENTITY torbutton.prefs.sec_standard_description "Alle Tor Browser und Webseiten Funktionen sind aktiviert."> @@ -42,7 +42,7 @@ <!ENTITY torbutton.prefs.sec_safest_label "Am sichersten"> <!ENTITY torbutton.prefs.sec_safest_description "Erlaubt nur Webseiten-Funktionen, die für statische Seiten und Basisdienste benötigt werden. Diese Änderungen betreffen Bilder, Medien und Skripte."> <!ENTITY torbutton.prefs.sec_safest_list_label "In der sichersten Einstellung:"> -<!ENTITY torbutton.prefs.sec_learn_more_label "Erfahren Sie mehr"> +<!ENTITY torbutton.prefs.sec_learn_more_label "Erfahre mehr"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript ist auf Nicht-HTTTPS-Sites deaktiviert."> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript ist standardmäßig auf allen Seiten deaktiviert."> <!ENTITY torbutton.prefs.sec_limit_typography "Einige Schriftarten und mathematische Symbole sind deaktiviert."> diff --git a/src/chrome/locale/de/torbutton.properties b/src/chrome/locale/de/torbutton.properties index bccd548d..cff5f13b 100644 --- a/src/chrome/locale/de/torbutton.properties +++ b/src/chrome/locale/de/torbutton.properties @@ -7,34 +7,34 @@ torbutton.circuit_display.tor_bridge = Brücke torbutton.circuit_display.unknown_country = Unbekanntes Land torbutton.circuit_display.guard = Wächter torbutton.circuit_display.guard_note = Dein [Wächter] Knotenpunkt darf sich nicht ändern. -torbutton.circuit_display.learn_more = Erfahren Sie mehr -torbutton.content_sizer.margin_tooltip = Tor Browser fügt diese Begrenzung hinzu, um die Breite und Höhe Ihres Fensters weniger einzigartig zu machen. Dadurch wird es anderen erschwert, Sie im Internet zu verfolgen. +torbutton.circuit_display.learn_more = Erfahre mehr +torbutton.content_sizer.margin_tooltip = Tor Browser fügt diese Begrenzung hinzu, um die Breite und Höhe deines Fensters weniger einzigartig zu machen. Dadurch wird es anderen erschwert, dich im Internet zu verfolgen. torbutton.panel.tooltip.disabled = Klicken, um Tor zu aktivieren torbutton.panel.tooltip.enabled = Klicken, um Tor zu deaktivieren torbutton.panel.label.disabled = Tor ist deaktiviert torbutton.panel.label.enabled = Tor ist aktiviert -extensions.torbutton(a)torproject.org.description = Torbutton gibt ihnen die Möglichkeit, Einstellungen von Tor schnell und einfach zu verändern und einfach die Internetdaten zu löschen. -torbutton.popup.external.title = Einen externen Dateitypen herunterladen -torbutton.popup.external.app = Tor-Browser kann diese Datei nicht anzeigen. Sie müssen es mit einer anderen Anwendung öffnen.\n\n -torbutton.popup.external.note = Einige Dateitypen können Anwendungen dazu führen, dass sie sich mit dem Internet ohne Tor verbinden.\n\n -torbutton.popup.external.suggest = Um sicher zu sein, sollten Sie heruntergeladene Dateien nur öffnen, wenn Sie nicht mit dem Netz verbunden sind oder Sie benutzen eine Live-CD wie z. B. Tails.\n +extensions.torbutton(a)torproject.org.description = Torbutton gibt dir die Möglichkeit, Einstellungen von Tor zu verändern und schnell und einfach die Internetdaten zu löschen. +torbutton.popup.external.title = Einen externen Dateitypen herunterladen? +torbutton.popup.external.app = Tor-Browser kann diese Datei nicht anzeigen. Du musst es mit einer anderen Anwendung öffnen.\n\n +torbutton.popup.external.note = Einige Dateitypen können Anwendungen dazu führen, dass du dich mit dem Internet ohne Tor verbindest.\n\n +torbutton.popup.external.suggest = Um sicher zu sein, solltest du heruntergeladene Dateien nur öffnen, wenn du nicht mit dem Netz verbunden bist, oder du benutzt eine Live-CD wie z. B. Tails.\n torbutton.popup.launch = Datei herunterladen torbutton.popup.cancel = Abbrechen torbutton.popup.dontask = Von jetzt an Dateien immer automatisch herunterladen -torbutton.popup.no_newnym = Torbutton kann Ihnen keine neue Identität geben, da es keinen Zugriff auf den Tor-Steueranschluss hat.\n\nBenutzen Sie das Tor-Browser-Paket? +torbutton.popup.no_newnym = Torbutton kann dir keine neue Identität geben, da es keinen Zugriff auf den Tor-Steueranschluss hat.\n\nBenutzt du das Tor-Browser-Paket? torbutton.security_settings.menu.title = Sicherheitseinstellungen torbutton.title.prompt_torbrowser = Wichtige Torbutton-Information -torbutton.popup.prompt_torbrowser = Torbutton funktioniert jetzt anders als vorher: es kann nicht mehr abgeschaltet werden.\n\nWir haben diese Änderung vorgenommen, da es nicht sicher ist, Torbutton auch in einem Browser zu benutzen, der auch für den Betrieb ohne Tor gedacht ist. Es gab zu viele Fehler, die wir sonst nicht hätten beheben können.\n\nWenn Sie Firefox weiterhin normal benutzen möchten, sollten Sie Torbutton deinstallieren, und das Tor-Browser-Paket herunterladen. Die Privatsphäreeinstellungen des Tor-Browsers sind außerdem denen des normalen Firefox überlegen, selbst wenn Firefox mit Torbutton benutzt wird.\n\nUm Torbutton zu entfernen, gehen Sie einfach auf Extras->Add-ons->Erweiterungen und klicken Sie auf Entfernen neben dem Torbutton. +torbutton.popup.prompt_torbrowser = Torbutton funktioniert jetzt anders als vorher: es kann nicht mehr abgeschaltet werden.\n\nWir haben diese Änderung vorgenommen, da es nicht sicher ist, Torbutton auch in einem Browser zu benutzen, der auch für den Betrieb ohne Tor gedacht ist. Es gab zu viele Fehler, die wir sonst nicht hätten beheben können.\n\nWenn du Firefox weiterhin normal benutzen möchtest, solltest du Torbutton deinstallieren, und das Tor-Browser-Paket herunterladen. Die Privatsphäreeinstellungen des Tor-Browsers sind außerdem denen des normalen Firefox überlegen, selbst wenn Firefox mit Torbutton benutzt wird.\n\nUm Torbutton zu entfernen, gehst du einfach auf Extras->Add-ons->Erweiterungen und klickst auf Entfernen neben dem Torbutton. torbutton.popup.short_torbrowser = Wichtige Torbutton-Information!\n\nTorbutton ist jetzt immer aktiviert.\n\nBitte auf den Torbutton klicken, um mehr Informationen zu erhalten. -torbutton.popup.confirm_plugins = Erweiterungen wie Flash können ihre Privatsphäre und Anonymität schädigen.\n\nSie können auch das Tor-Netzwerk umgehen, und Ihren derzeitigen Aufenthaltsort und ihre IP-Adresse verraten.\n\nSind Sie sicher, dass Sie Erweiterungen aktivieren wollen?\n\n +torbutton.popup.confirm_plugins = Erweiterungen wie Flash können deine Privatsphäre und Anonymität schädigen.\n\nDu kannst auch das Tor-Netzwerk umgehen, und deinen derzeitigen Aufenthaltsort und deine IP-Adresse verraten.\n\nBist du sicher, dass du Erweiterungen aktivieren willst?\n\n 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.popup.confirm_newnym = Tor-Browser wird alle Fenster und Reiter schließen. Alle Internetseitensitzungen gehen verloren.\n\nTor-Browser jetzt neu starten, um deine Identität zurückzusetzen?\n\n -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. +torbutton.maximize_warning = Die Maximierung des Tor-Browsers kann Webseiten die Bestimmung deiner Bildschirmgröße ermöglichen, um damit deine Spur zu verfolgen. Wir empfehlen dir, 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? +canvas.siteprompt=Die Internetseite (%S) hat versucht, HTML5-Canvas-Bilddaten zu extrahieren, die verwendet werden können, um deinen Rechner eindeutig zu identifizieren. \n\nSoll Tor-Browser es dieser Internetseite erlauben, HTML5-Canvas-Bilddaten zu extrahieren? canvas.notNow=Nicht jetzt canvas.notNowAccessKey=j canvas.allow=In der Zukunft erlauben @@ -45,9 +45,9 @@ canvas.neverAccessKey=N # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. profileProblemTitle=%S-Profilproblem -profileReadOnly=Es ist nicht möglich %S auf einem nur lesbaren Dateisystem zu starten. Bitte kopiere %S an einen anderen Ort bevor Sie es benutzen. -profileReadOnlyMac=Es ist nicht möglich %S auf einem nur lesbaren Dateisystem zu starten. Bitte %S auf Ihren Schreibtisch oder den Anwendungsordner kopieren, bevor Sie es benutzen. -profileAccessDenied=%S hat keine Berechtigung um dieses Profil abzurufen. Bitte die Berechtigungen Ihres Dateisystems einstellen und es noch einmal probieren. +profileReadOnly=Es ist nicht möglich %S auf einem nur lesbaren Dateisystem zu starten. Bitte kopiere %S an einen anderen Ort bevor du es benutzt. +profileReadOnlyMac=Es ist nicht möglich %S auf einem nur lesbaren Dateisystem zu starten. Bitte %S auf deinen Schreibtisch oder den Anwendungsordner kopieren, bevor du es benutzt. +profileAccessDenied=%S hat keine Berechtigung um dieses Profil abzurufen. Bitte die Berechtigungen deines Dateisystems einstellen und es noch einmal probieren. profileMigrationFailed=Übernahme des bestehenden %S Profils ist fehlgeschlagen.\nEs werden neue Einstellungen verwendet. # .Onion Page Info prompt. Strings are kept here for ease of translation. diff --git a/src/chrome/locale/es/aboutTBUpdate.dtd b/src/chrome/locale/es/aboutTBUpdate.dtd index 17f354cb..c6b42517 100644 --- a/src/chrome/locale/es/aboutTBUpdate.dtd +++ b/src/chrome/locale/es/aboutTBUpdate.dtd @@ -5,6 +5,6 @@ <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Registro de cambios:"> -<!ENTITY aboutTBUpdate.circuitDisplayHeading "Nuevo, Pantalla de Circuito Rediseñada RCD"> -<!ENTITY aboutTBUpdate.circuitDisplayDescription "¡Se ha trasladado y mejorado la visualización del ciruito de Tor! Clic en el botón Site Identity (situado en el lado izquierdo de la barra de direcciones URL) para ver la nueva visualización del circuito."> +<!ENTITY aboutTBUpdate.circuitDisplayHeading "Nueva Pantalla de Circuito Rediseñada"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "¡Se ha trasladado y mejorado la visualización del enrutado de Tor! Clic en el botón Site Identity (situado en el lado izquierdo de la barra de direcciones URL) para ver la nueva visualización del circuito."> <!ENTITY aboutTBUpdate.learnMore "Aprende más"> diff --git a/src/chrome/locale/es/aboutTor.dtd b/src/chrome/locale/es/aboutTor.dtd index c0934bde..b20f45d5 100644 --- a/src/chrome/locale/es/aboutTor.dtd +++ b/src/chrome/locale/es/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Recibe las últimas noticias de Tor directamente en tu bandeja de entrada."> <!ENTITY aboutTor.newsletter.link_text "Inscríbete en Tor News."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: La fuerza en la cantidad"> + +<!ENTITY aboutTor.donationBanner.line2a "El anonimato ama la compañía."> +<!ENTITY aboutTor.donationBanner.line2b "Promover los derechos humanos universales."> +<!ENTITY aboutTor.donationBanner.line2c "Defiende la libertad."> +<!ENTITY aboutTor.donationBanner.line2d "Protege la privacidad de millones de personas."> +<!ENTITY aboutTor.donationBanner.line2e "Mantén fuerte a Tor."> +<!ENTITY aboutTor.donationBanner.line2f "Necesitamos tu apoyo."> + +<!ENTITY aboutTor.donationBanner.line3 "Dona hoy, y Mozilla igualará tu donación."> + +<!ENTITY aboutTor.donationBanner.buttonA "Dona ahora."> +<!ENTITY aboutTor.donationBanner.buttonB "Cuenta conmigo."> diff --git a/src/chrome/locale/es/browserOnboarding.properties b/src/chrome/locale/es/browserOnboarding.properties index 2e858112..a86af461 100644 --- a/src/chrome/locale/es/browserOnboarding.properties +++ b/src/chrome/locale/es/browserOnboarding.properties @@ -19,36 +19,36 @@ onboarding.tour-tor-network.button=Ir a la visualización del circuito onboarding.tour-tor-circuit-display=Visualización del circuito onboarding.tour-tor-circuit-display.title=Ver tu recorrido -onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. +onboarding.tour-tor-circuit-display.description=Por cada dominio que visitas, tus datos de tráfico son transportados y cifrados en un circuito a través de tres repetidores de Tor alrededor del mundo. Ningún sitio web sabe desde dónde te conectas. Puedes pedir un nuevo circuito haciendo clic en 'Nuevo Circuito para este Sitio' en la Visualización del Circuito. onboarding.tour-tor-circuit-display.button=Ver mi recorrido onboarding.tour-tor-security=Seguridad -onboarding.tour-tor-security.title=Choose your experience. -onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. +onboarding.tour-tor-security.title=Elige tu experiencia. +onboarding.tour-tor-security.description=También te proporcionamos configuraciones adicionales para aumentar la seguridad de tu navegador. Nuestra Configuración de Seguridad te permite bloquear elementos que podrían usarse para atacar tu computadora. Haz clic a continuación para ver lo que hacen las diferentes opciones. onboarding.tour-tor-security.button=Revisar configuración -onboarding.tour-tor-expect-differences=Consejos de experiencia -onboarding.tour-tor-expect-differences.title=Expect some differences. -onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-expect-differences=Consejos de expertos +onboarding.tour-tor-expect-differences.title=Espera algunas diferencias. +onboarding.tour-tor-expect-differences.description=Con todas las características de seguridad y privacidad proporcionadas por Tor, tu experiencia mientras navegas por Internet puede ser un poco diferente. Las cosas pueden ser un poco más lentas, y dependiendo de tu nivel de seguridad, algunos elementos pueden no funcionar o no cargarse. También se te puede pedir que demuestres que eres un ser humano y no un robot. +onboarding.tour-tor-expect-differences.button=Preguntas frecuentes (FAQ) -onboarding.tour-tor-onion-services=Servicios onion -onboarding.tour-tor-onion-services.title=Be extra protected. -onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. -onboarding.tour-tor-onion-services.button=Visit an Onion +onboarding.tour-tor-onion-services=Servicios cebolla +onboarding.tour-tor-onion-services.title=Protégete bien. +onboarding.tour-tor-onion-services.description=Los servicios cebolla son sitios que terminan con .onion y proveen protecciones extra a editores y visitantes, incluyendo salvaguardas adicionales contra la censura. Los mismos permiten a cualquiera proveer contenido y servicios anónimamente. Haz clic abajo para visitar el sitio cebolla de DuckDuckGo. +onboarding.tour-tor-onion-services.button=Visita un sitio cebolla # Circuit Display onboarding. onboarding.tor-circuit-display.next=Siguiente onboarding.tor-circuit-display.done=Hecho -onboarding.tor-circuit-display.one-of-three=1 of 3 -onboarding.tor-circuit-display.two-of-three=2 of 3 -onboarding.tor-circuit-display.three-of-three=3 of 3 +onboarding.tor-circuit-display.one-of-three=1 de 3 +onboarding.tor-circuit-display.two-of-three=2 de 3 +onboarding.tor-circuit-display.three-of-three=3 de 3 -onboarding.tor-circuit-display.intro.title=How do circuits work? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.title=¿Cómo funcionan los circuitos? +onboarding.tor-circuit-display.intro.msg=Los circuitos están formados por repetidores asignados aleatoriamente, que son computadoras de todo el mundo configuradas para reenviar el tráfico de Tor. Los circuitos te permiten navegar de forma privada y conectarte a los servicios cebolla. onboarding.tor-circuit-display.diagram.title=Visualización del circuito onboarding.tor-circuit-display.diagram.msg=Estos diagramas muestran los repetidores que crean el circuito para esta página web. Para prevenir la vinculación de la actividad a través de diferentes sitios, cada página web tiene un circuito diferente. onboarding.tor-circuit-display.new-circuit.title=¿Necesitas un circuito nuevo? -onboarding.tor-circuit-display.new-circuit.msg=Si no consigues conectarte a la página web que estás intentando visitar, o no está cargando correctamente, puedes usar el botón para recargar la página con un circuito nuevo. +onboarding.tor-circuit-display.new-circuit.msg=Si no consigues conectarte a la página web que estás intentando visitar, o no está cargando correctamente, puedes usar este botón para recargar el sitio con un circuito nuevo. diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties index 6c56979e..7c3d7050 100644 --- a/src/chrome/locale/es/torbutton.properties +++ b/src/chrome/locale/es/torbutton.properties @@ -51,5 +51,5 @@ profileAccessDenied=%S no tiene permiso para acceder al perfil. Ajuste los permi profileMigrationFailed=Ha ocurrido un error en la migración de tu perfil %S. \nSe usarán los nuevos ajustes. # .Onion Page Info prompt. Strings are kept here for ease of translation. -pageInfo_OnionEncryptionWithBitsAndProtocol=Conexión cifrada (Servicio Onion, %1$S, %2$S bit keys, %3$S) -pageInfo_OnionEncryption=Conexión cifrada (Servicio Onion) +pageInfo_OnionEncryptionWithBitsAndProtocol=Conexión cifrada (Servicio cebolla, %1$S, %2$S bit keys, %3$S) +pageInfo_OnionEncryption=Conexión cifrada (Servicio cebolla) diff --git a/src/chrome/locale/eu/aboutTor.dtd b/src/chrome/locale/eu/aboutTor.dtd index 123091e5..24acba36 100644 --- a/src/chrome/locale/eu/aboutTor.dtd +++ b/src/chrome/locale/eu/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> +<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> +<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> + +<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/fa/aboutTBUpdate.dtd b/src/chrome/locale/fa/aboutTBUpdate.dtd index 9502a888..9ad06d0b 100644 --- a/src/chrome/locale/fa/aboutTBUpdate.dtd +++ b/src/chrome/locale/fa/aboutTBUpdate.dtd @@ -7,4 +7,4 @@ <!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> <!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> -<!ENTITY aboutTBUpdate.learnMore "Learn More"> +<!ENTITY aboutTBUpdate.learnMore "بیشتر بدانید"> diff --git a/src/chrome/locale/fa/aboutTor.dtd b/src/chrome/locale/fa/aboutTor.dtd index add704d4..be1440b7 100644 --- a/src/chrome/locale/fa/aboutTor.dtd +++ b/src/chrome/locale/fa/aboutTor.dtd @@ -6,23 +6,37 @@ <!ENTITY aboutTor.title "درباره‌ی تور"> -<!ENTITY aboutTor.ready.label "Explore. Privately."> +<!ENTITY aboutTor.ready.label "کاوش. خصوصی."> <!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> <!ENTITY aboutTor.failure.label "خطایی پیش آمده است!"> -<!ENTITY aboutTor.failure2.label "تا با این مرورگر کار نمی‌کند."> +<!ENTITY aboutTor.failure2.label "تور با این مرورگر کار نمی‌کند."> -<!ENTITY aboutTor.search.label "Search with DuckDuckGo"> +<!ENTITY aboutTor.search.label "جستجو توسط داک‌داک‌گو"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> -<!ENTITY aboutTor.torbrowser_user_manual_questions.label "پرسش؟"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »"> +<!ENTITY aboutTor.torbrowser_user_manual_questions.label "سوالات؟"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "بررسی راهنمای مرورگر تور »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual"> +<!ENTITY aboutTor.torbrowser_user_manual.label "راهنمای مرورگر تور"> <!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding."> -<!ENTITY aboutTor.getInvolved.label "Get Involved »"> +<!ENTITY aboutTor.getInvolved.label "دریافت مشارکت »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> -<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> +<!ENTITY aboutTor.newsletter.tagline "آخرین اخبار تور را در صندوق ورودی خود دریافت کنید."> +<!ENTITY aboutTor.newsletter.link_text "ثبت‌نام برای اخبار تور."> + +<!ENTITY aboutTor.donationBanner.line1 "تور: قدرت در اعداد"> + +<!ENTITY aboutTor.donationBanner.line2a "شرکت گمنامیت را دوست دارد."> +<!ENTITY aboutTor.donationBanner.line2b "حمایت از حقوق بشر جهانی."> +<!ENTITY aboutTor.donationBanner.line2c "برای آزادی ایستادگی کنید."> +<!ENTITY aboutTor.donationBanner.line2d "از حریم خصوصی میلیون‌ها محافظت کنید"> +<!ENTITY aboutTor.donationBanner.line2e "تور را محکم نگه دارید."> +<!ENTITY aboutTor.donationBanner.line2f "ما به حمایت شما نیاز داریم!"> + +<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "اکنون اهداء کنید"> +<!ENTITY aboutTor.donationBanner.buttonB "روی من حساب کن"> diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd index 858b8c17..6c6d1120 100644 --- a/src/chrome/locale/fa/torbutton.dtd +++ b/src/chrome/locale/fa/torbutton.dtd @@ -30,7 +30,7 @@ <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "این جعبه را نگه دارید تا از استفاده از ویژگی‌های مختلف مرورگر برای ردیابی شما در هنگام مرور وب جلوگیری شود. ویژگی های اصلاح شده شامل: آدرس‌های آلوده, broadcast channels, کش مرورگر, کوکی‌ها, فاویکن, HTTP Auth headers, پیوندهاpreconnects, حافظه محلی, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets."> <!ENTITY torbutton.prefs.resist_fingerprinting "تغييردادن جزئياتى كه شمارا از كاربران ديگر تُر تميزمى‌كند"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "این جعبه برای پنهان کردن چیزهایی از وب سایت‌هایی که می‌تواند منحصر به شما باشد؛ از جمله کارایی رایانه، طرح بندی صفحه کلید، مکان، محل افزونه‌های نصب شده، لیست افزونه‌های نصب شده، وضعیت شبکه شما، جهت صفحه نمایش، اندازه صفحه، سطوح زوم خاص، انواع فایل پشتیبانی شده، رنگ سیستم و قابلیت‌های WebGL نگه دارید."> <!ENTITY torbutton.prefs.sec_caption "سطح امنیت"> <!ENTITY torbutton.prefs.sec_caption_tooltip "نوار لغزنده امنیتی به شما اجازه می‌دهد که مشخصه‌های خاص مرورگر را غیرفعال کنید که ممکن است مرورگر شما را در برابر تلاش‌های هک آسیب‌پذیر سازد."> <!ENTITY torbutton.prefs.sec_standard_label "استاندارد"> @@ -39,7 +39,7 @@ <!ENTITY torbutton.prefs.sec_safer_description "از کار انداختن ویژگی‌های وبسایت که اغلب خطرناک هستند و باعث از دست رفتن برخی سایت‌ها می‌شوند."> <!ENTITY torbutton.prefs.sec_safer_list_label "تنظیم مکانی امن‌تر:"> <!ENTITY torbutton.prefs.sec_safest_label "ایمن ترین "> -<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts."> +<!ENTITY torbutton.prefs.sec_safest_description "تنها اجازه می‌دهد که ویژگی‌های وبسایت برای سایت‌های ایستا و خدمات پایه مورد نیاز باشد. این تغییرات بر تصاویر، رسانه‌ها و متن تاثیر می‌گذارند."> <!ENTITY torbutton.prefs.sec_safest_list_label "تنظیم امن‌ترین مکان"> <!ENTITY torbutton.prefs.sec_learn_more_label "اطلاعات بیشتر"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "جاوا اسکریپت روی سایت‌های غیر HTTPS کار نمی‌کند."> diff --git a/src/chrome/locale/fr/aboutTBUpdate.dtd b/src/chrome/locale/fr/aboutTBUpdate.dtd index 7ff3ca31..cfed15d9 100644 --- a/src/chrome/locale/fr/aboutTBUpdate.dtd +++ b/src/chrome/locale/fr/aboutTBUpdate.dtd @@ -6,5 +6,5 @@ <!ENTITY aboutTBUpdate.changeLogHeading "Journal des changements :"> <!ENTITY aboutTBUpdate.circuitDisplayHeading "Affichage des circuits nouveau et repensé"> -<!ENTITY aboutTBUpdate.circuitDisplayDescription "L’affichage des circuits de Tor a été déplacé et amélioré ! Cliquez sur le bouton Identité&#160;du&#160;site (situé à gauche de la barre d’URL) pour voir le nouvel affichage des circuits."> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "L’affichage des circuits de Tor a été déplacé et amélioré ! Cliquez sur le bouton Identité du site (situé à gauche de la barre d’URL) pour voir le nouvel affichage des circuits."> <!ENTITY aboutTBUpdate.learnMore "En apprendre davantage"> diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd index 708e244a..52c4d062 100644 --- a/src/chrome/locale/fr/aboutTor.dtd +++ b/src/chrome/locale/fr/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Obtenez les dernières nouvelles au sujet de Tor directement dans votre boîte de réception."> <!ENTITY aboutTor.newsletter.link_text "Inscrivez-vous aux nouvelles de Tor"> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> + +<!ENTITY aboutTor.donationBanner.line2a "L’anonymat adore la compagnie"> +<!ENTITY aboutTor.donationBanner.line2b "Améliorer les droits de la personne."> +<!ENTITY aboutTor.donationBanner.line2c "Se lever pour la liberté."> +<!ENTITY aboutTor.donationBanner.line2d "Protéger la confidentialité de millions de personnes."> +<!ENTITY aboutTor.donationBanner.line2e "Garder Tor robuste."> +<!ENTITY aboutTor.donationBanner.line2f "On a besoin de votre soutien !"> + +<!ENTITY aboutTor.donationBanner.line3 "Donnez aujourd'hui, et Mozilla recevra votre donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donnez dès maintenant"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/fr/browserOnboarding.properties b/src/chrome/locale/fr/browserOnboarding.properties index 4c9fff79..ad6ca038 100644 --- a/src/chrome/locale/fr/browserOnboarding.properties +++ b/src/chrome/locale/fr/browserOnboarding.properties @@ -3,52 +3,52 @@ # vim: set sw=2 sts=2 ts=8 et: onboarding.tour-tor-welcome=Bienvenue -onboarding.tour-tor-welcome.title=You’re ready. -onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. -onboarding.tour-tor-welcome.button=Start Now +onboarding.tour-tor-welcome.title=Vous êtes prêts. +onboarding.tour-tor-welcome.description=Le Navigateur Tor offre le plus haut niveau de confidentialité et de sécurité quand vous parcourez le Web. Vous êtes maintenant protégé contre le suivi à la trace, la surveillance et la censure. Cette introduction rapide vous montrera comment faire. +onboarding.tour-tor-welcome.button=Commencer maintenant onboarding.tour-tor-privacy=Confidentialité -onboarding.tour-tor-privacy.title=Snub trackers and snoopers. -onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. -onboarding.tour-tor-privacy.button=Go to Tor Network +onboarding.tour-tor-privacy.title=Repoussez les traqueurs et les fouineurs. +onboarding.tour-tor-privacy.description=Le Navigateur Tor isole les témoins et supprime l’historique de votre navigateur en fin de session. Ces modifications garantissent que confidentialité et sécurité sont protégées dans le navigateur. Cliquez sur « Réseau Tor » pour savoir comment nous vous protégeons au niveau du réseau. +onboarding.tour-tor-privacy.button=Se rendre sur le Réseau Tor -onboarding.tour-tor-network=Tor Network -onboarding.tour-tor-network.title=Travel a decentralized network. -onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. -onboarding.tour-tor-network.button=Go to Circuit Display +onboarding.tour-tor-network=Réseau Tor +onboarding.tour-tor-network.title=Naviguez sur un réseau décentralisé. +onboarding.tour-tor-network.description=Le navigateur Tor vous connecte au réseau Tor exploité par des milliers de bénévoles dans le monde entier. Contrairement à un RPV, il n’y a pas de point de défaillance unique ou d’entité centralisée auxquels vous devez faire confiance pour profiter d’Internet en toute confidentialité. +onboarding.tour-tor-network.button=Se rendre sur l’Affichage des circuits -onboarding.tour-tor-circuit-display=Circuit Display -onboarding.tour-tor-circuit-display.title=See your path. -onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. -onboarding.tour-tor-circuit-display.button=See My Path +onboarding.tour-tor-circuit-display=Affichage des circuits +onboarding.tour-tor-circuit-display.title=Visualisez votre chemin. +onboarding.tour-tor-circuit-display.description=Pour chaque domaine que vous visitez, votre trafic est relayé et chiffré dans un circuit passant par trois relais Tor disséminés de par le monde. Aucun site Web ne sait d’où vous vous connectez. Vous pouvez demander un nouveau circuit en cliquant sur « Nouveau circuit Tor pour ce site » dans votre Affichage des circuits. +onboarding.tour-tor-circuit-display.button=Visualiser mon chemin onboarding.tour-tor-security=Sécurité -onboarding.tour-tor-security.title=Choose your experience. -onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. -onboarding.tour-tor-security.button=Review Settings +onboarding.tour-tor-security.title=Choisissez votre expérience. +onboarding.tour-tor-security.description=Nous vous offrons aussi des paramètres supplémentaires pour augmenter la sécurité de votre navigateur. Nos paramètres de sécurité vous permettent de bloquer des éléments qui pourraient être utilisés pour attaquer votre ordinateur. Cliquez ci-dessous pour voir ce que les différentes options vous proposent. +onboarding.tour-tor-security.button=Passer les paramètres en revue -onboarding.tour-tor-expect-differences=Experience Tips -onboarding.tour-tor-expect-differences.title=Expect some differences. -onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-expect-differences=Informations concernant l’expérience +onboarding.tour-tor-expect-differences.title=Attendez-vous à des différences. +onboarding.tour-tor-expect-differences.description=Avec toutes les fonctions de sécurité et de confidentialité offertes par Tor, votre expérience de navigation sur Internet pourrait être un peu différente. Les choses pourraient être un peu plus lentes et selon votre niveau de sécurité, certains éléments pourraient ne pas fonctionner ou ne pas se charger. On pourrait aussi vous demander de prouver que vous êtes un humain et non un robot. +onboarding.tour-tor-expect-differences.button=Consulter les FAQ -onboarding.tour-tor-onion-services=Les services oignon -onboarding.tour-tor-onion-services.title=Be extra protected. -onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. -onboarding.tour-tor-onion-services.button=Visit an Onion +onboarding.tour-tor-onion-services=Les services onion +onboarding.tour-tor-onion-services.title=Soyez plus que protégé. +onboarding.tour-tor-onion-services.description=Les services onion sont des sites se terminant par .onion qui offrent des protections accrues aux diffuseurs et aux visiteurs, dont des mesures de protection contre la censure. Les services onion permettent à tous de proposer anonymement du contenu et des services. Cliquez ci-dessous pour visiter le site onion de DuckDuckGo. +onboarding.tour-tor-onion-services.button=Visiter un Onion # Circuit Display onboarding. onboarding.tor-circuit-display.next=Suivant -onboarding.tor-circuit-display.done=Fait -onboarding.tor-circuit-display.one-of-three=1 of 3 -onboarding.tor-circuit-display.two-of-three=2 of 3 -onboarding.tor-circuit-display.three-of-three=3 of 3 +onboarding.tor-circuit-display.done=Terminé +onboarding.tor-circuit-display.one-of-three=1 de 3 +onboarding.tor-circuit-display.two-of-three=2 de 3 +onboarding.tor-circuit-display.three-of-three=3 de 3 -onboarding.tor-circuit-display.intro.title=How do circuits work? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.title=Comment les circuits fonctionnent-ils ? +onboarding.tor-circuit-display.intro.msg=Les circuits sont composés de relais attribués au hasard et qui sont des ordinateurs disséminés dans le monde entier et configurés pour acheminer le trafic de Tor. -onboarding.tor-circuit-display.diagram.title=Circuit Display -onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. +onboarding.tor-circuit-display.diagram.title=Affichage des circuits +onboarding.tor-circuit-display.diagram.msg=Ce diagramme affiche les relais qui composent le circuit de ce site Web. Pour empêcher de relier l’activité d’un site à l’autre, chaque site Web obtient un circuit différent. -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? -onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. +onboarding.tor-circuit-display.new-circuit.title=Avez-vous besoin d'un nouveau circuit ? +onboarding.tor-circuit-display.new-circuit.msg=Si vous n’arrivez pas à vous connecter au site Web que vous essayez de visiter ou s’il ne se charge pas correctement, vous pouvez alors utiliser ce bouton pour recharger le site avec un nouveau circuit. diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties index 6f430a65..3e8e860d 100644 --- a/src/chrome/locale/fr/torbutton.properties +++ b/src/chrome/locale/fr/torbutton.properties @@ -1,6 +1,6 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP inconnue -torbutton.circuit_display.onion_site = Site Oignon +torbutton.circuit_display.onion_site = Site onion torbutton.circuit_display.this_browser = Ce navigateur torbutton.circuit_display.relay = Relais torbutton.circuit_display.tor_bridge = Pont @@ -51,5 +51,5 @@ profileAccessDenied=%S n’a pas le droit d’accéder au profil. Veuillez ajust profileMigrationFailed=La migration de votre profil existant %S a échoué.\nDe nouveaux paramètres vont être utilisés. # .Onion Page Info prompt. Strings are kept here for ease of translation. -pageInfo_OnionEncryptionWithBitsAndProtocol=La connexion est chiffrée (service oignon, %1$S, clés %2$S bits, %3$S) -pageInfo_OnionEncryption=La connexion est chiffrée (service oignon) +pageInfo_OnionEncryptionWithBitsAndProtocol=La connexion est chiffrée (service onion, %1$S, clés %2$S bits, %3$S) +pageInfo_OnionEncryption=La connexion est chiffrée (service onion) diff --git a/src/chrome/locale/ga/aboutTor.dtd b/src/chrome/locale/ga/aboutTor.dtd index ce6fe3f5..a2c65352 100644 --- a/src/chrome/locale/ga/aboutTor.dtd +++ b/src/chrome/locale/ga/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Faigh an nuacht is déanaí maidir le Tor i do bhosca isteach."> <!ENTITY aboutTor.newsletter.link_text "Cláraigh le Nuachtlitir Tor."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Ní neart go cur le chéile"> + +<!ENTITY aboutTor.donationBanner.line2a "Dul i bhfolach sa slua."> +<!ENTITY aboutTor.donationBanner.line2b "Cuir cearta daonna chun cinn."> +<!ENTITY aboutTor.donationBanner.line2c "Seas an fód ar son na saoirse."> +<!ENTITY aboutTor.donationBanner.line2d "Cosain príobháideachas na milliún duine."> +<!ENTITY aboutTor.donationBanner.line2e "Cuir taca le Tor."> +<!ENTITY aboutTor.donationBanner.line2f "Tá do chúnamh de dhíth orainn!"> + +<!ENTITY aboutTor.donationBanner.line3 "Tabhair síntiús airgid inniu agus tabharfaidh Mozilla an méid céanna arís dúinn."> + +<!ENTITY aboutTor.donationBanner.buttonA "Tabhair síntiús airgid anois"> +<!ENTITY aboutTor.donationBanner.buttonB "Cuir mise san áireamh"> diff --git a/src/chrome/locale/he/aboutDialog.dtd b/src/chrome/locale/he/aboutDialog.dtd index d334bfd0..286b86b6 100644 --- a/src/chrome/locale/he/aboutDialog.dtd +++ b/src/chrome/locale/he/aboutDialog.dtd @@ -1,6 +1,6 @@ <!ENTITY project.start "&brandShortName; פותח ע"י">  -<!ENTITY project.tpoLink "ה-&vendorShortName;"> +<!ENTITY project.tpoLink "&vendorShortName;"> <!ENTITY project.end ", ארגון ללא כוונות רווח הפועל להגן על פרטיותך וחירותך ברשת."> <!ENTITY help.start "רוצה לעזור?"> @@ -8,7 +8,7 @@ <!ENTITY help.donateLink "תרום"> <!ENTITY help.or "או">  -<!ENTITY help.getInvolvedLink "הייה מעורב!"> +<!ENTITY help.getInvolvedLink "הייה מעורב"> <!ENTITY help.end "!">  <!ENTITY bottomLinks.questions "שאלות?"> diff --git a/src/chrome/locale/he/aboutTor.dtd b/src/chrome/locale/he/aboutTor.dtd index e47b43c7..e4659b67 100644 --- a/src/chrome/locale/he/aboutTor.dtd +++ b/src/chrome/locale/he/aboutTor.dtd @@ -15,14 +15,28 @@ <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "שאלות?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "בדוק את מדריך של דפדפן Tor שלנו «"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "בדוק את מדריך של דפדפן Tor שלנו »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "מ"> <!ENTITY aboutTor.torbrowser_user_manual.label "מדריך של דפדפן Tor"> <!ENTITY aboutTor.tor_mission.label "מיזם Tor הוא ארגון US 501(c)(3) ללא רווחים המקדם זכויות אדם וחירויות ע"י יצירה ופריסה של טכנולוגיות של אלמוניות ופרטיות בקוד פתוח וחינמי, תמיכה בזמינות ובשימוש בלתי־מוגבל שלהן, וקידום הבנה מדעית ועממית שלהן."> -<!ENTITY aboutTor.getInvolved.label "הייה מעורב «"> +<!ENTITY aboutTor.getInvolved.label "הייה מעורב »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> <!ENTITY aboutTor.newsletter.tagline "קבל את החדשות האחרונות מאת Tor ישירות לתיבה הנכנסת שלך."> <!ENTITY aboutTor.newsletter.link_text "הירשם עבור חדשות Tor."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: חוזק במספרים"> + +<!ENTITY aboutTor.donationBanner.line2a "אלמוניות אוהבת חברה."> +<!ENTITY aboutTor.donationBanner.line2b "זכויות אדם קדומות יקומיות."> +<!ENTITY aboutTor.donationBanner.line2c "סנגר על חירות."> +<!ENTITY aboutTor.donationBanner.line2d "הגן על פרטיותם של מיליונים."> +<!ENTITY aboutTor.donationBanner.line2e "שמור על Tor חזק."> +<!ENTITY aboutTor.donationBanner.line2f "אנחנו צריכים את תמיכתך!"> + +<!ENTITY aboutTor.donationBanner.line3 "תן היום, ו־Mozilla תשווה את תרומתך."> + +<!ENTITY aboutTor.donationBanner.buttonA "תרום עכשיו"> +<!ENTITY aboutTor.donationBanner.buttonB "החשב אותי"> diff --git a/src/chrome/locale/he/browserOnboarding.properties b/src/chrome/locale/he/browserOnboarding.properties index daa6b6e7..8865f0c8 100644 --- a/src/chrome/locale/he/browserOnboarding.properties +++ b/src/chrome/locale/he/browserOnboarding.properties @@ -9,32 +9,32 @@ onboarding.tour-tor-welcome.button=התחל עכשיו onboarding.tour-tor-privacy=פרטיות onboarding.tour-tor-privacy.title=בלום גששים וחטטנים. -onboarding.tour-tor-privacy.description=דפדפן Tor מבודד עוגיות ומוחק את היסטורית הדפדפן שלך לאחר השיח שלך. שינויים אלו מבטיחים שהפרטיות והאבטחה שלך מוגנים בדפדפן. לחץ ’רשת Tor‘ כדי ללמוד כיצד אנחנו מגינים עליך ברמת הרשת. +onboarding.tour-tor-privacy.description=דפדפן Tor מבודד עוגיות ומוחק את היסטורית הדפדפן שלך לאחר השיח שלך. שינויים אלו מבטיחים שהפרטיות והאבטחה שלך מוגנים בדפדפן. לחץ על ’רשת Tor‘ כדי ללמוד כיצד אנחנו מגינים עליך ברמת הרשת. onboarding.tour-tor-privacy.button=לך אל רשת Tor onboarding.tour-tor-network=רשת Tor onboarding.tour-tor-network.title=טייל ברשת מבוזרת. -onboarding.tour-tor-network.description=דפדפן Tor מחבר אותך אל רשת Tor המופעלת ע"י אלפי מתנדבים ברחבי העולם. בשונה מאשר VPN, אין נקודת כשל בודדת או כניסה מבוזרת שאתה צריך לסמוך עליה על מנת ליהנות מהאינטרנט באופן פרטי. +onboarding.tour-tor-network.description=דפדפן Tor מחבר אותך אל רשת Tor המופעלת ע"י אלפי מתנדבים ברחבי העולם. בשונה מאשר VPN, אין נקודת כשל בודדת או כניסה ממורכזת שאתה צריך לסמוך עליה על מנת ליהנות מהאינטרנט באופן פרטי. onboarding.tour-tor-network.button=לך אל תצוגת מעגל onboarding.tour-tor-circuit-display=תצוגת מעגל onboarding.tour-tor-circuit-display.title=ראה את הנתיב שלך. -onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. +onboarding.tour-tor-circuit-display.description=עבור כל תחום שאתה מבקר בו, התעבורה שלך עוברת בממסר ומוצפנת במעגל דרך שלושה ממסרי Tor ברחבי העולם. אין אתר שיודע מאיפה אתה מתחבר. אתה יכול לבקש מעגל חדש ע"י לחיצה על ’מעגל חדש עבור אתר זה‘ בתצוגת המעגל שלנו. onboarding.tour-tor-circuit-display.button=ראה את הנתיב שלי onboarding.tour-tor-security=אבטחה onboarding.tour-tor-security.title=בחר את חוויתך. -onboarding.tour-tor-security.description=אנחנו מספקים לך גם הגדרות נוספות עבור הגברת אבטחת הדפדפן שלך. הגדרות האבטחה שלנו מתירות לך לחסום יסודות שעלולות לשמש כדי לתקוף את המחשב שלך. לחץ למטה כדי לראות מה האפשרויות השונות עושות. +onboarding.tour-tor-security.description=אנחנו מספקים לך גם הגדרות נוספות עבור הגברת אבטחת הדפדפן שלך. הגדרות האבטחה שלנו מתירות לך לחסום יסודות שעלולים לשמש כדי לתקוף את המחשב שלך. לחץ למטה כדי לראות מה האפשרויות השונות עושות. onboarding.tour-tor-security.button=סקור הגדרות onboarding.tour-tor-expect-differences=עצות חוויה onboarding.tour-tor-expect-differences.title=צפה למספר הבדלים. -onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. +onboarding.tour-tor-expect-differences.description=עם כל המאפיינים של האבטחה והפרטיות המסופקים ע"י Tor, חוויתך בעת גלישה באינטרנט עשויה להיות מעט שונה. דברים עשויים להיות מעט איטיים יותר, ובהסתמכות על רמת האבטחה שלך, יסודות מסוימים עשויים לא לעבוד או להיטען. ייתכן שתתבקש להוכיח שאתה אנושי ולא רובוט. onboarding.tour-tor-expect-differences.button=ראה שאלות נפוצות onboarding.tour-tor-onion-services=שירותי בצל onboarding.tour-tor-onion-services.title=הייה אקסטרה מוגן. -onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. +onboarding.tour-tor-onion-services.description=שירותי בצל הם אתרים המסתיימים עם .onion המספק הגנות אקסטרה אל מפרסמים ומבקרים, כולל אמצעיי הגנה שהתווספו נגד צנזורה. שירותי בצל מתירים לכל אחד לספק תוכן ושירותים באופן אלמוני. לחץ למטה כדי לבקר באתר הבצל DuckDuckGo. onboarding.tour-tor-onion-services.button=בקר בבצל # Circuit Display onboarding. @@ -45,7 +45,7 @@ onboarding.tor-circuit-display.two-of-three=2 מתוך 3 onboarding.tor-circuit-display.three-of-three=3 מתוך 3 onboarding.tor-circuit-display.intro.title=איך מעגלים עובדים? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.msg=מעגלים בנויים ממסרים מוקצים אקראית, שהם מחשבים ברחבי העולם המתוצרים להעביר הלאה תעבורת Tor. מעגלים מתירים לך לגלוש בפרטיות ולהתחבר אל שירותי בצל. onboarding.tor-circuit-display.diagram.title=תצוגת מעגל onboarding.tor-circuit-display.diagram.msg=תרשים זה מראה את הממסרים המרכיבים את המעגל עבור אתר זה. כדי למנוע קישור פעילות על פני אתרים שונים, כל אתר מקבל מעגל שונה. diff --git a/src/chrome/locale/he/torbutton.dtd b/src/chrome/locale/he/torbutton.dtd index 5035258c..5595b01f 100644 --- a/src/chrome/locale/he/torbutton.dtd +++ b/src/chrome/locale/he/torbutton.dtd @@ -34,7 +34,7 @@ <!ENTITY torbutton.prefs.sec_caption "רמת אבטחה"> <!ENTITY torbutton.prefs.sec_caption_tooltip "מחוון האבטחה נותן לך להשבית תכונות דפדפן מסוימות אשר עלולות לעשות את הדפדפן שלך יותר פגיע לנסיונות פיצוח."> <!ENTITY torbutton.prefs.sec_standard_label "תקני"> -<!ENTITY torbutton.prefs.sec_standard_description "כל המאפיינים של דפדפן Tor ומאפייני אתרים מושבתים."> +<!ENTITY torbutton.prefs.sec_standard_description "כל המאפיינים של דפדפן Tor ומאפייני אתר מושבתים."> <!ENTITY torbutton.prefs.sec_safer_label "בטוח יותר"> <!ENTITY torbutton.prefs.sec_safer_description "משבית מאפייני אתר שמסוכנים לעיתים קרובות, מה שגורם למספר אתרים לאבד תפקודיות."> <!ENTITY torbutton.prefs.sec_safer_list_label "בהגדרה הבטוחה יותר:"> diff --git a/src/chrome/locale/he/torbutton.properties b/src/chrome/locale/he/torbutton.properties index 315ef4ce..8c2d7a15 100644 --- a/src/chrome/locale/he/torbutton.properties +++ b/src/chrome/locale/he/torbutton.properties @@ -13,7 +13,7 @@ torbutton.panel.tooltip.disabled = לחץ כדי לאפשר את Tor torbutton.panel.tooltip.enabled = לחץ כדי להשבית את Tor torbutton.panel.label.disabled = Tor מושבת torbutton.panel.label.enabled = Tor מאופשר -extensions.torbutton(a)torproject.org.description = Torbutton מספק כפתור כדי להגדיר את הגדרות Tor וכדי לנקות במהירות ובקלות נתוני גלישה פרטיים. +extensions.torbutton(a)torproject.org.description = Torbutton מספק כפתור כדי לתצר את הגדרות Tor וכדי לנקות במהירות ובקלות נתוני גלישה פרטיים. torbutton.popup.external.title = להוריד סוג חיצוני של קובץ? torbutton.popup.external.app = דפדפן Tor אינו יכול להציג קובץ זה. תצטרך לפתוח אותו באמצעות יישום אחר.\n\n torbutton.popup.external.note = סוגים מסוימים של קבצים עלולים לגרום ליישומים להתחבר אל האינטרנט ללא שימוש ב-Tor.\n diff --git a/src/chrome/locale/id/aboutTor.dtd b/src/chrome/locale/id/aboutTor.dtd index 3a4e3a27..7d56a131 100644 --- a/src/chrome/locale/id/aboutTor.dtd +++ b/src/chrome/locale/id/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Dapatkan berita Tor terbaru langsung ke inbox Anda."> <!ENTITY aboutTor.newsletter.link_text "Daftar untuk mendapatkan Berita Tor."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> +<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> +<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> + +<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/is/aboutTBUpdate.dtd b/src/chrome/locale/is/aboutTBUpdate.dtd index a23e06dd..a668b89c 100644 --- a/src/chrome/locale/is/aboutTBUpdate.dtd +++ b/src/chrome/locale/is/aboutTBUpdate.dtd @@ -5,6 +5,6 @@ <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Breytingaannáll:"> -<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> -<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> +<!ENTITY aboutTBUpdate.circuitDisplayHeading "Ný, endurhönnuð birting rása"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "Birting rása í Tor hefur verið flutt á nýjan stað og endurhönnuð! Smelltu á Vefsvæði Auðkenni hnappinn (vinstra megin við staðsetningarstikuna) til að sjá nýja framsetningu rása."> <!ENTITY aboutTBUpdate.learnMore "Fræðast frekar"> diff --git a/src/chrome/locale/is/aboutTor.dtd b/src/chrome/locale/is/aboutTor.dtd index 0a259108..cc2317c5 100644 --- a/src/chrome/locale/is/aboutTor.dtd +++ b/src/chrome/locale/is/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Fáðu nýjustu fréttir af Tor beint í pósthólfið þitt."> <!ENTITY aboutTor.newsletter.link_text "Skráðu þig til að fá Tor-fréttir."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Styrkur í fjöldanum"> + +<!ENTITY aboutTor.donationBanner.line2a "Nafnleysi krefst félagsskapar."> +<!ENTITY aboutTor.donationBanner.line2b "Setjum mannréttindi á oddinn."> +<!ENTITY aboutTor.donationBanner.line2c "Stöndum saman með frelsinu."> +<!ENTITY aboutTor.donationBanner.line2d "Verndum friðhelgi milljóna manna."> +<!ENTITY aboutTor.donationBanner.line2e "Höldum Tor sterku"> +<!ENTITY aboutTor.donationBanner.line2f "Við þörfnumst stuðnings þíns!"> + +<!ENTITY aboutTor.donationBanner.line3 "Gefðu í dag - og Mozilla mun jafna framlag þitt."> + +<!ENTITY aboutTor.donationBanner.buttonA "Styrkja núna"> +<!ENTITY aboutTor.donationBanner.buttonB "Reiknið með mér"> diff --git a/src/chrome/locale/is/browserOnboarding.properties b/src/chrome/locale/is/browserOnboarding.properties index 2ca47d25..893ce908 100644 --- a/src/chrome/locale/is/browserOnboarding.properties +++ b/src/chrome/locale/is/browserOnboarding.properties @@ -2,53 +2,53 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -onboarding.tour-tor-welcome=Welcome -onboarding.tour-tor-welcome.title=You’re ready. -onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. -onboarding.tour-tor-welcome.button=Start Now +onboarding.tour-tor-welcome=Velkomin +onboarding.tour-tor-welcome.title=Þú ert tilbúin(n). +onboarding.tour-tor-welcome.description=Tor-vafrinn stenst mestu kröfur varðandi öryggi og nafnleynd þegar vafrað er á netinu. Þú ert núna varin(n) fyrir eftirliti, skráningu og ritskoðun. Þessi flýtikynning mun sýna þér hvernig þetta fer fram. +onboarding.tour-tor-welcome.button=Byrja núna onboarding.tour-tor-privacy=Friðhelgi -onboarding.tour-tor-privacy.title=Snub trackers and snoopers. -onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. -onboarding.tour-tor-privacy.button=Go to Tor Network - -onboarding.tour-tor-network=Tor Network -onboarding.tour-tor-network.title=Travel a decentralized network. -onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. -onboarding.tour-tor-network.button=Go to Circuit Display - -onboarding.tour-tor-circuit-display=Circuit Display -onboarding.tour-tor-circuit-display.title=See your path. -onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. -onboarding.tour-tor-circuit-display.button=See My Path - -onboarding.tour-tor-security=Security -onboarding.tour-tor-security.title=Choose your experience. -onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. -onboarding.tour-tor-security.button=Review Settings - -onboarding.tour-tor-expect-differences=Experience Tips -onboarding.tour-tor-expect-differences.title=Expect some differences. -onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-privacy.title=Feldu þig fyrir snuðrurum og eftirliti +onboarding.tour-tor-privacy.description=Tor-vafrinn einangrar vefkökur og hreinsar vafurferil þinn eftir setuna þína. Þessar aðgerðir tryggja verndun gagnaleyndar og almennt öryggi í vafranum. Smelltu á ‘Tor-netið’ til að sjá hvernig við verjum þig einnig gagnvart netkerfinu sjálfu. +onboarding.tour-tor-privacy.button=Fara á Tor-netið + +onboarding.tour-tor-network=Tor-netið +onboarding.tour-tor-network.title=Farðu um ómiðstýrt netkerfi. +onboarding.tour-tor-network.description=Tor-vafrinn tengir þig við Tor-netið sem rekið er af þúsundum sjálfboðaliða um víða veröld. Ólíkt VPN, þá er enginn einn punktur sem getur brugðist eða miðlægt firirbæri sem þú þarft að treysta til að geta notað netið án afskipta annarra. +onboarding.tour-tor-network.button=Farðu í birtingu rása + +onboarding.tour-tor-circuit-display=Birting rása +onboarding.tour-tor-circuit-display.title=Skoðaðu slóðina þína +onboarding.tour-tor-circuit-display.description=Fyrir hvert lén sem þú heimsækir, er umferðinni þinni endurbeint dulritaðri um brautir (rásir) milli þriggja Tor-endurvarpa víðsvegar um heiminn. Ekkert vefsvæði getur séð hvaðan þú tengist. Þú getur beðið um nýja rás með því að smella á ‘Ný rás fyrir þetta vefsvæði’ í glugganum þar sem rásirnar eru birtar. +onboarding.tour-tor-circuit-display.button=Skoða slóðina mína + +onboarding.tour-tor-security=Öryggi +onboarding.tour-tor-security.title=Veldu hvernig þú vilt upplifa þetta. +onboarding.tour-tor-security.description=Við höfum einnig útbúið viðbótarstillingar þar sem þú getur breytt öryggisstigi vafrans. Öryggisstillingarnar gera kleift að loka á atriði sem hægt væri að nota til árása á tölvuna þína. Smelltu hér fyrir neðan til að skoða hvernig hinir mismunandi valkostir virka. +onboarding.tour-tor-security.button=Yfirfara stillingar + +onboarding.tour-tor-expect-differences=Ábendingar fyrir upplifunina +onboarding.tour-tor-expect-differences.title=Gerður ráð fyrir að eitthvað verði öðruvísi. +onboarding.tour-tor-expect-differences.description=Vegna allra öryggis- og gagnaverndareiginleika Tor, þá gæti upplifun þín af vafri á internetinu orðið eilítið öðruvísi en annars. Hlutirnir gerast kannski aðeins hægar og það fer eftir öryggisstillingunum þínum hvort sum atriði virki eða birtist yfirhöfuð. Þú gætir líka lent í því að vera reglulega spurð(ur) hvort þú sért mannvera eða vélmenni. +onboarding.tour-tor-expect-differences.button=Skoðaðu algengar spurningar - FAQ onboarding.tour-tor-onion-services=Onion-þjónustur -onboarding.tour-tor-onion-services.title=Be extra protected. -onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. -onboarding.tour-tor-onion-services.button=Visit an Onion +onboarding.tour-tor-onion-services.title=Fáðu viðbótaröryggi. +onboarding.tour-tor-onion-services.description=Onion-þjónustur eru vefsvæði sem enda á .onion viðskeyti, vefsvæði sem gefa útgefendum efnis og þeim sem skoða það aukna vernd gagnvart ritskoðun. Onion-þjónustur gera öllum kleift að birta efni eða eigin þjónustu nafnlaust. Smelltu hr fyrir neðan til að skoða onion-vefsvæði DuckDuckGo. +onboarding.tour-tor-onion-services.button=Heimsækja Onion-vef # Circuit Display onboarding. -onboarding.tor-circuit-display.next=Næsti +onboarding.tor-circuit-display.next=Næsta onboarding.tor-circuit-display.done=Lokið -onboarding.tor-circuit-display.one-of-three=1 of 3 -onboarding.tor-circuit-display.two-of-three=2 of 3 -onboarding.tor-circuit-display.three-of-three=3 of 3 +onboarding.tor-circuit-display.one-of-three=1 af 3 +onboarding.tor-circuit-display.two-of-three=2 af 3 +onboarding.tor-circuit-display.three-of-three=3 af 3 -onboarding.tor-circuit-display.intro.title=How do circuits work? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.title=Hvernig virka rásir? +onboarding.tor-circuit-display.intro.msg=Rásir eru samsettar úr handahófsvöldum endurbeinum, sem eru tölvur úti um víða veröld sem sjá um að áframsenda umferð fyrir Tor. Rásir gera þér kleift að vafra í leyni og að tengjast við onion-þjónustur. -onboarding.tor-circuit-display.diagram.title=Circuit Display -onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. +onboarding.tor-circuit-display.diagram.title=Birting rása +onboarding.tor-circuit-display.diagram.msg=Þessi skýringamynd sýnir endurvarpana sem saman mynda rásina fyrir þetta vefsvæði. Til að koma í veg fyrir að hægt sé að tengja saman virkni á mismunandi vefsvæðum, þá fær hvert vefsvæði sína sérstöku rás. -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? -onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. +onboarding.tor-circuit-display.new-circuit.title=Þarftu nýja rás? +onboarding.tor-circuit-display.new-circuit.msg=Ef þú átt í vandræðum með að tengjast vefsvæði sem þú ætlar að skoða eða að það hleðst ekki rétt inn, þá geturðu notað þennan hnapp til að endurhlaða in vefsíðunni með nýrri rás. diff --git a/src/chrome/locale/is/torbutton.dtd b/src/chrome/locale/is/torbutton.dtd index de0c5ecc..4477085c 100644 --- a/src/chrome/locale/is/torbutton.dtd +++ b/src/chrome/locale/is/torbutton.dtd @@ -27,12 +27,12 @@ <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ekki vernda nýjar vefkökur"> <!ENTITY torbutton.prefs.restrict_thirdparty "Takmarka vefkökur frá þriðja aðila og önnur ferligögn"> <!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R"> -<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets."> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Hafðu merkt í þennan reit til að koma í veg fyrir að ýmsir eiginleikar vafrans séu misnotaðir í að fylgjast með þér á meðan þú flakkar um vefinn. Breyttir eiginleikar eru til dæmis innri slóðir (blob URLs), útsendar rásir, skyndiminni vafrans, vefkökur, veftákn (favicon), HTTP-auðkenningarhausar, fortengi tengla, localStorage, mediaSource-slóðir, OCSP-beiðnir, SharedWorkers og TLS setumiðar."> <!ENTITY torbutton.prefs.resist_fingerprinting "Breyta atriðum sem gera þig ólíkan öðrum notendum Tor-vafrans"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Hafðu hakað í þennan reit til að fela fyrir vefsvæðum atriði sem gætu verið einstök hjá þér, þar með talin atriði eins og upplýsingar um afköst tölvunnar, lyklaborðsuppsetningu, staðfærslu, staðsetningu uppsettra viðbóta, lista yfir uppsettar viðbætur, stöðu netkerfis, stærð og stefnu skjás, sértækan aðdrátt fyrir vefsvæði, studdar skráategundir, kerfisliti og getu varðandi WebGL."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Hafðu merkt í þennan reit til að fela fyrir vefsvæðum atriði sem gætu verið einstök hjá þér, þar með talin atriði eins og upplýsingar um afköst tölvunnar, lyklaborðsuppsetningu, staðfærslu, staðsetningu uppsettra viðbóta, lista yfir uppsettar viðbætur, stöðu netkerfis, stærð og stefnu skjás, sértækan aðdrátt fyrir vefsvæði, studdar skráategundir, kerfisliti og getu varðandi WebGL."> <!ENTITY torbutton.prefs.sec_caption "Öryggisstig"> -<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts."> +<!ENTITY torbutton.prefs.sec_caption_tooltip "Öryggisstillingasleðinn getur gert óvirka ýmsa þá eiginleika vafrans sem gætu gert vafrann viðkvæmari fyrir árásum hakkara."> <!ENTITY torbutton.prefs.sec_standard_label "Staðlað"> <!ENTITY torbutton.prefs.sec_standard_description "Allir eiginleikar Tor-vafrans og vefsvæðisins eru virkjaðir."> <!ENTITY torbutton.prefs.sec_safer_label "Öruggara"> @@ -46,6 +46,6 @@ <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript er sjálfgefið óvirkt á öllum vefsvæðum."> <!ENTITY torbutton.prefs.sec_limit_typography "Sumt letur og stærðfræðitákn eru óvirk."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Sumt letur, táknmyndir, myndir og stærðfræðitákn eru óvirk."> -<!ENTITY torbutton.prefs.sec_click_to_play_media "Hljóð og myndskeið (HTML5-gagnamiðlar) þarf að smella á til að spila."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "Hljóð og myndskeið (HTML5-gagnamiðla) þarf að smella á til að spila."> <!ENTITY torbutton.circuit_display.title "Tor-rás"> <!ENTITY torbutton.circuit_display.new_circuit "Ný rás fyrir þetta vefsvæði"> diff --git a/src/chrome/locale/is/torbutton.properties b/src/chrome/locale/is/torbutton.properties index 9d476492..d275d72c 100644 --- a/src/chrome/locale/is/torbutton.properties +++ b/src/chrome/locale/is/torbutton.properties @@ -5,10 +5,10 @@ torbutton.circuit_display.this_browser = Þessi vafri torbutton.circuit_display.relay = Relay torbutton.circuit_display.tor_bridge = Brú torbutton.circuit_display.unknown_country = Óþekkt land -torbutton.circuit_display.guard = Guard -torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.guard = Vörður (guard) +torbutton.circuit_display.guard_note = Varðarhnúturinn [Guard] breytist ekki endilega. torbutton.circuit_display.learn_more = Læra meira -torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. +torbutton.content_sizer.margin_tooltip = Tor-vafrinn setur inn þessa spássíu til að gera hæð og breidd gluggans minna einkennandi, og þar með að gera erfiðara að fylgjast með þér á netinu. torbutton.panel.tooltip.disabled = Smelltu til að virkja Tor torbutton.panel.tooltip.enabled = Smelltu til að afvirkja Tor torbutton.panel.label.disabled = Tor óvirkt @@ -17,24 +17,24 @@ extensions.torbutton(a)torproject.org.description = Torbutton útbýr hnapp til up torbutton.popup.external.title = Sækja utanaðkomandi skráartegund? torbutton.popup.external.app = Tor-vafrinn getur ekki birt þessa skrá. Þú verður að opna hana með öðru forriti.\n\n torbutton.popup.external.note = Sumar skráartegundir geta látið forrit tengjast netinu án þess að fara í gegnum Tor. -torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n +torbutton.popup.external.suggest = Til að vera örugg(ur), ættirðu einungis að opna sóttar skrár þegar netið er aftengt, eða með því að nota Tor Live CD keyrsludisk eins og Tails.\n torbutton.popup.launch = Ná í skrá torbutton.popup.cancel = Hætta við torbutton.popup.dontask = Hlaða sjálfkrafa inn skrám héðan í frá -torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? +torbutton.popup.no_newnym = Torbutton getur ekki gefið þér nýtt öruggt auðkenni. Hann er ekki með aðgang að Tor-stýrigáttinni.\n\nErt þú að keyra Tor-vafravöndulinn (browser bundle)? torbutton.security_settings.menu.title = Öryggisstillingar torbutton.title.prompt_torbrowser = Mikilvægar upplýsingar um Tor-hnappinn -torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. +torbutton.popup.prompt_torbrowser = Torbutton-hnappurinn virkar núna öðruvísi en áður: ekki er lengur hægt að slökkva á honum.\n\nVið gerðum þessa breytingu því það er ekki öruggt að nota Torbutton í vafra sem einnig er notaður fyrir vafur án Tor. Það voru allt of margar veilur sem ekki var hægt að laga á neinn annan hátt.\n\nEf þig langar til að halda áfram að nota Firefox eins og venjulega, þá ættirðu að henda Torbutton út og ná þér frekar í Tor-vafravöndulinn (browser bundle). Gagnaverndareiginleikar Tor-vafrans eru líka mikið betri en í Firefox, jafnvel þegar Firefox er notaður með Torbutton.\n\nTil að fjarlægja Torbutton, farðu þá í Verkfæri->Viðbætur->Viðbætur (enska: Tools->Addons->Extensions og smelltu á fjarlægingarhnappinn næst Torbutton-færslunni. torbutton.popup.short_torbrowser = Mikilvægar upplýsingar um Tor-hnappinn!\n\nTor-hnappurinn er núna alltaf virkur.\n\nSmelltu á Tor-hnappinn til að sjá nánar. torbutton.popup.confirm_plugins = Viðbætur eins og til dæmis Flash geta skaðað friðhelgi þína og gagnaleynd.\n\nÞær geta einnig farið framhjá Tor til að gefa upp staðsetningu þína og IP-vistfang.\n\nErtu viss um að þú viljir virkja viðbætur?\n\n torbutton.popup.never_ask_again = Ekki spyrja mig aftur torbutton.popup.confirm_newnym = Tor-vafrinn mun núna loka öllum flipum og gluggum. Allar setur á vefsvæðum munu tapast.\n\nÁ að endurræsa Tor-vafrann til að núllstilla auðkennið þitt?\n\n -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 = Með því að stækka Tor-vafragluggann gerir þú vefsvæðum mögulega kleift að mæla stærð skjásins þíns, sem aftur gerir kleift að einkenna þig. Við mælum með því að þú hafir glugga Tor-vafrans í upprunalegri sjálfgefinni stærð. # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? +canvas.siteprompt=Þetta vefsvæði (%S) reyndi að nálgast gögn um HTML5 myndflötinn, gögn sem hægt er að nota til að auðkenna þig.\n\nÆtti Tor-vafrinn að leyfa þessu vefsvæði að fá gögn um HTML5 myndflöt? canvas.notNow=Ekki núna canvas.notNowAccessKey=N canvas.allow=Leyfa í framtíðinni @@ -45,11 +45,11 @@ canvas.neverAccessKey=e # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. profileProblemTitle=Vandamál við %S snið -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. +profileReadOnly=Þú getur ekki keyrt %S af skrifvörðu kerfi. Afritaðu %S á einhvern annan stað áður en þú reynir að nota það. +profileReadOnlyMac=Þú getur ekki keyrt %S af skrifvörðu kerfi. Afritaðu %S á skjáborðið eða í forritamöppu áður en þú reynir að nota það. +profileAccessDenied=%S er ekki með heimildir til að fara inn í sniðið. Lagaðu aðgangsheimildir kerfisins og reyndu svo aftur. profileMigrationFailed=Yfirfærsla á fyrirliggjandi %S sniðinu þínu mistókst.\nNýjar stillingar verða notaðar. # .Onion Page Info prompt. Strings are kept here for ease of translation. -pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S) -pageInfo_OnionEncryption=Connection Encrypted (Onion Service) +pageInfo_OnionEncryptionWithBitsAndProtocol=Dulrituð tenging (Onion-þjónusta, %1$S, %2$S bita dulritunarlyklar, %3$S) +pageInfo_OnionEncryption=Dulrituð tenging (Onion-þjónusta) diff --git a/src/chrome/locale/it/aboutTor.dtd b/src/chrome/locale/it/aboutTor.dtd index b9687c45..f023c259 100644 --- a/src/chrome/locale/it/aboutTor.dtd +++ b/src/chrome/locale/it/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Ottieni le ultime info da Tor direttamente nella tua casella di posta elettronica."> <!ENTITY aboutTor.newsletter.link_text "Registrati alle Tor News."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: la Forza in Numeri"> + +<!ENTITY aboutTor.donationBanner.line2a "L'anonimato ama l'azienda."> +<!ENTITY aboutTor.donationBanner.line2b "Migliora i diritti universali dell'uomo."> +<!ENTITY aboutTor.donationBanner.line2c "Difendi la libertà."> +<!ENTITY aboutTor.donationBanner.line2d "Protegge la privacy di milioni."> +<!ENTITY aboutTor.donationBanner.line2e "Mantieni Tor forte."> +<!ENTITY aboutTor.donationBanner.line2f "Abbiamo bisogno del tuo supporto!"> + +<!ENTITY aboutTor.donationBanner.line3 "Dai oggi, e Mozilla ricambierà la tua donazione."> + +<!ENTITY aboutTor.donationBanner.buttonA "Dona Ora"> +<!ENTITY aboutTor.donationBanner.buttonB "Contami"> diff --git a/src/chrome/locale/ja/aboutTor.dtd b/src/chrome/locale/ja/aboutTor.dtd index db9195f7..8c573564 100644 --- a/src/chrome/locale/ja/aboutTor.dtd +++ b/src/chrome/locale/ja/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> +<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> +<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> + +<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/ko/aboutTor.dtd b/src/chrome/locale/ko/aboutTor.dtd index 74bc503e..8c8065a5 100644 --- a/src/chrome/locale/ko/aboutTor.dtd +++ b/src/chrome/locale/ko/aboutTor.dtd @@ -20,9 +20,23 @@ <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> <!ENTITY aboutTor.torbrowser_user_manual.label "Tor 브라우저 설명서"> -<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding."> +<!ENTITY aboutTor.tor_mission.label "Tor 프로젝트는 자유와 인권증진에 기여하는 US 501(c)(3) 비영리 단체입니다. 이는 무료로 이용 가능한 오픈 소스 익명성과 사생활 보호기술을 개발하고 그 무제한적 이용을 지원하여 과학적 공적 이해로 나아갑니다."> <!ENTITY aboutTor.getInvolved.label "참여 »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> <!ENTITY aboutTor.newsletter.tagline "최신의 Tor 뉴스를 받은 편지함에 곧장 받으십시오."> <!ENTITY aboutTor.newsletter.link_text "Tor 뉴스를 구독."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> +<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> +<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> + +<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/ko/browserOnboarding.properties b/src/chrome/locale/ko/browserOnboarding.properties index e2cad1ca..b3c9363b 100644 --- a/src/chrome/locale/ko/browserOnboarding.properties +++ b/src/chrome/locale/ko/browserOnboarding.properties @@ -2,10 +2,10 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -onboarding.tour-tor-welcome=Welcome -onboarding.tour-tor-welcome.title=You’re ready. +onboarding.tour-tor-welcome=환영합니다 +onboarding.tour-tor-welcome.title=준비됐습니다. onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. -onboarding.tour-tor-welcome.button=Start Now +onboarding.tour-tor-welcome.button=지금 시작 onboarding.tour-tor-privacy=사생활 onboarding.tour-tor-privacy.title=Snub trackers and snoopers. diff --git a/src/chrome/locale/nb/aboutTor.dtd b/src/chrome/locale/nb/aboutTor.dtd index 89bd5a7f..d5899000 100644 --- a/src/chrome/locale/nb/aboutTor.dtd +++ b/src/chrome/locale/nb/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Få de siste nyhetene fra Tor rett til innboksen din."> <!ENTITY aboutTor.newsletter.link_text "Registrer deg for Tor Nyheter."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> +<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> +<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> + +<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/nl/aboutTBUpdate.dtd b/src/chrome/locale/nl/aboutTBUpdate.dtd index 9f5cc50f..f780a834 100644 --- a/src/chrome/locale/nl/aboutTBUpdate.dtd +++ b/src/chrome/locale/nl/aboutTBUpdate.dtd @@ -5,6 +5,6 @@ <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Wijzigingslogboek:"> -<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> +<!ENTITY aboutTBUpdate.circuitDisplayHeading "Nieuw, Herontworpen Circuit Venster"> <!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> -<!ENTITY aboutTBUpdate.learnMore "Learn More"> +<!ENTITY aboutTBUpdate.learnMore "Meer info"> diff --git a/src/chrome/locale/nl/aboutTor.dtd b/src/chrome/locale/nl/aboutTor.dtd index cb8fd18f..4b462d6c 100644 --- a/src/chrome/locale/nl/aboutTor.dtd +++ b/src/chrome/locale/nl/aboutTor.dtd @@ -6,12 +6,12 @@ <!ENTITY aboutTor.title "Over Tor"> -<!ENTITY aboutTor.ready.label "Explore. Privately."> +<!ENTITY aboutTor.ready.label "Onderzoek. Privé."> <!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> <!ENTITY aboutTor.failure.label "Er ging iets mis!"> <!ENTITY aboutTor.failure2.label "Tor werkt niet in deze browser."> -<!ENTITY aboutTor.search.label "Search with DuckDuckGo"> +<!ENTITY aboutTor.search.label "Zoek met DuckDuckGo"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Vragen?"> @@ -21,8 +21,22 @@ <!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual"> <!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding."> -<!ENTITY aboutTor.getInvolved.label "Get Involved »"> +<!ENTITY aboutTor.getInvolved.label "Doe Mee"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> -<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> +<!ENTITY aboutTor.newsletter.tagline "Krijg het laatste Tor nieuws regelrecht in jouw inbox."> +<!ENTITY aboutTor.newsletter.link_text "Meld je aan voor Tor Nieuws."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Kracht in Nummers"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> +<!ENTITY aboutTor.donationBanner.line2b "Universele rechten van de mens bevorderen."> +<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2d "Bescherm de privacy van miljoenen."> +<!ENTITY aboutTor.donationBanner.line2e "Houdt Tor sterk."> +<!ENTITY aboutTor.donationBanner.line2f "We hebben jouw ondersteuning nodig!"> + +<!ENTITY aboutTor.donationBanner.line3 "Geef vandaag, en Mozilla geeft hetzelfde bedrag."> + +<!ENTITY aboutTor.donationBanner.buttonA "Geef Nu"> +<!ENTITY aboutTor.donationBanner.buttonB "Ik Doe Mee"> diff --git a/src/chrome/locale/nl/browserOnboarding.properties b/src/chrome/locale/nl/browserOnboarding.properties index 2e72b207..247eb89b 100644 --- a/src/chrome/locale/nl/browserOnboarding.properties +++ b/src/chrome/locale/nl/browserOnboarding.properties @@ -3,52 +3,52 @@ # vim: set sw=2 sts=2 ts=8 et: onboarding.tour-tor-welcome=Welkom -onboarding.tour-tor-welcome.title=You’re ready. +onboarding.tour-tor-welcome.title=Je bent klaar. onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. -onboarding.tour-tor-welcome.button=Start Now +onboarding.tour-tor-welcome.button=Start nu. onboarding.tour-tor-privacy=Privacy onboarding.tour-tor-privacy.title=Snub trackers and snoopers. onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. -onboarding.tour-tor-privacy.button=Go to Tor Network +onboarding.tour-tor-privacy.button=Ga naar het Tor Netwerk -onboarding.tour-tor-network=Tor Network -onboarding.tour-tor-network.title=Travel a decentralized network. +onboarding.tour-tor-network=Tor Netwerk +onboarding.tour-tor-network.title=Reis over een gedecentraliseerd netwerk. onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. -onboarding.tour-tor-network.button=Go to Circuit Display +onboarding.tour-tor-network.button=Ga naar het Circuit Venster -onboarding.tour-tor-circuit-display=Circuit Display -onboarding.tour-tor-circuit-display.title=See your path. -onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. -onboarding.tour-tor-circuit-display.button=See My Path +onboarding.tour-tor-circuit-display=Circuit Venster +onboarding.tour-tor-circuit-display.title=Zie jouw route. +onboarding.tour-tor-circuit-display.description=Voor elk domein dat je bezoekt wordt jouw verkeer omgeleid en vercijferd in een circuit over drie Tor omleidingen over de wereld. Geen website weet waar je verbinding vandaan maakt. Je kunt een nieuwe route aanvragen door te klikken op "Nieuw Circuit voor deze Site' in ons Circuit Venster. +onboarding.tour-tor-circuit-display.button=Zie Mijn Route onboarding.tour-tor-security=Beveiliging -onboarding.tour-tor-security.title=Choose your experience. +onboarding.tour-tor-security.title=Kies jouw ervaring. onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. -onboarding.tour-tor-security.button=Review Settings +onboarding.tour-tor-security.button=Herzie Instellingen -onboarding.tour-tor-expect-differences=Experience Tips -onboarding.tour-tor-expect-differences.title=Expect some differences. +onboarding.tour-tor-expect-differences=Ervaring tips +onboarding.tour-tor-expect-differences.title=Verwacht enige verschillen. onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-expect-differences.button=Zie de VGVn onboarding.tour-tor-onion-services=Onion Services -onboarding.tour-tor-onion-services.title=Be extra protected. +onboarding.tour-tor-onion-services.title=Wees extra beschermd. onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. onboarding.tour-tor-onion-services.button=Visit an Onion # Circuit Display onboarding. onboarding.tor-circuit-display.next=Volgende onboarding.tor-circuit-display.done=Klaar -onboarding.tor-circuit-display.one-of-three=1 of 3 -onboarding.tor-circuit-display.two-of-three=2 of 3 -onboarding.tor-circuit-display.three-of-three=3 of 3 +onboarding.tor-circuit-display.one-of-three=1 van 3 +onboarding.tor-circuit-display.two-of-three=2 van 3 +onboarding.tor-circuit-display.three-of-three=3 van 3 -onboarding.tor-circuit-display.intro.title=How do circuits work? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.title=Hoe werken circuits? +onboarding.tor-circuit-display.intro.msg=Circuits worden gemaakt van willekeurig toegekende omleidingen, die computers over de wereld zijn, ingesteld om Tor verkeer door te sturen. -onboarding.tor-circuit-display.diagram.title=Circuit Display +onboarding.tor-circuit-display.diagram.title=Circuit Venster onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? +onboarding.tor-circuit-display.new-circuit.title=Heb je een nieuw circuit nodig? onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. diff --git a/src/chrome/locale/nl/torbutton.properties b/src/chrome/locale/nl/torbutton.properties index 920916f5..b5639c69 100644 --- a/src/chrome/locale/nl/torbutton.properties +++ b/src/chrome/locale/nl/torbutton.properties @@ -5,7 +5,7 @@ torbutton.circuit_display.this_browser = Deze browser torbutton.circuit_display.relay = Relay torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Onbekend land -torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard = Bewaking torbutton.circuit_display.guard_note = Your [Guard] node may not change. torbutton.circuit_display.learn_more = Lees meer torbutton.content_sizer.margin_tooltip = Tor Browser voegt deze rand toe om de afmetingen van het venster minder uit de toon te laten vallen. Dit maakt het moeilijker om u online te volgen. diff --git a/src/chrome/locale/pl/aboutTor.dtd b/src/chrome/locale/pl/aboutTor.dtd index 3d531447..53d22a06 100644 --- a/src/chrome/locale/pl/aboutTor.dtd +++ b/src/chrome/locale/pl/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> +<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> +<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> + +<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd b/src/chrome/locale/pt-BR/aboutTor.dtd index 44435395..a90f3e1a 100644 --- a/src/chrome/locale/pt-BR/aboutTor.dtd +++ b/src/chrome/locale/pt-BR/aboutTor.dtd @@ -6,16 +6,16 @@ <!ENTITY aboutTor.title "Sobre Tor"> -<!ENTITY aboutTor.ready.label "Explorar. Em particular."> +<!ENTITY aboutTor.ready.label "Navegar. Com privacidade."> <!ENTITY aboutTor.ready2.label "Você está pronto para a maior experiência de navegação privada do mundo."> <!ENTITY aboutTor.failure.label "Alguma coisa deu errado!"> <!ENTITY aboutTor.failure2.label "Tor não está funcionando neste navegador. "> -<!ENTITY aboutTor.search.label "Pesquise com DuckDuckGo"> +<!ENTITY aboutTor.search.label "Pesquisar com DuckDuckGo"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Perguntas?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Veja nosso Manual do Navegador Tor"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Consulte nosso Manual do Navegador Tor »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> <!ENTITY aboutTor.torbrowser_user_manual.label "Manual do Navegador Tor"> @@ -25,5 +25,19 @@ "> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Receba as últimas novidades do Tor diretamente na sua caixa de e-mail."> -<!ENTITY aboutTor.newsletter.link_text "Inscreva-se para novidades Tor"> +<!ENTITY aboutTor.newsletter.tagline "Receba as últimas notícias do Tor diretamente na sua caixa de e-mail."> +<!ENTITY aboutTor.newsletter.link_text "Inscreva-se para receber Notícias do Tor."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Nossa Força em Números"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonimidade adora companhia "> +<!ENTITY aboutTor.donationBanner.line2b "Avançar os direitos humanos universais."> +<!ENTITY aboutTor.donationBanner.line2c "Defender a liberdade."> +<!ENTITY aboutTor.donationBanner.line2d "Proteger a privacidade de milhões de pessoas."> +<!ENTITY aboutTor.donationBanner.line2e "Manter a força do Tor."> +<!ENTITY aboutTor.donationBanner.line2f "Precisamos do seu apoio!"> + +<!ENTITY aboutTor.donationBanner.line3 "Doe hoje, e a Mozilla duplicará a sua doação."> + +<!ENTITY aboutTor.donationBanner.buttonA "Doar Agora"> +<!ENTITY aboutTor.donationBanner.buttonB "Estou dentro"> diff --git a/src/chrome/locale/ru/aboutDialog.dtd b/src/chrome/locale/ru/aboutDialog.dtd index 369b0534..849a5063 100644 --- a/src/chrome/locale/ru/aboutDialog.dtd +++ b/src/chrome/locale/ru/aboutDialog.dtd @@ -1,7 +1,7 @@ <!ENTITY project.start "Разработано &brandShortName;">  <!ENTITY project.tpoLink "&vendorShortName;"> -<!ENTITY project.end ", проект, созданный, чтобы защитить вашу конфиденциальность и свободу в сети."> +<!ENTITY project.end ", некоммерческий проект для защиты приватности и других свобод в сети."> <!ENTITY help.start "Желаете помочь?">  diff --git a/src/chrome/locale/ru/aboutTBUpdate.dtd b/src/chrome/locale/ru/aboutTBUpdate.dtd index 81d607ca..b246094d 100644 --- a/src/chrome/locale/ru/aboutTBUpdate.dtd +++ b/src/chrome/locale/ru/aboutTBUpdate.dtd @@ -1,10 +1,10 @@ -<!ENTITY aboutTBUpdate.title "Обновление браузера Tor"> +<!ENTITY aboutTBUpdate.title "Обновление Tor Browser"> <!ENTITY aboutTBUpdate.updated "Tor Browser обновлен."> -<!ENTITY aboutTBUpdate.linkPrefix "Чтобы получить наиболее свежую информацию об этом выпуске,"> -<!ENTITY aboutTBUpdate.linkLabel "посетите наш вебсайт"> +<!ENTITY aboutTBUpdate.linkPrefix "Самая свежая информация об этой версии — "> +<!ENTITY aboutTBUpdate.linkLabel "на нашем сайте"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Журнал изменений:"> -<!ENTITY aboutTBUpdate.circuitDisplayHeading "Новая, измененная Схема индикации"> -<!ENTITY aboutTBUpdate.circuitDisplayDescription "Схема индикации Tor была перемещена и улучшена! Нажмите на сайт кнопка идентификации (расположенную в левой части строки URL), чтобы увидеть новый вид схемы."> +<!ENTITY aboutTBUpdate.circuitDisplayHeading "Цепочка Tor отображается по-новому"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "Цепочка узлов Tor теперь имеет другой, улучшенный вид. Нажмите на значок слева от адреса сайта, чтобы увидеть цепочку."> <!ENTITY aboutTBUpdate.learnMore "Подробнее"> diff --git a/src/chrome/locale/ru/aboutTor.dtd b/src/chrome/locale/ru/aboutTor.dtd index 71c4920c..30da9663 100644 --- a/src/chrome/locale/ru/aboutTor.dtd +++ b/src/chrome/locale/ru/aboutTor.dtd @@ -6,8 +6,8 @@ <!ENTITY aboutTor.title "О проекте Tor"> -<!ENTITY aboutTor.ready.label "Исследование. Конфиденциальность."> -<!ENTITY aboutTor.ready2.label "Вы готовы к самому конфиденциальному просмотру в мире."> +<!ENTITY aboutTor.ready.label "Исследуйте. Приватно."> +<!ENTITY aboutTor.ready2.label "Вы готовы к самому приватному просмотру веб-страниц в мире."> <!ENTITY aboutTor.failure.label "Что-то пошло не так!"> <!ENTITY aboutTor.failure2.label "Tor не работает в этом браузере."> @@ -15,10 +15,10 @@ <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Вопросы?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Ознакомьтесь с руководством по браузеру Тоr »"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Ознакомьтесь с руководством Тоr Browser »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "М"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Руководство по браузеру Tor"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Руководство по Tor Browser"> <!ENTITY aboutTor.tor_mission.label "Проект Tor является некоммерческой организацией США со статусом 501(c)(3), продвигающей права человека и свободы путем создания и развертывания технологий анонимности и конфиденциальности с открытым исходным кодом, поддержки их неограниченной доступности и использования, а также содействия их научному и популярному пониманию."> <!ENTITY aboutTor.getInvolved.label "Присоединяйтесь »"> @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Получайте последние новости Tor прямо на ваш почтовый ящик."> <!ENTITY aboutTor.newsletter.link_text "Подпишитесь на новости Tor."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Сила в цифрах"> + +<!ENTITY aboutTor.donationBanner.line2a "Анонимность уважает компании."> +<!ENTITY aboutTor.donationBanner.line2b "Продвижение всеобщих прав человека."> +<!ENTITY aboutTor.donationBanner.line2c "Встаньте на свободу."> +<!ENTITY aboutTor.donationBanner.line2d "Обеспечиваем конфиденциальность миллионам людей."> +<!ENTITY aboutTor.donationBanner.line2e "Сохраните Tor сильным."> +<!ENTITY aboutTor.donationBanner.line2f "Нам нужна твоя поддержка!"> + +<!ENTITY aboutTor.donationBanner.line3 "Пожертвуйте сегодня и Mozilla удвоит Ваше пожертвование."> + +<!ENTITY aboutTor.donationBanner.buttonA "Пожертвовать"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/ru/brand.dtd b/src/chrome/locale/ru/brand.dtd index e7e0a5ec..416dcd8e 100644 --- a/src/chrome/locale/ru/brand.dtd +++ b/src/chrome/locale/ru/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShorterName "Браузер Tor"> +<!ENTITY brandShorterName "Tor Browser"> <!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Проект Tor"> diff --git a/src/chrome/locale/ru/browserOnboarding.properties b/src/chrome/locale/ru/browserOnboarding.properties index 678da90e..1833487f 100644 --- a/src/chrome/locale/ru/browserOnboarding.properties +++ b/src/chrome/locale/ru/browserOnboarding.properties @@ -4,7 +4,7 @@ onboarding.tour-tor-welcome=Добро пожаловать onboarding.tour-tor-welcome.title=Вы готовы. -onboarding.tour-tor-welcome.description=Tor Browser предоставляет высочайший стандарт приватности и безопасности при просмотре сайтов. Теперь вы защищены от слежки, наблюдения и цензуры. Сейчас покажем вам, что к чему. +onboarding.tour-tor-welcome.description=Браузер Tor предоставляет высочайший стандарт приватности и безопасности при просмотре сайтов. Теперь вы защищены от отслеживания, наблюдения и цензуры. Небольшое введение покажет вам как. onboarding.tour-tor-welcome.button=Запустить onboarding.tour-tor-privacy=Приватность @@ -14,41 +14,41 @@ onboarding.tour-tor-privacy.button=Перейти в Сеть Tor onboarding.tour-tor-network=Сеть Tor onboarding.tour-tor-network.title=Перемещайтесь по децентрализованной сети. -onboarding.tour-tor-network.description=Tor Browser подключает вас к сети Tor, поддерживаемая волонтерами со всего мира. В отличии от VPN, здесь исключены возможные слабые звенья или централизованные организации, которым вам необходимо довериться для использования интернета. -onboarding.tour-tor-network.button=Перейти в Просмотр Цепочки +onboarding.tour-tor-network.description=Tor Browser подключает вас к сети Tor, которую поддерживают волонтеры со всего мира. В отличие от VPN здесь нет какого-то одного узла, отказ которого вызовет сбой всей системы, или централизованного сервиса, которому придется довериться, чтобы приватно использовать интернет. +onboarding.tour-tor-network.button=Посмотреть цепочку -onboarding.tour-tor-circuit-display=Просмотр Цепочки +onboarding.tour-tor-circuit-display=Просмотр цепочки onboarding.tour-tor-circuit-display.title=Ваша цепочка. onboarding.tour-tor-circuit-display.description=Для каждого посещаемого вами домена ваш трафик передается и шифруется в цепочке через три ретранслятора Tor, разбросанных по всему миру. Ни одному вебсайту недоступно ваша точка подключения сети. Вы можете запросить новую цепочку, нажав на ‘Новая Цепочка для этого сайта’ в ‘Просмотре Цепочки’ . -onboarding.tour-tor-circuit-display.button=See My Path +onboarding.tour-tor-circuit-display.button=Ваш цикл onboarding.tour-tor-security=Безопасность onboarding.tour-tor-security.title=Choose your experience. -onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. -onboarding.tour-tor-security.button=Review Settings +onboarding.tour-tor-security.description=Мы также предоставляем вам дополнительные настройки для повышения безопасности вашего браузера. Наши Параметры Безопасности позволяют блокировать элементы, которые могут быть использованы для атаки вашего компьютера. Нажмите ниже, чтобы посмотреть, что делают разные функции. +onboarding.tour-tor-security.button=Настройки Просмотра -onboarding.tour-tor-expect-differences=Experience Tips -onboarding.tour-tor-expect-differences.title=Expect some differences. -onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-expect-differences=Рекомендации +onboarding.tour-tor-expect-differences.title=Ждите небольших различий. +onboarding.tour-tor-expect-differences.description=Со всеми функциями безопасности и конфиденциальности, предоставляемыми Tor, ваш просмотр интернета может быть немного другим. Скорость может быть немного медленнее, и в зависимости от уровня безопасности некоторые элементы могут не работать или не загружаться. Вас также могут попросить доказать, что вы человек, а не робот. +onboarding.tour-tor-expect-differences.button=Посмотреть FAQ onboarding.tour-tor-onion-services=Onion-сервисы -onboarding.tour-tor-onion-services.title=Be extra protected. -onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. -onboarding.tour-tor-onion-services.button=Visit an Onion +onboarding.tour-tor-onion-services.title=Станьте особенно защищены. +onboarding.tour-tor-onion-services.description=Onion Services - это сайты, которые заканчиваются на .onion, они обеспечивают дополнительную защиту владельцам и посетителям, предоставляя дополнительные гарантии против цензуры. Onion Services позволяют любому анонимно предоставлять контент и услуги. Нажмите ниже, чтобы посетить Onion сайт DuckDuckGo. +onboarding.tour-tor-onion-services.button=Посетите Onion # Circuit Display onboarding. onboarding.tor-circuit-display.next=Вперёд onboarding.tor-circuit-display.done=Готово -onboarding.tor-circuit-display.one-of-three=1 of 3 -onboarding.tor-circuit-display.two-of-three=2 of 3 -onboarding.tor-circuit-display.three-of-three=3 of 3 +onboarding.tor-circuit-display.one-of-three=1 из 3 +onboarding.tor-circuit-display.two-of-three=2 из 3 +onboarding.tor-circuit-display.three-of-three=3 из 3 -onboarding.tor-circuit-display.intro.title=How do circuits work? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.title=Как работает цикл? +onboarding.tor-circuit-display.intro.msg=Цикл состоит из случайно назначенных ретрансляторов, которые являются компьютерами по всему миру, сконфигурированными для пересылки трафика Tor. Цикл делает ваш браузер безопасным и позволяет подключаться к .onion сайтам. onboarding.tor-circuit-display.diagram.title=Просмотр Цепочки -onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. +onboarding.tor-circuit-display.diagram.msg=На этой диаграмме показаны ретрансляторы, которые составляют цикл для этого веб-сайта. Чтобы предотвратить привязку активности на разных сайтах, каждый веб-сайт получает другой цикл. -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? -onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. +onboarding.tor-circuit-display.new-circuit.title=Нуждаетесь в новом цикле? +onboarding.tor-circuit-display.new-circuit.msg=Если вы не можете подключиться к веб-сайту, который вы пытаетесь посетить, или он не загружается должным образом, вы можете использовать эту кнопку, чтобы перезагрузить сайт с новым циклом. diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd index cae369e4..26dd7455 100644 --- a/src/chrome/locale/ru/torbutton.dtd +++ b/src/chrome/locale/ru/torbutton.dtd @@ -13,7 +13,7 @@ <!ENTITY torbutton.button.tooltip "Нажмите, чтобы инициализировать Torbutton"> <!ENTITY torbutton.prefs.security_settings "Настройки безопасности Tor Browser"> <!ENTITY torbutton.prefs.restore_defaults "Восстановить значения по умолчанию"> -<!ENTITY torbutton.prefs.custom_warning "Ваши настройки браузера, привели к необычным параметрам безопасности. По соображениям безопасности и конфиденциальности, мы рекомендуем вам выбрать один из уровней безопасности по умолчанию."> +<!ENTITY torbutton.prefs.custom_warning "Ваши настройки браузера привели к необычным параметрам безопасности. По соображениям безопасности и приватности мы рекомендуем выбрать один из уровней безопасности по умолчанию."> <!ENTITY torbutton.cookiedialog.title "Управление защитой куки-файлов"> <!ENTITY torbutton.cookiedialog.lockCol "Защищено"> <!ENTITY torbutton.cookiedialog.domainCol "Ведущий узел"> diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv/aboutTor.dtd index b357efc1..94cea14a 100644 --- a/src/chrome/locale/sv/aboutTor.dtd +++ b/src/chrome/locale/sv/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> +<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> +<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> + +<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd index ce8761f2..e4a2443d 100644 --- a/src/chrome/locale/tr/aboutTor.dtd +++ b/src/chrome/locale/tr/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Tor ile ilgili son gelişmeler doğrudan e-posta kutunuza gelsin."> <!ENTITY aboutTor.newsletter.link_text "Tor Haber Bültenine Abone Olun"> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Birlikten Kuvvet Doğar"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonimlik birlikteliği sever."> +<!ENTITY aboutTor.donationBanner.line2b "Evrensel insan haklarını geliştir."> +<!ENTITY aboutTor.donationBanner.line2c "Özgürlüğü savun."> +<!ENTITY aboutTor.donationBanner.line2d "Milyonların gizliliğini koru."> +<!ENTITY aboutTor.donationBanner.line2e "Tor uygulamasının gücünü koru."> +<!ENTITY aboutTor.donationBanner.line2f "Desteğinize ihtiyacımız var!"> + +<!ENTITY aboutTor.donationBanner.line3 "Bugün yaptığınız her bağış kadar Mozilla da bağış yapacak."> + +<!ENTITY aboutTor.donationBanner.buttonA "Şimdi Bağış Yapın"> +<!ENTITY aboutTor.donationBanner.buttonB "Ben de Varım"> diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd index d8eb7323..b087f9ea 100644 --- a/src/chrome/locale/vi/aboutTor.dtd +++ b/src/chrome/locale/vi/aboutTor.dtd @@ -6,23 +6,37 @@ <!ENTITY aboutTor.title "Thông tin về Tor"> -<!ENTITY aboutTor.ready.label "Explore. Privately."> -<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> -<!ENTITY aboutTor.failure.label "Có gì đó đã sai!"> +<!ENTITY aboutTor.ready.label "Khám phá. Riêng tư."> +<!ENTITY aboutTor.ready2.label "Bạn đã sẵn sàng cho trải nghiệm duyệt web riêng tư nhất trên thế giới."> +<!ENTITY aboutTor.failure.label "Có Lỗi Xảy Ra!"> <!ENTITY aboutTor.failure2.label "Tor không hoạt động trên trình duyệt này."> -<!ENTITY aboutTor.search.label "Search with DuckDuckGo"> +<!ENTITY aboutTor.search.label "Tìm kiếm với DuckDuckGo"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Những câu hỏi?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Xem qua Hướng dẫn Trình duyệt Tor »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Hướng dẫn Trình duyệt Tor"> -<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding."> -<!ENTITY aboutTor.getInvolved.label "Get Involved »"> +<!ENTITY aboutTor.tor_mission.label "The Tor Project là một tổ chức phi lợi nhuận US 501(c)(3) của Hoa Kỳ thúc đẩy quyền con người và tự do bằng cách tạo và triển khai các công nghệ bảo mật và ẩn danh miễn phí và mã nguồn mở, hỗ trợ tính sẵn có và sử dụng không hạn chế của chúng và nâng cao hiểu biết khoa học và phổ biến của họ."> +<!ENTITY aboutTor.getInvolved.label "Tham gia »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> -<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> +<!ENTITY aboutTor.newsletter.tagline "Nhận thông tin mói nhất từ Tor vào hộp thư của bạn."> +<!ENTITY aboutTor.newsletter.link_text "Đăng kí nhận tin tức từ Tor."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> +<!ENTITY aboutTor.donationBanner.line2b "Nâng cao nhân quyền phổ thông."> +<!ENTITY aboutTor.donationBanner.line2c "Đứng lên vì tự do."> +<!ENTITY aboutTor.donationBanner.line2d "Bảo vệ sự riêng tư của hàng triệu người."> +<!ENTITY aboutTor.donationBanner.line2e "Giữ cho Tor trở nên mạnh mẽ."> +<!ENTITY aboutTor.donationBanner.line2f "Chúng toi cần sự hỗ trợ của bạn!"> + +<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donate Ngay bây giờ"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd index 36e9b9a5..502cbb8c 100644 --- a/src/chrome/locale/zh-CN/aboutTor.dtd +++ b/src/chrome/locale/zh-CN/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "通过邮件获取 Tor 的最新消息。"> <!ENTITY aboutTor.newsletter.link_text "注册 Tor 新闻列表"> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> +<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> +<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> + +<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index aa7f8619..e9ea7dbe 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -48,4 +48,4 @@ <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "一些字体，图标，数学符号与图片被禁用。"> <!ENTITY torbutton.prefs.sec_click_to_play_media "点击播放音频或视频（HTML5 媒体）。"> <!ENTITY torbutton.circuit_display.title "tor链路"> -<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> +<!ENTITY torbutton.circuit_display.new_circuit "为此站点使用新线路"> diff --git a/src/chrome/locale/zh-TW/aboutTor.dtd b/src/chrome/locale/zh-TW/aboutTor.dtd index 0e049b1b..b08ffa26 100644 --- a/src/chrome/locale/zh-TW/aboutTor.dtd +++ b/src/chrome/locale/zh-TW/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "將 Tor 的最新消息直接傳送到您的收件匣。"> <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> +<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> +<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.line2f "我們需要您的支持"> + +<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "立刻捐款"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/zh-TW/torbutton.dtd b/src/chrome/locale/zh-TW/torbutton.dtd index 0ddbd823..8fe54733 100644 --- a/src/chrome/locale/zh-TW/torbutton.dtd +++ b/src/chrome/locale/zh-TW/torbutton.dtd @@ -2,11 +2,11 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "建立新的洋蔥路由迴路來連接上此網站"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "安全設定中..."> +<!ENTITY torbutton.context_menu.preferences "安全設定..."> <!ENTITY torbutton.context_menu.preferences.key "S"> -<!ENTITY torbutton.context_menu.networksettings "洋蔥路由網路設定"> +<!ENTITY torbutton.context_menu.networksettings "洋蔥路由網路設定..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> -<!ENTITY torbutton.context_menu.downloadUpdate "檢查洋蔥路由瀏覽器更新...."> +<!ENTITY torbutton.context_menu.downloadUpdate "檢查洋蔥路由瀏覽器更新…"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie 保護"> <!ENTITY torbutton.context_menu.cookieProtections.key "C">

1 0

[torbutton/master] Update translations
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 9e5c4406e6458ae65e5a8ebb60c11fdd8cb527ea Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 18 07:13:01 2018 +0000 Update translations --- src/chrome/locale/ar/aboutTBUpdate.dtd | 2 +- src/chrome/locale/ar/aboutTor.dtd | 26 ++++++-- src/chrome/locale/bn-BD/aboutTor.dtd | 14 ++++ src/chrome/locale/ca/aboutTor.dtd | 14 ++++ src/chrome/locale/da/aboutTor.dtd | 14 ++++ src/chrome/locale/da/browserOnboarding.properties | 16 ++--- src/chrome/locale/da/torbutton.dtd | 2 +- src/chrome/locale/de/aboutDialog.dtd | 8 +-- src/chrome/locale/de/aboutTBUpdate.dtd | 2 +- src/chrome/locale/de/aboutTor.dtd | 28 ++++++-- src/chrome/locale/de/brand.dtd | 4 +- src/chrome/locale/de/brand.properties | 4 +- src/chrome/locale/de/browserOnboarding.properties | 12 ++-- src/chrome/locale/de/torbutton.dtd | 12 ++-- src/chrome/locale/de/torbutton.properties | 32 ++++----- src/chrome/locale/es/aboutTBUpdate.dtd | 4 +- src/chrome/locale/es/aboutTor.dtd | 14 ++++ src/chrome/locale/es/browserOnboarding.properties | 34 +++++----- src/chrome/locale/es/torbutton.properties | 4 +- src/chrome/locale/eu/aboutTor.dtd | 14 ++++ src/chrome/locale/fa/aboutTBUpdate.dtd | 2 +- src/chrome/locale/fa/aboutTor.dtd | 32 ++++++--- src/chrome/locale/fa/torbutton.dtd | 4 +- src/chrome/locale/fr/aboutTBUpdate.dtd | 2 +- src/chrome/locale/fr/aboutTor.dtd | 14 ++++ src/chrome/locale/fr/browserOnboarding.properties | 70 ++++++++++---------- src/chrome/locale/fr/torbutton.properties | 6 +- src/chrome/locale/ga/aboutTor.dtd | 14 ++++ src/chrome/locale/he/aboutDialog.dtd | 4 +- src/chrome/locale/he/aboutTor.dtd | 18 ++++- src/chrome/locale/he/browserOnboarding.properties | 14 ++-- src/chrome/locale/he/torbutton.dtd | 2 +- src/chrome/locale/he/torbutton.properties | 2 +- src/chrome/locale/id/aboutTor.dtd | 14 ++++ src/chrome/locale/is/aboutTBUpdate.dtd | 4 +- src/chrome/locale/is/aboutTor.dtd | 14 ++++ src/chrome/locale/is/browserOnboarding.properties | 80 +++++++++++------------ src/chrome/locale/is/torbutton.dtd | 8 +-- src/chrome/locale/is/torbutton.properties | 26 ++++---- src/chrome/locale/it/aboutTor.dtd | 14 ++++ src/chrome/locale/ja/aboutTor.dtd | 14 ++++ src/chrome/locale/ko/aboutTor.dtd | 16 ++++- src/chrome/locale/ko/browserOnboarding.properties | 6 +- src/chrome/locale/nb/aboutTor.dtd | 14 ++++ src/chrome/locale/nl/aboutTBUpdate.dtd | 4 +- src/chrome/locale/nl/aboutTor.dtd | 24 +++++-- src/chrome/locale/nl/browserOnboarding.properties | 46 ++++++------- src/chrome/locale/nl/torbutton.properties | 2 +- src/chrome/locale/pl/aboutTor.dtd | 14 ++++ src/chrome/locale/pt-BR/aboutTor.dtd | 24 +++++-- src/chrome/locale/ru/aboutDialog.dtd | 2 +- src/chrome/locale/ru/aboutTBUpdate.dtd | 10 +-- src/chrome/locale/ru/aboutTor.dtd | 22 +++++-- src/chrome/locale/ru/brand.dtd | 2 +- src/chrome/locale/ru/browserOnboarding.properties | 44 ++++++------- src/chrome/locale/ru/torbutton.dtd | 2 +- src/chrome/locale/sv/aboutTor.dtd | 14 ++++ src/chrome/locale/tr/aboutTor.dtd | 14 ++++ src/chrome/locale/vi/aboutTor.dtd | 34 +++++++--- src/chrome/locale/zh-CN/aboutTor.dtd | 14 ++++ src/chrome/locale/zh-CN/torbutton.dtd | 2 +- src/chrome/locale/zh-TW/aboutTor.dtd | 14 ++++ src/chrome/locale/zh-TW/torbutton.dtd | 6 +- 63 files changed, 656 insertions(+), 292 deletions(-) diff --git a/src/chrome/locale/ar/aboutTBUpdate.dtd b/src/chrome/locale/ar/aboutTBUpdate.dtd index c4e08b80..eee3db56 100644 --- a/src/chrome/locale/ar/aboutTBUpdate.dtd +++ b/src/chrome/locale/ar/aboutTBUpdate.dtd @@ -5,6 +5,6 @@ <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "سجل التغييرات:"> -<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> +<!ENTITY aboutTBUpdate.circuitDisplayHeading "تصميم جديد لطريقة عرض الدوائر"> <!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> <!ENTITY aboutTBUpdate.learnMore "إعرف/ي أكثر "> diff --git a/src/chrome/locale/ar/aboutTor.dtd b/src/chrome/locale/ar/aboutTor.dtd index 2c80fc4d..183d47f8 100644 --- a/src/chrome/locale/ar/aboutTor.dtd +++ b/src/chrome/locale/ar/aboutTor.dtd @@ -7,22 +7,36 @@ <!ENTITY aboutTor.title "عن تور"> <!ENTITY aboutTor.ready.label "تصفح بهوية خفية"> -<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> +<!ENTITY aboutTor.ready2.label "أنت جاهز الآن لتجربة التصفح الأكثر خصوصية في العالم."> <!ENTITY aboutTor.failure.label "حدث خطأ ما!"> <!ENTITY aboutTor.failure2.label "تور لا يعمل في هذا المتصفح."> -<!ENTITY aboutTor.search.label "البحث بواسطة داك داك غو"> +<!ENTITY aboutTor.search.label "ابحث بواسطة داك داك غو"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "أية أسئلة؟"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "إطّلع على دليلنا باستخدام متصفح تور "> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "اطّلع على دليل استخدام متصفح تور ">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "س"> <!ENTITY aboutTor.torbrowser_user_manual.label "دليل استخدام متصفّح تور"> -<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding."> +<!ENTITY aboutTor.tor_mission.label "مشرع تور منظمة غير ربحية أميريكية خاضعة لقانون 501(c)(3)، تعمل على تقدم حقوق الإنسان وحرياته، عبر إنشاء واستخدام تقنيات حرة ومفتوحة المصدر للمجهولية والخصوصية، وتدعم توفرها واستخدامها دون قيود، وتدعم تقدم الفهم العلمي والشعبي لهذه التقنيات."> <!ENTITY aboutTor.getInvolved.label "شارك"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> -<!ENTITY aboutTor.newsletter.link_text "اشترك للحصول على مستجدات تور."> +<!ENTITY aboutTor.newsletter.tagline "احصل على آخر أخبار تور مباشرة على بريدك"> +<!ENTITY aboutTor.newsletter.link_text "اشترك للحصول على أخبار تور."> + +<!ENTITY aboutTor.donationBanner.line1 "تور: نقاط القوة"> + +<!ENTITY aboutTor.donationBanner.line2a "المجهولية تحتاج لصحبة."> +<!ENTITY aboutTor.donationBanner.line2b "ساعد في تقدم حقوق الإنسان."> +<!ENTITY aboutTor.donationBanner.line2c "انتصر للحرية."> +<!ENTITY aboutTor.donationBanner.line2d "احم خصوصية الملايين."> +<!ENTITY aboutTor.donationBanner.line2e "حافظ على قوة تور."> +<!ENTITY aboutTor.donationBanner.line2f "نحتاج دعمك."> + +<!ENTITY aboutTor.donationBanner.line3 "تبرع اليوم، وستجاريك موزيلا وتبرع بنفس المبلغ."> + +<!ENTITY aboutTor.donationBanner.buttonA "تبرع الآن"> +<!ENTITY aboutTor.donationBanner.buttonB "سأشارك"> diff --git a/src/chrome/locale/bn-BD/aboutTor.dtd b/src/chrome/locale/bn-BD/aboutTor.dtd index 0896f075..a7458617 100644 --- a/src/chrome/locale/bn-BD/aboutTor.dtd +++ b/src/chrome/locale/bn-BD/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "টর থেকে সর্বশেষ খবর নিন সোজা আপনার ইনবক্সে ।"> <!ENTITY aboutTor.newsletter.link_text "টর নিউজ-এর জন্য সাইন আপ করুন ।"> + +<!ENTITY aboutTor.donationBanner.line1 "টর: সংখ্যাই শক্তি"> + +<!ENTITY aboutTor.donationBanner.line2a "ছদ্মনাম বেশী ব্যবহারকারীর মধ্যে কার্যকরী।"> +<!ENTITY aboutTor.donationBanner.line2b "সার্বজনীন মানবাধিকারকে এগিয়ে নিন। "> +<!ENTITY aboutTor.donationBanner.line2c "স্বাধীনতার জন্য এগিয়ে আসুন "> +<!ENTITY aboutTor.donationBanner.line2d "লাখো লোকের ব্যক্তিগত গোপনীয়তা রক্ষা করুন। "> +<!ENTITY aboutTor.donationBanner.line2e "টরকে শক্তিশালী রাখুন। "> +<!ENTITY aboutTor.donationBanner.line2f "আপনাদের সাহায্য দরকার! "> + +<!ENTITY aboutTor.donationBanner.line3 "অর্থ সাহায্য করুন, এবং মজিলা সমপরিমাণ সাহায্য করবে। "> + +<!ENTITY aboutTor.donationBanner.buttonA "এখুনি দান করুন! "> +<!ENTITY aboutTor.donationBanner.buttonB "আমাকেও সাথে নিন"> diff --git a/src/chrome/locale/ca/aboutTor.dtd b/src/chrome/locale/ca/aboutTor.dtd index ca8aee1c..91132da8 100644 --- a/src/chrome/locale/ca/aboutTor.dtd +++ b/src/chrome/locale/ca/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Obteniu les darreres novetats de Tor directament a la safata d'entrada."> <!ENTITY aboutTor.newsletter.link_text "Inscriviu-vos a les noticies de Tor."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> +<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> +<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> + +<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/da/aboutTor.dtd b/src/chrome/locale/da/aboutTor.dtd index 902a84fa..7a2df3b0 100644 --- a/src/chrome/locale/da/aboutTor.dtd +++ b/src/chrome/locale/da/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Få de seneste nyheder fra Tor direkte i din indbakke."> <!ENTITY aboutTor.newsletter.link_text "Tilmeld Tor-nyheder."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Styrke i antal"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymitet elsker selskab."> +<!ENTITY aboutTor.donationBanner.line2b "Avancerede universelle menneskerettigheder."> +<!ENTITY aboutTor.donationBanner.line2c "Slå et slag for frihed."> +<!ENTITY aboutTor.donationBanner.line2d "Beskyt privatlivet af millioner."> +<!ENTITY aboutTor.donationBanner.line2e "Hold Tor stærk."> +<!ENTITY aboutTor.donationBanner.line2f "Vi har brug for din støtte!"> + +<!ENTITY aboutTor.donationBanner.line3 "Giv i dag, og Mozilla vil matche din donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donér nu"> +<!ENTITY aboutTor.donationBanner.buttonB "Jeg er med"> diff --git a/src/chrome/locale/da/browserOnboarding.properties b/src/chrome/locale/da/browserOnboarding.properties index 7ebc3b54..dd257df4 100644 --- a/src/chrome/locale/da/browserOnboarding.properties +++ b/src/chrome/locale/da/browserOnboarding.properties @@ -9,32 +9,32 @@ onboarding.tour-tor-welcome.button=Start nu onboarding.tour-tor-privacy=Privatliv onboarding.tour-tor-privacy.title=Sæt en stopper for trackere og snoopers. -onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. +onboarding.tour-tor-privacy.description=Tor Browser isolerer cookies og sletter din browserhistorik efter din session. Ændringerne sikre dit privatliv, og sikkerheden beskyttes i browseren. Klik på ‘Tor-netværk’ for at lære hvordan vi beskytter dig på netværksniveauet. onboarding.tour-tor-privacy.button=Gå til Tor-netværk onboarding.tour-tor-network=Tor-netværk onboarding.tour-tor-network.title=Rejs på et decentraliseret netværk. -onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. +onboarding.tour-tor-network.description=Tor Browser opretter forbindelse for dig til Tor-netværket, som køres af tusindvis af frivillige verden over. I modsætning til en VPN, er der ikke ét punkt som kan få det til at fejle, eller centraliseret indgang som du skal have tillid til for at bruge internettet privat. onboarding.tour-tor-network.button=Gå til kredsløb-visning onboarding.tour-tor-circuit-display=Kredsløb-visning onboarding.tour-tor-circuit-display.title=Se din sti. -onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. +onboarding.tour-tor-circuit-display.description=Hver gang du besøger et domæne, videresendes og krypteres din trafik i et kredsløb hen over tre Tor-relæ verden over. Webstederne kan ikke se hvor du opretter forbindelse fra. Du kan anmode om et nyt kredsløb ved at klikke på ‘Nyt kredsløb til dette sted’ på vores kredsløb-display. onboarding.tour-tor-circuit-display.button=Se min sti onboarding.tour-tor-security=Sikkerhed onboarding.tour-tor-security.title=Vælg din oplevelse. -onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. +onboarding.tour-tor-security.description=Vi giver dig også yderligere sikkerhedsindstillinger for at øge din browsersikkerhed. Vores sikkerhedsindstillinger giver dig mulighed for at blokere elementer der kan bruges til at angribe din computer. Klik nedenfor for at se hvad de forskellige valgmuligheder gør. onboarding.tour-tor-security.button=Gennemgå indstillinger onboarding.tour-tor-expect-differences=Oplevelesestips onboarding.tour-tor-expect-differences.title=Forvent nogen forskelle. -onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. +onboarding.tour-tor-expect-differences.description=Med alle de sikkerheds- og privatlivsfunktionaliteter som gives af Tor, kan din oplevelse på internettet være lidt anderledes. Ting man være lidt langsommere, og afhængig af dit sikkerhedsniveau, kan det være at nogle elementer ikke virker eller ikke indlæses. Du bliver måske også spurgt om du er et menneske eller en robot. onboarding.tour-tor-expect-differences.button=Se FAQ'er onboarding.tour-tor-onion-services=Onion-tjenester onboarding.tour-tor-onion-services.title=Vær ekstra beskyttet. -onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. +onboarding.tour-tor-onion-services.description=Onion-tjenester er steder som slutter med .onion som giver yderligere beskyttelse til udgivere og besøgende, inklusiv tilføjelse af sikkhedsforanstaltninger mod censur. Onion-tjenester giver alle mulighed for at levere indhold og tjenester anonymt. Klik nedenfor for at besøge DuckDuckGo's onion-sted. onboarding.tour-tor-onion-services.button=Besøg et onion # Circuit Display onboarding. @@ -45,10 +45,10 @@ onboarding.tor-circuit-display.two-of-three=2 af 3 onboarding.tor-circuit-display.three-of-three=3 af 3 onboarding.tor-circuit-display.intro.title=Hvordan virker kredsløb? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.msg=Kredsløb består af relæ, som er tildelt tilfældigt, hvilket er computere verden over som er konfigureret til at videresende Tor-trafik. Kredskøb giver dig mulighed for at bruge internettet privat og at oprette forbindelse til onion-tjenester. onboarding.tor-circuit-display.diagram.title=Kredsløb-visning -onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. +onboarding.tor-circuit-display.diagram.msg=Diagrammet viser relæene som opgør kredsløbet til webstedet. For at forhindre sammenkædning af aktivitet på tværs af forskellige steder, så får hvert websted et andet kredsløb. onboarding.tor-circuit-display.new-circuit.title=Har du brug for et nyt kredsløb? onboarding.tor-circuit-display.new-circuit.msg=Hvis du ikke kan oprette forbindelse til det websted du prøver at besøge, eller det ikke indlæser ordentligt, så kan du bruge denne knap til at genindlæse stedet med et nyt kredsløb. diff --git a/src/chrome/locale/da/torbutton.dtd b/src/chrome/locale/da/torbutton.dtd index 694792e8..f0be1e85 100644 --- a/src/chrome/locale/da/torbutton.dtd +++ b/src/chrome/locale/da/torbutton.dtd @@ -31,7 +31,7 @@ <!ENTITY torbutton.prefs.resist_fingerprinting "Tilpas detaljer som adskiller dig fra andre Tor Browser-brugere"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Lad denne boks være valgt til for at skjule ting fra websteder som er unikke for dig, inklusiv din computerydelse, tastaturlayout, sprog, placeringen af installerede plugins, listen af installerede plugins, din netværksstatus, skærmorientering, skærmstørrelse, stedspecifikke zoomniveauer, understøttede filtyper, systemfarver og WebGL-formåenheder."> -<!ENTITY torbutton.prefs.sec_caption "Sikkerheds Niveau"> +<!ENTITY torbutton.prefs.sec_caption "Sikkerhedsniveau"> <!ENTITY torbutton.prefs.sec_caption_tooltip "Sikkerhedsskyderen giver dig mulighed for at deaktivere bestemte browserfunktionaliteter som kan gøre din browser sårbar overfor forsøg på hacking."> <!ENTITY torbutton.prefs.sec_standard_label "Standard"> <!ENTITY torbutton.prefs.sec_standard_description "Alle Tor Browser- og webstedsfunktionaliteter er aktiveret."> diff --git a/src/chrome/locale/de/aboutDialog.dtd b/src/chrome/locale/de/aboutDialog.dtd index cf8b77d5..d2853db2 100644 --- a/src/chrome/locale/de/aboutDialog.dtd +++ b/src/chrome/locale/de/aboutDialog.dtd @@ -1,19 +1,19 @@ <!ENTITY project.start "&brandShortName; wird entwickelt von ">  <!ENTITY project.tpoLink "das &vendorShortName;"> -<!ENTITY project.end ", eine gemeinnützige Organisation, um Ihre Privatsphäre und Freiheit im Internet zu verteidigen."> +<!ENTITY project.end ", eine gemeinnützige Organisation, um deine Privatsphäre und Freiheit im Internet zu verteidigen."> -<!ENTITY help.start "Sie wollen helfen? "> +<!ENTITY help.start "Du willst helfen? ">  <!ENTITY help.donateLink "Spenden"> <!ENTITY help.or "oder">  -<!ENTITY help.getInvolvedLink "machen Sie mit"> +<!ENTITY help.getInvolvedLink "mach mit"> <!ENTITY help.end "!">  <!ENTITY bottomLinks.questions "Fragen?">  -<!ENTITY bottomLinks.grow "Helfen Sie beim Ausweiten des Tor-Netzwerks!"> +<!ENTITY bottomLinks.grow "Hilf beim Vergrössern des Tor-Netzwerks!">  <!ENTITY bottomLinks.license "Lizenzinformationen"> <!ENTITY tor.TrademarkStatement "»Tor« und das »Zwiebel-Logo« sind eingetragene Warenzeichen von Tor Project, Inc."> diff --git a/src/chrome/locale/de/aboutTBUpdate.dtd b/src/chrome/locale/de/aboutTBUpdate.dtd index 047db091..9b0d0bfa 100644 --- a/src/chrome/locale/de/aboutTBUpdate.dtd +++ b/src/chrome/locale/de/aboutTBUpdate.dtd @@ -1,7 +1,7 @@ <!ENTITY aboutTBUpdate.title "Tor Browser Update"> <!ENTITY aboutTBUpdate.updated "Tor Browser wurde aktualisiert."> <!ENTITY aboutTBUpdate.linkPrefix "Für die aktuellsten Informationen zu diesem Release, "> -<!ENTITY aboutTBUpdate.linkLabel "besuchen Sie unsere Website"> +<!ENTITY aboutTBUpdate.linkLabel "besuche unsere Website"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> diff --git a/src/chrome/locale/de/aboutTor.dtd b/src/chrome/locale/de/aboutTor.dtd index 4b29fbb0..6c43e2c6 100644 --- a/src/chrome/locale/de/aboutTor.dtd +++ b/src/chrome/locale/de/aboutTor.dtd @@ -7,7 +7,7 @@ <!ENTITY aboutTor.title "Über Tor"> <!ENTITY aboutTor.ready.label "Entdecken. Privat."> -<!ENTITY aboutTor.ready2.label "Sie sind bereit für das privateste Browsing-Erlebnis der Welt."> +<!ENTITY aboutTor.ready2.label "Du bist bereit für das privateste Browsing-Erlebnis der Welt."> <!ENTITY aboutTor.failure.label "Irgend etwas lief schief!"> <!ENTITY aboutTor.failure2.label "Tor funktioniert mit diesem Browser nicht."> @@ -15,14 +15,28 @@ <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Fragen?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Schauen Sie unser Tor-Browser-Handbuch an »"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Schaue unser Tor Browser Handbuch an »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor-Browser-Handbuch"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser-Handbuch"> -<!ENTITY aboutTor.tor_mission.label "Projekt Tor ist eine in den USA als "The Tor Project" (US 501(c)(3)) registrierte nicht-kommerzielle Organisation für Menschenrechte und Freiheit, die freie und quelloffene Technologien für Anonymität und Privatsphäre entwickelt und bereitstellt und die Forschung und das öffentliche Verständnis auf diesen Gebieten voranbringt."> -<!ENTITY aboutTor.getInvolved.label "Machen Sie mit »"> +<!ENTITY aboutTor.tor_mission.label "Projekt Tor ist eine in den USA als "The Tor Project" US 501(c)(3) registrierte nicht-kommerzielle Organisation für Menschenrechte und Freiheit, die freie und quelloffene Technologien für Anonymität und Privatsphäre entwickelt und bereitstellt und die Forschung und das öffentliche Verständnis auf diesen Gebieten voranbringt."> +<!ENTITY aboutTor.getInvolved.label "Mach mit »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Erhalte die neuesten Nachrichten von Tor direkt in den Posteingang"> -<!ENTITY aboutTor.newsletter.link_text "Tor-Nachrichten abonnieren"> +<!ENTITY aboutTor.newsletter.tagline "Erhalte die neuesten Nachrichten von Tor direkt in den Posteingang."> +<!ENTITY aboutTor.newsletter.link_text "Tor-Nachrichten abonnieren."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Stärke in Zahlen"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymität liebt Gemeinschaft"> +<!ENTITY aboutTor.donationBanner.line2b "Verbessere die Menschenrechte"> +<!ENTITY aboutTor.donationBanner.line2c "Setz dich ein für Freiheit."> +<!ENTITY aboutTor.donationBanner.line2d "Schütze die Privatsphäre von Millionen Menschen."> +<!ENTITY aboutTor.donationBanner.line2e "Mache Tor stark."> +<!ENTITY aboutTor.donationBanner.line2f "Wir brauchen deine Unterstützung."> + +<!ENTITY aboutTor.donationBanner.line3 "Gib noch heute, und Mozilla wird deiner Spende entsprechen."> + +<!ENTITY aboutTor.donationBanner.buttonA "Spende jetzt"> +<!ENTITY aboutTor.donationBanner.buttonB "Zähl mich mit"> diff --git a/src/chrome/locale/de/brand.dtd b/src/chrome/locale/de/brand.dtd index 55f35060..c7c9feaf 100644 --- a/src/chrome/locale/de/brand.dtd +++ b/src/chrome/locale/de/brand.dtd @@ -9,7 +9,7 @@ <!ENTITY trademarkInfo.part1 "Firefox und die Firefox-Logos sind Warenzeichen der Mozilla Foundation.">  -<!ENTITY plugins.installed.find "Klicken Sie, um System-Erweiterungen zu laden"> +<!ENTITY plugins.installed.find "Klicke, um System-Erweiterungen zu laden"> <!ENTITY plugins.installed.enable "Erweiterungen aktivieren"> <!ENTITY plugins.installed.disable "Erweiterungen deaktivieren"> -<!ENTITY plugins.installed.disable.tip "Klicken Sie, um das Laden von System-Erweiterungen zu verhindern"> +<!ENTITY plugins.installed.disable.tip "Klicke, um das Laden von System-Erweiterungen zu verhindern"> diff --git a/src/chrome/locale/de/brand.properties b/src/chrome/locale/de/brand.properties index 9bdc2621..40e650bf 100644 --- a/src/chrome/locale/de/brand.properties +++ b/src/chrome/locale/de/brand.properties @@ -8,9 +8,9 @@ brandFullName=Tor-Browser vendorShortName=Tor-Projekt homePageSingleStartMain=Firefox-Start, eine schnelle Startseite mit eingebauter Suche -homePageImport=Ihre Startseite von %S importieren +homePageImport=Deine Startseite von %S importieren homePageMigrationPageTitle=Startseitenauswahl -homePageMigrationDescription=Bitte wählen Sie die Startseite aus, die Sie benutzen wollen: +homePageMigrationDescription=Bitte wähle die Startseite aus, die du benutzen willst: syncBrandShortName=Sync diff --git a/src/chrome/locale/de/browserOnboarding.properties b/src/chrome/locale/de/browserOnboarding.properties index b9d841ea..1243128c 100644 --- a/src/chrome/locale/de/browserOnboarding.properties +++ b/src/chrome/locale/de/browserOnboarding.properties @@ -4,17 +4,17 @@ onboarding.tour-tor-welcome=Willkommen onboarding.tour-tor-welcome.title=Fertig. -onboarding.tour-tor-welcome.description=Tor Browser bietet höchste Privatsphäre und Sicherheit beim Surfen im Internet. Es schützt jetzt auch gegen Tracker, Überwachung und Zensur. Diese Einführung zeigt, wie. +onboarding.tour-tor-welcome.description=Tor Browser bietet höchste Privatsphäre und Sicherheit beim Surfen im Internet. Sie sind jetzt auch gegen Tracker, Überwachung und Zensur geschützt. Diese Einführung zeigt, wie. onboarding.tour-tor-welcome.button=Jetzt starten onboarding.tour-tor-privacy=Privatsphäre onboarding.tour-tor-privacy.title=Tracker und Schnüffler abweisen. -onboarding.tour-tor-privacy.description=Tor Browser isoliert Cookies und löscht den Verlauf nach jeder Benutzung. Diese Veränderungen garantieren, dass Privatsphäre und Sicherheit im Browser geschützt sind. Klicke auf "Tor-Netzwerk", um zu erfahren wir Tor auf Netzwerkebene schützt. +onboarding.tour-tor-privacy.description=Tor Browser isoliert Cookies und löscht den Verlauf nach jeder Benutzung. Diese Veränderungen garantieren, dass Privatsphäre und Sicherheit im Browser geschützt sind. Klicken Sie auf "Tor-Netzwerk", um zu erfahren, wie Tor auf Netzwerkebene schützt. onboarding.tour-tor-privacy.button=Öffne Tor-Netzwerk onboarding.tour-tor-network=Tor-Netzwerk onboarding.tour-tor-network.title=Bereise ein dezentrales Netzwerk. -onboarding.tour-tor-network.description=Tor Browser verbindet sich mit dem Tor-Netzwerk, das von tausenden Freiwilligen betrieben wird. Anders als andere VPN gibt es keinen zentralen Punkt, dem vertraut werden muss, um das Internet privat zu nutzen. +onboarding.tour-tor-network.description=Der Tor Browser verbindet sich mit dem Tor-Netzwerk, das von tausenden Freiwilligen betrieben wird. Anders als bei einem VPN gibt es keinen zentralen Punkt, dem vertraut werden muss, um das Internet privat zu nutzen. onboarding.tour-tor-network.button=Circuit-Ansicht öffnen onboarding.tour-tor-circuit-display=Circuit-Ansicht @@ -24,7 +24,7 @@ onboarding.tour-tor-circuit-display.button=Meinen Pfad sehen onboarding.tour-tor-security=Sicherheit onboarding.tour-tor-security.title=Wähle deine Erfahrung -onboarding.tour-tor-security.description=Wir bieten zusätzliche Einstellungen, um die Sicherheit zu erhöhen. In den Sicherheitseinstellungen können verschiedene Objekte und Funktionen deaktiviert werden, welche die Sicherheit des Computers gefährden können. Klicke, um zu erfahren, was die verschiedenen Optionen bewirken. +onboarding.tour-tor-security.description=Wir bieten zusätzliche Einstellungen, um die Sicherheit zu erhöhen. In den Sicherheitseinstellungen können verschiedene Objekte und Funktionen deaktiviert werden, welche die Sicherheit des Computers gefährden können. Klicken Sie, um zu erfahren, was die verschiedenen Optionen bewirken. onboarding.tour-tor-security.button=Einstellungen überprüfen onboarding.tour-tor-expect-differences=Erfahrungswerte @@ -48,7 +48,7 @@ onboarding.tor-circuit-display.intro.title=Wie funktionieren Circuits? onboarding.tor-circuit-display.intro.msg=Circuits bestehen aus zufällig zugeordneten Relays, d.h. Computern auf der ganzen Welt, die konfiguriert sind, um Torverkehr weiterzuleiten. Circuits ermöglichen es Ihnen, privat zu surfen und sich mit Onion-Diensten zu verbinden.\n onboarding.tor-circuit-display.diagram.title=Circuit-Ansicht -onboarding.tor-circuit-display.diagram.msg=Dieses Diagramm zeigt die Relais, aus denen die Circuits für diese Website besteht. Um zu verhindern, dass Aktivitäten zwischen verschiedenen Standorten verlinkt werden, erhält jede Website einen anderen Circuit. +onboarding.tor-circuit-display.diagram.msg=Dieses Diagramm zeigt die Relays, aus denen die Circuits für diese Website besteht. Um zu verhindern, dass Aktivitäten zwischen verschiedenen Standorten verlinkt werden, erhält jede Website einen anderen Circuit. onboarding.tor-circuit-display.new-circuit.title=Brauchen Sie einen neuen Circuit? -onboarding.tor-circuit-display.new-circuit.msg=Wenn Sie keine Verbindung zu der Website herstellen können, die Sie besuchen möchten, oder wenn sie nicht richtig geladen wird, können Sie diese Schaltfläche verwenden um die Website über einen neuen Circuit zu laden. +onboarding.tor-circuit-display.new-circuit.msg=Wenn Sie keine Verbindung zu der Website herstellen können, die Sie besuchen möchten, oder wenn sie nicht richtig geladen wird, können Sie diese Schaltfläche verwenden, um die Website über einen neuen Circuit zu laden. diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd index 0b22921a..ccc834b3 100644 --- a/src/chrome/locale/de/torbutton.dtd +++ b/src/chrome/locale/de/torbutton.dtd @@ -13,7 +13,7 @@ <!ENTITY torbutton.button.tooltip "Klicken, um Torbutton zu aktivieren"> <!ENTITY torbutton.prefs.security_settings "Tor-Browser-Sicherheitseinstellungen"> <!ENTITY torbutton.prefs.restore_defaults "Standardeinstellungen wiederherstellen"> -<!ENTITY torbutton.prefs.custom_warning "Ihre benutzerdefinierten Browser-Einstellungen haben zu ungewöhnlichen Sicherheitseinstellungen geführt. Aus Gründen der Sicherheit und Privatsphäre empfehlen wir Ihnen eine der vorgegebenen Sicherheitsstufen auszuwählen."> +<!ENTITY torbutton.prefs.custom_warning "Ihre benutzerdefinierten Browser-Einstellungen haben zu ungewöhnlichen Sicherheitseinstellungen geführt. Aus Gründen der Sicherheit und Privatsphäre empfehlen wir dir eine der vorgegebenen Sicherheitsstufen auszuwählen."> <!ENTITY torbutton.cookiedialog.title "Cookie-Schutz verwalten"> <!ENTITY torbutton.cookiedialog.lockCol "Geschützt"> <!ENTITY torbutton.cookiedialog.domainCol "Rechner"> @@ -27,12 +27,12 @@ <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Neue Cookies nicht schützen"> <!ENTITY torbutton.prefs.restrict_thirdparty "Cookies von Drittanbietern und andere Überwachungsdaten einschränken"> <!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "E"> -<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Lassen Sie dieses Feld ausgewählt, um zu verhindern, dass verschiedene Browserfunktionen ausgenutzt werden, um Ihr Surfverhalten nachzuverfolgen. Die veränderten Funktionen betreffen: BLOB-URLs, Rundruf-Kanäle, den Browser-Puffer, Cookies, Favicons, HTTP-Authentifizierungs-Kopfdaten, Verknüpfungs-Vorverbindungen, den lokalen Speicher, URLs von Medienquellen, OCSP-Anfragen, gemeinsame JavaScript-Instanzen und Tickets von TLS-Sitzungen."> -<!ENTITY torbutton.prefs.resist_fingerprinting "Details ändern, die Sie von anderen Tor-Browser-Benutzern unterscheiden"> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Lasse dieses Feld ausgewählt, um zu verhindern, dass verschiedene Browserfunktionen ausgenutzt werden, um dein Surfverhalten nachzuverfolgen. Die veränderten Funktionen betreffen: BLOB-URLs, Rundruf-Kanäle, den Browser-Puffer, Cookies, Favicons, HTTP-Authentifizierungs-Kopfdaten, Verknüpfungs-Vorverbindungen, den lokalen Speicher, URLs von Medienquellen, OCSP-Anfragen, gemeinsame JavaScript-Instanzen und Tickets von TLS-Sitzungen."> +<!ENTITY torbutton.prefs.resist_fingerprinting "Details ändern, die dich von anderen Tor-Browser-Benutzern unterscheiden"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Lassen Sie dieses Feld ausgewählt um bestimmte einzigartige Informationen Ihres Systems vor Webportalen zu verbergen, wie die Rechnerleistung, Tastaturbelegung, das Sprachprofil, den Installationsort von Erweiterungen, die Liste der installierten Erweiterungen, Ihren Netzwerkstatus, die Bildschirmausrichtung, Bildschirmgröße, seitenspezifische Vergrößerungseinstellungen, unterstützte Dateitypen, Farbschemata und WebGL-Fähigkeiten."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Lasse dieses Feld ausgewählt, um bestimmte einzigartige Informationen deines Systems vor Webportalen zu verbergen, wie die Rechnerleistung, Tastaturbelegung, das Sprachprofil, den Installationsort von Erweiterungen, die Liste der installierten Erweiterungen, deinen Netzwerkstatus, die Bildschirmausrichtung, Bildschirmgröße, seitenspezifische Vergrößerungseinstellungen, unterstützte Dateitypen, Farbschemata und WebGL-Fähigkeiten."> <!ENTITY torbutton.prefs.sec_caption "Sicherheitsstufe"> -<!ENTITY torbutton.prefs.sec_caption_tooltip "Mit dem Sicherheitsschieberegler können Sie bestimmte Browserfunktionen, die Ihren Browser für mögliche Attacken anfälliger machen, deaktivieren."> +<!ENTITY torbutton.prefs.sec_caption_tooltip "Mit dem Sicherheitsschieberegler kannst du bestimmte Browserfunktionen, die deinen Browser für mögliche Attacken anfälliger machen, deaktivieren."> <!ENTITY torbutton.prefs.sec_standard_label "Standard "> <!ENTITY torbutton.prefs.sec_standard_description "Alle Tor Browser und Webseiten Funktionen sind aktiviert."> @@ -42,7 +42,7 @@ <!ENTITY torbutton.prefs.sec_safest_label "Am sichersten"> <!ENTITY torbutton.prefs.sec_safest_description "Erlaubt nur Webseiten-Funktionen, die für statische Seiten und Basisdienste benötigt werden. Diese Änderungen betreffen Bilder, Medien und Skripte."> <!ENTITY torbutton.prefs.sec_safest_list_label "In der sichersten Einstellung:"> -<!ENTITY torbutton.prefs.sec_learn_more_label "Erfahren Sie mehr"> +<!ENTITY torbutton.prefs.sec_learn_more_label "Erfahre mehr"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript ist auf Nicht-HTTTPS-Sites deaktiviert."> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript ist standardmäßig auf allen Seiten deaktiviert."> <!ENTITY torbutton.prefs.sec_limit_typography "Einige Schriftarten und mathematische Symbole sind deaktiviert."> diff --git a/src/chrome/locale/de/torbutton.properties b/src/chrome/locale/de/torbutton.properties index bccd548d..cff5f13b 100644 --- a/src/chrome/locale/de/torbutton.properties +++ b/src/chrome/locale/de/torbutton.properties @@ -7,34 +7,34 @@ torbutton.circuit_display.tor_bridge = Brücke torbutton.circuit_display.unknown_country = Unbekanntes Land torbutton.circuit_display.guard = Wächter torbutton.circuit_display.guard_note = Dein [Wächter] Knotenpunkt darf sich nicht ändern. -torbutton.circuit_display.learn_more = Erfahren Sie mehr -torbutton.content_sizer.margin_tooltip = Tor Browser fügt diese Begrenzung hinzu, um die Breite und Höhe Ihres Fensters weniger einzigartig zu machen. Dadurch wird es anderen erschwert, Sie im Internet zu verfolgen. +torbutton.circuit_display.learn_more = Erfahre mehr +torbutton.content_sizer.margin_tooltip = Tor Browser fügt diese Begrenzung hinzu, um die Breite und Höhe deines Fensters weniger einzigartig zu machen. Dadurch wird es anderen erschwert, dich im Internet zu verfolgen. torbutton.panel.tooltip.disabled = Klicken, um Tor zu aktivieren torbutton.panel.tooltip.enabled = Klicken, um Tor zu deaktivieren torbutton.panel.label.disabled = Tor ist deaktiviert torbutton.panel.label.enabled = Tor ist aktiviert -extensions.torbutton(a)torproject.org.description = Torbutton gibt ihnen die Möglichkeit, Einstellungen von Tor schnell und einfach zu verändern und einfach die Internetdaten zu löschen. -torbutton.popup.external.title = Einen externen Dateitypen herunterladen -torbutton.popup.external.app = Tor-Browser kann diese Datei nicht anzeigen. Sie müssen es mit einer anderen Anwendung öffnen.\n\n -torbutton.popup.external.note = Einige Dateitypen können Anwendungen dazu führen, dass sie sich mit dem Internet ohne Tor verbinden.\n\n -torbutton.popup.external.suggest = Um sicher zu sein, sollten Sie heruntergeladene Dateien nur öffnen, wenn Sie nicht mit dem Netz verbunden sind oder Sie benutzen eine Live-CD wie z. B. Tails.\n +extensions.torbutton(a)torproject.org.description = Torbutton gibt dir die Möglichkeit, Einstellungen von Tor zu verändern und schnell und einfach die Internetdaten zu löschen. +torbutton.popup.external.title = Einen externen Dateitypen herunterladen? +torbutton.popup.external.app = Tor-Browser kann diese Datei nicht anzeigen. Du musst es mit einer anderen Anwendung öffnen.\n\n +torbutton.popup.external.note = Einige Dateitypen können Anwendungen dazu führen, dass du dich mit dem Internet ohne Tor verbindest.\n\n +torbutton.popup.external.suggest = Um sicher zu sein, solltest du heruntergeladene Dateien nur öffnen, wenn du nicht mit dem Netz verbunden bist, oder du benutzt eine Live-CD wie z. B. Tails.\n torbutton.popup.launch = Datei herunterladen torbutton.popup.cancel = Abbrechen torbutton.popup.dontask = Von jetzt an Dateien immer automatisch herunterladen -torbutton.popup.no_newnym = Torbutton kann Ihnen keine neue Identität geben, da es keinen Zugriff auf den Tor-Steueranschluss hat.\n\nBenutzen Sie das Tor-Browser-Paket? +torbutton.popup.no_newnym = Torbutton kann dir keine neue Identität geben, da es keinen Zugriff auf den Tor-Steueranschluss hat.\n\nBenutzt du das Tor-Browser-Paket? torbutton.security_settings.menu.title = Sicherheitseinstellungen torbutton.title.prompt_torbrowser = Wichtige Torbutton-Information -torbutton.popup.prompt_torbrowser = Torbutton funktioniert jetzt anders als vorher: es kann nicht mehr abgeschaltet werden.\n\nWir haben diese Änderung vorgenommen, da es nicht sicher ist, Torbutton auch in einem Browser zu benutzen, der auch für den Betrieb ohne Tor gedacht ist. Es gab zu viele Fehler, die wir sonst nicht hätten beheben können.\n\nWenn Sie Firefox weiterhin normal benutzen möchten, sollten Sie Torbutton deinstallieren, und das Tor-Browser-Paket herunterladen. Die Privatsphäreeinstellungen des Tor-Browsers sind außerdem denen des normalen Firefox überlegen, selbst wenn Firefox mit Torbutton benutzt wird.\n\nUm Torbutton zu entfernen, gehen Sie einfach auf Extras->Add-ons->Erweiterungen und klicken Sie auf Entfernen neben dem Torbutton. +torbutton.popup.prompt_torbrowser = Torbutton funktioniert jetzt anders als vorher: es kann nicht mehr abgeschaltet werden.\n\nWir haben diese Änderung vorgenommen, da es nicht sicher ist, Torbutton auch in einem Browser zu benutzen, der auch für den Betrieb ohne Tor gedacht ist. Es gab zu viele Fehler, die wir sonst nicht hätten beheben können.\n\nWenn du Firefox weiterhin normal benutzen möchtest, solltest du Torbutton deinstallieren, und das Tor-Browser-Paket herunterladen. Die Privatsphäreeinstellungen des Tor-Browsers sind außerdem denen des normalen Firefox überlegen, selbst wenn Firefox mit Torbutton benutzt wird.\n\nUm Torbutton zu entfernen, gehst du einfach auf Extras->Add-ons->Erweiterungen und klickst auf Entfernen neben dem Torbutton. torbutton.popup.short_torbrowser = Wichtige Torbutton-Information!\n\nTorbutton ist jetzt immer aktiviert.\n\nBitte auf den Torbutton klicken, um mehr Informationen zu erhalten. -torbutton.popup.confirm_plugins = Erweiterungen wie Flash können ihre Privatsphäre und Anonymität schädigen.\n\nSie können auch das Tor-Netzwerk umgehen, und Ihren derzeitigen Aufenthaltsort und ihre IP-Adresse verraten.\n\nSind Sie sicher, dass Sie Erweiterungen aktivieren wollen?\n\n +torbutton.popup.confirm_plugins = Erweiterungen wie Flash können deine Privatsphäre und Anonymität schädigen.\n\nDu kannst auch das Tor-Netzwerk umgehen, und deinen derzeitigen Aufenthaltsort und deine IP-Adresse verraten.\n\nBist du sicher, dass du Erweiterungen aktivieren willst?\n\n 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.popup.confirm_newnym = Tor-Browser wird alle Fenster und Reiter schließen. Alle Internetseitensitzungen gehen verloren.\n\nTor-Browser jetzt neu starten, um deine Identität zurückzusetzen?\n\n -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. +torbutton.maximize_warning = Die Maximierung des Tor-Browsers kann Webseiten die Bestimmung deiner Bildschirmgröße ermöglichen, um damit deine Spur zu verfolgen. Wir empfehlen dir, 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? +canvas.siteprompt=Die Internetseite (%S) hat versucht, HTML5-Canvas-Bilddaten zu extrahieren, die verwendet werden können, um deinen Rechner eindeutig zu identifizieren. \n\nSoll Tor-Browser es dieser Internetseite erlauben, HTML5-Canvas-Bilddaten zu extrahieren? canvas.notNow=Nicht jetzt canvas.notNowAccessKey=j canvas.allow=In der Zukunft erlauben @@ -45,9 +45,9 @@ canvas.neverAccessKey=N # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. profileProblemTitle=%S-Profilproblem -profileReadOnly=Es ist nicht möglich %S auf einem nur lesbaren Dateisystem zu starten. Bitte kopiere %S an einen anderen Ort bevor Sie es benutzen. -profileReadOnlyMac=Es ist nicht möglich %S auf einem nur lesbaren Dateisystem zu starten. Bitte %S auf Ihren Schreibtisch oder den Anwendungsordner kopieren, bevor Sie es benutzen. -profileAccessDenied=%S hat keine Berechtigung um dieses Profil abzurufen. Bitte die Berechtigungen Ihres Dateisystems einstellen und es noch einmal probieren. +profileReadOnly=Es ist nicht möglich %S auf einem nur lesbaren Dateisystem zu starten. Bitte kopiere %S an einen anderen Ort bevor du es benutzt. +profileReadOnlyMac=Es ist nicht möglich %S auf einem nur lesbaren Dateisystem zu starten. Bitte %S auf deinen Schreibtisch oder den Anwendungsordner kopieren, bevor du es benutzt. +profileAccessDenied=%S hat keine Berechtigung um dieses Profil abzurufen. Bitte die Berechtigungen deines Dateisystems einstellen und es noch einmal probieren. profileMigrationFailed=Übernahme des bestehenden %S Profils ist fehlgeschlagen.\nEs werden neue Einstellungen verwendet. # .Onion Page Info prompt. Strings are kept here for ease of translation. diff --git a/src/chrome/locale/es/aboutTBUpdate.dtd b/src/chrome/locale/es/aboutTBUpdate.dtd index 17f354cb..c6b42517 100644 --- a/src/chrome/locale/es/aboutTBUpdate.dtd +++ b/src/chrome/locale/es/aboutTBUpdate.dtd @@ -5,6 +5,6 @@ <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Registro de cambios:"> -<!ENTITY aboutTBUpdate.circuitDisplayHeading "Nuevo, Pantalla de Circuito Rediseñada RCD"> -<!ENTITY aboutTBUpdate.circuitDisplayDescription "¡Se ha trasladado y mejorado la visualización del ciruito de Tor! Clic en el botón Site Identity (situado en el lado izquierdo de la barra de direcciones URL) para ver la nueva visualización del circuito."> +<!ENTITY aboutTBUpdate.circuitDisplayHeading "Nueva Pantalla de Circuito Rediseñada"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "¡Se ha trasladado y mejorado la visualización del enrutado de Tor! Clic en el botón Site Identity (situado en el lado izquierdo de la barra de direcciones URL) para ver la nueva visualización del circuito."> <!ENTITY aboutTBUpdate.learnMore "Aprende más"> diff --git a/src/chrome/locale/es/aboutTor.dtd b/src/chrome/locale/es/aboutTor.dtd index c0934bde..b20f45d5 100644 --- a/src/chrome/locale/es/aboutTor.dtd +++ b/src/chrome/locale/es/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Recibe las últimas noticias de Tor directamente en tu bandeja de entrada."> <!ENTITY aboutTor.newsletter.link_text "Inscríbete en Tor News."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: La fuerza en la cantidad"> + +<!ENTITY aboutTor.donationBanner.line2a "El anonimato ama la compañía."> +<!ENTITY aboutTor.donationBanner.line2b "Promover los derechos humanos universales."> +<!ENTITY aboutTor.donationBanner.line2c "Defiende la libertad."> +<!ENTITY aboutTor.donationBanner.line2d "Protege la privacidad de millones de personas."> +<!ENTITY aboutTor.donationBanner.line2e "Mantén fuerte a Tor."> +<!ENTITY aboutTor.donationBanner.line2f "Necesitamos tu apoyo."> + +<!ENTITY aboutTor.donationBanner.line3 "Dona hoy, y Mozilla igualará tu donación."> + +<!ENTITY aboutTor.donationBanner.buttonA "Dona ahora."> +<!ENTITY aboutTor.donationBanner.buttonB "Cuenta conmigo."> diff --git a/src/chrome/locale/es/browserOnboarding.properties b/src/chrome/locale/es/browserOnboarding.properties index 2e858112..a86af461 100644 --- a/src/chrome/locale/es/browserOnboarding.properties +++ b/src/chrome/locale/es/browserOnboarding.properties @@ -19,36 +19,36 @@ onboarding.tour-tor-network.button=Ir a la visualización del circuito onboarding.tour-tor-circuit-display=Visualización del circuito onboarding.tour-tor-circuit-display.title=Ver tu recorrido -onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. +onboarding.tour-tor-circuit-display.description=Por cada dominio que visitas, tus datos de tráfico son transportados y cifrados en un circuito a través de tres repetidores de Tor alrededor del mundo. Ningún sitio web sabe desde dónde te conectas. Puedes pedir un nuevo circuito haciendo clic en 'Nuevo Circuito para este Sitio' en la Visualización del Circuito. onboarding.tour-tor-circuit-display.button=Ver mi recorrido onboarding.tour-tor-security=Seguridad -onboarding.tour-tor-security.title=Choose your experience. -onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. +onboarding.tour-tor-security.title=Elige tu experiencia. +onboarding.tour-tor-security.description=También te proporcionamos configuraciones adicionales para aumentar la seguridad de tu navegador. Nuestra Configuración de Seguridad te permite bloquear elementos que podrían usarse para atacar tu computadora. Haz clic a continuación para ver lo que hacen las diferentes opciones. onboarding.tour-tor-security.button=Revisar configuración -onboarding.tour-tor-expect-differences=Consejos de experiencia -onboarding.tour-tor-expect-differences.title=Expect some differences. -onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-expect-differences=Consejos de expertos +onboarding.tour-tor-expect-differences.title=Espera algunas diferencias. +onboarding.tour-tor-expect-differences.description=Con todas las características de seguridad y privacidad proporcionadas por Tor, tu experiencia mientras navegas por Internet puede ser un poco diferente. Las cosas pueden ser un poco más lentas, y dependiendo de tu nivel de seguridad, algunos elementos pueden no funcionar o no cargarse. También se te puede pedir que demuestres que eres un ser humano y no un robot. +onboarding.tour-tor-expect-differences.button=Preguntas frecuentes (FAQ) -onboarding.tour-tor-onion-services=Servicios onion -onboarding.tour-tor-onion-services.title=Be extra protected. -onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. -onboarding.tour-tor-onion-services.button=Visit an Onion +onboarding.tour-tor-onion-services=Servicios cebolla +onboarding.tour-tor-onion-services.title=Protégete bien. +onboarding.tour-tor-onion-services.description=Los servicios cebolla son sitios que terminan con .onion y proveen protecciones extra a editores y visitantes, incluyendo salvaguardas adicionales contra la censura. Los mismos permiten a cualquiera proveer contenido y servicios anónimamente. Haz clic abajo para visitar el sitio cebolla de DuckDuckGo. +onboarding.tour-tor-onion-services.button=Visita un sitio cebolla # Circuit Display onboarding. onboarding.tor-circuit-display.next=Siguiente onboarding.tor-circuit-display.done=Hecho -onboarding.tor-circuit-display.one-of-three=1 of 3 -onboarding.tor-circuit-display.two-of-three=2 of 3 -onboarding.tor-circuit-display.three-of-three=3 of 3 +onboarding.tor-circuit-display.one-of-three=1 de 3 +onboarding.tor-circuit-display.two-of-three=2 de 3 +onboarding.tor-circuit-display.three-of-three=3 de 3 -onboarding.tor-circuit-display.intro.title=How do circuits work? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.title=¿Cómo funcionan los circuitos? +onboarding.tor-circuit-display.intro.msg=Los circuitos están formados por repetidores asignados aleatoriamente, que son computadoras de todo el mundo configuradas para reenviar el tráfico de Tor. Los circuitos te permiten navegar de forma privada y conectarte a los servicios cebolla. onboarding.tor-circuit-display.diagram.title=Visualización del circuito onboarding.tor-circuit-display.diagram.msg=Estos diagramas muestran los repetidores que crean el circuito para esta página web. Para prevenir la vinculación de la actividad a través de diferentes sitios, cada página web tiene un circuito diferente. onboarding.tor-circuit-display.new-circuit.title=¿Necesitas un circuito nuevo? -onboarding.tor-circuit-display.new-circuit.msg=Si no consigues conectarte a la página web que estás intentando visitar, o no está cargando correctamente, puedes usar el botón para recargar la página con un circuito nuevo. +onboarding.tor-circuit-display.new-circuit.msg=Si no consigues conectarte a la página web que estás intentando visitar, o no está cargando correctamente, puedes usar este botón para recargar el sitio con un circuito nuevo. diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties index 6c56979e..7c3d7050 100644 --- a/src/chrome/locale/es/torbutton.properties +++ b/src/chrome/locale/es/torbutton.properties @@ -51,5 +51,5 @@ profileAccessDenied=%S no tiene permiso para acceder al perfil. Ajuste los permi profileMigrationFailed=Ha ocurrido un error en la migración de tu perfil %S. \nSe usarán los nuevos ajustes. # .Onion Page Info prompt. Strings are kept here for ease of translation. -pageInfo_OnionEncryptionWithBitsAndProtocol=Conexión cifrada (Servicio Onion, %1$S, %2$S bit keys, %3$S) -pageInfo_OnionEncryption=Conexión cifrada (Servicio Onion) +pageInfo_OnionEncryptionWithBitsAndProtocol=Conexión cifrada (Servicio cebolla, %1$S, %2$S bit keys, %3$S) +pageInfo_OnionEncryption=Conexión cifrada (Servicio cebolla) diff --git a/src/chrome/locale/eu/aboutTor.dtd b/src/chrome/locale/eu/aboutTor.dtd index 123091e5..24acba36 100644 --- a/src/chrome/locale/eu/aboutTor.dtd +++ b/src/chrome/locale/eu/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> +<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> +<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> + +<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/fa/aboutTBUpdate.dtd b/src/chrome/locale/fa/aboutTBUpdate.dtd index 9502a888..9ad06d0b 100644 --- a/src/chrome/locale/fa/aboutTBUpdate.dtd +++ b/src/chrome/locale/fa/aboutTBUpdate.dtd @@ -7,4 +7,4 @@ <!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> <!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> -<!ENTITY aboutTBUpdate.learnMore "Learn More"> +<!ENTITY aboutTBUpdate.learnMore "بیشتر بدانید"> diff --git a/src/chrome/locale/fa/aboutTor.dtd b/src/chrome/locale/fa/aboutTor.dtd index add704d4..be1440b7 100644 --- a/src/chrome/locale/fa/aboutTor.dtd +++ b/src/chrome/locale/fa/aboutTor.dtd @@ -6,23 +6,37 @@ <!ENTITY aboutTor.title "درباره‌ی تور"> -<!ENTITY aboutTor.ready.label "Explore. Privately."> +<!ENTITY aboutTor.ready.label "کاوش. خصوصی."> <!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> <!ENTITY aboutTor.failure.label "خطایی پیش آمده است!"> -<!ENTITY aboutTor.failure2.label "تا با این مرورگر کار نمی‌کند."> +<!ENTITY aboutTor.failure2.label "تور با این مرورگر کار نمی‌کند."> -<!ENTITY aboutTor.search.label "Search with DuckDuckGo"> +<!ENTITY aboutTor.search.label "جستجو توسط داک‌داک‌گو"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> -<!ENTITY aboutTor.torbrowser_user_manual_questions.label "پرسش؟"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »"> +<!ENTITY aboutTor.torbrowser_user_manual_questions.label "سوالات؟"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "بررسی راهنمای مرورگر تور »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual"> +<!ENTITY aboutTor.torbrowser_user_manual.label "راهنمای مرورگر تور"> <!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding."> -<!ENTITY aboutTor.getInvolved.label "Get Involved »"> +<!ENTITY aboutTor.getInvolved.label "دریافت مشارکت »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> -<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> +<!ENTITY aboutTor.newsletter.tagline "آخرین اخبار تور را در صندوق ورودی خود دریافت کنید."> +<!ENTITY aboutTor.newsletter.link_text "ثبت‌نام برای اخبار تور."> + +<!ENTITY aboutTor.donationBanner.line1 "تور: قدرت در اعداد"> + +<!ENTITY aboutTor.donationBanner.line2a "شرکت گمنامیت را دوست دارد."> +<!ENTITY aboutTor.donationBanner.line2b "حمایت از حقوق بشر جهانی."> +<!ENTITY aboutTor.donationBanner.line2c "برای آزادی ایستادگی کنید."> +<!ENTITY aboutTor.donationBanner.line2d "از حریم خصوصی میلیون‌ها محافظت کنید"> +<!ENTITY aboutTor.donationBanner.line2e "تور را محکم نگه دارید."> +<!ENTITY aboutTor.donationBanner.line2f "ما به حمایت شما نیاز داریم!"> + +<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "اکنون اهداء کنید"> +<!ENTITY aboutTor.donationBanner.buttonB "روی من حساب کن"> diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd index 858b8c17..6c6d1120 100644 --- a/src/chrome/locale/fa/torbutton.dtd +++ b/src/chrome/locale/fa/torbutton.dtd @@ -30,7 +30,7 @@ <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "این جعبه را نگه دارید تا از استفاده از ویژگی‌های مختلف مرورگر برای ردیابی شما در هنگام مرور وب جلوگیری شود. ویژگی های اصلاح شده شامل: آدرس‌های آلوده, broadcast channels, کش مرورگر, کوکی‌ها, فاویکن, HTTP Auth headers, پیوندهاpreconnects, حافظه محلی, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets."> <!ENTITY torbutton.prefs.resist_fingerprinting "تغييردادن جزئياتى كه شمارا از كاربران ديگر تُر تميزمى‌كند"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "این جعبه برای پنهان کردن چیزهایی از وب سایت‌هایی که می‌تواند منحصر به شما باشد؛ از جمله کارایی رایانه، طرح بندی صفحه کلید، مکان، محل افزونه‌های نصب شده، لیست افزونه‌های نصب شده، وضعیت شبکه شما، جهت صفحه نمایش، اندازه صفحه، سطوح زوم خاص، انواع فایل پشتیبانی شده، رنگ سیستم و قابلیت‌های WebGL نگه دارید."> <!ENTITY torbutton.prefs.sec_caption "سطح امنیت"> <!ENTITY torbutton.prefs.sec_caption_tooltip "نوار لغزنده امنیتی به شما اجازه می‌دهد که مشخصه‌های خاص مرورگر را غیرفعال کنید که ممکن است مرورگر شما را در برابر تلاش‌های هک آسیب‌پذیر سازد."> <!ENTITY torbutton.prefs.sec_standard_label "استاندارد"> @@ -39,7 +39,7 @@ <!ENTITY torbutton.prefs.sec_safer_description "از کار انداختن ویژگی‌های وبسایت که اغلب خطرناک هستند و باعث از دست رفتن برخی سایت‌ها می‌شوند."> <!ENTITY torbutton.prefs.sec_safer_list_label "تنظیم مکانی امن‌تر:"> <!ENTITY torbutton.prefs.sec_safest_label "ایمن ترین "> -<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts."> +<!ENTITY torbutton.prefs.sec_safest_description "تنها اجازه می‌دهد که ویژگی‌های وبسایت برای سایت‌های ایستا و خدمات پایه مورد نیاز باشد. این تغییرات بر تصاویر، رسانه‌ها و متن تاثیر می‌گذارند."> <!ENTITY torbutton.prefs.sec_safest_list_label "تنظیم امن‌ترین مکان"> <!ENTITY torbutton.prefs.sec_learn_more_label "اطلاعات بیشتر"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "جاوا اسکریپت روی سایت‌های غیر HTTPS کار نمی‌کند."> diff --git a/src/chrome/locale/fr/aboutTBUpdate.dtd b/src/chrome/locale/fr/aboutTBUpdate.dtd index 7ff3ca31..cfed15d9 100644 --- a/src/chrome/locale/fr/aboutTBUpdate.dtd +++ b/src/chrome/locale/fr/aboutTBUpdate.dtd @@ -6,5 +6,5 @@ <!ENTITY aboutTBUpdate.changeLogHeading "Journal des changements :"> <!ENTITY aboutTBUpdate.circuitDisplayHeading "Affichage des circuits nouveau et repensé"> -<!ENTITY aboutTBUpdate.circuitDisplayDescription "L’affichage des circuits de Tor a été déplacé et amélioré ! Cliquez sur le bouton Identité&#160;du&#160;site (situé à gauche de la barre d’URL) pour voir le nouvel affichage des circuits."> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "L’affichage des circuits de Tor a été déplacé et amélioré ! Cliquez sur le bouton Identité du site (situé à gauche de la barre d’URL) pour voir le nouvel affichage des circuits."> <!ENTITY aboutTBUpdate.learnMore "En apprendre davantage"> diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd index 708e244a..52c4d062 100644 --- a/src/chrome/locale/fr/aboutTor.dtd +++ b/src/chrome/locale/fr/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Obtenez les dernières nouvelles au sujet de Tor directement dans votre boîte de réception."> <!ENTITY aboutTor.newsletter.link_text "Inscrivez-vous aux nouvelles de Tor"> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> + +<!ENTITY aboutTor.donationBanner.line2a "L’anonymat adore la compagnie"> +<!ENTITY aboutTor.donationBanner.line2b "Améliorer les droits de la personne."> +<!ENTITY aboutTor.donationBanner.line2c "Se lever pour la liberté."> +<!ENTITY aboutTor.donationBanner.line2d "Protéger la confidentialité de millions de personnes."> +<!ENTITY aboutTor.donationBanner.line2e "Garder Tor robuste."> +<!ENTITY aboutTor.donationBanner.line2f "On a besoin de votre soutien !"> + +<!ENTITY aboutTor.donationBanner.line3 "Donnez aujourd'hui, et Mozilla recevra votre donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donnez dès maintenant"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/fr/browserOnboarding.properties b/src/chrome/locale/fr/browserOnboarding.properties index 4c9fff79..ad6ca038 100644 --- a/src/chrome/locale/fr/browserOnboarding.properties +++ b/src/chrome/locale/fr/browserOnboarding.properties @@ -3,52 +3,52 @@ # vim: set sw=2 sts=2 ts=8 et: onboarding.tour-tor-welcome=Bienvenue -onboarding.tour-tor-welcome.title=You’re ready. -onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. -onboarding.tour-tor-welcome.button=Start Now +onboarding.tour-tor-welcome.title=Vous êtes prêts. +onboarding.tour-tor-welcome.description=Le Navigateur Tor offre le plus haut niveau de confidentialité et de sécurité quand vous parcourez le Web. Vous êtes maintenant protégé contre le suivi à la trace, la surveillance et la censure. Cette introduction rapide vous montrera comment faire. +onboarding.tour-tor-welcome.button=Commencer maintenant onboarding.tour-tor-privacy=Confidentialité -onboarding.tour-tor-privacy.title=Snub trackers and snoopers. -onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. -onboarding.tour-tor-privacy.button=Go to Tor Network +onboarding.tour-tor-privacy.title=Repoussez les traqueurs et les fouineurs. +onboarding.tour-tor-privacy.description=Le Navigateur Tor isole les témoins et supprime l’historique de votre navigateur en fin de session. Ces modifications garantissent que confidentialité et sécurité sont protégées dans le navigateur. Cliquez sur « Réseau Tor » pour savoir comment nous vous protégeons au niveau du réseau. +onboarding.tour-tor-privacy.button=Se rendre sur le Réseau Tor -onboarding.tour-tor-network=Tor Network -onboarding.tour-tor-network.title=Travel a decentralized network. -onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. -onboarding.tour-tor-network.button=Go to Circuit Display +onboarding.tour-tor-network=Réseau Tor +onboarding.tour-tor-network.title=Naviguez sur un réseau décentralisé. +onboarding.tour-tor-network.description=Le navigateur Tor vous connecte au réseau Tor exploité par des milliers de bénévoles dans le monde entier. Contrairement à un RPV, il n’y a pas de point de défaillance unique ou d’entité centralisée auxquels vous devez faire confiance pour profiter d’Internet en toute confidentialité. +onboarding.tour-tor-network.button=Se rendre sur l’Affichage des circuits -onboarding.tour-tor-circuit-display=Circuit Display -onboarding.tour-tor-circuit-display.title=See your path. -onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. -onboarding.tour-tor-circuit-display.button=See My Path +onboarding.tour-tor-circuit-display=Affichage des circuits +onboarding.tour-tor-circuit-display.title=Visualisez votre chemin. +onboarding.tour-tor-circuit-display.description=Pour chaque domaine que vous visitez, votre trafic est relayé et chiffré dans un circuit passant par trois relais Tor disséminés de par le monde. Aucun site Web ne sait d’où vous vous connectez. Vous pouvez demander un nouveau circuit en cliquant sur « Nouveau circuit Tor pour ce site » dans votre Affichage des circuits. +onboarding.tour-tor-circuit-display.button=Visualiser mon chemin onboarding.tour-tor-security=Sécurité -onboarding.tour-tor-security.title=Choose your experience. -onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. -onboarding.tour-tor-security.button=Review Settings +onboarding.tour-tor-security.title=Choisissez votre expérience. +onboarding.tour-tor-security.description=Nous vous offrons aussi des paramètres supplémentaires pour augmenter la sécurité de votre navigateur. Nos paramètres de sécurité vous permettent de bloquer des éléments qui pourraient être utilisés pour attaquer votre ordinateur. Cliquez ci-dessous pour voir ce que les différentes options vous proposent. +onboarding.tour-tor-security.button=Passer les paramètres en revue -onboarding.tour-tor-expect-differences=Experience Tips -onboarding.tour-tor-expect-differences.title=Expect some differences. -onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-expect-differences=Informations concernant l’expérience +onboarding.tour-tor-expect-differences.title=Attendez-vous à des différences. +onboarding.tour-tor-expect-differences.description=Avec toutes les fonctions de sécurité et de confidentialité offertes par Tor, votre expérience de navigation sur Internet pourrait être un peu différente. Les choses pourraient être un peu plus lentes et selon votre niveau de sécurité, certains éléments pourraient ne pas fonctionner ou ne pas se charger. On pourrait aussi vous demander de prouver que vous êtes un humain et non un robot. +onboarding.tour-tor-expect-differences.button=Consulter les FAQ -onboarding.tour-tor-onion-services=Les services oignon -onboarding.tour-tor-onion-services.title=Be extra protected. -onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. -onboarding.tour-tor-onion-services.button=Visit an Onion +onboarding.tour-tor-onion-services=Les services onion +onboarding.tour-tor-onion-services.title=Soyez plus que protégé. +onboarding.tour-tor-onion-services.description=Les services onion sont des sites se terminant par .onion qui offrent des protections accrues aux diffuseurs et aux visiteurs, dont des mesures de protection contre la censure. Les services onion permettent à tous de proposer anonymement du contenu et des services. Cliquez ci-dessous pour visiter le site onion de DuckDuckGo. +onboarding.tour-tor-onion-services.button=Visiter un Onion # Circuit Display onboarding. onboarding.tor-circuit-display.next=Suivant -onboarding.tor-circuit-display.done=Fait -onboarding.tor-circuit-display.one-of-three=1 of 3 -onboarding.tor-circuit-display.two-of-three=2 of 3 -onboarding.tor-circuit-display.three-of-three=3 of 3 +onboarding.tor-circuit-display.done=Terminé +onboarding.tor-circuit-display.one-of-three=1 de 3 +onboarding.tor-circuit-display.two-of-three=2 de 3 +onboarding.tor-circuit-display.three-of-three=3 de 3 -onboarding.tor-circuit-display.intro.title=How do circuits work? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.title=Comment les circuits fonctionnent-ils ? +onboarding.tor-circuit-display.intro.msg=Les circuits sont composés de relais attribués au hasard et qui sont des ordinateurs disséminés dans le monde entier et configurés pour acheminer le trafic de Tor. -onboarding.tor-circuit-display.diagram.title=Circuit Display -onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. +onboarding.tor-circuit-display.diagram.title=Affichage des circuits +onboarding.tor-circuit-display.diagram.msg=Ce diagramme affiche les relais qui composent le circuit de ce site Web. Pour empêcher de relier l’activité d’un site à l’autre, chaque site Web obtient un circuit différent. -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? -onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. +onboarding.tor-circuit-display.new-circuit.title=Avez-vous besoin d'un nouveau circuit ? +onboarding.tor-circuit-display.new-circuit.msg=Si vous n’arrivez pas à vous connecter au site Web que vous essayez de visiter ou s’il ne se charge pas correctement, vous pouvez alors utiliser ce bouton pour recharger le site avec un nouveau circuit. diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties index 6f430a65..3e8e860d 100644 --- a/src/chrome/locale/fr/torbutton.properties +++ b/src/chrome/locale/fr/torbutton.properties @@ -1,6 +1,6 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP inconnue -torbutton.circuit_display.onion_site = Site Oignon +torbutton.circuit_display.onion_site = Site onion torbutton.circuit_display.this_browser = Ce navigateur torbutton.circuit_display.relay = Relais torbutton.circuit_display.tor_bridge = Pont @@ -51,5 +51,5 @@ profileAccessDenied=%S n’a pas le droit d’accéder au profil. Veuillez ajust profileMigrationFailed=La migration de votre profil existant %S a échoué.\nDe nouveaux paramètres vont être utilisés. # .Onion Page Info prompt. Strings are kept here for ease of translation. -pageInfo_OnionEncryptionWithBitsAndProtocol=La connexion est chiffrée (service oignon, %1$S, clés %2$S bits, %3$S) -pageInfo_OnionEncryption=La connexion est chiffrée (service oignon) +pageInfo_OnionEncryptionWithBitsAndProtocol=La connexion est chiffrée (service onion, %1$S, clés %2$S bits, %3$S) +pageInfo_OnionEncryption=La connexion est chiffrée (service onion) diff --git a/src/chrome/locale/ga/aboutTor.dtd b/src/chrome/locale/ga/aboutTor.dtd index ce6fe3f5..a2c65352 100644 --- a/src/chrome/locale/ga/aboutTor.dtd +++ b/src/chrome/locale/ga/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Faigh an nuacht is déanaí maidir le Tor i do bhosca isteach."> <!ENTITY aboutTor.newsletter.link_text "Cláraigh le Nuachtlitir Tor."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Ní neart go cur le chéile"> + +<!ENTITY aboutTor.donationBanner.line2a "Dul i bhfolach sa slua."> +<!ENTITY aboutTor.donationBanner.line2b "Cuir cearta daonna chun cinn."> +<!ENTITY aboutTor.donationBanner.line2c "Seas an fód ar son na saoirse."> +<!ENTITY aboutTor.donationBanner.line2d "Cosain príobháideachas na milliún duine."> +<!ENTITY aboutTor.donationBanner.line2e "Cuir taca le Tor."> +<!ENTITY aboutTor.donationBanner.line2f "Tá do chúnamh de dhíth orainn!"> + +<!ENTITY aboutTor.donationBanner.line3 "Tabhair síntiús airgid inniu agus tabharfaidh Mozilla an méid céanna arís dúinn."> + +<!ENTITY aboutTor.donationBanner.buttonA "Tabhair síntiús airgid anois"> +<!ENTITY aboutTor.donationBanner.buttonB "Cuir mise san áireamh"> diff --git a/src/chrome/locale/he/aboutDialog.dtd b/src/chrome/locale/he/aboutDialog.dtd index d334bfd0..286b86b6 100644 --- a/src/chrome/locale/he/aboutDialog.dtd +++ b/src/chrome/locale/he/aboutDialog.dtd @@ -1,6 +1,6 @@ <!ENTITY project.start "&brandShortName; פותח ע"י">  -<!ENTITY project.tpoLink "ה-&vendorShortName;"> +<!ENTITY project.tpoLink "&vendorShortName;"> <!ENTITY project.end ", ארגון ללא כוונות רווח הפועל להגן על פרטיותך וחירותך ברשת."> <!ENTITY help.start "רוצה לעזור?"> @@ -8,7 +8,7 @@ <!ENTITY help.donateLink "תרום"> <!ENTITY help.or "או">  -<!ENTITY help.getInvolvedLink "הייה מעורב!"> +<!ENTITY help.getInvolvedLink "הייה מעורב"> <!ENTITY help.end "!">  <!ENTITY bottomLinks.questions "שאלות?"> diff --git a/src/chrome/locale/he/aboutTor.dtd b/src/chrome/locale/he/aboutTor.dtd index e47b43c7..e4659b67 100644 --- a/src/chrome/locale/he/aboutTor.dtd +++ b/src/chrome/locale/he/aboutTor.dtd @@ -15,14 +15,28 @@ <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "שאלות?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "בדוק את מדריך של דפדפן Tor שלנו «"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "בדוק את מדריך של דפדפן Tor שלנו »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "מ"> <!ENTITY aboutTor.torbrowser_user_manual.label "מדריך של דפדפן Tor"> <!ENTITY aboutTor.tor_mission.label "מיזם Tor הוא ארגון US 501(c)(3) ללא רווחים המקדם זכויות אדם וחירויות ע"י יצירה ופריסה של טכנולוגיות של אלמוניות ופרטיות בקוד פתוח וחינמי, תמיכה בזמינות ובשימוש בלתי־מוגבל שלהן, וקידום הבנה מדעית ועממית שלהן."> -<!ENTITY aboutTor.getInvolved.label "הייה מעורב «"> +<!ENTITY aboutTor.getInvolved.label "הייה מעורב »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> <!ENTITY aboutTor.newsletter.tagline "קבל את החדשות האחרונות מאת Tor ישירות לתיבה הנכנסת שלך."> <!ENTITY aboutTor.newsletter.link_text "הירשם עבור חדשות Tor."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: חוזק במספרים"> + +<!ENTITY aboutTor.donationBanner.line2a "אלמוניות אוהבת חברה."> +<!ENTITY aboutTor.donationBanner.line2b "זכויות אדם קדומות יקומיות."> +<!ENTITY aboutTor.donationBanner.line2c "סנגר על חירות."> +<!ENTITY aboutTor.donationBanner.line2d "הגן על פרטיותם של מיליונים."> +<!ENTITY aboutTor.donationBanner.line2e "שמור על Tor חזק."> +<!ENTITY aboutTor.donationBanner.line2f "אנחנו צריכים את תמיכתך!"> + +<!ENTITY aboutTor.donationBanner.line3 "תן היום, ו־Mozilla תשווה את תרומתך."> + +<!ENTITY aboutTor.donationBanner.buttonA "תרום עכשיו"> +<!ENTITY aboutTor.donationBanner.buttonB "החשב אותי"> diff --git a/src/chrome/locale/he/browserOnboarding.properties b/src/chrome/locale/he/browserOnboarding.properties index daa6b6e7..8865f0c8 100644 --- a/src/chrome/locale/he/browserOnboarding.properties +++ b/src/chrome/locale/he/browserOnboarding.properties @@ -9,32 +9,32 @@ onboarding.tour-tor-welcome.button=התחל עכשיו onboarding.tour-tor-privacy=פרטיות onboarding.tour-tor-privacy.title=בלום גששים וחטטנים. -onboarding.tour-tor-privacy.description=דפדפן Tor מבודד עוגיות ומוחק את היסטורית הדפדפן שלך לאחר השיח שלך. שינויים אלו מבטיחים שהפרטיות והאבטחה שלך מוגנים בדפדפן. לחץ ’רשת Tor‘ כדי ללמוד כיצד אנחנו מגינים עליך ברמת הרשת. +onboarding.tour-tor-privacy.description=דפדפן Tor מבודד עוגיות ומוחק את היסטורית הדפדפן שלך לאחר השיח שלך. שינויים אלו מבטיחים שהפרטיות והאבטחה שלך מוגנים בדפדפן. לחץ על ’רשת Tor‘ כדי ללמוד כיצד אנחנו מגינים עליך ברמת הרשת. onboarding.tour-tor-privacy.button=לך אל רשת Tor onboarding.tour-tor-network=רשת Tor onboarding.tour-tor-network.title=טייל ברשת מבוזרת. -onboarding.tour-tor-network.description=דפדפן Tor מחבר אותך אל רשת Tor המופעלת ע"י אלפי מתנדבים ברחבי העולם. בשונה מאשר VPN, אין נקודת כשל בודדת או כניסה מבוזרת שאתה צריך לסמוך עליה על מנת ליהנות מהאינטרנט באופן פרטי. +onboarding.tour-tor-network.description=דפדפן Tor מחבר אותך אל רשת Tor המופעלת ע"י אלפי מתנדבים ברחבי העולם. בשונה מאשר VPN, אין נקודת כשל בודדת או כניסה ממורכזת שאתה צריך לסמוך עליה על מנת ליהנות מהאינטרנט באופן פרטי. onboarding.tour-tor-network.button=לך אל תצוגת מעגל onboarding.tour-tor-circuit-display=תצוגת מעגל onboarding.tour-tor-circuit-display.title=ראה את הנתיב שלך. -onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. +onboarding.tour-tor-circuit-display.description=עבור כל תחום שאתה מבקר בו, התעבורה שלך עוברת בממסר ומוצפנת במעגל דרך שלושה ממסרי Tor ברחבי העולם. אין אתר שיודע מאיפה אתה מתחבר. אתה יכול לבקש מעגל חדש ע"י לחיצה על ’מעגל חדש עבור אתר זה‘ בתצוגת המעגל שלנו. onboarding.tour-tor-circuit-display.button=ראה את הנתיב שלי onboarding.tour-tor-security=אבטחה onboarding.tour-tor-security.title=בחר את חוויתך. -onboarding.tour-tor-security.description=אנחנו מספקים לך גם הגדרות נוספות עבור הגברת אבטחת הדפדפן שלך. הגדרות האבטחה שלנו מתירות לך לחסום יסודות שעלולות לשמש כדי לתקוף את המחשב שלך. לחץ למטה כדי לראות מה האפשרויות השונות עושות. +onboarding.tour-tor-security.description=אנחנו מספקים לך גם הגדרות נוספות עבור הגברת אבטחת הדפדפן שלך. הגדרות האבטחה שלנו מתירות לך לחסום יסודות שעלולים לשמש כדי לתקוף את המחשב שלך. לחץ למטה כדי לראות מה האפשרויות השונות עושות. onboarding.tour-tor-security.button=סקור הגדרות onboarding.tour-tor-expect-differences=עצות חוויה onboarding.tour-tor-expect-differences.title=צפה למספר הבדלים. -onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. +onboarding.tour-tor-expect-differences.description=עם כל המאפיינים של האבטחה והפרטיות המסופקים ע"י Tor, חוויתך בעת גלישה באינטרנט עשויה להיות מעט שונה. דברים עשויים להיות מעט איטיים יותר, ובהסתמכות על רמת האבטחה שלך, יסודות מסוימים עשויים לא לעבוד או להיטען. ייתכן שתתבקש להוכיח שאתה אנושי ולא רובוט. onboarding.tour-tor-expect-differences.button=ראה שאלות נפוצות onboarding.tour-tor-onion-services=שירותי בצל onboarding.tour-tor-onion-services.title=הייה אקסטרה מוגן. -onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. +onboarding.tour-tor-onion-services.description=שירותי בצל הם אתרים המסתיימים עם .onion המספק הגנות אקסטרה אל מפרסמים ומבקרים, כולל אמצעיי הגנה שהתווספו נגד צנזורה. שירותי בצל מתירים לכל אחד לספק תוכן ושירותים באופן אלמוני. לחץ למטה כדי לבקר באתר הבצל DuckDuckGo. onboarding.tour-tor-onion-services.button=בקר בבצל # Circuit Display onboarding. @@ -45,7 +45,7 @@ onboarding.tor-circuit-display.two-of-three=2 מתוך 3 onboarding.tor-circuit-display.three-of-three=3 מתוך 3 onboarding.tor-circuit-display.intro.title=איך מעגלים עובדים? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.msg=מעגלים בנויים ממסרים מוקצים אקראית, שהם מחשבים ברחבי העולם המתוצרים להעביר הלאה תעבורת Tor. מעגלים מתירים לך לגלוש בפרטיות ולהתחבר אל שירותי בצל. onboarding.tor-circuit-display.diagram.title=תצוגת מעגל onboarding.tor-circuit-display.diagram.msg=תרשים זה מראה את הממסרים המרכיבים את המעגל עבור אתר זה. כדי למנוע קישור פעילות על פני אתרים שונים, כל אתר מקבל מעגל שונה. diff --git a/src/chrome/locale/he/torbutton.dtd b/src/chrome/locale/he/torbutton.dtd index 5035258c..5595b01f 100644 --- a/src/chrome/locale/he/torbutton.dtd +++ b/src/chrome/locale/he/torbutton.dtd @@ -34,7 +34,7 @@ <!ENTITY torbutton.prefs.sec_caption "רמת אבטחה"> <!ENTITY torbutton.prefs.sec_caption_tooltip "מחוון האבטחה נותן לך להשבית תכונות דפדפן מסוימות אשר עלולות לעשות את הדפדפן שלך יותר פגיע לנסיונות פיצוח."> <!ENTITY torbutton.prefs.sec_standard_label "תקני"> -<!ENTITY torbutton.prefs.sec_standard_description "כל המאפיינים של דפדפן Tor ומאפייני אתרים מושבתים."> +<!ENTITY torbutton.prefs.sec_standard_description "כל המאפיינים של דפדפן Tor ומאפייני אתר מושבתים."> <!ENTITY torbutton.prefs.sec_safer_label "בטוח יותר"> <!ENTITY torbutton.prefs.sec_safer_description "משבית מאפייני אתר שמסוכנים לעיתים קרובות, מה שגורם למספר אתרים לאבד תפקודיות."> <!ENTITY torbutton.prefs.sec_safer_list_label "בהגדרה הבטוחה יותר:"> diff --git a/src/chrome/locale/he/torbutton.properties b/src/chrome/locale/he/torbutton.properties index 315ef4ce..8c2d7a15 100644 --- a/src/chrome/locale/he/torbutton.properties +++ b/src/chrome/locale/he/torbutton.properties @@ -13,7 +13,7 @@ torbutton.panel.tooltip.disabled = לחץ כדי לאפשר את Tor torbutton.panel.tooltip.enabled = לחץ כדי להשבית את Tor torbutton.panel.label.disabled = Tor מושבת torbutton.panel.label.enabled = Tor מאופשר -extensions.torbutton(a)torproject.org.description = Torbutton מספק כפתור כדי להגדיר את הגדרות Tor וכדי לנקות במהירות ובקלות נתוני גלישה פרטיים. +extensions.torbutton(a)torproject.org.description = Torbutton מספק כפתור כדי לתצר את הגדרות Tor וכדי לנקות במהירות ובקלות נתוני גלישה פרטיים. torbutton.popup.external.title = להוריד סוג חיצוני של קובץ? torbutton.popup.external.app = דפדפן Tor אינו יכול להציג קובץ זה. תצטרך לפתוח אותו באמצעות יישום אחר.\n\n torbutton.popup.external.note = סוגים מסוימים של קבצים עלולים לגרום ליישומים להתחבר אל האינטרנט ללא שימוש ב-Tor.\n diff --git a/src/chrome/locale/id/aboutTor.dtd b/src/chrome/locale/id/aboutTor.dtd index 3a4e3a27..7d56a131 100644 --- a/src/chrome/locale/id/aboutTor.dtd +++ b/src/chrome/locale/id/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Dapatkan berita Tor terbaru langsung ke inbox Anda."> <!ENTITY aboutTor.newsletter.link_text "Daftar untuk mendapatkan Berita Tor."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> +<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> +<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> + +<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/is/aboutTBUpdate.dtd b/src/chrome/locale/is/aboutTBUpdate.dtd index a23e06dd..a668b89c 100644 --- a/src/chrome/locale/is/aboutTBUpdate.dtd +++ b/src/chrome/locale/is/aboutTBUpdate.dtd @@ -5,6 +5,6 @@ <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Breytingaannáll:"> -<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> -<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> +<!ENTITY aboutTBUpdate.circuitDisplayHeading "Ný, endurhönnuð birting rása"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "Birting rása í Tor hefur verið flutt á nýjan stað og endurhönnuð! Smelltu á Vefsvæði Auðkenni hnappinn (vinstra megin við staðsetningarstikuna) til að sjá nýja framsetningu rása."> <!ENTITY aboutTBUpdate.learnMore "Fræðast frekar"> diff --git a/src/chrome/locale/is/aboutTor.dtd b/src/chrome/locale/is/aboutTor.dtd index 0a259108..cc2317c5 100644 --- a/src/chrome/locale/is/aboutTor.dtd +++ b/src/chrome/locale/is/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Fáðu nýjustu fréttir af Tor beint í pósthólfið þitt."> <!ENTITY aboutTor.newsletter.link_text "Skráðu þig til að fá Tor-fréttir."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Styrkur í fjöldanum"> + +<!ENTITY aboutTor.donationBanner.line2a "Nafnleysi krefst félagsskapar."> +<!ENTITY aboutTor.donationBanner.line2b "Setjum mannréttindi á oddinn."> +<!ENTITY aboutTor.donationBanner.line2c "Stöndum saman með frelsinu."> +<!ENTITY aboutTor.donationBanner.line2d "Verndum friðhelgi milljóna manna."> +<!ENTITY aboutTor.donationBanner.line2e "Höldum Tor sterku"> +<!ENTITY aboutTor.donationBanner.line2f "Við þörfnumst stuðnings þíns!"> + +<!ENTITY aboutTor.donationBanner.line3 "Gefðu í dag - og Mozilla mun jafna framlag þitt."> + +<!ENTITY aboutTor.donationBanner.buttonA "Styrkja núna"> +<!ENTITY aboutTor.donationBanner.buttonB "Reiknið með mér"> diff --git a/src/chrome/locale/is/browserOnboarding.properties b/src/chrome/locale/is/browserOnboarding.properties index 2ca47d25..893ce908 100644 --- a/src/chrome/locale/is/browserOnboarding.properties +++ b/src/chrome/locale/is/browserOnboarding.properties @@ -2,53 +2,53 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -onboarding.tour-tor-welcome=Welcome -onboarding.tour-tor-welcome.title=You’re ready. -onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. -onboarding.tour-tor-welcome.button=Start Now +onboarding.tour-tor-welcome=Velkomin +onboarding.tour-tor-welcome.title=Þú ert tilbúin(n). +onboarding.tour-tor-welcome.description=Tor-vafrinn stenst mestu kröfur varðandi öryggi og nafnleynd þegar vafrað er á netinu. Þú ert núna varin(n) fyrir eftirliti, skráningu og ritskoðun. Þessi flýtikynning mun sýna þér hvernig þetta fer fram. +onboarding.tour-tor-welcome.button=Byrja núna onboarding.tour-tor-privacy=Friðhelgi -onboarding.tour-tor-privacy.title=Snub trackers and snoopers. -onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. -onboarding.tour-tor-privacy.button=Go to Tor Network - -onboarding.tour-tor-network=Tor Network -onboarding.tour-tor-network.title=Travel a decentralized network. -onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. -onboarding.tour-tor-network.button=Go to Circuit Display - -onboarding.tour-tor-circuit-display=Circuit Display -onboarding.tour-tor-circuit-display.title=See your path. -onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. -onboarding.tour-tor-circuit-display.button=See My Path - -onboarding.tour-tor-security=Security -onboarding.tour-tor-security.title=Choose your experience. -onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. -onboarding.tour-tor-security.button=Review Settings - -onboarding.tour-tor-expect-differences=Experience Tips -onboarding.tour-tor-expect-differences.title=Expect some differences. -onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-privacy.title=Feldu þig fyrir snuðrurum og eftirliti +onboarding.tour-tor-privacy.description=Tor-vafrinn einangrar vefkökur og hreinsar vafurferil þinn eftir setuna þína. Þessar aðgerðir tryggja verndun gagnaleyndar og almennt öryggi í vafranum. Smelltu á ‘Tor-netið’ til að sjá hvernig við verjum þig einnig gagnvart netkerfinu sjálfu. +onboarding.tour-tor-privacy.button=Fara á Tor-netið + +onboarding.tour-tor-network=Tor-netið +onboarding.tour-tor-network.title=Farðu um ómiðstýrt netkerfi. +onboarding.tour-tor-network.description=Tor-vafrinn tengir þig við Tor-netið sem rekið er af þúsundum sjálfboðaliða um víða veröld. Ólíkt VPN, þá er enginn einn punktur sem getur brugðist eða miðlægt firirbæri sem þú þarft að treysta til að geta notað netið án afskipta annarra. +onboarding.tour-tor-network.button=Farðu í birtingu rása + +onboarding.tour-tor-circuit-display=Birting rása +onboarding.tour-tor-circuit-display.title=Skoðaðu slóðina þína +onboarding.tour-tor-circuit-display.description=Fyrir hvert lén sem þú heimsækir, er umferðinni þinni endurbeint dulritaðri um brautir (rásir) milli þriggja Tor-endurvarpa víðsvegar um heiminn. Ekkert vefsvæði getur séð hvaðan þú tengist. Þú getur beðið um nýja rás með því að smella á ‘Ný rás fyrir þetta vefsvæði’ í glugganum þar sem rásirnar eru birtar. +onboarding.tour-tor-circuit-display.button=Skoða slóðina mína + +onboarding.tour-tor-security=Öryggi +onboarding.tour-tor-security.title=Veldu hvernig þú vilt upplifa þetta. +onboarding.tour-tor-security.description=Við höfum einnig útbúið viðbótarstillingar þar sem þú getur breytt öryggisstigi vafrans. Öryggisstillingarnar gera kleift að loka á atriði sem hægt væri að nota til árása á tölvuna þína. Smelltu hér fyrir neðan til að skoða hvernig hinir mismunandi valkostir virka. +onboarding.tour-tor-security.button=Yfirfara stillingar + +onboarding.tour-tor-expect-differences=Ábendingar fyrir upplifunina +onboarding.tour-tor-expect-differences.title=Gerður ráð fyrir að eitthvað verði öðruvísi. +onboarding.tour-tor-expect-differences.description=Vegna allra öryggis- og gagnaverndareiginleika Tor, þá gæti upplifun þín af vafri á internetinu orðið eilítið öðruvísi en annars. Hlutirnir gerast kannski aðeins hægar og það fer eftir öryggisstillingunum þínum hvort sum atriði virki eða birtist yfirhöfuð. Þú gætir líka lent í því að vera reglulega spurð(ur) hvort þú sért mannvera eða vélmenni. +onboarding.tour-tor-expect-differences.button=Skoðaðu algengar spurningar - FAQ onboarding.tour-tor-onion-services=Onion-þjónustur -onboarding.tour-tor-onion-services.title=Be extra protected. -onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. -onboarding.tour-tor-onion-services.button=Visit an Onion +onboarding.tour-tor-onion-services.title=Fáðu viðbótaröryggi. +onboarding.tour-tor-onion-services.description=Onion-þjónustur eru vefsvæði sem enda á .onion viðskeyti, vefsvæði sem gefa útgefendum efnis og þeim sem skoða það aukna vernd gagnvart ritskoðun. Onion-þjónustur gera öllum kleift að birta efni eða eigin þjónustu nafnlaust. Smelltu hr fyrir neðan til að skoða onion-vefsvæði DuckDuckGo. +onboarding.tour-tor-onion-services.button=Heimsækja Onion-vef # Circuit Display onboarding. -onboarding.tor-circuit-display.next=Næsti +onboarding.tor-circuit-display.next=Næsta onboarding.tor-circuit-display.done=Lokið -onboarding.tor-circuit-display.one-of-three=1 of 3 -onboarding.tor-circuit-display.two-of-three=2 of 3 -onboarding.tor-circuit-display.three-of-three=3 of 3 +onboarding.tor-circuit-display.one-of-three=1 af 3 +onboarding.tor-circuit-display.two-of-three=2 af 3 +onboarding.tor-circuit-display.three-of-three=3 af 3 -onboarding.tor-circuit-display.intro.title=How do circuits work? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.title=Hvernig virka rásir? +onboarding.tor-circuit-display.intro.msg=Rásir eru samsettar úr handahófsvöldum endurbeinum, sem eru tölvur úti um víða veröld sem sjá um að áframsenda umferð fyrir Tor. Rásir gera þér kleift að vafra í leyni og að tengjast við onion-þjónustur. -onboarding.tor-circuit-display.diagram.title=Circuit Display -onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. +onboarding.tor-circuit-display.diagram.title=Birting rása +onboarding.tor-circuit-display.diagram.msg=Þessi skýringamynd sýnir endurvarpana sem saman mynda rásina fyrir þetta vefsvæði. Til að koma í veg fyrir að hægt sé að tengja saman virkni á mismunandi vefsvæðum, þá fær hvert vefsvæði sína sérstöku rás. -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? -onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. +onboarding.tor-circuit-display.new-circuit.title=Þarftu nýja rás? +onboarding.tor-circuit-display.new-circuit.msg=Ef þú átt í vandræðum með að tengjast vefsvæði sem þú ætlar að skoða eða að það hleðst ekki rétt inn, þá geturðu notað þennan hnapp til að endurhlaða in vefsíðunni með nýrri rás. diff --git a/src/chrome/locale/is/torbutton.dtd b/src/chrome/locale/is/torbutton.dtd index de0c5ecc..4477085c 100644 --- a/src/chrome/locale/is/torbutton.dtd +++ b/src/chrome/locale/is/torbutton.dtd @@ -27,12 +27,12 @@ <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ekki vernda nýjar vefkökur"> <!ENTITY torbutton.prefs.restrict_thirdparty "Takmarka vefkökur frá þriðja aðila og önnur ferligögn"> <!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R"> -<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets."> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Hafðu merkt í þennan reit til að koma í veg fyrir að ýmsir eiginleikar vafrans séu misnotaðir í að fylgjast með þér á meðan þú flakkar um vefinn. Breyttir eiginleikar eru til dæmis innri slóðir (blob URLs), útsendar rásir, skyndiminni vafrans, vefkökur, veftákn (favicon), HTTP-auðkenningarhausar, fortengi tengla, localStorage, mediaSource-slóðir, OCSP-beiðnir, SharedWorkers og TLS setumiðar."> <!ENTITY torbutton.prefs.resist_fingerprinting "Breyta atriðum sem gera þig ólíkan öðrum notendum Tor-vafrans"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Hafðu hakað í þennan reit til að fela fyrir vefsvæðum atriði sem gætu verið einstök hjá þér, þar með talin atriði eins og upplýsingar um afköst tölvunnar, lyklaborðsuppsetningu, staðfærslu, staðsetningu uppsettra viðbóta, lista yfir uppsettar viðbætur, stöðu netkerfis, stærð og stefnu skjás, sértækan aðdrátt fyrir vefsvæði, studdar skráategundir, kerfisliti og getu varðandi WebGL."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Hafðu merkt í þennan reit til að fela fyrir vefsvæðum atriði sem gætu verið einstök hjá þér, þar með talin atriði eins og upplýsingar um afköst tölvunnar, lyklaborðsuppsetningu, staðfærslu, staðsetningu uppsettra viðbóta, lista yfir uppsettar viðbætur, stöðu netkerfis, stærð og stefnu skjás, sértækan aðdrátt fyrir vefsvæði, studdar skráategundir, kerfisliti og getu varðandi WebGL."> <!ENTITY torbutton.prefs.sec_caption "Öryggisstig"> -<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts."> +<!ENTITY torbutton.prefs.sec_caption_tooltip "Öryggisstillingasleðinn getur gert óvirka ýmsa þá eiginleika vafrans sem gætu gert vafrann viðkvæmari fyrir árásum hakkara."> <!ENTITY torbutton.prefs.sec_standard_label "Staðlað"> <!ENTITY torbutton.prefs.sec_standard_description "Allir eiginleikar Tor-vafrans og vefsvæðisins eru virkjaðir."> <!ENTITY torbutton.prefs.sec_safer_label "Öruggara"> @@ -46,6 +46,6 @@ <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript er sjálfgefið óvirkt á öllum vefsvæðum."> <!ENTITY torbutton.prefs.sec_limit_typography "Sumt letur og stærðfræðitákn eru óvirk."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Sumt letur, táknmyndir, myndir og stærðfræðitákn eru óvirk."> -<!ENTITY torbutton.prefs.sec_click_to_play_media "Hljóð og myndskeið (HTML5-gagnamiðlar) þarf að smella á til að spila."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "Hljóð og myndskeið (HTML5-gagnamiðla) þarf að smella á til að spila."> <!ENTITY torbutton.circuit_display.title "Tor-rás"> <!ENTITY torbutton.circuit_display.new_circuit "Ný rás fyrir þetta vefsvæði"> diff --git a/src/chrome/locale/is/torbutton.properties b/src/chrome/locale/is/torbutton.properties index 9d476492..d275d72c 100644 --- a/src/chrome/locale/is/torbutton.properties +++ b/src/chrome/locale/is/torbutton.properties @@ -5,10 +5,10 @@ torbutton.circuit_display.this_browser = Þessi vafri torbutton.circuit_display.relay = Relay torbutton.circuit_display.tor_bridge = Brú torbutton.circuit_display.unknown_country = Óþekkt land -torbutton.circuit_display.guard = Guard -torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.guard = Vörður (guard) +torbutton.circuit_display.guard_note = Varðarhnúturinn [Guard] breytist ekki endilega. torbutton.circuit_display.learn_more = Læra meira -torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. +torbutton.content_sizer.margin_tooltip = Tor-vafrinn setur inn þessa spássíu til að gera hæð og breidd gluggans minna einkennandi, og þar með að gera erfiðara að fylgjast með þér á netinu. torbutton.panel.tooltip.disabled = Smelltu til að virkja Tor torbutton.panel.tooltip.enabled = Smelltu til að afvirkja Tor torbutton.panel.label.disabled = Tor óvirkt @@ -17,24 +17,24 @@ extensions.torbutton(a)torproject.org.description = Torbutton útbýr hnapp til up torbutton.popup.external.title = Sækja utanaðkomandi skráartegund? torbutton.popup.external.app = Tor-vafrinn getur ekki birt þessa skrá. Þú verður að opna hana með öðru forriti.\n\n torbutton.popup.external.note = Sumar skráartegundir geta látið forrit tengjast netinu án þess að fara í gegnum Tor. -torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n +torbutton.popup.external.suggest = Til að vera örugg(ur), ættirðu einungis að opna sóttar skrár þegar netið er aftengt, eða með því að nota Tor Live CD keyrsludisk eins og Tails.\n torbutton.popup.launch = Ná í skrá torbutton.popup.cancel = Hætta við torbutton.popup.dontask = Hlaða sjálfkrafa inn skrám héðan í frá -torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? +torbutton.popup.no_newnym = Torbutton getur ekki gefið þér nýtt öruggt auðkenni. Hann er ekki með aðgang að Tor-stýrigáttinni.\n\nErt þú að keyra Tor-vafravöndulinn (browser bundle)? torbutton.security_settings.menu.title = Öryggisstillingar torbutton.title.prompt_torbrowser = Mikilvægar upplýsingar um Tor-hnappinn -torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. +torbutton.popup.prompt_torbrowser = Torbutton-hnappurinn virkar núna öðruvísi en áður: ekki er lengur hægt að slökkva á honum.\n\nVið gerðum þessa breytingu því það er ekki öruggt að nota Torbutton í vafra sem einnig er notaður fyrir vafur án Tor. Það voru allt of margar veilur sem ekki var hægt að laga á neinn annan hátt.\n\nEf þig langar til að halda áfram að nota Firefox eins og venjulega, þá ættirðu að henda Torbutton út og ná þér frekar í Tor-vafravöndulinn (browser bundle). Gagnaverndareiginleikar Tor-vafrans eru líka mikið betri en í Firefox, jafnvel þegar Firefox er notaður með Torbutton.\n\nTil að fjarlægja Torbutton, farðu þá í Verkfæri->Viðbætur->Viðbætur (enska: Tools->Addons->Extensions og smelltu á fjarlægingarhnappinn næst Torbutton-færslunni. torbutton.popup.short_torbrowser = Mikilvægar upplýsingar um Tor-hnappinn!\n\nTor-hnappurinn er núna alltaf virkur.\n\nSmelltu á Tor-hnappinn til að sjá nánar. torbutton.popup.confirm_plugins = Viðbætur eins og til dæmis Flash geta skaðað friðhelgi þína og gagnaleynd.\n\nÞær geta einnig farið framhjá Tor til að gefa upp staðsetningu þína og IP-vistfang.\n\nErtu viss um að þú viljir virkja viðbætur?\n\n torbutton.popup.never_ask_again = Ekki spyrja mig aftur torbutton.popup.confirm_newnym = Tor-vafrinn mun núna loka öllum flipum og gluggum. Allar setur á vefsvæðum munu tapast.\n\nÁ að endurræsa Tor-vafrann til að núllstilla auðkennið þitt?\n\n -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 = Með því að stækka Tor-vafragluggann gerir þú vefsvæðum mögulega kleift að mæla stærð skjásins þíns, sem aftur gerir kleift að einkenna þig. Við mælum með því að þú hafir glugga Tor-vafrans í upprunalegri sjálfgefinni stærð. # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? +canvas.siteprompt=Þetta vefsvæði (%S) reyndi að nálgast gögn um HTML5 myndflötinn, gögn sem hægt er að nota til að auðkenna þig.\n\nÆtti Tor-vafrinn að leyfa þessu vefsvæði að fá gögn um HTML5 myndflöt? canvas.notNow=Ekki núna canvas.notNowAccessKey=N canvas.allow=Leyfa í framtíðinni @@ -45,11 +45,11 @@ canvas.neverAccessKey=e # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. profileProblemTitle=Vandamál við %S snið -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. +profileReadOnly=Þú getur ekki keyrt %S af skrifvörðu kerfi. Afritaðu %S á einhvern annan stað áður en þú reynir að nota það. +profileReadOnlyMac=Þú getur ekki keyrt %S af skrifvörðu kerfi. Afritaðu %S á skjáborðið eða í forritamöppu áður en þú reynir að nota það. +profileAccessDenied=%S er ekki með heimildir til að fara inn í sniðið. Lagaðu aðgangsheimildir kerfisins og reyndu svo aftur. profileMigrationFailed=Yfirfærsla á fyrirliggjandi %S sniðinu þínu mistókst.\nNýjar stillingar verða notaðar. # .Onion Page Info prompt. Strings are kept here for ease of translation. -pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S) -pageInfo_OnionEncryption=Connection Encrypted (Onion Service) +pageInfo_OnionEncryptionWithBitsAndProtocol=Dulrituð tenging (Onion-þjónusta, %1$S, %2$S bita dulritunarlyklar, %3$S) +pageInfo_OnionEncryption=Dulrituð tenging (Onion-þjónusta) diff --git a/src/chrome/locale/it/aboutTor.dtd b/src/chrome/locale/it/aboutTor.dtd index b9687c45..f023c259 100644 --- a/src/chrome/locale/it/aboutTor.dtd +++ b/src/chrome/locale/it/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Ottieni le ultime info da Tor direttamente nella tua casella di posta elettronica."> <!ENTITY aboutTor.newsletter.link_text "Registrati alle Tor News."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: la Forza in Numeri"> + +<!ENTITY aboutTor.donationBanner.line2a "L'anonimato ama l'azienda."> +<!ENTITY aboutTor.donationBanner.line2b "Migliora i diritti universali dell'uomo."> +<!ENTITY aboutTor.donationBanner.line2c "Difendi la libertà."> +<!ENTITY aboutTor.donationBanner.line2d "Protegge la privacy di milioni."> +<!ENTITY aboutTor.donationBanner.line2e "Mantieni Tor forte."> +<!ENTITY aboutTor.donationBanner.line2f "Abbiamo bisogno del tuo supporto!"> + +<!ENTITY aboutTor.donationBanner.line3 "Dai oggi, e Mozilla ricambierà la tua donazione."> + +<!ENTITY aboutTor.donationBanner.buttonA "Dona Ora"> +<!ENTITY aboutTor.donationBanner.buttonB "Contami"> diff --git a/src/chrome/locale/ja/aboutTor.dtd b/src/chrome/locale/ja/aboutTor.dtd index db9195f7..8c573564 100644 --- a/src/chrome/locale/ja/aboutTor.dtd +++ b/src/chrome/locale/ja/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> +<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> +<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> + +<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/ko/aboutTor.dtd b/src/chrome/locale/ko/aboutTor.dtd index 74bc503e..8c8065a5 100644 --- a/src/chrome/locale/ko/aboutTor.dtd +++ b/src/chrome/locale/ko/aboutTor.dtd @@ -20,9 +20,23 @@ <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> <!ENTITY aboutTor.torbrowser_user_manual.label "Tor 브라우저 설명서"> -<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding."> +<!ENTITY aboutTor.tor_mission.label "Tor 프로젝트는 자유와 인권증진에 기여하는 US 501(c)(3) 비영리 단체입니다. 이는 무료로 이용 가능한 오픈 소스 익명성과 사생활 보호기술을 개발하고 그 무제한적 이용을 지원하여 과학적 공적 이해로 나아갑니다."> <!ENTITY aboutTor.getInvolved.label "참여 »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> <!ENTITY aboutTor.newsletter.tagline "최신의 Tor 뉴스를 받은 편지함에 곧장 받으십시오."> <!ENTITY aboutTor.newsletter.link_text "Tor 뉴스를 구독."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> +<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> +<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> + +<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/ko/browserOnboarding.properties b/src/chrome/locale/ko/browserOnboarding.properties index e2cad1ca..b3c9363b 100644 --- a/src/chrome/locale/ko/browserOnboarding.properties +++ b/src/chrome/locale/ko/browserOnboarding.properties @@ -2,10 +2,10 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -onboarding.tour-tor-welcome=Welcome -onboarding.tour-tor-welcome.title=You’re ready. +onboarding.tour-tor-welcome=환영합니다 +onboarding.tour-tor-welcome.title=준비됐습니다. onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. -onboarding.tour-tor-welcome.button=Start Now +onboarding.tour-tor-welcome.button=지금 시작 onboarding.tour-tor-privacy=사생활 onboarding.tour-tor-privacy.title=Snub trackers and snoopers. diff --git a/src/chrome/locale/nb/aboutTor.dtd b/src/chrome/locale/nb/aboutTor.dtd index 89bd5a7f..d5899000 100644 --- a/src/chrome/locale/nb/aboutTor.dtd +++ b/src/chrome/locale/nb/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Få de siste nyhetene fra Tor rett til innboksen din."> <!ENTITY aboutTor.newsletter.link_text "Registrer deg for Tor Nyheter."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> +<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> +<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> + +<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/nl/aboutTBUpdate.dtd b/src/chrome/locale/nl/aboutTBUpdate.dtd index 9f5cc50f..f780a834 100644 --- a/src/chrome/locale/nl/aboutTBUpdate.dtd +++ b/src/chrome/locale/nl/aboutTBUpdate.dtd @@ -5,6 +5,6 @@ <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Wijzigingslogboek:"> -<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> +<!ENTITY aboutTBUpdate.circuitDisplayHeading "Nieuw, Herontworpen Circuit Venster"> <!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> -<!ENTITY aboutTBUpdate.learnMore "Learn More"> +<!ENTITY aboutTBUpdate.learnMore "Meer info"> diff --git a/src/chrome/locale/nl/aboutTor.dtd b/src/chrome/locale/nl/aboutTor.dtd index cb8fd18f..4b462d6c 100644 --- a/src/chrome/locale/nl/aboutTor.dtd +++ b/src/chrome/locale/nl/aboutTor.dtd @@ -6,12 +6,12 @@ <!ENTITY aboutTor.title "Over Tor"> -<!ENTITY aboutTor.ready.label "Explore. Privately."> +<!ENTITY aboutTor.ready.label "Onderzoek. Privé."> <!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> <!ENTITY aboutTor.failure.label "Er ging iets mis!"> <!ENTITY aboutTor.failure2.label "Tor werkt niet in deze browser."> -<!ENTITY aboutTor.search.label "Search with DuckDuckGo"> +<!ENTITY aboutTor.search.label "Zoek met DuckDuckGo"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Vragen?"> @@ -21,8 +21,22 @@ <!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual"> <!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding."> -<!ENTITY aboutTor.getInvolved.label "Get Involved »"> +<!ENTITY aboutTor.getInvolved.label "Doe Mee"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> -<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> +<!ENTITY aboutTor.newsletter.tagline "Krijg het laatste Tor nieuws regelrecht in jouw inbox."> +<!ENTITY aboutTor.newsletter.link_text "Meld je aan voor Tor Nieuws."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Kracht in Nummers"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> +<!ENTITY aboutTor.donationBanner.line2b "Universele rechten van de mens bevorderen."> +<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2d "Bescherm de privacy van miljoenen."> +<!ENTITY aboutTor.donationBanner.line2e "Houdt Tor sterk."> +<!ENTITY aboutTor.donationBanner.line2f "We hebben jouw ondersteuning nodig!"> + +<!ENTITY aboutTor.donationBanner.line3 "Geef vandaag, en Mozilla geeft hetzelfde bedrag."> + +<!ENTITY aboutTor.donationBanner.buttonA "Geef Nu"> +<!ENTITY aboutTor.donationBanner.buttonB "Ik Doe Mee"> diff --git a/src/chrome/locale/nl/browserOnboarding.properties b/src/chrome/locale/nl/browserOnboarding.properties index 2e72b207..247eb89b 100644 --- a/src/chrome/locale/nl/browserOnboarding.properties +++ b/src/chrome/locale/nl/browserOnboarding.properties @@ -3,52 +3,52 @@ # vim: set sw=2 sts=2 ts=8 et: onboarding.tour-tor-welcome=Welkom -onboarding.tour-tor-welcome.title=You’re ready. +onboarding.tour-tor-welcome.title=Je bent klaar. onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. -onboarding.tour-tor-welcome.button=Start Now +onboarding.tour-tor-welcome.button=Start nu. onboarding.tour-tor-privacy=Privacy onboarding.tour-tor-privacy.title=Snub trackers and snoopers. onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. -onboarding.tour-tor-privacy.button=Go to Tor Network +onboarding.tour-tor-privacy.button=Ga naar het Tor Netwerk -onboarding.tour-tor-network=Tor Network -onboarding.tour-tor-network.title=Travel a decentralized network. +onboarding.tour-tor-network=Tor Netwerk +onboarding.tour-tor-network.title=Reis over een gedecentraliseerd netwerk. onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. -onboarding.tour-tor-network.button=Go to Circuit Display +onboarding.tour-tor-network.button=Ga naar het Circuit Venster -onboarding.tour-tor-circuit-display=Circuit Display -onboarding.tour-tor-circuit-display.title=See your path. -onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. -onboarding.tour-tor-circuit-display.button=See My Path +onboarding.tour-tor-circuit-display=Circuit Venster +onboarding.tour-tor-circuit-display.title=Zie jouw route. +onboarding.tour-tor-circuit-display.description=Voor elk domein dat je bezoekt wordt jouw verkeer omgeleid en vercijferd in een circuit over drie Tor omleidingen over de wereld. Geen website weet waar je verbinding vandaan maakt. Je kunt een nieuwe route aanvragen door te klikken op "Nieuw Circuit voor deze Site' in ons Circuit Venster. +onboarding.tour-tor-circuit-display.button=Zie Mijn Route onboarding.tour-tor-security=Beveiliging -onboarding.tour-tor-security.title=Choose your experience. +onboarding.tour-tor-security.title=Kies jouw ervaring. onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. -onboarding.tour-tor-security.button=Review Settings +onboarding.tour-tor-security.button=Herzie Instellingen -onboarding.tour-tor-expect-differences=Experience Tips -onboarding.tour-tor-expect-differences.title=Expect some differences. +onboarding.tour-tor-expect-differences=Ervaring tips +onboarding.tour-tor-expect-differences.title=Verwacht enige verschillen. onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-expect-differences.button=Zie de VGVn onboarding.tour-tor-onion-services=Onion Services -onboarding.tour-tor-onion-services.title=Be extra protected. +onboarding.tour-tor-onion-services.title=Wees extra beschermd. onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. onboarding.tour-tor-onion-services.button=Visit an Onion # Circuit Display onboarding. onboarding.tor-circuit-display.next=Volgende onboarding.tor-circuit-display.done=Klaar -onboarding.tor-circuit-display.one-of-three=1 of 3 -onboarding.tor-circuit-display.two-of-three=2 of 3 -onboarding.tor-circuit-display.three-of-three=3 of 3 +onboarding.tor-circuit-display.one-of-three=1 van 3 +onboarding.tor-circuit-display.two-of-three=2 van 3 +onboarding.tor-circuit-display.three-of-three=3 van 3 -onboarding.tor-circuit-display.intro.title=How do circuits work? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.title=Hoe werken circuits? +onboarding.tor-circuit-display.intro.msg=Circuits worden gemaakt van willekeurig toegekende omleidingen, die computers over de wereld zijn, ingesteld om Tor verkeer door te sturen. -onboarding.tor-circuit-display.diagram.title=Circuit Display +onboarding.tor-circuit-display.diagram.title=Circuit Venster onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? +onboarding.tor-circuit-display.new-circuit.title=Heb je een nieuw circuit nodig? onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. diff --git a/src/chrome/locale/nl/torbutton.properties b/src/chrome/locale/nl/torbutton.properties index 920916f5..b5639c69 100644 --- a/src/chrome/locale/nl/torbutton.properties +++ b/src/chrome/locale/nl/torbutton.properties @@ -5,7 +5,7 @@ torbutton.circuit_display.this_browser = Deze browser torbutton.circuit_display.relay = Relay torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Onbekend land -torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard = Bewaking torbutton.circuit_display.guard_note = Your [Guard] node may not change. torbutton.circuit_display.learn_more = Lees meer torbutton.content_sizer.margin_tooltip = Tor Browser voegt deze rand toe om de afmetingen van het venster minder uit de toon te laten vallen. Dit maakt het moeilijker om u online te volgen. diff --git a/src/chrome/locale/pl/aboutTor.dtd b/src/chrome/locale/pl/aboutTor.dtd index 3d531447..53d22a06 100644 --- a/src/chrome/locale/pl/aboutTor.dtd +++ b/src/chrome/locale/pl/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> +<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> +<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> + +<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd b/src/chrome/locale/pt-BR/aboutTor.dtd index 44435395..a90f3e1a 100644 --- a/src/chrome/locale/pt-BR/aboutTor.dtd +++ b/src/chrome/locale/pt-BR/aboutTor.dtd @@ -6,16 +6,16 @@ <!ENTITY aboutTor.title "Sobre Tor"> -<!ENTITY aboutTor.ready.label "Explorar. Em particular."> +<!ENTITY aboutTor.ready.label "Navegar. Com privacidade."> <!ENTITY aboutTor.ready2.label "Você está pronto para a maior experiência de navegação privada do mundo."> <!ENTITY aboutTor.failure.label "Alguma coisa deu errado!"> <!ENTITY aboutTor.failure2.label "Tor não está funcionando neste navegador. "> -<!ENTITY aboutTor.search.label "Pesquise com DuckDuckGo"> +<!ENTITY aboutTor.search.label "Pesquisar com DuckDuckGo"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Perguntas?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Veja nosso Manual do Navegador Tor"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Consulte nosso Manual do Navegador Tor »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> <!ENTITY aboutTor.torbrowser_user_manual.label "Manual do Navegador Tor"> @@ -25,5 +25,19 @@ "> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Receba as últimas novidades do Tor diretamente na sua caixa de e-mail."> -<!ENTITY aboutTor.newsletter.link_text "Inscreva-se para novidades Tor"> +<!ENTITY aboutTor.newsletter.tagline "Receba as últimas notícias do Tor diretamente na sua caixa de e-mail."> +<!ENTITY aboutTor.newsletter.link_text "Inscreva-se para receber Notícias do Tor."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Nossa Força em Números"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonimidade adora companhia "> +<!ENTITY aboutTor.donationBanner.line2b "Avançar os direitos humanos universais."> +<!ENTITY aboutTor.donationBanner.line2c "Defender a liberdade."> +<!ENTITY aboutTor.donationBanner.line2d "Proteger a privacidade de milhões de pessoas."> +<!ENTITY aboutTor.donationBanner.line2e "Manter a força do Tor."> +<!ENTITY aboutTor.donationBanner.line2f "Precisamos do seu apoio!"> + +<!ENTITY aboutTor.donationBanner.line3 "Doe hoje, e a Mozilla duplicará a sua doação."> + +<!ENTITY aboutTor.donationBanner.buttonA "Doar Agora"> +<!ENTITY aboutTor.donationBanner.buttonB "Estou dentro"> diff --git a/src/chrome/locale/ru/aboutDialog.dtd b/src/chrome/locale/ru/aboutDialog.dtd index 369b0534..849a5063 100644 --- a/src/chrome/locale/ru/aboutDialog.dtd +++ b/src/chrome/locale/ru/aboutDialog.dtd @@ -1,7 +1,7 @@ <!ENTITY project.start "Разработано &brandShortName;">  <!ENTITY project.tpoLink "&vendorShortName;"> -<!ENTITY project.end ", проект, созданный, чтобы защитить вашу конфиденциальность и свободу в сети."> +<!ENTITY project.end ", некоммерческий проект для защиты приватности и других свобод в сети."> <!ENTITY help.start "Желаете помочь?">  diff --git a/src/chrome/locale/ru/aboutTBUpdate.dtd b/src/chrome/locale/ru/aboutTBUpdate.dtd index 81d607ca..b246094d 100644 --- a/src/chrome/locale/ru/aboutTBUpdate.dtd +++ b/src/chrome/locale/ru/aboutTBUpdate.dtd @@ -1,10 +1,10 @@ -<!ENTITY aboutTBUpdate.title "Обновление браузера Tor"> +<!ENTITY aboutTBUpdate.title "Обновление Tor Browser"> <!ENTITY aboutTBUpdate.updated "Tor Browser обновлен."> -<!ENTITY aboutTBUpdate.linkPrefix "Чтобы получить наиболее свежую информацию об этом выпуске,"> -<!ENTITY aboutTBUpdate.linkLabel "посетите наш вебсайт"> +<!ENTITY aboutTBUpdate.linkPrefix "Самая свежая информация об этой версии — "> +<!ENTITY aboutTBUpdate.linkLabel "на нашем сайте"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Журнал изменений:"> -<!ENTITY aboutTBUpdate.circuitDisplayHeading "Новая, измененная Схема индикации"> -<!ENTITY aboutTBUpdate.circuitDisplayDescription "Схема индикации Tor была перемещена и улучшена! Нажмите на сайт кнопка идентификации (расположенную в левой части строки URL), чтобы увидеть новый вид схемы."> +<!ENTITY aboutTBUpdate.circuitDisplayHeading "Цепочка Tor отображается по-новому"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "Цепочка узлов Tor теперь имеет другой, улучшенный вид. Нажмите на значок слева от адреса сайта, чтобы увидеть цепочку."> <!ENTITY aboutTBUpdate.learnMore "Подробнее"> diff --git a/src/chrome/locale/ru/aboutTor.dtd b/src/chrome/locale/ru/aboutTor.dtd index 71c4920c..30da9663 100644 --- a/src/chrome/locale/ru/aboutTor.dtd +++ b/src/chrome/locale/ru/aboutTor.dtd @@ -6,8 +6,8 @@ <!ENTITY aboutTor.title "О проекте Tor"> -<!ENTITY aboutTor.ready.label "Исследование. Конфиденциальность."> -<!ENTITY aboutTor.ready2.label "Вы готовы к самому конфиденциальному просмотру в мире."> +<!ENTITY aboutTor.ready.label "Исследуйте. Приватно."> +<!ENTITY aboutTor.ready2.label "Вы готовы к самому приватному просмотру веб-страниц в мире."> <!ENTITY aboutTor.failure.label "Что-то пошло не так!"> <!ENTITY aboutTor.failure2.label "Tor не работает в этом браузере."> @@ -15,10 +15,10 @@ <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Вопросы?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Ознакомьтесь с руководством по браузеру Тоr »"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Ознакомьтесь с руководством Тоr Browser »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "М"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Руководство по браузеру Tor"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Руководство по Tor Browser"> <!ENTITY aboutTor.tor_mission.label "Проект Tor является некоммерческой организацией США со статусом 501(c)(3), продвигающей права человека и свободы путем создания и развертывания технологий анонимности и конфиденциальности с открытым исходным кодом, поддержки их неограниченной доступности и использования, а также содействия их научному и популярному пониманию."> <!ENTITY aboutTor.getInvolved.label "Присоединяйтесь »"> @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Получайте последние новости Tor прямо на ваш почтовый ящик."> <!ENTITY aboutTor.newsletter.link_text "Подпишитесь на новости Tor."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Сила в цифрах"> + +<!ENTITY aboutTor.donationBanner.line2a "Анонимность уважает компании."> +<!ENTITY aboutTor.donationBanner.line2b "Продвижение всеобщих прав человека."> +<!ENTITY aboutTor.donationBanner.line2c "Встаньте на свободу."> +<!ENTITY aboutTor.donationBanner.line2d "Обеспечиваем конфиденциальность миллионам людей."> +<!ENTITY aboutTor.donationBanner.line2e "Сохраните Tor сильным."> +<!ENTITY aboutTor.donationBanner.line2f "Нам нужна твоя поддержка!"> + +<!ENTITY aboutTor.donationBanner.line3 "Пожертвуйте сегодня и Mozilla удвоит Ваше пожертвование."> + +<!ENTITY aboutTor.donationBanner.buttonA "Пожертвовать"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/ru/brand.dtd b/src/chrome/locale/ru/brand.dtd index e7e0a5ec..416dcd8e 100644 --- a/src/chrome/locale/ru/brand.dtd +++ b/src/chrome/locale/ru/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShorterName "Браузер Tor"> +<!ENTITY brandShorterName "Tor Browser"> <!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Проект Tor"> diff --git a/src/chrome/locale/ru/browserOnboarding.properties b/src/chrome/locale/ru/browserOnboarding.properties index 678da90e..1833487f 100644 --- a/src/chrome/locale/ru/browserOnboarding.properties +++ b/src/chrome/locale/ru/browserOnboarding.properties @@ -4,7 +4,7 @@ onboarding.tour-tor-welcome=Добро пожаловать onboarding.tour-tor-welcome.title=Вы готовы. -onboarding.tour-tor-welcome.description=Tor Browser предоставляет высочайший стандарт приватности и безопасности при просмотре сайтов. Теперь вы защищены от слежки, наблюдения и цензуры. Сейчас покажем вам, что к чему. +onboarding.tour-tor-welcome.description=Браузер Tor предоставляет высочайший стандарт приватности и безопасности при просмотре сайтов. Теперь вы защищены от отслеживания, наблюдения и цензуры. Небольшое введение покажет вам как. onboarding.tour-tor-welcome.button=Запустить onboarding.tour-tor-privacy=Приватность @@ -14,41 +14,41 @@ onboarding.tour-tor-privacy.button=Перейти в Сеть Tor onboarding.tour-tor-network=Сеть Tor onboarding.tour-tor-network.title=Перемещайтесь по децентрализованной сети. -onboarding.tour-tor-network.description=Tor Browser подключает вас к сети Tor, поддерживаемая волонтерами со всего мира. В отличии от VPN, здесь исключены возможные слабые звенья или централизованные организации, которым вам необходимо довериться для использования интернета. -onboarding.tour-tor-network.button=Перейти в Просмотр Цепочки +onboarding.tour-tor-network.description=Tor Browser подключает вас к сети Tor, которую поддерживают волонтеры со всего мира. В отличие от VPN здесь нет какого-то одного узла, отказ которого вызовет сбой всей системы, или централизованного сервиса, которому придется довериться, чтобы приватно использовать интернет. +onboarding.tour-tor-network.button=Посмотреть цепочку -onboarding.tour-tor-circuit-display=Просмотр Цепочки +onboarding.tour-tor-circuit-display=Просмотр цепочки onboarding.tour-tor-circuit-display.title=Ваша цепочка. onboarding.tour-tor-circuit-display.description=Для каждого посещаемого вами домена ваш трафик передается и шифруется в цепочке через три ретранслятора Tor, разбросанных по всему миру. Ни одному вебсайту недоступно ваша точка подключения сети. Вы можете запросить новую цепочку, нажав на ‘Новая Цепочка для этого сайта’ в ‘Просмотре Цепочки’ . -onboarding.tour-tor-circuit-display.button=See My Path +onboarding.tour-tor-circuit-display.button=Ваш цикл onboarding.tour-tor-security=Безопасность onboarding.tour-tor-security.title=Choose your experience. -onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. -onboarding.tour-tor-security.button=Review Settings +onboarding.tour-tor-security.description=Мы также предоставляем вам дополнительные настройки для повышения безопасности вашего браузера. Наши Параметры Безопасности позволяют блокировать элементы, которые могут быть использованы для атаки вашего компьютера. Нажмите ниже, чтобы посмотреть, что делают разные функции. +onboarding.tour-tor-security.button=Настройки Просмотра -onboarding.tour-tor-expect-differences=Experience Tips -onboarding.tour-tor-expect-differences.title=Expect some differences. -onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-expect-differences=Рекомендации +onboarding.tour-tor-expect-differences.title=Ждите небольших различий. +onboarding.tour-tor-expect-differences.description=Со всеми функциями безопасности и конфиденциальности, предоставляемыми Tor, ваш просмотр интернета может быть немного другим. Скорость может быть немного медленнее, и в зависимости от уровня безопасности некоторые элементы могут не работать или не загружаться. Вас также могут попросить доказать, что вы человек, а не робот. +onboarding.tour-tor-expect-differences.button=Посмотреть FAQ onboarding.tour-tor-onion-services=Onion-сервисы -onboarding.tour-tor-onion-services.title=Be extra protected. -onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. -onboarding.tour-tor-onion-services.button=Visit an Onion +onboarding.tour-tor-onion-services.title=Станьте особенно защищены. +onboarding.tour-tor-onion-services.description=Onion Services - это сайты, которые заканчиваются на .onion, они обеспечивают дополнительную защиту владельцам и посетителям, предоставляя дополнительные гарантии против цензуры. Onion Services позволяют любому анонимно предоставлять контент и услуги. Нажмите ниже, чтобы посетить Onion сайт DuckDuckGo. +onboarding.tour-tor-onion-services.button=Посетите Onion # Circuit Display onboarding. onboarding.tor-circuit-display.next=Вперёд onboarding.tor-circuit-display.done=Готово -onboarding.tor-circuit-display.one-of-three=1 of 3 -onboarding.tor-circuit-display.two-of-three=2 of 3 -onboarding.tor-circuit-display.three-of-three=3 of 3 +onboarding.tor-circuit-display.one-of-three=1 из 3 +onboarding.tor-circuit-display.two-of-three=2 из 3 +onboarding.tor-circuit-display.three-of-three=3 из 3 -onboarding.tor-circuit-display.intro.title=How do circuits work? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.title=Как работает цикл? +onboarding.tor-circuit-display.intro.msg=Цикл состоит из случайно назначенных ретрансляторов, которые являются компьютерами по всему миру, сконфигурированными для пересылки трафика Tor. Цикл делает ваш браузер безопасным и позволяет подключаться к .onion сайтам. onboarding.tor-circuit-display.diagram.title=Просмотр Цепочки -onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. +onboarding.tor-circuit-display.diagram.msg=На этой диаграмме показаны ретрансляторы, которые составляют цикл для этого веб-сайта. Чтобы предотвратить привязку активности на разных сайтах, каждый веб-сайт получает другой цикл. -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? -onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. +onboarding.tor-circuit-display.new-circuit.title=Нуждаетесь в новом цикле? +onboarding.tor-circuit-display.new-circuit.msg=Если вы не можете подключиться к веб-сайту, который вы пытаетесь посетить, или он не загружается должным образом, вы можете использовать эту кнопку, чтобы перезагрузить сайт с новым циклом. diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd index cae369e4..26dd7455 100644 --- a/src/chrome/locale/ru/torbutton.dtd +++ b/src/chrome/locale/ru/torbutton.dtd @@ -13,7 +13,7 @@ <!ENTITY torbutton.button.tooltip "Нажмите, чтобы инициализировать Torbutton"> <!ENTITY torbutton.prefs.security_settings "Настройки безопасности Tor Browser"> <!ENTITY torbutton.prefs.restore_defaults "Восстановить значения по умолчанию"> -<!ENTITY torbutton.prefs.custom_warning "Ваши настройки браузера, привели к необычным параметрам безопасности. По соображениям безопасности и конфиденциальности, мы рекомендуем вам выбрать один из уровней безопасности по умолчанию."> +<!ENTITY torbutton.prefs.custom_warning "Ваши настройки браузера привели к необычным параметрам безопасности. По соображениям безопасности и приватности мы рекомендуем выбрать один из уровней безопасности по умолчанию."> <!ENTITY torbutton.cookiedialog.title "Управление защитой куки-файлов"> <!ENTITY torbutton.cookiedialog.lockCol "Защищено"> <!ENTITY torbutton.cookiedialog.domainCol "Ведущий узел"> diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv/aboutTor.dtd index b357efc1..94cea14a 100644 --- a/src/chrome/locale/sv/aboutTor.dtd +++ b/src/chrome/locale/sv/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> +<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> +<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> + +<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd index ce8761f2..e4a2443d 100644 --- a/src/chrome/locale/tr/aboutTor.dtd +++ b/src/chrome/locale/tr/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Tor ile ilgili son gelişmeler doğrudan e-posta kutunuza gelsin."> <!ENTITY aboutTor.newsletter.link_text "Tor Haber Bültenine Abone Olun"> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Birlikten Kuvvet Doğar"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonimlik birlikteliği sever."> +<!ENTITY aboutTor.donationBanner.line2b "Evrensel insan haklarını geliştir."> +<!ENTITY aboutTor.donationBanner.line2c "Özgürlüğü savun."> +<!ENTITY aboutTor.donationBanner.line2d "Milyonların gizliliğini koru."> +<!ENTITY aboutTor.donationBanner.line2e "Tor uygulamasının gücünü koru."> +<!ENTITY aboutTor.donationBanner.line2f "Desteğinize ihtiyacımız var!"> + +<!ENTITY aboutTor.donationBanner.line3 "Bugün yaptığınız her bağış kadar Mozilla da bağış yapacak."> + +<!ENTITY aboutTor.donationBanner.buttonA "Şimdi Bağış Yapın"> +<!ENTITY aboutTor.donationBanner.buttonB "Ben de Varım"> diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd index d8eb7323..b087f9ea 100644 --- a/src/chrome/locale/vi/aboutTor.dtd +++ b/src/chrome/locale/vi/aboutTor.dtd @@ -6,23 +6,37 @@ <!ENTITY aboutTor.title "Thông tin về Tor"> -<!ENTITY aboutTor.ready.label "Explore. Privately."> -<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> -<!ENTITY aboutTor.failure.label "Có gì đó đã sai!"> +<!ENTITY aboutTor.ready.label "Khám phá. Riêng tư."> +<!ENTITY aboutTor.ready2.label "Bạn đã sẵn sàng cho trải nghiệm duyệt web riêng tư nhất trên thế giới."> +<!ENTITY aboutTor.failure.label "Có Lỗi Xảy Ra!"> <!ENTITY aboutTor.failure2.label "Tor không hoạt động trên trình duyệt này."> -<!ENTITY aboutTor.search.label "Search with DuckDuckGo"> +<!ENTITY aboutTor.search.label "Tìm kiếm với DuckDuckGo"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Những câu hỏi?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Xem qua Hướng dẫn Trình duyệt Tor »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Hướng dẫn Trình duyệt Tor"> -<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding."> -<!ENTITY aboutTor.getInvolved.label "Get Involved »"> +<!ENTITY aboutTor.tor_mission.label "The Tor Project là một tổ chức phi lợi nhuận US 501(c)(3) của Hoa Kỳ thúc đẩy quyền con người và tự do bằng cách tạo và triển khai các công nghệ bảo mật và ẩn danh miễn phí và mã nguồn mở, hỗ trợ tính sẵn có và sử dụng không hạn chế của chúng và nâng cao hiểu biết khoa học và phổ biến của họ."> +<!ENTITY aboutTor.getInvolved.label "Tham gia »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> -<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> +<!ENTITY aboutTor.newsletter.tagline "Nhận thông tin mói nhất từ Tor vào hộp thư của bạn."> +<!ENTITY aboutTor.newsletter.link_text "Đăng kí nhận tin tức từ Tor."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> +<!ENTITY aboutTor.donationBanner.line2b "Nâng cao nhân quyền phổ thông."> +<!ENTITY aboutTor.donationBanner.line2c "Đứng lên vì tự do."> +<!ENTITY aboutTor.donationBanner.line2d "Bảo vệ sự riêng tư của hàng triệu người."> +<!ENTITY aboutTor.donationBanner.line2e "Giữ cho Tor trở nên mạnh mẽ."> +<!ENTITY aboutTor.donationBanner.line2f "Chúng toi cần sự hỗ trợ của bạn!"> + +<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donate Ngay bây giờ"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd index 36e9b9a5..502cbb8c 100644 --- a/src/chrome/locale/zh-CN/aboutTor.dtd +++ b/src/chrome/locale/zh-CN/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "通过邮件获取 Tor 的最新消息。"> <!ENTITY aboutTor.newsletter.link_text "注册 Tor 新闻列表"> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> +<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> +<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> + +<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index aa7f8619..e9ea7dbe 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -48,4 +48,4 @@ <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "一些字体，图标，数学符号与图片被禁用。"> <!ENTITY torbutton.prefs.sec_click_to_play_media "点击播放音频或视频（HTML5 媒体）。"> <!ENTITY torbutton.circuit_display.title "tor链路"> -<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> +<!ENTITY torbutton.circuit_display.new_circuit "为此站点使用新线路"> diff --git a/src/chrome/locale/zh-TW/aboutTor.dtd b/src/chrome/locale/zh-TW/aboutTor.dtd index 0e049b1b..b08ffa26 100644 --- a/src/chrome/locale/zh-TW/aboutTor.dtd +++ b/src/chrome/locale/zh-TW/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "將 Tor 的最新消息直接傳送到您的收件匣。"> <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> +<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> +<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.line2f "我們需要您的支持"> + +<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "立刻捐款"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/zh-TW/torbutton.dtd b/src/chrome/locale/zh-TW/torbutton.dtd index 0ddbd823..8fe54733 100644 --- a/src/chrome/locale/zh-TW/torbutton.dtd +++ b/src/chrome/locale/zh-TW/torbutton.dtd @@ -2,11 +2,11 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "建立新的洋蔥路由迴路來連接上此網站"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "安全設定中..."> +<!ENTITY torbutton.context_menu.preferences "安全設定..."> <!ENTITY torbutton.context_menu.preferences.key "S"> -<!ENTITY torbutton.context_menu.networksettings "洋蔥路由網路設定"> +<!ENTITY torbutton.context_menu.networksettings "洋蔥路由網路設定..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> -<!ENTITY torbutton.context_menu.downloadUpdate "檢查洋蔥路由瀏覽器更新...."> +<!ENTITY torbutton.context_menu.downloadUpdate "檢查洋蔥路由瀏覽器更新…"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie 保護"> <!ENTITY torbutton.context_menu.cookieProtections.key "C">

1 0

[torbutton/master] Bug 23925: Donation banner for YE 2018 Campaign
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 4c9e8dc0f8a0d45f6955801a24a1d45a98cccdf0 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Oct 15 21:15:09 2018 -0700 Bug 23925: Donation banner for YE 2018 Campaign Design by Antonela Debiasi --- src/chrome/content/aboutTor/aboutTor-content.js | 30 +++++-- src/chrome/content/aboutTor/aboutTor.xhtml | 49 +++++++--- src/chrome/content/torbutton.js | 18 ++-- src/chrome/skin/aboutTor.css | 114 +++++++++++++++++------- src/chrome/skin/donation_banner_image_3x.png | Bin 0 -> 71927 bytes src/chrome/skin/newsletter_3x.png | Bin 6735 -> 0 bytes src/defaults/preferences/preferences.js | 2 +- 7 files changed, 152 insertions(+), 61 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index ff5a970b..e8f5ffa2 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -24,7 +24,7 @@ let { bindPrefAndInit, show_torbrowser_manual } = Cu.import("resource://torbutto var AboutTorListener = { kAboutTorLoadedMessage: "AboutTor:Loaded", kAboutTorChromeDataMessage: "AboutTor:ChromeData", - kAboutTorHideTorNewsBanner: "AboutTor:HideTorNewsBanner", + kAboutTorHideDonationBanner: "AboutTor:HideDonationBanner", get isAboutTor() { return content.document.documentURI.toLowerCase() == "about:tor"; @@ -61,20 +61,24 @@ var AboutTorListener = { setupBannerClosing: function () { let that = this; - let closer = content.document.getElementById("tornews-banner-closer"); + let closer = content.document.getElementById("donation-banner-closer"); closer.addEventListener("click", function () { - sendAsyncMessage(that.kAboutTorHideTorNewsBanner); + sendAsyncMessage(that.kAboutTorHideDonationBanner); }); - let link = content.document.querySelector("#tornews-banner-message a"); - link.addEventListener("click", function () { + let button = content.document.getElementById("donation-banner-button"); + button.addEventListener("click", function () { // Wait until page unloads so we don't hide banner before that. content.addEventListener("unload", function () { - sendAsyncMessage(that.kAboutTorHideTorNewsBanner); + sendAsyncMessage(that.kAboutTorHideDonationBanner); }); }); - bindPrefAndInit("extensions.torbutton.tornews_banner_countdown", - countdown => content.document.body.setAttribute( - "show-tornews-banner", countdown > 0)); + bindPrefAndInit("extensions.torbutton.donation_banner_countdown", + countdown => { + if (content.document && content.document.body) { + content.document.body.setAttribute( + "show-donation-banner", countdown > 0); + } + }); }, onPageLoad: function() { @@ -124,6 +128,14 @@ var AboutTorListener = { content.document.getElementById("manualLink").href = "https://tb-manual.torproject.org/" + aLocale; + // Don't use "Count Me In" phrase in non-en-US locales + if (!aLocale.startsWith("en")) { + let button = content.document.getElementById("donation-banner-button"); + button.innerHTML = button.getAttribute("data-0"); + let theURL = button.getAttribute("href"); + button.setAttribute("href", theURL.slice(0,-2)); + } + // Display the Tor Browser product name and version. try { const kBrandBundle = "chrome://branding/locale/brand.properties"; diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 87fe8307..9256748e 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -31,21 +31,48 @@ window.addEventListener("pageshow", function() { </script> </head> <body dir="&locale.dir;"> - <div id="tornews-banner"> - <div></div> - <div id="tornews-banner-message"> - <div id="tornews-banner-icon"></div> - <div>&aboutTor.newsletter.tagline; - <a href="https://newsletter.torproject.org"> - &aboutTor.newsletter.link_text; - </a> + <div id="donation-banner"> + <div id="donation-banner-image"></div> + <div id="donation-banner-lines"> + <div id="donation-banner-line1">&aboutTor.donationBanner.line1;</div> + <div id="donation-banner-line2" + data-0="&aboutTor.donationBanner.line2a;" + data-1="&aboutTor.donationBanner.line2b;" + data-2="&aboutTor.donationBanner.line2c;" + data-3="&aboutTor.donationBanner.line2d;" + data-4="&aboutTor.donationBanner.line2e;" + data-5="&aboutTor.donationBanner.line2f;"> + &aboutTor.donationBanner.line2a; </div> + <div id="donation-banner-line3">&aboutTor.donationBanner.line3;</div> + <a id="donation-banner-button" + href="https://www.torproject.org/donate/donate-sin-tbd0-0" + type="button" + data-0="&aboutTor.donationBanner.buttonA;" + data-1="&aboutTor.donationBanner.buttonB;"> + &aboutTor.donationBanner.buttonA; + </a> </div> - <div id="tornews-banner-closer">×</div> + <div id="donation-banner-closer">×</div> </div> - +<script type="text/javascript"> + <![CDATA[ + let lineChoice = Math.floor(Math.random() * 6); + let line2 = document.getElementById("donation-banner-line2"); + let line2text = line2.getAttribute(`data-${lineChoice}`); + let line2pieces = line2text.split(" "); + let line2end = '<span>' + line2pieces.pop() + '</span>'; + line2pieces.push(line2end); + line2.innerHTML = line2pieces.join(" "); + let buttonChoice = Math.floor(Math.random() * 2); + let button = document.getElementById("donation-banner-button"); + button.innerHTML = button.getAttribute(`data-${buttonChoice}`); + button.setAttribute("href", + `https://www.torproject.org/donate/donate-sin-tbd${lineChoice}-${buttonChoice}`); +]]> +</script> + <div id="torstatus-version"/> <div class="torcontent-container"> - <div id="torstatus-version"/> <div id="torstatus" class="top"> <div id="torstatus-on-container" class="hideIfTorOff torstatus-container"> <div class="heading1">&aboutTor.ready.label;</div> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 03dc3563..fc1a38d8 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -19,7 +19,7 @@ const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion" const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed"; -const k_tb_tornews_banner_countdown = "extensions.torbutton.tornews_banner_countdown"; +const k_tb_donation_banner_countdown = "extensions.torbutton.donation_banner_countdown"; var m_tb_prefs = Services.prefs; @@ -233,10 +233,10 @@ function torbutton_init_toolbutton() } // Show the Sign Up for Tor News banner a finite number of times. -function torbutton_tornews_banner_countdown() { - let count = m_tb_prefs.getIntPref(k_tb_tornews_banner_countdown, 0); +function torbutton_donation_banner_countdown() { + let count = m_tb_prefs.getIntPref(k_tb_donation_banner_countdown, 0); if (count > 0) { - m_tb_prefs.setIntPref(k_tb_tornews_banner_countdown, count - 1); + m_tb_prefs.setIntPref(k_tb_donation_banner_countdown, count - 1); } } @@ -348,10 +348,10 @@ function torbutton_init() { // Add about:tor IPC message listener. window.messageManager.addMessageListener("AboutTor:Loaded", torbutton_abouttor_message_handler); - window.messageManager.addMessageListener("AboutTor:HideTorNewsBanner", + window.messageManager.addMessageListener("AboutTor:HideDonationBanner", torbutton_abouttor_message_handler); - torbutton_tornews_banner_countdown(); + torbutton_donation_banner_countdown(); setupPreferencesForMobile(); @@ -431,9 +431,9 @@ var torbutton_abouttor_message_handler = { aMessage.target.messageManager.sendAsyncMessage("AboutTor:ChromeData", this.chromeData); break; - case "AboutTor:HideTorNewsBanner": - torbutton_log(5, "message AboutTor:HideTorNewsBanner received"); - m_tb_prefs.setIntPref(k_tb_tornews_banner_countdown, 0); + case "AboutTor:HideDonationBanner": + torbutton_log(5, "message AboutTor:HideDonationBanner received"); + m_tb_prefs.setIntPref(k_tb_donation_banner_countdown, 0); break; } }, diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index ce0a2f29..9f195cfd 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -272,74 +272,126 @@ body:not([showmanual]) .showForManual { border-radius: 50px 50px 0 0; } -/* Tor News Signup Banner +/* Donation Banner * While this banner is present, we need to * offset the elements normally at the top of * the window. */ -#tornews-banner { +#donation-banner { display: flex; - align-items: center; + align-items: stretch; background-color: white; color: var(--abouttor-bg-toron-color); font-size: 16px; - height: 60px; - justify-content: space-between; + height: 200px; + justify-content: center; left: 0px; right: 0px; top: 0px; - transform: translateY(-60px); + position: absolute; + transform: translateY(-200px); transition: transform 200ms; + z-index: 1; } -body[show-tornews-banner="true"] #tornews-banner { +body[show-donation-banner="true"] #donation-banner { transform: translateY(0px); transition: transform 0ms; } -#tornews-banner-message { - align-items: center; - display: flex; - justify-content: center; -} - -#tornews-banner-message a { - color: var(--abouttor-bg-toron-color); -} - -#tornews-banner-icon { - background: url('chrome://torbutton/skin/newsletter_3x.png') no-repeat center center; - background-size: cover; - height: 32px; - margin: 0px 16px; - width: 32px; +#donation-banner-image { + background: url('chrome://torbutton/skin/donation_banner_image_3x.png') no-repeat center center; + background-size: contain; + height: 190px; + margin: 10px 10px 0px 0px; + width: 400px; } -#tornews-banner-closer { +#donation-banner-closer { display: flex; align-items: center; font-size: 20px; height: 22px; justify-content: center; - margin: 4px 20px; + margin: 4px; padding: 4px; + position: absolute; + offset-inline-end: 0px; + top: 0px; width: 22px; -moz-user-select: none; } -#tornews-banner-closer:hover { +#donation-banner-closer:hover { background-color: gray; cursor: pointer; } -body[show-tornews-banner="false"] #torstatus-version, -body[show-tornews-banner="false"] #onboarding-overlay-button { +#donation-banner-lines { + align-items: start; + display: flex; + flex-direction: column; + justify-content: space-around; + padding: 20px 0px; +} + +#donation-banner-line1 { + font-size: 11px; + font-weight: bold; + text-transform: uppercase; +} + +#donation-banner-line2 { + font-size: 20px; + font-weight: bold; +} + +#donation-banner-line2 span { + background-color: #a9fef8; +} + +#donation-banner-line3 { + font-size: 14px; +} + +#donation-banner-button { + background-color: var(--abouttor-bg-toron-color); + border-radius: 3px; + border: 0px; + color: white; + font-size: 14px; + font-weight: bold; + margin: 10px 0px; + padding: 10px 24px; + text-decoration: none; +} + +#donation-banner-button:hover { + background-color: #683d7d; + cursor: pointer; +} + +body[show-donation-banner="false"] .torcontent-container, +body[show-donation-banner="false"] .onion-pattern-container, +body[show-donation-banner="false"] #torstatus-version, +body[show-donation-banner="false"] #onboarding-overlay-button { transition: transform 200ms; } -body[show-tornews-banner="true"] #torstatus-version, -body[show-tornews-banner="true"] #onboarding-overlay-button { - transform: translateY(60px); +body[show-donation-banner="true"] .torcontent-container, +body[show-donation-banner="true"] .onion-pattern-container { + transform: translateY(80px); transition: transform 0ms; } + +body[show-donation-banner="true"] .onion-pattern-container { + position: fixed; +} + +body[show-donation-banner="true"] #torstatus-version, +body[show-donation-banner="true"] #onboarding-overlay-button { + transform: translateY(200px); + transition: transform 0ms; + position: absolute; +} diff --git a/src/chrome/skin/donation_banner_image_3x.png b/src/chrome/skin/donation_banner_image_3x.png new file mode 100644 index 00000000..6eb7fbbb Binary files /dev/null and b/src/chrome/skin/donation_banner_image_3x.png differ diff --git a/src/chrome/skin/newsletter_3x.png b/src/chrome/skin/newsletter_3x.png deleted file mode 100644 index 821572fa..00000000 Binary files a/src/chrome/skin/newsletter_3x.png and /dev/null differ diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 45b60ce8..9beb3993 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -6,7 +6,7 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglo pref("extensions.torbutton.display_circuit", true); pref("extensions.torbutton(a)torproject.org.description", "chrome://torbutton/locale/torbutton.properties"); pref("extensions.torbutton.updateNeeded", false); -pref("extensions.torbutton.tornews_banner_countdown", 4); +pref("extensions.torbutton.donation_banner_countdown", 12); // Tor check and proxy prefs pref("extensions.torbutton.test_enabled",true);

1 0

[tor-browser-build/maint-8.0] Bug 27552: Use bundled dir on CentOS/RHEL 6
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit af1a15c5047041c0d1f8b4cef2c4aa723a1c0021 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 17 12:37:17 2018 +0200 Bug 27552: Use bundled dir on CentOS/RHEL 6 On CentOS/RHEL 6, add the bundled directory from the firefox package to the LD_LIBRARY_PATH. In addition, we don't reset anymore the previous LD_LIBRARY_PATH value, but only add new directories to it. This allows users to set LD_LIBRARY_PATH before starting the browser if additional libraries are needed. --- projects/firefox/start-firefox | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/projects/firefox/start-firefox b/projects/firefox/start-firefox index dc30574..7e7685c 100644 --- a/projects/firefox/start-firefox +++ b/projects/firefox/start-firefox @@ -2,13 +2,46 @@ basedir=$(dirname "$0") -LD_LIBRARY_PATH="$basedir/TorBrowser/Tor/" +add_LD_LIBRARY_PATH() { + if test -z "$LD_LIBRARY_PATH" + then + LD_LIBRARY_PATH="$1" + else + LD_LIBRARY_PATH="$1:$LD_LIBRARY_PATH" + fi +} + +# Bug 27552: On CentOS/RHEL 6, we need to add the firefox bundled dir +# to LD_LIBRARY_PATH +if test -f /etc/system-release-cpe +then + if test "$(cut -d : -f 3 /etc/system-release-cpe)" = centos || \ + test "$(cut -d : -f 3 /etc/system-release-cpe)" = "enterprise_linux" + then + if test "$(cut -d : -f 5 /etc/system-release-cpe)" = "6" + then + if test -d /usr/lib64/firefox/bundled/lib64 + then + add_LD_LIBRARY_PATH /usr/lib64/firefox/bundled/lib64 + elif test -d /usr/lib/firefox/bundled/lib + then + add_LD_LIBRARY_PATH /usr/lib/firefox/bundled/lib + else + echo "Error: the firefox package (version 60 or more) is not installed." >&2 + echo "On CentOS/RHEL 6, Tor Browser requires the firefox package to be installed." >&2 + exit 1 + fi + fi + fi +fi + # Check if the system has a more recent version of libstdc++.so.6; if yes, use # that instead of the bundled version. "$basedir/abicheck" >/dev/null 2>&1 if [ $? -ne 0 ]; then - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$basedir/TorBrowser/Tor/libstdc++/" + add_LD_LIBRARY_PATH "$basedir/TorBrowser/Tor/libstdc++/" fi +add_LD_LIBRARY_PATH "$basedir/TorBrowser/Tor/" export LD_LIBRARY_PATH exec "$basedir/firefox.real" "$@"

1 0

[tor-browser-build/maint-8.0] Bug 27546: Fix vertical scrollbar behavior in Tor Browser 8 with Gtk3
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 7d72590c2bac2567d176b6c11c6ac6abd39de811 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 18 09:45:03 2018 +0000 Bug 27546: Fix vertical scrollbar behavior in Tor Browser 8 with Gtk3 --- projects/tor-browser/build | 4 ++++ projects/tor-browser/config | 2 ++ projects/tor-browser/gtk3-settings.ini | 2 ++ 3 files changed, 8 insertions(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 219f622..4d51ec6 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -70,6 +70,10 @@ tar -C "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]" -xf [% c('input [% INCLUDE 'RelativeLink/start-tor-browser' -%] RBM_TB_EOF chmod +x ${TB_STAGE_DIR}/Browser/start-tor-browser + # Make sure we get the desired scrollbar behavior with Gtk3, see bug 27546. + GTK_SETTINGS_DIR=${TB_STAGE_DIR}/Browser/.config/gtk-3.0 + mkdir -p $GTK_SETTINGS_DIR + cp $rootdir/gtk3-settings.ini $GTK_SETTINGS_DIR/settings.ini [% END %] tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/tor-browser.tar.gz diff --git a/projects/tor-browser/config b/projects/tor-browser/config index e0581f4..1647b77 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -74,6 +74,8 @@ input_files: enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' enable: '[% c("var/linux") %]' + - filename: 'gtk3-settings.ini' + enable: '[% c("var/linux") %]' - project: libdmg-hfsplus name: libdmg enable: '[% c("var/osx") %]' diff --git a/projects/tor-browser/gtk3-settings.ini b/projects/tor-browser/gtk3-settings.ini new file mode 100644 index 0000000..55c8e89 --- /dev/null +++ b/projects/tor-browser/gtk3-settings.ini @@ -0,0 +1,2 @@ +[Settings] +gtk-primary-button-warps-slider = false

1 0

[tor-browser-build/master] Merge remote-tracking branch 'pc/bug26263-01'
by gk＠torproject.org 17 Oct '18

17 Oct '18

commit 8d7c170ac77f1a9901b1ef3fc36a9144ac3cd4cb Merge: b71d186 8043f25 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Oct 17 11:47:17 2018 +0000 Merge remote-tracking branch 'pc/bug26263-01' .../Bundle-Data/mac-applications.dmg/.DS_Store | Bin 12292 -> 15365 bytes .../mac-applications.dmg/.background/background.png | Bin 50020 -> 0 bytes .../.background/background.tiff | Bin 0 -> 36170 bytes .../.fseventsd/0000000000400c60 | Bin 173 -> 0 bytes .../mac-applications.dmg/.fseventsd/fseventsd-uuid | 1 - 5 files changed, 1 deletion(-)

1 0

[tor-browser-build/master] Bug 26263: app icon positioned incorrectly in macOS DMG installer window
by gk＠torproject.org 17 Oct '18

17 Oct '18

commit 8043f2546a8b24a6cead0e0e18e8053e490fc4b3 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Oct 16 17:29:59 2018 +0000 Bug 26263: app icon positioned incorrectly in macOS DMG installer window Use a new .DS_Store file that has the correct app icon position. Incorporate a new background image with updated Tor Browser branding, including @1x and @2x (Retina) images. Remove the .fseventsd/ directory, which is not needed in a DMG. These changes also fix bug 25151: Update Tor Browser branding on installation. --- .../Bundle-Data/mac-applications.dmg/.DS_Store | Bin 12292 -> 15365 bytes .../mac-applications.dmg/.background/background.png | Bin 50020 -> 0 bytes .../.background/background.tiff | Bin 0 -> 36170 bytes .../.fseventsd/0000000000400c60 | Bin 173 -> 0 bytes .../mac-applications.dmg/.fseventsd/fseventsd-uuid | 1 - 5 files changed, 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.DS_Store b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.DS_Store index aeb3104..deb29a7 100644 Binary files a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.DS_Store and b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.DS_Store differ diff --git a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.background/background.png b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.background/background.png deleted file mode 100644 index 94e4584..0000000 Binary files a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.background/background.png and /dev/null differ diff --git a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.background/background.tiff b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.background/background.tiff new file mode 100644 index 0000000..5d28d71 Binary files /dev/null and b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.background/background.tiff differ diff --git a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 deleted file mode 100644 index e21068d..0000000 Binary files a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 and /dev/null differ diff --git a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid deleted file mode 100644 index 538367d..0000000 --- a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid +++ /dev/null @@ -1 +0,0 @@ -B29020CB-1603-4E1C-8C56-5C8A4434D120 \ No newline at end of file

1 0

[tor-browser-build/master] Bug 21704: Abort install if CPU is missing SSE2 support
by boklm＠torproject.org 17 Oct '18

17 Oct '18

commit b71d1862ad5daf9c22edba498a11b9beeeb6c495 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Oct 17 12:06:28 2018 +0200 Bug 21704: Abort install if CPU is missing SSE2 support Update tbb-windows-installer to v0.5, adding patch to abort install if CPU is missing SSE2 support. --- projects/tbb-windows-installer/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tbb-windows-installer/config b/projects/tbb-windows-installer/config index 57c4fda..a990229 100644 --- a/projects/tbb-windows-installer/config +++ b/projects/tbb-windows-installer/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.4 +version: 0.5 git_url: https://github.com/moba/tbb-windows-installer.git git_hash: 'v[% c("version") %]' tag_gpg_id: 1

1 0

[tor-browser-build/master] Bug 27218: generate multiple bundles in parallel
by gk＠torproject.org 16 Oct '18

16 Oct '18

commit dfa0cc46fc0ef70f78313a651bffe178b4d1c4ee Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Oct 10 01:33:59 2018 +0200 Bug 27218: generate multiple bundles in parallel --- projects/tor-browser/build | 28 ++++++++++++++++++++++------ projects/tor-browser/config | 16 ++++++++++------ projects/tor-browser/ddmg.sh | 10 +++++----- projects/tor-browser/run_scripts | 30 ++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 17 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 9e8cddb..250a0e9 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -5,6 +5,9 @@ export TORBROWSER_VERSION='[% c("version") %]' mkdir -p $distdir +scripts_dir=/var/tmp/build_scripts +mkdir -p "$scripts_dir" + OUTDIR='[% dest_dir _ "/" _ c("filename") %]' mkdir -p $OUTDIR @@ -260,8 +263,6 @@ popd mv $distdir/tbb-windows-installer ${TB_STAGE_DIR} [% END %] -cp -a ${TB_STAGE_DIR} $distdir/$PKG_DIR - [% IF c("var/windows") %] TBDIR="$distdir/$PKG_DIR/Tor Browser/Browser" [% ELSIF c("var/osx") %] @@ -270,6 +271,11 @@ cp -a ${TB_STAGE_DIR} $distdir/$PKG_DIR TBDIR="$distdir/$PKG_DIR/Browser" [% END %] +cat > "$scripts_dir/create-$PKG_DIR" << SCRIPT_EOF +#!/bin/bash +set -e +cp -a ${TB_STAGE_DIR} $distdir/$PKG_DIR + pushd "$TBDIR[% IF c("var/osx") %]/Contents/Resources/[% END %]" rm -f precomplete python $MARTOOLS/createprecomplete.py @@ -279,8 +285,8 @@ cd $distdir [% IF c("var/build_mar") -%] # Create full MAR file and compressed package. - MAR_FILE=tor-browser-[% c("var/mar_osname") %]-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.mar - MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "$TBDIR" + [% SET mar_file = 'tor-browser-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_${PKG_LOCALE}.mar' %] + MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/[% mar_file %] "$TBDIR" [% END -%] [% IF c("var/linux") %] @@ -306,6 +312,7 @@ cd $distdir popd [% END %] rm -rf $distdir/${PKG_DIR} +SCRIPT_EOF cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% IF c("var/linux-x86_64") -%] @@ -322,6 +329,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% SET lang = tmpl(lang); SET xpi = '$rootdir/' _ c('input_files_by_name/firefox-langpacks') _ '/' _ lang _ '.xpi'; SET tbdir = '$distdir/tor-browser_' _ lang; + SET mar_file = 'tor-browser-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_' _ lang _ '.mar'; IF c("var/osx"); SET browserdir = tbdir _ '/Tor Browser.app'; ELSIF c("var/windows"); @@ -330,6 +338,9 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ SET browserdir = tbdir _ '/Browser'; END; %] + cat > "$scripts_dir/create-tor-browser_[% lang %]" << SCRIPT_EOF +#!/bin/bash + set -e cp -a ${TB_STAGE_DIR} [% tbdir %] cp [% xpi %] "[% browserdir %]/$EXTSPATH/langpack-[% lang %](a)firefox.mozilla.org.xpi" @@ -357,9 +368,10 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ python $MARTOOLS/createprecomplete.py popd + cd $distdir + # Create full MAR file and compressed package for this locale. - MAR_FILE=tor-browser-[% c("var/mar_osname") %]-[% c("var/torbrowser_version") %]_[% lang %].mar - MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "[% browserdir %]" + MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/[% mar_file %] "[% browserdir %]" [% IF c("var/linux") %] [% SET tardir = 'tor-browser_' _ lang; c('tar', { @@ -388,5 +400,9 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ popd [% END %] rm -rf [% tbdir %] +SCRIPT_EOF [% END %] [% END %] + +chmod 775 $rootdir/run_scripts "$scripts_dir"/* +$rootdir/run_scripts [% c("buildconf/num_procs") %] "$scripts_dir" diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 1647b77..7b44d8f 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -6,6 +6,14 @@ var: container: use_container: 1 ddmg: '[% INCLUDE ddmg.sh %]' + deps: + - python + - libparallel-forkmanager-perl + - libfile-slurp-perl + - zip + - unzip + - bzip2 + - xz-utils targets: linux-i686: @@ -17,14 +25,9 @@ targets: osx-x86_64: var: mar_osname: osx64 - deps: + arch_deps: - genisoimage - - zip - - unzip - - python - - bzip2 - faketime - - xz-utils windows: var: arch_deps: @@ -41,6 +44,7 @@ targets: input_files: - project: container-image + - filename: run_scripts - project: firefox name: firefox - project: tor diff --git a/projects/tor-browser/ddmg.sh b/projects/tor-browser/ddmg.sh index a715300..97fddb1 100755 --- a/projects/tor-browser/ddmg.sh +++ b/projects/tor-browser/ddmg.sh @@ -4,8 +4,8 @@ find [% src %] ! -executable -exec chmod 0644 {} \; find [% src %] -exec [% c("var/touch") %] {} \; -dmg_tmpdir=$(mktemp -d) -[% SET filelist = '"$dmg_tmpdir/filelist.txt"' %] +dmg_tmpdir=\$(mktemp -d) +[% SET filelist = '"\$dmg_tmpdir/filelist.txt"' %] pushd [% src %] find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > [% filelist %] find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> [% filelist %] @@ -13,9 +13,9 @@ find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> [% filelis export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" -genisoimage -D -V "Tor Browser" -no-pad -R -apple -o "$dmg_tmpdir/tbb-uncompressed.dmg" -path-list [% filelist %] -graft-points -gid 20 -dir-mode 0755 -new-dir-mode 0755 +genisoimage -D -V "Tor Browser" -no-pad -R -apple -o "\$dmg_tmpdir/tbb-uncompressed.dmg" -path-list [% filelist %] -graft-points -gid 20 -dir-mode 0755 -new-dir-mode 0755 -dmg dmg "$dmg_tmpdir/tbb-uncompressed.dmg" [% c('dmg_out', { error_if_undef => 1 }) %] +dmg dmg "\$dmg_tmpdir/tbb-uncompressed.dmg" [% c('dmg_out', { error_if_undef => 1 }) %] popd -rm -Rf "$dmg_tmpdir" +rm -Rf "\$dmg_tmpdir" diff --git a/projects/tor-browser/run_scripts b/projects/tor-browser/run_scripts new file mode 100755 index 0000000..4b85b50 --- /dev/null +++ b/projects/tor-browser/run_scripts @@ -0,0 +1,30 @@ +#!/usr/bin/perl -w +use strict; + +use Parallel::ForkManager; +use File::Slurp; + +sub exit_error { + print STDERR "Error: ", $_[0], "\n"; + chdir '/'; + exit (exists $_[1] ? $_[1] : 1); +} + +exit_error "Wrong number of arguments" unless @ARGV == 2; +my ($nb_threads, $scripts_dir) = @ARGV; +exit_error "Could not enter $scripts_dir" unless chdir $scripts_dir; +my $pm = Parallel::ForkManager->new($nb_threads); +$pm->run_on_finish( + sub { + my ($pid, $exit, $id) = @_; + exit_error "Error running $id" unless $exit == 0; + print "Finished $id\n"; + } +); +foreach my $script (sort(read_dir($scripts_dir))) { + $pm->start($script) and next; + print "Running $script\n"; + exit_error "Error running $script" unless system("./$script") == 0; + $pm->finish; +} +$pm->wait_all_children;

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_27218_v4'
by gk＠torproject.org 16 Oct '18

16 Oct '18

commit d0bd427db75d980be121b12f30f59f18c4e47325 Merge: c65b5af dfa0cc4 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 16 18:02:12 2018 +0000 Merge remote-tracking branch 'boklm/bug_27218_v4' projects/tor-browser/build | 28 ++++++++++++++++++++++------ projects/tor-browser/config | 16 ++++++++++------ projects/tor-browser/ddmg.sh | 10 +++++----- projects/tor-browser/run_scripts | 30 ++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 17 deletions(-)

1 0

[tor-browser-build/master] Bug 28022: Use `/usr/bin/env bash` for bash invocation
by boklm＠torproject.org 16 Oct '18

16 Oct '18

commit c65b5af3d9c565d4e274fbd8606f0404623a19e1 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 15 17:24:53 2018 +0000 Bug 28022: Use `/usr/bin/env bash` for bash invocation We use `/usr/bin/env` for invocation in other scripts already. Let's use it in `execdesktop` as well. --- projects/tor-browser/RelativeLink/execdesktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/RelativeLink/execdesktop b/projects/tor-browser/RelativeLink/execdesktop index 27328b2..fa6dc0a 100755 --- a/projects/tor-browser/RelativeLink/execdesktop +++ b/projects/tor-browser/RelativeLink/execdesktop @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash TBB_START_PROG="$(grep '^X-TorBrowser-ExecShell' $1 | tail -1 | sed 's/^X-TorBrowser-ExecShell=//' | sed 's/%.//')"

1 0

[tor-browser-build/master] Bug 6111: Update URL for tor-browser-bundle-testsuite.git
by boklm＠torproject.org 15 Oct '18

15 Oct '18

commit ef8b470dc1a1361438f190844f42e18c7bc36375 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 15 16:37:16 2018 +0200 Bug 6111: Update URL for tor-browser-bundle-testsuite.git --- tools/ansible/roles/tbb-nightly-build/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml index d84a161..af7e03d 100644 --- a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml +++ b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml @@ -4,7 +4,7 @@ nightly_build_cron_hour: 2 nightly_build_cron_minute: 20 nightly_build_keep_builds: 2 testsuite_dir: "/home/{{ nightly_build_user }}/tbb-testsuite" -testsuite_git_url: https://git.torproject.org/boklm/tor-browser-bundle-testsuite.git +testsuite_git_url: https://git.torproject.org/user/boklm/tor-browser-bundle-testsuite.git testsuite_git_commit: 348ad855711382089c4fbf1badfec58e31a6c148 nightly_build_wwwdir: "/home/{{ nightly_build_user }}/www" nightly_build_nginx_enable: true

1 0

[tor-browser-build/master] Bug 28002: fix the precomplete file in the en-US installer
by gk＠torproject.org 12 Oct '18

12 Oct '18

commit 3fad7f22441cd2e106a2d5bd8ba7e4623fac409a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Oct 11 12:30:18 2018 +0200 Bug 28002: fix the precomplete file in the en-US installer The Windows installer for the en-US bundle was created from the $TB_STAGE_DIR instead of the $PKG_DIR where the precomplete file has been regenerated. --- projects/tor-browser/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 85d7eaa..9e8cddb 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -294,8 +294,8 @@ cd $distdir dmg_out => '$OUTDIR/TorBrowser-' _ c("var/torbrowser_version") _ '-osx64_${PKG_LOCALE}.dmg', }) %] [% ELSIF c("var/windows") %] - find "${TB_STAGE_DIR}" -exec [% c("var/touch") %] {} \; - pushd "${TB_STAGE_DIR}" + find "$PKG_DIR" -exec [% c("var/touch") %] {} \; + pushd "$PKG_DIR" makensis torbrowser.nsi # Working around NSIS braindamage mv torbrowser-install.exe torbrowser-install-tmp.exe

1 0

[tor-browser-build/master] Bug 27320: Add certutil and signmar to macOS mar-tools
by gk＠torproject.org 11 Oct '18

11 Oct '18

commit b40b18fc4b0e87b8536be04383258b2cd4e4c69b Author: JeremyRand <biolizard89(a)gmail.com> Date: Sat Sep 8 12:25:01 2018 +0000 Bug 27320: Add certutil and signmar to macOS mar-tools These binaries were already being built but were being discarded. Since reproducible builds of these tools for macOS are likely to be useful to some people (even though they're not required for Tor Browser to operate), it seems like they're worth distributing. They're placed in the mar-tools zip because that's where they were already being placed for Linux. --- projects/firefox/build | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/projects/firefox/build b/projects/firefox/build index da7640a..1b5a942 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -201,6 +201,14 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cp -p obj-*/dist/bin/$LIB $MARTOOLS/ done [% END %] +[% IF c("var/osx") %] + cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ + cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil $MARTOOLS/ + NSS_LIBS="libfreebl3.dylib libmozglue.dylib libnss3.dylib libnssdbm3.dylib libsoftokn3.dylib" + for LIB in $NSS_LIBS; do + cp -p obj-*/dist/bin/$LIB $MARTOOLS/ + done +[% END %] [% IF c("var/windows") %] cp -p obj-*/modules/libmar/tool/signmar.exe $MARTOOLS/ cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil.exe $MARTOOLS/

1 0

[tor-browser-build/master] Bug 27320: Add certutil and signmar to Windows mar-tools
by gk＠torproject.org 11 Oct '18

11 Oct '18

commit 6ed7eacc5b6b75fe888c67a7810c6bddad815f09 Author: JeremyRand <biolizard89(a)gmail.com> Date: Wed Oct 10 20:15:05 2018 +0000 Bug 27320: Add certutil and signmar to Windows mar-tools These binaries were already being built but were being discarded. Since reproducible builds of these tools for Windows are likely to be useful to some people (even though they're not required for Tor Browser to operate), it seems like they're worth distributing. They're placed in the mar-tools zip because that's where they were already being placed for Linux. --- projects/firefox/build | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/projects/firefox/build b/projects/firefox/build index 489d087..da7640a 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -201,6 +201,15 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cp -p obj-*/dist/bin/$LIB $MARTOOLS/ done [% END %] +[% IF c("var/windows") %] + cp -p obj-*/modules/libmar/tool/signmar.exe $MARTOOLS/ + cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil.exe $MARTOOLS/ + NSS_LIBS="freebl3.dll mozglue.dll nss3.dll nssdbm3.dll softokn3.dll" + for LIB in $NSS_LIBS; do + cp -p obj-*/dist/bin/$LIB $MARTOOLS/ + done + cp -a $rootdir/msvcr100.dll $MARTOOLS/ +[% END %] cd $distdir

1 0

[tor-browser-build/master] Bug 27320: Add nssckbi library to mar-tools
by gk＠torproject.org 11 Oct '18

11 Oct '18

commit bec987dfaae5e683a15e09a1e722b0de15161c52 Author: JeremyRand <biolizard89(a)gmail.com> Date: Sat Sep 8 13:24:59 2018 +0000 Bug 27320: Add nssckbi library to mar-tools This library is needed for a subset of certutil's functionality (specifically, the ability for certutil to change the trust settings of built-in certificates). --- projects/firefox/build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 1b5a942..c9330fa 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -195,7 +195,7 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ [% IF c("var/linux") %] cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil $MARTOOLS/ - NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" + NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssckbi.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" for LIB in $NSS_LIBS $NSPR_LIBS; do cp -p obj-*/dist/bin/$LIB $MARTOOLS/ @@ -204,7 +204,7 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ [% IF c("var/osx") %] cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil $MARTOOLS/ - NSS_LIBS="libfreebl3.dylib libmozglue.dylib libnss3.dylib libnssdbm3.dylib libsoftokn3.dylib" + NSS_LIBS="libfreebl3.dylib libmozglue.dylib libnss3.dylib libnssckbi.dylib libnssdbm3.dylib libsoftokn3.dylib" for LIB in $NSS_LIBS; do cp -p obj-*/dist/bin/$LIB $MARTOOLS/ done @@ -212,7 +212,7 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ [% IF c("var/windows") %] cp -p obj-*/modules/libmar/tool/signmar.exe $MARTOOLS/ cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil.exe $MARTOOLS/ - NSS_LIBS="freebl3.dll mozglue.dll nss3.dll nssdbm3.dll softokn3.dll" + NSS_LIBS="freebl3.dll mozglue.dll nss3.dll nssckbi.dll nssdbm3.dll softokn3.dll" for LIB in $NSS_LIBS; do cp -p obj-*/dist/bin/$LIB $MARTOOLS/ done

1 0

[tor-browser-build/master] Bug 27320: Add modutil, pk12util, and shlibsign to mar-tools
by gk＠torproject.org 11 Oct '18

11 Oct '18

commit 9a0a161ab2732102d89d2397a032abc6ea86131a Author: JeremyRand <biolizard89(a)gmail.com> Date: Sat Sep 8 13:32:15 2018 +0000 Bug 27320: Add modutil, pk12util, and shlibsign to mar-tools These binaries were already being built but were being discarded. Since reproducible builds of these tools are likely to be useful to some people (even though they're not required for Tor Browser to operate), it seems like they're worth distributing. They're placed in the mar-tools zip because that's where certutil was already being placed. --- projects/firefox/build | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/projects/firefox/build b/projects/firefox/build index c9330fa..c73590d 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -195,6 +195,9 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ [% IF c("var/linux") %] cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil $MARTOOLS/ + cp -p obj-*/security/nss/cmd/modutil/modutil_modutil/modutil $MARTOOLS/ + cp -p obj-*/security/nss/cmd/pk12util/pk12util_pk12util/pk12util $MARTOOLS/ + cp -p obj-*/security/nss/cmd/shlibsign/shlibsign_shlibsign/shlibsign $MARTOOLS/ NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssckbi.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" for LIB in $NSS_LIBS $NSPR_LIBS; do @@ -204,6 +207,9 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ [% IF c("var/osx") %] cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil $MARTOOLS/ + cp -p obj-*/security/nss/cmd/modutil/modutil_modutil/modutil $MARTOOLS/ + cp -p obj-*/security/nss/cmd/pk12util/pk12util_pk12util/pk12util $MARTOOLS/ + cp -p obj-*/security/nss/cmd/shlibsign/shlibsign_shlibsign/shlibsign $MARTOOLS/ NSS_LIBS="libfreebl3.dylib libmozglue.dylib libnss3.dylib libnssckbi.dylib libnssdbm3.dylib libsoftokn3.dylib" for LIB in $NSS_LIBS; do cp -p obj-*/dist/bin/$LIB $MARTOOLS/ @@ -212,6 +218,9 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ [% IF c("var/windows") %] cp -p obj-*/modules/libmar/tool/signmar.exe $MARTOOLS/ cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil.exe $MARTOOLS/ + cp -p obj-*/security/nss/cmd/modutil/modutil_modutil/modutil.exe $MARTOOLS/ + cp -p obj-*/security/nss/cmd/pk12util/pk12util_pk12util/pk12util.exe $MARTOOLS/ + cp -p obj-*/security/nss/cmd/shlibsign/shlibsign_shlibsign/shlibsign.exe $MARTOOLS/ NSS_LIBS="freebl3.dll mozglue.dll nss3.dll nssckbi.dll nssdbm3.dll softokn3.dll" for LIB in $NSS_LIBS; do cp -p obj-*/dist/bin/$LIB $MARTOOLS/

1 0

[tor-launcher/master] Bug 27994: Use the new Tor Browser logo
by gk＠torproject.org 11 Oct '18

11 Oct '18

commit 87d1731c48b9f3f10825390999b14a8199976bd0 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Oct 10 16:49:42 2018 -0400 Bug 27994: Use the new Tor Browser logo --- src/chrome/skin/network-settings.css | 1 - src/chrome/skin/tbb-logo.svg | 192 ++++++++++------------------------- 2 files changed, 56 insertions(+), 137 deletions(-) diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index c6a9f0b..40ca0f0 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -89,7 +89,6 @@ button.firstAnswer { .tbb-logo { list-style-image: url("chrome://torlauncher/skin/tbb-logo.svg"); - width: 40em; height: 60px; } diff --git a/src/chrome/skin/tbb-logo.svg b/src/chrome/skin/tbb-logo.svg index 8be32c2..240425a 100644 --- a/src/chrome/skin/tbb-logo.svg +++ b/src/chrome/skin/tbb-logo.svg @@ -1,137 +1,57 @@ -<?xml version="1.0" encoding="utf-8"?> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" - viewBox="0 0 328.6 66.3" enable-background="new 0 0 328.6 66.3" xml:space="preserve"> -<g> - <g> - <g> - <path fill="#68B044" d="M138.8,28.3h11.9c7.6,0,13.3,2.3,13.3,9.2c0,3.5-2,7-6.4,8.1v0.2c5.4,0.9,8.4,3.8,8.4,8.8 - c0,7.5-6.1,10.9-14.3,10.9h-12.9V28.3z M150.1,43.7c5.2,0,7.4-2,7.4-5.5c0-3.4-2.4-4.8-7.2-4.8h-4.8v10.3H150.1z M151,60.4 - c5.5,0,8.5-2.1,8.5-6.3c0-3.9-3-5.7-8.5-5.7h-5.6v12H151z"/> - </g> - <g> - <path fill="#68B044" d="M170.7,37.6h5.4l0.5,5h0.2c2-3.6,5-5.6,7.9-5.6c1.4,0,2.3,0.2,3.2,0.6l-1.1,5.7c-1-0.3-1.7-0.5-2.9-0.5 - c-2.2,0-4.9,1.5-6.6,5.8v17.1h-6.6V37.6z"/> - </g> - <g> - <path fill="#68B044" d="M201.4,36.9c7,0,13.3,5.4,13.3,14.7c0,9.3-6.3,14.7-13.3,14.7c-7,0-13.3-5.4-13.3-14.7 - C188.1,42.2,194.5,36.9,201.4,36.9z M201.4,60.9c4.1,0,6.6-3.7,6.6-9.3c0-5.6-2.5-9.4-6.6-9.4s-6.6,3.7-6.6,9.4 - C194.9,57.2,197.3,60.9,201.4,60.9z"/> - </g> - <g> - <path fill="#68B044" d="M216.7,37.6h6.6l3.4,14.5c0.6,2.7,1,5.3,1.5,8h0.2c0.5-2.7,1.1-5.4,1.8-8l3.6-14.5h6l3.7,14.5 - c0.7,2.7,1.3,5.3,1.9,8h0.2c0.5-2.7,1-5.4,1.5-8l3.4-14.5h6.2l-7.1,28h-7.8l-3.3-13.1c-0.6-2.6-1.1-5.2-1.7-8.2h-0.2 - c-0.5,3-1,5.6-1.7,8.2l-3.2,13h-7.5L216.7,37.6z"/> - </g> - <g> - <path fill="#68B044" d="M261,58.2c2.5,1.9,4.9,3.1,7.8,3.1c3,0,4.4-1.4,4.4-3.4c0-2.3-3-3.4-6-4.5c-3.7-1.4-7.9-3.5-7.9-8.2 - c0-4.9,3.9-8.4,10.2-8.4c3.9,0,7,1.6,9.3,3.4l-3,4c-1.9-1.4-3.9-2.4-6.2-2.4c-2.8,0-4.1,1.3-4.1,3.1c0,2.2,2.8,3.1,5.8,4.2 - c3.8,1.4,8,3.3,8,8.5c0,4.8-3.8,8.7-10.9,8.7c-3.8,0-7.9-1.7-10.6-3.9L261,58.2z"/> - </g> - <g> - <path fill="#68B044" d="M294.9,36.9c7.6,0,11.6,5.5,11.6,13.3c0,1.3-0.1,2.4-0.3,3.1h-17.8c0.6,5.1,3.8,7.9,8.3,7.9 - c2.4,0,4.4-0.7,6.5-2.1l2.2,4.1c-2.7,1.8-6,3-9.6,3c-7.8,0-13.8-5.4-13.8-14.7C282,42.5,288.4,36.9,294.9,36.9z M300.8,49.1 - c0-4.4-1.9-7.1-5.7-7.1c-3.3,0-6.2,2.5-6.7,7.1H300.8z"/> - </g> - <g> - <path fill="#68B044" d="M311.4,37.6h5.4l0.5,5h0.2c2-3.6,5-5.6,7.9-5.6c1.4,0,2.3,0.2,3.2,0.6l-1.1,5.7c-1-0.3-1.7-0.5-2.9-0.5 - c-2.2,0-4.9,1.5-6.6,5.8v17.1h-6.6V37.6z"/> - </g> - </g> - <g> - <g> - <rect x="120.4" y="6.2" fill="#494949" width="3" height="58"/> - </g> - </g> - <g> - <g> - <g id="layer3_17_" transform="translate(-92,-63.999774)"> - <g id="layer5_17_"> - <g id="path2554_28_"> - <g> - <path fill="#68B044" d="M152.1,68.8l-1.7,6.8c2.4-4.8,6.3-8.4,10.7-11.6c-3.2,3.8-6.2,7.5-8,11.3c3.1-4.3,7.2-6.7,11.8-8.2 - c-6.2,5.5-11,11.4-14.8,17.3l-3-1.3C147.7,78.3,149.5,73.5,152.1,68.8L152.1,68.8z"/> - </g> - </g> - <g id="path2534_7_"> - <g> - <path fill="#F5F8DE" d="M144.2,81.8l5.6,2.3c0,1.4-0.1,5.8,0.8,7.1c9.4,12.1,7.8,36.2-1.9,36.8c-14.7,0-20.4-10-20.4-19.2 - c0-8.4,10.1-14,16.1-18.9C146,88.6,145.7,85.6,144.2,81.8L144.2,81.8z"/> - </g> - </g> - <g id="path2536_18_"> - <g> - <path fill="#7E4798" d="M149.9,84l2,1c-0.2,1.3,0.1,4.3,1.4,5.1c5.9,3.7,11.5,7.7,13.7,11.7c7.8,14.1-5.5,27.2-17,25.9 - c6.2-4.6,8.1-14.1,5.7-24.5c-1-4.1-2.4-7.7-5.1-11.9C149.6,89.4,150,86.9,149.9,84L149.9,84z"/> - </g> - </g> - </g> - <g id="layer4_17_"> - <g id="path2540_18_"> - <g> - <path fill="#010101" d="M147.6,90.8c-0.4,2.2-0.9,6.2-2.8,7.6c-0.8,0.6-1.6,1.1-2.5,1.7c-3.4,2.3-6.9,4.5-8.4,10.2 - c-0.3,1.2,0,2.5,0.2,3.7c0.9,3.4,3.3,7.2,5.2,9.3c0,0.1,0.4,0.3,0.4,0.4c1.6,1.9,2.1,2.4,8,3.7l-0.1,0.7 - c-3.6-1-6.5-1.8-8.4-4c0,0-0.3-0.4-0.3-0.4c-2-2.3-4.4-6.1-5.3-9.7c-0.3-1.4-0.6-2.5-0.2-4c1.6-5.8,5.2-8.1,8.7-10.5 - c0.8-0.5,1.8-1,2.5-1.6C146,96.8,146.8,93.5,147.6,90.8L147.6,90.8z"/> - </g> - </g> - <g id="path2542_18_"> - <g> - <path fill="#010101" d="M149.1,99.9c0,2.5-0.2,3.7,0.4,5.5c0.4,1,1.7,2.5,2.1,3.9c0.5,1.9,1.1,3.9,1,5.2c0,1.4-0.1,4.1-0.7,7 - c-0.5,2.4-1.6,4.4-3.4,5.5c-1.9-0.4-4.1-1-5.4-2.2c-2.5-2.2-4.8-5.9-5.1-9.1c-0.2-2.6,2.2-6.5,5.6-8.4 - c2.9-1.7,3.5-3.6,4.1-6.6c-0.9,2.7-1.7,4.9-4.4,6.3c-4,2.1-6.1,5.6-5.9,9c0.3,4.3,2,7.2,5.4,9.5c1.4,1,4.1,2.1,5.8,2.3v-0.2 - c1.3-0.2,2.9-2.3,3.7-5.1c0.7-2.5,1-5.8,0.9-7.8c0-1.2-0.6-3.8-1.5-6.1c-0.5-1.3-1.3-2.6-1.9-3.5 - C149.4,104.2,149.4,102.2,149.1,99.9z"/> - </g> - </g> - <g id="path2544_18_"> - <g> - <path fill="#010101" d="M148.7,109.7c0,1.7,0.7,3.8,1,6c0.2,1.6,0.1,3.3,0.1,4.7c0,1.7-0.6,4.6-1.4,6.1 - c-0.7-0.3-1-0.7-1.5-1.3c-0.6-0.8-1-1.6-1.3-2.6c-0.3-0.7-0.6-1.5-0.8-2.5c-0.2-1.4-0.1-3.7,1.5-6c1.2-1.8,1.5-2,2-4 - c-0.6,1.9-1,2-2.3,3.6c-1.5,1.7-1.7,4.2-1.7,6.3c0,0.9,0.3,1.8,0.7,2.7c0.4,1,0.7,1.9,1.2,2.6c0.8,1.2,1.8,1.8,2.3,1.9 - c0,0,0,0,0,0c0,0,0,0,0,0v-0.1c0.9-1,1.5-2.1,1.7-3.1c0.2-1.2,0.3-2.5,0.4-4c0.1-1.2,0-2.9-0.3-4.6 - C149.8,113.4,149,111.2,148.7,109.7L148.7,109.7z"/> - </g> - </g> - <g id="path2550_18_"> - <g> - <path fill="#010101" d="M149,88.7c0,2.5,0.2,7.1,0.9,8.9c0.2,0.6,2,3.3,3.2,6.6c0.9,2.3,1,4.4,1.2,5 - c0.6,2.7-0.1,7.3-1.1,11.6c-0.5,2.3-2.1,5.2-4,6.4l-0.4,0.7c1,0,3.6-2.6,4.5-5.7c1.5-5.3,2.1-7.8,1.4-13.7 - c-0.1-0.6-0.3-2.5-1.2-4.6c-1.3-3.2-3.2-6.2-3.5-6.9C149.7,96,149.1,91.7,149,88.7L149,88.7z"/> - </g> - </g> - <g id="path2552_18_"> - <g> - <path fill="#010101" d="M149.9,84.3c-0.1,2.5-0.2,4.6,0.3,6.4c0.5,2.1,3.2,5,4.3,8.4c2.1,6.5,1.6,15,0,21.6 - c-0.6,2.3-3.3,5.7-6,6.8l2,0.5c1.1,0,3.9-2.7,5-5.7c1.8-4.7,2.1-10.3,1.4-16.3c0-0.6-1-5.7-1.9-7.8c-1.3-3.2-3.3-5.4-4.1-7.4 - c-0.6-1.5-0.8-5.4-0.4-6.3L149.9,84.3z"/> - </g> - </g> - </g> - </g> - <g id="path2528_14_"> - <g> - <path fill="#7E4798" d="M2.7,6.2H41c1.4,0,2.7,1.2,2.7,2.7v11.3c0,1.5-1.2,2.7-2.7,2.7h-7.9c-1.8,0-2.5,1-2.5,2.1v37 - c0,1.2-1,2.2-2.2,2.2h-13c-1.2,0-2.1-1-2.1-2.2V24.7c0-1.1-1-1.8-1.9-1.8H2.7c-1.5,0-2.7-1.2-2.7-2.7V8.9 - C0,7.4,1.2,6.2,2.7,6.2z"/> - </g> - </g> - <g id="path2532_14_"> - <g> - <path fill="#7E4798" d="M100.9,21.2h3.4c1.2,0,2.2,1,2.2,2.2v12.1c0,1.6,0.1,2.2-1.8,2.2c-3.8,0-5.5,2-5.5,4.2v20.5 - c0,1-0.9,1.8-2,1.8H85.1c-1.1,0-2-0.8-2-1.8V39.1c0-0.4,0-1,0-1.3c0.7-8.6,7.4-15.5,16-16.4C99.4,21.3,100.5,21.2,100.9,21.2 - L100.9,21.2z"/> - </g> - </g> - </g> - <g> - <g> - <path fill="#010101" d="M72,32.8c-2.1-1.9-4.6-3.4-7.3-4.9c-1.2-0.7-4.9-3.5-3.6-7.6l-9.3-3.8l-0.6,0.5c3.1,5.6,1.5,8.5,0,9.6 - c-3.1,2.1-7.6,4.8-9.9,7.2c-4.3,4.4-5.6,8.7-5.2,14.3c0.4,7.2,5.6,13.1,12.6,15.5c3.1,1,5.9,1.1,9,1.1c5.1,0,10.3-1.3,14-4.5 - c4-3.3,6.4-8.3,6.4-13.5C78.1,41.2,75.9,36.3,72,32.8z M70.6,58.9c-3.4,2.9-9.7,4.8-13,4.7c-3.7-0.2-7.3-0.8-10.4-2.3 - c-5.6-2.7-9.3-8.5-9.5-13.3c-0.5-9.7,4.1-12.5,8.4-16c2.4-2,5.8-3,7.7-6.5c0.4-0.8,0.6-2.5,0.1-4.2c-0.2-0.6-1.1-2.8-1.4-3.2 - l7,3.1c-0.9,3.2,1.8,6.5,3.9,7.7c2.1,1.2,5.5,3.4,7.5,5.3c3.6,3.2,5.5,7.7,5.5,12.5C76.3,51.2,74.3,55.8,70.6,58.9z"/> - </g> - </g> - </g> -</g> +<?xml version="1.0" encoding="UTF-8"?> +<svg width="210px" height="42px" viewBox="0 0 210 42" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.799999952"> + <g transform="translate(-154.000000, -173.000000)" fill="#010101" fill-rule="nonzero"> + <g transform="translate(154.000000, 173.000000)"> + <g transform="translate(88.085106, 17.181818)"> + <path d="M0.510638298,0.190909091 L8.10638298,0.190909091 C12.9574468,0.190909091 16.5957447,1.65454545 16.5957447,6.04545455 C16.5957447,8.27272727 15.3191489,10.5 12.5106383,11.2 L12.5106383,11.3272727 C15.9574468,11.9 17.8723404,13.7454545 17.8723404,16.9272727 C17.8723404,21.7 13.9787234,23.8636364 8.74468085,23.8636364 L0.510638298,23.8636364 L0.510638298,0.190909091 Z M7.72340426,9.99090909 C11.0425532,9.99090909 12.4468085,8.71818182 12.4468085,6.49090909 C12.4468085,4.32727273 10.9148936,3.43636364 7.85106383,3.43636364 L4.78723404,3.43636364 L4.78723404,9.99090909 L7.72340426,9.99090909 Z M8.29787234,20.6181818 C11.8085106,20.6181818 13.7234043,19.2818182 13.7234043,16.6090909 C13.7234043,14.1272727 11.8085106,12.9818182 8.29787234,12.9818182 L4.72340426,12.9818182 L4.72340426,20.6181818 L8.29787234,20.6181818 Z" id="Shape"></path> + <path d="M20.8723404,6.10909091 L24.3191489,6.10909091 L24.6382979,9.29090909 L24.7659574,9.29090909 C26.0425532,7 27.9574468,5.72727273 29.8085106,5.72727273 C30.7021277,5.72727273 31.2765957,5.85454545 31.8510638,6.10909091 L31.1489362,9.73636364 C30.5106383,9.54545455 30.0638298,9.41818182 29.2978723,9.41818182 C27.893617,9.41818182 26.1702128,10.3727273 25.0851064,13.1090909 L25.0851064,23.9909091 L20.8723404,23.9909091 L20.8723404,6.10909091 Z" id="Shape"></path> + <path d="M40.4680851,5.66363636 C44.9361702,5.66363636 48.9574468,9.1 48.9574468,15.0181818 C48.9574468,20.9363636 44.9361702,24.3727273 40.4680851,24.3727273 C36,24.3727273 31.9787234,20.9363636 31.9787234,15.0181818 C31.9787234,9.03636364 36.0638298,5.66363636 40.4680851,5.66363636 Z M40.4680851,20.9363636 C43.0851064,20.9363636 44.6808511,18.5818182 44.6808511,15.0181818 C44.6808511,11.4545455 43.0851064,9.03636364 40.4680851,9.03636364 C37.8510638,9.03636364 36.2553191,11.3909091 36.2553191,15.0181818 C36.3191489,18.5818182 37.8510638,20.9363636 40.4680851,20.9363636 Z" id="Shape"></path> + <path d="M50.2340426,6.10909091 L54.4468085,6.10909091 L56.6170213,15.3363636 C57,17.0545455 57.2553191,18.7090909 57.5744681,20.4272727 L57.7021277,20.4272727 C58.0212766,18.7090909 58.4042553,16.9909091 58.8510638,15.3363636 L61.1489362,6.10909091 L64.9787234,6.10909091 L67.3404255,15.3363636 C67.787234,17.0545455 68.1702128,18.7090909 68.5531915,20.4272727 L68.6808511,20.4272727 C69,18.7090909 69.3191489,16.9909091 69.6382979,15.3363636 L71.8085106,6.10909091 L75.7659574,6.10909091 L71.2340426,23.9272727 L66.2553191,23.9272727 L64.1489362,15.5909091 C63.7659574,13.9363636 63.4468085,12.2818182 63.0638298,10.3727273 L62.9361702,10.3727273 C62.6170213,12.2818182 62.2978723,13.9363636 61.8510638,15.5909091 L59.8085106,23.8636364 L55.0212766,23.8636364 L50.2340426,6.10909091 Z" id="Shape"></path> + <path d="M78.5106383,19.2181818 C80.106383,20.4272727 81.6382979,21.1909091 83.4893617,21.1909091 C85.4042553,21.1909091 86.2978723,20.3 86.2978723,19.0272727 C86.2978723,17.5636364 84.3829787,16.8636364 82.4680851,16.1636364 C80.106383,15.2727273 77.4255319,13.9363636 77.4255319,10.9454545 C77.4255319,7.82727273 79.9148936,5.6 83.9361702,5.6 C86.4255319,5.6 88.4042553,6.61818182 89.8723404,7.76363636 L87.9574468,10.3090909 C86.7446809,9.41818182 85.4680851,8.78181818 84,8.78181818 C82.212766,8.78181818 81.3829787,9.60909091 81.3829787,10.7545455 C81.3829787,12.1545455 83.1702128,12.7272727 85.0851064,13.4272727 C87.5106383,14.3181818 90.1914894,15.5272727 90.1914894,18.8363636 C90.1914894,21.8909091 87.7659574,24.3727273 83.2340426,24.3727273 C80.8085106,24.3727273 78.1914894,23.2909091 76.4680851,21.8909091 L78.5106383,19.2181818 Z" id="Shape"></path> + <path d="M100.148936,5.66363636 C105,5.66363636 107.553191,9.16363636 107.553191,14.1272727 C107.553191,14.9545455 107.489362,15.6545455 107.361702,16.1 L96,16.1 C96.3829787,19.3454545 98.4255319,21.1272727 101.297872,21.1272727 C102.829787,21.1272727 104.106383,20.6818182 105.446809,19.7909091 L106.851064,22.4 C105.12766,23.5454545 103.021277,24.3090909 100.723404,24.3090909 C95.7446809,24.3090909 91.9148936,20.8727273 91.9148936,14.9545455 C91.9148936,9.22727273 96,5.66363636 100.148936,5.66363636 Z M103.914894,13.4272727 C103.914894,10.6272727 102.702128,8.90909091 100.276596,8.90909091 C98.1702128,8.90909091 96.3191489,10.5 96,13.4272727 L103.914894,13.4272727 Z" id="Shape"></path> + <path d="M110.680851,6.10909091 L114.12766,6.10909091 L114.446809,9.29090909 L114.574468,9.29090909 C115.851064,7 117.765957,5.72727273 119.617021,5.72727273 C120.510638,5.72727273 121.085106,5.85454545 121.659574,6.10909091 L120.957447,9.73636364 C120.319149,9.54545455 119.87234,9.41818182 119.106383,9.41818182 C117.702128,9.41818182 115.978723,10.3727273 114.893617,13.1090909 L114.893617,23.9909091 L110.680851,23.9909091 L110.680851,6.10909091 Z" id="Shape"></path> + </g> + <rect id="Rectangle-path" x="76.5957447" y="5.09090909" width="1.91489362" height="36.9090909"></rect> + <g id="Black"> + <g id="Group"> + <g id="layer3_20_" transform="translate(26.263210, 0.000104)"> + <g id="layer5_20_" transform="translate(9.675919, 0.000000)"> + <g id="path2554_21_"> + <path d="M3.17923066,3.12366045 L2.0734113,7.53353402 C3.63998873,4.40987357 6.17415809,2.06712824 9.07693392,-7.10542736e-15 C6.95744681,2.4346177 5.02226293,4.8692354 3.87036776,7.34978928 C5.85162745,4.54768212 8.52402424,3.03178808 11.5189517,1.97525587 C7.51035649,5.51234196 4.33112583,9.37098134 1.93518388,13.1836845 L-2.84217094e-14,12.3568332 C0.322530647,9.27910897 1.47442581,6.15544852 3.17923066,3.12366045 Z" id="Shape"></path> + </g> + <g id="path2536_21_" transform="translate(1.382274, 12.862131)"> + <path d="M0.322530647,0.137808549 L1.65872904,0.826851294 C1.52050162,1.69963877 1.70480485,3.62895846 2.58024517,4.08832029 C6.45061294,6.47700181 10.0445259,9.04942806 11.4728759,11.6677905 C16.5412146,20.8090909 7.92503875,29.3072848 0.41468226,28.4804335 C4.46935325,25.4945816 5.66732422,19.3391331 4.1468226,12.5865141 C3.54783711,9.96815172 2.58024517,7.5794702 0.875440327,4.8692354 C0.13822742,3.62895846 0.41468226,1.97525587 0.322530647,0.137808549 Z" id="Shape"></path> + </g> + </g> + <g id="layer4_20_" transform="translate(0.000000, 12.862131)"> + <g id="path2540_21_" transform="translate(0.000000, 4.134256)"> + <path d="M9.90629844,0.367489464 C9.6298436,1.79151114 9.30731295,4.36393739 8.06326617,5.32859723 C7.5564323,5.69608669 7.00352262,6.06357616 6.45061294,6.43106562 C4.19289841,7.94695966 1.98125969,9.37098134 0.96759194,12.9999398 C0.737212907,13.7808549 0.921516134,14.6077062 1.10581936,15.3886213 C1.65872904,17.6394943 3.22530647,20.0281758 4.46935325,21.4521975 C4.46935325,21.4981337 4.69973228,21.6818784 4.69973228,21.7278146 C5.71340003,22.9221553 6.03593067,23.2896448 9.90629844,24.1624323 L9.81414682,24.5758579 C7.46428068,23.9786875 5.57517261,23.3815172 4.33112583,22.0034317 C4.33112583,21.9574955 4.10074679,21.7737508 4.10074679,21.7737508 C2.81062421,20.3037929 1.19797097,17.823239 0.645061294,15.4804937 C0.41468226,14.56177 0.230379033,13.8267911 0.506833873,12.8621312 C1.56657743,9.09536424 3.87036776,7.5794702 6.17415809,6.01763998 C6.68099197,5.69608669 7.32605326,5.37453341 7.83288714,4.96110777 C8.89263069,4.27206502 9.39946456,2 .11306442 9.90629844,0.367489464 Z" id="Shape"></path> + </g> + <g id="path2542_21_" transform="translate(3.225306, 10.105960)"> + <path d="M7.69465972,0.367489464 C7.74073552,1.97525587 7.5564323,2.80210716 7.97111456,3.95051174 C8.20149359,4.63955449 9.07693392,5.55827815 9.30731295,6.47700181 C9.6298436,7.67134256 9.99845005,9.00349187 9.99845005,9.83034317 C9.99845005,10.7490668 9.95237424,12.4946418 9.53769198,14.3320891 C9.21516134,15.8479831 8.52402424,17.1801325 7.32605326,17.9151114 C6.08200648,17.6854305 4.65365647,17.2260686 3.82429195,16.4910897 C2.16556291,15.067068 0.737212907,12.6783865 0.55290968,10.6112583 C0.41468226,8.91161951 1.98125969,6.38512944 4.19289841,5.1448525 C6.03593067,4.04238411 6.49668874,2.84804335 6.911371,0.826851294 C6.35846132,2.57242625 5.80555164,3.99644792 4.00859518,4.96110777 C1.3822742,6.33919326 0.0460758067,8.59006623 0.184303227,10.795003 C0.368606453,13.5971102 1.47442581,15.4804937 3.68606453,16.9963877 C4.60758067,17.6394943 6.35846132,18.328537 7.46428068,18.5122818 L7.46428068,18.3744732 C8.2936452,18.2366647 9.35338876,16.8 585792 9.90629844,15.067068 C10.3670565,13.4133654 10.5513597,11.3462372 10.5052839,10.0140879 C10.4592081,9.23317279 10.1366775,7.5794702 9.49161618,6.06357616 C9.16908553,5.23672486 8.61617585,4.40987357 8.2936452,3.81270319 C7.87896294,3.12366045 7.87896294,1.83744732 7.69465972,0.367489464 Z" id="Shape"></path> + </g> + <g id="path2544_21_" transform="translate(7.372129, 16.537026)"> + <path d="M3.27138227,0.229680915 C3.31745808,1.33214931 3.73214034,2.7102348 3.91644357,4.13425647 C4.05467099,5.19078868 4.00859518,6.24732089 3.96251937,7.16604455 C3.91644357,8.22257676 3.59391292,10.1518964 3.08707905,11.1165563 C2.62632098,10.8868754 2.44201775,10.6571945 2.11948711,10.289705 C1.75088065,9.78440698 1.47442581,9.23317279 1.24404678,8.63600241 C1.05974355,8.17664058 0.82936452,7.62540638 0.737212907,7.028236 C0.598985487,6.10951234 0.645061294,4.63955449 1.70480485,3.16959663 C2.53416937,1.97525587 2.71847259,1.8833835 2.99492743,0.551234196 C2.62632098,1.74557495 2.34986614,1.8833835 1.47442581,2.89397953 C0.506833873,3.99644792 0.368606453,5.65015051 0.368606453,6.98229982 C0.368606453,7.53353402 0.598985487,8.17664058 0.82936452,8.72787477 C1.05974355,9.32504515 1.29012259,9.96815172 1.61265323,10.4275135 C2.11948711,11.1624925 2.7645484,11.6218543 3.08707905,11.6677905 C3.08707905,11.6677905 3.08707905,11.6677905 3.08707905 ,11.6677905 C3.08707905,11.6677905 3.08707905,11.6677905 3.08707905,11.6677905 L3.08707905,11.6218543 C3.68606453,10.9328116 4.05467099,10.289705 4.19289841,9.60066225 C4.33112583,8.77381096 4.37720163,7.99289585 4.46935325,7.028236 C4.56150486,6.20138471 4.51542905,5.1448525 4.28505002,4.04238411 C4.00859518,2.66429862 3.50176131,1.24027694 3.27138227,0.229680915 Z" id="Shape"></path> + </g> + <g id="path2550_21_" transform="translate(10.597436, 3.215533)"> + <path d="M0.230379033,0 C0.27645484,1.60776641 0.368606453,4.5936183 0.82936452,5.78795906 C0.96759194,6.20138471 2.11948711,7.94695966 2.90277582,10.1059603 C3.4556855,11.5759181 3.59391292,12.9540036 3.68606453,13.3674293 C4.05467099,15.1130042 3.59391292,18.0988561 2.99492743,20.9009633 C2.67239679,22.4168573 1.61265323,24.3002408 0.41468226,25.0352197 L0.184303227,25.4486454 C0.875440327,25.4027092 2.53416937,23.7949428 3.13315485,21.7278146 C4.1468226,18.2826008 4.51542905,16.6748344 4.05467099,12.8161951 C4.00859518,12.4487056 3.82429195,11.1624925 3.22530647,9.83034317 C2.34986614,7.76321493 1.10581936,5.78795906 0.96759194,5.37453341 C0.645061294,4.73142685 0.27645484,1.8833835 0.230379033,0 Z" id="Shape"></path> + </g> + <g id="path2552_21_" transform="translate(10.136677, 0.000000)"> + <path d="M1.24404678,0.275617098 C1.15189517,1.92931969 1.15189517,3.21553281 1.42835001,4.45580975 C1.75088065,5.78795906 3.50176131,7.71727875 4.23897421,9.92221553 C5.62124841,14.1483444 5.25264196,19.6606863 4.28505002,23.9327514 C3.91644357,25.4486454 2.16556291,27.6535822 0.368606453,28.3426249 L1.65872904,28.6641782 C2.34986614,28.618242 4.19289841,26.9186033 4.93011131,24.9892836 C6.08200648,21.9115593 6.31238552,18.2826008 5.85162745,14.4239615 C5.80555164,14.056472 5.20656615,10.7490668 4.60758067,9.37098134 C3.77821615,7.3038531 2.44201775,5.83389524 1.98125969,4.54768212 C1.61265323,3.58302228 1.47442581,1.01059603 1.70480485,0.505298013 L1.24404678,0.275617098 Z" id="Shape"></path> + </g> + </g> + </g> + <g id="path2528_16_" transform="translate(0.000000, 3.674895)"> + <path d="M1.75088065,0.367489464 L26.6778921,0.367489464 C27.5994082,0.367489464 28.4287727,1.14840458 28.4287727,2.11306442 L28.4287727,9.4628537 C28.4287727,10.4275135 27.5994082,11.2084287 26.6778921,11.2084287 L21.5634775,11.2084287 C20.4115824,11.2084287 19.9047485,11.8515352 19.9047485,12.5865141 L19.9047485,36.6111379 C19.9047485,37.4379892 19.2596872,38.0351595 18.4763985,38.0351595 L9.99845005,38.0351595 C9.21516134,38.0351595 8.61617585,37.4379892 8.61617585,36.6111379 L8.61617585,12.3568332 C8.61617585,11.6218543 7.92503875,11.1624925 7.41820488,11.1624925 L1.75088065,11.1624925 C0.783288714,11.1624925 0,10.3815774 0,9.41691752 L0,2.06712824 C0,1.14840458 0.783288714,0.367489464 1.75088065,0.367489464 Z" id="Shape"></path> + </g> + <g id="path2532_17_" transform="translate(53.908694, 13.780855)"> + <path d="M11.7954065,0 L14.0070452,0 C14.8364098,0 15.481471,0.643106562 15.481471,1.42402167 L15.481471,9.27910897 C15.481471,10.289705 15.5275469,10.7031306 14.2835001,10.7031306 C11.8414823,10.7031306 10.735663,11.9893438 10.735663,13.4133654 L10.735663,26.6889223 C10.735663,27.2860927 10.1366775,27.8373269 9.44554037,27.8373269 L1.52050162,27.8373269 C0.82936452,27.8373269 0.230379033,27.3320289 0.230379033,26.6889223 L0.230379033,11.5759181 C0.230379033,11.300301 0.230379033,10.9328116 0.27645484,10.7031306 C0.6911371,5.09891632 5.11441454,0.643106562 10.6895871,0.045936183 C10.8278146,0.045936183 11.4728759,0 11.7954065,0 Z" id="Shape"></path> + </g> + </g> + <path d="M46.8590954,21.2684527 C45.522897,20.074112 43.864168,19.063516 42.1132873,18.0988561 C41.3299986,17.6854305 38.9340566,15.802047 39.7634212,13.1377483 L33.7274905,10.6571945 L33.3128082,10.9787477 C35.3401437,14.6077062 34.2804002,16.5370259 33.2667324,17.1801325 C31.2393969,18.5582179 28.2905453,20.3037929 26.8621953,21.8196869 C24.0515711,24.7136665 23.2222066,27.4698374 23.4986614,31.0528597 C23.7751162,35.6924142 27.1386501,39.5510536 31.700155,41.0669476 C33.6814147,41.7100542 35.5244469,41.8019266 37.5517824,41.8019266 C40.8231647,41.8019266 44.2327744,40.9291391 46.6747922,38.907947 C49.3011131,36.7489464 50.8216148,33.4874774 50.8216148,30.1341361 C50.8216148,26.7807947 49.3932648,23.5652619 46.8590954,21.2684527 Z M45.9836551,38.2189043 C43.7259405,40.0563516 39.6712696,41.3425647 37.5057066,41.2506924 C35.1097647,41.1128838 32.7598985,40.7453943 30.6864872,39.7347983 C27.0464985,37.9892234 24.6505566,34.1765202 24.4662533,31.0987959 C24.143722 7,24.8055388 27.1847259,23.0140277 29.9953501,20.7172185 C31.5619276,19.4310054 33.7735663,18.7878989 35.0176131,16.4910897 C35.2479921,15.9857917 35.3862195,14.8833233 35.1097647,13.7349187 C34.9715373,13.3214931 34.4186276,11.9434076 34.1882486,11.6218543 L38.7036776,13.5971102 C38.1507679,15.6642384 39.8555728,17.823239 41.237847,18.6041541 C42.6201212,19.3850692 44.7856841,20.8550271 46.1218825,22.0493679 C48.4717486,24.1164961 49.6697196,27.0564118 49.6697196,30.1341361 C49.6697196,33.2118603 48.379597,36.2436484 45.9836551,38.2189043 Z" id="Shape"></path> + </g> + </g> + </g> + </g> </svg>

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] squash! Bug 2176: Rebrand Firefox to TorBrowser
by gk＠torproject.org 10 Oct '18

10 Oct '18

commit 482dd99c9507ae456578ba1fedfb4cc714e87ecc Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Sat Sep 29 21:18:21 2018 -0500 squash! Bug 2176: Rebrand Firefox to TorBrowser Also fix bug 27905. --- browser/branding/official/locales/en-US/tor-browser-brand.ftl | 5 +++++ browser/components/preferences/in-content/preferences.xul | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/browser/branding/official/locales/en-US/tor-browser-brand.ftl b/browser/branding/official/locales/en-US/tor-browser-brand.ftl new file mode 100644 index 000000000000..817ce1b3f17c --- /dev/null +++ b/browser/branding/official/locales/en-US/tor-browser-brand.ftl @@ -0,0 +1,5 @@ +# For Tor Browser, we use a new file (different than the brand.ftl file +# that is used by Firefox) to avoid picking up the -brand-short-name values +# that Mozilla includes in the Firefox language packs. + +-brand-short-name = Tor Browser diff --git a/browser/components/preferences/in-content/preferences.xul b/browser/components/preferences/in-content/preferences.xul index f107ece67d04..91e1cf94ebb4 100644 --- a/browser/components/preferences/in-content/preferences.xul +++ b/browser/components/preferences/in-content/preferences.xul @@ -90,7 +90,7 @@ data-l10n-id="pref-page" data-l10n-attrs="title"> - <link rel="localization" href="branding/brand.ftl"/> + <link rel="localization" href="branding/tor-browser-brand.ftl"/> <link rel="localization" href="browser/branding/sync-brand.ftl"/> <link rel="localization" href="browser/preferences/preferences.ftl"/> <script type="text/javascript" src="chrome://global/content/l10n.js"></script>

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 680300 - Part 2: Add a test case for ensuring no error reporting when loading an unknown protocol. r=smaug
by gk＠torproject.org 09 Oct '18

09 Oct '18

commit 0a5a1991dec543177e78283f27407e2a6d4892d8 Author: Tim Huang <tihuang(a)mozilla.com> Date: Sun Sep 23 22:24:05 2018 +0000 Bug 680300 - Part 2: Add a test case for ensuring no error reporting when loading an unknown protocol. r=smaug This test case will try to navigate an iframe to an unknown protocol and check whether no errors been reported. Differential Revision: https://phabricator.services.mozilla.com/D3493 --HG-- extra : moz-landing-system : lando --- uriloader/exthandler/tests/mochitest/mochitest.ini | 1 + .../test_unknown_ext_protocol_handlers.html | 28 ++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/uriloader/exthandler/tests/mochitest/mochitest.ini b/uriloader/exthandler/tests/mochitest/mochitest.ini index 266d783e569b..12ffa16a4233 100644 --- a/uriloader/exthandler/tests/mochitest/mochitest.ini +++ b/uriloader/exthandler/tests/mochitest/mochitest.ini @@ -8,5 +8,6 @@ support-files = [test_handlerApps.xhtml] skip-if = (toolkit == 'android' || os == 'mac') || e10s # OS X: bug 786938 scheme = https +[test_unknown_ext_protocol_handlers.html] [test_unsafeBidiChars.xhtml] [test_web_protocol_handlers.html] diff --git a/uriloader/exthandler/tests/mochitest/test_unknown_ext_protocol_handlers.html b/uriloader/exthandler/tests/mochitest/test_unknown_ext_protocol_handlers.html new file mode 100644 index 000000000000..9a399e486257 --- /dev/null +++ b/uriloader/exthandler/tests/mochitest/test_unknown_ext_protocol_handlers.html @@ -0,0 +1,28 @@ +<!DOCTYPE html> +<html> +<head> + <title>Test for no error reporting for unknown external protocols</title> + <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> + <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> +</head> +<body> +<iframe id="testFrame"></iframe> +<script type="text/javascript"> + +SimpleTest.waitForExplicitFinish(); + +window.onload = () => { + let testFrame = document.getElementById("testFrame"); + + try { + testFrame.contentWindow.location.href = "unknownextproto:"; + ok(true, "There is no error reporting for unknown external protocol navigation."); + } catch (e) { + ok(false, "There should be no error reporting for unknown external protocol navigation."); + } + + SimpleTest.finish(); +} +</script> +</body> +</html>

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 680300 - Part 3: Make the client.navigate() not to reference the baseURL if it navigates to a view-source URL r=asuth
by gk＠torproject.org 09 Oct '18

09 Oct '18

commit d098b183150a7feb83f159ad731fc42537252863 Author: Tim Huang <tihuang(a)mozilla.com> Date: Mon Sep 24 18:22:26 2018 +0000 Bug 680300 - Part 3: Make the client.navigate() not to reference the baseURL if it navigates to a view-source URL r=asuth The suppressing of the error NS_ERROR_UNKNOWN_PROTOCOL will break the web-platform-test 'windowclient-navigate.https.html' since navigating to an invalid view-source url through the client API won't receive any error due to the suppressing. So the test will time-out since it waits for an error. While navigating to an invalid view-source url with its inner url as relative, this will pass the validity check we have right now and do the navigation because of it takes account the baseURL while doing the check. The invalid view-source url will be resolved into a valid view-source url in the case. Fortunately, we won't encounter any issue in the test in the past since the docShell will block this loading because it's loading a view-source url inside an iframe and reports a NS_ERROR_UNKNOWN_PROTOCOL error. But, we should faild with a NS_ERROR_MALFORMED_URI error when doing the URL validity check. For addressing this, this patch makes the client.navigate to not take the baseURL into account if it is a view-source URL. Differential Revision: https://phabricator.services.mozilla.com/D6587 --HG-- extra : moz-landing-system : lando --- dom/clients/manager/ClientNavigateOpChild.cpp | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dom/clients/manager/ClientNavigateOpChild.cpp b/dom/clients/manager/ClientNavigateOpChild.cpp index b6a8e70b7356..1e6cc50da41d 100644 --- a/dom/clients/manager/ClientNavigateOpChild.cpp +++ b/dom/clients/manager/ClientNavigateOpChild.cpp @@ -15,6 +15,7 @@ #include "nsIWebProgressListener.h" #include "nsNetUtil.h" #include "nsPIDOMWindow.h" +#include "nsURLHelper.h" namespace mozilla { namespace dom { @@ -185,8 +186,24 @@ ClientNavigateOpChild::DoNavigate(const ClientNavigateOpConstructorArgs& aArgs) return ref.forget(); } + // There is an edge case for view-source url here. According to the wpt test + // windowclient-navigate.https.html, a view-source URL with a relative inner + // URL should be treated as an invalid URL. However, we will still resolve it + // into a valid view-source URL since the baseURL is involved while creating + // the URI. So, an invalid view-source URL will be treated as a valid URL + // in this case. To address this, we should not take the baseURL into account + // for the view-source URL. + bool shouldUseBaseURL = true; + nsAutoCString scheme; + if (NS_SUCCEEDED(net_ExtractURLScheme(aArgs.url(), scheme)) && + scheme.LowerCaseEqualsLiteral("view-source")) { + shouldUseBaseURL = false; + } + nsCOMPtr<nsIURI> url; - rv = NS_NewURI(getter_AddRefs(url), aArgs.url(), nullptr, baseURL); + rv = NS_NewURI(getter_AddRefs(url), aArgs.url(), + nullptr, shouldUseBaseURL ? baseURL.get() + : nullptr); if (NS_FAILED(rv)) { ref = ClientOpPromise::CreateAndReject(rv, __func__); return ref.forget();

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 680300 - Part 1: Stopping reporting errors when loading an unknown external protocol. r=smaug
by gk＠torproject.org 09 Oct '18

09 Oct '18

commit 8ac83f77ae144a3063c57099c250a340fd4bf0ac Author: Tim Huang <tihuang(a)mozilla.com> Date: Tue Sep 25 07:50:28 2018 +0000 Bug 680300 - Part 1: Stopping reporting errors when loading an unknown external protocol. r=smaug This patch makes the docshell not to report an error if it is a unknown protocol error. However, we will still display the error page in this case. Differential Revision: https://phabricator.services.mozilla.com/D3492 --HG-- extra : moz-landing-system : lando --- docshell/base/nsDocShell.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 120b8c8b880b..e95855dd3e9f 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -10486,6 +10486,13 @@ nsDocShell::InternalLoad(nsIURI* aURI, (aFlags & LOAD_FLAGS_ERROR_LOAD_CHANGES_RV) != 0) { return NS_ERROR_LOAD_SHOWED_ERRORPAGE; } + + // We won't report any error if this is an unknown protocol error. The reason + // behind this is that it will allow enumeration of external protocols if + // we report an error for each unknown protocol. + if (NS_ERROR_UNKNOWN_PROTOCOL == rv) { + return NS_OK; + } } return rv;

1 0

[tor-browser-build/master] Fold in stable changelogs
by gk＠torproject.org 09 Oct '18

09 Oct '18

commit 5362bd07f5f712fdf3a799b8e1d3905bdfa3d842 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 9 09:40:28 2018 +0000 Fold in stable changelogs --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 94ab254..54ebd96 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -7,6 +7,13 @@ Tor Browser 8.5a3 -- October 4 2018 * OS X * Backport fix for Mozilla bug 1489785 for macOS 10.14 compatibility +Tor Browser 8.0.2 -- October 2 2018 + * All platforms + * Update Firefox to 60.2.1esr + * Backport fix for Mozilla bug 1493900 and 1493903 + * OS X + * Backport fix for Mozilla bug 1489785 for macOS 10.14 compatibility + Tor Browser 8.5a2 -- September 24 2018 * All platforms * Update Tor to 0.3.5.2-alpha @@ -41,6 +48,35 @@ Tor Browser 8.5a2 -- September 24 2018 * Bug 27552: Use bundled dir on CentOS/RHEL 6 * Bug 26556: Fix broken Tor Browser icon path on Linux +Tor Browser 8.0.1 -- September 24 2018 + * All platforms + * Update Tor to 0.3.4.8 + * Update Torbutton to 2.0.7 + * Bug 27097: Tor News signup banner + * Bug 27663: Add New Identity menuitem again + * Bug 26624: Only block OBJECT on highest slider level + * Bug 26555: Don't show IP address for meek or snowflake + * Bug 27478: Torbutton icons for dark theme + * Bug 27506+14520: Move status version to upper left corner for RTL locales + * Bug 27427: Fix NoScript IPC for about:blank by whitelisting messages + * Bug 27558: Update the link to "Your Guard note may not change" text + * Translations update + * Update Tor Launcher to 0.2.16.6 + * Bug 27469: Adapt Moat URLs + * Translations update + * Clean-up + * Update NoScript to 10.1.9.6 + * Bug 27763: Restrict Torbutton signing exemption to mobile + * Bug 26146: Spoof HTTP User-Agent header for desktop platforms + * Bug 27543: QR code is broken on web.whatsapp.com + * Bug 27264: Bookmark items are not visible on the boomark toolbar + * Bug 27535: Enable TLS 1.3 draft version + * Backport of Mozilla bug 1490585, 1475775, and 1489744 + * OS X + * Bug 27482: Fix crash during start-up on macOS 10.9.x systems + * Linux + * Bug 26556: Fix broken Tor Browser icon path on Linux + Tor Browser 8.5a1 -- September 5 2018 * All platforms * Update Firefox to 60.2.0esr

1 0

[torbutton/master] Bug 27959: 2018 Donation banner text ready for translation
by gk＠torproject.org 08 Oct '18

08 Oct '18

commit 9ad95c9170ad55cb4bddb2d4b226080966f8542f Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Oct 5 10:21:45 2018 -0700 Bug 27959: 2018 Donation banner text ready for translation --- src/chrome/locale/en/aboutTor.dtd | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd index 1400d7b5..6efb202e 100644 --- a/src/chrome/locale/en/aboutTor.dtd +++ b/src/chrome/locale/en/aboutTor.dtd @@ -26,3 +26,17 @@ <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> +<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> +<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> + +<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> +<!ENTITY aboutTor.donationBanner.buttonB "Count Me In">

1 0

[tor-browser-build/master] Release preparations for 8.5a3
by gk＠torproject.org 02 Oct '18

02 Oct '18

commit 0e0cb78f2d1625047a5800b16c23289fa7b28403 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 2 20:25:35 2018 +0000 Release preparations for 8.5a3 --- projects/firefox/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 9 +++++++++ rbm.conf | 6 +++--- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 89e5ce6..d79eec3 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,13 +1,13 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build3' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 60.2.0 + firefox_platform_version: 60.2.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.5 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 9cd6c3f..94ab254 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,12 @@ +Tor Browser 8.5a3 -- October 4 2018 + * All platforms + * Update Firefox to 60.2.1esr + * Backport fix for Mozilla bug 1493900 and 1493903 + * Windows + * Bug 27865: Tor Browser 8.5a2 is crashing on Windows + * OS X + * Backport fix for Mozilla bug 1489785 for macOS 10.14 compatibility + Tor Browser 8.5a2 -- September 24 2018 * All platforms * Update Tor to 0.3.5.2-alpha diff --git a/rbm.conf b/rbm.conf index 0723a42..d7f1420 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.5a2' - torbrowser_build: 'build3' + torbrowser_version: '8.5a3' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.5a1 + - 8.5a2 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Bug 27865: Tor Browser 8.5a2 is crashing on Windows
by gk＠torproject.org 02 Oct '18

02 Oct '18

commit 49eb43da16695c8fce31129f3499a8258761025a Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 2 03:04:05 2018 +0000 Bug 27865: Tor Browser 8.5a2 is crashing on Windows We disable the usage of MOZILLA_OFFICIAL again for Windows platforms as Tor Browser is crashing otherwise. The underlying reason is likely the same as in https://bugzilla.mozilla.org/show_bug.cgi?id=1470772. --- projects/firefox/mozconfig-windows-i686 | 1 - projects/firefox/mozconfig-windows-x86_64 | 1 - 2 files changed, 2 deletions(-) diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index 07e8851..a5e15f1 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -10,7 +10,6 @@ ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 -export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --disable-debug diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index 1665005..e7f857d 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -10,7 +10,6 @@ ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 -export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --disable-debug

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1493903 - Don't inline push with more than 1 argument. r=tcampbell a=dveditz
by gk＠torproject.org 01 Oct '18

01 Oct '18

commit 50e3be5d0c750483f8e2367cb8b8e0c3c26bba11 Author: Jan de Mooij <jdemooij(a)mozilla.com> Date: Tue Sep 25 12:33:42 2018 +0200 Bug 1493903 - Don't inline push with more than 1 argument. r=tcampbell a=dveditz --HG-- extra : source : b193307614e2f56615e7b5fe5ca97c2f6638c29d extra : intermediate-source : dc688e0c970278799f4d0ca9bde78545380e4110 --- js/src/jit/MCallOptimize.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/js/src/jit/MCallOptimize.cpp b/js/src/jit/MCallOptimize.cpp index 2bee4b605280..1e600583c4cb 100644 --- a/js/src/jit/MCallOptimize.cpp +++ b/js/src/jit/MCallOptimize.cpp @@ -775,6 +775,12 @@ IonBuilder::inlineArrayPush(CallInfo& callInfo) return InliningStatus_NotInlined; } + // XXX bug 1493903. + if (callInfo.argc() != 1) { + trackOptimizationOutcome(TrackedOutcome::CantInlineNativeBadForm); + return InliningStatus_NotInlined; + } + MDefinition* obj = convertUnboxedObjects(callInfo.thisArg()); for (uint32_t i = 0; i < callInfo.argc(); i++) { MDefinition* value = callInfo.getArg(i);

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1493900. r=bhackett, sunfish a=dveditz
by gk＠torproject.org 01 Oct '18

01 Oct '18

commit 34bcbdca41c7949318930b44b504e88696d0aeee Author: Jan de Mooij <jdemooij(a)mozilla.com> Date: Tue Sep 25 12:14:11 2018 +0200 Bug 1493900. r=bhackett,sunfish a=dveditz --HG-- extra : source : b5e3f4138c0ca0a2a42ec8007f27e1e7b6cb2150 extra : intermediate-source : d596c94e62cd99b7efa048cb8016368047aaa079 --- js/src/jit/BacktrackingAllocator.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/js/src/jit/BacktrackingAllocator.cpp b/js/src/jit/BacktrackingAllocator.cpp index 16f7ff56397c..414de92e5bbc 100644 --- a/js/src/jit/BacktrackingAllocator.cpp +++ b/js/src/jit/BacktrackingAllocator.cpp @@ -1930,8 +1930,16 @@ BacktrackingAllocator::resolveControlFlow() if (!alloc().ensureBallast()) return false; - if (!moveAtExit(predecessor, from, to, def->type())) - return false; + if (mSuccessor->numPredecessors() > 1) { + MOZ_ASSERT(predecessor->mir()->numSuccessors() == 1); + if (!moveAtExit(predecessor, from, to, def->type())) { + return false; + } + } else { + if (!moveAtEntry(successor, from, to, def->type())) { + return false; + } + } } } }

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 27865: Fix start-up crashes on Windows
by gk＠torproject.org 01 Oct '18

01 Oct '18

commit 06750f24d6c10d12158d2402361e3ce71d8493e1 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Sep 30 17:53:00 2018 +0000 Bug 27865: Fix start-up crashes on Windows Don't bind --enable-release to MOZILLA_OFFICIAL for Windows targets as we are currently crashing on start-up for unknown reasons if --enable-release is set, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1470772. --- build/moz.configure/toolchain.configure | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index 67007c8dcf7c..008193c6c945 100755 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -1382,8 +1382,10 @@ option(env='RUSTFLAGS', help='Rust compiler flags') set_config('RUSTFLAGS', depends('RUSTFLAGS')(lambda flags: flags)) - -imply_option('--enable-release', mozilla_official) +if target.os != 'WINNT': + imply_option('--enable-release', mozilla_official) +else: + imply_option('--enable-release', False) imply_option('--enable-release', depends_if('MOZ_AUTOMATION')(lambda x: True)) js_option('--enable-release',

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1489785: Remove a workaround for gcc, introduced in bug 678607, that is no longer needed and that causes hangs in modal dialogs on macOS 10.14. r=mstange, a=jcristau
by gk＠torproject.org 01 Oct '18

01 Oct '18

commit 0c004047822a94a6e16851a9f46d237be10eebce Author: Stephen A Pohl <spohl.mozilla.bugs(a)gmail.com> Date: Sun Sep 30 01:02:08 2018 -0400 Bug 1489785: Remove a workaround for gcc, introduced in bug 678607, that is no longer needed and that causes hangs in modal dialogs on macOS 10.14. r=mstange, a=jcristau --HG-- extra : source : 3920c858319dff66ebbc9263f6aa8d24f16071f8 extra : intermediate-source : d7a52857cd862b4e2f8305baddc119f4e9a47146 --- widget/cocoa/nsChildView.mm | 52 --------------------------------------------- 1 file changed, 52 deletions(-) diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index 8ffafc5d148e..072d59d0c010 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -442,13 +442,6 @@ nsChildView::Create(nsIWidget* aParent, if (!gChildViewMethodsSwizzled) { nsToolkit::SwizzleMethods([NSView class], @selector(mouseDownCanMoveWindow), @selector(nsChildView_NSView_mouseDownCanMoveWindow)); -#ifdef __LP64__ - nsToolkit::SwizzleMethods([NSEvent class], @selector(addLocalMonitorForEventsMatchingMask:handler:), - @selector(nsChildView_NSEvent_addLocalMonitorForEventsMatchingMask:handler:), - true); - nsToolkit::SwizzleMethods([NSEvent class], @selector(removeMonitor:), - @selector(nsChildView_NSEvent_removeMonitor:), true); -#endif gChildViewMethodsSwizzled = true; } @@ -7134,48 +7127,3 @@ static const CGEventField kCGWindowNumberField = (const CGEventField) 51; } @end - -#ifdef __LP64__ -// When using blocks, at least on OS X 10.7, the OS sometimes calls -// +[NSEvent removeMonitor:] more than once on a single event monitor, which -// causes crashes. See bug 678607. We hook these methods to work around -// the problem. -@interface NSEvent (MethodSwizzling) -+ (id)nsChildView_NSEvent_addLocalMonitorForEventsMatchingMask:(unsigned long long)mask handler:(id)block; -+ (void)nsChildView_NSEvent_removeMonitor:(id)eventMonitor; -@end - -// This is a local copy of the AppKit frameworks sEventObservers hashtable. -// It only stores "local monitors". We use it to ensure that +[NSEvent -// removeMonitor:] is never called more than once on the same local monitor. -static NSHashTable *sLocalEventObservers = nil; - -@implementation NSEvent (MethodSwizzling) - -+ (id)nsChildView_NSEvent_addLocalMonitorForEventsMatchingMask:(unsigned long long)mask handler:(id)block -{ - if (!sLocalEventObservers) { - sLocalEventObservers = [[NSHashTable hashTableWithOptions: - NSHashTableStrongMemory | NSHashTableObjectPointerPersonality] retain]; - } - id retval = - [self nsChildView_NSEvent_addLocalMonitorForEventsMatchingMask:mask handler:block]; - if (sLocalEventObservers && retval && ![sLocalEventObservers containsObject:retval]) { - [sLocalEventObservers addObject:retval]; - } - return retval; -} - -+ (void)nsChildView_NSEvent_removeMonitor:(id)eventMonitor -{ - if (sLocalEventObservers && [eventMonitor isKindOfClass: ::NSClassFromString(@"_NSLocalEventObserver")]) { - if (![sLocalEventObservers containsObject:eventMonitor]) { - return; - } - [sLocalEventObservers removeObject:eventMonitor]; - } - [self nsChildView_NSEvent_removeMonitor:eventMonitor]; -} - -@end -#endif // #ifdef __LP64__

1 0

[tor-browser-build/maint-8.0] Release preparations for 8.0.2
by gk＠torproject.org 01 Oct '18

01 Oct '18

commit 477884d77cfa213307db56c2cb60eee8575865d4 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 1 13:05:57 2018 +0000 Release preparations for 8.0.2 Version bumps and Changelog update --- projects/firefox/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 7 +++++++ rbm.conf | 6 +++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 9d675eb..debff32 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,13 +1,13 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build5' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 60.2.0 + firefox_platform_version: 60.2.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.0 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 0c7d943..ec0bf46 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,10 @@ +Tor Browser 8.0.2 -- October 2 2018 + * All platforms + * Update Firefox to 60.2.1esr + * Backport fix for Mozilla bug 1493900 and 1493903 + * OS X + * Backport fix for Mozilla bug 1489785 for macOS 10.14 compatibility + Tor Browser 8.0.1 -- September 24 2018 * All platforms * Update Tor to 0.3.4.8 diff --git a/rbm.conf b/rbm.conf index 9f10ba5..fbc9776 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.0.1' - torbrowser_build: 'build3' + torbrowser_version: '8.0.2' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.0 + - 8.0.1 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-60.2.1esr-8.0-1] Bug 1489785: Remove a workaround for gcc, introduced in bug 678607, that is no longer needed and that causes hangs in modal dialogs on macOS 10.14. r=mstange, a=jcristau
by gk＠torproject.org 01 Oct '18

01 Oct '18

commit f3a77068c18589f124c8ad4697476b11b4fada6a Author: Stephen A Pohl <spohl.mozilla.bugs(a)gmail.com> Date: Sun Sep 30 01:02:08 2018 -0400 Bug 1489785: Remove a workaround for gcc, introduced in bug 678607, that is no longer needed and that causes hangs in modal dialogs on macOS 10.14. r=mstange, a=jcristau --HG-- extra : source : 3920c858319dff66ebbc9263f6aa8d24f16071f8 extra : intermediate-source : d7a52857cd862b4e2f8305baddc119f4e9a47146 --- widget/cocoa/nsChildView.mm | 52 --------------------------------------------- 1 file changed, 52 deletions(-) diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index 8ffafc5d148e..072d59d0c010 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -442,13 +442,6 @@ nsChildView::Create(nsIWidget* aParent, if (!gChildViewMethodsSwizzled) { nsToolkit::SwizzleMethods([NSView class], @selector(mouseDownCanMoveWindow), @selector(nsChildView_NSView_mouseDownCanMoveWindow)); -#ifdef __LP64__ - nsToolkit::SwizzleMethods([NSEvent class], @selector(addLocalMonitorForEventsMatchingMask:handler:), - @selector(nsChildView_NSEvent_addLocalMonitorForEventsMatchingMask:handler:), - true); - nsToolkit::SwizzleMethods([NSEvent class], @selector(removeMonitor:), - @selector(nsChildView_NSEvent_removeMonitor:), true); -#endif gChildViewMethodsSwizzled = true; } @@ -7134,48 +7127,3 @@ static const CGEventField kCGWindowNumberField = (const CGEventField) 51; } @end - -#ifdef __LP64__ -// When using blocks, at least on OS X 10.7, the OS sometimes calls -// +[NSEvent removeMonitor:] more than once on a single event monitor, which -// causes crashes. See bug 678607. We hook these methods to work around -// the problem. -@interface NSEvent (MethodSwizzling) -+ (id)nsChildView_NSEvent_addLocalMonitorForEventsMatchingMask:(unsigned long long)mask handler:(id)block; -+ (void)nsChildView_NSEvent_removeMonitor:(id)eventMonitor; -@end - -// This is a local copy of the AppKit frameworks sEventObservers hashtable. -// It only stores "local monitors". We use it to ensure that +[NSEvent -// removeMonitor:] is never called more than once on the same local monitor. -static NSHashTable *sLocalEventObservers = nil; - -@implementation NSEvent (MethodSwizzling) - -+ (id)nsChildView_NSEvent_addLocalMonitorForEventsMatchingMask:(unsigned long long)mask handler:(id)block -{ - if (!sLocalEventObservers) { - sLocalEventObservers = [[NSHashTable hashTableWithOptions: - NSHashTableStrongMemory | NSHashTableObjectPointerPersonality] retain]; - } - id retval = - [self nsChildView_NSEvent_addLocalMonitorForEventsMatchingMask:mask handler:block]; - if (sLocalEventObservers && retval && ![sLocalEventObservers containsObject:retval]) { - [sLocalEventObservers addObject:retval]; - } - return retval; -} - -+ (void)nsChildView_NSEvent_removeMonitor:(id)eventMonitor -{ - if (sLocalEventObservers && [eventMonitor isKindOfClass: ::NSClassFromString(@"_NSLocalEventObserver")]) { - if (![sLocalEventObservers containsObject:eventMonitor]) { - return; - } - [sLocalEventObservers removeObject:eventMonitor]; - } - [self nsChildView_NSEvent_removeMonitor:eventMonitor]; -} - -@end -#endif // #ifdef __LP64__

1 0

[tor-browser/tor-browser-60.2.1esr-8.0-1] Bug 1493903 - Don't inline push with more than 1 argument. r=tcampbell a=dveditz
by gk＠torproject.org 01 Oct '18

01 Oct '18

commit 19a1fbba648f1dd12e7bfc31f7c3f82cfc89cf33 Author: Jan de Mooij <jdemooij(a)mozilla.com> Date: Tue Sep 25 12:33:42 2018 +0200 Bug 1493903 - Don't inline push with more than 1 argument. r=tcampbell a=dveditz --HG-- extra : source : b193307614e2f56615e7b5fe5ca97c2f6638c29d extra : intermediate-source : dc688e0c970278799f4d0ca9bde78545380e4110 --- js/src/jit/MCallOptimize.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/js/src/jit/MCallOptimize.cpp b/js/src/jit/MCallOptimize.cpp index 2bee4b605280..1e600583c4cb 100644 --- a/js/src/jit/MCallOptimize.cpp +++ b/js/src/jit/MCallOptimize.cpp @@ -775,6 +775,12 @@ IonBuilder::inlineArrayPush(CallInfo& callInfo) return InliningStatus_NotInlined; } + // XXX bug 1493903. + if (callInfo.argc() != 1) { + trackOptimizationOutcome(TrackedOutcome::CantInlineNativeBadForm); + return InliningStatus_NotInlined; + } + MDefinition* obj = convertUnboxedObjects(callInfo.thisArg()); for (uint32_t i = 0; i < callInfo.argc(); i++) { MDefinition* value = callInfo.getArg(i);

1 0

[tor-browser/tor-browser-60.2.1esr-8.0-1] Bug 1493900. r=bhackett, sunfish a=dveditz
by gk＠torproject.org 01 Oct '18

01 Oct '18

commit 3943f44464ab5aa6bf92b3326cd99479779a83c7 Author: Jan de Mooij <jdemooij(a)mozilla.com> Date: Tue Sep 25 12:14:11 2018 +0200 Bug 1493900. r=bhackett,sunfish a=dveditz --HG-- extra : source : b5e3f4138c0ca0a2a42ec8007f27e1e7b6cb2150 extra : intermediate-source : d596c94e62cd99b7efa048cb8016368047aaa079 --- js/src/jit/BacktrackingAllocator.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/js/src/jit/BacktrackingAllocator.cpp b/js/src/jit/BacktrackingAllocator.cpp index 16f7ff56397c..414de92e5bbc 100644 --- a/js/src/jit/BacktrackingAllocator.cpp +++ b/js/src/jit/BacktrackingAllocator.cpp @@ -1930,8 +1930,16 @@ BacktrackingAllocator::resolveControlFlow() if (!alloc().ensureBallast()) return false; - if (!moveAtExit(predecessor, from, to, def->type())) - return false; + if (mSuccessor->numPredecessors() > 1) { + MOZ_ASSERT(predecessor->mir()->numSuccessors() == 1); + if (!moveAtExit(predecessor, from, to, def->type())) { + return false; + } + } else { + if (!moveAtEntry(successor, from, to, def->type())) { + return false; + } + } } } }

1 0

[tor-browser-build/master] Bug 27183: set mar_compression to xz for all releases
by gk＠torproject.org 26 Sep '18

26 Sep '18

commit 62cb1af5411afc571aa14a70d9206a8a64f7848e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 3 12:01:10 2018 +0200 Bug 27183: set mar_compression to xz for all releases --- projects/release/update_responses_config.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index fec62f2..4497114 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -47,12 +47,7 @@ versions: minSupportedOSVersion: 6.1 win64: minSupportedOSVersion: 6.1 -[% IF c("var/release") -%] - mar_compression: xz -mar_compression: bzip2 -[% ELSE -%] mar_compression: xz -[% END -%] htaccess_rewrite_rules: alpha: | # bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory

1 0

[tor-browser-build/maint-8.0] Bug 27183: set mar_compression to xz for all releases
by gk＠torproject.org 26 Sep '18

26 Sep '18

commit 95e916813808e5c102939ff5d557bfd4f4e7df72 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 3 12:01:10 2018 +0200 Bug 27183: set mar_compression to xz for all releases --- projects/release/update_responses_config.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index fec62f2..4497114 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -47,12 +47,7 @@ versions: minSupportedOSVersion: 6.1 win64: minSupportedOSVersion: 6.1 -[% IF c("var/release") -%] - mar_compression: xz -mar_compression: bzip2 -[% ELSE -%] mar_compression: xz -[% END -%] htaccess_rewrite_rules: alpha: | # bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory

1 0

[tor-browser-build/master] Picking up tor-0.3.5.2-alpha
by gk＠torproject.org 21 Sep '18

21 Sep '18

commit 0f6d30c59d367193b4c0363432ac9554bb2a70e0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 21 12:42:55 2018 +0000 Picking up tor-0.3.5.2-alpha --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- projects/tor/config | 2 +- rbm.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index aec6bc4..9cd6c3f 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,6 +1,6 @@ Tor Browser 8.5a2 -- September 24 2018 * All platforms - * Update Tor to 0.3.5.1-alpha + * Update Tor to 0.3.5.2-alpha * Update Torbutton to 2.1 * Bug 27097: Tor News signup banner * Bug 27663: Add New Identity menuitem again diff --git a/projects/tor/config b/projects/tor/config index 451c9bb..cc7811b 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.5.1-alpha +version: 0.3.5.2-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index 65ffefa..0723a42 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.5a2' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 8.5a1 project_name: tor-browser

1 0

[tor-browser-build/maint-8.0] Picking new Tor Launcher tag up for realz
by gk＠torproject.org 20 Sep '18

20 Sep '18

commit cfdec2c3c4e354885652bcaeda0c3d085524a4fb Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 20 09:50:29 2018 +0000 Picking new Tor Launcher tag up for realz --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- projects/tor-launcher/config | 2 +- rbm.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 12ae6ff..0c7d943 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 8.0.1 -- September 20 2018 +Tor Browser 8.0.1 -- September 24 2018 * All platforms * Update Tor to 0.3.4.8 * Update Torbutton to 2.0.7 diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 9e00653..9211817 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.16.5 +version: 0.2.16.6 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 529cd56..9f10ba5 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0.1' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 8.0 project_name: tor-browser

1 0

[tor-browser-build/master] Pick up three Mozilla patches for 8.5a2
by gk＠torproject.org 20 Sep '18

20 Sep '18

commit 578b05727c639523148353d88bbec620b8bca64b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 20 09:15:13 2018 +0000 Pick up three Mozilla patches for 8.5a2 --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 3 ++- rbm.conf | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index aca6ce9..89e5ce6 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build3' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 0276ef5..aec6bc4 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 8.5a2 -- September 20 2018 +Tor Browser 8.5a2 -- September 24 2018 * All platforms * Update Tor to 0.3.5.1-alpha * Update Torbutton to 2.1 @@ -24,6 +24,7 @@ Tor Browser 8.5a2 -- September 20 2018 * Bug 27264: Bookmark items are not visible on the boomark toolbar * Bug 27535: Enable TLS 1.3 draft version * Bug 27623: Use MOZILLA_OFFICIAL for our builds + * Backport of Mozilla bug 1490585, 1475775, and 1489744 * Windows: * Bug 26381: about:tor page does not load on first start on Windows * Linux: diff --git a/rbm.conf b/rbm.conf index 461849c..65ffefa 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.5a2' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.5a1 project_name: tor-browser

1 0

[tor-browser/tor-browser-60.2.0esr-8.5-1] Bug 1489744 - Fix a bounds violation crash in the prefs parser. r=glandium, a=RyanVM
by gk＠torproject.org 20 Sep '18

20 Sep '18

commit e4f063eb30d140dcf0c04074dfe4ab82307fd7c3 Author: Nicholas Nethercote <nnethercote(a)mozilla.com> Date: Tue Sep 11 09:36:07 2018 +1000 Bug 1489744 - Fix a bounds violation crash in the prefs parser. r=glandium, a=RyanVM Currently, if a get_char() call returns EOF, the index moves beyond the buffer's bounds and get_char() cannot be called again without triggering a panic. As a result, everywhere that encounters an EOF and then does subsequent parsing ungets the EOF... except there was one place that failed to do that: the match case for CharKind::Slash in get_token(). This meant that a single '/' at the end of the input could trigger a bounds violation (but only if it is the start of a new token). This EOF-unget requirement is subtle and easy to get wrong, so this patch eliminates it. get_char() now can be called repeatedly after an EOF, and will return EOF on each subsequent call. This means that some of the existing unget_char() calls can be removed. Some others are still necessary to get line numbers correct in error messages, but the outcome of mishandled cases is now much less drastic -- an incorrect line number in an error message instead of a panic. The patch also clarifies a couple of related comments. --HG-- extra : source : 5097db630d1fb51f7f3fcd5523a924fa823e77ce extra : intermediate-source : 2676e53112584b2c08b9a1bf02e15cd9bb0d0ee5 --- modules/libpref/parser/src/lib.rs | 70 +++++++++++++++++++---------------- modules/libpref/test/gtest/Parser.cpp | 9 +++-- 2 files changed, 45 insertions(+), 34 deletions(-) diff --git a/modules/libpref/parser/src/lib.rs b/modules/libpref/parser/src/lib.rs index 8d8b9a6125e4..5ea7650252f5 100644 --- a/modules/libpref/parser/src/lib.rs +++ b/modules/libpref/parser/src/lib.rs @@ -54,16 +54,10 @@ // This parser uses several important optimizations. // -// - Because "'\0' means EOF" is part of the grammar (see above) we can match -// EOF as a normal char/token, which means we can avoid a typical "do we -// still have chars remaining?" test in get_char(), which gives a speedup -// because get_char() is a very hot function. (Actually, Rust would -// bounds-check this function anyway, so we have get_char_unchecked() which -// is used for the two hottest call sites.) -// -// This also means EOF is representable by a u8. If EOF was represented by an -// out-of-band value such as -1 or 256, we'd have to return a larger type -// such as u16 or i16 from get_char(). +// - Because "'\0' means EOF" is part of the grammar (see above), EOF is +// representable by a u8. If EOF was represented by an out-of-band value such +// as -1 or 256, we'd have to return a larger type such as u16 or i16 from +// get_char(). // // - When starting a new token, it uses a lookup table with the first char, // which quickly identifies what kind of token it will be. Furthermore, if @@ -192,7 +186,7 @@ enum Token { #[derive(Clone, Copy, PartialEq)] enum CharKind { // These are ordered by frequency. See the comment in GetToken(). - SingleChar, // Unambiguous single-char tokens: [()+,-] + SingleChar, // Unambiguous single-char tokens: [()+,-] or EOF SpaceNL, // [\t\v\f \n] Keyword, // [A-Za-z_] Quote, // ["'] @@ -535,13 +529,21 @@ impl<'t> Parser<'t> { #[inline(always)] fn get_char(&mut self) -> u8 { - let c = self.buf[self.i]; - self.i += 1; - c + // We do the bounds check ourselves so we can return EOF on failure. + // (Although the buffer is guaranteed to end in an EOF char, we might + // go one char past that, whereupon we must return EOF again.) + if self.i < self.buf.len() { + let c = unsafe { *self.buf.get_unchecked(self.i) }; + self.i += 1; + c + } else { + debug_assert!(self.i == self.buf.len()); + EOF + } } - // This function skips the bounds check in non-optimized builds. Using it - // at the hottest two call sites gives a ~15% parsing speed boost. + // This function skips the bounds check in optimized builds. Using it at + // the hottest two call sites gives a ~15% parsing speed boost. #[inline(always)] unsafe fn get_char_unchecked(&mut self) -> u8 { debug_assert!(self.i < self.buf.len()); @@ -568,9 +570,11 @@ impl<'t> Parser<'t> { #[inline(always)] fn match_single_line_comment(&mut self) { loop { - // To reach here, the previous char must have been '/', and - // assertions elsewhere ensure that there must be at least one - // subsequent char (the '\0' for EOF). + // To reach here, the previous char must have been '/' (if this is + // the first loop iteration) or non-special (if this is the second + // or subsequent iteration), and assertions elsewhere ensure that + // there must be at least one subsequent char after those chars + // (the '\0' for EOF). let c = unsafe { self.get_char_unchecked() }; // All the special chars have value <= b'\r'. @@ -588,8 +592,6 @@ impl<'t> Parser<'t> { break; } EOF => { - // Unget EOF so subsequent calls to get_char() are safe. - self.unget_char(); break; } _ => continue @@ -615,8 +617,6 @@ impl<'t> Parser<'t> { self.match_char(b'\n'); } EOF => { - // Unget EOF so subsequent calls to get_char() are safe. - self.unget_char(); return false } _ => continue @@ -630,11 +630,10 @@ impl<'t> Parser<'t> { for _ in 0..ndigits { value = value << 4; match self.get_char() { - c @ b'0'... b'9' => value += (c - b'0') as u16, + c @ b'0'...b'9' => value += (c - b'0') as u16, c @ b'A'...b'F' => value += (c - b'A') as u16 + 10, c @ b'a'...b'f' => value += (c - b'a') as u16 + 10, _ => { - // Unget in case the char was a closing quote or EOF. self.unget_char(); return None; } @@ -716,7 +715,15 @@ impl<'t> Parser<'t> { return Token::Error("unterminated /* comment"); } } - _ => return Token::Error("expected '/' or '*' after '/'") + c @ _ => { + if c == b'\n' || c == b'\r' { + // Unget the newline char; the outer loop will + // reget it and adjust self.line_num + // appropriately. + self.unget_char(); + } + return Token::Error("expected '/' or '*' after '/'"); + } } continue; } @@ -871,9 +878,12 @@ impl<'t> Parser<'t> { } continue; // We don't want to str_buf.push(c2) below. } - _ => { - // Unget in case the char is an EOF. - self.unget_char(); + c @ _ => { + if c == b'\n' || c == b'\r' { + // Unget the newline char; the outer loop will + // reget it and adjust self.line_num appropriately. + self.unget_char(); + } self.string_error_token( &mut token, "unexpected escape sequence character after '\\'"); continue; @@ -894,8 +904,6 @@ impl<'t> Parser<'t> { } } else if c == EOF { - // Unget EOF so subsequent calls to get_char() are safe. - self.unget_char(); self.string_error_token(&mut token, "unterminated string literal"); break; diff --git a/modules/libpref/test/gtest/Parser.cpp b/modules/libpref/test/gtest/Parser.cpp index d5469dd38007..fe9dea87ee60 100644 --- a/modules/libpref/test/gtest/Parser.cpp +++ b/modules/libpref/test/gtest/Parser.cpp @@ -293,11 +293,14 @@ pref("string.bad-keyword", TRUE); "test:3: prefs parse error: unterminated /* comment\n" ); - // Malformed comment. + // Malformed comments (single slashes), followed by whitespace, newline, EOF. DEFAULT(R"( -/ comment - )", +/ comment; +/ +; /)", "test:2: prefs parse error: expected '/' or '*' after '/'\n" + "test:3: prefs parse error: expected '/' or '*' after '/'\n" + "test:4: prefs parse error: expected '/' or '*' after '/'\n" ); // C++-style comment ending in EOF (1).

1 0

[tor-browser/tor-browser-60.2.0esr-8.5-1] Bug 1490585 - Ensure we got an nsISSLStatus when deserializing in TransportSecurityInfo. r=jcj, a=RyanVM
by gk＠torproject.org 20 Sep '18

20 Sep '18

commit d29ffa3dedf25a5e656df2751eaa6b3c99964ce0 Author: Dana Keeler <dkeeler(a)mozilla.com> Date: Thu Sep 13 16:59:21 2018 +0000 Bug 1490585 - Ensure we got an nsISSLStatus when deserializing in TransportSecurityInfo. r=jcj, a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D5803 --HG-- extra : source : 45359b962851973a70afbde575e6b89242d408de extra : intermediate-source : e9dd9434ad9ac15284429d904a45e4daf567c03b --- security/manager/ssl/TransportSecurityInfo.cpp | 7 +- .../ssl/tests/gtest/DeserializeCertTest.cpp | 86 ++++++++++++++++++++++ 2 files changed, 92 insertions(+), 1 deletion(-) diff --git a/security/manager/ssl/TransportSecurityInfo.cpp b/security/manager/ssl/TransportSecurityInfo.cpp index a57f91603ec4..c954e5517683 100644 --- a/security/manager/ssl/TransportSecurityInfo.cpp +++ b/security/manager/ssl/TransportSecurityInfo.cpp @@ -390,7 +390,12 @@ TransportSecurityInfo::Read(nsIObjectInputStream* stream) if (NS_FAILED(rv)) { return rv; } - mSSLStatus = BitwiseCast<nsSSLStatus*, nsISupports*>(supports.get()); + nsCOMPtr<nsISSLStatus> castGuard(do_QueryInterface(supports)); + if (castGuard) { + mSSLStatus = BitwiseCast<nsSSLStatus*, nsISSLStatus*>(castGuard.get()); + } else { + mSSLStatus = nullptr; + } nsCOMPtr<nsISupports> failedCertChainSupports; rv = NS_ReadOptionalObject(stream, true, getter_AddRefs(failedCertChainSupports)); diff --git a/security/manager/ssl/tests/gtest/DeserializeCertTest.cpp b/security/manager/ssl/tests/gtest/DeserializeCertTest.cpp index 868ecdba6b57..c3a4115b333d 100644 --- a/security/manager/ssl/tests/gtest/DeserializeCertTest.cpp +++ b/security/manager/ssl/tests/gtest/DeserializeCertTest.cpp @@ -94,3 +94,89 @@ TEST(psm_DeserializeCert, gecko46) ASSERT_EQ(NS_OK, rv); ASSERT_TRUE(cert); } + +TEST(psm_DeserializeCert, gecko64) +{ + // This is a serialization of nsITransportSecurityInfo from gecko 64. + // Deserialization should fail. + nsCString base64Serialization( + "FnhllAKWRHGAlo+ESXykKAAAAAAAAAAAwAAAAAAAAEaphjojH6pBabDSgSnsfLHeAAgAAgAAAAAAAAAAAAAAAAAAAAEAMQFmCjIm" + "kVxP+7sgiYWmMt8FvcOXmlQiTNWFiWlrbpbqgwAAAAAAAAX2MIIF8jCCBNqgAwIBAgIQDmTF+8I2reFLFyrrQceMsDANBgkqhkiG" + "9w0BAQsFADBwMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMS8w" + "LQYDVQQDEyZEaWdpQ2VydCBTSEEyIEhpZ2ggQXNzdXJhbmNlIFNlcnZlciBDQTAeFw0xNTExMDMwMDAwMDBaFw0xODExMjgxMjAw" + "MDBaMIGlMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLTG9zIEFuZ2VsZXMxPDA6BgNVBAoTM0lu" + "dGVybmV0IENvcnBvcmF0aW9uIGZvciBBc3NpZ25lZCBOYW1lcyBhbmQgTnVtYmVyczETMBEGA1UECxMKVGVjaG5vbG9neTEYMBYG" + "A1UEAxMPd3d3LmV4YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs0CWL2FjPiXBl61lRfvvE0KzLJmG" + "9LWAC3bcBjgsH6NiVVo2dt6uXfzi5bTm7F3K7srfUBYkLO78mraM9qizrHoIeyofrV/n+pZZJauQsPjCPxMEJnRoD8Z4KpWKX0Ly" + "Du1SputoI4nlQ/htEhtiQnuoBfNZxF7WxcxGwEsZuS1KcXIkHl5VRJOreKFHTaXcB1qcZ/QRaBIv0yhxvK1yBTwWddT4cli6GfHc" + "Ce3xGMaSL328Fgs3jYrvG29PueB6VJi/tbbPu6qTfwp/H1brqdjh29U52Bhb0fJkM9DWxCP/Cattcc7az8EXnCO+LK8vkhw/kAiJ" + "WPKx4RBvgy73nwIDAQABo4ICUDCCAkwwHwYDVR0jBBgwFoAUUWj/kK8CB3U8zNllZGKiErhZcjswHQYDVR0OBBYEFKZPYB4fLdHn" + "8SOgKpUW5Oia6m5IMIGBBgNVHREEejB4gg93d3cuZXhhbXBsZS5vcmeCC2V4YW1wbGUuY29tggtleGFtcGxlLmVkdYILZXhhbXBs" + "ZS5uZXSCC2V4YW1wbGUub3Jngg93d3cuZXhhbXBsZS5jb22CD3d3dy5leGFtcGxlLmVkdYIPd3d3LmV4YW1wbGUubmV0MA4GA1Ud" + "DwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwdQYDVR0fBG4wbDA0oDKgMIYuaHR0cDovL2NybDMuZGln" + "aWNlcnQuY29tL3NoYTItaGEtc2VydmVyLWc0LmNybDA0oDKgMIYuaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL3NoYTItaGEtc2Vy" + "dmVyLWc0LmNybDBMBgNVHSAERTBDMDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20v" + "Q1BTMAgGBmeBDAECAjCBgwYIKwYBBQUHAQEEdzB1MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wTQYIKwYB" + "BQUHMAKGQWh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFNIQTJIaWdoQXNzdXJhbmNlU2VydmVyQ0EuY3J0MAwG" + "A1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAISomhGn2L0LJn5SJHuyVZ3qMIlRCIdvqe0Q6ls+C8ctRwRO3UU3x8q8OH+2" + "ahxlQmpzdC5al4XQzJLiLjiJ2Q1p+hub8MFiMmVPPZjb2tZm2ipWVuMRM+zgpRVM6nVJ9F3vFfUSHOb4/JsEIUvPY+d8/Krc+kPQ" + "wLvyieqRbcuFjmqfyPmUv1U9QoI4TQikpw7TZU0zYZANP4C/gj4Ry48/znmUaRvy2kvIl7gRQ21qJTK5suoiYoYNo3J9T+pXPGU7" + "Lydz/HwW+w0DpArtAaukI8aNX4ohFUKSwDSiIIWIWJiJGbEeIO0TIFwEVWTOnbNl/faPXpk5IRXicapqiILALwADAAAAAAEBAAAA" + "AAAABFAyNTYAAAAQUlNBLVBLQ1MxLVNIQTUxMgGVn7FlZRdIf6ub2JE75TGXrnTNpc0vRz+W9fC3//YsaAAAAANmCjImkVxP+7sg" + "iYWmMt8FvcOXmlQiTNWFiWlrbpbqgwAAAAAAAAX2MIIF8jCCBNqgAwIBAgIQDmTF+8I2reFLFyrrQceMsDANBgkqhkiG9w0BAQsF" + "ADBwMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMS8wLQYDVQQD" + "EyZEaWdpQ2VydCBTSEEyIEhpZ2ggQXNzdXJhbmNlIFNlcnZlciBDQTAeFw0xNTExMDMwMDAwMDBaFw0xODExMjgxMjAwMDBaMIGl" + "MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLTG9zIEFuZ2VsZXMxPDA6BgNVBAoTM0ludGVybmV0" + "IENvcnBvcmF0aW9uIGZvciBBc3NpZ25lZCBOYW1lcyBhbmQgTnVtYmVyczETMBEGA1UECxMKVGVjaG5vbG9neTEYMBYGA1UEAxMP" + "d3d3LmV4YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs0CWL2FjPiXBl61lRfvvE0KzLJmG9LWAC3bc" + "BjgsH6NiVVo2dt6uXfzi5bTm7F3K7srfUBYkLO78mraM9qizrHoIeyofrV/n+pZZJauQsPjCPxMEJnRoD8Z4KpWKX0LyDu1Sputo" + "I4nlQ/htEhtiQnuoBfNZxF7WxcxGwEsZuS1KcXIkHl5VRJOreKFHTaXcB1qcZ/QRaBIv0yhxvK1yBTwWddT4cli6GfHcCe3xGMaS" + "L328Fgs3jYrvG29PueB6VJi/tbbPu6qTfwp/H1brqdjh29U52Bhb0fJkM9DWxCP/Cattcc7az8EXnCO+LK8vkhw/kAiJWPKx4RBv" + "gy73nwIDAQABo4ICUDCCAkwwHwYDVR0jBBgwFoAUUWj/kK8CB3U8zNllZGKiErhZcjswHQYDVR0OBBYEFKZPYB4fLdHn8SOgKpUW" + "5Oia6m5IMIGBBgNVHREEejB4gg93d3cuZXhhbXBsZS5vcmeCC2V4YW1wbGUuY29tggtleGFtcGxlLmVkdYILZXhhbXBsZS5uZXSC" + "C2V4YW1wbGUub3Jngg93d3cuZXhhbXBsZS5jb22CD3d3dy5leGFtcGxlLmVkdYIPd3d3LmV4YW1wbGUubmV0MA4GA1UdDwEB/wQE" + "AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwdQYDVR0fBG4wbDA0oDKgMIYuaHR0cDovL2NybDMuZGlnaWNlcnQu" + "Y29tL3NoYTItaGEtc2VydmVyLWc0LmNybDA0oDKgMIYuaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL3NoYTItaGEtc2VydmVyLWc0" + "LmNybDBMBgNVHSAERTBDMDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMAgG" + "BmeBDAECAjCBgwYIKwYBBQUHAQEEdzB1MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wTQYIKwYBBQUHMAKG" + "QWh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFNIQTJIaWdoQXNzdXJhbmNlU2VydmVyQ0EuY3J0MAwGA1UdEwEB" + "/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAISomhGn2L0LJn5SJHuyVZ3qMIlRCIdvqe0Q6ls+C8ctRwRO3UU3x8q8OH+2ahxlQmpz" + "dC5al4XQzJLiLjiJ2Q1p+hub8MFiMmVPPZjb2tZm2ipWVuMRM+zgpRVM6nVJ9F3vFfUSHOb4/JsEIUvPY+d8/Krc+kPQwLvyieqR" + "bcuFjmqfyPmUv1U9QoI4TQikpw7TZU0zYZANP4C/gj4Ry48/znmUaRvy2kvIl7gRQ21qJTK5suoiYoYNo3J9T+pXPGU7Lydz/HwW" + "+w0DpArtAaukI8aNX4ohFUKSwDSiIIWIWJiJGbEeIO0TIFwEVWTOnbNl/faPXpk5IRXicapqiIJmCjImkVxP+7sgiYWmMt8FvcOX" + "mlQiTNWFiWlrbpbqgwAAAAAAAAS1MIIEsTCCA5mgAwIBAgIQBOHnpNxc8vNtwCtCuF0VnzANBgkqhkiG9w0BAQsFADBsMQswCQYD" + "VQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2Vy" + "dCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4XDTEzMTAyMjEyMDAwMFoXDTI4MTAyMjEyMDAwMFowcDELMAkGA1UEBhMCVVMx" + "FTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTEvMC0GA1UEAxMmRGlnaUNlcnQgU0hBMiBI" + "aWdoIEFzc3VyYW5jZSBTZXJ2ZXIgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC24C/CJAbIbQRf1+8KZAayfSIm" + "ZRauQkCbztyfn3YHPsMwVYcZuU+UDlqUH1VWtMICKq/QmO4LQNfE0DtyyBSe75CxEamu0si4QzrZCwvV1ZX1QK/IHe1NnF9Xt4ZQ" + "aJn1itrSxwUfqJfJ3KSxgoQtxq2lnMcZgqaFD15EWCo3j/018QsIJzJa9buLnqS9UdAn4t07QjOjBSjEuyjMmqwrIw14xnvmXnG3" + "Sj4I+4G3FhahnSMSTeXXkgisdaScus0Xsh5ENWV/UyU50RwKmmMbGZJ0aAo3wsJSSMs5WqK24V3B3aAguCGikyZvFEohQcftbZvy" + "SC/zA/WiaJJTL17jAgMBAAGjggFJMIIBRTASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBhjAdBgNVHSUEFjAUBggr" + "BgEFBQcDAQYIKwYBBQUHAwIwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wSwYD" + "VR0fBEQwQjBAoD6gPIY6aHR0cDovL2NybDQuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0SGlnaEFzc3VyYW5jZUVWUm9vdENBLmNybDA9" + "BgNVHSAENjA0MDIGBFUdIAAwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAdBgNVHQ4EFgQUUWj/" + "kK8CB3U8zNllZGKiErhZcjswHwYDVR0jBBgwFoAUsT7DaQP4v0cB1JgmGggC72NkK8MwDQYJKoZIhvcNAQELBQADggEBABiKlYkD" + "5m3fXPwdaOpKj4PWUS+Na0QWnqxj9dJubISZi6qBcYRb7TROsLd5kinMLYBq8I4g4Xmk/gNHE+r1hspZcX30BJZr01lYPf7TMSVc" + "GDiEo+afgv2MW5gxTs14nhr9hctJqvIni5ly/D6q1UEL2tU2ob8cbkdJf17ZSHwD2f2LSaCYJkJA69aSEaRkCldUxPUd1gJea6zu" + "xICaEnL6VpPX/78whQYwvwt/Tv9XBZ0k7YXDK/umdaisLRbvfXknsuvCnQsH6qqF0wGjIChBWUMo0oHjqvbsezt3tkBigAVBRQHv" + "FwY+3sAzm2fTYS5yh+Rp/BIAV0AecPUeybRmCjImkVxP+7sgiYWmMt8FvcOXmlQiTNWFiWlrbpbqgwAAAAAAAAPJMIIDxTCCAq2g" + "AwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5j" + "MRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4X" + "DTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UE" + "CxMQd3d3LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2UgRVYgUm9vdCBDQTCCASIwDQYJKoZI" + "hvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm+9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW" + "PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEMxChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuN" + "s8ckRZqnrG0AFFoEt7oT61EKmEFBIk5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3hzBWBOUR" + "tCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsgEsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQD" + "AgGGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaAFLE+w2kD+L9HAdSY" + "JhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3NecnzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlM" + "MUu4kehDLI6zeM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jFhS9OMPagMRYjyOfiZRYzy78a" + "G6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZd" + "kGCevEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9KAA=="); + + nsCOMPtr<nsISupports> transportSecurityInfo; + nsresult rv = NS_DeserializeObject(base64Serialization, getter_AddRefs(transportSecurityInfo)); + ASSERT_EQ(NS_ERROR_FACTORY_NOT_REGISTERED, rv); + ASSERT_FALSE(transportSecurityInfo); +}

1 0

[tor-browser/tor-browser-60.2.0esr-8.5-1] Bug 1475775 - Clean up old NSS DB file after upgrade if necessary. r=franziskus, r=mattn, a=RyanVM
by gk＠torproject.org 20 Sep '18

20 Sep '18

commit e47b36fb220d31308765559a6ae09045ffebbf8f Author: David Keeler <dkeeler(a)mozilla.com> Date: Tue Jul 17 13:51:00 2018 -0700 Bug 1475775 - Clean up old NSS DB file after upgrade if necessary. r=franziskus, r=mattn, a=RyanVM Reviewers: franziskus, mattn Bug #: 1475775 Differential Revision: https://phabricator.services.mozilla.com/D2202 --HG-- rename : security/manager/ssl/tests/unit/test_sdr_preexisting_with_password.js => security/manager/ssl/tests/unit/test_sdr_upgraded_with_password.js rename : security/manager/ssl/tests/unit/test_sdr_preexisting_with_password/key3.db => security/manager/ssl/tests/unit/test_sdr_upgraded_with_password/key3.db extra : source : 26ac31d53e50217dff8829e6d9bae18c7e36b812 extra : intermediate-source : 1e05e8939a189df7b3d8309ad7936079ec012057 --- security/manager/ssl/nsNSSComponent.cpp | 48 +++++++++ .../tests/unit/test_sdr_upgraded_with_password.js | 115 +++++++++++++++++++++ .../unit/test_sdr_upgraded_with_password/cert8.db | Bin 0 -> 65536 bytes .../unit/test_sdr_upgraded_with_password/cert9.db | Bin 0 -> 229376 bytes .../unit/test_sdr_upgraded_with_password/key3.db | Bin 0 -> 16384 bytes .../unit/test_sdr_upgraded_with_password/key4.db | Bin 0 -> 294912 bytes security/manager/ssl/tests/unit/xpcshell.ini | 4 + 7 files changed, 167 insertions(+) diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp index da5dd60222ad..5d887f99dde0 100644 --- a/security/manager/ssl/nsNSSComponent.cpp +++ b/security/manager/ssl/nsNSSComponent.cpp @@ -1940,6 +1940,51 @@ AttemptToRenameBothPKCS11ModuleDBVersions(const nsACString& profilePath) } return AttemptToRenamePKCS11ModuleDB(profilePath, sqlModuleDBFilename); } + +// When we changed from the old dbm database format to the newer sqlite +// implementation, the upgrade process left behind the existing files. Suppose a +// user had not set a password for the old key3.db (which is about 99% of +// users). After upgrading, both the old database and the new database are +// unprotected. If the user then sets a password for the new database, the old +// one will not be protected. In this scenario, we should probably just remove +// the old database (it would only be relevant if the user downgraded to a +// version of Firefox before 58, but we have to trade this off against the +// user's old private keys being unexpectedly unprotected after setting a +// password). +// This was never an issue on Android because we always used the new +// implementation. +static void +MaybeCleanUpOldNSSFiles(const nsACString& profilePath) +{ + UniquePK11SlotInfo slot(PK11_GetInternalKeySlot()); + if (!slot) { + return; + } + // Unfortunately we can't now tell the difference between "there already was a + // password when the upgrade happened" and "there was not a password but then + // the user added one after upgrading". + bool hasPassword = PK11_NeedLogin(slot.get()) && + !PK11_NeedUserInit(slot.get()); + if (!hasPassword) { + return; + } + nsCOMPtr<nsIFile> dbFile = do_CreateInstance("@mozilla.org/file/local;1"); + if (!dbFile) { + return; + } + nsresult rv = dbFile->InitWithNativePath(profilePath); + if (NS_FAILED(rv)) { + return; + } + NS_NAMED_LITERAL_CSTRING(keyDBFilename, "key3.db"); + rv = dbFile->AppendNative(keyDBFilename); + if (NS_FAILED(rv)) { + return; + } + // Since this isn't a directory, the `recursive` argument to `Remove` is + // irrelevant. + Unused << dbFile->Remove(false); +} #endif // ifndef ANDROID // Given a profile directory, attempt to initialize NSS. If nocertdb is true, @@ -1971,6 +2016,9 @@ InitializeNSSWithFallbacks(const nsACString& profilePath, bool nocertdb, SECStatus srv = ::mozilla::psm::InitializeNSS(profilePath, false, !safeMode); if (srv == SECSuccess) { MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("initialized NSS in r/w mode")); +#ifndef ANDROID + MaybeCleanUpOldNSSFiles(profilePath); +#endif // ifndef ANDROID return NS_OK; } #ifndef ANDROID diff --git a/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password.js b/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password.js new file mode 100644 index 000000000000..4949c2cf7956 --- /dev/null +++ b/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password.js @@ -0,0 +1,115 @@ +// -*- indent-tabs-mode: nil; js-indent-level: 2 -*- +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. + +"use strict"; + +// Tests that the SDR implementation is able to decrypt strings encrypted using +// a preexisting NSS key database that a) has a password and b) has already been +// upgraded from the old dbm format in a previous run of Firefox. +// To create such a database, run the xpcshell test +// `test_sdr_preexisting_with_password.js` and locate the file `key4.db` created +// in the xpcshell test profile directory. +// This does not apply to Android as the dbm implementation was never enabled on +// that platform. + +var gMockPrompter = { + passwordToTry: "password", + numPrompts: 0, + + // This intentionally does not use arrow function syntax to avoid an issue + // where in the context of the arrow function, |this != gMockPrompter| due to + // how objects get wrapped when going across xpcom boundaries. + promptPassword(dialogTitle, text, password, checkMsg, checkValue) { + this.numPrompts++; + if (this.numPrompts > 1) { // don't keep retrying a bad password + return false; + } + equal(text, + "Please enter your master password.", + "password prompt text should be as expected"); + equal(checkMsg, null, "checkMsg should be null"); + ok(this.passwordToTry, "passwordToTry should be non-null"); + password.value = this.passwordToTry; + return true; + }, + + QueryInterface: XPCOMUtils.generateQI([Ci.nsIPrompt]), +}; + +// Mock nsIWindowWatcher. PSM calls getNewPrompter on this to get an nsIPrompt +// to call promptPassword. We return the mock one, above. +var gWindowWatcher = { + getNewPrompter: () => gMockPrompter, + QueryInterface: XPCOMUtils.generateQI([Ci.nsIWindowWatcher]), +}; + +function run_test() { + let windowWatcherCID = + MockRegistrar.register("@mozilla.org/embedcomp/window-watcher;1", + gWindowWatcher); + registerCleanupFunction(() => { + MockRegistrar.unregister(windowWatcherCID); + }); + + let profile = do_get_profile(); + let key3DBFile = do_get_file("test_sdr_upgraded_with_password/key3.db"); + key3DBFile.copyTo(profile, "key3.db"); + let key4DBFile = do_get_file("test_sdr_upgraded_with_password/key4.db"); + key4DBFile.copyTo(profile, "key4.db"); + // Unfortunately we have to also copy the certificate databases as well. + // Otherwise, NSS will think it has to create them, which will cause NSS to + // think it has to also do a migration, which will open key3.db and not close + // it until shutdown, which means that on Windows removing the file just after + // startup fails. Luckily users profiles will have both key and certificate + // databases anyway, so this is an accurate reflection of normal use. + let cert8DBFile = do_get_file("test_sdr_upgraded_with_password/cert8.db"); + cert8DBFile.copyTo(profile, "cert8.db"); + let cert9DBFile = do_get_file("test_sdr_upgraded_with_password/cert9.db"); + cert9DBFile.copyTo(profile, "cert9.db"); + + let sdr = Cc["@mozilla.org/security/sdr;1"] + .getService(Ci.nsISecretDecoderRing); + + let testcases = [ + // a full padding block + { ciphertext: "MDoEEPgAAAAAAAAAAAAAAAAAAAEwFAYIKoZIhvcNAwcECGeDHwVfyFqzBBAYvqMq/kDMsrARVNdC1C8d", + plaintext: "password" }, + // 7 bytes of padding + { ciphertext: "MDIEEPgAAAAAAAAAAAAAAAAAAAEwFAYIKoZIhvcNAwcECCAzLDVmYG2/BAh3IoIsMmT8dQ==", + plaintext: "a" }, + // 6 bytes of padding + { ciphertext: "MDIEEPgAAAAAAAAAAAAAAAAAAAEwFAYIKoZIhvcNAwcECPN8zlZzn8FdBAiu2acpT8UHsg==", + plaintext: "bb" }, + // 1 byte of padding + { ciphertext: "MDIEEPgAAAAAAAAAAAAAAAAAAAEwFAYIKoZIhvcNAwcECD5px1eMKkJQBAgUPp35GlrDvQ==", + plaintext: "!seven!" }, + // 2 bytes of padding + { ciphertext: "MDIEEPgAAAAAAAAAAAAAAAAAAAEwFAYIKoZIhvcNAwcECMh0hLtKDyUdBAixw9UZsMt+vA==", + plaintext: "sixsix" }, + // long plaintext requiring more than two blocks + { ciphertext: "MFoEEPgAAAAAAAAAAAAAAAAAAAEwFAYIKoZIhvcNAwcECDRX1qi+/FX1BDATFIcIneQjvBuq3wdFxzllJt2VtUD69ACdOKAXH3eA87oHDvuHqOeCDwRy4UzoG5s=", + plaintext: "thisismuchlongerandsotakesupmultipleblocks" }, + // this differs from the previous ciphertext by one bit and demonstrates + // that this implementation does not enforce message integrity + { ciphertext: "MFoEEPgAAAAAAAAAAAAAAAAAAAEwFAYIKoZIhvcNAwcECDRX1qi+/FX1BDAbFIcIneQjvBuq3wdFxzllJt2VtUD69ACdOKAXH3eA87oHDvuHqOeCDwRy4UzoG5s=", + plaintext: "nnLbuwLRkhlongerandsotakesupmultipleblocks" }, + ]; + + for (let testcase of testcases) { + let decrypted = sdr.decryptString(testcase.ciphertext); + equal(decrypted, testcase.plaintext, + "decrypted ciphertext should match expected plaintext"); + } + equal(gMockPrompter.numPrompts, 1, + "Should have been prompted for a password once"); + + // NSS does not close the old database when performing an upgrade. Thus, on + // Windows, we can't delete the old database file on the run that we perform + // an upgrade. However, we can delete it on subsequent runs. + let key3DBInProfile = do_get_profile(); + key3DBInProfile.append("key3.db"); + ok(!key3DBInProfile.exists(), + "key3.db should not exist after running with key4.db with a password"); +} diff --git a/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password/cert8.db b/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password/cert8.db new file mode 100644 index 000000000000..ac40a3325724 Binary files /dev/null and b/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password/cert8.db differ diff --git a/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password/cert9.db b/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password/cert9.db new file mode 100644 index 000000000000..163d07a6f325 Binary files /dev/null and b/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password/cert9.db differ diff --git a/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password/key3.db b/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password/key3.db new file mode 100644 index 000000000000..cac0808ac32c Binary files /dev/null and b/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password/key3.db differ diff --git a/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password/key4.db b/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password/key4.db new file mode 100644 index 000000000000..8c853543cc3e Binary files /dev/null and b/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password/key4.db differ diff --git a/security/manager/ssl/tests/unit/xpcshell.ini b/security/manager/ssl/tests/unit/xpcshell.ini index 5e5a1190f170..db865f6757bb 100644 --- a/security/manager/ssl/tests/unit/xpcshell.ini +++ b/security/manager/ssl/tests/unit/xpcshell.ini @@ -32,6 +32,7 @@ support-files = test_pinning_dynamic/** test_sdr_preexisting/** test_sdr_preexisting_with_password/** + test_sdr_upgraded_with_password/** test_signed_apps/** test_signed_dir/** test_startcom_wosign/** @@ -153,6 +154,9 @@ requesttimeoutfactor = 2 [test_sdr_preexisting_with_password.js] # Not relevant to Android. See the comment in the test. skip-if = toolkit == 'android' +[test_sdr_upgraded_with_password.js] +# Not relevant to Android. See the comment in the test. +skip-if = toolkit == 'android' [test_session_resumption.js] run-sequentially = hardcoded ports [test_signed_apps.js]

1 0

[tor-browser-build/maint-8.0] Preparing a build2 for 8.0.1
by gk＠torproject.org 20 Sep '18

20 Sep '18

commit eaf882ad3dd1c5fc2461d5ba898837de1eed66eb Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 20 08:24:35 2018 +0000 Preparing a build2 for 8.0.1 We pick up three patches that are planned for Firefox 60.2.1esr but we can't wait for the final release candidate as we run out of time before Mexico. Furthermore, back out the moat related fix in Tor Launcher. We want to give it a bit more testing time on alpha. --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- rbm.conf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index ad9d7d8..9d675eb 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build4' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build5' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 4cc90f3..12ae6ff 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -11,9 +11,8 @@ Tor Browser 8.0.1 -- September 20 2018 * Bug 27427: Fix NoScript IPC for about:blank by whitelisting messages * Bug 27558: Update the link to "Your Guard note may not change" text * Translations update - * Update Tor Launcher to 0.2.16.5 + * Update Tor Launcher to 0.2.16.6 * Bug 27469: Adapt Moat URLs - * Bug 25405: Cannot use Moat if a meek bridge is configured * Translations update * Clean-up * Update NoScript to 10.1.9.6 @@ -22,6 +21,7 @@ Tor Browser 8.0.1 -- September 20 2018 * Bug 27543: QR code is broken on web.whatsapp.com * Bug 27264: Bookmark items are not visible on the boomark toolbar * Bug 27535: Enable TLS 1.3 draft version + * Backport of Mozilla bug 1490585, 1475775, and 1489744 * OS X * Bug 27482: Fix crash during start-up on macOS 10.9.x systems * Linux diff --git a/rbm.conf b/rbm.conf index 8ad5c34..529cd56 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0.1' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.0 project_name: tor-browser

1 0

[tor-browser/tor-browser-60.2.0esr-8.0-1] Bug 1475775 - Clean up old NSS DB file after upgrade if necessary. r=franziskus, r=mattn, a=RyanVM
by gk＠torproject.org 20 Sep '18

20 Sep '18

commit ae13b0bbbf37edc464def7231992529eaf4ab731 Author: David Keeler <dkeeler(a)mozilla.com> Date: Tue Jul 17 13:51:00 2018 -0700 Bug 1475775 - Clean up old NSS DB file after upgrade if necessary. r=franziskus, r=mattn, a=RyanVM Reviewers: franziskus, mattn Bug #: 1475775 Differential Revision: https://phabricator.services.mozilla.com/D2202 --HG-- rename : security/manager/ssl/tests/unit/test_sdr_preexisting_with_password.js => security/manager/ssl/tests/unit/test_sdr_upgraded_with_password.js rename : security/manager/ssl/tests/unit/test_sdr_preexisting_with_password/key3.db => security/manager/ssl/tests/unit/test_sdr_upgraded_with_password/key3.db extra : source : 26ac31d53e50217dff8829e6d9bae18c7e36b812 extra : intermediate-source : 1e05e8939a189df7b3d8309ad7936079ec012057 --- security/manager/ssl/nsNSSComponent.cpp | 48 +++++++++ .../tests/unit/test_sdr_upgraded_with_password.js | 115 +++++++++++++++++++++ .../unit/test_sdr_upgraded_with_password/cert8.db | Bin 0 -> 65536 bytes .../unit/test_sdr_upgraded_with_password/cert9.db | Bin 0 -> 229376 bytes .../unit/test_sdr_upgraded_with_password/key3.db | Bin 0 -> 16384 bytes .../unit/test_sdr_upgraded_with_password/key4.db | Bin 0 -> 294912 bytes security/manager/ssl/tests/unit/xpcshell.ini | 4 + 7 files changed, 167 insertions(+) diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp index da5dd60222ad..5d887f99dde0 100644 --- a/security/manager/ssl/nsNSSComponent.cpp +++ b/security/manager/ssl/nsNSSComponent.cpp @@ -1940,6 +1940,51 @@ AttemptToRenameBothPKCS11ModuleDBVersions(const nsACString& profilePath) } return AttemptToRenamePKCS11ModuleDB(profilePath, sqlModuleDBFilename); } + +// When we changed from the old dbm database format to the newer sqlite +// implementation, the upgrade process left behind the existing files. Suppose a +// user had not set a password for the old key3.db (which is about 99% of +// users). After upgrading, both the old database and the new database are +// unprotected. If the user then sets a password for the new database, the old +// one will not be protected. In this scenario, we should probably just remove +// the old database (it would only be relevant if the user downgraded to a +// version of Firefox before 58, but we have to trade this off against the +// user's old private keys being unexpectedly unprotected after setting a +// password). +// This was never an issue on Android because we always used the new +// implementation. +static void +MaybeCleanUpOldNSSFiles(const nsACString& profilePath) +{ + UniquePK11SlotInfo slot(PK11_GetInternalKeySlot()); + if (!slot) { + return; + } + // Unfortunately we can't now tell the difference between "there already was a + // password when the upgrade happened" and "there was not a password but then + // the user added one after upgrading". + bool hasPassword = PK11_NeedLogin(slot.get()) && + !PK11_NeedUserInit(slot.get()); + if (!hasPassword) { + return; + } + nsCOMPtr<nsIFile> dbFile = do_CreateInstance("@mozilla.org/file/local;1"); + if (!dbFile) { + return; + } + nsresult rv = dbFile->InitWithNativePath(profilePath); + if (NS_FAILED(rv)) { + return; + } + NS_NAMED_LITERAL_CSTRING(keyDBFilename, "key3.db"); + rv = dbFile->AppendNative(keyDBFilename); + if (NS_FAILED(rv)) { + return; + } + // Since this isn't a directory, the `recursive` argument to `Remove` is + // irrelevant. + Unused << dbFile->Remove(false); +} #endif // ifndef ANDROID // Given a profile directory, attempt to initialize NSS. If nocertdb is true, @@ -1971,6 +2016,9 @@ InitializeNSSWithFallbacks(const nsACString& profilePath, bool nocertdb, SECStatus srv = ::mozilla::psm::InitializeNSS(profilePath, false, !safeMode); if (srv == SECSuccess) { MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("initialized NSS in r/w mode")); +#ifndef ANDROID + MaybeCleanUpOldNSSFiles(profilePath); +#endif // ifndef ANDROID return NS_OK; } #ifndef ANDROID diff --git a/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password.js b/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password.js new file mode 100644 index 000000000000..4949c2cf7956 --- /dev/null +++ b/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password.js @@ -0,0 +1,115 @@ +// -*- indent-tabs-mode: nil; js-indent-level: 2 -*- +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. + +"use strict"; + +// Tests that the SDR implementation is able to decrypt strings encrypted using +// a preexisting NSS key database that a) has a password and b) has already been +// upgraded from the old dbm format in a previous run of Firefox. +// To create such a database, run the xpcshell test +// `test_sdr_preexisting_with_password.js` and locate the file `key4.db` created +// in the xpcshell test profile directory. +// This does not apply to Android as the dbm implementation was never enabled on +// that platform. + +var gMockPrompter = { + passwordToTry: "password", + numPrompts: 0, + + // This intentionally does not use arrow function syntax to avoid an issue + // where in the context of the arrow function, |this != gMockPrompter| due to + // how objects get wrapped when going across xpcom boundaries. + promptPassword(dialogTitle, text, password, checkMsg, checkValue) { + this.numPrompts++; + if (this.numPrompts > 1) { // don't keep retrying a bad password + return false; + } + equal(text, + "Please enter your master password.", + "password prompt text should be as expected"); + equal(checkMsg, null, "checkMsg should be null"); + ok(this.passwordToTry, "passwordToTry should be non-null"); + password.value = this.passwordToTry; + return true; + }, + + QueryInterface: XPCOMUtils.generateQI([Ci.nsIPrompt]), +}; + +// Mock nsIWindowWatcher. PSM calls getNewPrompter on this to get an nsIPrompt +// to call promptPassword. We return the mock one, above. +var gWindowWatcher = { + getNewPrompter: () => gMockPrompter, + QueryInterface: XPCOMUtils.generateQI([Ci.nsIWindowWatcher]), +}; + +function run_test() { + let windowWatcherCID = + MockRegistrar.register("@mozilla.org/embedcomp/window-watcher;1", + gWindowWatcher); + registerCleanupFunction(() => { + MockRegistrar.unregister(windowWatcherCID); + }); + + let profile = do_get_profile(); + let key3DBFile = do_get_file("test_sdr_upgraded_with_password/key3.db"); + key3DBFile.copyTo(profile, "key3.db"); + let key4DBFile = do_get_file("test_sdr_upgraded_with_password/key4.db"); + key4DBFile.copyTo(profile, "key4.db"); + // Unfortunately we have to also copy the certificate databases as well. + // Otherwise, NSS will think it has to create them, which will cause NSS to + // think it has to also do a migration, which will open key3.db and not close + // it until shutdown, which means that on Windows removing the file just after + // startup fails. Luckily users profiles will have both key and certificate + // databases anyway, so this is an accurate reflection of normal use. + let cert8DBFile = do_get_file("test_sdr_upgraded_with_password/cert8.db"); + cert8DBFile.copyTo(profile, "cert8.db"); + let cert9DBFile = do_get_file("test_sdr_upgraded_with_password/cert9.db"); + cert9DBFile.copyTo(profile, "cert9.db"); + + let sdr = Cc["@mozilla.org/security/sdr;1"] + .getService(Ci.nsISecretDecoderRing); + + let testcases = [ + // a full padding block + { ciphertext: "MDoEEPgAAAAAAAAAAAAAAAAAAAEwFAYIKoZIhvcNAwcECGeDHwVfyFqzBBAYvqMq/kDMsrARVNdC1C8d", + plaintext: "password" }, + // 7 bytes of padding + { ciphertext: "MDIEEPgAAAAAAAAAAAAAAAAAAAEwFAYIKoZIhvcNAwcECCAzLDVmYG2/BAh3IoIsMmT8dQ==", + plaintext: "a" }, + // 6 bytes of padding + { ciphertext: "MDIEEPgAAAAAAAAAAAAAAAAAAAEwFAYIKoZIhvcNAwcECPN8zlZzn8FdBAiu2acpT8UHsg==", + plaintext: "bb" }, + // 1 byte of padding + { ciphertext: "MDIEEPgAAAAAAAAAAAAAAAAAAAEwFAYIKoZIhvcNAwcECD5px1eMKkJQBAgUPp35GlrDvQ==", + plaintext: "!seven!" }, + // 2 bytes of padding + { ciphertext: "MDIEEPgAAAAAAAAAAAAAAAAAAAEwFAYIKoZIhvcNAwcECMh0hLtKDyUdBAixw9UZsMt+vA==", + plaintext: "sixsix" }, + // long plaintext requiring more than two blocks + { ciphertext: "MFoEEPgAAAAAAAAAAAAAAAAAAAEwFAYIKoZIhvcNAwcECDRX1qi+/FX1BDATFIcIneQjvBuq3wdFxzllJt2VtUD69ACdOKAXH3eA87oHDvuHqOeCDwRy4UzoG5s=", + plaintext: "thisismuchlongerandsotakesupmultipleblocks" }, + // this differs from the previous ciphertext by one bit and demonstrates + // that this implementation does not enforce message integrity + { ciphertext: "MFoEEPgAAAAAAAAAAAAAAAAAAAEwFAYIKoZIhvcNAwcECDRX1qi+/FX1BDAbFIcIneQjvBuq3wdFxzllJt2VtUD69ACdOKAXH3eA87oHDvuHqOeCDwRy4UzoG5s=", + plaintext: "nnLbuwLRkhlongerandsotakesupmultipleblocks" }, + ]; + + for (let testcase of testcases) { + let decrypted = sdr.decryptString(testcase.ciphertext); + equal(decrypted, testcase.plaintext, + "decrypted ciphertext should match expected plaintext"); + } + equal(gMockPrompter.numPrompts, 1, + "Should have been prompted for a password once"); + + // NSS does not close the old database when performing an upgrade. Thus, on + // Windows, we can't delete the old database file on the run that we perform + // an upgrade. However, we can delete it on subsequent runs. + let key3DBInProfile = do_get_profile(); + key3DBInProfile.append("key3.db"); + ok(!key3DBInProfile.exists(), + "key3.db should not exist after running with key4.db with a password"); +} diff --git a/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password/cert8.db b/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password/cert8.db new file mode 100644 index 000000000000..ac40a3325724 Binary files /dev/null and b/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password/cert8.db differ diff --git a/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password/cert9.db b/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password/cert9.db new file mode 100644 index 000000000000..163d07a6f325 Binary files /dev/null and b/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password/cert9.db differ diff --git a/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password/key3.db b/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password/key3.db new file mode 100644 index 000000000000..cac0808ac32c Binary files /dev/null and b/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password/key3.db differ diff --git a/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password/key4.db b/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password/key4.db new file mode 100644 index 000000000000..8c853543cc3e Binary files /dev/null and b/security/manager/ssl/tests/unit/test_sdr_upgraded_with_password/key4.db differ diff --git a/security/manager/ssl/tests/unit/xpcshell.ini b/security/manager/ssl/tests/unit/xpcshell.ini index 5e5a1190f170..db865f6757bb 100644 --- a/security/manager/ssl/tests/unit/xpcshell.ini +++ b/security/manager/ssl/tests/unit/xpcshell.ini @@ -32,6 +32,7 @@ support-files = test_pinning_dynamic/** test_sdr_preexisting/** test_sdr_preexisting_with_password/** + test_sdr_upgraded_with_password/** test_signed_apps/** test_signed_dir/** test_startcom_wosign/** @@ -153,6 +154,9 @@ requesttimeoutfactor = 2 [test_sdr_preexisting_with_password.js] # Not relevant to Android. See the comment in the test. skip-if = toolkit == 'android' +[test_sdr_upgraded_with_password.js] +# Not relevant to Android. See the comment in the test. +skip-if = toolkit == 'android' [test_session_resumption.js] run-sequentially = hardcoded ports [test_signed_apps.js]

1 0

[tor-browser/tor-browser-60.2.0esr-8.0-1] Bug 1490585 - Ensure we got an nsISSLStatus when deserializing in TransportSecurityInfo. r=jcj, a=RyanVM
by gk＠torproject.org 20 Sep '18

20 Sep '18

commit 9b86848baf55860cfc3a341bd9c8b40e1fa0f89e Author: Dana Keeler <dkeeler(a)mozilla.com> Date: Thu Sep 13 16:59:21 2018 +0000 Bug 1490585 - Ensure we got an nsISSLStatus when deserializing in TransportSecurityInfo. r=jcj, a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D5803 --HG-- extra : source : 45359b962851973a70afbde575e6b89242d408de extra : intermediate-source : e9dd9434ad9ac15284429d904a45e4daf567c03b --- security/manager/ssl/TransportSecurityInfo.cpp | 7 +- .../ssl/tests/gtest/DeserializeCertTest.cpp | 86 ++++++++++++++++++++++ 2 files changed, 92 insertions(+), 1 deletion(-) diff --git a/security/manager/ssl/TransportSecurityInfo.cpp b/security/manager/ssl/TransportSecurityInfo.cpp index a57f91603ec4..c954e5517683 100644 --- a/security/manager/ssl/TransportSecurityInfo.cpp +++ b/security/manager/ssl/TransportSecurityInfo.cpp @@ -390,7 +390,12 @@ TransportSecurityInfo::Read(nsIObjectInputStream* stream) if (NS_FAILED(rv)) { return rv; } - mSSLStatus = BitwiseCast<nsSSLStatus*, nsISupports*>(supports.get()); + nsCOMPtr<nsISSLStatus> castGuard(do_QueryInterface(supports)); + if (castGuard) { + mSSLStatus = BitwiseCast<nsSSLStatus*, nsISSLStatus*>(castGuard.get()); + } else { + mSSLStatus = nullptr; + } nsCOMPtr<nsISupports> failedCertChainSupports; rv = NS_ReadOptionalObject(stream, true, getter_AddRefs(failedCertChainSupports)); diff --git a/security/manager/ssl/tests/gtest/DeserializeCertTest.cpp b/security/manager/ssl/tests/gtest/DeserializeCertTest.cpp index 868ecdba6b57..c3a4115b333d 100644 --- a/security/manager/ssl/tests/gtest/DeserializeCertTest.cpp +++ b/security/manager/ssl/tests/gtest/DeserializeCertTest.cpp @@ -94,3 +94,89 @@ TEST(psm_DeserializeCert, gecko46) ASSERT_EQ(NS_OK, rv); ASSERT_TRUE(cert); } + +TEST(psm_DeserializeCert, gecko64) +{ + // This is a serialization of nsITransportSecurityInfo from gecko 64. + // Deserialization should fail. + nsCString base64Serialization( + "FnhllAKWRHGAlo+ESXykKAAAAAAAAAAAwAAAAAAAAEaphjojH6pBabDSgSnsfLHeAAgAAgAAAAAAAAAAAAAAAAAAAAEAMQFmCjIm" + "kVxP+7sgiYWmMt8FvcOXmlQiTNWFiWlrbpbqgwAAAAAAAAX2MIIF8jCCBNqgAwIBAgIQDmTF+8I2reFLFyrrQceMsDANBgkqhkiG" + "9w0BAQsFADBwMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMS8w" + "LQYDVQQDEyZEaWdpQ2VydCBTSEEyIEhpZ2ggQXNzdXJhbmNlIFNlcnZlciBDQTAeFw0xNTExMDMwMDAwMDBaFw0xODExMjgxMjAw" + "MDBaMIGlMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLTG9zIEFuZ2VsZXMxPDA6BgNVBAoTM0lu" + "dGVybmV0IENvcnBvcmF0aW9uIGZvciBBc3NpZ25lZCBOYW1lcyBhbmQgTnVtYmVyczETMBEGA1UECxMKVGVjaG5vbG9neTEYMBYG" + "A1UEAxMPd3d3LmV4YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs0CWL2FjPiXBl61lRfvvE0KzLJmG" + "9LWAC3bcBjgsH6NiVVo2dt6uXfzi5bTm7F3K7srfUBYkLO78mraM9qizrHoIeyofrV/n+pZZJauQsPjCPxMEJnRoD8Z4KpWKX0Ly" + "Du1SputoI4nlQ/htEhtiQnuoBfNZxF7WxcxGwEsZuS1KcXIkHl5VRJOreKFHTaXcB1qcZ/QRaBIv0yhxvK1yBTwWddT4cli6GfHc" + "Ce3xGMaSL328Fgs3jYrvG29PueB6VJi/tbbPu6qTfwp/H1brqdjh29U52Bhb0fJkM9DWxCP/Cattcc7az8EXnCO+LK8vkhw/kAiJ" + "WPKx4RBvgy73nwIDAQABo4ICUDCCAkwwHwYDVR0jBBgwFoAUUWj/kK8CB3U8zNllZGKiErhZcjswHQYDVR0OBBYEFKZPYB4fLdHn" + "8SOgKpUW5Oia6m5IMIGBBgNVHREEejB4gg93d3cuZXhhbXBsZS5vcmeCC2V4YW1wbGUuY29tggtleGFtcGxlLmVkdYILZXhhbXBs" + "ZS5uZXSCC2V4YW1wbGUub3Jngg93d3cuZXhhbXBsZS5jb22CD3d3dy5leGFtcGxlLmVkdYIPd3d3LmV4YW1wbGUubmV0MA4GA1Ud" + "DwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwdQYDVR0fBG4wbDA0oDKgMIYuaHR0cDovL2NybDMuZGln" + "aWNlcnQuY29tL3NoYTItaGEtc2VydmVyLWc0LmNybDA0oDKgMIYuaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL3NoYTItaGEtc2Vy" + "dmVyLWc0LmNybDBMBgNVHSAERTBDMDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20v" + "Q1BTMAgGBmeBDAECAjCBgwYIKwYBBQUHAQEEdzB1MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wTQYIKwYB" + "BQUHMAKGQWh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFNIQTJIaWdoQXNzdXJhbmNlU2VydmVyQ0EuY3J0MAwG" + "A1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAISomhGn2L0LJn5SJHuyVZ3qMIlRCIdvqe0Q6ls+C8ctRwRO3UU3x8q8OH+2" + "ahxlQmpzdC5al4XQzJLiLjiJ2Q1p+hub8MFiMmVPPZjb2tZm2ipWVuMRM+zgpRVM6nVJ9F3vFfUSHOb4/JsEIUvPY+d8/Krc+kPQ" + "wLvyieqRbcuFjmqfyPmUv1U9QoI4TQikpw7TZU0zYZANP4C/gj4Ry48/znmUaRvy2kvIl7gRQ21qJTK5suoiYoYNo3J9T+pXPGU7" + "Lydz/HwW+w0DpArtAaukI8aNX4ohFUKSwDSiIIWIWJiJGbEeIO0TIFwEVWTOnbNl/faPXpk5IRXicapqiILALwADAAAAAAEBAAAA" + "AAAABFAyNTYAAAAQUlNBLVBLQ1MxLVNIQTUxMgGVn7FlZRdIf6ub2JE75TGXrnTNpc0vRz+W9fC3//YsaAAAAANmCjImkVxP+7sg" + "iYWmMt8FvcOXmlQiTNWFiWlrbpbqgwAAAAAAAAX2MIIF8jCCBNqgAwIBAgIQDmTF+8I2reFLFyrrQceMsDANBgkqhkiG9w0BAQsF" + "ADBwMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMS8wLQYDVQQD" + "EyZEaWdpQ2VydCBTSEEyIEhpZ2ggQXNzdXJhbmNlIFNlcnZlciBDQTAeFw0xNTExMDMwMDAwMDBaFw0xODExMjgxMjAwMDBaMIGl" + "MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLTG9zIEFuZ2VsZXMxPDA6BgNVBAoTM0ludGVybmV0" + "IENvcnBvcmF0aW9uIGZvciBBc3NpZ25lZCBOYW1lcyBhbmQgTnVtYmVyczETMBEGA1UECxMKVGVjaG5vbG9neTEYMBYGA1UEAxMP" + "d3d3LmV4YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs0CWL2FjPiXBl61lRfvvE0KzLJmG9LWAC3bc" + "BjgsH6NiVVo2dt6uXfzi5bTm7F3K7srfUBYkLO78mraM9qizrHoIeyofrV/n+pZZJauQsPjCPxMEJnRoD8Z4KpWKX0LyDu1Sputo" + "I4nlQ/htEhtiQnuoBfNZxF7WxcxGwEsZuS1KcXIkHl5VRJOreKFHTaXcB1qcZ/QRaBIv0yhxvK1yBTwWddT4cli6GfHcCe3xGMaS" + "L328Fgs3jYrvG29PueB6VJi/tbbPu6qTfwp/H1brqdjh29U52Bhb0fJkM9DWxCP/Cattcc7az8EXnCO+LK8vkhw/kAiJWPKx4RBv" + "gy73nwIDAQABo4ICUDCCAkwwHwYDVR0jBBgwFoAUUWj/kK8CB3U8zNllZGKiErhZcjswHQYDVR0OBBYEFKZPYB4fLdHn8SOgKpUW" + "5Oia6m5IMIGBBgNVHREEejB4gg93d3cuZXhhbXBsZS5vcmeCC2V4YW1wbGUuY29tggtleGFtcGxlLmVkdYILZXhhbXBsZS5uZXSC" + "C2V4YW1wbGUub3Jngg93d3cuZXhhbXBsZS5jb22CD3d3dy5leGFtcGxlLmVkdYIPd3d3LmV4YW1wbGUubmV0MA4GA1UdDwEB/wQE" + "AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwdQYDVR0fBG4wbDA0oDKgMIYuaHR0cDovL2NybDMuZGlnaWNlcnQu" + "Y29tL3NoYTItaGEtc2VydmVyLWc0LmNybDA0oDKgMIYuaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL3NoYTItaGEtc2VydmVyLWc0" + "LmNybDBMBgNVHSAERTBDMDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMAgG" + "BmeBDAECAjCBgwYIKwYBBQUHAQEEdzB1MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wTQYIKwYBBQUHMAKG" + "QWh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFNIQTJIaWdoQXNzdXJhbmNlU2VydmVyQ0EuY3J0MAwGA1UdEwEB" + "/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAISomhGn2L0LJn5SJHuyVZ3qMIlRCIdvqe0Q6ls+C8ctRwRO3UU3x8q8OH+2ahxlQmpz" + "dC5al4XQzJLiLjiJ2Q1p+hub8MFiMmVPPZjb2tZm2ipWVuMRM+zgpRVM6nVJ9F3vFfUSHOb4/JsEIUvPY+d8/Krc+kPQwLvyieqR" + "bcuFjmqfyPmUv1U9QoI4TQikpw7TZU0zYZANP4C/gj4Ry48/znmUaRvy2kvIl7gRQ21qJTK5suoiYoYNo3J9T+pXPGU7Lydz/HwW" + "+w0DpArtAaukI8aNX4ohFUKSwDSiIIWIWJiJGbEeIO0TIFwEVWTOnbNl/faPXpk5IRXicapqiIJmCjImkVxP+7sgiYWmMt8FvcOX" + "mlQiTNWFiWlrbpbqgwAAAAAAAAS1MIIEsTCCA5mgAwIBAgIQBOHnpNxc8vNtwCtCuF0VnzANBgkqhkiG9w0BAQsFADBsMQswCQYD" + "VQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2Vy" + "dCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4XDTEzMTAyMjEyMDAwMFoXDTI4MTAyMjEyMDAwMFowcDELMAkGA1UEBhMCVVMx" + "FTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTEvMC0GA1UEAxMmRGlnaUNlcnQgU0hBMiBI" + "aWdoIEFzc3VyYW5jZSBTZXJ2ZXIgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC24C/CJAbIbQRf1+8KZAayfSIm" + "ZRauQkCbztyfn3YHPsMwVYcZuU+UDlqUH1VWtMICKq/QmO4LQNfE0DtyyBSe75CxEamu0si4QzrZCwvV1ZX1QK/IHe1NnF9Xt4ZQ" + "aJn1itrSxwUfqJfJ3KSxgoQtxq2lnMcZgqaFD15EWCo3j/018QsIJzJa9buLnqS9UdAn4t07QjOjBSjEuyjMmqwrIw14xnvmXnG3" + "Sj4I+4G3FhahnSMSTeXXkgisdaScus0Xsh5ENWV/UyU50RwKmmMbGZJ0aAo3wsJSSMs5WqK24V3B3aAguCGikyZvFEohQcftbZvy" + "SC/zA/WiaJJTL17jAgMBAAGjggFJMIIBRTASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBhjAdBgNVHSUEFjAUBggr" + "BgEFBQcDAQYIKwYBBQUHAwIwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wSwYD" + "VR0fBEQwQjBAoD6gPIY6aHR0cDovL2NybDQuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0SGlnaEFzc3VyYW5jZUVWUm9vdENBLmNybDA9" + "BgNVHSAENjA0MDIGBFUdIAAwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAdBgNVHQ4EFgQUUWj/" + "kK8CB3U8zNllZGKiErhZcjswHwYDVR0jBBgwFoAUsT7DaQP4v0cB1JgmGggC72NkK8MwDQYJKoZIhvcNAQELBQADggEBABiKlYkD" + "5m3fXPwdaOpKj4PWUS+Na0QWnqxj9dJubISZi6qBcYRb7TROsLd5kinMLYBq8I4g4Xmk/gNHE+r1hspZcX30BJZr01lYPf7TMSVc" + "GDiEo+afgv2MW5gxTs14nhr9hctJqvIni5ly/D6q1UEL2tU2ob8cbkdJf17ZSHwD2f2LSaCYJkJA69aSEaRkCldUxPUd1gJea6zu" + "xICaEnL6VpPX/78whQYwvwt/Tv9XBZ0k7YXDK/umdaisLRbvfXknsuvCnQsH6qqF0wGjIChBWUMo0oHjqvbsezt3tkBigAVBRQHv" + "FwY+3sAzm2fTYS5yh+Rp/BIAV0AecPUeybRmCjImkVxP+7sgiYWmMt8FvcOXmlQiTNWFiWlrbpbqgwAAAAAAAAPJMIIDxTCCAq2g" + "AwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5j" + "MRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4X" + "DTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UE" + "CxMQd3d3LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2UgRVYgUm9vdCBDQTCCASIwDQYJKoZI" + "hvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm+9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW" + "PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEMxChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuN" + "s8ckRZqnrG0AFFoEt7oT61EKmEFBIk5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3hzBWBOUR" + "tCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsgEsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQD" + "AgGGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaAFLE+w2kD+L9HAdSY" + "JhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3NecnzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlM" + "MUu4kehDLI6zeM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jFhS9OMPagMRYjyOfiZRYzy78a" + "G6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZd" + "kGCevEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9KAA=="); + + nsCOMPtr<nsISupports> transportSecurityInfo; + nsresult rv = NS_DeserializeObject(base64Serialization, getter_AddRefs(transportSecurityInfo)); + ASSERT_EQ(NS_ERROR_FACTORY_NOT_REGISTERED, rv); + ASSERT_FALSE(transportSecurityInfo); +}

1 0

[tor-browser/tor-browser-60.2.0esr-8.0-1] Bug 1489744 - Fix a bounds violation crash in the prefs parser. r=glandium, a=RyanVM
by gk＠torproject.org 20 Sep '18

20 Sep '18

commit 982ef502b7c6d264afd3c403f20c9b6ef7840034 Author: Nicholas Nethercote <nnethercote(a)mozilla.com> Date: Tue Sep 11 09:36:07 2018 +1000 Bug 1489744 - Fix a bounds violation crash in the prefs parser. r=glandium, a=RyanVM Currently, if a get_char() call returns EOF, the index moves beyond the buffer's bounds and get_char() cannot be called again without triggering a panic. As a result, everywhere that encounters an EOF and then does subsequent parsing ungets the EOF... except there was one place that failed to do that: the match case for CharKind::Slash in get_token(). This meant that a single '/' at the end of the input could trigger a bounds violation (but only if it is the start of a new token). This EOF-unget requirement is subtle and easy to get wrong, so this patch eliminates it. get_char() now can be called repeatedly after an EOF, and will return EOF on each subsequent call. This means that some of the existing unget_char() calls can be removed. Some others are still necessary to get line numbers correct in error messages, but the outcome of mishandled cases is now much less drastic -- an incorrect line number in an error message instead of a panic. The patch also clarifies a couple of related comments. --HG-- extra : source : 5097db630d1fb51f7f3fcd5523a924fa823e77ce extra : intermediate-source : 2676e53112584b2c08b9a1bf02e15cd9bb0d0ee5 --- modules/libpref/parser/src/lib.rs | 70 +++++++++++++++++++---------------- modules/libpref/test/gtest/Parser.cpp | 9 +++-- 2 files changed, 45 insertions(+), 34 deletions(-) diff --git a/modules/libpref/parser/src/lib.rs b/modules/libpref/parser/src/lib.rs index 8d8b9a6125e4..5ea7650252f5 100644 --- a/modules/libpref/parser/src/lib.rs +++ b/modules/libpref/parser/src/lib.rs @@ -54,16 +54,10 @@ // This parser uses several important optimizations. // -// - Because "'\0' means EOF" is part of the grammar (see above) we can match -// EOF as a normal char/token, which means we can avoid a typical "do we -// still have chars remaining?" test in get_char(), which gives a speedup -// because get_char() is a very hot function. (Actually, Rust would -// bounds-check this function anyway, so we have get_char_unchecked() which -// is used for the two hottest call sites.) -// -// This also means EOF is representable by a u8. If EOF was represented by an -// out-of-band value such as -1 or 256, we'd have to return a larger type -// such as u16 or i16 from get_char(). +// - Because "'\0' means EOF" is part of the grammar (see above), EOF is +// representable by a u8. If EOF was represented by an out-of-band value such +// as -1 or 256, we'd have to return a larger type such as u16 or i16 from +// get_char(). // // - When starting a new token, it uses a lookup table with the first char, // which quickly identifies what kind of token it will be. Furthermore, if @@ -192,7 +186,7 @@ enum Token { #[derive(Clone, Copy, PartialEq)] enum CharKind { // These are ordered by frequency. See the comment in GetToken(). - SingleChar, // Unambiguous single-char tokens: [()+,-] + SingleChar, // Unambiguous single-char tokens: [()+,-] or EOF SpaceNL, // [\t\v\f \n] Keyword, // [A-Za-z_] Quote, // ["'] @@ -535,13 +529,21 @@ impl<'t> Parser<'t> { #[inline(always)] fn get_char(&mut self) -> u8 { - let c = self.buf[self.i]; - self.i += 1; - c + // We do the bounds check ourselves so we can return EOF on failure. + // (Although the buffer is guaranteed to end in an EOF char, we might + // go one char past that, whereupon we must return EOF again.) + if self.i < self.buf.len() { + let c = unsafe { *self.buf.get_unchecked(self.i) }; + self.i += 1; + c + } else { + debug_assert!(self.i == self.buf.len()); + EOF + } } - // This function skips the bounds check in non-optimized builds. Using it - // at the hottest two call sites gives a ~15% parsing speed boost. + // This function skips the bounds check in optimized builds. Using it at + // the hottest two call sites gives a ~15% parsing speed boost. #[inline(always)] unsafe fn get_char_unchecked(&mut self) -> u8 { debug_assert!(self.i < self.buf.len()); @@ -568,9 +570,11 @@ impl<'t> Parser<'t> { #[inline(always)] fn match_single_line_comment(&mut self) { loop { - // To reach here, the previous char must have been '/', and - // assertions elsewhere ensure that there must be at least one - // subsequent char (the '\0' for EOF). + // To reach here, the previous char must have been '/' (if this is + // the first loop iteration) or non-special (if this is the second + // or subsequent iteration), and assertions elsewhere ensure that + // there must be at least one subsequent char after those chars + // (the '\0' for EOF). let c = unsafe { self.get_char_unchecked() }; // All the special chars have value <= b'\r'. @@ -588,8 +592,6 @@ impl<'t> Parser<'t> { break; } EOF => { - // Unget EOF so subsequent calls to get_char() are safe. - self.unget_char(); break; } _ => continue @@ -615,8 +617,6 @@ impl<'t> Parser<'t> { self.match_char(b'\n'); } EOF => { - // Unget EOF so subsequent calls to get_char() are safe. - self.unget_char(); return false } _ => continue @@ -630,11 +630,10 @@ impl<'t> Parser<'t> { for _ in 0..ndigits { value = value << 4; match self.get_char() { - c @ b'0'... b'9' => value += (c - b'0') as u16, + c @ b'0'...b'9' => value += (c - b'0') as u16, c @ b'A'...b'F' => value += (c - b'A') as u16 + 10, c @ b'a'...b'f' => value += (c - b'a') as u16 + 10, _ => { - // Unget in case the char was a closing quote or EOF. self.unget_char(); return None; } @@ -716,7 +715,15 @@ impl<'t> Parser<'t> { return Token::Error("unterminated /* comment"); } } - _ => return Token::Error("expected '/' or '*' after '/'") + c @ _ => { + if c == b'\n' || c == b'\r' { + // Unget the newline char; the outer loop will + // reget it and adjust self.line_num + // appropriately. + self.unget_char(); + } + return Token::Error("expected '/' or '*' after '/'"); + } } continue; } @@ -871,9 +878,12 @@ impl<'t> Parser<'t> { } continue; // We don't want to str_buf.push(c2) below. } - _ => { - // Unget in case the char is an EOF. - self.unget_char(); + c @ _ => { + if c == b'\n' || c == b'\r' { + // Unget the newline char; the outer loop will + // reget it and adjust self.line_num appropriately. + self.unget_char(); + } self.string_error_token( &mut token, "unexpected escape sequence character after '\\'"); continue; @@ -894,8 +904,6 @@ impl<'t> Parser<'t> { } } else if c == EOF { - // Unget EOF so subsequent calls to get_char() are safe. - self.unget_char(); self.string_error_token(&mut token, "unterminated string literal"); break; diff --git a/modules/libpref/test/gtest/Parser.cpp b/modules/libpref/test/gtest/Parser.cpp index d5469dd38007..fe9dea87ee60 100644 --- a/modules/libpref/test/gtest/Parser.cpp +++ b/modules/libpref/test/gtest/Parser.cpp @@ -293,11 +293,14 @@ pref("string.bad-keyword", TRUE); "test:3: prefs parse error: unterminated /* comment\n" ); - // Malformed comment. + // Malformed comments (single slashes), followed by whitespace, newline, EOF. DEFAULT(R"( -/ comment - )", +/ comment; +/ +; /)", "test:2: prefs parse error: expected '/' or '*' after '/'\n" + "test:3: prefs parse error: expected '/' or '*' after '/'\n" + "test:4: prefs parse error: expected '/' or '*' after '/'\n" ); // C++-style comment ending in EOF (1).

1 0

[tor-launcher/maint-0.2.16] Version bump (0.2.16.6)
by gk＠torproject.org 20 Sep '18

20 Sep '18

commit 020b7730ee1637728d6f90dad3fbe3b27b37a2d3 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 20 06:28:26 2018 +0000 Version bump (0.2.16.6) --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index a5d027e..6a0c65a 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.16.5</em:version> + <em:version>0.2.16.6</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[tor-launcher/maint-0.2.16] Revert "Bug 25405: cannot use Moat if a meek bridge is configured"
by gk＠torproject.org 20 Sep '18

20 Sep '18

commit b48803c87dde780a0897fe85bf4d27c739eecfbe Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 20 06:18:03 2018 +0000 Revert "Bug 25405: cannot use Moat if a meek bridge is configured" This reverts commit a5791ec33537b5efefb5c64c240e48d9ce1c8721. Let's test this bugfix a bit more on the alpha series first. --- src/modules/tl-bridgedb.jsm | 9 ++------- src/modules/tl-util.jsm | 19 ++----------------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/src/modules/tl-bridgedb.jsm b/src/modules/tl-bridgedb.jsm index 8b7a1d6..339cb39 100644 --- a/src/modules/tl-bridgedb.jsm +++ b/src/modules/tl-bridgedb.jsm @@ -224,22 +224,17 @@ _MoatRequestor.prototype = } let ptStateDir = TorLauncherUtil.getTorFile("tordatadir", false); - let meekHelperProfileDir = TorLauncherUtil.getTorFile("pt-profiles-dir", - true); - if (!ptStateDir || !meekHelperProfileDir) + if (!ptStateDir) { let msg = TorLauncherUtil.getLocalizedString("datadir_missing"); return Promise.reject(new Error(msg)); } ptStateDir.append("pt_state"); // Match what tor uses. - meekHelperProfileDir.appendRelativePath("profile.moat-http-helper"); - let envAdditions = { TOR_PT_MANAGED_TRANSPORT_VER: "1", TOR_PT_STATE_LOCATION: ptStateDir.path, TOR_PT_EXIT_ON_STDIN_CLOSE: "1", - TOR_PT_CLIENT_TRANSPORTS: this.kTransport, - TOR_BROWSER_MEEK_PROFILE: meekHelperProfileDir.path }; + TOR_PT_CLIENT_TRANSPORTS: this.kTransport }; if (this.mLocalProxyURL) envAdditions.TOR_PT_PROXY = this.mLocalProxyURL; diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 36abeaa..292f88b 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -561,8 +561,6 @@ let TorLauncherUtil = // Public path = "Tor\\torrc"; else if ("tordatadir" == aTorFileType) path = "Tor"; - else if ("pt-profiles-dir" == aTorFileType) - path = "Tor\\PluggableTransports"; } else if (this.isMac) { @@ -576,8 +574,6 @@ let TorLauncherUtil = // Public path = "Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Tor"; - else if ("pt-profiles-dir" == aTorFileType) - path = "Tor/PluggableTransports"; else if (isIPC) path = "Tor/" + ipcFileName; } @@ -593,8 +589,6 @@ let TorLauncherUtil = // Public path = "Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Tor"; - else if ("pt-profiles-dir" == aTorFileType) - path = "Tor/PluggableTransports"; else if (isIPC) path = "Tor/" + ipcFileName; } @@ -612,9 +606,7 @@ let TorLauncherUtil = // Public path = "Data\\Tor\\torrc"; else if ("tordatadir" == aTorFileType) path = "Data\\Tor"; - else if ("pt-profiles-dir" == aTorFileType) - path = "Data\\Browser"; - } + } else // Linux, Mac OS and others. { // This block is also used for the non-TorBrowser-Data/ case. @@ -628,8 +620,6 @@ let TorLauncherUtil = // Public path = "Data/Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Data/Tor"; - else if ("pt-profiles-dir" == aTorFileType) - path = "Data/Browser"; else if (isIPC) path = "Data/Tor/" + ipcFileName; } @@ -672,15 +662,10 @@ let TorLauncherUtil = // Public { try { - if (("tordatadir" == aTorFileType) || - ("pt-profiles-dir" == aTorFileType)) - { + if ("tordatadir" == aTorFileType) torFile.create(torFile.DIRECTORY_TYPE, 0o700); - } else - { torFile.create(torFile.NORMAL_FILE_TYPE, 0o600); - } } catch (e) {

1 0

[tor-browser-build/master] Fix typo in changelog
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 6a900e2af3a47e22f6390516ae2bc7a29ba7ba0a Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 18 18:09:04 2018 +0000 Fix typo in changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 60b61c0..0276ef5 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 8.0.1 -- September 20 2018 +Tor Browser 8.5a2 -- September 20 2018 * All platforms * Update Tor to 0.3.5.1-alpha * Update Torbutton to 2.1

1 0

[tor-browser-build/maint-8.0] Update 8.0.1 changelog
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 4825a7d9d091733957da2515161d8c0157428d9c Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 18 18:00:04 2018 +0000 Update 8.0.1 changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 64ef362..4cc90f3 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -24,6 +24,8 @@ Tor Browser 8.0.1 -- September 20 2018 * Bug 27535: Enable TLS 1.3 draft version * OS X * Bug 27482: Fix crash during start-up on macOS 10.9.x systems + * Linux + * Bug 26556: Fix broken Tor Browser icon path on Linux Tor Browser 8.0 -- September 5 2018 * All platforms

1 0

[tor-browser-build/master] Release preparations for 8.5a2
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 467bb22b75375c673fc3ad58653d647c7650bfc9 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 18 17:57:09 2018 +0000 Release preparations for 8.5a2 --- projects/firefox/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 33 ++++++++++++++++++++++ projects/tor-browser/config | 4 +-- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 4 +-- 7 files changed, 41 insertions(+), 8 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 8ebbd4f..aca6ce9 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 7c33834..60b61c0 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,36 @@ +Tor Browser 8.0.1 -- September 20 2018 + * All platforms + * Update Tor to 0.3.5.1-alpha + * Update Torbutton to 2.1 + * Bug 27097: Tor News signup banner + * Bug 27663: Add New Identity menuitem again + * Bug 27175: Add pref to allow users to persist custom noscript settings + * Bug 27760: Use new NoScript API for IPC and fix about:blank issue + * Bug 26624: Only block OBJECT on highest slider level + * Bug 26555: Don't show IP address for meek or snowflake + * Bug 27478: Torbutton icons for dark theme + * Bug 27506+14520: Move status version to upper left corner for RTL locales + * Bug 27558: Update the link to "Your Guard note may not change" text + * Bug 21263: Remove outdated information from the README + * Translations update + * Update Tor Launcher to 0.2.16.5 + * Bug 27469: Adapt Moat URLs + * Translations update + * Clean-up + * Update NoScript to 10.1.9.6 + * Bug 27763: Restrict Torbutton signing exemption to mobile + * Bug 26146: Spoof HTTP User-Agent header for desktop platforms + * Bug 27543: QR code is broken on web.whatsapp.com + * Bug 27264: Bookmark items are not visible on the boomark toolbar + * Bug 27535: Enable TLS 1.3 draft version + * Bug 27623: Use MOZILLA_OFFICIAL for our builds + * Windows: + * Bug 26381: about:tor page does not load on first start on Windows + * Linux: + * Bug 27546: Fix vertical scrollbar behavior in Tor Browser 8 with Gtk3 + * Bug 27552: Use bundled dir on CentOS/RHEL 6 + * Bug 26556: Fix broken Tor Browser icon path on Linux + Tor Browser 8.5a1 -- September 5 2018 * All platforms * Update Firefox to 60.2.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 85754ae..1647b77 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -67,9 +67,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 68c3ef1b753210d376ab9b9c73fa053043f4f0f4cab219e317759fb32b104a27 + sha256sum: 336ae26d0a70688e6c2b3c14267c9e80f52f6f36c31f23b8242e0edae3666d42 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index c5ddc0a..9e00653 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.16.4 +version: 0.2.16.5 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index c1a3878..451c9bb 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.4.7-rc +version: 0.3.5.1-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/projects/torbutton/config b/projects/torbutton/config index f076b8f..a698691 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.0.6 +version: 2.1 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index cbbbf64..461849c 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.5a1' + torbrowser_version: '8.5a2' torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.0a10 + - 8.5a1 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[torbutton/master] Release preparations for 2.1
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit cd85d9dd4e0a225688d1785ff4cb421abca1e16a Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 18 17:45:16 2018 +0000 Release preparations for 2.1 Changelog update and version bump --- src/CHANGELOG | 5 +++++ src/install.rdf | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 562842e9..8bffbe8b 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,8 @@ +2.1 + * Bug 27175: Add pref to allow users to persist custom noscript settings + * Bug 27760: Use new NoScript API for IPC and fix about:blank issue + * Bug 21263: Remove outdated information from the README + 2.0.7 * Bug 27097: Tor News signup banner * Bug 27663: Add New Identity menuitem again diff --git a/src/install.rdf b/src/install.rdf index cd14a7dd..5df0f129 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>2.0.7</em:version> + <em:version>2.1</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-browser/tor-browser-60.2.0esr-8.5-1] Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit cfcf68c7ef27d33f072a405ef7e99815f5e34c1d Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Sep 17 16:39:42 2018 -0400 Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds This fixes a problem where some preferences had the wrong default value. Also see bug 27472 where we made a similar fix for Android. --- .mozconfig | 1 + .mozconfig-asan | 1 + .mozconfig-mac | 1 + .mozconfig-mingw | 1 + 4 files changed, 4 insertions(+) diff --git a/.mozconfig b/.mozconfig index 909f107f2948..b19e10a24940 100755 --- a/.mozconfig +++ b/.mozconfig @@ -3,6 +3,7 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --enable-optimize diff --git a/.mozconfig-asan b/.mozconfig-asan index 914195971e6e..be11dcbd967a 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -15,6 +15,7 @@ export HOST_LDFLAGS="-ldl" mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --enable-address-sanitizer diff --git a/.mozconfig-mac b/.mozconfig-mac index 540c5b375336..a9fbe7967ead 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -33,6 +33,7 @@ ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-macos mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --enable-application=browser diff --git a/.mozconfig-mingw b/.mozconfig-mingw index 05dd4d6168a8..71494b6e1b78 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -7,6 +7,7 @@ ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --disable-debug

1 0

[tor-browser-build/master] Bug 27623: Export MOZILLA_OFFICIAL during desktop builds
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit f49b8306354f68dcaf8efeec8a4bd8b5a8908e6b Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Sep 18 09:29:55 2018 -0400 Bug 27623: Export MOZILLA_OFFICIAL during desktop builds This fixes a problem where some preferences had the wrong default value. Also see bug 27472 where we made a similar fix for Android. --- projects/firefox/mozconfig-linux-i686 | 1 + projects/firefox/mozconfig-linux-x86_64 | 1 + projects/firefox/mozconfig-osx-x86_64 | 1 + projects/firefox/mozconfig-windows-i686 | 1 + projects/firefox/mozconfig-windows-x86_64 | 1 + 5 files changed, 5 insertions(+) diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686 index ec0adb9..ee5082a 100755 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@ -3,6 +3,7 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 export CFLAGS=-m32 diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64 index 2e8e2fa..917e32c 100755 --- a/projects/firefox/mozconfig-linux-x86_64 +++ b/projects/firefox/mozconfig-linux-x86_64 @@ -3,6 +3,7 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --enable-optimize diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 7ff17e1..5d56ad3 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -31,6 +31,7 @@ ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-macos mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --enable-application=browser diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index a5e15f1..07e8851 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -10,6 +10,7 @@ ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --disable-debug diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index e7f857d..1665005 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -10,6 +10,7 @@ ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --disable-debug

1 0

[torbutton/master] Bug 27175: Add pref to allow users to persist custom noscript settings
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 461b828c70bb85501db99fdf077af71b69ef7e0a Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Sep 17 23:03:26 2018 -0700 Bug 27175: Add pref to allow users to persist custom noscript settings The pref is called "extensions.torbutton.noscript_persist". Warning! It is dangerous and could reveal what sites you have visited in the past. (We also use a pref named "extensions.torbutton.noscript_inited" to keep track of the first run.) --- src/defaults/preferences/preferences.js | 3 +++ src/modules/noscript-control.js | 31 +++++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index fecf0e69..45b60ce8 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -48,6 +48,9 @@ pref("extensions.torbutton.prompt_torbrowser", true); pref("extensions.torbutton.confirm_plugins", true); pref("extensions.torbutton.confirm_newnym", true); +pref("extensions.torbutton.noscript_inited", false); +pref("extensions.torbutton.noscript_persist", false); + // Browser home page: pref("browser.startup.homepage", "chrome://torbutton/content/locale/non-localized.properties"); diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js index 621f2b7f..275f9dba 100644 --- a/src/modules/noscript-control.js +++ b/src/modules/noscript-control.js @@ -5,9 +5,10 @@ // ## Utilities const { utils: Cu } = Components; +const { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); const { LegacyExtensionContext } = Cu.import("resource://gre/modules/LegacyExtensionsUtils.jsm", {}); -const { bindPrefAndInit } = +const { bindPref } = Cu.import("resource://torbutton/modules/utils.js", {}); let logger = Components.classes["@torproject.org/torbutton-logger;1"] .getService(Components.interfaces.nsISupports).wrappedJSObject; @@ -128,14 +129,28 @@ var initialize = () => { // Wait for the first message from NoScript to arrive, and then // bind the security_slider pref to the NoScript settings. let messageListener = (a,b,c) => { - log(3, `Message received from NoScript: ${JSON.stringify([a,b,c])}`); - if (!["started", "pageshow"].includes(a.__meta.name)) { - return; + try { + log(3, `Message received from NoScript: ${JSON.stringify([a,b,c])}`); + if (!["started", "pageshow"].includes(a.__meta.name)) { + return; + } + extensionContext.api.browser.runtime.onMessage.removeListener(messageListener); + let noscriptPersist = Services.prefs.getBoolPref("extensions.torbutton.noscript_persist", false); + let noscriptInited = Services.prefs.getBoolPref("extensions.torbutton.noscript_inited", false); + // Set the noscript safety level once if we have never run noscript + // before, or if we are not allowing noscript per-site settings to be + // persisted between browser sessions. Otherwise make sure that the + // security slider position, if changed, will rewrite the noscript + // settings. + bindPref("extensions.torbutton.security_slider", + sliderState => setNoScriptSafetyLevel(securitySliderToSafetyLevel(sliderState)), + !noscriptPersist || !noscriptInited); + if (!noscriptInited) { + Services.prefs.setBoolPref("extensions.torbutton.noscript_inited", true); + } + } catch (e) { + log(5, e.message); } - extensionContext.api.browser.runtime.onMessage.removeListener(messageListener); - bindPrefAndInit( - "extensions.torbutton.security_slider", - sliderState => setNoScriptSafetyLevel(securitySliderToSafetyLevel(sliderState))); }; extensionContext.api.browser.runtime.onMessage.addListener(messageListener); log(3, "Listening for message from NoScript.");

1 0

[torbutton/master] Bug 21263: Remove outdated information from the README
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 02f3a9334acb1b1b72ee27c3e81013f8706f20d1 Author: traumschule <traumschuleriebau(a)riseup.net> Date: Sat Sep 15 15:43:15 2018 +0200 Bug 21263: Remove outdated information from the README --- README | 155 ++++++++--------------------------------------------------------- 1 file changed, 17 insertions(+), 138 deletions(-) diff --git a/README b/README index 3b3af2d6..f4dc12d4 100644 --- a/README +++ b/README @@ -1,144 +1,23 @@ -Torbutton is a 1-click way for Firefox users to enable or disable the -browser's use of Tor. It adds a panel to the statusbar that says "Tor -Enabled" (in green) or "Tor Disabled" (in red). The user may click on the -panel to toggle the status. If the user (or some other extension) changes -the proxy settings, the change is automatically reflected in the -statusbar. +Torbutton comes pre-installed with Tor Browser and we urge you not to change it. +We do not recommend to install it to Firefox because this is not a sufficient +way to surf anonymously. -Some users may prefer a toolbar button instead of a statusbar panel. Such -a button is included, and one adds it to the toolbar by right-clicking on -the desired toolbar, selecting "Customize...", and then dragging the -Torbutton icon onto the toolbar. There is an option in the preferences to -hide the statusbar panel (Tools->Extensions, select Torbutton, and click -on Preferences). +Torbutton guarantees that DNS requests are sent through the Tor instance that +comes with Tor Browser. You should not change the proxy settings. -Newer Firefoxes have the ability to send DNS resolves through the socks -proxy, and Torbutton will make use of this feature if it is available in -your version of Firefox. +It’s strongly discouraged to install new Add-ons in Tor Browser, because they +can compromise both your privacy and your security. Plus, Tor Browser already +comes installed with two add-ons — HTTPS Everywhere and NoScript — which give +you a lot of added protection. - FAQ +You can read more about it here: +https://www.torproject.org/projects/torbrowser/design/ -1. I can't click on links or hit reload after I toggle Tor! Why? +Also have a look at this page for already answered questions: +https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam/Support_discuss - Due to Firefox Bug 409737, pages can still open popups and perform - Javascript redirects and history access after Tor has been toggled. These - popups and redirects can be blocked, but unfortunately they are - indistinguishable from normal user interactions with the page (such as - clicking on links, opening them in new tabs/windows, or using the history - buttons), and so those are blocked as a side effect. Once that Firefox bug - is fixed, this degree of isolation will become optional (for people who do - not want to accidentally click on links and give away information via - referrers). A workaround is to right click on the link, and open it in a - new tab or window. The tab or window won't load automatically, but you can - hit enter in the URL bar, and it will begin loading. Hitting enter in the - URL bar will also reload the page without clicking the reload button. +For other issues you should know about have a look at this blog post: +https://blog.torproject.org/toggle-or-not-toggle-end-torbutton -2. My browser is in some weird state where nothing works right! - - Try to disable Tor by clicking on the button, and then open a new window. - If that doesn't fix the issue, go to the preferences page and hit 'Restore - Defaults'. This should reset the extension and Firefox to a known good - configuration. If you can manage to reproduce whatever issue gets your - Firefox wedged, please file details at the bug tracker. - -3. When I toggle Tor, my sites that use javascript stop working. Why? - - Javascript can do things like wait until you have disabled Tor before - trying to contact its source site, thus revealing your IP address. As - such, Torbutton must disable Javascript, Meta-Refresh tags, and certain - CSS behavior when Tor state changes from the state that was used to load a - given page. These features are re-enabled when Torbutton goes back into - the state that was used to load the page, but in some cases (particularly - with Javascript and CSS) it is sometimes not possible to fully recover - from the resulting errors, and the page is broken. Unfortunately, the only - thing you can do (and still remain safe from having your IP address leak) - is to reload the page when you toggle Tor, or just ensure you do all your - work in a page before switching tor state. - -4. When I use Tor, Firefox is no longer filling in logins/search boxes for - me. Why? - - Currently, this is tied to the "Block history writes during Tor" setting. - If you have enabled that setting, all formfill functionality (both saving - and reading) is disabled. If this bothers you, you can uncheck that - option, but both history and forms will be saved. To prevent history - disclosure attacks via Non-Tor usage, it is recommended you disable - Non-Tor history reads if you allow history writing during Tor. - -5. Which Firefox extensions should I avoid using? - - This is a tough one. There are thousands of Firefox extensions: making a - complete list of ones that are bad for anonymity is near impossible. - However, here are a few examples that should get you started as to what - sorts of behavior are dangerous. - - 1. StumbleUpon, et al These extensions will send all sorts of information - about the websites you visit to the stumbleupon servers, and correlate - this information with a unique identifier. This is obviously terrible - for your anonymity. More generally, any sort of extension that - requires registration, or even extensions that provide information - about websites you visit should be suspect. - 2. FoxyProxy While FoxyProxy is a nice idea in theory, in practice it is - impossible to configure securely for Tor usage without Torbutton. Like - all vanilla third party proxy plugins, the main risks are plugin - leakage and history disclosure, followed closely by cookie theft - by exit nodes and tracking by adservers (see the Torbutton - Adversary Model for more information). However, even with Torbutton - installed in tandem and always enabled, it is still very difficult - (though not impossible) to configure FoxyProxy securely. Since - FoxyProxy's 'Patterns' mode only applies to specific urls, and not to - an entire tab, setting FoxyProxy to only send specific sites through - Tor will still allow adservers to still learn your real IP. Worse, if - those sites use offsite logging services such as Google Analytics, you - may still end up in their logs with your real IP. Malicious exit nodes - can also cooperate with sites to inject images into pages that bypass - your filters. Setting FoxyProxy to only send certain URLs via Non-Tor - is much more viable, but be very careful with the filters you allow. - For example, something as simple as allowing *google* to go via - Non-Tor will still cause you to end up in all the logs of all websites - that use Google Analytics! See this question on the FoxyProxy FAQ - for more information. - 3. NoScript Torbutton currently mitigates all known anonymity issues with - Javascript. While it may be tempting to get better security by - disabling Javascript for certain sites, you are far better off with an - all-or-nothing approach. NoScript is exceedingly complicated, and has - many subtleties that can surprise even advanced users. For example, - addons.mozilla.org verifies extension integrity via Javascript over - https, but downloads them in the clear. Not adding it to your - whitelist effectively means you are pulling down unverified - extensions. Worse still, using NoScript can actually disable - protections that Torbutton itself provides via Javascript, yet still - allow malicious exit nodes to compromise your anonymity via the - default whitelist (which they can spoof to inject any script they - want). - -6. Which Firefox extensions do you recommend? - - 1. RefControl Mentioned above, this extension allows more - fine-grained referrer spoofing than Torbutton currently provides. It - should break less sites than Torbutton's referrer spoofing option. - 2. SafeCache If you use Tor excessively, and rarely disable it, you - probably want to install this extension to minimize the ability of - sites to store long term identifiers in your cache. This extension - applies same origin policy to the cache, so that elements are - retrieved from the cache only if they are fetched from a document in - the same origin domain as the cached element. - -7. Are there any other issues I should be concerned about? - - There is currently one known unfixed security issue with Torbutton: it is - possible to unmask the javascript hooks that wrap the Date object to - conceal your timezone in Firefox 2, and the timezone masking code does not - work at all on Firefox 3. We are working with the Firefox team to fix one - of Bug 399274 or Bug 419598 to address this. In the meantime, it - is possible to set the TZ environment variable to UTC to cause the browser - to use UTC as your timezone. Under Linux, you can add an export TZ=UTC to - the /usr/bin/firefox script, or edit your system bashrc to do the same. - Under Windows, you can set either a User or System Environment - Variable for TZ via My Computer's properties. In MacOS, the situation is - a lot more complicated, unfortunately. - - In addition, RSS readers such as Firefox Livemarks can perform periodic - fetches. Due to Firefox Bug 436250, there is no way to disable - Livemark fetches during Tor. This can be a problem if you have a lot of - custom Livemark urls that can give away information about your identity. +For a list of all torbutton announcements see +https://blog.torproject.org/category/tags/torbutton

1 0

[torbutton/master] Bug 27760: Fix NoScript IPC for about:blank by whitelisting messages
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 6016a170f0266cf926b7ff305796ba83cc353536 Author: Rusty Bird <rustybird(a)net-c.com> Date: Fri Sep 14 13:05:08 2018 +0000 Bug 27760: Fix NoScript IPC for about:blank by whitelisting messages If about:blank is the homepage (or has been passed as a command line parameter), NoScript will send a message named "fetchChildPolicy" _before_ "started". Torbutton would then send its "updateSettings" too soon, resulting in the dreaded error "Could not establish connection. Receiving end does not exist" (see bug 26520). Fix this by whitelisting the relevant messages from NoScript: "started" and also "pageshow" for a slightly more graceful failure mode in case Torbutton somehow misses NoScript startup. --- src/modules/noscript-control.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js index 934a4ef0..621f2b7f 100644 --- a/src/modules/noscript-control.js +++ b/src/modules/noscript-control.js @@ -129,6 +129,9 @@ var initialize = () => { // bind the security_slider pref to the NoScript settings. let messageListener = (a,b,c) => { log(3, `Message received from NoScript: ${JSON.stringify([a,b,c])}`); + if (!["started", "pageshow"].includes(a.__meta.name)) { + return; + } extensionContext.api.browser.runtime.onMessage.removeListener(messageListener); bindPrefAndInit( "extensions.torbutton.security_slider",

1 0

[torbutton/master] Revert "Fix NoScript IPC for about:blank by whitelisting messages"
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 0a7d19da90202e5d40851432400444dd6287ffd9 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 18 10:46:58 2018 +0000 Revert "Fix NoScript IPC for about:blank by whitelisting messages" This reverts commit efdc83fec6244d5f2e4b8880fef010a6e362d9dc. --- src/modules/noscript-control.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js index c1442950..934a4ef0 100644 --- a/src/modules/noscript-control.js +++ b/src/modules/noscript-control.js @@ -129,9 +129,6 @@ var initialize = () => { // bind the security_slider pref to the NoScript settings. let messageListener = (a,b,c) => { log(3, `Message received from NoScript: ${JSON.stringify([a,b,c])}`); - if (a._messageName != "started" && a._messageName != "pageshow") { - return; - } extensionContext.api.browser.runtime.onMessage.removeListener(messageListener); bindPrefAndInit( "extensions.torbutton.security_slider",

1 0

[tor-browser-build/master] Bug 27546: Fix vertical scrollbar behavior in Tor Browser 8 with Gtk3
by boklm＠torproject.org 18 Sep '18

18 Sep '18

commit 768e2c34a7516ab6e4ce2389d76c45603c3aa2fe Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 18 09:45:03 2018 +0000 Bug 27546: Fix vertical scrollbar behavior in Tor Browser 8 with Gtk3 --- projects/tor-browser/build | 4 ++++ projects/tor-browser/config | 2 ++ projects/tor-browser/gtk3-settings.ini | 2 ++ 3 files changed, 8 insertions(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 4c228a9..85d7eaa 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -71,6 +71,10 @@ tar -C "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]" -xf [% c('input [% INCLUDE 'RelativeLink/start-tor-browser' -%] RBM_TB_EOF chmod +x ${TB_STAGE_DIR}/Browser/start-tor-browser + # Make sure we get the desired scrollbar behavior with Gtk3, see bug 27546. + GTK_SETTINGS_DIR=${TB_STAGE_DIR}/Browser/.config/gtk-3.0 + mkdir -p $GTK_SETTINGS_DIR + cp $rootdir/gtk3-settings.ini $GTK_SETTINGS_DIR/settings.ini [% END %] tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/tor-browser.tar.gz diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 7d1720b..85754ae 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -74,6 +74,8 @@ input_files: enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' enable: '[% c("var/linux") %]' + - filename: 'gtk3-settings.ini' + enable: '[% c("var/linux") %]' - project: libdmg-hfsplus name: libdmg enable: '[% c("var/osx") %]' diff --git a/projects/tor-browser/gtk3-settings.ini b/projects/tor-browser/gtk3-settings.ini new file mode 100644 index 0000000..55c8e89 --- /dev/null +++ b/projects/tor-browser/gtk3-settings.ini @@ -0,0 +1,2 @@ +[Settings] +gtk-primary-button-warps-slider = false

1 0

[tor-browser-build/master] Bug 27552: Use bundled dir on CentOS/RHEL 6
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit a0420227e3f10f159a40b08a70cbb8c66f64c342 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 17 12:37:17 2018 +0200 Bug 27552: Use bundled dir on CentOS/RHEL 6 On CentOS/RHEL 6, add the bundled directory from the firefox package to the LD_LIBRARY_PATH. In addition, we don't reset anymore the previous LD_LIBRARY_PATH value, but only add new directories to it. This allows users to set LD_LIBRARY_PATH before starting the browser if additional libraries are needed. --- projects/firefox/start-firefox | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/projects/firefox/start-firefox b/projects/firefox/start-firefox index dc30574..7e7685c 100644 --- a/projects/firefox/start-firefox +++ b/projects/firefox/start-firefox @@ -2,13 +2,46 @@ basedir=$(dirname "$0") -LD_LIBRARY_PATH="$basedir/TorBrowser/Tor/" +add_LD_LIBRARY_PATH() { + if test -z "$LD_LIBRARY_PATH" + then + LD_LIBRARY_PATH="$1" + else + LD_LIBRARY_PATH="$1:$LD_LIBRARY_PATH" + fi +} + +# Bug 27552: On CentOS/RHEL 6, we need to add the firefox bundled dir +# to LD_LIBRARY_PATH +if test -f /etc/system-release-cpe +then + if test "$(cut -d : -f 3 /etc/system-release-cpe)" = centos || \ + test "$(cut -d : -f 3 /etc/system-release-cpe)" = "enterprise_linux" + then + if test "$(cut -d : -f 5 /etc/system-release-cpe)" = "6" + then + if test -d /usr/lib64/firefox/bundled/lib64 + then + add_LD_LIBRARY_PATH /usr/lib64/firefox/bundled/lib64 + elif test -d /usr/lib/firefox/bundled/lib + then + add_LD_LIBRARY_PATH /usr/lib/firefox/bundled/lib + else + echo "Error: the firefox package (version 60 or more) is not installed." >&2 + echo "On CentOS/RHEL 6, Tor Browser requires the firefox package to be installed." >&2 + exit 1 + fi + fi + fi +fi + # Check if the system has a more recent version of libstdc++.so.6; if yes, use # that instead of the bundled version. "$basedir/abicheck" >/dev/null 2>&1 if [ $? -ne 0 ]; then - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$basedir/TorBrowser/Tor/libstdc++/" + add_LD_LIBRARY_PATH "$basedir/TorBrowser/Tor/libstdc++/" fi +add_LD_LIBRARY_PATH "$basedir/TorBrowser/Tor/" export LD_LIBRARY_PATH exec "$basedir/firefox.real" "$@"

1 0

[torbutton/master] Fix NoScript IPC for about:blank by whitelisting messages
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit efdc83fec6244d5f2e4b8880fef010a6e362d9dc Author: Rusty Bird <rustybird(a)net-c.com> Date: Mon Sep 3 12:32:04 2018 +0000 Fix NoScript IPC for about:blank by whitelisting messages If about:blank is the homepage (or has been passed as a command line parameter), NoScript will send a message named "fetchChildPolicy" _before_ "started". Torbutton would then send its "updateSettings" too soon, resulting in the dreaded error "Could not establish connection. Receiving end does not exist" (see bug 26520). Fix this by whitelisting the relevant messages from NoScript: "started" and also "pageshow" for a slightly more graceful failure mode in case Torbutton somehow misses NoScript startup. --- src/modules/noscript-control.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js index a03755de..02fa1bc8 100644 --- a/src/modules/noscript-control.js +++ b/src/modules/noscript-control.js @@ -127,6 +127,9 @@ var initialize = () => { // bind the security_slider pref to the NoScript settings. let messageListener = (a,b,c) => { log(3, `Message received from NoScript: ${JSON.stringify([a,b,c])}`); + if (a._messageName != "started" && a._messageName != "pageshow") { + return; + } extensionContext.api.browser.runtime.onMessage.removeListener(messageListener); bindPrefAndInit( "extensions.torbutton.security_slider",

1 0

[torbutton/master] Merge remote-tracking branch 'arthur/27427_alpha'
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit ec1c0f448893775b660313042709a9b057b3ab75 Merge: 59f3b783 866e3974 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 18 09:49:29 2018 +0000 Merge remote-tracking branch 'arthur/27427_alpha' src/modules/noscript-control.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)

1 0

[torbutton/master] Revert "Bug 27427: Fix NoScript IPC for about:blank by whitelisting messages"
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 59f3b78349d8de267cf69fb8873971ff0d9ecf7b Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 18 09:48:54 2018 +0000 Revert "Bug 27427: Fix NoScript IPC for about:blank by whitelisting messages" This reverts commit 8ff3b44e478ebddf5a067d796f57a353beae2af0. --- src/modules/noscript-control.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js index cd1a1237..66a00528 100644 --- a/src/modules/noscript-control.js +++ b/src/modules/noscript-control.js @@ -125,12 +125,8 @@ var initialize = () => { // Wait for the first message from NoScript to arrive, and then // bind the security_slider pref to the NoScript settings. - let messageListener = (message,b,c) => { - log(3, `Message received from NoScript: ${JSON.stringify([message,b,c])}`); - if (message._messageName !== "started" && - message._messageName !== "pageshow") { - return; - } + let messageListener = (a,b,c) => { + log(3, `Message received from NoScript: ${JSON.stringify([a,b,c])}`); extensionContext.api.browser.runtime.onMessage.removeListener(messageListener); bindPrefAndInit( "extensions.torbutton.security_slider",

1 0

[torbutton/master] Send updateSettings message using NoScript >= 10.1.9.2 protocol
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 866e3974597a3cc88a6ac9ef805de1b543eadbf7 Author: Rusty Bird <rustybird(a)net-c.com> Date: Fri Sep 14 13:05:10 2018 +0000 Send updateSettings message using NoScript >= 10.1.9.2 protocol --- src/modules/noscript-control.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js index 02fa1bc8..f6d5622b 100644 --- a/src/modules/noscript-control.js +++ b/src/modules/noscript-control.js @@ -51,8 +51,10 @@ const default_caps = [ // capabilities. Most things are blocked. let noscriptSettings = safetyLevel => ( { - "type": "NoScript.updateSettings", // backwards compatibility - "_messageName": "updateSettings", + "__meta": { + "name": "updateSettings", + "recipientInfo": null + }, "policy": { "DEFAULT": { "capabilities": default_caps[safetyLevel],

1 0

[tor-browser/tor-browser-60.2.0esr-8.5-1] Bug 26381: about:tor page does not load on first start on Windows
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 62001bb019dbf0956454f8fc550ccc1e81ee8d3c Author: Richard Pospesel <richard(a)torproject.org> Date: Sat Sep 15 04:01:17 2018 +0000 Bug 26381: about:tor page does not load on first start on Windows Child content processes require certain directories to be marked as readable or writeable when Sandboxing is enabled. The directories to be whitelisted are saved in static variables in sandboxBroker.cpp and are initialized in SandboxBroker::GeckoDependentInitialize(). Any child content process which is created before these directories are saved will be unable to read or write to them. The tor-launcher extension triggers the creation of a content process which hosts the tor network configuration settings window. This process is created before the whitelisted directories are saved. The network settings process doesn't need access to these directories to function, but subsequent content processes which are created once the settings window exits do need these directories to function. Sometimes, the creation of these subsequent processes is slow enough for the parent process to 'catch up' and create the whitelist resulting in the broken about:tor tab or broken white tab. A previous iteration of this patch moved the GeckoDependentInitialize() call directly above the call to DoStartup(). However, Mozilla dev Bob Owen objected to this since this places the call before various services are initialized which the SandboxBroker may depend on. Some experimentation would seem to confirm his objections: placing the whitelist init just prior to DoStartup() results in an empty value for the profile directory which prevents child processes reading the chrome and extensions directory. This patch inserts the GeckoDependentInitialize() call into DoStartup() just after the profile directory is known and queryable by the SandboxBroker, and before the 'profile-after-change' notification is fired. It also reverts the temp fix which reduced the sandbox level to 2 on windows. --- browser/app/profile/000-tor-browser.js | 5 ----- toolkit/xre/nsAppRunner.cpp | 6 ------ toolkit/xre/nsXREDirProvider.cpp | 19 +++++++++++++++++++ 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index bc7c4b05e3a1..38f72579760a 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -329,11 +329,6 @@ pref("browser.onboarding.newtour", "welcome,privacy,tor-network,circuit-display, pref("browser.onboarding.updatetour", "welcome,privacy,tor-network,circuit-display,security,expect-differences,onion-services"); pref("browser.onboarding.skip-tour-button.hide", true); -#ifdef XP_WIN -// For now, reduce sandboxing level to 2 (see #26381). -pref("security.sandbox.content.level", 2); -#endif - #ifdef TOR_BROWSER_VERSION #expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); #endif diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 1000014aedd0..7889919ca677 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -5249,12 +5249,6 @@ XREMain::XRE_mainRun() // We intentionally leak the string here since it is required by PR_SetEnv. PR_SetEnv(saved.release()); } - -#if defined(MOZ_SANDBOX) - // Call SandboxBroker to initialize things that depend on Gecko machinery like - // the directory provider. - SandboxBroker::GeckoDependentInitialize(); -#endif #endif SaveStateForAppInitiatedRestart(); diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp index b54985292e81..72545d0eb422 100644 --- a/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp @@ -66,6 +66,10 @@ #include "UIKitDirProvider.h" #endif +#if defined(MOZ_SANDBOX) && defined(XP_WIN) +#include "sandboxBroker.h" +#endif + #if defined(MOZ_CONTENT_SANDBOX) #include "mozilla/SandboxSettings.h" #include "nsIUUIDGenerator.h" @@ -1003,6 +1007,21 @@ nsXREDirProvider::DoStartup() policies->Observe(nullptr, "policies-startup", nullptr); } + #if defined(MOZ_SANDBOX) && defined(XP_WIN) + // Call SandboxBroker to initialize things that depend on Gecko machinery like + // the directory provider. + + // We insert this initialization code here so that any child content processes spawned by + // extensions (such as tor-launcher launching the network configuration window) will have + // all the requisite directories white-listed for read/write access + + // It's inserted here (rather than in XREMain::XRE_mainRun) because we need + // NS_APP_USER_PROFILE_50_DIR to be known + + // See tor bug #26381 and mozilla bug #1485836 + SandboxBroker::GeckoDependentInitialize(); + #endif + // Init the Extension Manager nsCOMPtr<nsIObserver> em = do_GetService("@mozilla.org/addons/integration;1"); if (em) {

1 0

[tor-browser-build/maint-8.0] Release preparations for 8.0.1
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 58526ef1fac442ce7424d9b1b5f9295c76ad68c7 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 18 09:16:02 2018 +0000 Release preparations for 8.0.1 Versions bump and Changelog update --- projects/firefox/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 27 ++++++++++++++++++++++ projects/tor-browser/config | 4 ++-- projects/tor-launcher/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 6 ++--- 6 files changed, 35 insertions(+), 8 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 124de7a..ad9d7d8 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build3' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build4' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index c46f139..64ef362 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,30 @@ +Tor Browser 8.0.1 -- September 20 2018 + * All platforms + * Update Tor to 0.3.4.8 + * Update Torbutton to 2.0.7 + * Bug 27097: Tor News signup banner + * Bug 27663: Add New Identity menuitem again + * Bug 26624: Only block OBJECT on highest slider level + * Bug 26555: Don't show IP address for meek or snowflake + * Bug 27478: Torbutton icons for dark theme + * Bug 27506+14520: Move status version to upper left corner for RTL locales + * Bug 27427: Fix NoScript IPC for about:blank by whitelisting messages + * Bug 27558: Update the link to "Your Guard note may not change" text + * Translations update + * Update Tor Launcher to 0.2.16.5 + * Bug 27469: Adapt Moat URLs + * Bug 25405: Cannot use Moat if a meek bridge is configured + * Translations update + * Clean-up + * Update NoScript to 10.1.9.6 + * Bug 27763: Restrict Torbutton signing exemption to mobile + * Bug 26146: Spoof HTTP User-Agent header for desktop platforms + * Bug 27543: QR code is broken on web.whatsapp.com + * Bug 27264: Bookmark items are not visible on the boomark toolbar + * Bug 27535: Enable TLS 1.3 draft version + * OS X + * Bug 27482: Fix crash during start-up on macOS 10.9.x systems + Tor Browser 8.0 -- September 5 2018 * All platforms * Update Firefox to 60.2.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 7d1720b..e0581f4 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -67,9 +67,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 68c3ef1b753210d376ab9b9c73fa053043f4f0f4cab219e317759fb32b104a27 + sha256sum: 336ae26d0a70688e6c2b3c14267c9e80f52f6f36c31f23b8242e0edae3666d42 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 19f16bb..9e00653 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.16.3 +version: 0.2.16.5 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/torbutton/config b/projects/torbutton/config index f076b8f..2b2df85 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.0.6 +version: 2.0.7 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 5cc88e4..8ad5c34 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.0' - torbrowser_build: 'build5' + torbrowser_version: '8.0.1' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 7.5.6 + - 8.0 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-60.2.0esr-8.5-1] fixup! Bug 27220 - Don't verify signature for Tor Button
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit d53c662d2fbb8053908ba776a2dbddd4f9817d4f Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 18 09:02:52 2018 +0000 fixup! Bug 27220 - Don't verify signature for Tor Button Fixes bug 27763. --- toolkit/mozapps/extensions/internal/XPIInstall.jsm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/toolkit/mozapps/extensions/internal/XPIInstall.jsm b/toolkit/mozapps/extensions/internal/XPIInstall.jsm index c696efc6fa57..40b3b1d6434e 100644 --- a/toolkit/mozapps/extensions/internal/XPIInstall.jsm +++ b/toolkit/mozapps/extensions/internal/XPIInstall.jsm @@ -1029,7 +1029,8 @@ function getSignedStatus(aRv, aCert, aAddonID) { } function shouldVerifySignedState(aAddon) { - if (aAddon.id === "torbutton(a)torproject.org") { + if (AppConstants.platform === "android" && + aAddon.id === "torbutton(a)torproject.org") { return false; }

1 0

[tor-browser/tor-browser-60.2.0esr-8.0-1] fixup! Bug 27220 - Don't verify signature for Tor Button
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit ba30179040d81bdd4e326c710d7893eeb8c2a8c6 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 18 09:02:52 2018 +0000 fixup! Bug 27220 - Don't verify signature for Tor Button Fixes bug 27763. --- toolkit/mozapps/extensions/internal/XPIInstall.jsm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/toolkit/mozapps/extensions/internal/XPIInstall.jsm b/toolkit/mozapps/extensions/internal/XPIInstall.jsm index c696efc6fa57..40b3b1d6434e 100644 --- a/toolkit/mozapps/extensions/internal/XPIInstall.jsm +++ b/toolkit/mozapps/extensions/internal/XPIInstall.jsm @@ -1029,7 +1029,8 @@ function getSignedStatus(aRv, aCert, aAddonID) { } function shouldVerifySignedState(aAddon) { - if (aAddon.id === "torbutton(a)torproject.org") { + if (AppConstants.platform === "android" && + aAddon.id === "torbutton(a)torproject.org") { return false; }

1 0

[tor-browser-build/maint-8.0] Updating torbutton key
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 5554cbb917d55ef7f347240ef45a475fb2d89652 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 18 08:35:07 2018 +0000 Updating torbutton key --- keyring/torbutton.gpg | Bin 182747 -> 234595 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/torbutton.gpg b/keyring/torbutton.gpg index 8a087c0..9802147 100644 Binary files a/keyring/torbutton.gpg and b/keyring/torbutton.gpg differ

1 0

[tor-browser-build/master] Updating torbutton key
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 3b81575afb05e4849c85cd7478c7d54cc8006e21 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 18 08:35:07 2018 +0000 Updating torbutton key --- keyring/torbutton.gpg | Bin 182747 -> 234595 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/torbutton.gpg b/keyring/torbutton.gpg index 8a087c0..9802147 100644 Binary files a/keyring/torbutton.gpg and b/keyring/torbutton.gpg differ

1 0

[tor-launcher/master] Version bump (0.2.16.5)
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit bf0a803a04c2753c52bb56f87047efac00e0d684 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 18 08:21:56 2018 +0000 Version bump (0.2.16.5) --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index fc8dc41..a5d027e 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.16.4</em:version> + <em:version>0.2.16.5</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[tor-launcher/master] Translations update
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 20549ce1056eb34881627475e4364f4c23dd8424 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 18 08:20:45 2018 +0000 Translations update --- src/chrome/locale/ca/torlauncher.properties | 2 +- src/chrome/locale/es-AR/network-settings.dtd | 6 +++--- src/chrome/locale/hu/network-settings.dtd | 26 +++++++++++++------------- src/chrome/locale/hu/torlauncher.properties | 24 ++++++++++++------------ src/chrome/locale/is/network-settings.dtd | 2 +- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/chrome/locale/ca/torlauncher.properties b/src/chrome/locale/ca/torlauncher.properties index 49bea66..598314e 100644 --- a/src/chrome/locale/ca/torlauncher.properties +++ b/src/chrome/locale/ca/torlauncher.properties @@ -43,7 +43,7 @@ torlauncher.no_bridges_available=No hi ha ponts disponibles ara mateix. torlauncher.connect=Connecta torlauncher.restart_tor=Reinicia Tor -torlauncher.quit=Tanca +torlauncher.quit=Surt torlauncher.quit_win=Surt torlauncher.done=Fet diff --git a/src/chrome/locale/es-AR/network-settings.dtd b/src/chrome/locale/es-AR/network-settings.dtd index 2780af2..d9b8996 100644 --- a/src/chrome/locale/es-AR/network-settings.dtd +++ b/src/chrome/locale/es-AR/network-settings.dtd @@ -5,7 +5,7 @@  <!ENTITY torlauncher.localePicker.title "Idioma del Navegador Tor"> -<!ENTITY torlauncher.localePicker.prompt "Por favor selecciona un idioma "> +<!ENTITY torlauncher.localePicker.prompt "Por favor seleccioná un idioma ">  @@ -52,11 +52,11 @@ <!ENTITY torsettings.copyLog "Copiar la bitácora Tor al Portapapeles"> <!ENTITY torsettings.proxyHelpTitle "Ayuda para Proxy"> -<!ENTITY torsettings.proxyHelp1 "Un proxy local puede ser necesitado cuando te estés conectando a través de una red de una compañía, escuela o universidad. Si no estás seguro si un proxy es necesario, mirá los ajustes de Internet en otro navegador o revisá tus ajustes de red del sistema."> +<!ENTITY torsettings.proxyHelp1 "Un proxy local puede ser necesario cuando te estés conectando a través de una red de una compañía, escuela o universidad. Si no estás seguro si un proxy es necesario, mirá los ajustes de Internet en otro navegador o revisá tus ajustes de red del sistema."> <!ENTITY torsettings.bridgeHelpTitle "Ayuda para relevo puente"> <!ENTITY torsettings.bridgeHelp1 "Puentes son relevos no listados que hacen más dificultoso bloquear conexiones a la red de Tor.  Cada uno de los tipos de puente usa un método diferente para evitar censura.  Los obfs hacen que tu tráfico parezca ruido aleatorio, y los meek hacen que tu tráfico parezca que se está conectando a otro servicio en vez de Tor."> <!ENTITY torsettings.bridgeHelp2 "Por la manera en que ciertos países intentan bloquear a Tor, ciertos puentes funcionan en ciertos países pero no otros.  Si no estás seguro acerca de cuáles puentes funcionan en tu país, visitá torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Por favor, espere mientras establecemos una conexión a la red Tor.  Puede tardar varios minutos."> +<!ENTITY torprogress.pleaseWait "Por favor, esperá mientras establecemos una conexión a la red de Tor.  Puede tardar varios minutos."> diff --git a/src/chrome/locale/hu/network-settings.dtd b/src/chrome/locale/hu/network-settings.dtd index d05005c..c474df2 100644 --- a/src/chrome/locale/hu/network-settings.dtd +++ b/src/chrome/locale/hu/network-settings.dtd @@ -1,16 +1,16 @@ <!ENTITY torsettings.dialog.title "Tor hálózati beállítások"> -<!ENTITY torsettings.wizard.title.default "Csatalkozás a Tor-hoz"> +<!ENTITY torsettings.wizard.title.default "Csatlakozás a Tor-hoz"> <!ENTITY torsettings.wizard.title.configure "Tor hálózati beállítások"> <!ENTITY torsettings.wizard.title.connecting "Kapcsolat létrehozása">  <!ENTITY torlauncher.localePicker.title "Tor Browser nyelv"> -<!ENTITY torlauncher.localePicker.prompt "Kérlek válassz egy nyelvet."> +<!ENTITY torlauncher.localePicker.prompt "Kérjük válasszon egy nyelvet.">  <!ENTITY torSettings.connectPrompt "Kattintson a "Csatlakozásra" hogy csatlakozzon a Tor-hoz."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Kattintson a "Konfigurálásra" hogy változtasson a hálózati beállításokon, amennyiben olyan országban él amelyek cenzúrázzák a Tor-t, (mint például Egyiptom, Kína, Törökország) vagy amennyiben olyan privát hálózatról kíván csatlakozni, amelynek proxy-ra van szüksége."> <!ENTITY torSettings.configure "Beállít"> <!ENTITY torSettings.connect "Csatlakozás"> @@ -36,27 +36,27 @@ <!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 "A számítógép egy tűzfalon keresztül kommunikál ami csak adott portokon keresztül engedélyezi a kapcsolatotokat."> +<!ENTITY torsettings.firewall.checkbox "A számítógép egy tűzfalon keresztül kommunikál, ami csak adott portokon keresztül engedélyezi a kapcsolatotokat."> <!ENTITY torsettings.firewall.allowedPorts "Engedélyezett portok:"> <!ENTITY torsettings.useBridges.checkbox "A Tor cenzúrázva van az országomban"> <!ENTITY torsettings.useBridges.default "Válasszon ki egy beépített hidat"> <!ENTITY torsettings.useBridges.default.placeholder "Válasszon ki egy hidat"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> +<!ENTITY torsettings.useBridges.bridgeDB "Híd kérése a torproject.org-tól"> <!ENTITY torsettings.useBridges.captchaSolution.placeholder "Adja meg a karaktereket amik a fenti képen láthatóak"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Új rejtvény kérése"> <!ENTITY torsettings.useBridges.captchaSubmit "Elküld"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.custom "Általam ismert híd megadása"> +<!ENTITY torsettings.useBridges.label "Adja meg a megbízható helyről származó híd adatokat."> +<!ENTITY torsettings.useBridges.placeholder "írja be cím:port (egyet soronként)"> <!ENTITY torsettings.copyLog "A Tor log Vágólapra másolása"> <!ENTITY torsettings.proxyHelpTitle "Proxy segítség"> -<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> +<!ENTITY torsettings.proxyHelp1 "Egy helyi proxy lehet szükséges amennyiben olyan hálózaton keresztül csatlakozik amely, cégen, iskolán, vagy egyetemi hálózaton megy keresztül.  Ha nem biztos benne, hogy szükséges-e proxyt beállítani, akkor nézze meg egy másik böngésző vagy a rendszer hálózati beállításait."> -<!ENTITY torsettings.bridgeHelpTitle "Híd kapcsoló súgó"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelpTitle "Híd csomópont súgó"> +<!ENTITY torsettings.bridgeHelp1 "A hidak olyan nem listázott csomópontok, amik megnehezítik a Tor kapcsolatok blokkolását.  Minden hídtípus más módszert használ a cezúra elhárítására.  Az obfs fajták a hálózati forgalmat zajnak álcázzák, a meek fajták pedig egy adott szolgáltatáshoz kapcsolódásnak látszanak a Tor szolgáltatás helyett."> +<!ENTITY torsettings.bridgeHelp2 "Annak a módja alapján, hogy egyes országok hogyan blokkolják a Tor-t, bizonyos hidak bizonyos országokban működnek, de másokban nem.  Ha nem bztos abban, hogy mely hidak működnek az Ön országában, látogassa meg a torproject.org/about/contact.html#support oldalt.">  <!ENTITY torprogress.pleaseWait "Kérlek várj, amíg létrehozunk egy kapcsolatot a Tor hálózathoz.  Ez eltarthat néhány percig."> diff --git a/src/chrome/locale/hu/torlauncher.properties b/src/chrome/locale/hu/torlauncher.properties index 623e0dc..74c7ae4 100644 --- a/src/chrome/locale/hu/torlauncher.properties +++ b/src/chrome/locale/hu/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Meg kell adnia egy IP címet, vagy egy gép torlauncher.error_proxy_type_missing=Ki kell választania a proxy típusát. torlauncher.error_bridges_missing=Meg kell adnia egy vagy több hidat. torlauncher.error_default_bridges_type_missing=Ki kell választanod egy átviteli típust a felkínált hidakhoz. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Kérjük kérjen egy hidat, torlauncher.error_bridge_bad_default_type=Nincs egy híd sem aminek az átviteli típusa %S elérhető lenne. Kérlek módosítsd a beállításaidat. torlauncher.bridge_suffix.meek-amazon=(működik Kínában) torlauncher.bridge_suffix.meek-azure=(működik Kínában) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=Híd kérése... +torlauncher.request_a_new_bridge=Új híd kérése... +torlauncher.contacting_bridgedb=Kapcsolódás a hídadatbázishoz. Kérjük várjon. +torlauncher.captcha_prompt=Oldjon meg egy CAPTCHA-t a híd kéréséhez. +torlauncher.bad_captcha_solution=A megoldás nem helyes. Kérjük próbálja újra. +torlauncher.unable_to_get_bridge=Sikertelen a híd beszerzése a hídadatbázisból.\n\n%S +torlauncher.no_meek=A böngésző nincs meek-re konfigurálva, ami szükséges a hidak beszerzéséhez. +torlauncher.no_bridges_available=Nincsenek most elérhető hidak. Sajnáljuk. torlauncher.connect=Csatlakozás torlauncher.restart_tor=Tor újraindítása @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=nincs út a kiszolgálóhoz torlauncher.bootstrapWarning.ioerror=írás/olvasás hiba torlauncher.bootstrapWarning.pt_missing=hiányzó becsatlakoztatható átvitel -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=A kapcsolat a szerverhez elveszett. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Sikertelen a csatlakozás a szerverhez. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Sikertelen a csatlakozás a proxy-hoz. diff --git a/src/chrome/locale/is/network-settings.dtd b/src/chrome/locale/is/network-settings.dtd index 4c83859..4676680 100644 --- a/src/chrome/locale/is/network-settings.dtd +++ b/src/chrome/locale/is/network-settings.dtd @@ -52,7 +52,7 @@ <!ENTITY torsettings.copyLog "Afrita atvikaskrá Tor á klippispjald"> <!ENTITY torsettings.proxyHelpTitle "Hjálp fyrir milliþjóna"> -<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> +<!ENTITY torsettings.proxyHelp1 "Hugsanlega þarf að nota staðværan milliþjón (proxy) þegar tengst er í gegnum net fyrirtækis, skóla eða stofnunar. Ef þú ert ekki viss hvort þurfi að nota milliþjón, kíktu þá á netstillingarnar í einhverjum öðrum vafra eða á uppsetningu netsins í stýrikerfinu þínu."> <!ENTITY torsettings.bridgeHelpTitle "Hjálp fyrir brúaendurvarpa"> <!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor.">

1 0

[torbutton/master] Release preparations for 2.0.7
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit c3b6a6813dd48c3116c3370b2cf3449793052d05 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 18 08:14:42 2018 +0000 Release preparations for 2.0.7 Changelog update and version bump --- src/CHANGELOG | 11 +++++++++++ src/install.rdf | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index c9f24cbd..562842e9 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,14 @@ +2.0.7 + * Bug 27097: Tor News signup banner + * Bug 27663: Add New Identity menuitem again + * Bug 26624: Only block OBJECT on highest slider level + * Bug 26555: Don't show IP address for meek or snowflake + * Bug 27478: Torbutton icons for dark theme + * Bug 27506+14520: Move status version to upper left corner for RTL locales + * Bug 27427: Fix NoScript IPC for about:blank by whitelisting messages + * Bug 27558: Update the link to "Your Guard note may not change" text + * Translations update + 2.0.6 * Bug 27401: Start listening for NoScript before it loads diff --git a/src/install.rdf b/src/install.rdf index a92cd651..cd14a7dd 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>2.0.6</em:version> + <em:version>2.0.7</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Translations update
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 012be2a6607a43bb9300e57161a539b2177ffbb0 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 18 08:05:32 2018 +0000 Translations update --- src/chrome/locale/ar/aboutTor.dtd | 6 +- src/chrome/locale/ca/browserOnboarding.properties | 68 +++++++++---------- src/chrome/locale/da/aboutTBUpdate.dtd | 6 +- src/chrome/locale/da/aboutTor.dtd | 4 +- src/chrome/locale/da/browserOnboarding.properties | 52 +++++++-------- src/chrome/locale/da/torbutton.properties | 2 +- src/chrome/locale/de/aboutTBUpdate.dtd | 6 +- src/chrome/locale/de/aboutTor.dtd | 4 +- src/chrome/locale/de/browserOnboarding.properties | 66 +++++++++--------- src/chrome/locale/es/browserOnboarding.properties | 32 ++++----- src/chrome/locale/fa/brand.properties | 8 +-- src/chrome/locale/fa/torbutton.dtd | 24 +++---- src/chrome/locale/ga/aboutTBUpdate.dtd | 4 +- src/chrome/locale/ga/browserOnboarding.properties | 78 +++++++++++----------- src/chrome/locale/ga/torbutton.properties | 2 +- src/chrome/locale/he/aboutTor.dtd | 2 +- src/chrome/locale/he/browserOnboarding.properties | 60 ++++++++--------- src/chrome/locale/id/aboutTBUpdate.dtd | 6 +- src/chrome/locale/id/aboutTor.dtd | 18 ++--- src/chrome/locale/id/browserOnboarding.properties | 42 ++++++------ src/chrome/locale/is/aboutTBUpdate.dtd | 2 +- src/chrome/locale/is/aboutTor.dtd | 8 +-- src/chrome/locale/it/browserOnboarding.properties | 64 +++++++++--------- src/chrome/locale/ko/aboutTBUpdate.dtd | 6 +- src/chrome/locale/ko/aboutTor.dtd | 4 +- src/chrome/locale/nb/browserOnboarding.properties | 38 +++++------ src/chrome/locale/pt-BR/aboutTBUpdate.dtd | 4 +- src/chrome/locale/pt-BR/aboutTor.dtd | 2 +- .../locale/pt-BR/browserOnboarding.properties | 66 +++++++++--------- src/chrome/locale/ru/aboutTBUpdate.dtd | 6 +- src/chrome/locale/ru/browserOnboarding.properties | 32 ++++----- src/chrome/locale/tr/browserOnboarding.properties | 76 ++++++++++----------- src/chrome/locale/zh-CN/aboutTBUpdate.dtd | 6 +- src/chrome/locale/zh-CN/aboutTor.dtd | 2 +- .../locale/zh-CN/browserOnboarding.properties | 66 +++++++++--------- src/chrome/locale/zh-TW/aboutTBUpdate.dtd | 4 +- src/chrome/locale/zh-TW/aboutTor.dtd | 2 +- 37 files changed, 439 insertions(+), 439 deletions(-) diff --git a/src/chrome/locale/ar/aboutTor.dtd b/src/chrome/locale/ar/aboutTor.dtd index 4ebb323e..2c80fc4d 100644 --- a/src/chrome/locale/ar/aboutTor.dtd +++ b/src/chrome/locale/ar/aboutTor.dtd @@ -11,11 +11,11 @@ <!ENTITY aboutTor.failure.label "حدث خطأ ما!"> <!ENTITY aboutTor.failure2.label "تور لا يعمل في هذا المتصفح."> -<!ENTITY aboutTor.search.label "Search with DuckDuckGo"> +<!ENTITY aboutTor.search.label "البحث بواسطة داك داك غو"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "أية أسئلة؟"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "إطّلع على دليلنا باستخدام متصفح تور ">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "س"> <!ENTITY aboutTor.torbrowser_user_manual.label "دليل استخدام متصفّح تور"> @@ -25,4 +25,4 @@ <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> -<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> +<!ENTITY aboutTor.newsletter.link_text "اشترك للحصول على مستجدات تور."> diff --git a/src/chrome/locale/ca/browserOnboarding.properties b/src/chrome/locale/ca/browserOnboarding.properties index 059d6cfc..f1cbea63 100644 --- a/src/chrome/locale/ca/browserOnboarding.properties +++ b/src/chrome/locale/ca/browserOnboarding.properties @@ -2,53 +2,53 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -onboarding.tour-tor-welcome=Welcome -onboarding.tour-tor-welcome.title=You’re ready. -onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. -onboarding.tour-tor-welcome.button=Start Now +onboarding.tour-tor-welcome=Benvingut +onboarding.tour-tor-welcome.title=Ja estàs preparat. +onboarding.tour-tor-welcome.description=El navegador Tor ofereix el màxim nivell de privadesa i seguretat mentre navegueu per la web. Ara està protegit contra el seguiment, la vigilància i la censura. Aquest ràpid embarcament us mostrarà com fer-ho. +onboarding.tour-tor-welcome.button=Comença ara onboarding.tour-tor-privacy=Privadesa -onboarding.tour-tor-privacy.title=Snub trackers and snoopers. -onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. -onboarding.tour-tor-privacy.button=Go to Tor Network +onboarding.tour-tor-privacy.title=Seguidors de snub i snoopers. +onboarding.tour-tor-privacy.description=El navegador Tor aïllarà les galetes i elimina l'historial del navegador després de la sessió. Aquestes modificacions garanteixen que la vostra privadesa i seguretat estiguin protegides al navegador. Feu clic a 'Tor Network' per obtenir informació sobre com us protegim al nivell de la xarxa. +onboarding.tour-tor-privacy.button=Aneu a la xarxa Tor -onboarding.tour-tor-network=Tor Network -onboarding.tour-tor-network.title=Travel a decentralized network. -onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. -onboarding.tour-tor-network.button=Go to Circuit Display +onboarding.tour-tor-network=Xarxa Tor +onboarding.tour-tor-network.title=Viatja per una xarxa descentralitzada. +onboarding.tour-tor-network.description=El navegador Tor us connecta a la xarxa Tor gestionada per milers de voluntaris de tot el món. A diferència d'una VPN, no hi ha cap punt de fracàs o entitat centralitzada que necessiteu confiar per gaudir d'Internet en privat. +onboarding.tour-tor-network.button=Vés a la pantalla de circuits -onboarding.tour-tor-circuit-display=Circuit Display -onboarding.tour-tor-circuit-display.title=See your path. -onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. -onboarding.tour-tor-circuit-display.button=See My Path +onboarding.tour-tor-circuit-display=Pantalla de circuits +onboarding.tour-tor-circuit-display.title=Vegeu el vostre camí. +onboarding.tour-tor-circuit-display.description=Per cada domini que visiteu, el vostre trànsit es retransmet i es xifra en un circuit a través de tres repetidors Tor al voltant del món. Cap lloc web sap d'on es connecta. Podeu sol·licitar un nou circuit fent clic a 'Nou circuit per a aquest lloc' a la nostra pantalla de circuits. +onboarding.tour-tor-circuit-display.button=Veure el meu camí onboarding.tour-tor-security=Seguretat -onboarding.tour-tor-security.title=Choose your experience. -onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. -onboarding.tour-tor-security.button=Review Settings +onboarding.tour-tor-security.title=Tria la teva experiència. +onboarding.tour-tor-security.description=També li oferim opcions de configuració addicionals per eliminar la seguretat del vostre navegador. La nostra configuració de seguretat us permet bloquejar els elements que es podrien utilitzar per atacar l'ordinador. Feu clic a sota per veure què fan les diferents opcions. +onboarding.tour-tor-security.button=Opcions de revisió -onboarding.tour-tor-expect-differences=Experience Tips -onboarding.tour-tor-expect-differences.title=Expect some differences. -onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-expect-differences=Consells sobre experiències +onboarding.tour-tor-expect-differences.title=Espereu algunes diferències. +onboarding.tour-tor-expect-differences.description=Amb totes les funcions de seguretat i privacitat proporcionades per Tor, la vostra experiència en navegar per Internet pot ser una mica diferent. Les coses poden ser una mica més lentes, i depenent del vostre nivell de seguretat, pot ser que alguns elements no funcionin ni es carreguin. També se us pot demanar que demostreu que sou un ésser humà i no un robot. +onboarding.tour-tor-expect-differences.button=Mirar preguntes freqüents onboarding.tour-tor-onion-services=Onion Services -onboarding.tour-tor-onion-services.title=Be extra protected. -onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. -onboarding.tour-tor-onion-services.button=Visit an Onion +onboarding.tour-tor-onion-services.title=Estigueu protegits addicionalment. +onboarding.tour-tor-onion-services.description=Els serveis de onion són llocs que acaben amb un .onion que proporciona proteccions addicionals a editors i visitants, incloses les mesures addicionals de protecció contra la censura. Els serveis de onion permeten que qualsevol persona proporcioni continguts i serveis de forma anònima. Feu clic a continuació per visitar el lloc de onion de DuckDuckGo. +onboarding.tour-tor-onion-services.button=Visita un Onion # Circuit Display onboarding. onboarding.tor-circuit-display.next=Següent onboarding.tor-circuit-display.done=Fet -onboarding.tor-circuit-display.one-of-three=1 of 3 -onboarding.tor-circuit-display.two-of-three=2 of 3 -onboarding.tor-circuit-display.three-of-three=3 of 3 +onboarding.tor-circuit-display.one-of-three=1 de 3 +onboarding.tor-circuit-display.two-of-three=2 de 3 +onboarding.tor-circuit-display.three-of-three=3 de 3 -onboarding.tor-circuit-display.intro.title=How do circuits work? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.title=Com funcionen els circuits? +onboarding.tor-circuit-display.intro.msg=Els circuits estan formats per repetidors assignats aleatòriament, que són ordinadors de tot el món configurats per reenviar el trànsit de Tor. Els circuits us permeten navegar de manera privada i connectar-vos amb els serveis de ceba. -onboarding.tor-circuit-display.diagram.title=Circuit Display -onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. +onboarding.tor-circuit-display.diagram.title=Pantalla de circuits +onboarding.tor-circuit-display.diagram.msg=Aquest diagrama mostra els repetidors que conformen el circuit d'aquest lloc web. Per evitar la vinculació de l'activitat en diferents llocs, cada lloc web obté un circuit diferent. -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? -onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. +onboarding.tor-circuit-display.new-circuit.title=Necessites un nou circuit? +onboarding.tor-circuit-display.new-circuit.msg=Si no podeu connectar-vos al lloc web que esteu tractant de visitar o no s'està carregant correctament, podeu utilitzar aquest botó per tornar a carregar el lloc amb un nou circuit. diff --git a/src/chrome/locale/da/aboutTBUpdate.dtd b/src/chrome/locale/da/aboutTBUpdate.dtd index 8fd39182..84c053af 100644 --- a/src/chrome/locale/da/aboutTBUpdate.dtd +++ b/src/chrome/locale/da/aboutTBUpdate.dtd @@ -5,6 +5,6 @@ <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Ændringslog:"> -<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> -<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> -<!ENTITY aboutTBUpdate.learnMore "Learn More"> +<!ENTITY aboutTBUpdate.circuitDisplayHeading "Nyt, redesignet kredsløb-display"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "Tors kredsløb-display er blev flyttet og forbedret! Klik på stedets identitet-knap (findes på venstre side af URL-linjen) for at se det nye kredskøb-display."> +<!ENTITY aboutTBUpdate.learnMore "Læs mere"> diff --git a/src/chrome/locale/da/aboutTor.dtd b/src/chrome/locale/da/aboutTor.dtd index 42cf050b..902a84fa 100644 --- a/src/chrome/locale/da/aboutTor.dtd +++ b/src/chrome/locale/da/aboutTor.dtd @@ -24,5 +24,5 @@ <!ENTITY aboutTor.getInvolved.label "Deltag »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> -<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> +<!ENTITY aboutTor.newsletter.tagline "Få de seneste nyheder fra Tor direkte i din indbakke."> +<!ENTITY aboutTor.newsletter.link_text "Tilmeld Tor-nyheder."> diff --git a/src/chrome/locale/da/browserOnboarding.properties b/src/chrome/locale/da/browserOnboarding.properties index 95530ce3..7ebc3b54 100644 --- a/src/chrome/locale/da/browserOnboarding.properties +++ b/src/chrome/locale/da/browserOnboarding.properties @@ -2,53 +2,53 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -onboarding.tour-tor-welcome=Welcome -onboarding.tour-tor-welcome.title=You’re ready. -onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. -onboarding.tour-tor-welcome.button=Start Now +onboarding.tour-tor-welcome=Velkommen +onboarding.tour-tor-welcome.title=Du er klar. +onboarding.tour-tor-welcome.description=Tor Browser tilbyder den højeste standard indenfor privatliv og sikkerhed på webbet. Du er nu beskyttet mod sporing, overvågning og censur. Denne hurtige introduktion viser dig hvordan. +onboarding.tour-tor-welcome.button=Start nu onboarding.tour-tor-privacy=Privatliv -onboarding.tour-tor-privacy.title=Snub trackers and snoopers. +onboarding.tour-tor-privacy.title=Sæt en stopper for trackere og snoopers. onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. -onboarding.tour-tor-privacy.button=Go to Tor Network +onboarding.tour-tor-privacy.button=Gå til Tor-netværk -onboarding.tour-tor-network=Tor Network -onboarding.tour-tor-network.title=Travel a decentralized network. +onboarding.tour-tor-network=Tor-netværk +onboarding.tour-tor-network.title=Rejs på et decentraliseret netværk. onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. -onboarding.tour-tor-network.button=Go to Circuit Display +onboarding.tour-tor-network.button=Gå til kredsløb-visning -onboarding.tour-tor-circuit-display=Circuit Display -onboarding.tour-tor-circuit-display.title=See your path. +onboarding.tour-tor-circuit-display=Kredsløb-visning +onboarding.tour-tor-circuit-display.title=Se din sti. onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. -onboarding.tour-tor-circuit-display.button=See My Path +onboarding.tour-tor-circuit-display.button=Se min sti onboarding.tour-tor-security=Sikkerhed -onboarding.tour-tor-security.title=Choose your experience. +onboarding.tour-tor-security.title=Vælg din oplevelse. onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. -onboarding.tour-tor-security.button=Review Settings +onboarding.tour-tor-security.button=Gennemgå indstillinger -onboarding.tour-tor-expect-differences=Experience Tips -onboarding.tour-tor-expect-differences.title=Expect some differences. +onboarding.tour-tor-expect-differences=Oplevelesestips +onboarding.tour-tor-expect-differences.title=Forvent nogen forskelle. onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-expect-differences.button=Se FAQ'er onboarding.tour-tor-onion-services=Onion-tjenester -onboarding.tour-tor-onion-services.title=Be extra protected. +onboarding.tour-tor-onion-services.title=Vær ekstra beskyttet. onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. -onboarding.tour-tor-onion-services.button=Visit an Onion +onboarding.tour-tor-onion-services.button=Besøg et onion # Circuit Display onboarding. onboarding.tor-circuit-display.next=Næste onboarding.tor-circuit-display.done=Fuldført -onboarding.tor-circuit-display.one-of-three=1 of 3 -onboarding.tor-circuit-display.two-of-three=2 of 3 -onboarding.tor-circuit-display.three-of-three=3 of 3 +onboarding.tor-circuit-display.one-of-three=1 af 3 +onboarding.tor-circuit-display.two-of-three=2 af 3 +onboarding.tor-circuit-display.three-of-three=3 af 3 -onboarding.tor-circuit-display.intro.title=How do circuits work? +onboarding.tor-circuit-display.intro.title=Hvordan virker kredsløb? onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. -onboarding.tor-circuit-display.diagram.title=Circuit Display +onboarding.tor-circuit-display.diagram.title=Kredsløb-visning onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? -onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. +onboarding.tor-circuit-display.new-circuit.title=Har du brug for et nyt kredsløb? +onboarding.tor-circuit-display.new-circuit.msg=Hvis du ikke kan oprette forbindelse til det websted du prøver at besøge, eller det ikke indlæser ordentligt, så kan du bruge denne knap til at genindlæse stedet med et nyt kredsløb. diff --git a/src/chrome/locale/da/torbutton.properties b/src/chrome/locale/da/torbutton.properties index f7b7cb8a..eaf46742 100644 --- a/src/chrome/locale/da/torbutton.properties +++ b/src/chrome/locale/da/torbutton.properties @@ -6,7 +6,7 @@ torbutton.circuit_display.relay = Relæ torbutton.circuit_display.tor_bridge = Bro torbutton.circuit_display.unknown_country = Ukendt land torbutton.circuit_display.guard = Vagt -torbutton.circuit_display.guard_note = Dit [Vagt]-knudepunkt må ikke ændres. +torbutton.circuit_display.guard_note = Dit [Vagt]-knudepunkt ændres måske ikke. torbutton.circuit_display.learn_more = Lær mere torbutton.content_sizer.margin_tooltip = Tor Browser tilføjer denne margin for at gøre dit vindues højde og bredde mindre genkendeligt, hvilket reducerer muligheden for at andre spore dig online. torbutton.panel.tooltip.disabled = Klik for at aktivere Tor diff --git a/src/chrome/locale/de/aboutTBUpdate.dtd b/src/chrome/locale/de/aboutTBUpdate.dtd index 3d699176..047db091 100644 --- a/src/chrome/locale/de/aboutTBUpdate.dtd +++ b/src/chrome/locale/de/aboutTBUpdate.dtd @@ -5,6 +5,6 @@ <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> -<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> -<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> -<!ENTITY aboutTBUpdate.learnMore "Learn More"> +<!ENTITY aboutTBUpdate.circuitDisplayHeading "Neu, Überarbeitete Circuit-Anzeige"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "Die Tor-Circuit-Anzeige wurde verschoben und verbessert! Klicke auf den Knopf Site Identity (links in der URL-Leiste), um die neue Circuit-Anzeige zu sehen."> +<!ENTITY aboutTBUpdate.learnMore "Mehr erfahren"> diff --git a/src/chrome/locale/de/aboutTor.dtd b/src/chrome/locale/de/aboutTor.dtd index f03c0e89..4b29fbb0 100644 --- a/src/chrome/locale/de/aboutTor.dtd +++ b/src/chrome/locale/de/aboutTor.dtd @@ -24,5 +24,5 @@ <!ENTITY aboutTor.getInvolved.label "Machen Sie mit »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> -<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> +<!ENTITY aboutTor.newsletter.tagline "Erhalte die neuesten Nachrichten von Tor direkt in den Posteingang"> +<!ENTITY aboutTor.newsletter.link_text "Tor-Nachrichten abonnieren"> diff --git a/src/chrome/locale/de/browserOnboarding.properties b/src/chrome/locale/de/browserOnboarding.properties index 69c7b86e..b9d841ea 100644 --- a/src/chrome/locale/de/browserOnboarding.properties +++ b/src/chrome/locale/de/browserOnboarding.properties @@ -3,52 +3,52 @@ # vim: set sw=2 sts=2 ts=8 et: onboarding.tour-tor-welcome=Willkommen -onboarding.tour-tor-welcome.title=You’re ready. -onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. -onboarding.tour-tor-welcome.button=Start Now +onboarding.tour-tor-welcome.title=Fertig. +onboarding.tour-tor-welcome.description=Tor Browser bietet höchste Privatsphäre und Sicherheit beim Surfen im Internet. Es schützt jetzt auch gegen Tracker, Überwachung und Zensur. Diese Einführung zeigt, wie. +onboarding.tour-tor-welcome.button=Jetzt starten onboarding.tour-tor-privacy=Privatsphäre -onboarding.tour-tor-privacy.title=Snub trackers and snoopers. -onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. -onboarding.tour-tor-privacy.button=Go to Tor Network +onboarding.tour-tor-privacy.title=Tracker und Schnüffler abweisen. +onboarding.tour-tor-privacy.description=Tor Browser isoliert Cookies und löscht den Verlauf nach jeder Benutzung. Diese Veränderungen garantieren, dass Privatsphäre und Sicherheit im Browser geschützt sind. Klicke auf "Tor-Netzwerk", um zu erfahren wir Tor auf Netzwerkebene schützt. +onboarding.tour-tor-privacy.button=Öffne Tor-Netzwerk -onboarding.tour-tor-network=Tor Network -onboarding.tour-tor-network.title=Travel a decentralized network. -onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. -onboarding.tour-tor-network.button=Go to Circuit Display +onboarding.tour-tor-network=Tor-Netzwerk +onboarding.tour-tor-network.title=Bereise ein dezentrales Netzwerk. +onboarding.tour-tor-network.description=Tor Browser verbindet sich mit dem Tor-Netzwerk, das von tausenden Freiwilligen betrieben wird. Anders als andere VPN gibt es keinen zentralen Punkt, dem vertraut werden muss, um das Internet privat zu nutzen. +onboarding.tour-tor-network.button=Circuit-Ansicht öffnen -onboarding.tour-tor-circuit-display=Circuit Display -onboarding.tour-tor-circuit-display.title=See your path. -onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. -onboarding.tour-tor-circuit-display.button=See My Path +onboarding.tour-tor-circuit-display=Circuit-Ansicht +onboarding.tour-tor-circuit-display.title=Zeige deinen Pfad +onboarding.tour-tor-circuit-display.description=Für jede Webseite wandern Anfragen und Antworten mehrfach verschlüsselt über drei Server (Relays) um die Welt. Keine Webseite weiß, woher die Verbindung ursprünglich kommt. Um eine Webseite über einen neuen Pfad erneut zu laden, klicke auf das Informations-Symbol in der Adressleiste und wähle "Neuer Pfad für diese Seite". +onboarding.tour-tor-circuit-display.button=Meinen Pfad sehen onboarding.tour-tor-security=Sicherheit -onboarding.tour-tor-security.title=Choose your experience. -onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. -onboarding.tour-tor-security.button=Review Settings +onboarding.tour-tor-security.title=Wähle deine Erfahrung +onboarding.tour-tor-security.description=Wir bieten zusätzliche Einstellungen, um die Sicherheit zu erhöhen. In den Sicherheitseinstellungen können verschiedene Objekte und Funktionen deaktiviert werden, welche die Sicherheit des Computers gefährden können. Klicke, um zu erfahren, was die verschiedenen Optionen bewirken. +onboarding.tour-tor-security.button=Einstellungen überprüfen -onboarding.tour-tor-expect-differences=Experience Tips -onboarding.tour-tor-expect-differences.title=Expect some differences. -onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-expect-differences=Erfahrungswerte +onboarding.tour-tor-expect-differences.title=Erwarten Sie einige Unterschiede. +onboarding.tour-tor-expect-differences.description=Mit all den Sicherheits- und Datenschutzfunktionen von Tor kann Ihre Erfahrung beim Surfen im Internet etwas anders sein. Die Dinge können etwas langsamer sein, und je nach Sicherheitsstufe funktionieren oder laden einige Elemente möglicherweise nicht. Möglicherweise werden Sie auch gebeten, zu beweisen, dass Sie ein Mensch und kein Roboter sind. +onboarding.tour-tor-expect-differences.button=Siehe FAQs onboarding.tour-tor-onion-services=Onion-Dienste -onboarding.tour-tor-onion-services.title=Be extra protected. -onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. -onboarding.tour-tor-onion-services.button=Visit an Onion +onboarding.tour-tor-onion-services.title=Seien Sie besonders geschützt. +onboarding.tour-tor-onion-services.description=Onion-Dienste sind Websites, die auf .onion enden, die Herausgebern und Besuchern zusätzlichen Schutz bieten, einschließlich zusätzlicher Schutzmaßnahmen gegen Zensur. Onion-Dienste ermöglichen es jedem, Inhalte und Dienste anonym bereitzustellen. Klicken Sie unten, um die DuckDuckGo Onion Website zu besuchen. +onboarding.tour-tor-onion-services.button=Eine Onion-Website besuchen # Circuit Display onboarding. onboarding.tor-circuit-display.next=Weiter onboarding.tor-circuit-display.done=Fertig -onboarding.tor-circuit-display.one-of-three=1 of 3 -onboarding.tor-circuit-display.two-of-three=2 of 3 -onboarding.tor-circuit-display.three-of-three=3 of 3 +onboarding.tor-circuit-display.one-of-three=1 von 3 +onboarding.tor-circuit-display.two-of-three=2 von 3 +onboarding.tor-circuit-display.three-of-three=3 von 3 -onboarding.tor-circuit-display.intro.title=How do circuits work? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.title=Wie funktionieren Circuits? +onboarding.tor-circuit-display.intro.msg=Circuits bestehen aus zufällig zugeordneten Relays, d.h. Computern auf der ganzen Welt, die konfiguriert sind, um Torverkehr weiterzuleiten. Circuits ermöglichen es Ihnen, privat zu surfen und sich mit Onion-Diensten zu verbinden.\n -onboarding.tor-circuit-display.diagram.title=Circuit Display -onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. +onboarding.tor-circuit-display.diagram.title=Circuit-Ansicht +onboarding.tor-circuit-display.diagram.msg=Dieses Diagramm zeigt die Relais, aus denen die Circuits für diese Website besteht. Um zu verhindern, dass Aktivitäten zwischen verschiedenen Standorten verlinkt werden, erhält jede Website einen anderen Circuit. -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? -onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. +onboarding.tor-circuit-display.new-circuit.title=Brauchen Sie einen neuen Circuit? +onboarding.tor-circuit-display.new-circuit.msg=Wenn Sie keine Verbindung zu der Website herstellen können, die Sie besuchen möchten, oder wenn sie nicht richtig geladen wird, können Sie diese Schaltfläche verwenden um die Website über einen neuen Circuit zu laden. diff --git a/src/chrome/locale/es/browserOnboarding.properties b/src/chrome/locale/es/browserOnboarding.properties index 5ba63158..2e858112 100644 --- a/src/chrome/locale/es/browserOnboarding.properties +++ b/src/chrome/locale/es/browserOnboarding.properties @@ -4,30 +4,30 @@ onboarding.tour-tor-welcome=Bienvenido/a onboarding.tour-tor-welcome.title=Estás listo/a. -onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. -onboarding.tour-tor-welcome.button=Start Now +onboarding.tour-tor-welcome.description=El Navegador Tor ofrece un alto standar de privacidad y seguridad mientras se navega por la red. Está ahora protegido de rastreadores, vigilancia y censura. Esta rápida introducción te enseñará cómo. +onboarding.tour-tor-welcome.button=Comienza Ahora onboarding.tour-tor-privacy=Privacidad -onboarding.tour-tor-privacy.title=Snub trackers and snoopers. -onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. +onboarding.tour-tor-privacy.title=Rastreadores y espías molestos +onboarding.tour-tor-privacy.description=El Navegador Tor aísla las cookies y borra el historial de navegación después de la sesión. Estas modificaciones aseguran que tu privacidad y seguridad sean protegidas en el navegador. Haz click en 'Red Tor' para saber cómo te protegemeos a nivel de red. onboarding.tour-tor-privacy.button=Ir a la red Tor onboarding.tour-tor-network=Red Tor -onboarding.tour-tor-network.title=Travel a decentralized network. -onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. -onboarding.tour-tor-network.button=Go to Circuit Display +onboarding.tour-tor-network.title=Viaja por la red descentralizada. +onboarding.tour-tor-network.description=El Navegador Tor te conecta con la Red Tor, mantenida por miles de voluntarios alrededor del mundo.\nA diferencia de una VPN, no hay un punto de falla o entidad centralizada en la que necesites confiar para disfrutar de Internet de forma privada. +onboarding.tour-tor-network.button=Ir a la visualización del circuito -onboarding.tour-tor-circuit-display=Circuit Display -onboarding.tour-tor-circuit-display.title=See your path. +onboarding.tour-tor-circuit-display=Visualización del circuito +onboarding.tour-tor-circuit-display.title=Ver tu recorrido onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. -onboarding.tour-tor-circuit-display.button=See My Path +onboarding.tour-tor-circuit-display.button=Ver mi recorrido onboarding.tour-tor-security=Seguridad onboarding.tour-tor-security.title=Choose your experience. onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. -onboarding.tour-tor-security.button=Review Settings +onboarding.tour-tor-security.button=Revisar configuración -onboarding.tour-tor-expect-differences=Experience Tips +onboarding.tour-tor-expect-differences=Consejos de experiencia onboarding.tour-tor-expect-differences.title=Expect some differences. onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. onboarding.tour-tor-expect-differences.button=See FAQs @@ -47,8 +47,8 @@ onboarding.tor-circuit-display.three-of-three=3 of 3 onboarding.tor-circuit-display.intro.title=How do circuits work? onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. -onboarding.tor-circuit-display.diagram.title=Circuit Display -onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. +onboarding.tor-circuit-display.diagram.title=Visualización del circuito +onboarding.tor-circuit-display.diagram.msg=Estos diagramas muestran los repetidores que crean el circuito para esta página web. Para prevenir la vinculación de la actividad a través de diferentes sitios, cada página web tiene un circuito diferente. -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? -onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. +onboarding.tor-circuit-display.new-circuit.title=¿Necesitas un circuito nuevo? +onboarding.tor-circuit-display.new-circuit.msg=Si no consigues conectarte a la página web que estás intentando visitar, o no está cargando correctamente, puedes usar el botón para recargar la página con un circuito nuevo. diff --git a/src/chrome/locale/fa/brand.properties b/src/chrome/locale/fa/brand.properties index f5ec5a29..b602d0ab 100644 --- a/src/chrome/locale/fa/brand.properties +++ b/src/chrome/locale/fa/brand.properties @@ -7,10 +7,10 @@ brandShortName=مرورگر تور brandFullName=مرورگر تور vendorShortName=پروژه تور -homePageSingleStartMain=صفحهٔ Firefox Start, صفحهٔ خانگی تند با موتور جستجو -homePageImport=صفحه‌ٔ خانگیتان‌را از %S وارد كنيد +homePageSingleStartMain=شروع بکار فایرفاکس، یک صفحه اصلی با قابلیت کادر جستجو ایجاد شد. +homePageImport=درون‌ریزی صفحه خانگی از %S -homePageMigrationPageTitle=انتخاب صفحهٔ خانگی -homePageMigrationDescription=لطفاً صفحه خانگی مورد نظر خود را انتخاب نمایید: +homePageMigrationPageTitle=انتخاب صفحه اصلی +homePageMigrationDescription=لطفا صفحه اصلی مورد نظر خود را انتخاب کنید: syncBrandShortName=همگام‌ سازی diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd index 6bf62d14..858b8c17 100644 --- a/src/chrome/locale/fa/torbutton.dtd +++ b/src/chrome/locale/fa/torbutton.dtd @@ -27,25 +27,25 @@ <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "عدم حفاظت از کلوچک‌های جديد"> <!ENTITY torbutton.prefs.restrict_thirdparty "محدود‌كردن كوكى‌هاى طرف سوم و داده‌هاى پيگردى ديگر"> <!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R"> -<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets."> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "این جعبه را نگه دارید تا از استفاده از ویژگی‌های مختلف مرورگر برای ردیابی شما در هنگام مرور وب جلوگیری شود. ویژگی های اصلاح شده شامل: آدرس‌های آلوده, broadcast channels, کش مرورگر, کوکی‌ها, فاویکن, HTTP Auth headers, پیوندهاpreconnects, حافظه محلی, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets."> <!ENTITY torbutton.prefs.resist_fingerprinting "تغييردادن جزئياتى كه شمارا از كاربران ديگر تُر تميزمى‌كند"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> <!ENTITY torbutton.prefs.sec_caption "سطح امنیت"> -<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts."> +<!ENTITY torbutton.prefs.sec_caption_tooltip "نوار لغزنده امنیتی به شما اجازه می‌دهد که مشخصه‌های خاص مرورگر را غیرفعال کنید که ممکن است مرورگر شما را در برابر تلاش‌های هک آسیب‌پذیر سازد."> <!ENTITY torbutton.prefs.sec_standard_label "استاندارد"> -<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled."> +<!ENTITY torbutton.prefs.sec_standard_description "همه مرورگر تور و ویژگی‌های وبسایت به کار انداخته شده‌اند."> <!ENTITY torbutton.prefs.sec_safer_label "ایمن تر "> -<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality."> -<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:"> +<!ENTITY torbutton.prefs.sec_safer_description "از کار انداختن ویژگی‌های وبسایت که اغلب خطرناک هستند و باعث از دست رفتن برخی سایت‌ها می‌شوند."> +<!ENTITY torbutton.prefs.sec_safer_list_label "تنظیم مکانی امن‌تر:"> <!ENTITY torbutton.prefs.sec_safest_label "ایمن ترین "> <!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts."> -<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:"> +<!ENTITY torbutton.prefs.sec_safest_list_label "تنظیم امن‌ترین مکان"> <!ENTITY torbutton.prefs.sec_learn_more_label "اطلاعات بیشتر"> -<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites."> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "جاوا اسکریپت روی سایت‌های غیر HTTPS کار نمی‌کند."> <!ENTITY torbutton.prefs.sec_js_disabled "جاوا اسکریپت به طور پیش فرض در تمامی سایت ها غیر فعال است."> -<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled."> -<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled."> -<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play."> -<!ENTITY torbutton.circuit_display.title "Tor Circuit"> -<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> +<!ENTITY torbutton.prefs.sec_limit_typography "برخی از فونت ها و نمادهای ریاضی غیرفعال هستند"> +<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "برخی از فونت ها، شمایل‌ها، علایم ریاضی و تصاویر از کار افتاده هستند."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "صدا و ویدیو ( HTML5 رسانه ) برای بازی کلیک می‌کنند."> +<!ENTITY torbutton.circuit_display.title "مدار تور"> +<!ENTITY torbutton.circuit_display.new_circuit "مدار جدید برای این سایت"> diff --git a/src/chrome/locale/ga/aboutTBUpdate.dtd b/src/chrome/locale/ga/aboutTBUpdate.dtd index 258515c4..72f53a93 100644 --- a/src/chrome/locale/ga/aboutTBUpdate.dtd +++ b/src/chrome/locale/ga/aboutTBUpdate.dtd @@ -5,6 +5,6 @@ <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Logchomhad athruithe:"> -<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> -<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> +<!ENTITY aboutTBUpdate.circuitDisplayHeading "Dearadh Nua ar Thaispeántas an Chiorcaid"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "Chuireamar feabhas ar thaispeántas an chiorcaid, agus tá sé in áit nua freisin! Cliceáil an cnaipe Eolas faoin suíomh (ar an taobh clé den bharra URL) chun an taispeántas nua a fheiceáil."> <!ENTITY aboutTBUpdate.learnMore "Tuilleadh Eolais"> diff --git a/src/chrome/locale/ga/browserOnboarding.properties b/src/chrome/locale/ga/browserOnboarding.properties index cc1000c1..1d44d5a0 100644 --- a/src/chrome/locale/ga/browserOnboarding.properties +++ b/src/chrome/locale/ga/browserOnboarding.properties @@ -2,53 +2,53 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -onboarding.tour-tor-welcome=Welcome -onboarding.tour-tor-welcome.title=You’re ready. -onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. -onboarding.tour-tor-welcome.button=Start Now +onboarding.tour-tor-welcome=Fáilte +onboarding.tour-tor-welcome.title=Tá tú réidh. +onboarding.tour-tor-welcome.description=Soláthraíonn Brabhsálaí Tor príobháideachas agus slándáil den chéad scoth ar an nGréasán. Cosnaíonn sé thú ar lorgaireacht, ar fhaire leictreonach, agus ar chinsireacht. Míneoidh an ceacht beag seo an chaoi a n-oibríonn sé. +onboarding.tour-tor-welcome.button=Tosaigh Anois onboarding.tour-tor-privacy=Príobháideachas -onboarding.tour-tor-privacy.title=Snub trackers and snoopers. -onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. -onboarding.tour-tor-privacy.button=Go to Tor Network - -onboarding.tour-tor-network=Tor Network -onboarding.tour-tor-network.title=Travel a decentralized network. -onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. -onboarding.tour-tor-network.button=Go to Circuit Display - -onboarding.tour-tor-circuit-display=Circuit Display -onboarding.tour-tor-circuit-display.title=See your path. -onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. -onboarding.tour-tor-circuit-display.button=See My Path - -onboarding.tour-tor-security=Security -onboarding.tour-tor-security.title=Choose your experience. -onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. -onboarding.tour-tor-security.button=Review Settings - -onboarding.tour-tor-expect-differences=Experience Tips -onboarding.tour-tor-expect-differences.title=Expect some differences. -onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-privacy.title=Cuir bac ar na lorgairí agus ar na gliúcaigh. +onboarding.tour-tor-privacy.description=Coinníonn Brabhsálaí Tor fianáin scartha agus scriosann sé do stair bhrabhsála tar éis gach seisiúin. Sa chaoi seo, cosnaíonn sé do phríobháideachas agus do shlándáil sa mbrabhsálaí. Cliceáil 'Líonra Tor' le foghlaim conas a chosnaímid thú ar leibhéal an líonra. +onboarding.tour-tor-privacy.button=Téigh go Líonra Tor + +onboarding.tour-tor-network=Líonra Tor +onboarding.tour-tor-network.title=Taisteal ar líonra díláraithe. +onboarding.tour-tor-network.description=Ceanglaíonn Brabhsálaí Tor le líonra Tor thú, líonra faoi stiúir na mílte oibrí deonach timpeall an domhain. I gcodarsnacht le VPN, níl éalang aonair ann agus ní gá duit muinín a chur in eagraíocht láraithe chun taitneamh a bhaint as an Idirlíon go príobháideach. +onboarding.tour-tor-network.button=Téigh go dtí Taispeántas an Chiorcaid + +onboarding.tour-tor-circuit-display=Taispeántas an Chiorcaid +onboarding.tour-tor-circuit-display.title=Do chosán a dhéanamh. +onboarding.tour-tor-circuit-display.description=Ar gach fearann a dtugann tú cuairt air, cuirtear do chuid tráchta ar aghaidh trí chiorcad déanta as trí cinn d'athsheachadáin timpeall an domhain. Is féidir leat ciorcad nua a iarraidh trí ‘Ciorcadh Nua don Suíomh seo’ a chliceáil i dTaispeántas an Chiorcaid. +onboarding.tour-tor-circuit-display.button=Mo Chosán + +onboarding.tour-tor-security=Slándáil +onboarding.tour-tor-security.title=D'eispéireas féin. +onboarding.tour-tor-security.description=Soláthraímid socruithe breise duit lenar féidir leat leibhéal slándála níos airde a bhaint amach trí, mar shampla, cosc a chur ar eilimintí áirithe a d'fhéadfaí a úsáid chun ionsaí a dhéanamh ar do ríomhaire. Cliceáil thíos chun tuilleadh eolais a fháil faoi na roghanna éagsúla. +onboarding.tour-tor-security.button=Athbhreithniú Socruithe + +onboarding.tour-tor-expect-differences=Leideanna +onboarding.tour-tor-expect-differences.title=Bí ag súil le difríochtaí. +onboarding.tour-tor-expect-differences.description=D'fhéadfadh d'eispéireas ar an Idirlíon a bheith pas beag difriúil mar gheall ar na gnéithe príobháideachais agus slándála i mbrabhsálaí Tor. B'fhéidir go mbeadh sé beagán níos moille, agus tá seans ann nach bhfeidhmeoidh nó nach lódálfaidh eilimintí áirithe, ag brath ar an leibhéal slándála. Uaireanta, iarrfar ort cruthúnas a thabhairt nach róbat thú. +onboarding.tour-tor-expect-differences.button=Ceisteanna Coitianta onboarding.tour-tor-onion-services=Seirbhísí Onion -onboarding.tour-tor-onion-services.title=Be extra protected. -onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. -onboarding.tour-tor-onion-services.button=Visit an Onion +onboarding.tour-tor-onion-services.title=Cosaint bhreise. +onboarding.tour-tor-onion-services.description=Is éard atá i seirbhís onion ná suíomh speisialta ón fhearann barrleibhéil .onion a sholáthraíonn cosaintí breise d'fhoilsitheoirí agus do chuairteoirí, cosaintí ar an gcinsireacht san áireamh. Is féidir le haon duine seirbhísí onion a úsáid chun ábhar a fhoilsiú agus seirbhísí a sholáthar gan a ainm a nochtadh. Cliceáil thíos le cuairt a thabhairt ar an suíomh onion do DuckDuckGo. +onboarding.tour-tor-onion-services.button=Oscail Oinniún # Circuit Display onboarding. onboarding.tor-circuit-display.next=Ar Aghaidh onboarding.tor-circuit-display.done=Déanta -onboarding.tor-circuit-display.one-of-three=1 of 3 -onboarding.tor-circuit-display.two-of-three=2 of 3 -onboarding.tor-circuit-display.three-of-three=3 of 3 +onboarding.tor-circuit-display.one-of-three=1 as 3 +onboarding.tor-circuit-display.two-of-three=2 as 3 +onboarding.tor-circuit-display.three-of-three=3 as 3 -onboarding.tor-circuit-display.intro.title=How do circuits work? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.title=Cén chaoi a n-oibríonn ciorcaid? +onboarding.tor-circuit-display.intro.msg=Déantar ciorcaid as athsheachadáin a roghnaítear go randamach, ríomhairí timpeall an domhain a chuireann trácht Tor ar aghaidh. Ligeann an ciorcad duit an Gréasán a bhrabhsáil go príobháideach agus seirbhísí onion a úsáid. -onboarding.tor-circuit-display.diagram.title=Circuit Display -onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. +onboarding.tor-circuit-display.diagram.title=Taispeántas an Chiorcaid +onboarding.tor-circuit-display.diagram.msg=Léiríonn an léaráid seo na hathsheachadáin sa gciorcad don suíomh seo. Tá ciorcad difriúil ag gach suíomh sa chaoi nach féidir le tríú páirtithe do chuid gníomhaíochta a nascadh ó shuíomh go suíomh. -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? -onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. +onboarding.tor-circuit-display.new-circuit.title=An teastaíonn ciorcad nua uait? +onboarding.tor-circuit-display.new-circuit.msg=Mura bhfuil tú in ann ceangal a bhunú le suíomh Gréasáin, nó mura bhfuil sé ag lódáil mar ba cheart, is féidir leat an cnaipe seo a úsáid chun an suíomh a athlódáil le ciorcad nua. diff --git a/src/chrome/locale/ga/torbutton.properties b/src/chrome/locale/ga/torbutton.properties index ab7d7efe..4e5ae906 100644 --- a/src/chrome/locale/ga/torbutton.properties +++ b/src/chrome/locale/ga/torbutton.properties @@ -6,7 +6,7 @@ torbutton.circuit_display.relay = Athsheachadán torbutton.circuit_display.tor_bridge = Droichead torbutton.circuit_display.unknown_country = Tír anaithnid torbutton.circuit_display.guard = Garda -torbutton.circuit_display.guard_note = Níl cead agat an [Garda] a athrú. +torbutton.circuit_display.guard_note = Seans nach n-athrófar an nód [Guard]. torbutton.circuit_display.learn_more = Tuilleadh eolais torbutton.content_sizer.margin_tooltip = Cuireann Brabhsálaí Tor an chiumhais seo leis an bhfuinneog ionas nach mbeidh leithead agus airde na fuinneoige chomh suntasach, sa chaoi go mbíonn sé níos deacra do ghníomhaíocht ar líne a lorg. torbutton.panel.tooltip.disabled = Cliceáil le Tor a chumasú diff --git a/src/chrome/locale/he/aboutTor.dtd b/src/chrome/locale/he/aboutTor.dtd index 2413d064..e47b43c7 100644 --- a/src/chrome/locale/he/aboutTor.dtd +++ b/src/chrome/locale/he/aboutTor.dtd @@ -25,4 +25,4 @@ <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> <!ENTITY aboutTor.newsletter.tagline "קבל את החדשות האחרונות מאת Tor ישירות לתיבה הנכנסת שלך."> -<!ENTITY aboutTor.newsletter.link_text "הירשם עבור חדשות Tor"> +<!ENTITY aboutTor.newsletter.link_text "הירשם עבור חדשות Tor."> diff --git a/src/chrome/locale/he/browserOnboarding.properties b/src/chrome/locale/he/browserOnboarding.properties index 466f104f..daa6b6e7 100644 --- a/src/chrome/locale/he/browserOnboarding.properties +++ b/src/chrome/locale/he/browserOnboarding.properties @@ -2,53 +2,53 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -onboarding.tour-tor-welcome=Welcome -onboarding.tour-tor-welcome.title=You’re ready. -onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. -onboarding.tour-tor-welcome.button=Start Now +onboarding.tour-tor-welcome=ברוך הבא +onboarding.tour-tor-welcome.title=אתה מוכן. +onboarding.tour-tor-welcome.description=דפדפן Tor מציע את התקן הגבוה ביותר של פרטיות ואבטחה בזמן גלישה ברשת. אתה מוגן כעת מפני מעקב, ציתות וצנזורה. ביאור מהיר זה יראה לך איך. +onboarding.tour-tor-welcome.button=התחל עכשיו onboarding.tour-tor-privacy=פרטיות -onboarding.tour-tor-privacy.title=Snub trackers and snoopers. -onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. -onboarding.tour-tor-privacy.button=Go to Tor Network +onboarding.tour-tor-privacy.title=בלום גששים וחטטנים. +onboarding.tour-tor-privacy.description=דפדפן Tor מבודד עוגיות ומוחק את היסטורית הדפדפן שלך לאחר השיח שלך. שינויים אלו מבטיחים שהפרטיות והאבטחה שלך מוגנים בדפדפן. לחץ ’רשת Tor‘ כדי ללמוד כיצד אנחנו מגינים עליך ברמת הרשת. +onboarding.tour-tor-privacy.button=לך אל רשת Tor -onboarding.tour-tor-network=Tor Network -onboarding.tour-tor-network.title=Travel a decentralized network. -onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. -onboarding.tour-tor-network.button=Go to Circuit Display +onboarding.tour-tor-network=רשת Tor +onboarding.tour-tor-network.title=טייל ברשת מבוזרת. +onboarding.tour-tor-network.description=דפדפן Tor מחבר אותך אל רשת Tor המופעלת ע"י אלפי מתנדבים ברחבי העולם. בשונה מאשר VPN, אין נקודת כשל בודדת או כניסה מבוזרת שאתה צריך לסמוך עליה על מנת ליהנות מהאינטרנט באופן פרטי. +onboarding.tour-tor-network.button=לך אל תצוגת מעגל -onboarding.tour-tor-circuit-display=Circuit Display -onboarding.tour-tor-circuit-display.title=See your path. +onboarding.tour-tor-circuit-display=תצוגת מעגל +onboarding.tour-tor-circuit-display.title=ראה את הנתיב שלך. onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. -onboarding.tour-tor-circuit-display.button=See My Path +onboarding.tour-tor-circuit-display.button=ראה את הנתיב שלי onboarding.tour-tor-security=אבטחה -onboarding.tour-tor-security.title=Choose your experience. -onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. -onboarding.tour-tor-security.button=Review Settings +onboarding.tour-tor-security.title=בחר את חוויתך. +onboarding.tour-tor-security.description=אנחנו מספקים לך גם הגדרות נוספות עבור הגברת אבטחת הדפדפן שלך. הגדרות האבטחה שלנו מתירות לך לחסום יסודות שעלולות לשמש כדי לתקוף את המחשב שלך. לחץ למטה כדי לראות מה האפשרויות השונות עושות. +onboarding.tour-tor-security.button=סקור הגדרות -onboarding.tour-tor-expect-differences=Experience Tips -onboarding.tour-tor-expect-differences.title=Expect some differences. +onboarding.tour-tor-expect-differences=עצות חוויה +onboarding.tour-tor-expect-differences.title=צפה למספר הבדלים. onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-expect-differences.button=ראה שאלות נפוצות onboarding.tour-tor-onion-services=שירותי בצל -onboarding.tour-tor-onion-services.title=Be extra protected. +onboarding.tour-tor-onion-services.title=הייה אקסטרה מוגן. onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. -onboarding.tour-tor-onion-services.button=Visit an Onion +onboarding.tour-tor-onion-services.button=בקר בבצל # Circuit Display onboarding. onboarding.tor-circuit-display.next=הבא onboarding.tor-circuit-display.done=בוצע -onboarding.tor-circuit-display.one-of-three=1 of 3 -onboarding.tor-circuit-display.two-of-three=2 of 3 -onboarding.tor-circuit-display.three-of-three=3 of 3 +onboarding.tor-circuit-display.one-of-three=1 מתוך 3 +onboarding.tor-circuit-display.two-of-three=2 מתוך 3 +onboarding.tor-circuit-display.three-of-three=3 מתוך 3 -onboarding.tor-circuit-display.intro.title=How do circuits work? +onboarding.tor-circuit-display.intro.title=איך מעגלים עובדים? onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. -onboarding.tor-circuit-display.diagram.title=Circuit Display -onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. +onboarding.tor-circuit-display.diagram.title=תצוגת מעגל +onboarding.tor-circuit-display.diagram.msg=תרשים זה מראה את הממסרים המרכיבים את המעגל עבור אתר זה. כדי למנוע קישור פעילות על פני אתרים שונים, כל אתר מקבל מעגל שונה. -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? -onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. +onboarding.tor-circuit-display.new-circuit.title=האם אתה צריך מעגל חדש? +onboarding.tor-circuit-display.new-circuit.msg=אם אינך מצליח להתחבר אל האתר שאתה מנסה לבקר בו או שהוא אינו נטען כראוי, אתה יכול להשתמש בכפתור זה כדי לטעון מחדש את האתר עם מעגל חדש. diff --git a/src/chrome/locale/id/aboutTBUpdate.dtd b/src/chrome/locale/id/aboutTBUpdate.dtd index 9a10bc64..ad37dae0 100644 --- a/src/chrome/locale/id/aboutTBUpdate.dtd +++ b/src/chrome/locale/id/aboutTBUpdate.dtd @@ -5,6 +5,6 @@ <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Catatan Perubahan:"> -<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> -<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> -<!ENTITY aboutTBUpdate.learnMore "Learn More"> +<!ENTITY aboutTBUpdate.circuitDisplayHeading "Circuit Display yang Baru dan Didesain ulang"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "Tor circuit display telah dipindahkan dan ditingkatkan! Klik tombol Site Identity (ada di sebelah kiri URL bar) untuk melihat circuit display yang baru."> +<!ENTITY aboutTBUpdate.learnMore "Pelajari lebih lanjut"> diff --git a/src/chrome/locale/id/aboutTor.dtd b/src/chrome/locale/id/aboutTor.dtd index 7164df0f..3a4e3a27 100644 --- a/src/chrome/locale/id/aboutTor.dtd +++ b/src/chrome/locale/id/aboutTor.dtd @@ -6,23 +6,23 @@ <!ENTITY aboutTor.title "Tentang Tor"> -<!ENTITY aboutTor.ready.label "Explore. Privately."> -<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> +<!ENTITY aboutTor.ready.label "Jelajahi. Secara Privat."> +<!ENTITY aboutTor.ready2.label "Anda siap untuk pengalaman menjelajah yang paling privat di dunia."> <!ENTITY aboutTor.failure.label "Ada Masalah!"> <!ENTITY aboutTor.failure2.label "Tor tidak dapat digunakan di peramban ini."> -<!ENTITY aboutTor.search.label "Search with DuckDuckGo"> +<!ENTITY aboutTor.search.label "Cari dengan DuckDuckGo"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Pertanyaan?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Periksa Tor Browser Manual kami »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "m"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual "> -<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding."> -<!ENTITY aboutTor.getInvolved.label "Get Involved »"> +<!ENTITY aboutTor.tor_mission.label "The Tor Project adalah US 501(c)(3) organisasi nirlaba yang bertujuan memajukan hak asasi manusia dan kebebasan dengan membuat dan menyebarkan teknologi anominitas dan privasi yang bebas dan terbuka dan mendukung keberadaan dan penggunaannya, dan meningkatkan pemahamannya dalam hal ilmiah dan populer."> +<!ENTITY aboutTor.getInvolved.label "Ikut Terlibat »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/terlibat/relawan.html.id"> -<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> -<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> +<!ENTITY aboutTor.newsletter.tagline "Dapatkan berita Tor terbaru langsung ke inbox Anda."> +<!ENTITY aboutTor.newsletter.link_text "Daftar untuk mendapatkan Berita Tor."> diff --git a/src/chrome/locale/id/browserOnboarding.properties b/src/chrome/locale/id/browserOnboarding.properties index 5af64bc9..471a73b8 100644 --- a/src/chrome/locale/id/browserOnboarding.properties +++ b/src/chrome/locale/id/browserOnboarding.properties @@ -3,38 +3,38 @@ # vim: set sw=2 sts=2 ts=8 et: onboarding.tour-tor-welcome=Selamat datang -onboarding.tour-tor-welcome.title=You’re ready. -onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. +onboarding.tour-tor-welcome.title=Anda siap. +onboarding.tour-tor-welcome.description=Peramban Tor menawarkan standar tertinggi atas privasi dan keamanan saat menjelajahi jaringan. Anda sekarang dilindungi dari pelacakan, pengintaian, dan penyensoran. Pelatihan singkat ini akan menunjukkan Anda bagaimana caranya. onboarding.tour-tor-welcome.button=Start Now onboarding.tour-tor-privacy=Privasi -onboarding.tour-tor-privacy.title=Snub trackers and snoopers. -onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. +onboarding.tour-tor-privacy.title=Menolak pelacak dan pengintai. +onboarding.tour-tor-privacy.description=Peramban tor mengisolasi kuki dan menghapus riwayat peramban anda setelah ditutup. Modifikasi ini menjamin privasi dan keamanan telah terproteksi di dalam peramban. Klik 'Jaringan Tor' untuk pempelajari bagaimana kami melindungi anda pada level jaringan. onboarding.tour-tor-privacy.button=Go to Tor Network onboarding.tour-tor-network=Tor Network -onboarding.tour-tor-network.title=Travel a decentralized network. -onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. +onboarding.tour-tor-network.title=Mengelilingi jaringan yang terdesentralisasi. +onboarding.tour-tor-network.description=Peramban Tor menghubungkan Anda ke jaringan Tor yang dijalankan oleh ribuan relawan di seluruh dunia. Tidak seperti VPN, tidak ada satu titik kesalahan atau entitas sentral yang perlu anda percaya untuk menikmati internet secara privat. onboarding.tour-tor-network.button=Go to Circuit Display -onboarding.tour-tor-circuit-display=Circuit Display -onboarding.tour-tor-circuit-display.title=See your path. -onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. +onboarding.tour-tor-circuit-display=Tampilan Sirkuit +onboarding.tour-tor-circuit-display.title=Lihat jalan Anda. +onboarding.tour-tor-circuit-display.description=Untuk setiap domain yang Anda kunjungi, lalu lintas anda disampaikan dan terenkripsi dalam sebuah sirkuit melalui tiga relay Tor dari seluruh dunia. Tidak ada situs web mengetahui dari mana anda terhubung. Anda dapat meminta sebuah sirkuit baru dengan klik 'Sirkuit Baru untuk Situs ini' pada Tampilan Sirkuit kami. onboarding.tour-tor-circuit-display.button=See My Path onboarding.tour-tor-security=Keamanan -onboarding.tour-tor-security.title=Choose your experience. -onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. +onboarding.tour-tor-security.title=Putuskan pengalamanmu. +onboarding.tour-tor-security.description=Kami juga menyediakan Anda dengan pengaturan tambahan untuk meningkatkan keamanan peramban Anda. Pengaturan Keamanan kami mengizinkan anda untuk memblokir elemen-elemen yang dapat digunakan untuk menyerang komputer Anda. Klik di bawah untuk mengetahui apa saja yang dilakukan oleh pilihan yang berbeda. onboarding.tour-tor-security.button=Review Settings -onboarding.tour-tor-expect-differences=Experience Tips -onboarding.tour-tor-expect-differences.title=Expect some differences. -onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. +onboarding.tour-tor-expect-differences=Tips Pengalaman +onboarding.tour-tor-expect-differences.title=Harapkan beberapa perubahan. +onboarding.tour-tor-expect-differences.description=Dengan semua fitur keamanan dan privasi yang disediakan oleh Tor, pengalaman Anda saat menjelajahi internet mungkin akan sedikit berbeda. Kecepatan internet mungkin akan berkurang, dan berdasarkan level keamanan Anda, beberapa elemen mungkin tidak bisa bekerja ada dimuat. Anda mungkin juga akan mendapatkan pertanyaan untuk membuktikan bahwa Anda adalah manusia dan bukan robot. onboarding.tour-tor-expect-differences.button=See FAQs onboarding.tour-tor-onion-services=Layanan Onion -onboarding.tour-tor-onion-services.title=Be extra protected. -onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. +onboarding.tour-tor-onion-services.title=Menjadi lebih terlindung. +onboarding.tour-tor-onion-services.description=Layanan Onion adalah situs yang berakhir dengan sebuah .onion yang menyediakan perlindungan lebih kepada penerbit dan pengunjung, termasuk tambahan penjagaan terhadap sensor. Layanan Onion mengizinkan siapa saja untuk menyediakan konten dan layanan secara anonim. Klik di bawah untuk mengunjungu situs onion DuckDuckGo. onboarding.tour-tor-onion-services.button=Visit an Onion # Circuit Display onboarding. @@ -45,10 +45,10 @@ onboarding.tor-circuit-display.two-of-three=2 of 3 onboarding.tor-circuit-display.three-of-three=3 of 3 onboarding.tor-circuit-display.intro.title=How do circuits work? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.msg=Sirkuit terbuat dari relay yang ditentukan secara acak, yang merupakan komputer di seluruh dunia yang terkonfigurasi untuk mengalihkan lalu lintas Tor. Sirkuit mengizinkan anda untuk menjelajah secara privat dan terhubung ke layanan onion. -onboarding.tor-circuit-display.diagram.title=Circuit Display -onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. +onboarding.tor-circuit-display.diagram.title=Tampilan Sirkuit +onboarding.tor-circuit-display.diagram.msg=Diagram ini menunjukkan relay-relay yang membuat sirkuit untuk situs web ini. Untuk mencegah pengkaitan antara aktivitas pada situs berbeda, setiap situs web mendapatkan sirkuit yang berbeda. -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? -onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. +onboarding.tor-circuit-display.new-circuit.title=Apakah Anda menginginkan sirkuit baru? +onboarding.tor-circuit-display.new-circuit.msg=Bila Anda tidak berhasil terhubung ke situs web yang Anda coba kunjungi atau situs web tersebut tidak memuat dengan benar, maka Anda bisa menggunakan tombol ini untuk membuka ulang situs tersebut dengan sirkuit baru. diff --git a/src/chrome/locale/is/aboutTBUpdate.dtd b/src/chrome/locale/is/aboutTBUpdate.dtd index aba97757..a23e06dd 100644 --- a/src/chrome/locale/is/aboutTBUpdate.dtd +++ b/src/chrome/locale/is/aboutTBUpdate.dtd @@ -7,4 +7,4 @@ <!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> <!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> -<!ENTITY aboutTBUpdate.learnMore "Learn More"> +<!ENTITY aboutTBUpdate.learnMore "Fræðast frekar"> diff --git a/src/chrome/locale/is/aboutTor.dtd b/src/chrome/locale/is/aboutTor.dtd index 03c443cb..0a259108 100644 --- a/src/chrome/locale/is/aboutTor.dtd +++ b/src/chrome/locale/is/aboutTor.dtd @@ -7,7 +7,7 @@ <!ENTITY aboutTor.title "Um Tor"> <!ENTITY aboutTor.ready.label "Vafraðu í friði fyrir hnýsni."> -<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> +<!ENTITY aboutTor.ready2.label "Nú ertu tilbúin(n) fyrir mestu fáanlegu vernd við vafur á netinu."> <!ENTITY aboutTor.failure.label "Eitthvað fór úrskeiðis!"> <!ENTITY aboutTor.failure2.label "Tor virkar ekki í þessum vafra."> @@ -20,9 +20,9 @@ <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> <!ENTITY aboutTor.torbrowser_user_manual.label "Notendahandbók Tor-vafrans"> -<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding."> +<!ENTITY aboutTor.tor_mission.label "Tor-verkefnið er skráð sem bandarísk US 501(c)(3) sjálfboðaliðasamtök án gróðamarkmiða, samtök sem hafa mannréttindi og frelsi að leiðarljósi og stefna að þeim markmiðum með gerð og útbreiðslu á tækni til verndar persónuupplýsinga. Sú tækni eigi að vera öllum frjáls og heimil til notkunar, vera opin til skoðunar, enda sé eitt markmiðanna að stuðla að bættum almennum og vísindalegum skilningi á þessum málum."> <!ENTITY aboutTor.getInvolved.label "Taktu þátt »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> -<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> +<!ENTITY aboutTor.newsletter.tagline "Fáðu nýjustu fréttir af Tor beint í pósthólfið þitt."> +<!ENTITY aboutTor.newsletter.link_text "Skráðu þig til að fá Tor-fréttir."> diff --git a/src/chrome/locale/it/browserOnboarding.properties b/src/chrome/locale/it/browserOnboarding.properties index 304c84d3..e15164f4 100644 --- a/src/chrome/locale/it/browserOnboarding.properties +++ b/src/chrome/locale/it/browserOnboarding.properties @@ -3,52 +3,52 @@ # vim: set sw=2 sts=2 ts=8 et: onboarding.tour-tor-welcome=Benvenuto -onboarding.tour-tor-welcome.title=You’re ready. -onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. +onboarding.tour-tor-welcome.title=Sei pronto. +onboarding.tour-tor-welcome.description=Tor Browser offre il più alto standard di privacy e sicurezza nella navigazione del web. Sei ora protetto dal tracciamento, dalla sorveglianza e dalla censura. Questa rapida panoramica ti mostrerà come. onboarding.tour-tor-welcome.button=Inizia ora onboarding.tour-tor-privacy=Privacy -onboarding.tour-tor-privacy.title=Snub trackers and snoopers. -onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. -onboarding.tour-tor-privacy.button=Go to Tor Network +onboarding.tour-tor-privacy.title=Affronta tracciatori e ficcanaso. +onboarding.tour-tor-privacy.description=Tor Browser isola i cookie ed elimina la cronologia del browser dopo la tua sessione. Queste modifiche assicurano che la tua privacy e sicurezza siano protette nel browser. Clicca ‘Rete Tor’ per sapere come ti proteggiamo a livello di rete. +onboarding.tour-tor-privacy.button=Vai alla rete Tor -onboarding.tour-tor-network=Tor Network -onboarding.tour-tor-network.title=Travel a decentralized network. -onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. -onboarding.tour-tor-network.button=Go to Circuit Display +onboarding.tour-tor-network=Rete Tor +onboarding.tour-tor-network.title=Percorri una rete decentralizzata. +onboarding.tour-tor-network.description=Tor Browser ti connette alla rete Tor gestita da migliaia di volontari in tutto il mondo. Diversamente dalle VPN, non c'è nessun punto di fallimento o entità centralizzata di cui ti devi fidare per goderti internet privatamente. +onboarding.tour-tor-network.button=Visualizza il circuito -onboarding.tour-tor-circuit-display=Circuit Display -onboarding.tour-tor-circuit-display.title=See your path. -onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. -onboarding.tour-tor-circuit-display.button=See My Path +onboarding.tour-tor-circuit-display=Visualizzazione circuito +onboarding.tour-tor-circuit-display.title=Vedi il tuo percorso. +onboarding.tour-tor-circuit-display.description=Per ogni dominio che visiti, il tuo traffico è inoltrato e criptato in un circuito attraverso tre relay Tor sparsi nel mondo. Nessun sito sa da dove ti stai connettendo. Puoi richiedere un nuovo circuito cliccando ‘Nuovo circuito per questo sito’ nella visualizzazione del circuito. +onboarding.tour-tor-circuit-display.button=Vedi il mio percorso onboarding.tour-tor-security=Sicurezza -onboarding.tour-tor-security.title=Choose your experience. -onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. -onboarding.tour-tor-security.button=Review Settings +onboarding.tour-tor-security.title=Scegli la tua esperienza. +onboarding.tour-tor-security.description=Ti forniamo anche impostazioni aggiuntive per aumentare la sicurezza del tuo browser. Le nostre impostazioni di sicurezza ti permettono di bloccare elementi che potrebbero essere utilizzati per attaccare il tuo computer. Clicca qui sotto per vedere cosa fanno le diverse opzioni. +onboarding.tour-tor-security.button=Valuta le impostazioni -onboarding.tour-tor-expect-differences=Experience Tips -onboarding.tour-tor-expect-differences.title=Expect some differences. -onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-expect-differences=Consigli per l'esperienza +onboarding.tour-tor-expect-differences.title=Aspettati delle differenze. +onboarding.tour-tor-expect-differences.description=Con tutte le caratteristiche di sicurezza e privacy fornite da Tor, la tua esperienza di navigazione in internet può essere un po' diversa. Le cose possono essere un po' più lente e, a seconda del tuo livello di sicurezza, alcuni elementi potrebbero non funzionare o caricarsi. Potrebbe anche esserti chiesto di dimostrare di essere umano e non un robot. +onboarding.tour-tor-expect-differences.button=Vedi le FAQ onboarding.tour-tor-onion-services=Servizi Onion -onboarding.tour-tor-onion-services.title=Be extra protected. -onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. -onboarding.tour-tor-onion-services.button=Visit an Onion +onboarding.tour-tor-onion-services.title=Sii super protetto. +onboarding.tour-tor-onion-services.description=I servizi onion sono siti che terminano con .onion che forniscono protezioni extra ad editori e visitatori, incluse ulteriori salvaguardie contro la censura. I servizi onion consentono a chiunque di fornire contenuti e servizi in forma anonima. Clicca qui sotto per visitare il sito onion di DuckDuckGo. +onboarding.tour-tor-onion-services.button=Visita una Cipolla # Circuit Display onboarding. onboarding.tor-circuit-display.next=Successivo onboarding.tor-circuit-display.done=Fatto -onboarding.tor-circuit-display.one-of-three=1 of 3 -onboarding.tor-circuit-display.two-of-three=2 of 3 -onboarding.tor-circuit-display.three-of-three=3 of 3 +onboarding.tor-circuit-display.one-of-three=1 di 3 +onboarding.tor-circuit-display.two-of-three=2 di 3 +onboarding.tor-circuit-display.three-of-three=3 di 3 -onboarding.tor-circuit-display.intro.title=How do circuits work? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.title=Come funzionano i circuiti? +onboarding.tor-circuit-display.intro.msg=I circuiti sono costituiti da relay assegnati casualmente, che sono computer di tutto il mondo configurati per inoltrare il traffico Tor. I circuiti consentono di navigare privatamente e di connettersi ai servizi onion. -onboarding.tor-circuit-display.diagram.title=Circuit Display -onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. +onboarding.tor-circuit-display.diagram.title=Visualizzazione circuito +onboarding.tor-circuit-display.diagram.msg=Questo diagramma mostra i relay che compongono il circuito di questo sito. Per evitare il collegamento di attività tra siti diversi, ogni sito web riceve un circuito diverso. -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? -onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. +onboarding.tor-circuit-display.new-circuit.title=Ti serve un nuovo circuito? +onboarding.tor-circuit-display.new-circuit.msg=Se non sei in grado di connetterti al sito che stai cercando di visitare o non si sta caricando correttamente, allora puoi usare questo pulsante per ricaricare il sito con un nuovo circuito. diff --git a/src/chrome/locale/ko/aboutTBUpdate.dtd b/src/chrome/locale/ko/aboutTBUpdate.dtd index 57e5d9af..b8b08d7b 100644 --- a/src/chrome/locale/ko/aboutTBUpdate.dtd +++ b/src/chrome/locale/ko/aboutTBUpdate.dtd @@ -5,6 +5,6 @@ <!ENTITY aboutTBUpdate.linkSuffix " "> <!ENTITY aboutTBUpdate.changeLogHeading "변경사항:"> -<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> -<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> -<!ENTITY aboutTBUpdate.learnMore "Learn More"> +<!ENTITY aboutTBUpdate.circuitDisplayHeading "서킷 표시가 일신하고 재설계했습니다"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "Tor 서킷 표시를 이전하고 개량했습니다! 새 서킷 표시를 보려고 Site Identity 버튼 (URL 막대의 왼쪽) 클릭하십시오."> +<!ENTITY aboutTBUpdate.learnMore "더 알아보기"> diff --git a/src/chrome/locale/ko/aboutTor.dtd b/src/chrome/locale/ko/aboutTor.dtd index 4dd465ad..74bc503e 100644 --- a/src/chrome/locale/ko/aboutTor.dtd +++ b/src/chrome/locale/ko/aboutTor.dtd @@ -24,5 +24,5 @@ <!ENTITY aboutTor.getInvolved.label "참여 »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> -<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> +<!ENTITY aboutTor.newsletter.tagline "최신의 Tor 뉴스를 받은 편지함에 곧장 받으십시오."> +<!ENTITY aboutTor.newsletter.link_text "Tor 뉴스를 구독."> diff --git a/src/chrome/locale/nb/browserOnboarding.properties b/src/chrome/locale/nb/browserOnboarding.properties index cf2a005a..09b36334 100644 --- a/src/chrome/locale/nb/browserOnboarding.properties +++ b/src/chrome/locale/nb/browserOnboarding.properties @@ -2,17 +2,17 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -onboarding.tour-tor-welcome=Welcome -onboarding.tour-tor-welcome.title=You’re ready. -onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. -onboarding.tour-tor-welcome.button=Start Now +onboarding.tour-tor-welcome=Velkommen +onboarding.tour-tor-welcome.title=Du er klar. +onboarding.tour-tor-welcome.description=Tor Nettleser tilbyr den høyeste standarden på personvern og sikkerhet mens du surfer på nettet. Du er nå beskyttet mot sporing, overvåkning og sensur. Denne raske onboarding vil vise deg hvordan. +onboarding.tour-tor-welcome.button=Start nå onboarding.tour-tor-privacy=Personvern onboarding.tour-tor-privacy.title=Snub trackers and snoopers. onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. -onboarding.tour-tor-privacy.button=Go to Tor Network +onboarding.tour-tor-privacy.button=Gå til Tor Nettverk -onboarding.tour-tor-network=Tor Network +onboarding.tour-tor-network=Tor Nettverk onboarding.tour-tor-network.title=Travel a decentralized network. onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. onboarding.tour-tor-network.button=Go to Circuit Display @@ -20,35 +20,35 @@ onboarding.tour-tor-network.button=Go to Circuit Display onboarding.tour-tor-circuit-display=Circuit Display onboarding.tour-tor-circuit-display.title=See your path. onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. -onboarding.tour-tor-circuit-display.button=See My Path +onboarding.tour-tor-circuit-display.button=Se Min Vei onboarding.tour-tor-security=Sikkerhet -onboarding.tour-tor-security.title=Choose your experience. +onboarding.tour-tor-security.title=Velg din opplevelse. onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. onboarding.tour-tor-security.button=Review Settings onboarding.tour-tor-expect-differences=Experience Tips -onboarding.tour-tor-expect-differences.title=Expect some differences. -onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-expect-differences.title=Forvent noen forskjeller. +onboarding.tour-tor-expect-differences.description=Med alle de sikkerhets og personvernfunksjonene som Tor leverer, kan din erfaring mens du surfer på Internett, være litt annerledes. Det kan være litt tregere, og avhengig av sikkerhetsnivået, kan noen elementer ikke fungere eller lastes. Du kan også bli bedt om å bevise at du er et menneske og ikke en robot. +onboarding.tour-tor-expect-differences.button=se FAQs onboarding.tour-tor-onion-services=Løk-tjenester -onboarding.tour-tor-onion-services.title=Be extra protected. -onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. -onboarding.tour-tor-onion-services.button=Visit an Onion +onboarding.tour-tor-onion-services.title=Vær ekstra beskyttet. +onboarding.tour-tor-onion-services.description=Onion tjenester er nettsteder som slutter med en .onion som gir ekstra beskyttelse til utgivere og besøkende, inkludert ekstra sikkerhetskontroll mot sensur. Onion tjenester tillater alle å gi innhold og tjenester anonymt. Klikk nedenfor for å besøke DuckDuckGo-onionstedet. +onboarding.tour-tor-onion-services.button=Besøk en Onion # Circuit Display onboarding. onboarding.tor-circuit-display.next=Neste onboarding.tor-circuit-display.done=Ferdig -onboarding.tor-circuit-display.one-of-three=1 of 3 -onboarding.tor-circuit-display.two-of-three=2 of 3 -onboarding.tor-circuit-display.three-of-three=3 of 3 +onboarding.tor-circuit-display.one-of-three=1 av 3 +onboarding.tor-circuit-display.two-of-three=2 av 3 +onboarding.tor-circuit-display.three-of-three=3 av 3 -onboarding.tor-circuit-display.intro.title=How do circuits work? +onboarding.tor-circuit-display.intro.title=Hvordan fungerer kretser? onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. onboarding.tor-circuit-display.diagram.title=Circuit Display onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? +onboarding.tor-circuit-display.new-circuit.title=Trenger du en ny krets? onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. diff --git a/src/chrome/locale/pt-BR/aboutTBUpdate.dtd b/src/chrome/locale/pt-BR/aboutTBUpdate.dtd index 2c2cff6f..d349e8ad 100644 --- a/src/chrome/locale/pt-BR/aboutTBUpdate.dtd +++ b/src/chrome/locale/pt-BR/aboutTBUpdate.dtd @@ -5,6 +5,6 @@ <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Registro de modificações:"> -<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> -<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> +<!ENTITY aboutTBUpdate.circuitDisplayHeading "Novo display de circuito reprojetado"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "O display do circuito Tor foi realocado e melhorado! Clique no Site botão de identidade (localizado no lado esquerdo da barra de URL) para ver o novo display do circuito."> <!ENTITY aboutTBUpdate.learnMore "Saiba Mais"> diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd b/src/chrome/locale/pt-BR/aboutTor.dtd index 0b87ad28..44435395 100644 --- a/src/chrome/locale/pt-BR/aboutTor.dtd +++ b/src/chrome/locale/pt-BR/aboutTor.dtd @@ -6,7 +6,7 @@ <!ENTITY aboutTor.title "Sobre Tor"> -<!ENTITY aboutTor.ready.label "Explore. Privately."> +<!ENTITY aboutTor.ready.label "Explorar. Em particular."> <!ENTITY aboutTor.ready2.label "Você está pronto para a maior experiência de navegação privada do mundo."> <!ENTITY aboutTor.failure.label "Alguma coisa deu errado!"> <!ENTITY aboutTor.failure2.label "Tor não está funcionando neste navegador. "> diff --git a/src/chrome/locale/pt-BR/browserOnboarding.properties b/src/chrome/locale/pt-BR/browserOnboarding.properties index 075ee3ac..b4d4fc8c 100644 --- a/src/chrome/locale/pt-BR/browserOnboarding.properties +++ b/src/chrome/locale/pt-BR/browserOnboarding.properties @@ -3,52 +3,52 @@ # vim: set sw=2 sts=2 ts=8 et: onboarding.tour-tor-welcome=Bem Vindo -onboarding.tour-tor-welcome.title=You’re ready. -onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. -onboarding.tour-tor-welcome.button=Start Now +onboarding.tour-tor-welcome.title=Você está pronto. +onboarding.tour-tor-welcome.description=O Tor Browser oferece o mais elevado padrão de privacidade e segurança para navegação na web. Você, agora, está protegido contra rastreamento, vigilância e censura. Esta rápida abordagem mostrará como ele faz isso. +onboarding.tour-tor-welcome.button=Comece agora. onboarding.tour-tor-privacy=Privacidade -onboarding.tour-tor-privacy.title=Snub trackers and snoopers. -onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. -onboarding.tour-tor-privacy.button=Go to Tor Network +onboarding.tour-tor-privacy.title=Despiste rastreadores e xeretas. +onboarding.tour-tor-privacy.description=O navegador Tor isola cookies e deleta o histórico de navegação do browser depois de finalizada sua seção. Estas modificações garantem que sua privacidade e segurança estão protegidas no browser. Clique em 'Rede Tor' para aprender como nós lhe protegemos ao nível de rede. +onboarding.tour-tor-privacy.button=Vá para a Rede Tor. -onboarding.tour-tor-network=Tor Network -onboarding.tour-tor-network.title=Travel a decentralized network. -onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. -onboarding.tour-tor-network.button=Go to Circuit Display +onboarding.tour-tor-network=Rede Tor +onboarding.tour-tor-network.title=Viaje por uma rede descentralizada. +onboarding.tour-tor-network.description=O Tor Browser conecta você à rede Tor, composta por milhares de voluntários ao redor do mundo. Diferente de uma VPN, não há uma entidade ou ponto de falha central em que você precisa confiar para desfrutar da internet com privacidade. +onboarding.tour-tor-network.button=Vá para a Exibição de Circuitos -onboarding.tour-tor-circuit-display=Circuit Display -onboarding.tour-tor-circuit-display.title=See your path. -onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. -onboarding.tour-tor-circuit-display.button=See My Path +onboarding.tour-tor-circuit-display=Exibição de Circuitos +onboarding.tour-tor-circuit-display.title=Veja o seu caminho. +onboarding.tour-tor-circuit-display.description=A cada domínio que você visita, o seu tráfego de internet é retransmitido e criptografado através de três retransmissores Tor em diversas partes do mundo. Nenhum website saberá a partir de onde você se conectou a ele. Você pode solicitar um novo circuito a qualquer momento clicando em "Novo Circuito para este Site" em nossa Exibição de Circuitos. +onboarding.tour-tor-circuit-display.button=Ver Meu Caminho onboarding.tour-tor-security=Segurança -onboarding.tour-tor-security.title=Choose your experience. -onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. -onboarding.tour-tor-security.button=Review Settings +onboarding.tour-tor-security.title=Escolha sua experiência. +onboarding.tour-tor-security.description=Nós também fornecemos a você configurações adicionais para aumentar a segurança do seu browser. Nossas Configurações de Segurança permitem você bloquear elementos que podem ser utilizados para atacar o seu computador. Clique abaixo para ver o que as diferentes opções fazem. +onboarding.tour-tor-security.button=Reveja Configurações -onboarding.tour-tor-expect-differences=Experience Tips -onboarding.tour-tor-expect-differences.title=Expect some differences. -onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-expect-differences=Dicas de Experiência +onboarding.tour-tor-expect-differences.title=Espere algumas diferenças. +onboarding.tour-tor-expect-differences.description=Com toda segurança e funcionalidades de privacidade fornecidos pelo Tor, sua experiência na utilização da internet pode ser um pouco diferente. As coisas podem ficar um pouco mais devagar, e dependendo do seu nível de segurança alguns elementos podem não funcionar ou serem carregados. Você também poderá ser questionado a provar que é um humano e não um robô. +onboarding.tour-tor-expect-differences.button=Veja FAQs onboarding.tour-tor-onion-services=Serviços Onion -onboarding.tour-tor-onion-services.title=Be extra protected. -onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. -onboarding.tour-tor-onion-services.button=Visit an Onion +onboarding.tour-tor-onion-services.title=Fique extra protegido. +onboarding.tour-tor-onion-services.description=Serviços Onion são sites que terminam com .onion e que fornecem proteções extras para editores e visitantes, incluindo proteções adicionais contra censura. Serviços Onion permitem que qualquer um forneça conteúdo e serviços anonimamente. Clique abaixo para visitar o site onion DuckDuckGo. +onboarding.tour-tor-onion-services.button=Visitar um endereço Onion # Circuit Display onboarding. onboarding.tor-circuit-display.next=Próximo onboarding.tor-circuit-display.done=Feito -onboarding.tor-circuit-display.one-of-three=1 of 3 -onboarding.tor-circuit-display.two-of-three=2 of 3 -onboarding.tor-circuit-display.three-of-three=3 of 3 +onboarding.tor-circuit-display.one-of-three=1 de 3 +onboarding.tor-circuit-display.two-of-three=2 de 3 +onboarding.tor-circuit-display.three-of-three=3 de 3 -onboarding.tor-circuit-display.intro.title=How do circuits work? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.title=Como circuitos funcionam ? +onboarding.tor-circuit-display.intro.msg=Circuitos são compostos de relés designados aleatoriamente, que são computadores ao redor do mundo, configurados para encaminhar o tráfico Tor. Circuitos permitem que você navegue privadamente e se conecte a serviços onion. -onboarding.tor-circuit-display.diagram.title=Circuit Display -onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. +onboarding.tor-circuit-display.diagram.title=Exibição de Circuitos +onboarding.tor-circuit-display.diagram.msg=Este diagrama mostra os retransmissores que compõem o circuito para este website. Para evitar a correlação de atividade entre sites diferentes, cada website recebe um novo circuito diferente do anterior. -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? -onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. +onboarding.tor-circuit-display.new-circuit.title=Você precisa de um novo circuito ? +onboarding.tor-circuit-display.new-circuit.msg=Se você estiver impossibilitado de conectar-se ao site que está tentando visitar ou este não está sendo carregado corretamente, então você pode utilizar este botão para recarregar o site em um novo circuito. diff --git a/src/chrome/locale/ru/aboutTBUpdate.dtd b/src/chrome/locale/ru/aboutTBUpdate.dtd index 3c9466ca..81d607ca 100644 --- a/src/chrome/locale/ru/aboutTBUpdate.dtd +++ b/src/chrome/locale/ru/aboutTBUpdate.dtd @@ -5,6 +5,6 @@ <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Журнал изменений:"> -<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> -<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> -<!ENTITY aboutTBUpdate.learnMore "Learn More"> +<!ENTITY aboutTBUpdate.circuitDisplayHeading "Новая, измененная Схема индикации"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "Схема индикации Tor была перемещена и улучшена! Нажмите на сайт кнопка идентификации (расположенную в левой части строки URL), чтобы увидеть новый вид схемы."> +<!ENTITY aboutTBUpdate.learnMore "Подробнее"> diff --git a/src/chrome/locale/ru/browserOnboarding.properties b/src/chrome/locale/ru/browserOnboarding.properties index e9237ce7..678da90e 100644 --- a/src/chrome/locale/ru/browserOnboarding.properties +++ b/src/chrome/locale/ru/browserOnboarding.properties @@ -3,23 +3,23 @@ # vim: set sw=2 sts=2 ts=8 et: onboarding.tour-tor-welcome=Добро пожаловать -onboarding.tour-tor-welcome.title=You’re ready. -onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. -onboarding.tour-tor-welcome.button=Start Now +onboarding.tour-tor-welcome.title=Вы готовы. +onboarding.tour-tor-welcome.description=Tor Browser предоставляет высочайший стандарт приватности и безопасности при просмотре сайтов. Теперь вы защищены от слежки, наблюдения и цензуры. Сейчас покажем вам, что к чему. +onboarding.tour-tor-welcome.button=Запустить onboarding.tour-tor-privacy=Приватность -onboarding.tour-tor-privacy.title=Snub trackers and snoopers. -onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. -onboarding.tour-tor-privacy.button=Go to Tor Network - -onboarding.tour-tor-network=Tor Network -onboarding.tour-tor-network.title=Travel a decentralized network. -onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. -onboarding.tour-tor-network.button=Go to Circuit Display - -onboarding.tour-tor-circuit-display=Circuit Display -onboarding.tour-tor-circuit-display.title=See your path. -onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. +onboarding.tour-tor-privacy.title=Следопыты и ищейки. +onboarding.tour-tor-privacy.description=Tor Browser изолирует cookies и удалет историю просмотров после завершения сессии. Эти меры обеспечивают вашу приватность и безопасность. Нажмите ‘Сеть Tor’ чтобы узнать, как мы защищаем вас на сетевом уровне. +onboarding.tour-tor-privacy.button=Перейти в Сеть Tor + +onboarding.tour-tor-network=Сеть Tor +onboarding.tour-tor-network.title=Перемещайтесь по децентрализованной сети. +onboarding.tour-tor-network.description=Tor Browser подключает вас к сети Tor, поддерживаемая волонтерами со всего мира. В отличии от VPN, здесь исключены возможные слабые звенья или централизованные организации, которым вам необходимо довериться для использования интернета. +onboarding.tour-tor-network.button=Перейти в Просмотр Цепочки + +onboarding.tour-tor-circuit-display=Просмотр Цепочки +onboarding.tour-tor-circuit-display.title=Ваша цепочка. +onboarding.tour-tor-circuit-display.description=Для каждого посещаемого вами домена ваш трафик передается и шифруется в цепочке через три ретранслятора Tor, разбросанных по всему миру. Ни одному вебсайту недоступно ваша точка подключения сети. Вы можете запросить новую цепочку, нажав на ‘Новая Цепочка для этого сайта’ в ‘Просмотре Цепочки’ . onboarding.tour-tor-circuit-display.button=See My Path onboarding.tour-tor-security=Безопасность @@ -47,7 +47,7 @@ onboarding.tor-circuit-display.three-of-three=3 of 3 onboarding.tor-circuit-display.intro.title=How do circuits work? onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. -onboarding.tor-circuit-display.diagram.title=Circuit Display +onboarding.tor-circuit-display.diagram.title=Просмотр Цепочки onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? diff --git a/src/chrome/locale/tr/browserOnboarding.properties b/src/chrome/locale/tr/browserOnboarding.properties index 9413168c..219f3037 100644 --- a/src/chrome/locale/tr/browserOnboarding.properties +++ b/src/chrome/locale/tr/browserOnboarding.properties @@ -2,53 +2,53 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -onboarding.tour-tor-welcome=Courier'a -onboarding.tour-tor-welcome.title=You’re ready. -onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. -onboarding.tour-tor-welcome.button=Start Now - -onboarding.tour-tor-privacy=Gizlilik -onboarding.tour-tor-privacy.title=Snub trackers and snoopers. -onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. -onboarding.tour-tor-privacy.button=Go to Tor Network - -onboarding.tour-tor-network=Tor Network -onboarding.tour-tor-network.title=Travel a decentralized network. -onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. -onboarding.tour-tor-network.button=Go to Circuit Display - -onboarding.tour-tor-circuit-display=Circuit Display -onboarding.tour-tor-circuit-display.title=See your path. -onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. -onboarding.tour-tor-circuit-display.button=See My Path +onboarding.tour-tor-welcome=Hoş Geldiniz +onboarding.tour-tor-welcome.title=Hazırsınız. +onboarding.tour-tor-welcome.description=Tor Browser, web üzerinde gezinirken en yükek standartlarda kişisel gizlilik ve güvelik sağlar. İzleme, gözetleme ve engellemeye karşı koruma sağlar. Nasıl olduğunu buradan hızlıca görebilirsiniz. +onboarding.tour-tor-welcome.button=Başlayın + +onboarding.tour-tor-privacy=Kişisel Gizlilik +onboarding.tour-tor-privacy.title=İzleyenlere ve meraklılara hadlerini bildirin. +onboarding.tour-tor-privacy.description=Tor Browser çerezleri yalıtır ve kapattıığınızda web tarayıcı geçmişinizi siler. Bu değişiklikler web tarayıcı üzerinde kişisel gizliliğinizin ve güvenliğinizin korunmasını sağlar. Ağ düzeyinde nasıl koruma sağladığımızı öğrenmek için 'Tor Ağo' üzerine tıklayın. +onboarding.tour-tor-privacy.button=Tor Ağına Geç + +onboarding.tour-tor-network=Tor Ağı +onboarding.tour-tor-network.title=Tek merkezden yönetilmeyen bir ağda gezinin. +onboarding.tour-tor-network.description=Tor Browser sizi tüm dünyada binlerce gönüllü tarafından işletilen Tor Ağına bağlar. VPN bağlantısının aksine güvenlik açığı oluşturacak bir nokta ya da İnternet üzerinde kişisel gizliliğinizi koruyarak gezinmeniz için güvenmeniz gereken merkezi bir kuruluş yoktur. +onboarding.tour-tor-network.button=Devre Görünümüne Geç + +onboarding.tour-tor-circuit-display=Devre Görünümü +onboarding.tour-tor-circuit-display.title=Yolunuzu görün. +onboarding.tour-tor-circuit-display.description=Ziyaret ettiğiniz her web sitesi için bağlantınız dünya üzerindeki üç Tor aktarıcısından oluşan bir devreden şifrelenir ve aktarılır. Hiç bir web sitesi sizin gerçekte nereden bağlandığınızı bilemez. Kullandığınız devreyi değiştirmek için Devre Görünümünde "Bu Sitenin Devresini Yenile" üzerine tıklayın. +onboarding.tour-tor-circuit-display.button=Yolumu Göster onboarding.tour-tor-security=Güvenlik -onboarding.tour-tor-security.title=Choose your experience. -onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. -onboarding.tour-tor-security.button=Review Settings +onboarding.tour-tor-security.title=Deneyiminizi özelleştirin. +onboarding.tour-tor-security.description=Ek ayarları kullanarak web tarayıcınızın güvenliğini arttırabilirsiniz. Güvenlik Ayarlarımız bilgisayarınıza saldırmak için kullanılabilecek bileşenleri engellemenizi sağlar. Seçeneklerinizi görebilmek için aşağıya tıklayın. +onboarding.tour-tor-security.button=Ayarları Gözden Geçir -onboarding.tour-tor-expect-differences=Experience Tips -onboarding.tour-tor-expect-differences.title=Expect some differences. -onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-expect-differences=Deneyim İpuçları +onboarding.tour-tor-expect-differences.title=Bazı farklılıklara açık olun. +onboarding.tour-tor-expect-differences.description=Tor tarafından sağlanan tüm kişisel gizlilik ve güvenlik özellikleri nedeniyle İnternet üzerinde gezinme deneyiminiz biraz farklı olabilir. Sayfalar biraz yavaş olabilir ve kullandığınız güvenlik düzeyine göre bazı bileşenler yüklenmeyebilir ya da çalışmayabilir. Ayrıca bir insan mı robot mu olduğunuzu kanıtlamanız istenebilir. +onboarding.tour-tor-expect-differences.button=Sık Sorulan Sorulara Bakın onboarding.tour-tor-onion-services=Onion Hizmetleri -onboarding.tour-tor-onion-services.title=Be extra protected. -onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. -onboarding.tour-tor-onion-services.button=Visit an Onion +onboarding.tour-tor-onion-services.title=Ek koruma sağlayın. +onboarding.tour-tor-onion-services.description=Onion hizmetleri, yayıncılar ile ziyaretçiler için ek güvenlik ve engellemeleri aşmak için koruma sağlayan, sonu .onion uzantısı ile biten web siteleridir. Onion hizmetleri sayesinde isteyen herkes anonim olarak içerik ve hizmet sunabilir. DuckDuckGo onion sitesini ziyaret etmek için aşağıya tıklayabilirsiniz. +onboarding.tour-tor-onion-services.button=Bir Onion Sitesine Gidin # Circuit Display onboarding. onboarding.tor-circuit-display.next=Sonraki onboarding.tor-circuit-display.done=Bitti -onboarding.tor-circuit-display.one-of-three=1 of 3 -onboarding.tor-circuit-display.two-of-three=2 of 3 -onboarding.tor-circuit-display.three-of-three=3 of 3 +onboarding.tor-circuit-display.one-of-three=1 / 3 +onboarding.tor-circuit-display.two-of-three=2 / 3 +onboarding.tor-circuit-display.three-of-three=3 / 3 -onboarding.tor-circuit-display.intro.title=How do circuits work? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.title=Devreler nasıl çalışır? +onboarding.tor-circuit-display.intro.msg=Devreler, dünya çapında Tor trafiğini aktarmak üzere yapılandırılmış bilgisayarlar olan rastgele atanmış aktarıcılardan oluşur. Devreler, kişisel gizliliğinizi koruyarak gezinmenizi ve onion hizmetlerine bağlanmanızı sağlar. -onboarding.tor-circuit-display.diagram.title=Circuit Display -onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. +onboarding.tor-circuit-display.diagram.title=Devre Görünümü +onboarding.tor-circuit-display.diagram.msg=Bu web sitesinin devresinde kullanılan aktarıcılar bu şemada görülebilir. Farklı web siteleri arasında yapılan işlemler arasında bağlantı kurulmasını engellemek için her web sitesinde farklı bir devre kullanılır. -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? -onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. +onboarding.tor-circuit-display.new-circuit.title=Yeni bir devre mi gerekli? +onboarding.tor-circuit-display.new-circuit.msg=Ziyaret etmeye çalıştığınız web sitesine bağlanamıyorsanız ya da site düzgün bir şekilde yüklenmiyorsa, siteyi yeni bir devre kullanarak yeniden yüklemek için bu düğmeyi kullanabilirsiniz. diff --git a/src/chrome/locale/zh-CN/aboutTBUpdate.dtd b/src/chrome/locale/zh-CN/aboutTBUpdate.dtd index a2cda6c6..2e14767d 100644 --- a/src/chrome/locale/zh-CN/aboutTBUpdate.dtd +++ b/src/chrome/locale/zh-CN/aboutTBUpdate.dtd @@ -5,6 +5,6 @@ <!ENTITY aboutTBUpdate.linkSuffix "。"> <!ENTITY aboutTBUpdate.changeLogHeading "更新日志："> -<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> -<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> -<!ENTITY aboutTBUpdate.learnMore "Learn More"> +<!ENTITY aboutTBUpdate.circuitDisplayHeading "重新设计的全新线路显示"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "Tor 线路显示移动了位置而且更进一步，点击站点与身份按钮（在地址栏的左边）来查看新的线路显示界面。"> +<!ENTITY aboutTBUpdate.learnMore "了解更多"> diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd index bcf5b05f..36e9b9a5 100644 --- a/src/chrome/locale/zh-CN/aboutTor.dtd +++ b/src/chrome/locale/zh-CN/aboutTor.dtd @@ -20,7 +20,7 @@ <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> <!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser 用户手册"> -<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding."> +<!ENTITY aboutTor.tor_mission.label "The Tor Project 是一家美国 501(c)(3) 非营利机构，致力于通过开发和部署自由且开放源代码的匿名和隐私技术，为其不受限制的可用性和使用提供支持，促进其在科研领域和大众的知名度来支持人权和自由。"> <!ENTITY aboutTor.getInvolved.label "参与进来 »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> diff --git a/src/chrome/locale/zh-CN/browserOnboarding.properties b/src/chrome/locale/zh-CN/browserOnboarding.properties index 17d74bcc..47587585 100644 --- a/src/chrome/locale/zh-CN/browserOnboarding.properties +++ b/src/chrome/locale/zh-CN/browserOnboarding.properties @@ -3,52 +3,52 @@ # vim: set sw=2 sts=2 ts=8 et: onboarding.tour-tor-welcome=欢迎 -onboarding.tour-tor-welcome.title=You’re ready. -onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. -onboarding.tour-tor-welcome.button=Start Now +onboarding.tour-tor-welcome.title=一切就绪。 +onboarding.tour-tor-welcome.description=Tor Browser 在浏览互联网中提供最高标准的隐私和安全保护，帮助你对抗跟踪、监控和审查。这个快速指南会向你介绍我们是怎样做的。 +onboarding.tour-tor-welcome.button=开始了解 onboarding.tour-tor-privacy=隐私 -onboarding.tour-tor-privacy.title=Snub trackers and snoopers. -onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. -onboarding.tour-tor-privacy.button=Go to Tor Network +onboarding.tour-tor-privacy.title=拒绝跟踪和嗅探。 +onboarding.tour-tor-privacy.description=Tor Browser 会隔离 Cookie ，并在你浏览结束时删除 Cookies 和历史记录。这些修改保证了你的安全和隐私在浏览过程中收到保护。点击 ’Tor 网络‘ 了解我们如何在网络层级进行保护。 +onboarding.tour-tor-privacy.button=前往 ’Tor 网络‘ -onboarding.tour-tor-network=Tor Network -onboarding.tour-tor-network.title=Travel a decentralized network. -onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. -onboarding.tour-tor-network.button=Go to Circuit Display +onboarding.tour-tor-network=Tor 网络 +onboarding.tour-tor-network.title=通过非中心化的网络进行浏览。 +onboarding.tour-tor-network.description=Tor Browser 将你和世界数千名志愿者支持的 Tor 网络相连。和 VPN 不同的是，这里不会有单点故障，也不需要你为了私密浏览信任某一个中心化的实体。 +onboarding.tour-tor-network.button=前往 ’显示链路' -onboarding.tour-tor-circuit-display=Circuit Display -onboarding.tour-tor-circuit-display.title=See your path. -onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. -onboarding.tour-tor-circuit-display.button=See My Path +onboarding.tour-tor-circuit-display=显示链路 +onboarding.tour-tor-circuit-display.title=查看你的路径。 +onboarding.tour-tor-circuit-display.description=当你每次访问一个域名的时候，你的流量会加密的通过遍及各地的三个 Tor 中继。因此网站无法知道你来自何处。你也可以在显示链路窗口中点击 ‘为此网站使用新链路’ 来请求一个新的链路。 +onboarding.tour-tor-circuit-display.button=查看我的路径。 onboarding.tour-tor-security=安全 -onboarding.tour-tor-security.title=Choose your experience. -onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. -onboarding.tour-tor-security.button=Review Settings +onboarding.tour-tor-security.title=自定你的浏览体验。 +onboarding.tour-tor-security.description=我们也提供更多选项来进一步强化 Tor Browser 的安全性。安全设置可以允许你屏蔽可能会被用于攻击你的电脑的元素。点击下方的按钮来了解不同的选项的作用。 +onboarding.tour-tor-security.button=检查设置 -onboarding.tour-tor-expect-differences=Experience Tips -onboarding.tour-tor-expect-differences.title=Expect some differences. -onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-expect-differences=浏览提示 +onboarding.tour-tor-expect-differences.title=可能会有些不同。 +onboarding.tour-tor-expect-differences.description=在由 Tor 提供的安全和隐私功能的加持下，你浏览互联网的体验可能会有些不同。例如加载速度变慢，根据你的安全设置的不同，网站上的某些元素可能无法工作或加载。你也许会被更频繁的要求完成验证以确认你不是机器人。 +onboarding.tour-tor-expect-differences.button=查阅常见问题和解答 onboarding.tour-tor-onion-services=洋葱服务 -onboarding.tour-tor-onion-services.title=Be extra protected. -onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. -onboarding.tour-tor-onion-services.button=Visit an Onion +onboarding.tour-tor-onion-services.title=保护，更进一步。 +onboarding.tour-tor-onion-services.description=洋葱服务是以 .onion 域名结尾的网站，可以为访问者和发布者提供额外的保护，例如对抗审查。洋葱服务允许任何人以匿名的方式提供内容和服务。点击下面的按钮来访问 DuckDuckGo 的洋葱服务网站。 +onboarding.tour-tor-onion-services.button=访问一个洋葱服务网站 # Circuit Display onboarding. onboarding.tor-circuit-display.next=下一步 onboarding.tor-circuit-display.done=完成 -onboarding.tor-circuit-display.one-of-three=1 of 3 -onboarding.tor-circuit-display.two-of-three=2 of 3 -onboarding.tor-circuit-display.three-of-three=3 of 3 +onboarding.tor-circuit-display.one-of-three=1 / 3 +onboarding.tor-circuit-display.two-of-three=2 / 3 +onboarding.tor-circuit-display.three-of-three=3 / 3 -onboarding.tor-circuit-display.intro.title=How do circuits work? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.title=链路如何工作？ +onboarding.tor-circuit-display.intro.msg=链路由从世界各地随机分配的三个转发 Tor 流量的中继组成，使你能够私密的进行浏览和连接洋葱服务。 -onboarding.tor-circuit-display.diagram.title=Circuit Display -onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. +onboarding.tor-circuit-display.diagram.title=显示链路 +onboarding.tor-circuit-display.diagram.msg=这张图展示了组成访问这个网站所使用链路的中继。为了防止不同网站间的身份关联，每一个网站都有一条不同的链路。 -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? -onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. +onboarding.tor-circuit-display.new-circuit.title=你需要一条不同的链路？ +onboarding.tor-circuit-display.new-circuit.msg=如果你无法通过当前的链路正常的连接到网站（例如网站无法打开或是加载不正确），你可以使用这个按钮来通过一条不同的链路重新加载。 diff --git a/src/chrome/locale/zh-TW/aboutTBUpdate.dtd b/src/chrome/locale/zh-TW/aboutTBUpdate.dtd index 6dc56295..d4c86ee2 100644 --- a/src/chrome/locale/zh-TW/aboutTBUpdate.dtd +++ b/src/chrome/locale/zh-TW/aboutTBUpdate.dtd @@ -5,6 +5,6 @@ <!ENTITY aboutTBUpdate.linkSuffix "。"> <!ENTITY aboutTBUpdate.changeLogHeading "變更歷史紀錄："> -<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> +<!ENTITY aboutTBUpdate.circuitDisplayHeading "新的、重新設計的迴路顯示"> <!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> -<!ENTITY aboutTBUpdate.learnMore "Learn More"> +<!ENTITY aboutTBUpdate.learnMore "了解更多"> diff --git a/src/chrome/locale/zh-TW/aboutTor.dtd b/src/chrome/locale/zh-TW/aboutTor.dtd index d0a05ffb..0e049b1b 100644 --- a/src/chrome/locale/zh-TW/aboutTor.dtd +++ b/src/chrome/locale/zh-TW/aboutTor.dtd @@ -24,5 +24,5 @@ <!ENTITY aboutTor.getInvolved.label "加入我們 »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> +<!ENTITY aboutTor.newsletter.tagline "將 Tor 的最新消息直接傳送到您的收件匣。"> <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News.">

1 0

[tor-browser/tor-browser-60.2.0esr-8.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 3b34acd2d3b755cef2fbd83ddf37545b6988eb0f Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 17 11:16:49 2018 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Fixes bug 27543 (QR code broken on web.whatsapp.com) --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 57f0be3a81f9..bc7c4b05e3a1 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -154,6 +154,9 @@ pref("dom.vr.enabled", false); // Bug 21607: Disable WebVR for now // Disable randomised Firefox HTTP cache decay user test groups (Bug: 13575) pref("security.webauth.webauthn", false); // Bug 26614: Disable Web Authentication API for now pref("browser.cache.frecency_experiment", -1); +// Until https://bugzilla.mozilla.org/show_bug.cgi?id=1446472 is solved fall +// back to old canvas behavior. +pref("privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts", false); // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation

1 0

[tor-browser/tor-browser-60.2.0esr-8.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 367ce17b735fdfa1244aa78569e16ac6c90dd746 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 17 11:16:49 2018 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Fixes bug 27543 (QR code broken on web.whatsapp.com) --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 57f0be3a81f9..bc7c4b05e3a1 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -154,6 +154,9 @@ pref("dom.vr.enabled", false); // Bug 21607: Disable WebVR for now // Disable randomised Firefox HTTP cache decay user test groups (Bug: 13575) pref("security.webauth.webauthn", false); // Bug 26614: Disable Web Authentication API for now pref("browser.cache.frecency_experiment", -1); +// Until https://bugzilla.mozilla.org/show_bug.cgi?id=1446472 is solved fall +// back to old canvas behavior. +pref("privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts", false); // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation

1 0

[torbutton/master] Bug 27427: Fix NoScript IPC for about:blank by whitelisting messages
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 8ff3b44e478ebddf5a067d796f57a353beae2af0 Author: Rusty Bird <rustybird(a)net-c.com> Date: Mon Sep 3 12:32:04 2018 +0000 Bug 27427: Fix NoScript IPC for about:blank by whitelisting messages If about:blank is the homepage (or has been passed as a command line parameter), NoScript will send a message named "fetchChildPolicy" _before_ "started". Torbutton would then send its "updateSettings" too soon, resulting in the dreaded error "Could not establish connection. Receiving end does not exist" (see bug 26520). Fix this by whitelisting the relevant messages from NoScript: "started" and also "pageshow" for a slightly more graceful failure mode in case Torbutton somehow misses NoScript startup. --- src/modules/noscript-control.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js index 66a00528..cd1a1237 100644 --- a/src/modules/noscript-control.js +++ b/src/modules/noscript-control.js @@ -125,8 +125,12 @@ var initialize = () => { // Wait for the first message from NoScript to arrive, and then // bind the security_slider pref to the NoScript settings. - let messageListener = (a,b,c) => { - log(3, `Message received from NoScript: ${JSON.stringify([a,b,c])}`); + let messageListener = (message,b,c) => { + log(3, `Message received from NoScript: ${JSON.stringify([message,b,c])}`); + if (message._messageName !== "started" && + message._messageName !== "pageshow") { + return; + } extensionContext.api.browser.runtime.onMessage.removeListener(messageListener); bindPrefAndInit( "extensions.torbutton.security_slider",

1 0

[tor-browser/tor-browser-60.2.0esr-8.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 3444c43fc135f68a2da2ebcded8c0adb89254f3f Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 17 10:19:54 2018 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Fixes bug 27264 (bookmark items are not visible on the boomark toolbar). --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 7b602c13e0d5..57f0be3a81f9 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -269,7 +269,7 @@ pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},tor pref("extensions.webextensions.restrictedDomains", ""); // Toolbar layout -pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[],\"nav-bar\":[\"torbutton-button\",\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"downloads-button\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"https-everywhere-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\",\"https-everywhere_eff_org-browser-action\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\"],\"cur rentVersion\":14,\"newElementCount\":1}"); +pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"torbutton-button\",\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"downloads-button\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"https-everywhere-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\",\"https-everywhere_eff_org-browser-action\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"to olbar-menubar\"],\"currentVersion\":14,\"newElementCount\":1}"); // Putting the search engine prefs into this file to fix #11236. // Default search engine

1 0

[tor-browser/tor-browser-60.2.0esr-8.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 1d974fa2b70dfe07bea896c99c88d7f62f3268a5 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 17 10:19:54 2018 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Fixes bug 27264 (bookmark items are not visible on the boomark toolbar). --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 7b602c13e0d5..57f0be3a81f9 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -269,7 +269,7 @@ pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},tor pref("extensions.webextensions.restrictedDomains", ""); // Toolbar layout -pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[],\"nav-bar\":[\"torbutton-button\",\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"downloads-button\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"https-everywhere-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\",\"https-everywhere_eff_org-browser-action\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\"],\"cur rentVersion\":14,\"newElementCount\":1}"); +pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"torbutton-button\",\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"downloads-button\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"https-everywhere-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\",\"https-everywhere_eff_org-browser-action\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"to olbar-menubar\"],\"currentVersion\":14,\"newElementCount\":1}"); // Putting the search engine prefs into this file to fix #11236. // Default search engine

1 0

[tor-launcher/master] Bug 27396: Don't track progress.dtd anymore
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 2b89cfe9069de9851d4b71ccc9abbb4ecf888063 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 31 06:03:35 2018 +0000 Bug 27396: Don't track progress.dtd anymore Since bug 23262 landed progress.dtd is not used anymore. Untrack it for our translations update. --- localization/import-translations.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/localization/import-translations.sh b/localization/import-translations.sh index 0c81aa6..f78df42 100755 --- a/localization/import-translations.sh +++ b/localization/import-translations.sh @@ -2,7 +2,6 @@ TRANSLATION_BRANCHES=" tor-launcher-network-settings -tor-launcher-progress tor-launcher-properties "

1 0

[torbutton/master] Bug 26624: Only block OBJECT on highest slider level
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit b9626557ddf9a3faf5fb88f99f479145d7789a7f Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 12 06:16:53 2018 +0000 Bug 26624: Only block OBJECT on highest slider level --- src/modules/noscript-control.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js index a03755de..66a00528 100644 --- a/src/modules/noscript-control.js +++ b/src/modules/noscript-control.js @@ -16,20 +16,20 @@ let log = (level, msg) => logger.log(level, msg); // ## NoScript settings // Minimum and maximum capability states as controlled by NoScript. -const max_caps = ["fetch", "font", "frame", "media", "other", "script", "webgl"]; +const max_caps = ["fetch", "font", "frame", "media", "object", "other", "script", "webgl"]; const min_caps = ["frame", "other"]; // Untrusted capabilities for [Standard, Safer, Safest] safety levels. const untrusted_caps = [ max_caps, // standard safety: neither http nor https - ["frame", "font", "other"], // safer: http + ["frame", "font", "object", "other"], // safer: http min_caps, // safest: neither http nor https ]; // Default capabilities for [Standard, Safer, Safest] safety levels. const default_caps = [ max_caps, // standard: both http and https - ["fetch", "font", "frame", "other", "script", "webgl"], // safer: https only + ["fetch", "font", "frame", "object", "other", "script", "webgl"], // safer: https only min_caps, // safest: both http and https ];

1 0

[torbutton/master] Bug 27097: Get the event listener scope right
by gk＠torproject.org 17 Sep '18

17 Sep '18

commit 7540556c69566bc5454be354d877d08b98ac5d99 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 17 20:25:09 2018 +0000 Bug 27097: Get the event listener scope right --- src/chrome/content/aboutTor/aboutTor-content.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index ac552e21..ff5a970b 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -60,15 +60,16 @@ var AboutTorListener = { }, setupBannerClosing: function () { + let that = this; let closer = content.document.getElementById("tornews-banner-closer"); closer.addEventListener("click", function () { - sendAsyncMessage(this.kAboutTorHideTorNewsBanner); + sendAsyncMessage(that.kAboutTorHideTorNewsBanner); }); let link = content.document.querySelector("#tornews-banner-message a"); link.addEventListener("click", function () { // Wait until page unloads so we don't hide banner before that. content.addEventListener("unload", function () { - sendAsyncMessage(this.kAboutTorHideTorNewsBanner); + sendAsyncMessage(that.kAboutTorHideTorNewsBanner); }); }); bindPrefAndInit("extensions.torbutton.tornews_banner_countdown",

1 0

[torbutton/master] Bug 26555: Don't show IP address for meek or snowflake
by gk＠torproject.org 17 Sep '18

17 Sep '18

commit 51c3b458ef0d9bf4a0df42410a4d02e6c49c97d4 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Sep 17 09:53:40 2018 -0700 Bug 26555: Don't show IP address for meek or snowflake (the IP address for these PTs looks like 0.x.x.x) Also, we remove some dead code that implemented part of the old circuit display. --- src/chrome/content/tor-circuit-display.js | 34 ++----------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index bbabe1c8..6105fea1 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -229,36 +229,6 @@ let showCircuitDisplay = function (show) { 'block' : 'none'; }; -// __nodeLines(nodeData)__. -// Takes a nodeData array of node items, each like -// `{ ip : "12.34.56.78", country : "fr" }` -// and converts each node data to text, as -// `"France (12.34.56.78)"`. -let nodeLines = function (nodeData) { - let result = []; - for (let {ip, countryCode, type, bridgeType} of nodeData) { - let bridge = type === "bridge", - country = countryCode ? localizedCountryNameFromCode(countryCode) : null; - result.push( - bridge ? - // As we have a bridge, don't show the IP address - // but show the bridge type. - (uiString("tor_bridge") + - ((bridgeType !== "vanilla") ? (": " + bridgeType) : "") + - (country ? " (" + country + ")" : "")) - : - // For each non-bridge relay, show its host country and IP. - country + - // As we don't have a bridge, show the IP address - // of the node. Use unicode escapes to ensure that - // parentheses behave properly in both left-to-right - // and right-to-left languages. - " ‭ (" + (ip || uiString("ip_unknown")) + ")‬" - ); - } - return result; -}; - // __xmlTree(ns, data)__. // Takes an xml namespace, ns, and a // data structure representing xml elements like @@ -324,8 +294,8 @@ let updateCircuitDisplay = function () { } else { relayText = localizedCountryNameFromCode(nodeData[i].countryCode); } - li(relayText, " ", - ["span", { class: "circuit-ip-address" }, nodeData[i].ip], " ", + let ip = nodeData[i].ip.startsWith("0.") ? "" : nodeData[i].ip; + li(relayText, " ", ["span", { class: "circuit-ip-address" }, ip], " ", (i === 0 && nodeData[0].type !== "bridge") ? ["span", { class: "circuit-guard-info" }, uiString("guard")] : null); }

1 0

[torbutton/master] Bug 27097: Tor News signup banner
by gk＠torproject.org 17 Sep '18

17 Sep '18

commit b55672f07a24e5611510840012a32108553cf413 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Aug 27 16:32:20 2018 -0700 Bug 27097: Tor News signup banner The banner disappears permanently: * if the user clicks a small "X" on the right * if the user clicks the "Sign Up" link * if the banner has already been shown 4 times --- src/chrome/content/aboutTor/aboutTor-content.js | 20 +++++++ src/chrome/content/aboutTor/aboutTor.xhtml | 13 +++++ src/chrome/content/torbutton.js | 17 ++++++ src/chrome/skin/aboutTor.css | 72 ++++++++++++++++++++++++ src/chrome/skin/newsletter_3x.png | Bin 0 -> 6735 bytes src/defaults/preferences/preferences.js | 1 + 6 files changed, 123 insertions(+) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index ae20505e..ac552e21 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -24,6 +24,7 @@ let { bindPrefAndInit, show_torbrowser_manual } = Cu.import("resource://torbutto var AboutTorListener = { kAboutTorLoadedMessage: "AboutTor:Loaded", kAboutTorChromeDataMessage: "AboutTor:ChromeData", + kAboutTorHideTorNewsBanner: "AboutTor:HideTorNewsBanner", get isAboutTor() { return content.document.documentURI.toLowerCase() == "about:tor"; @@ -58,6 +59,23 @@ var AboutTorListener = { } }, + setupBannerClosing: function () { + let closer = content.document.getElementById("tornews-banner-closer"); + closer.addEventListener("click", function () { + sendAsyncMessage(this.kAboutTorHideTorNewsBanner); + }); + let link = content.document.querySelector("#tornews-banner-message a"); + link.addEventListener("click", function () { + // Wait until page unloads so we don't hide banner before that. + content.addEventListener("unload", function () { + sendAsyncMessage(this.kAboutTorHideTorNewsBanner); + }); + }); + bindPrefAndInit("extensions.torbutton.tornews_banner_countdown", + countdown => content.document.body.setAttribute( + "show-tornews-banner", countdown > 0)); + }, + onPageLoad: function() { // Arrange to update localized text and links. bindPrefAndInit("intl.locale.requested", aNewVal => { @@ -66,6 +84,8 @@ var AboutTorListener = { } }); + this.setupBannerClosing(); + // Add message and event listeners. addMessageListener(this.kAboutTorChromeDataMessage, this); addEventListener("pagehide", this, false); diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index ecdd0f85..87fe8307 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -31,6 +31,19 @@ window.addEventListener("pageshow", function() { </script> </head> <body dir="&locale.dir;"> + <div id="tornews-banner"> + <div></div> + <div id="tornews-banner-message"> + <div id="tornews-banner-icon"></div> + <div>&aboutTor.newsletter.tagline; + <a href="https://newsletter.torproject.org"> + &aboutTor.newsletter.link_text; + </a> + </div> + </div> + <div id="tornews-banner-closer">×</div> + </div> + <div class="torcontent-container"> <div id="torstatus-version"/> <div id="torstatus" class="top"> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 9f6ba898..03dc3563 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -19,6 +19,7 @@ const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion" const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed"; +const k_tb_tornews_banner_countdown = "extensions.torbutton.tornews_banner_countdown"; var m_tb_prefs = Services.prefs; @@ -231,6 +232,14 @@ function torbutton_init_toolbutton() } } +// Show the Sign Up for Tor News banner a finite number of times. +function torbutton_tornews_banner_countdown() { + let count = m_tb_prefs.getIntPref(k_tb_tornews_banner_countdown, 0); + if (count > 0) { + m_tb_prefs.setIntPref(k_tb_tornews_banner_countdown, count - 1); + } +} + // Bug 1506 P2-P4: This code sets some version variables that are irrelevant. // It does read out some important environment variables, though. It is // called once per browser window.. This might belong in a component. @@ -339,6 +348,10 @@ function torbutton_init() { // Add about:tor IPC message listener. window.messageManager.addMessageListener("AboutTor:Loaded", torbutton_abouttor_message_handler); + window.messageManager.addMessageListener("AboutTor:HideTorNewsBanner", + torbutton_abouttor_message_handler); + + torbutton_tornews_banner_countdown(); setupPreferencesForMobile(); @@ -418,6 +431,10 @@ var torbutton_abouttor_message_handler = { aMessage.target.messageManager.sendAsyncMessage("AboutTor:ChromeData", this.chromeData); break; + case "AboutTor:HideTorNewsBanner": + torbutton_log(5, "message AboutTor:HideTorNewsBanner received"); + m_tb_prefs.setIntPref(k_tb_tornews_banner_countdown, 0); + break; } }, diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 2e6bab75..ce0a2f29 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -271,3 +271,75 @@ body:not([showmanual]) .showForManual { height: 50px; border-radius: 50px 50px 0 0; } + +/* Tor News Signup Banner + * While this banner is present, we need to + * offset the elements normally at the top of + * the window. + */ + +#tornews-banner { + display: flex; + align-items: center; + background-color: white; + color: var(--abouttor-bg-toron-color); + font-size: 16px; + height: 60px; + justify-content: space-between; + left: 0px; + right: 0px; + top: 0px; + transform: translateY(-60px); + transition: transform 200ms; +} + +body[show-tornews-banner="true"] #tornews-banner { + transform: translateY(0px); + transition: transform 0ms; +} + +#tornews-banner-message { + align-items: center; + display: flex; + justify-content: center; +} + +#tornews-banner-message a { + color: var(--abouttor-bg-toron-color); +} + +#tornews-banner-icon { + background: url('chrome://torbutton/skin/newsletter_3x.png') no-repeat center center; + background-size: cover; + height: 32px; + margin: 0px 16px; + width: 32px; +} + +#tornews-banner-closer { + display: flex; + align-items: center; + font-size: 20px; + height: 22px; + justify-content: center; + margin: 4px 20px; + padding: 4px; + width: 22px; + -moz-user-select: none; +} + +#tornews-banner-closer:hover { + background-color: gray; + cursor: pointer; +} + +body[show-tornews-banner="false"] #torstatus-version, +body[show-tornews-banner="false"] #onboarding-overlay-button { + transition: transform 200ms; +} + +body[show-tornews-banner="true"] #torstatus-version, +body[show-tornews-banner="true"] #onboarding-overlay-button { + transform: translateY(60px); + transition: transform 0ms; +} diff --git a/src/chrome/skin/newsletter_3x.png b/src/chrome/skin/newsletter_3x.png new file mode 100644 index 00000000..821572fa Binary files /dev/null and b/src/chrome/skin/newsletter_3x.png differ diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 92d1c106..fecf0e69 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -6,6 +6,7 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglo pref("extensions.torbutton.display_circuit", true); pref("extensions.torbutton(a)torproject.org.description", "chrome://torbutton/locale/torbutton.properties"); pref("extensions.torbutton.updateNeeded", false); +pref("extensions.torbutton.tornews_banner_countdown", 4); // Tor check and proxy prefs pref("extensions.torbutton.test_enabled",true);

1 0

[tor-browser/tor-browser-60.2.0esr-8.0-1] Bug 26146: Spoof HTTP User-Agent header for desktop platforms
by gk＠torproject.org 14 Sep '18

14 Sep '18

commit 62d76b2381c1df0b893336f496ae4ffe161d592f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Sep 14 10:02:17 2018 -0400 Bug 26146: Spoof HTTP User-Agent header for desktop platforms In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent header and to JavaScript code via navigator.userAgent. To avoid leaking the OS inside each HTTP request (which many web servers log), always use the Windows 7 OS value in the desktop User-Agent header. We continue to allow access to the actual OS via JavaScript, since doing so improves compatibility with web applications such as GitHub and Google Docs. --- browser/app/profile/000-tor-browser.js | 1 - dom/base/Navigator.cpp | 13 +++++++++++++ netwerk/protocol/http/nsHttpHandler.cpp | 2 +- toolkit/components/resistfingerprinting/nsRFPService.cpp | 5 +++-- toolkit/components/resistfingerprinting/nsRFPService.h | 10 +++++++++- 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index d9e609a71eb8..7b602c13e0d5 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -122,7 +122,6 @@ pref("general.appname.override", "Netscape"); pref("general.appversion.override", "5.0 (Windows)"); pref("general.oscpu.override", "Windows NT 6.1"); pref("general.platform.override", "Win32"); -pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:60.0) Gecko/20100101 Firefox/60.0"); pref("general.productSub.override", "20100101"); pref("general.buildID.override", "20100101"); pref("browser.startup.homepage_override.buildID", "20100101"); diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp index c2ec1f7081a3..33563ad65ccb 100644 --- a/dom/base/Navigator.cpp +++ b/dom/base/Navigator.cpp @@ -1772,6 +1772,19 @@ Navigator::GetUserAgent(nsPIDOMWindowInner* aWindow, } } + // When the caller is content and 'privacy.resistFingerprinting' is true, + // return a spoofed userAgent which reveals the platform but not the + // specific OS version, etc. + if (!aIsCallerChrome && nsContentUtils::ShouldResistFingerprinting()) { + nsAutoCString spoofedUA; + nsresult rv = nsRFPService::GetSpoofedUserAgent(spoofedUA, false); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; + } + CopyASCIItoUTF16(spoofedUA, aUserAgent); + return NS_OK; + } + nsresult rv; nsCOMPtr<nsIHttpProtocolHandler> service(do_GetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &rv)); diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp index f7f449868711..18f942c216fb 100644 --- a/netwerk/protocol/http/nsHttpHandler.cpp +++ b/netwerk/protocol/http/nsHttpHandler.cpp @@ -491,7 +491,7 @@ nsHttpHandler::Init() } // Generating the spoofed User Agent for fingerprinting resistance. - rv = nsRFPService::GetSpoofedUserAgent(mSpoofedUserAgent); + rv = nsRFPService::GetSpoofedUserAgent(mSpoofedUserAgent, true); if (NS_FAILED(rv)) { // Empty mSpoofedUserAgent to make sure the unsuccessful spoofed UA string // will not be used anywhere. diff --git a/toolkit/components/resistfingerprinting/nsRFPService.cpp b/toolkit/components/resistfingerprinting/nsRFPService.cpp index f560ce27f228..595e6556a27e 100644 --- a/toolkit/components/resistfingerprinting/nsRFPService.cpp +++ b/toolkit/components/resistfingerprinting/nsRFPService.cpp @@ -666,7 +666,7 @@ nsRFPService::GetSpoofedPresentedFrames(double aTime, uint32_t aWidth, uint32_t /* static */ nsresult -nsRFPService::GetSpoofedUserAgent(nsACString &userAgent) +nsRFPService::GetSpoofedUserAgent(nsACString &userAgent, bool isForHTTPHeader) { // This function generates the spoofed value of User Agent. // We spoof the values of the platform and Firefox version, which could be @@ -703,9 +703,10 @@ nsRFPService::GetSpoofedUserAgent(nsACString &userAgent) // Except we used 60 as an ESR instead of 59. // We infer the last and closest ESR version based on this rule. uint32_t spoofedVersion = firefoxVersion - ((firefoxVersion - 4) % 7); + const char *spoofedOS = isForHTTPHeader ? SPOOFED_HTTP_UA_OS : SPOOFED_UA_OS; userAgent.Assign(nsPrintfCString( "Mozilla/5.0 (%s; rv:%d.0) Gecko/%s Firefox/%d.0", - SPOOFED_UA_OS, spoofedVersion, LEGACY_BUILD_ID, spoofedVersion)); + spoofedOS, spoofedVersion, LEGACY_BUILD_ID, spoofedVersion)); return rv; } diff --git a/toolkit/components/resistfingerprinting/nsRFPService.h b/toolkit/components/resistfingerprinting/nsRFPService.h index 9708d362496f..da79da8de948 100644 --- a/toolkit/components/resistfingerprinting/nsRFPService.h +++ b/toolkit/components/resistfingerprinting/nsRFPService.h @@ -48,6 +48,14 @@ #define SPOOFED_APPNAME "Netscape" #define LEGACY_BUILD_ID "20100101" +// For the HTTP User-Agent header, we use a simpler set of spoofed values +// that do not reveal the specific desktop platform. +#if defined(MOZ_WIDGET_ANDROID) +#define SPOOFED_HTTP_UA_OS "Android 6.0; Mobile" +#else +#define SPOOFED_HTTP_UA_OS "Windows NT 6.1" +#endif + // Forward declare LRUCache, defined in nsRFPService.cpp class LRUCache; @@ -212,7 +220,7 @@ public: static uint32_t GetSpoofedPresentedFrames(double aTime, uint32_t aWidth, uint32_t aHeight); // This method generates the spoofed value of User Agent. - static nsresult GetSpoofedUserAgent(nsACString &userAgent); + static nsresult GetSpoofedUserAgent(nsACString &userAgent, bool isForHTTPHeader); /** * This method for getting spoofed modifier states for the given keyboard event.

1 0

[tor-browser/tor-browser-60.2.0esr-8.5-1] Bug 26146: Spoof HTTP User-Agent header for desktop platforms
by gk＠torproject.org 14 Sep '18

14 Sep '18

commit 165031359d2db55af85cab32713860bb6a026483 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Sep 14 10:02:17 2018 -0400 Bug 26146: Spoof HTTP User-Agent header for desktop platforms In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent header and to JavaScript code via navigator.userAgent. To avoid leaking the OS inside each HTTP request (which many web servers log), always use the Windows 7 OS value in the desktop User-Agent header. We continue to allow access to the actual OS via JavaScript, since doing so improves compatibility with web applications such as GitHub and Google Docs. --- browser/app/profile/000-tor-browser.js | 1 - dom/base/Navigator.cpp | 13 +++++++++++++ netwerk/protocol/http/nsHttpHandler.cpp | 2 +- toolkit/components/resistfingerprinting/nsRFPService.cpp | 5 +++-- toolkit/components/resistfingerprinting/nsRFPService.h | 10 +++++++++- 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index d9e609a71eb8..7b602c13e0d5 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -122,7 +122,6 @@ pref("general.appname.override", "Netscape"); pref("general.appversion.override", "5.0 (Windows)"); pref("general.oscpu.override", "Windows NT 6.1"); pref("general.platform.override", "Win32"); -pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:60.0) Gecko/20100101 Firefox/60.0"); pref("general.productSub.override", "20100101"); pref("general.buildID.override", "20100101"); pref("browser.startup.homepage_override.buildID", "20100101"); diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp index c2ec1f7081a3..33563ad65ccb 100644 --- a/dom/base/Navigator.cpp +++ b/dom/base/Navigator.cpp @@ -1772,6 +1772,19 @@ Navigator::GetUserAgent(nsPIDOMWindowInner* aWindow, } } + // When the caller is content and 'privacy.resistFingerprinting' is true, + // return a spoofed userAgent which reveals the platform but not the + // specific OS version, etc. + if (!aIsCallerChrome && nsContentUtils::ShouldResistFingerprinting()) { + nsAutoCString spoofedUA; + nsresult rv = nsRFPService::GetSpoofedUserAgent(spoofedUA, false); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; + } + CopyASCIItoUTF16(spoofedUA, aUserAgent); + return NS_OK; + } + nsresult rv; nsCOMPtr<nsIHttpProtocolHandler> service(do_GetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &rv)); diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp index f7f449868711..18f942c216fb 100644 --- a/netwerk/protocol/http/nsHttpHandler.cpp +++ b/netwerk/protocol/http/nsHttpHandler.cpp @@ -491,7 +491,7 @@ nsHttpHandler::Init() } // Generating the spoofed User Agent for fingerprinting resistance. - rv = nsRFPService::GetSpoofedUserAgent(mSpoofedUserAgent); + rv = nsRFPService::GetSpoofedUserAgent(mSpoofedUserAgent, true); if (NS_FAILED(rv)) { // Empty mSpoofedUserAgent to make sure the unsuccessful spoofed UA string // will not be used anywhere. diff --git a/toolkit/components/resistfingerprinting/nsRFPService.cpp b/toolkit/components/resistfingerprinting/nsRFPService.cpp index f560ce27f228..595e6556a27e 100644 --- a/toolkit/components/resistfingerprinting/nsRFPService.cpp +++ b/toolkit/components/resistfingerprinting/nsRFPService.cpp @@ -666,7 +666,7 @@ nsRFPService::GetSpoofedPresentedFrames(double aTime, uint32_t aWidth, uint32_t /* static */ nsresult -nsRFPService::GetSpoofedUserAgent(nsACString &userAgent) +nsRFPService::GetSpoofedUserAgent(nsACString &userAgent, bool isForHTTPHeader) { // This function generates the spoofed value of User Agent. // We spoof the values of the platform and Firefox version, which could be @@ -703,9 +703,10 @@ nsRFPService::GetSpoofedUserAgent(nsACString &userAgent) // Except we used 60 as an ESR instead of 59. // We infer the last and closest ESR version based on this rule. uint32_t spoofedVersion = firefoxVersion - ((firefoxVersion - 4) % 7); + const char *spoofedOS = isForHTTPHeader ? SPOOFED_HTTP_UA_OS : SPOOFED_UA_OS; userAgent.Assign(nsPrintfCString( "Mozilla/5.0 (%s; rv:%d.0) Gecko/%s Firefox/%d.0", - SPOOFED_UA_OS, spoofedVersion, LEGACY_BUILD_ID, spoofedVersion)); + spoofedOS, spoofedVersion, LEGACY_BUILD_ID, spoofedVersion)); return rv; } diff --git a/toolkit/components/resistfingerprinting/nsRFPService.h b/toolkit/components/resistfingerprinting/nsRFPService.h index 9708d362496f..da79da8de948 100644 --- a/toolkit/components/resistfingerprinting/nsRFPService.h +++ b/toolkit/components/resistfingerprinting/nsRFPService.h @@ -48,6 +48,14 @@ #define SPOOFED_APPNAME "Netscape" #define LEGACY_BUILD_ID "20100101" +// For the HTTP User-Agent header, we use a simpler set of spoofed values +// that do not reveal the specific desktop platform. +#if defined(MOZ_WIDGET_ANDROID) +#define SPOOFED_HTTP_UA_OS "Android 6.0; Mobile" +#else +#define SPOOFED_HTTP_UA_OS "Windows NT 6.1" +#endif + // Forward declare LRUCache, defined in nsRFPService.cpp class LRUCache; @@ -212,7 +220,7 @@ public: static uint32_t GetSpoofedPresentedFrames(double aTime, uint32_t aWidth, uint32_t aHeight); // This method generates the spoofed value of User Agent. - static nsresult GetSpoofedUserAgent(nsACString &userAgent); + static nsresult GetSpoofedUserAgent(nsACString &userAgent, bool isForHTTPHeader); /** * This method for getting spoofed modifier states for the given keyboard event.

1 0

[tor-browser-build/maint-8.0] Bug 26556: Fix broken Tor Browser icon path on Linux
by gk＠torproject.org 14 Sep '18

14 Sep '18

commit eb6a0da7fc417f7f0b42c99a072e18056c8c40dc Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 13 09:42:11 2018 +0000 Bug 26556: Fix broken Tor Browser icon path on Linux --- projects/tor-browser/RelativeLink/start-tor-browser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/RelativeLink/start-tor-browser b/projects/tor-browser/RelativeLink/start-tor-browser index 722caa5..474360b 100755 --- a/projects/tor-browser/RelativeLink/start-tor-browser +++ b/projects/tor-browser/RelativeLink/start-tor-browser @@ -240,7 +240,7 @@ fi # canonical version if it was changed by the updater. cp start-tor-browser.desktop ../ sed -i -e "s,^Name=.*,Name=Tor Browser,g" ../start-tor-browser.desktop -sed -i -e "s,^Icon=.*,Icon=$PWD/browser/icons/mozicon128.png,g" ../start-tor-browser.desktop +sed -i -e "s,^Icon=.*,Icon=$PWD/browser/chrome/icons/default/default128.png,g" ../start-tor-browser.desktop sed -i -e "s,^Exec=.*,Exec=sh -c '\"$PWD/start-tor-browser\" --detach || ([ ! -x \"$PWD/start-tor-browser\" ] \&\& \"\$(dirname \"\$*\")\"/Browser/start-tor-browser --detach)' dummy %k,g" ../start-tor-browser.desktop if [ "$register_desktop_app" -eq 1 ]; then

1 0

[tor-browser-build/master] Bug 26556: Fix broken Tor Browser icon path on Linux
by gk＠torproject.org 14 Sep '18

14 Sep '18

commit 5d99870ce97b06252c393c12f0c4d2bcf326d6c3 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 13 09:42:11 2018 +0000 Bug 26556: Fix broken Tor Browser icon path on Linux --- projects/tor-browser/RelativeLink/start-tor-browser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/RelativeLink/start-tor-browser b/projects/tor-browser/RelativeLink/start-tor-browser index 722caa5..474360b 100755 --- a/projects/tor-browser/RelativeLink/start-tor-browser +++ b/projects/tor-browser/RelativeLink/start-tor-browser @@ -240,7 +240,7 @@ fi # canonical version if it was changed by the updater. cp start-tor-browser.desktop ../ sed -i -e "s,^Name=.*,Name=Tor Browser,g" ../start-tor-browser.desktop -sed -i -e "s,^Icon=.*,Icon=$PWD/browser/icons/mozicon128.png,g" ../start-tor-browser.desktop +sed -i -e "s,^Icon=.*,Icon=$PWD/browser/chrome/icons/default/default128.png,g" ../start-tor-browser.desktop sed -i -e "s,^Exec=.*,Exec=sh -c '\"$PWD/start-tor-browser\" --detach || ([ ! -x \"$PWD/start-tor-browser\" ] \&\& \"\$(dirname \"\$*\")\"/Browser/start-tor-browser --detach)' dummy %k,g" ../start-tor-browser.desktop if [ "$register_desktop_app" -eq 1 ]; then

1 0

[tor-browser/tor-browser-60.2.0esr-8.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 14 Sep '18

14 Sep '18

commit 32b4b24c4cf56b9e88c7aae60c1db5affabd99b1 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 12 13:44:31 2018 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. This fixes bug 27535 and enables the TLS 1.3 draft version included in ESR60. --- browser/app/profile/000-tor-browser.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index b7c2ff8207f2..d9e609a71eb8 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -293,9 +293,6 @@ pref("media.audio_data.enabled", false); // Patch written by Jeff Gibat (iSEC). pref("network.jar.block-remote-files", true); -// Enable TLS 1.1 and 1.2: -// https://trac.torproject.org/projects/tor/ticket/11253 -pref("security.tls.version.max", 3); // Disable RC4 fallback. This will go live in Firefox 44, Chrome and IE/Edge: // https://blog.mozilla.org/security/2015/09/11/deprecating-the-rc4-cipher/ pref("security.tls.unrestricted_rc4_fallback", false);

1 0

[tor-browser/tor-browser-60.2.0esr-8.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 14 Sep '18

14 Sep '18

commit dc3519d999329f06042409786568e8e871503a92 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 12 13:44:31 2018 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. This fixes bug 27535 and enables the TLS 1.3 draft version included in ESR60. --- browser/app/profile/000-tor-browser.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index b7c2ff8207f2..d9e609a71eb8 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -293,9 +293,6 @@ pref("media.audio_data.enabled", false); // Patch written by Jeff Gibat (iSEC). pref("network.jar.block-remote-files", true); -// Enable TLS 1.1 and 1.2: -// https://trac.torproject.org/projects/tor/ticket/11253 -pref("security.tls.version.max", 3); // Disable RC4 fallback. This will go live in Firefox 44, Chrome and IE/Edge: // https://blog.mozilla.org/security/2015/09/11/deprecating-the-rc4-cipher/ pref("security.tls.unrestricted_rc4_fallback", false);

1 0

[tor-launcher/master] Bug 27469: Adapt Moat URLs
by gk＠torproject.org 14 Sep '18

14 Sep '18

commit 1db5a1ccddffe78c6b1ff242acfa628d9e9823e0 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 11 13:52:41 2018 +0000 Bug 27469: Adapt Moat URLs --- src/defaults/preferences/prefs.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/defaults/preferences/prefs.js b/src/defaults/preferences/prefs.js index dcddb1b..cc6b1a7 100644 --- a/src/defaults/preferences/prefs.js +++ b/src/defaults/preferences/prefs.js @@ -47,8 +47,8 @@ pref("extensions.torlauncher.tordatadir_path", ""); // BridgeDB-related preferences (used for Moat). pref("extensions.torlauncher.bridgedb_front", "ajax.aspnetcdn.com"); -pref("extensions.torlauncher.bridgedb_reflector", "https://onionquiche.azureedge.net/"); -pref("extensions.torlauncher.moat_service", "https://moat.onionlab.eu/moat"); +pref("extensions.torlauncher.bridgedb_reflector", "https://onion.azureedge.net/"); +pref("extensions.torlauncher.moat_service", "https://bridges.torproject.org/moat"); pref("extensions.torlauncher.bridgedb_bridge_type", "obfs4"); // Recommended default bridge type (can be set per localized bundle).

1 0

[torbutton/master] Bug 27558: Update the link to "Your Guard note may not change" text
by gk＠torproject.org 14 Sep '18

14 Sep '18

commit 6cf83b818025b0f941c92904d17e914cdf61ee2f Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Sep 7 18:59:45 2018 -0400 Bug 27558: Update the link to "Your Guard note may not change" text --- src/chrome/content/tor-circuit-display.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index fe6b51c1..bbabe1c8 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -386,7 +386,7 @@ let setupGuardNote = function () { ["div", {}, noteBefore, ["span", {class: "circuit-guard-name"}, name], noteAfter, " ", - ["span", {onclick: `gBrowser.selectedTab = gBrowser.addTab('https://tb-manual.torproject.org/${localeCode}');`, + ["span", {onclick: `gBrowser.selectedTab = gBrowser.addTab('https://support.torproject.org/${localeCode}/tbb/tbb-2/');`, class: "circuit-link"}, learnMoreString]]); };

1 0

[torbutton/master] Bug 27478: Torbutton icons for dark theme
by gk＠torproject.org 13 Sep '18

13 Sep '18

commit 9156c5564a5da6bd8e17eab094d655034e4135b6 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Sep 13 02:18:41 2018 -0700 Bug 27478: Torbutton icons for dark theme --- src/chrome/skin/torbutton-dark-update-needed.svg | 13 +++++++++++++ src/chrome/skin/torbutton-dark.svg | 9 +++++++++ src/chrome/skin/torbutton.css | 15 +++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/src/chrome/skin/torbutton-dark-update-needed.svg b/src/chrome/skin/torbutton-dark-update-needed.svg new file mode 100644 index 00000000..44df4a00 --- /dev/null +++ b/src/chrome/skin/torbutton-dark-update-needed.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <g id="Icon---Tor-Update---Grey10" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <g id="Tor-Button-Icon" fill="#F9F9FA" fill-opacity="0.8"> + <path d="M7.06561268,5.02241519 C6.77772045,5.2116121 5.67952408,5.90554501 5.6853992,5.90178938 C5.35790364,6.11113858 5.09635335,6.28354515 4.86413018,6.44457064 C4.45268439,6.72987059 4.15887546,6.96359333 3.97499388,7.15193679 C2.95731966,8.16499644 2.66333288,8.97771922 2.77290903,10.3548433 C2.86347409,11.8242645 4.01769529,13.1628244 5.73360996,13.7141752 C6.42393225,13.9308094 7.08993386,14 8.24418607,14 C9.69409954,14 11.010192,13.6175745 11.8475477,12.9475461 C12.7611494,12.2214478 13.2954545,11.1244618 13.2954545,10.0058997 C13.2954545,8.86286776 12.7876949,7.76058164 11.8769727,6.9600938 C11.3838667,6.53505399 10.722397,6.11798563 9.75901067,5.60447735 C9.08955454,5.26286683 8.4719792,4.75203246 8.02479915,4.11379651 C7.77978416,4.4739196 7.45874047,4.78154253 7.06561268,5.02241519 Z M13.1898674,5.45132743 C14.5364638,6.63126844 15.2954545,8.28318584 15.2954545,10.0058997 C15.2954545,11.7286136 14.4874967,13.4041298 13.0919331,14.5132743 C11.7943039,15.551622 4 9.98251962,16 8.24418607,16 C7.16690894,16 6.1875661,15.9528024 5.13477254,15.6224189 C2.71089901,14.8436578 0.923598318,12.8613569 0.776696891,10.4778761 C0.629795465,8.63716814 1.07049974,7.22123894 2.56399758,5.73451327 C3.32298828,4.95575221 4.88993683,4.05899705 5.96721396,3.35103245 C6.50585253,3.02064897 7.06897466,2.02949853 5.99169753,0.16519174 L6.21204967,0 L9.41939748,1.27433628 C8.97869321,2.64306785 10.2518389,3.61061947 10.6680596,3.82300885 C11.5984353,4.31858407 12.4798439,4.83775811 13.1898674,5.45132743 Z" id="Border" fill-rule="nonzero"></path> + <path d="M9.63636041,6.5268042 C10.3279607,6.89485621 10.8036714,7.19446079 11.1684763,7.5087455 C11.8759239,8.12902347 12.2727273,8.98864463 12.2727273,9.88278877 C12.2727273,10.7655864 11.852758,11.6266312 11.1353943,12.1959748 C10.4876507,12.713565 9.5005326,13 8.42423809,13 C8.37244863,13 8.32197458,12.9998006 8.27272727,12.9993871 L8.27272727,5 C8.49625435,5.67889606 9.03172133,6.21869701 9.63636041,6.5268042 Z" id="Half-Content"></path> + </g> + <g id="!" transform="translate(0.000000, 6.100000)"> + <polygon id="Triangle-Copy" fill="#414141" points="5 0.714285714 9.28571429 9.28571429 0.714285714 9.28571429"></polygon> + <path d="M9.78067261,7.86561722 C10.0020131,8.30856238 9.97819173,8.83453755 9.71771774,9.25566142 C9.45724375,9.6767853 8.9972698,9.93299087 8.50210118,9.93276007 L1.42710118,9.93276007 C0.932880889,9.93225088 0.474029854,9.67633171 0.213899592,9.2561101 C-0.0462306709,8.83588849 -0.0706843715,8.31106384 0.149244037,7.86847436 L3.68710118,0.789902932 C3.92904842,0.305811394 4.42377158,0 4.96495832,0 C5.50614506,0 6.00086822,0.305811394 6.24281547,0.789902932 L9.78067261,7.86561722 Z M4.25067261,2.78990293 L4.25067261,5.64704579 C4.25067261,6.0415349 4.57046922,6.3613315 4.96495832,6.3613315 C5.35944743,6.3613315 5.67924404,6.0415349 5.67924404,5.64704579 L5.67924404,2.78990293 C5.67924404,2.39541382 5.35944743,2.07561722 4.96495832,2.07561722 C4.57046922,2.07561722 4.25067261,2.39541382 4.25067261,2.78990293 Z M4.96495832,8.68276007 C5.45806971,8.68276007 5.85781547,8.28301432 5.85781547,7.78990293 C5.85781547,7.29679155 5.45806971,6.89704579 4.96495832,6.89704579 C4.47 184694,6.89704579 4.07210118,7.29679155 4.07210118,7.78990293 C4.07210118,8.28301432 4.47184694,8.68276007 4.96495832,8.68276007 Z" id="Shape-Copy" fill="#FFE900" fill-rule="nonzero"></path> + </g> + </g> +</svg> diff --git a/src/chrome/skin/torbutton-dark.svg b/src/chrome/skin/torbutton-dark.svg new file mode 100644 index 00000000..55d633e8 --- /dev/null +++ b/src/chrome/skin/torbutton-dark.svg @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <g id="Icon---Tor---Grey10" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" fill-opacity="0.8"> + <g id="Tor-Button-Icon" fill="#F9F9FA"> + <path d="M7.06561268,5.02241519 C6.77772045,5.2116121 5.67952408,5.90554501 5.6853992,5.90178938 C5.35790364,6.11113858 5.09635335,6.28354515 4.86413018,6.44457064 C4.45268439,6.72987059 4.15887546,6.96359333 3.97499388,7.15193679 C2.95731966,8.16499644 2.66333288,8.97771922 2.77290903,10.3548433 C2.86347409,11.8242645 4.01769529,13.1628244 5.73360996,13.7141752 C6.42393225,13.9308094 7.08993386,14 8.24418607,14 C9.69409954,14 11.010192,13.6175745 11.8475477,12.9475461 C12.7611494,12.2214478 13.2954545,11.1244618 13.2954545,10.0058997 C13.2954545,8.86286776 12.7876949,7.76058164 11.8769727,6.9600938 C11.3838667,6.53505399 10.722397,6.11798563 9.75901067,5.60447735 C9.08955454,5.26286683 8.4719792,4.75203246 8.02479915,4.11379651 C7.77978416,4.4739196 7.45874047,4.78154253 7.06561268,5.02241519 Z M13.1898674,5.45132743 C14.5364638,6.63126844 15.2954545,8.28318584 15.2954545,10.0058997 C15.2954545,11.7286136 14.4874967,13.4041298 13.0919331,14.5132743 C11.7943039,15.551622 4 9.98251962,16 8.24418607,16 C7.16690894,16 6.1875661,15.9528024 5.13477254,15.6224189 C2.71089901,14.8436578 0.923598318,12.8613569 0.776696891,10.4778761 C0.629795465,8.63716814 1.07049974,7.22123894 2.56399758,5.73451327 C3.32298828,4.95575221 4.88993683,4.05899705 5.96721396,3.35103245 C6.50585253,3.02064897 7.06897466,2.02949853 5.99169753,0.16519174 L6.21204967,0 L9.41939748,1.27433628 C8.97869321,2.64306785 10.2518389,3.61061947 10.6680596,3.82300885 C11.5984353,4.31858407 12.4798439,4.83775811 13.1898674,5.45132743 Z" id="Border" fill-rule="nonzero"></path> + <path d="M8.27272727,5 C8.49625435,5.67889606 9.03172133,6.21869701 9.63636041,6.5268042 C10.3279607,6.89485621 10.8036714,7.19446079 11.1684763,7.5087455 C11.8759239,8.12902347 12.2727273,8.98864463 12.2727273,9.88278877 C12.2727273,10.7655864 11.852758,11.6266312 11.1353943,12.1959748 C10.4876507,12.713565 9.5005326,13 8.42423809,13 C8.37244863,13 8.32197458,12.9998006 8.27272727,12.9993871 L8.27272727,5 Z" id="Half-Content"></path> + </g> + </g> +</svg> diff --git a/src/chrome/skin/torbutton.css b/src/chrome/skin/torbutton.css index cf90ae6d..928ba93d 100644 --- a/src/chrome/skin/torbutton.css +++ b/src/chrome/skin/torbutton.css @@ -6,10 +6,21 @@ list-style-image: url("chrome://torbutton/skin/torbutton.svg"); } } +@keyframes blink-update-dark { + 0% { + list-style-image: url("chrome://torbutton/skin/torbutton-dark-update-needed.svg"); + } + 100% { + list-style-image: url("chrome://torbutton/skin/torbutton-dark.svg"); + } +} #torbutton-button { list-style-image: url("chrome://torbutton/skin/torbutton.svg"); } +toolbar[brighttext] #torbutton-button { + list-style-image: url("chrome://torbutton/skin/torbutton-dark.svg"); +} #torbutton-button[tbstatus="on"] { opacity: 1.0; } @@ -20,6 +31,10 @@ opacity: 1.0; animation: blink-update normal 1s infinite ease-in-out; } +toolbar[brighttext] #torbutton-button[tbUpdateNeeded="true"] { + opacity: 1.0; + animation: blink-update-dark normal 1s infinite ease-in-out; +} #torbutton-button-tb { list-style-image: url("chrome://torbutton/skin/torbutton.svg");

1 0

[torbutton/master] Bug 27506: Move status version to UL corner for RTL locales
by gk＠torproject.org 13 Sep '18

13 Sep '18

commit 2754f4d06268c18e9121de41e436335a6946efc5 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Sep 13 00:24:00 2018 -0700 Bug 27506: Move status version to UL corner for RTL locales We use both offset-inline-end and inset-inline-end because the former is supported in Firefox 60 and the latter is supported in Firefox 63 and later. --- src/chrome/skin/aboutTor.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index c402bbed..2e6bab75 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -58,12 +58,13 @@ body:not([initialized]) { #torstatus-version { position: absolute; top: 6px; - right: 6px; + offset-inline-end: 6px; + inset-inline-end: 6px; height: 30px; width: 200px; font-size: 15px; white-space: pre-wrap; - text-align: right; + text-align: end; } a {

1 0