- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 40041: Remove CentOS 6 support for 10.5 series
by gk＠torproject.org 18 Sep '20

18 Sep '20

commit 1d426e5c975804f91095b9be0b9ea71d75e91ac0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 18 06:32:26 2020 +0000 Bug 40041: Remove CentOS 6 support for 10.5 series CentOS 6 will be EOL later this year (Nov 2020). We are removing support for it beginning with 10.5 which will get released around mid-2021. --- projects/firefox/start-firefox | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/projects/firefox/start-firefox b/projects/firefox/start-firefox index 7e7685c..67788a0 100644 --- a/projects/firefox/start-firefox +++ b/projects/firefox/start-firefox @@ -11,30 +11,6 @@ add_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

1 0

[tor-browser-build/maint-10.0] Update makefile release target and tag build2
by sysrqb＠torproject.org 17 Sep '20

17 Sep '20

commit c5431b7c2fff0e98580ebfe795e12bcef9ab0370 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Sep 17 18:32:33 2020 +0000 Update makefile release target and tag build2 --- Makefile | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7e2e104..15c8674 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ rbm=./rbm/rbm all: release release: submodule-update - $(rbm) build release --target release --target torbrowser-all + $(rbm) build release --target release --target torbrowser-all-desktop release-android: submodule-update $(rbm) build release --target release --target torbrowser-all-android diff --git a/rbm.conf b/rbm.conf index bd1c8a2..ac24f8f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '10.0' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 9.5.4 project_name: tor-browser

1 0

[tor-launcher/master] Release preparations for 0.2.25
by sysrqb＠torproject.org 17 Sep '20

17 Sep '20

commit 8c49d63c60aa7dc17cb45c61def9d1ef2600ad10 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Sep 17 18:17:53 2020 +0000 Release preparations for 0.2.25 Translations update and version bump --- src/chrome/locale/ga-IE/network-settings.dtd | 28 +++++++++--------- src/chrome/locale/ga-IE/torlauncher.properties | 2 +- src/chrome/locale/it/network-settings.dtd | 10 +++---- src/chrome/locale/sq/network-settings.dtd | 28 +++++++++--------- src/chrome/locale/sq/torlauncher.properties | 40 +++++++++++++------------- src/install.rdf | 2 +- 6 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/chrome/locale/ga-IE/network-settings.dtd b/src/chrome/locale/ga-IE/network-settings.dtd index e8ff8f3..1bb82b0 100644 --- a/src/chrome/locale/ga-IE/network-settings.dtd +++ b/src/chrome/locale/ga-IE/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Roghnach"> <!ENTITY torsettings.useProxy.checkbox "Úsáidim seachfhreastalaí chun ceangal leis an Idirlíon"> -<!ENTITY torsettings.useProxy.type "Proxy Type"> +<!ENTITY torsettings.useProxy.type "Cineál Seachfhreastalaí"> <!ENTITY torsettings.useProxy.type.placeholder "roghnaigh cineál an tseachfhreastalaí"> -<!ENTITY torsettings.useProxy.address "Address"> +<!ENTITY torsettings.useProxy.address "Seoladh"> <!ENTITY torsettings.useProxy.address.placeholder "Seoladh IP nó óstainm"> <!ENTITY torsettings.useProxy.port "Port"> -<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.username "Ainm Úsáideora"> <!ENTITY torsettings.useProxy.password "Focal faire"> <!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 "Téann an ríomhaire seo trí bhalla dóiteáin nach gceadaíonn ceangail ach le poirt áirithe"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> +<!ENTITY torsettings.firewall.allowedPorts "Poirt a Cheadaítear"> <!ENTITY torsettings.useBridges.checkbox "Déantar cinsireacht ar Tor sa tír seo"> <!ENTITY torsettings.useBridges.default "Roghnaigh droichead ionsuite"> <!ENTITY torsettings.useBridges.default.placeholder "roghnaigh droichead"> @@ -63,21 +63,21 @@  <!ENTITY torPreferences.categoryTitle "Tor"> -<!ENTITY torPreferences.torSettings "Tor Settings"> -<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > +<!ENTITY torPreferences.torSettings "Socruithe Tor"> +<!ENTITY torPreferences.torSettingsDescription "Seolann Brabhsálaí Tor do chuid tráchta thar líonra Tor, líonra faoi stiúir na mílte oibrí deonach timpeall an domhain." > <!ENTITY torPreferences.learnMore "Tuilleadh Eolais"> <!ENTITY torPreferences.bridges "Droichid"> <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> -<!ENTITY torPreferences.useBridge "Use a bridge"> +<!ENTITY torPreferences.useBridge "Úsáid droichead"> <!ENTITY torPreferences.requestNewBridge "Iarr Droichead Nua..."> -<!ENTITY torPreferences.provideBridge "Provide a bridge"> -<!ENTITY torPreferences.advanced "Advanced"> +<!ENTITY torPreferences.provideBridge "Soláthair droichead"> +<!ENTITY torPreferences.advanced "Ardroghanna"> <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet."> <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> -<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> -<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> +<!ENTITY torPreferences.requestBridgeDialogTitle "Iarr Droichead"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Ag dul i dteagmháil le BridgeDB. Fan nóiméad."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Réitigh an CAPTCHA le droichead a iarraidh."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "Níl an freagra sin ceart. Bain triail eile as."> -<!ENTITY torPreferences.viewTorLogs "View the Tor logs."> -<!ENTITY torPreferences.viewLogs "View Logs…"> -<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> +<!ENTITY torPreferences.viewTorLogs "Féach ar logchomhaid Tor."> +<!ENTITY torPreferences.viewLogs "Féach ar na Logchomhaid..."> +<!ENTITY torPreferences.torLogsDialogTitle "Logchomhaid Tor"> diff --git a/src/chrome/locale/ga-IE/torlauncher.properties b/src/chrome/locale/ga-IE/torlauncher.properties index 8b11073..0cf1437 100644 --- a/src/chrome/locale/ga-IE/torlauncher.properties +++ b/src/chrome/locale/ga-IE/torlauncher.properties @@ -16,7 +16,7 @@ torlauncher.unable_to_start_tor=Níorbh fhéidir Tor a thosú.\n\n%S torlauncher.tor_missing=Tá an clár inrite Tor ar iarraidh. torlauncher.torrc_missing=Tá an comhad torrc ar iarraidh agus níorbh fhéidir é a chruthú. torlauncher.datadir_missing=Níl comhadlann sonraí Tor ann agus níorbh fhéidir é a chruthú. -torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. +torlauncher.onionauthdir_missing=Níl comhadlann fíordheimhnithe onion Tor ann, agus níorbh fhéidir í a chruthú torlauncher.password_hash_missing=Níl aon fháil ar an bhfocal faire haiseáilte. torlauncher.failed_to_get_settings=Ní féidir socruithe Tor a fháil.\n\n%S diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd index 503cbb0..67d5aff 100644 --- a/src/chrome/locale/it/network-settings.dtd +++ b/src/chrome/locale/it/network-settings.dtd @@ -1,6 +1,6 @@ -<!ENTITY torsettings.dialog.title "Impostazioni rete Tor"> +<!ENTITY torsettings.dialog.title "Impostazioni della Rete Tor"> <!ENTITY torsettings.wizard.title.default "Connetti a Tor"> -<!ENTITY torsettings.wizard.title.configure "Impostazioni della rete Tor"> +<!ENTITY torsettings.wizard.title.configure "Impostazioni della Rete Tor"> <!ENTITY torsettings.wizard.title.connecting "Connessione in corso">  @@ -69,15 +69,15 @@ <!ENTITY torPreferences.bridges "Bridges"> <!ENTITY torPreferences.bridgesDescription "I bridge ti aiutano ad accedere alla rete Tor in luoghi dove Tor viene bloccato. A seconda di dove ti trovi, un bridge può funzionare meglio di un altro."> <!ENTITY torPreferences.useBridge "Usa un bridge"> -<!ENTITY torPreferences.requestNewBridge "Richiedi un nuovo bridge..."> +<!ENTITY torPreferences.requestNewBridge "Richiedi un Nuovo Bridge..."> <!ENTITY torPreferences.provideBridge "Fornisci un bridge"> <!ENTITY torPreferences.advanced "Avanzate"> <!ENTITY torPreferences.advancedDescription "Configura come Tor Browser si connette a internet."> <!ENTITY torPreferences.firewallPortsPlaceholder "Valori separati da una virgola"> -<!ENTITY torPreferences.requestBridgeDialogTitle "Richiedi bridge"> +<!ENTITY torPreferences.requestBridgeDialogTitle "Richiedi Bridge"> <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contattando BridgeDB. Attendere, prego."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Risolvi il CAPTCHA per richiedere un bridge."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "La soluzione è sbagliata. Riprova."> <!ENTITY torPreferences.viewTorLogs "Visualizza i log di Tor."> -<!ENTITY torPreferences.viewLogs "Visualizza log..."> +<!ENTITY torPreferences.viewLogs "Visualizza Log..."> <!ENTITY torPreferences.torLogsDialogTitle "Log di Tor"> diff --git a/src/chrome/locale/sq/network-settings.dtd b/src/chrome/locale/sq/network-settings.dtd index 1250a78..d40c31e 100644 --- a/src/chrome/locale/sq/network-settings.dtd +++ b/src/chrome/locale/sq/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Konfigurimi i Rrjetit të Tor"> +<!ENTITY torsettings.dialog.title "Rregullime Rrjeti Tor"> <!ENTITY torsettings.wizard.title.default "Connect to Tor"> <!ENTITY torsettings.wizard.title.configure "Konfigurimi i Rrjetit të Tor"> <!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> @@ -11,34 +11,34 @@ <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> <!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> -<!ENTITY torSettings.configure "Konfiguroni"> -<!ENTITY torSettings.connect "Lidhuni"> +<!ENTITY torSettings.configure "Formësojeni"> +<!ENTITY torSettings.connect "Lidhu">  -<!ENTITY torsettings.startingTor "Duke pritur që Tor të nisë..."> +<!ENTITY torsettings.startingTor "Po pritet që të niset Tor-i…"> <!ENTITY torsettings.restartTor "Riniseni Tor-in"> <!ENTITY torsettings.reconfigTor "Rikonfiguroni"> <!ENTITY torsettings.discardSettings.prompt "Ju keni konfiguruar urat Tor ose keni futur konfigurimin e proxy-t.  Për të bërë një lidhje të drejtpërdrejtë tek rrjeti Tor, ky konfigurim duhet të hiqet."> <!ENTITY torsettings.discardSettings.proceed "Hiqeni Konfigurimin dhe Lidhuni"> -<!ENTITY torsettings.optional "Me zgjedhje"> +<!ENTITY torsettings.optional "Opsional"> -<!ENTITY torsettings.useProxy.checkbox "Unë përdor një proxy për tu lidhur në Internet"> +<!ENTITY torsettings.useProxy.checkbox "Për t’u lidhur në Internet, unë përdor një ndërmjetës"> <!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adresë"> -<!ENTITY torsettings.useProxy.address.placeholder "Adresa IP ose emri i pritësit"> +<!ENTITY torsettings.useProxy.address.placeholder "Adresë IP ose emër strehë"> <!ENTITY torsettings.useProxy.port "Portë"> <!ENTITY torsettings.useProxy.username "Emër përdoruesi"> <!ENTITY torsettings.useProxy.password "Fjalëkalim"> <!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 "Ky kompjuter kalon përmes një muri mbrojtës, që i lejon lidhje vetëm me disa porta."> -<!ENTITY torsettings.firewall.allowedPorts "Portat e Lejuara"> -<!ENTITY torsettings.useBridges.checkbox "TOR është i çensuruar në vëndin tim"> +<!ENTITY torsettings.firewall.checkbox "Ky kompjuter kalon përmes një firewall-i, i cili lejon lidhje vetëm me disa porta."> +<!ENTITY torsettings.firewall.allowedPorts "Porta të Lejuara"> +<!ENTITY torsettings.useBridges.checkbox "TOR censurohet në vendin tim"> <!ENTITY torsettings.useBridges.default "Zgjidh një urë të paracaktuar"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> <!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> @@ -46,15 +46,15 @@ <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> <!ENTITY torsettings.useBridges.captchaSubmit "Parashtroni"> <!ENTITY torsettings.useBridges.custom "Mundëso një urë lidhëse që njoh"> -<!ENTITY torsettings.useBridges.label "Vendos informacion për urën nga një burim i besuar."> -<!ENTITY torsettings.useBridges.placeholder "shkruaj adresën:portën (një për rresht)"> +<!ENTITY torsettings.useBridges.label "Jepni të dhëna ure prej një burimi të besuar."> +<!ENTITY torsettings.useBridges.placeholder "shtypni adresë:portë (një për rresht)"> -<!ENTITY torsettings.copyLog "Kopjojeni Regjistrin e Tor në Kujtesën e fragmenteve"> +<!ENTITY torsettings.copyLog "Kopjo Regjistër Tor në Të papastër"> <!ENTITY torsettings.proxyHelpTitle "Proxy Help"> <!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.bridgeHelpTitle "Ndihma mbi Relenë e Urë"> +<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!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"> diff --git a/src/chrome/locale/sq/torlauncher.properties b/src/chrome/locale/sq/torlauncher.properties index 613f20d..091148a 100644 --- a/src/chrome/locale/sq/torlauncher.properties +++ b/src/chrome/locale/sq/torlauncher.properties @@ -1,30 +1,30 @@ ### Copyright (c) 2020, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Lëshuesi Tor +torlauncher.error_title=Nisës Tor-i torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. -torlauncher.tor_exited=Tor doli papritmas. Kjo mund të jetë për shkak të një gabimi të vetë Tor, të një tjetër programi në sistemin tuaj, ose të të metave të diskut të ngurtë. Derisa ta rinisni Tor, Tor Browser nuk do mund të arrijë asnjë webfaqe. Nëse problemi vijon, ju lutemi dërgoni një kopje të Regjistrit tuaj të Tor, tek ekipi i mbështetjes. +torlauncher.tor_exited=Tor-i reshti së funksionuari papritmas. Kjo mund të jetë për shkak të një të mete të vetë Tor-it, të një tjetër programi në sistemin tuaj, ose defekti në hardware. Derisa ta rinisni Tor-in, Shfletuesi Tor s’do të jetë në gjendje të hapë ndonjë sajt. Nëse problemi vijon, ju lutemi, dërgojini ekipit të asistencës një kopje të Regjistrit të Tor-it tuaj. torlauncher.tor_exited2=Rinisja e Tor s'do t'i mbyllë skedat e shfletuesit tuaj. -torlauncher.tor_controlconn_failed=E pamundur lidhja me portin e kontrollit të Tor. -torlauncher.tor_failed_to_start=Tor dështoi të nisë. +torlauncher.tor_controlconn_failed=S’u lidh dot me portë kontrolli Tor. +torlauncher.tor_failed_to_start=Tor-i s’arriti të niset. torlauncher.tor_control_failed=Dështim në marrjen në kontroll të Tor. -torlauncher.tor_bootstrap_failed=Tor dështoi që të vendoste një lidhje me rrjetin e Tor. +torlauncher.tor_bootstrap_failed=Tor-i s’arriti të vendosë lidhje me një rrjet Tor. torlauncher.tor_bootstrap_failed_details=%1$S dështoi (%2$S). -torlauncher.unable_to_start_tor=E pamundur që të niset Tor.\n\n%S -torlauncher.tor_missing=Skedari i ekzekutueshëm Tor, mungon. -torlauncher.torrc_missing=Skedari torrc mungon dhe s'mund të krijohet. -torlauncher.datadir_missing=Të dhënat e direktorisë Tor data nuk ekzistojnë dhe s'mund të krijohen. +torlauncher.unable_to_start_tor=S’arrihet të niset Tor-i.\n\n%S +torlauncher.tor_missing=Mungon kartela e ekzekutueshme Tor +torlauncher.torrc_missing=Mungon kartela torrc dhe s’mund të krijohet. +torlauncher.datadir_missing=Drejtoria e të dhënave Tor s’ekziston dhe s’mund të krijohet. torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. -torlauncher.password_hash_missing=Dështuam të përftonim fjalëkalimin me thurje. +torlauncher.password_hash_missing=S’u arrit të merrej fjalëkalim me hash. -torlauncher.failed_to_get_settings=Dështuam të gjenim konfigurimin e Tor.\n\n%S -torlauncher.failed_to_save_settings=Dështuam të ruanim konfigurimin e Tor.\n\n%S -torlauncher.ensure_tor_is_running=Ju lutemi sigurohuni që Tor është në ekzekutim. +torlauncher.failed_to_get_settings=S’arrihet të merren rregullime për Tor-in.\n\n%S +torlauncher.failed_to_save_settings=S’arrihet të ruhen rregullime për Tor-in.\n\n%S +torlauncher.ensure_tor_is_running=Ju lutemi, sigurohuni që Tor-i po xhiron. -torlauncher.error_proxy_addr_missing=Ju duhet të përcaktoni një adresë IP ose emër pritësi, si edhe një numër porte, për të konfiguruar Tor në mënyrë që të përdorë një proxy për t'u qasur në Internet. -torlauncher.error_proxy_type_missing=Duhet të përzgjidhni tipin proxy. +torlauncher.error_proxy_addr_missing=Për ta formësuar Tor-in të përdorë një ndërmjetës për hyrje në Internet, duhet të përcaktoni një adresë IP ose emërstrehë, si edhe një numër porte. +torlauncher.error_proxy_type_missing=Duhet të përzgjidhni llojin e ndërmjetësit. torlauncher.error_bridges_missing=Duhet të specifikoni një ose më shumë ura. torlauncher.error_default_bridges_type_missing=Duhet të përzgjidhni një lloj transport për urat e parashikuara torlauncher.error_bridgedb_bridges_missing=Please request a bridge. @@ -42,13 +42,13 @@ 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.connect=Lidhuni +torlauncher.connect=Lidhu torlauncher.restart_tor=Riniseni Tor -torlauncher.quit=Ndërpriteni -torlauncher.quit_win=Dilni -torlauncher.done=Kryer +torlauncher.quit=Mbylle +torlauncher.quit_win=Dil +torlauncher.done=U bë -torlauncher.forAssistance=Për ndihmë, kontaktoni %S +torlauncher.forAssistance=Për asistencë, lidhuni me %S torlauncher.forAssistance2=Për ndihmë, vizitoni %S torlauncher.copiedNLogMessages=Kopjimi u krye. Mesazhet e regjistrit të Tor për %S, janë gati për t'u ngjitur në një redaktues teksti, ose në një mesazh e-poste. diff --git a/src/install.rdf b/src/install.rdf index 772db91..444654d 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.24</em:version> + <em:version>0.2.25</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-browser-build/master] Move desktop nightlies to 10.5 series
by gk＠torproject.org 17 Sep '20

17 Sep '20

commit 0df5964adb5cc43cd504b71b9fac24f0ab20b8b8 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 17 08:27:55 2020 +0000 Move desktop nightlies to 10.5 series --- projects/firefox/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index b0a58fb..79674fb 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,9 +8,9 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 78.2.0 + firefox_platform_version: 78.3.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' - torbrowser_branch: 10.0 + torbrowser_branch: 10.5 branding_directory: 'browser/branding/alpha' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps:

1 0

[tor-browser/tor-browser-81.0b9-10.0-1] fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
by gk＠torproject.org 17 Sep '20

17 Sep '20

commit 7f647b0fc5312b64e5b78291691bb0f6c156dc5d Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Sep 16 19:52:45 2020 +0200 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances addons.json is not used anymore with v3 blocklisting enabled, so we don't add it while we are at it. Closes tor-browser#40128. --- services/settings/dumps/blocklists/moz.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/services/settings/dumps/blocklists/moz.build b/services/settings/dumps/blocklists/moz.build index 3ba9ba4980a8..dd0bad30f19a 100644 --- a/services/settings/dumps/blocklists/moz.build +++ b/services/settings/dumps/blocklists/moz.build @@ -8,9 +8,14 @@ with Files('**'): BUG_COMPONENT = ('Toolkit', 'Blocklist Implementation') # The addons blocklist is also in mobile/android/installer/package-manifest.in -FINAL_TARGET_FILES.defaults.settings.blocklists += ['addons.json', +FINAL_TARGET_FILES.defaults.settings.blocklists += ['addons-bloomfilters.json', 'gfx.json', 'plugins.json'] +FINAL_TARGET_FILES.defaults.settings.blocklists['addons-bloomfilters'] += [ + 'addons-bloomfilters/addons-mlbf.bin', + 'addons-bloomfilters/addons-mlbf.bin.meta.json' +] + if CONFIG['MOZ_BUILD_APP'] == 'browser': DIST_SUBDIR = 'browser'

1 0

[tor-browser-build/master] Bug 40095: Better match the APK file for signing
by gk＠torproject.org 17 Sep '20

17 Sep '20

commit bd265ab3df66007a581eeb48b2468c7367955f72 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 17 07:11:54 2020 +0000 Bug 40095: Better match the APK file for signing --- projects/tor-browser/build.android | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android index e349d88..e451e98 100644 --- a/projects/tor-browser/build.android +++ b/projects/tor-browser/build.android @@ -2,7 +2,7 @@ [% c("var/set_default_env") -%] ext_dir=assets/extensions qa_apk=[% dest_dir %]/[% c('filename') %]/tor-browser-[% c("version") %]-[% c("var/osname") %]-multi-qa.apk -apk=$rootdir/fenix/app-[% c("var/abi") %]*.apk +apk=$rootdir/fenix/app-[% c("var/abi") %]-*.apk tar xavf $rootdir/[% c('input_files_by_name/fenix') %]

1 0

[tor-browser/tor-browser-78.3.0esr-10.0-2] fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
by gk＠torproject.org 17 Sep '20

17 Sep '20

commit ceb6469f568880dca13d01fd2edf66828f3bbf54 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Sep 16 19:52:45 2020 +0200 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances addons.json is not used anymore with v3 blocklisting enabled, so we don't add it while we are at it. Closes tor-browser#40128. --- services/settings/dumps/blocklists/moz.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/services/settings/dumps/blocklists/moz.build b/services/settings/dumps/blocklists/moz.build index 3ba9ba4980a8..dd0bad30f19a 100644 --- a/services/settings/dumps/blocklists/moz.build +++ b/services/settings/dumps/blocklists/moz.build @@ -8,9 +8,14 @@ with Files('**'): BUG_COMPONENT = ('Toolkit', 'Blocklist Implementation') # The addons blocklist is also in mobile/android/installer/package-manifest.in -FINAL_TARGET_FILES.defaults.settings.blocklists += ['addons.json', +FINAL_TARGET_FILES.defaults.settings.blocklists += ['addons-bloomfilters.json', 'gfx.json', 'plugins.json'] +FINAL_TARGET_FILES.defaults.settings.blocklists['addons-bloomfilters'] += [ + 'addons-bloomfilters/addons-mlbf.bin', + 'addons-bloomfilters/addons-mlbf.bin.meta.json' +] + if CONFIG['MOZ_BUILD_APP'] == 'browser': DIST_SUBDIR = 'browser'

1 0

[tor-browser/tor-browser-78.2.0esr-10.0-1] fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
by gk＠torproject.org 17 Sep '20

17 Sep '20

commit 407f96829ec029942bf5e52b683dcf8c69bba225 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Sep 16 19:52:45 2020 +0200 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances --- services/settings/dumps/blocklists/moz.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/services/settings/dumps/blocklists/moz.build b/services/settings/dumps/blocklists/moz.build index 3ba9ba4980a8..dd0bad30f19a 100644 --- a/services/settings/dumps/blocklists/moz.build +++ b/services/settings/dumps/blocklists/moz.build @@ -8,9 +8,14 @@ with Files('**'): BUG_COMPONENT = ('Toolkit', 'Blocklist Implementation') # The addons blocklist is also in mobile/android/installer/package-manifest.in -FINAL_TARGET_FILES.defaults.settings.blocklists += ['addons.json', +FINAL_TARGET_FILES.defaults.settings.blocklists += ['addons-bloomfilters.json', 'gfx.json', 'plugins.json'] +FINAL_TARGET_FILES.defaults.settings.blocklists['addons-bloomfilters'] += [ + 'addons-bloomfilters/addons-mlbf.bin', + 'addons-bloomfilters/addons-mlbf.bin.meta.json' +] + if CONFIG['MOZ_BUILD_APP'] == 'browser': DIST_SUBDIR = 'browser'

1 0

[tor-browser-build/master] Pick up rbm fix for rbm#40004 and rbm#40003
by gk＠torproject.org 16 Sep '20

16 Sep '20

commit 3d671cceaa49badbbc975114e3a2fe942fdc4eda Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 16 19:27:30 2020 +0000 Pick up rbm fix for rbm#40004 and rbm#40003 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index ee2d60d..a32239d 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit ee2d60d8274fe3b88454683eb11b1d76981b6c46 +Subproject commit a32239ddb1f465115cb4a8bb9f4b853c149506f3

1 0

[rbm/master] Bug 40004: Improve cache in project_config
by gk＠torproject.org 16 Sep '20

16 Sep '20

commit a32239ddb1f465115cb4a8bb9f4b853c149506f3 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 14 15:40:10 2020 +0200 Bug 40004: Improve cache in project_config --- lib/RBM.pm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index 6277de4..825502a 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -206,19 +206,16 @@ sub confkey_str { sub project_config { my ($project, $name, $options) = @_; - CORE::state $cache; + CORE::state %config_cache; my $res; my $error_if_undef = $options->{error_if_undef}; - my $cache_save = $cache; - if ($options) { - $options = {%$options, error_if_undef => 0}; - my %ignore_options = map { $_ => 1 } qw(error_if_undef step); - $cache = {} if grep { !$ignore_options{$_} } keys %$options; - } + $options = {%$options, error_if_undef => 0} if $options; + my $cache_id = pp($config->{run}) + . pp({ %{$config->{opt}}, $options ? %$options : () }); my $name_str = ref $name eq 'ARRAY' ? join '/', @$name : $name; my $step = $config->{step}; - if (exists $cache->{$project}{$step}{$name_str}) { - $res = $cache->{$project}{$step}{$name_str}; + if (exists $config_cache{$project}{$step}{$name_str}{$cache_id}) { + $res = $config_cache{$project}{$step}{$name_str}{$cache_id}; goto FINISH; } $name = [ split '/', $name ] unless ref $name eq 'ARRAY'; @@ -233,10 +230,9 @@ sub project_config { $res = process_template($project, $res, confkey_str($name) eq 'output_dir' ? '.' : undef); } - $cache->{$project}{$step}{$name_str} = $res; + $config_cache{$project}{$step}{$name_str}{$cache_id} = $res; $config->{opt} = $opt_save; FINISH: - $cache = $cache_save; if (!defined($res) && $error_if_undef) { my $msg = $error_if_undef eq '1' ? "Option " . confkey_str($name) . " is undefined"

1 0

[tor-browser-build/master] Bug 40094: Bring back torbrowser-android-* targets for Rust
by sysrqb＠torproject.org 16 Sep '20

16 Sep '20

commit e8ff6b182dcd9d721ec97473051bda48d36d822e Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 16 16:54:21 2020 +0000 Bug 40094: Bring back torbrowser-android-* targets for Rust Apparently we can't just replace the torbrowser-android-* targets with android-* ones when including the Rust compilers for application-services. Thus, we revert that part of the patch for #40070. See: #40094 for more details. --- projects/application-services/config | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/projects/application-services/config b/projects/application-services/config index 0560872..336de62 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -23,22 +23,23 @@ input_files: - project: container-image - project: '[% c("var/compiler") %]' name: '[% c("var/compiler") %]' + # We need the torbrowser-* targets for Rust, see: #40094. - project: fenix-rust name: rust-armv7 target_prepend: - - android-armv7 + - torbrowser-android-armv7 - project: fenix-rust name: rust-aarch64 target_prepend: - - android-aarch64 + - torbrowser-android-aarch64 - project: fenix-rust name: rust-x86 target_prepend: - - android-x86 + - torbrowser-android-x86 - project: fenix-rust name: rust-x86_64 target_prepend: - - android-x86_64 + - torbrowser-android-x86_64 - project: nss name: nss-armv7 target_prepend:

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_40094'
by sysrqb＠torproject.org 16 Sep '20

16 Sep '20

commit 6cbd373aad047d53032170be4a3da19a8c49ab8f Merge: 47e2748 e8ff6b1 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Sep 16 17:15:21 2020 +0000 Merge remote-tracking branch 'gkgl/bug_40094' projects/application-services/config | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)

1 0

[tor-browser-build/master] Minor ChangeLog fixups
by sysrqb＠torproject.org 16 Sep '20

16 Sep '20

commit 47e2748ac843e06ab7f38b0363f3df05cfbc993f Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Sep 16 15:31:39 2020 +0000 Minor ChangeLog fixups --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index b0cdf08..c13d834 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -20,12 +20,12 @@ Tor Browser 10.0a7 -- September 14 2020 * Bug 40031: Add licenses for kcp-go and smux. [tor-browser-build] * Bug 40045: Fix complete .mar file creation for dmg2mar [tor-browser-build] * Bug 40065: Bump debootstrap-image ubuntu_version to 20.04.1 [tor-browser-build] - * Bug 40087: Deterministically add HTTPS Everywhere into omni.ja - * Bug 40090: NSIS 3.06.1 based builds are not reproducible anymore + * Bug 40087: Deterministically add HTTPS Everywhere into omni.ja [tor-browser-build] * Windows * Bug 40052: Bump NSIS to 3.06.1 [tor-browser-build] * Bug 40071: Be explicit about no SEH with mingw-w64 on 32bit systems [tor-browser-build] * Bug 40077: Don't pass --no-insert-timestamp when building Firefox [tor-browser-build] + * Bug 40090: NSIS 3.06.1 based builds are not reproducible anymore [tor-browser-build] Tor Browser 10.0a6 -- August 26 2020 * All Platforms

1 0

[tor-browser/tor-browser-78.2.0esr-10.0-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by sysrqb＠torproject.org 16 Sep '20

16 Sep '20

commit 7b9d33cf056c87ed10023f2d60e2021e2b040b32 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Sep 15 23:41:01 2020 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index c18489972abe..4e67ee2ef26e 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit c18489972abef8b449ad8b53356cda5e3aea601b +Subproject commit 4e67ee2ef26e28da0f02a0e43e22a61ee33c6d4d

1 0

[torbutton/master] Translations update
by sysrqb＠torproject.org 16 Sep '20

16 Sep '20

commit 4e67ee2ef26e28da0f02a0e43e22a61ee33c6d4d Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Sep 15 23:38:27 2020 +0000 Translations update --- chrome/locale/ar/aboutTor.dtd | 4 ++ chrome/locale/bn-BD/aboutTor.dtd | 4 ++ chrome/locale/ca/aboutTor.dtd | 4 ++ chrome/locale/ca/torbutton.properties | 76 ++++++++++++------------ chrome/locale/cs/aboutTor.dtd | 4 ++ chrome/locale/da/aboutTor.dtd | 4 ++ chrome/locale/de/aboutTor.dtd | 4 ++ chrome/locale/el/aboutTor.dtd | 4 ++ chrome/locale/es-AR/aboutTor.dtd | 4 ++ chrome/locale/es-ES/aboutTor.dtd | 4 ++ chrome/locale/eu/aboutTor.dtd | 4 ++ chrome/locale/fa/aboutTor.dtd | 4 ++ chrome/locale/fr/aboutTor.dtd | 4 ++ chrome/locale/ga-IE/aboutTor.dtd | 6 +- chrome/locale/ga-IE/browserOnboarding.properties | 12 ++-- chrome/locale/ga-IE/torbutton.dtd | 4 +- chrome/locale/ga-IE/torbutton.properties | 54 ++++++++--------- chrome/locale/he/aboutTor.dtd | 4 ++ chrome/locale/hu/aboutTBUpdate.dtd | 4 +- chrome/locale/hu/aboutTor.dtd | 8 ++- chrome/locale/hu/brand.dtd | 8 +-- chrome/locale/hu/torbutton.properties | 4 +- chrome/locale/id/aboutTor.dtd | 4 ++ chrome/locale/is/aboutTor.dtd | 4 ++ chrome/locale/it/aboutTor.dtd | 6 +- chrome/locale/it/brand.dtd | 6 +- chrome/locale/it/branding/tor-browser-brand.ftl | 2 +- chrome/locale/it/browserOnboarding.properties | 12 ++-- chrome/locale/it/torbutton.dtd | 8 +-- chrome/locale/it/torbutton.properties | 66 ++++++++++---------- chrome/locale/ja/aboutTor.dtd | 4 ++ chrome/locale/ja/torbutton.properties | 14 ++--- chrome/locale/ka/aboutTor.dtd | 4 ++ chrome/locale/ko/aboutTor.dtd | 4 ++ chrome/locale/lt/aboutTor.dtd | 4 ++ chrome/locale/mk/aboutTor.dtd | 4 ++ chrome/locale/ms/aboutTor.dtd | 4 ++ chrome/locale/nb-NO/aboutTor.dtd | 4 ++ chrome/locale/nl/aboutTor.dtd | 4 ++ chrome/locale/pl/aboutTor.dtd | 4 ++ chrome/locale/pt-BR/aboutTor.dtd | 4 ++ chrome/locale/ro/aboutTor.dtd | 4 ++ chrome/locale/ru/aboutTor.dtd | 4 ++ chrome/locale/sv-SE/aboutTor.dtd | 4 ++ chrome/locale/th/aboutTor.dtd | 4 ++ chrome/locale/tr/aboutTor.dtd | 4 ++ chrome/locale/vi/aboutTor.dtd | 4 ++ chrome/locale/zh-CN/aboutTor.dtd | 4 ++ chrome/locale/zh-CN/torbutton.properties | 22 +++---- chrome/locale/zh-TW/aboutTor.dtd | 4 ++ 50 files changed, 294 insertions(+), 150 deletions(-) diff --git a/chrome/locale/ar/aboutTor.dtd b/chrome/locale/ar/aboutTor.dtd index 2ad75578..e6d9941d 100644 --- a/chrome/locale/ar/aboutTor.dtd +++ b/chrome/locale/ar/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "اشترك للحصول على أخبار تور."> <!ENTITY aboutTor.donationBanner.freeToUse "تور متاح مجاناً بفضل التبرعات من الأشخاص مثلك"> <!ENTITY aboutTor.donationBanner.buttonA "تبرع الآن"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/bn-BD/aboutTor.dtd b/chrome/locale/bn-BD/aboutTor.dtd index a089acb9..35fed0f0 100644 --- a/chrome/locale/bn-BD/aboutTor.dtd +++ b/chrome/locale/bn-BD/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "টর নিউজ-এর জন্য সাইন আপ করুন ।"> <!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> <!ENTITY aboutTor.donationBanner.buttonA "এখুনি দান করুন! "> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/ca/aboutTor.dtd b/chrome/locale/ca/aboutTor.dtd index 99f9542b..0952deae 100644 --- a/chrome/locale/ca/aboutTor.dtd +++ b/chrome/locale/ca/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "Inscriviu-vos a les noticies de Tor."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor és d'ús gratuït gràcies als donatius de persones com vós."> <!ENTITY aboutTor.donationBanner.buttonA "Feu una donació"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/ca/torbutton.properties b/chrome/locale/ca/torbutton.properties index e6480677..8698caba 100644 --- a/chrome/locale/ca/torbutton.properties +++ b/chrome/locale/ca/torbutton.properties @@ -60,7 +60,7 @@ updateDownloadingPanelUILabel=S'està baixant l'actualització %S # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Connexió xifrada (Onion Service, %1$S, claus de %2$S bits, %3$S) pageInfo_OnionEncryption=Connexió xifrada (Onion Service) -pageInfo_OnionName=Onion Name: +pageInfo_OnionName=Nom .onion: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Més informació @@ -70,48 +70,48 @@ onionServices.errorPage.onionSite=Lloc onion # LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with # an error code, e.g., 0xF3. # Tor SOCKS error 0xF0: -onionServices.descNotFound.pageTitle=Problem Loading Onionsite -onionServices.descNotFound.header=Onionsite Not Found -onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. -onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. +onionServices.descNotFound.pageTitle=S'ha produït un problema en carregar el lloc .onion +onionServices.descNotFound.header=No s'ha trobat el lloc .onion +onionServices.descNotFound=La causa més probable és que el lloc .onion és fora de línia. Contacte amb l'administrador del lloc .onion. +onionServices.descNotFound.longDescription=Detalls: %S — El descriptor del servei Onion sol·licitat no es pot trobar en l'anell d'etiquetes i per tant el client no pot aconseguir el servei. # Tor SOCKS error 0xF1: -onionServices.descInvalid.pageTitle=Problem Loading Onionsite -onionServices.descInvalid.header=Onionsite Cannot Be Reached -onionServices.descInvalid=The onionsite is unreachable due an internal error. -onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed. +onionServices.descInvalid.pageTitle=S'ha produït un problema en carregar el lloc .onion +onionServices.descInvalid.header=El lloc Onion no es pot aconseguir +onionServices.descInvalid=El lloc Onion no es pot aconseguir a causa d'un error intern. +onionServices.descInvalid.longDescription=Detalls: %S — El descriptor del servei Onion sol·licitat no es pot analitzar o la validació de la signatura ha fallat. # Tor SOCKS error 0xF2: -onionServices.introFailed.pageTitle=Problem Loading Onionsite -onionServices.introFailed.header=Onionsite Has Disconnected -onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. -onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. +onionServices.introFailed.pageTitle=S'ha produït un problema en carregar el lloc .onion +onionServices.introFailed.header=El lloc .onion ha desconectat +onionServices.introFailed=La causa més probable és que el lloc .onion és fora de línia. Contacte amb l'administrador del lloc .onion. +onionServices.introFailed.longDescription=Detalls: %S — Ha fallat la introducció, el que significa que el descriptor s'ha trobat però el servei ja no es troba connectat al punt d'introducció. Segurament el servei ha canviat de descriptor, o no és iniciat. # Tor SOCKS error 0xF3: -onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite -onionServices.rendezvousFailed.header=Unable to Connect to Onionsite -onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later. -onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. +onionServices.rendezvousFailed.pageTitle=S'ha produït un problema en carregar el lloc .onion +onionServices.rendezvousFailed.header=No s'ha pogut connectar al lloc .onion +onionServices.rendezvousFailed=El lloc Onion està ocupat o la xarxa Tor està sobrecarregada. Proveu de nou més tard. +onionServices.rendezvousFailed.longDescription=Detalls: %S — El client a fallat en interactuar amb el servei, el que significa que el client no podia finalitzar la connexió. # Tor SOCKS error 0xF4: -onionServices.clientAuthMissing.pageTitle=Authorization Required -onionServices.clientAuthMissing.header=Onionsite Requires Authentication -onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided. -onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing. +onionServices.clientAuthMissing.pageTitle=Es requereix autorització +onionServices.clientAuthMissing.header=El lloc .onion requereix autenticació +onionServices.clientAuthMissing=L'accés al lloc .onion requereix una clau però no se n'ha proporcionat cap. +onionServices.clientAuthMissing.longDescription=Detalls: %S — El client ha baixat el descriptor del servei Onion sol·licitat, però no ha pogut desxifrar el seu contingut perquè falta la informació de l'autorització del client. # Tor SOCKS error 0xF5: onionServices.clientAuthIncorrect.pageTitle=Ha fallat l'autorització -onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed -onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator. -onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. +onionServices.clientAuthIncorrect.header=Ha fallat l'autenticació del lloc Onion +onionServices.clientAuthIncorrect=La clau proporcionada no és correcta o s'ha revocat. Contacteu amb l'administrador del lloc Onion. +onionServices.clientAuthIncorrect.longDescription=Detalls: %S — El client ha pogut baixar el descriptor del servei Onion sol·licitat, però no ha pogut desxifrar el seu contingut utilitzant la informació d'autorització del client proporcionada. Això podria significar que l'accés s'ha revocat. # Tor SOCKS error 0xF6: -onionServices.badAddress.pageTitle=Problem Loading Onionsite -onionServices.badAddress.header=Invalid Onionsite Address -onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly. -onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. +onionServices.badAddress.pageTitle=S'ha produït un problema en carregar el lloc .onion +onionServices.badAddress.header=L'adreça del lloc .onion no és vàlida +onionServices.badAddress=L'adreça del servei Onion proporcionada no és vàlida. Comproveu que l'heu introduïda correctament. +onionServices.badAddress.longDescription=Detalls: %S — L'adreça .onion proporcionada no és vàlida. Aquest error ocorre per una de les raons següents: la suma de comprovació de l'adreça no concorda, la clau pública ed25519 no és válida, o la codificació no és vàlida. # Tor SOCKS error 0xF7: -onionServices.introTimedOut.pageTitle=Problem Loading Onionsite -onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out -onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection. -onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. +onionServices.introTimedOut.pageTitle=S'ha produït un problema en carregar el lloc .onion +onionServices.introTimedOut.header=Esgotat el temps de creació del circuit del lloc Onion +onionServices.introTimedOut=Ha fallat la connexió amb el lloc Onion, possiblement a causa d'una connexió a la xarxa pobra. +onionServices.introTimedOut.longDescription=Detalls: %S — La connexió al servei Onion sol·licitat ha esgotat el temps mentre provava de construir el circuit de connexió. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description2=%S is requesting that you authenticate. +onionServices.authPrompt.description2=%S sol·licita que us autentiqueu. onionServices.authPrompt.keyPlaceholder=Introduïu la vostra clau privada per a aquest servei ceba onionServices.authPrompt.done=Fet onionServices.authPrompt.doneAccessKey=d @@ -130,15 +130,15 @@ onionServices.authPreferences.failedToGetKeys=No es poden recuperar les claus de onionServices.authPreferences.failedToRemoveKey=No s'ha pogut suprimir la clau # Onion-Location strings. -onionLocation.alwaysPrioritize=Always Prioritize Onions +onionLocation.alwaysPrioritize=Sempre prioritza els Onions onionLocation.alwaysPrioritizeAccessKey=p onionLocation.notNow=Ara no onionLocation.notNowAccessKey=p -onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship. -onionLocation.tryThis=Try Onion Services -onionLocation.onionAvailable=.onion available +onionLocation.description=Hi ha una versió més privada i segura d'aquest lloc web disponible a través de la xarxa Tor, mitjançant serveis Onion. Aquests serveis ajuden els creadors web i els seus visitants a vèncer la vigilància i la censura. +onionLocation.tryThis=Prova els serveis Onion +onionLocation.onionAvailable=.onion disponible onionLocation.learnMore=Més informació... onionLocation.always=Sempre onionLocation.askEverytime=Demana-ho cada vegada -onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. +onionLocation.prioritizeOnionsDescription=Prioritza els llocs .onion si se'n coneixen. onionLocation.onionServicesTitle=Serveis Onion diff --git a/chrome/locale/cs/aboutTor.dtd b/chrome/locale/cs/aboutTor.dtd index 00747b4c..a4906cd1 100644 --- a/chrome/locale/cs/aboutTor.dtd +++ b/chrome/locale/cs/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "Přihlaste se k odběru zpravodaje Toru."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> <!ENTITY aboutTor.donationBanner.buttonA "Přispějte"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/da/aboutTor.dtd b/chrome/locale/da/aboutTor.dtd index 789e4a0d..7076fca9 100644 --- a/chrome/locale/da/aboutTor.dtd +++ b/chrome/locale/da/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "Tilmeld Tor-nyheder."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor er gratis at bruge takke være donationer fra personer som dig."> <!ENTITY aboutTor.donationBanner.buttonA "Donér nu"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/de/aboutTor.dtd b/chrome/locale/de/aboutTor.dtd index afb1ce34..f8cac6a3 100644 --- a/chrome/locale/de/aboutTor.dtd +++ b/chrome/locale/de/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "Tor-Nachrichten abonnieren."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor ist aufgrund von Spenden von Leuten wie dir frei nutzbar."> <!ENTITY aboutTor.donationBanner.buttonA "Spende jetzt"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/el/aboutTor.dtd b/chrome/locale/el/aboutTor.dtd index 6c086733..8a4711ac 100644 --- a/chrome/locale/el/aboutTor.dtd +++ b/chrome/locale/el/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "Εγγραφτείτε για τα νέα του Tor."> <!ENTITY aboutTor.donationBanner.freeToUse "Το Tor είναι ελεύθερο λογισμικό, λόγω δωρεών από άτομα σαν κι εσας."> <!ENTITY aboutTor.donationBanner.buttonA "Κάντε μια δωρεά τώρα!"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/es-AR/aboutTor.dtd b/chrome/locale/es-AR/aboutTor.dtd index e1400c05..d3c9dc22 100644 --- a/chrome/locale/es-AR/aboutTor.dtd +++ b/chrome/locale/es-AR/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "Registrate en Tor News."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor es gratis gracias a las donaciones de personas como vos."> <!ENTITY aboutTor.donationBanner.buttonA "Doná ahora"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/es-ES/aboutTor.dtd b/chrome/locale/es-ES/aboutTor.dtd index 3909b8f4..5a32a47a 100644 --- a/chrome/locale/es-ES/aboutTor.dtd +++ b/chrome/locale/es-ES/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "Inscríbete en Tor News."> <!ENTITY aboutTor.donationBanner.freeToUse "Se puede usar Tor libremente por las donaciones de personas como tu."> <!ENTITY aboutTor.donationBanner.buttonA "Dona ahora."> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/eu/aboutTor.dtd b/chrome/locale/eu/aboutTor.dtd index b115af74..8fba9ac7 100644 --- a/chrome/locale/eu/aboutTor.dtd +++ b/chrome/locale/eu/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "Harpidetu Tor berrietara"> <!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> <!ENTITY aboutTor.donationBanner.buttonA "Egin dohaintza orain"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/fa/aboutTor.dtd b/chrome/locale/fa/aboutTor.dtd index 8fee56e7..27ab898c 100644 --- a/chrome/locale/fa/aboutTor.dtd +++ b/chrome/locale/fa/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "ثبت‌نام برای اخبار Tor."> <!ENTITY aboutTor.donationBanner.freeToUse "تور برای استفاده رایگان بوده و این به خاطر افرادی مانند شما می باشد."> <!ENTITY aboutTor.donationBanner.buttonA "اکنون اهداء کنید"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/fr/aboutTor.dtd b/chrome/locale/fr/aboutTor.dtd index 0356e3d8..5c09efe7 100644 --- a/chrome/locale/fr/aboutTor.dtd +++ b/chrome/locale/fr/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "Inscrivez-vous aux nouvelles de Tor"> <!ENTITY aboutTor.donationBanner.freeToUse "Tor peut être utilisé gratuitement grâce aux dons de personnes telles que vous."> <!ENTITY aboutTor.donationBanner.buttonA "Faites un don maintenant"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/ga-IE/aboutTor.dtd b/chrome/locale/ga-IE/aboutTor.dtd index 436d2f91..e9c097d3 100644 --- a/chrome/locale/ga-IE/aboutTor.dtd +++ b/chrome/locale/ga-IE/aboutTor.dtd @@ -27,5 +27,9 @@ <!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.freeToUse "Tor is free to use because of donations from people like you."> +<!ENTITY aboutTor.donationBanner.freeToUse "Tá Tor saor in aisce a bhuí le bronntanais airgid ó dhaoine cosúil leatsa."> <!ENTITY aboutTor.donationBanner.buttonA "Tabhair síntiús airgid anois"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/ga-IE/browserOnboarding.properties b/chrome/locale/ga-IE/browserOnboarding.properties index 754e6467..fed53951 100644 --- a/chrome/locale/ga-IE/browserOnboarding.properties +++ b/chrome/locale/ga-IE/browserOnboarding.properties @@ -15,8 +15,8 @@ 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.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences. -onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings +onboarding.tour-tor-network.description-para2=NUA: Gheobhaidh tú Socruithe Líonra Tor sna Sainroghanna, an comhéadan lenar féidir drochid a iarraidh san áireamh. +onboarding.tour-tor-network.action-button=Athraigh Socruithe Líonra Tor onboarding.tour-tor-network.button=Téigh go dtí Taispeántas an Chiorcaid onboarding.tour-tor-circuit-display=Taispeántas an Chiorcaid @@ -49,10 +49,10 @@ onboarding.tour-tor-update.prefix-new=Nua onboarding.tour-tor-update.prefix-updated=Nuashonraithe onboarding.tour-tor-toolbar=Barra Uirlisí -onboarding.tour-tor-toolbar-update-9.0.title=Goodbye Onion Button. -onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser. -onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu. -onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity +onboarding.tour-tor-toolbar-update-9.0.title=Slán agat, a Chnaipe Onion. +onboarding.tour-tor-toolbar-update-9.0.description=Ba mhaith linn d'eispéireas iomlán le Tor a chomhtháthú le Brabhsálaí Tor. +onboarding.tour-tor-toolbar-update-9.0.description-para2=Dá bharr sin, in áit an chnaipe onion, tá tú anois in ann do Chiorcad Tor a fheiceáil tríd an [i] sa bharra suímh, agus Aitheantas Nua a iarraidh ón gcnaipe sa bharra uirlisí nó ón roghchlár [≡]. +onboarding.tour-tor-toolbar-update-9.0.button=Conas a iarrtar Aitheantas Nua onboarding.tour-tor-toolbar-update-9.0.next-button=Téigh go Líonra Tor # Circuit Display onboarding. diff --git a/chrome/locale/ga-IE/torbutton.dtd b/chrome/locale/ga-IE/torbutton.dtd index dbca0894..8cb1458b 100644 --- a/chrome/locale/ga-IE/torbutton.dtd +++ b/chrome/locale/ga-IE/torbutton.dtd @@ -49,5 +49,5 @@ <!ENTITY torbutton.circuit_display.new_circuit "Ciorcad Nua don Suíomh seo">  -<!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> -<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> +<!ENTITY torbutton.onionServices.authPrompt.tooltip "Oscail leid fhíordheimhnithe don tseirbhís onion"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Meabhraigh an eochair seo"> diff --git a/chrome/locale/ga-IE/torbutton.properties b/chrome/locale/ga-IE/torbutton.properties index aa201bee..1c7295c1 100644 --- a/chrome/locale/ga-IE/torbutton.properties +++ b/chrome/locale/ga-IE/torbutton.properties @@ -8,8 +8,8 @@ torbutton.circuit_display.unknown_country = Tír anaithnid torbutton.circuit_display.guard = Garda torbutton.circuit_display.guard_note = Seans nach n-athrófar an nód [Guard]. torbutton.circuit_display.learn_more = Tuilleadh eolais -torbutton.circuit_display.click_to_copy = Click to Copy -torbutton.circuit_display.copied = Copied! +torbutton.circuit_display.click_to_copy = Cliceáil le Cóipeáil +torbutton.circuit_display.copied = Cóipeáilte! 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ú torbutton.panel.tooltip.enabled = Cliceáil le Tor a dhíchumasú @@ -60,32 +60,32 @@ updateDownloadingPanelUILabel=Nuashonrú %S á íoslódáil # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Ceangal Criptithe (Seirbhís Onion, %1$S, eochracha %2$S giotán, %3$S) pageInfo_OnionEncryption=Ceangal Criptithe (Seirbhís Onion) -pageInfo_OnionName=Onion Name: +pageInfo_OnionName=Ainm an Onion: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Tuilleadh eolais -onionServices.errorPage.browser=Browser +onionServices.errorPage.browser=Brabhsálaí onionServices.errorPage.network=Líonra -onionServices.errorPage.onionSite=Onionsite +onionServices.errorPage.onionSite=Suíomh Onion # LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with # an error code, e.g., 0xF3. # Tor SOCKS error 0xF0: -onionServices.descNotFound.pageTitle=Problem Loading Onionsite -onionServices.descNotFound.header=Onionsite Not Found -onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +onionServices.descNotFound.pageTitle=Níorbh fhéidir an suíomh Onion a lódáil +onionServices.descNotFound.header=Suíomh Onion gan aimsiú +onionServices.descNotFound=Is dócha go bhfuil an suíomh onion as líne. Téigh i dteagmháil le riarthóir an tsuímh. onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. # Tor SOCKS error 0xF1: -onionServices.descInvalid.pageTitle=Problem Loading Onionsite -onionServices.descInvalid.header=Onionsite Cannot Be Reached +onionServices.descInvalid.pageTitle=Níorbh fhéidir an suíomh Onion a lódáil +onionServices.descInvalid.header=Ní féidir teagmháil a dhéanamh leis an suíomh Onion onionServices.descInvalid=The onionsite is unreachable due an internal error. onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed. # Tor SOCKS error 0xF2: -onionServices.introFailed.pageTitle=Problem Loading Onionsite -onionServices.introFailed.header=Onionsite Has Disconnected -onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +onionServices.introFailed.pageTitle=Níorbh fhéidir an suíomh Onion a lódáil +onionServices.introFailed.header=Bhris an suíomh Onion an ceangal +onionServices.introFailed=Is dócha go bhfuil an suíomh onion as líne. Téigh i dteagmháil le riarthóir an tsuímh. onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. # Tor SOCKS error 0xF3: -onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite +onionServices.rendezvousFailed.pageTitle=Níorbh fhéidir an suíomh Onion a lódáil onionServices.rendezvousFailed.header=Unable to Connect to Onionsite onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later. onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. @@ -100,34 +100,34 @@ onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator. onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. # Tor SOCKS error 0xF6: -onionServices.badAddress.pageTitle=Problem Loading Onionsite +onionServices.badAddress.pageTitle=Níorbh fhéidir an suíomh Onion a lódáil onionServices.badAddress.header=Invalid Onionsite Address onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly. onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. # Tor SOCKS error 0xF7: -onionServices.introTimedOut.pageTitle=Problem Loading Onionsite +onionServices.introTimedOut.pageTitle=Níorbh fhéidir an suíomh Onion a lódáil onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection. onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. onionServices.authPrompt.description2=%S is requesting that you authenticate. -onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service +onionServices.authPrompt.keyPlaceholder=Cuir isteach d'eochair phríobháideach le haghaidh na seirbhíse onion seo onionServices.authPrompt.done=Déanta onionServices.authPrompt.doneAccessKey=d -onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) -onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key -onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPrompt.invalidKey=Cuir isteach eochair bhailí (52 carachtar base32, nó 44 carachtar base64) +onionServices.authPrompt.failedToSetKey=Níorbh fhéidir Tor a chumrú le d'eochair +onionServices.authPreferences.header=Fíordheimhniú do Sheirbhísí Onion onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. -onionServices.authPreferences.savedKeys=Saved Keys… -onionServices.authPreferences.dialogTitle=Onion Service Keys -onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer -onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.savedKeys=Eochracha Sábháilte... +onionServices.authPreferences.dialogTitle=Eochracha Seirbhíse Onion +onionServices.authPreferences.dialogIntro=Tá eochracha a bhaineann leis na suímh onion seo stóráilte ar do ríomhaire +onionServices.authPreferences.onionSite=Suíomh Onion onionServices.authPreferences.onionKey=Eochair onionServices.authPreferences.remove=Bain -onionServices.authPreferences.removeAll=Remove All -onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor -onionServices.authPreferences.failedToRemoveKey=Unable to remove key +onionServices.authPreferences.removeAll=Bain Uile +onionServices.authPreferences.failedToGetKeys=Níorbh fhéidir eochracha a fháil ó Tor +onionServices.authPreferences.failedToRemoveKey=Níorbh fhéidir an eochair a bhaint # Onion-Location strings. onionLocation.alwaysPrioritize=Always Prioritize Onions diff --git a/chrome/locale/he/aboutTor.dtd b/chrome/locale/he/aboutTor.dtd index 520d773b..7f9fb329 100644 --- a/chrome/locale/he/aboutTor.dtd +++ b/chrome/locale/he/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "הירשם עבור חדשות Tor."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor חינמי לשימוש בגלל תרומות מאנשים כמוך."> <!ENTITY aboutTor.donationBanner.buttonA "תרום עכשיו"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/hu/aboutTBUpdate.dtd b/chrome/locale/hu/aboutTBUpdate.dtd index 946bb36b..1d967e90 100644 --- a/chrome/locale/hu/aboutTBUpdate.dtd +++ b/chrome/locale/hu/aboutTBUpdate.dtd @@ -1,5 +1,5 @@ -<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser Változási napló"> -<!ENTITY aboutTBUpdate.updated "Tor Browser frissítve."> +<!ENTITY aboutTBUpdate.changelogTitle "Tor Böngésző Változási napló"> +<!ENTITY aboutTBUpdate.updated "Tor Böngésző frissítve."> <!ENTITY aboutTBUpdate.linkPrefix "Az erről a kiadásról szóló legfrissebb információkért"> <!ENTITY aboutTBUpdate.linkLabel "látogassa meg weboldalunkat"> <!ENTITY aboutTBUpdate.linkSuffix "."> diff --git a/chrome/locale/hu/aboutTor.dtd b/chrome/locale/hu/aboutTor.dtd index 6682d2ff..86740e18 100644 --- a/chrome/locale/hu/aboutTor.dtd +++ b/chrome/locale/hu/aboutTor.dtd @@ -17,10 +17,10 @@ <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Kérdések?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Tekintse meg a Tor Browser Útmutatónkat"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Tekintse meg a Tor Böngésző Útmutatónkat">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Útmutató"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Böngésző Útmutató"> <!ENTITY aboutTor.tor_mission.label "A Tor Project egy a US 501(c)(3) szerinti non-profit szervezet, amely az emberi jogokért és szabadságért harcol, nyílt forráskódú anonimitás és adatvédelmi technológiák fejlesztésével és terjesztésével, támogatva azok korlátlan elérhetőségét és használatát, támogassák a tudományos ás általános megértésüket."> <!ENTITY aboutTor.getInvolved.label "Vegyen részt"> @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "Iratkozzon fel a Tor hírekhez."> <!ENTITY aboutTor.donationBanner.freeToUse "A Tor ingyenes az Önhöz hasonló személyek támogatásai miatt."> <!ENTITY aboutTor.donationBanner.buttonA "Támogasson most"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/hu/brand.dtd b/chrome/locale/hu/brand.dtd index 3e0bacba..fa67c73d 100644 --- a/chrome/locale/hu/brand.dtd +++ b/chrome/locale/hu/brand.dtd @@ -2,10 +2,10 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShorterName "Tor Browser"> -<!ENTITY brandShortName "Tor Browser"> -<!ENTITY brandFullName "Tor Browser"> -<!ENTITY vendorShortName "Tor Project"> +<!ENTITY brandShorterName "Tor Böngésző"> +<!ENTITY brandShortName "Tor Böngésző"> +<!ENTITY brandFullName "Tor Böngésző"> +<!ENTITY vendorShortName "Tor Projekt"> <!ENTITY trademarkInfo.part1 "A 'Tor' és az 'Onion Logo' a Tor Project, Inc. bejegyzett védjegyei.">  +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/is/aboutTor.dtd b/chrome/locale/is/aboutTor.dtd index 14bad9ac..1d998a5c 100644 --- a/chrome/locale/is/aboutTor.dtd +++ b/chrome/locale/is/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "Skráðu þig til að fá Tor-fréttir."> <!ENTITY aboutTor.donationBanner.freeToUse "Öllum er frjálst að nota Tor vegna styrkja frá fólki eins og þér."> <!ENTITY aboutTor.donationBanner.buttonA "Styrkja núna"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/it/aboutTor.dtd b/chrome/locale/it/aboutTor.dtd index 67dbd1d9..4fecbcda 100644 --- a/chrome/locale/it/aboutTor.dtd +++ b/chrome/locale/it/aboutTor.dtd @@ -6,7 +6,7 @@ <!ENTITY aboutTor.title "Info su Tor"> -<!ENTITY aboutTor.viewChangelog.label "Vedi cronologia"> +<!ENTITY aboutTor.viewChangelog.label "Vedi il Changelog"> <!ENTITY aboutTor.ready.label "Naviga. Privatamente."> <!ENTITY aboutTor.ready2.label "Sei pronto per l'esperienza di navigazione più privata al mondo."> @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "Registrati alle Tor News."> <!ENTITY aboutTor.donationBanner.freeToUse "L'utilizzo di Tor è gratuito grazie alle donazioni fatte da persone come te."> <!ENTITY aboutTor.donationBanner.buttonA "Dona Adesso"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/it/brand.dtd b/chrome/locale/it/brand.dtd index a56d8b7f..11aa990b 100644 --- a/chrome/locale/it/brand.dtd +++ b/chrome/locale/it/brand.dtd @@ -6,7 +6,7 @@ <!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> -<!ENTITY trademarkInfo.part1 "'Tor' e 'Onion Logo' sono marchi registrati su Tor Project, Inc."> +<!ENTITY trademarkInfo.part1 "'Tor' e 'Onion Logo' sono marchi registrati di Tor Project, Inc.">  @@ -14,6 +14,6 @@  <!ENTITY plugins.installed.find "Clicca per caricare i plugin di sistema installati"> -<!ENTITY plugins.installed.enable "Permetti plugin"> -<!ENTITY plugins.installed.disable "Disabilita plugin"> +<!ENTITY plugins.installed.enable "Abilita i plugin"> +<!ENTITY plugins.installed.disable "Disabilita i plugin"> <!ENTITY plugins.installed.disable.tip "Clicca per evitare di caricare i plugin di sistema"> diff --git a/chrome/locale/it/branding/tor-browser-brand.ftl b/chrome/locale/it/branding/tor-browser-brand.ftl index 5a97eead..8336788f 100644 --- a/chrome/locale/it/branding/tor-browser-brand.ftl +++ b/chrome/locale/it/branding/tor-browser-brand.ftl @@ -9,4 +9,4 @@ # remain unchanged across different versions (Nightly, Beta, etc.). -brand-product-name = Tor Browser -vendor-short-name = Tor Project -trademarkInfo = 'Tor' e 'Onion Logo' sono marchi registrati su Tor Project, Inc. +trademarkInfo = 'Tor' e 'Onion Logo' sono marchi registrati di Tor Project, Inc. diff --git a/chrome/locale/it/browserOnboarding.properties b/chrome/locale/it/browserOnboarding.properties index 468e7d95..23b61f19 100644 --- a/chrome/locale/it/browserOnboarding.properties +++ b/chrome/locale/it/browserOnboarding.properties @@ -15,8 +15,8 @@ onboarding.tour-tor-privacy.button=Vai alla rete Tor 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.description-para2=NUOVO: Le impostazioni di rete Tor, inclusa la possibilità di chiedere un ponte dove Tor è bloccato, si trovano ora sotto Preferenze. -onboarding.tour-tor-network.action-button=Modifica le tue impostazioni di rete Tor. +onboarding.tour-tor-network.description-para2=NUOVO: Le impostazioni di rete Tor, inclusa la possibilità di chiedere un bridge nei luoghi dove Tor è bloccato, si trovano ora sotto Preferenze. +onboarding.tour-tor-network.action-button=Modifica le tue Impostazioni di Rete Tor. onboarding.tour-tor-network.button=Visualizza il circuito onboarding.tour-tor-circuit-display=Visualizzazione circuito @@ -28,7 +28,7 @@ onboarding.tour-tor-circuit-display.next-button=Vai in Sicurezza onboarding.tour-tor-security=Sicurezza 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.description-suffix=Nota: per impostazione predefinita, NoScript e HTTPS Everywhere non sono inclusi nella barra degli strumenti, ma è possibile personalizzare la barra degli strumenti per aggiungerli. +onboarding.tour-tor-security.description-suffix=Nota: per impostazione predefinita, NoScript e HTTPS Everywhere non sono inclusi nella barra degli strumenti, ma è possibile personalizzare tale barra per aggiungerli. onboarding.tour-tor-security-level.button=Vedi il tuo livello di sicurezza onboarding.tour-tor-security-level.next-button=Vai in Consigli per l'esperienza @@ -44,7 +44,7 @@ onboarding.tour-tor-onion-services.description=I servizi onion sono siti che ter onboarding.tour-tor-onion-services.button=Visita una Cipolla onboarding.tour-tor-onion-services.next-button=Fatto -onboarding.overlay-icon-tooltip-updated2=Guarda cosa c'è di nuovo\nnella %S +onboarding.overlay-icon-tooltip-updated2=Guarda cosa c'è di nuovo\nin %S onboarding.tour-tor-update.prefix-new=Nuovo onboarding.tour-tor-update.prefix-updated=Aggiornato @@ -52,8 +52,8 @@ onboarding.tour-tor-toolbar=Barra degli strumenti onboarding.tour-tor-toolbar-update-9.0.title=Arrivederci Onion Button. onboarding.tour-tor-toolbar-update-9.0.description=Vogliamo che la tua esperienza nell'utilizzo di Tor sia perfettamente integrata in Tor Browser. onboarding.tour-tor-toolbar-update-9.0.description-para2=Ecco perchè ora, invece di usare il bottone cipolla, puoi vedere il tuo circuito Tor attraverso [i] nella barra degli indirizzi e richiedere una nuova identità usando il bottone nella barra degli strumenti o nel menu [≡] . -onboarding.tour-tor-toolbar-update-9.0.button=Come richiedere una nuova identità -onboarding.tour-tor-toolbar-update-9.0.next-button=Vai alla rete Tor +onboarding.tour-tor-toolbar-update-9.0.button=Come Richiedere una Nuova Identità +onboarding.tour-tor-toolbar-update-9.0.next-button=Vai alla Rete Tor # Circuit Display onboarding. onboarding.tor-circuit-display.next=Successivo diff --git a/chrome/locale/it/torbutton.dtd b/chrome/locale/it/torbutton.dtd index c4513582..3a0edd1e 100644 --- a/chrome/locale/it/torbutton.dtd +++ b/chrome/locale/it/torbutton.dtd @@ -1,4 +1,4 @@ -<!ENTITY torbutton.context_menu.new_identity "Nuova identità"> +<!ENTITY torbutton.context_menu.new_identity "Nuova Identità"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Nuovo Circuito Tor per questo Sito"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> @@ -37,14 +37,14 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Alcuni caratteri e simboli matematici sono disattivati."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Alcuni caratteri, icone, simboli matematici e immagini sono disattivati."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio, video (media HTML5) e WebGL sono click-to-play."> -<!ENTITY torbutton.prefs.sec_custom_warning "Personalizzata"> +<!ENTITY torbutton.prefs.sec_custom_warning "Personalizzato"> <!ENTITY torbutton.prefs.sec_overview "Disabilita alcune funzionalità web che possono essere utilizzate per attaccare la tua sicurezza e anonimato."> <!ENTITY torbutton.prefs.sec_standard_tooltip "Livello di sicurezza: Standard"> <!ENTITY torbutton.prefs.sec_safer_tooltip "Livello di sicurezza: Più sicuro"> <!ENTITY torbutton.prefs.sec_safest_tooltip "Livello di sicurezza: Il più sicuro"> <!ENTITY torbutton.prefs.sec_custom_summary "Le tue impostazioni personalizzate del browser sembrano avere preferenze di sicurezza insolite. Per motivi di sicurezza e privacy, ti consigliamo di scegliere uno dei livelli di sicurezza predefiniti."> -<!ENTITY torbutton.prefs.sec_restore_defaults "Ripristina impostazioni iniziali"> -<!ENTITY torbutton.prefs.sec_advanced_security_settings "Impostazioni di sicurezza avanzate..."> +<!ENTITY torbutton.prefs.sec_restore_defaults "Ripristina Impostazioni Iniziali"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "Impostazioni di Sicurezza Avanzate..."> <!ENTITY torbutton.circuit_display.title "Circuito Tor"> <!ENTITY torbutton.circuit_display.new_circuit "Nuovo circuito per questo sito"> diff --git a/chrome/locale/it/torbutton.properties b/chrome/locale/it/torbutton.properties index 5b0f4079..29444943 100644 --- a/chrome/locale/it/torbutton.properties +++ b/chrome/locale/it/torbutton.properties @@ -5,7 +5,7 @@ torbutton.circuit_display.this_browser = Questo browser torbutton.circuit_display.relay = Ripetitore torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Paese sconosciuto -torbutton.circuit_display.guard = Guardia +torbutton.circuit_display.guard = Nodo di guardia torbutton.circuit_display.guard_note = Il tuo nodo [Guardia] non deve cambiare. torbutton.circuit_display.learn_more = Per saperne di più torbutton.circuit_display.click_to_copy = Clicca per copiare @@ -13,8 +13,8 @@ torbutton.circuit_display.copied = Copiato! torbutton.content_sizer.margin_tooltip = Il browser Tor aggiunge questo margine per rendere l'ampiezza e altezza della tua finestra meno distintiva, così si riduce la possibilità di che tu sia tracciato in linea. torbutton.panel.tooltip.disabled = Fai clic per attivare Tor torbutton.panel.tooltip.enabled = Fai clic per disattivare Tor -torbutton.panel.label.disabled = Tor disattivato -torbutton.panel.label.enabled = Tor attivato +torbutton.panel.label.disabled = Tor Disattivato +torbutton.panel.label.enabled = Tor Attivato extensions.torbutton(a)torproject.org.description = Torbutton fornisce un pulsante per configurare le impostazioni di Tor e rimuovere velocemente e facilmente i dati di navigazione privati. torbutton.popup.external.title = Si desidera scaricare un tipo di file esterno? torbutton.popup.external.app = Tor Browser non è in grado di aprire questo file. Sarà necessario usare un'altra applicazione per aprirlo.\n\n @@ -70,43 +70,43 @@ onionServices.errorPage.onionSite=Sito onion # LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with # an error code, e.g., 0xF3. # Tor SOCKS error 0xF0: -onionServices.descNotFound.pageTitle=Problema di caricamento del sito onion -onionServices.descNotFound.header=Sito onion non trovato +onionServices.descNotFound.pageTitle=Problema di Caricamento del Sito Onion +onionServices.descNotFound.header=Sito Onion Non Trovato onionServices.descNotFound=La causa più probabile è che il sito onion sia offline. Contatta l'amministratore del sito onion. onionServices.descNotFound.longDescription=Dettagli: %S — Il descrittore del servizio onion richiesto non può essere trovato nell'hashring, perciò il servizio non è raggiungibile dal client. # Tor SOCKS error 0xF1: -onionServices.descInvalid.pageTitle=Problema di caricamento del sito onion -onionServices.descInvalid.header=Sito onion non raggiungibile +onionServices.descInvalid.pageTitle=Problema di Caricamento del Sito Onion +onionServices.descInvalid.header=Sito Onion Non Raggiungibile onionServices.descInvalid=Il sito onion non è raggiungibile per un errore interno. onionServices.descInvalid.longDescription=Dettagli: %S — Il descrittore del servizio onion richiesto non può essere letto o la validazione della firma è fallita. # Tor SOCKS error 0xF2: -onionServices.introFailed.pageTitle=Problema di caricamento del sito onion -onionServices.introFailed.header=Il sito onion si è disconnesso +onionServices.introFailed.pageTitle=Problema di Caricamento del Sito Onion +onionServices.introFailed.header=Il Sito Onion si è Disconnesso onionServices.introFailed=La causa più probabile è che il sito onion sia offline. Contatta l'amministratore del sito onion. -onionServices.introFailed.longDescription=Dettagli: %S — Introduzione fallita, il che significa che il descrittore è stato trovato ma il servizio non è più connesso al punto di introduzione. Probabilmente il servizio ha cambiato il suo descrittore o non è in esecuzione. +onionServices.introFailed.longDescription=Dettagli: %S — Introduzione fallita, ciò significa che il descrittore è stato trovato ma il servizio non è più connesso al punto di introduzione. Probabilmente il servizio ha cambiato il suo descrittore o non è in esecuzione. # Tor SOCKS error 0xF3: -onionServices.rendezvousFailed.pageTitle=Problema di caricamento del sito onion -onionServices.rendezvousFailed.header=Impossibile connettersi al sito onion +onionServices.rendezvousFailed.pageTitle=Problema di Caricamento del Sito Onion +onionServices.rendezvousFailed.header=Impossibile Connettersi al Sito Onion onionServices.rendezvousFailed=Il sito onion è occupato o la rete Tor è sovraccarica. Riprova più tardi. -onionServices.rendezvousFailed.longDescription=Dettagli: %S — Il client non ha trovato riscontro con il servizio, il che significa che il client non è riuscito a completare la connessione. +onionServices.rendezvousFailed.longDescription=Dettagli: %S — Il client non ha trovato riscontro con il servizio, ciò significa che il client non è riuscito a completare la connessione. # Tor SOCKS error 0xF4: -onionServices.clientAuthMissing.pageTitle=Autorizzazione necessaria -onionServices.clientAuthMissing.header=Il sito onion richiede l'autenticazione +onionServices.clientAuthMissing.pageTitle=Autorizzazione Necessaria +onionServices.clientAuthMissing.header=Il Sito Onion Richiede L'autenticazione onionServices.clientAuthMissing=L'accesso al sito onion richiede una chiave ma non ne è stata fornita nessuna. -onionServices.clientAuthMissing.longDescription=Dettagli: %S — Il client ha scaricato il descrittore del servizio onion richiesto ma non è riuscito a decifrarne il contenuto perchè mancano informazioni di autorizzazione del client. +onionServices.clientAuthMissing.longDescription=Dettagli: %S — Il client ha scaricato il descrittore del servizio onion richiesto, ma non è riuscito a decifrarne il contenuto perché mancano informazioni di autorizzazione del client. # Tor SOCKS error 0xF5: -onionServices.clientAuthIncorrect.pageTitle=Autorizzazione fallita -onionServices.clientAuthIncorrect.header=Autenticazione al sito onion fallita +onionServices.clientAuthIncorrect.pageTitle=Autorizzazione Fallita +onionServices.clientAuthIncorrect.header=Autenticazione al Sito Onion Fallita onionServices.clientAuthIncorrect=La chiave fornita non è corretta o è stata revocata. Contatta l'amministratore del sito onion. -onionServices.clientAuthIncorrect.longDescription=Dettagli: %S — Il client è riuscito a scaricare il descrittore del servizio onion richiesto ma non è riuscito a decifrarne il contenuto usando le informazioni di autorizzazione del client fornite. Potrebbe significare che l'accesso è stato revocato. +onionServices.clientAuthIncorrect.longDescription=Dettagli: %S — Il client è riuscito a scaricare il descrittore del servizio onion richiesto ma non è riuscito a decifrarne il contenuto usando le informazioni di autorizzazione fornite dal client. Potrebbe significare che l'accesso è stato revocato. # Tor SOCKS error 0xF6: -onionServices.badAddress.pageTitle=Problema di caricamento del sito onion -onionServices.badAddress.header=Indirizzo onion non valido +onionServices.badAddress.pageTitle=Problema di Caricamento del Sito Onion +onionServices.badAddress.header=Indirizzo Onion Non Valido onionServices.badAddress=L'indirizzo onion fornito non è valido. Controlla di averlo inserito correttamente. onionServices.badAddress.longDescription=Dettagli: %S — L'indirizzo .onion fornito non è valido. Questo errore accade per uno dei seguenti motivi: il checksum dell'indirizzo non corrisponde, la chiave pubblica ed25519 non è valida o la codifica non è valida. # Tor SOCKS error 0xF7: -onionServices.introTimedOut.pageTitle=Problema di caricamento del sito onion -onionServices.introTimedOut.header=Creazione del circuito onion scaduta +onionServices.introTimedOut.pageTitle=Problema di Caricamento del Sito Onion +onionServices.introTimedOut.header=Creazione del Circuito Onion Scaduta onionServices.introTimedOut=Connessione al sito onion fallita, probabilmente per una connessione di rete debole. onionServices.introTimedOut.longDescription=Dettagli: %S — La connessione al servizio onion richiesto è scaduta mentre si tentava di costruire il circuito di incontro. # @@ -114,31 +114,31 @@ onionServices.introTimedOut.longDescription=Dettagli: %S — La connessione al s onionServices.authPrompt.description2=%S richiede che ti identifichi. onionServices.authPrompt.keyPlaceholder=Inserisci la tua chiave privata per questo servizio onion onionServices.authPrompt.done=Fatto -onionServices.authPrompt.doneAccessKey=d +onionServices.authPrompt.doneAccessKey=f onionServices.authPrompt.invalidKey=Per favore inserisci una chiave valida (52 caratteri base32 o 44 caratteri base64) onionServices.authPrompt.failedToSetKey=Impossibile configurare Tor con la tua chiave -onionServices.authPreferences.header=Autenticazione servizi onion +onionServices.authPreferences.header=Autenticazione Servizi Onion onionServices.authPreferences.overview=Alcuni servizi onion richiedono che ti identifichi con una chiave (una specie di password) prima di potervi accedere. -onionServices.authPreferences.savedKeys=Chiavi salvate… -onionServices.authPreferences.dialogTitle=Chiavi servizio onion +onionServices.authPreferences.savedKeys=Chiavi Salvate… +onionServices.authPreferences.dialogTitle=Chiavi Servizio Onion onionServices.authPreferences.dialogIntro=Le chiavi per il seguente sito onion sono salvate nel tuo computer onionServices.authPreferences.onionSite=Sito onion onionServices.authPreferences.onionKey=Chiave onionServices.authPreferences.remove=Rimuovi onionServices.authPreferences.removeAll=Rimuovi tutte -onionServices.authPreferences.failedToGetKeys=Impossibile recuperare le chiavi da tor +onionServices.authPreferences.failedToGetKeys=Impossibile recuperare le chiavi da Tor onionServices.authPreferences.failedToRemoveKey=Impossibile rimuovere la chiave # Onion-Location strings. -onionLocation.alwaysPrioritize=Priorità sempre agli onion +onionLocation.alwaysPrioritize=Dare Sempre Priorità agli Onion onionLocation.alwaysPrioritizeAccessKey=a -onionLocation.notNow=Non ora +onionLocation.notNow=Non Ora onionLocation.notNowAccessKey=n onionLocation.description=C'è una versione più privata e sicura di questo sito disponibile nella rete Tor tramite i servizi onion. I servizi onion aiutano i gestori dei siti ed i loro visitatori a sconfiggere la sorveglianza e la censura. -onionLocation.tryThis=Prova i servizi onion +onionLocation.tryThis=Prova i Servizi Onion onionLocation.onionAvailable=.onion disponibile onionLocation.learnMore=Maggiori informazioni... onionLocation.always=Sempre onionLocation.askEverytime=Chiedi ogni volta -onionLocation.prioritizeOnionsDescription=Priorità ai siti .onion quando conosciuti. -onionLocation.onionServicesTitle=Servizi onion +onionLocation.prioritizeOnionsDescription=Dare priorità ai siti .onion quando conosciuti. +onionLocation.onionServicesTitle=Servizi Onion diff --git a/chrome/locale/ja/aboutTor.dtd b/chrome/locale/ja/aboutTor.dtd index 10eb73a1..bc1784dc 100644 --- a/chrome/locale/ja/aboutTor.dtd +++ b/chrome/locale/ja/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "Tor ニュースに申し込む。"> <!ENTITY aboutTor.donationBanner.freeToUse "Tor は皆さんからの寄付に支えられています。"> <!ENTITY aboutTor.donationBanner.buttonA "今すぐ寄付"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/ja/torbutton.properties b/chrome/locale/ja/torbutton.properties index c3f8cd23..62437fa5 100644 --- a/chrome/locale/ja/torbutton.properties +++ b/chrome/locale/ja/torbutton.properties @@ -73,32 +73,32 @@ onionServices.errorPage.onionSite=Onion サイト onionServices.descNotFound.pageTitle=Onion サイトの読み込み中に問題が発生しました onionServices.descNotFound.header=Onion サイトが見つかりません onionServices.descNotFound=おそらく、Onion サイトがオフラインになっています。Onion サイトの管理者にお問い合わせください。 -onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. +onionServices.descNotFound.longDescription=詳細： %S — 指定したオニオンサービス記述子はハッシュリングに見つかることができないため、クライアントによって連絡可能ではありません。 # Tor SOCKS error 0xF1: onionServices.descInvalid.pageTitle=Onion サイトの読み込み中に問題が発生しました onionServices.descInvalid.header=Onion サイトに到達できません onionServices.descInvalid=内部エラーにより Onion サイトに到達できません。 -onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed. +onionServices.descInvalid.longDescription=詳細： %S — 指定したオニオンサービス記述子は解析されることができません、それとも署名認証が失敗しました。 # Tor SOCKS error 0xF2: onionServices.introFailed.pageTitle=Onion サイトの読み込み中に問題が発生しました onionServices.introFailed.header=Onion サイトとの接続が切断されました onionServices.introFailed=おそらく、Onion サイトがオフラインになっています。Onion サイトの管理者にお問い合わせください。 -onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. +onionServices.introFailed.longDescription=詳細： %S — 紹介は失敗しました、つまり記述子は見つかりましたがサービスはもはや紹介ポイントと接続されていません。おそらくサービスは記述子を変更しました、それとも動作していません。 # Tor SOCKS error 0xF3: onionServices.rendezvousFailed.pageTitle=Onion サイトの読み込み中に問題が発生しました onionServices.rendezvousFailed.header=Onion サイトに接続できません onionServices.rendezvousFailed=Onion サイトがビジー状態であるか、または Tor ネットワークに大きな負荷がかかっています。時間をおいて再度やり直してください。 -onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. +onionServices.rendezvousFailed.longDescription=詳細： %S — クライアントとサービスの合流は失敗しました、つまりクライアントは接続を仕上げれませんでした。 # Tor SOCKS error 0xF4: onionServices.clientAuthMissing.pageTitle=認証が必要です onionServices.clientAuthMissing.header=Onion サイトは認証を必要としています onionServices.clientAuthMissing=Onion サイトへのアクセスに鍵が必要ですが、何も入力されませんでした。 -onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing. +onionServices.clientAuthMissing.longDescription=詳細： %S — クライアントは指定したオニオンサービス記述子をダウンロードしましたが、欠測クライアント承認情報のため復号化できませんでした。 # Tor SOCKS error 0xF5: onionServices.clientAuthIncorrect.pageTitle=認証に失敗しました onionServices.clientAuthIncorrect.header=Onion サイトの認証に失敗しました onionServices.clientAuthIncorrect=入力された鍵が正しくないか、または鍵が取り消されました。Onion サイトの管理者にお問い合わせください。 -onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. +onionServices.clientAuthIncorrect.longDescription=詳細： %S — クライアントは指定したオニオンサービス記述子をダウンロードしましたが、提供されたクライアント承認情報で復号化できませんでした。アクセスは取り消された可能性があります。 # Tor SOCKS error 0xF6: onionServices.badAddress.pageTitle=Onion サイトの読み込み中に問題が発生しました onionServices.badAddress.header=無効な Onion サイトアドレスです @@ -108,7 +108,7 @@ onionServices.badAddress.longDescription=詳細: %S — 提供された .onion onionServices.introTimedOut.pageTitle=Onion サイトの読み込み中に問題が発生しました onionServices.introTimedOut.header=Onion サイトのサーキット作成がタイムアウトしました onionServices.introTimedOut=ネットワークの接続状態が不安定だったため、Onion サイトへの接続に失敗しました。 -onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. +onionServices.introTimedOut.longDescription=詳細： %S — 合流サーキットを確立中に、指定したオニオンサービスとの接続はタイムアウトされました。 # # LOCALIZATION NOTE: %S will be replaced with the .onion address. onionServices.authPrompt.description2=%s はあなたの認証を要求しています。 diff --git a/chrome/locale/ka/aboutTor.dtd b/chrome/locale/ka/aboutTor.dtd index 2bbdf85a..13017c43 100644 --- a/chrome/locale/ka/aboutTor.dtd +++ b/chrome/locale/ka/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "გამოიწერეთ Tor-ის სიახლეები."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor უფასოა, თქვენნაირი ადამიანების შემოწირულობების დამსახურებით."> <!ENTITY aboutTor.donationBanner.buttonA "გაიღეთ თანხა"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/ko/aboutTor.dtd b/chrome/locale/ko/aboutTor.dtd index 04e6de97..5599d9ee 100644 --- a/chrome/locale/ko/aboutTor.dtd +++ b/chrome/locale/ko/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "Tor 뉴스를 구독."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor는 바로 당신과 같은 사람들의 기부 덕분에 자유롭게 사용할 수 있습니다."> <!ENTITY aboutTor.donationBanner.buttonA "기부하기"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/lt/aboutTor.dtd b/chrome/locale/lt/aboutTor.dtd index 55eec8ec..87ae4703 100644 --- a/chrome/locale/lt/aboutTor.dtd +++ b/chrome/locale/lt/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "Užsisakykite Tor naujienas."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor yra nemokamas naudoti dėl paaukojimų iš tokių žmonių kaip jūs."> <!ENTITY aboutTor.donationBanner.buttonA "Paaukokite dabar"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/mk/aboutTor.dtd b/chrome/locale/mk/aboutTor.dtd index 5853c075..b8cf4fad 100644 --- a/chrome/locale/mk/aboutTor.dtd +++ b/chrome/locale/mk/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "Пријавете се за Tor Вести."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor е бесплатен за користење благодарение на донациите од луѓе како вас."> <!ENTITY aboutTor.donationBanner.buttonA "Донирај сега"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/ms/aboutTor.dtd b/chrome/locale/ms/aboutTor.dtd index 5499dd54..a73267d0 100644 --- a/chrome/locale/ms/aboutTor.dtd +++ b/chrome/locale/ms/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "Daftar untuk dapatkan Berita Tor."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> <!ENTITY aboutTor.donationBanner.buttonA "Dermalah Sekarang"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/nb-NO/aboutTor.dtd b/chrome/locale/nb-NO/aboutTor.dtd index 15c0c327..7ba3b842 100644 --- a/chrome/locale/nb-NO/aboutTor.dtd +++ b/chrome/locale/nb-NO/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "Registrer deg for Tor-nyheter."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor er gratis å bruke, grunnet bidrag fra folk som deg."> <!ENTITY aboutTor.donationBanner.buttonA "Donér nå"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/nl/aboutTor.dtd b/chrome/locale/nl/aboutTor.dtd index ca46073b..6c881957 100644 --- a/chrome/locale/nl/aboutTor.dtd +++ b/chrome/locale/nl/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "Meld u aan voor de Tor-nieuwsbrief."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor is gratis te gebruiken dankzij donaties van mensen zoals u."> <!ENTITY aboutTor.donationBanner.buttonA "Doneer nu"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/pl/aboutTor.dtd b/chrome/locale/pl/aboutTor.dtd index f67d40b9..b5719a5b 100644 --- a/chrome/locale/pl/aboutTor.dtd +++ b/chrome/locale/pl/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "Zapisz się na newsletter."> <!ENTITY aboutTor.donationBanner.freeToUse "Z przeglądarki Tor można korzystać bezpłatnie dzięki darowiznom od osób takich jak Ty."> <!ENTITY aboutTor.donationBanner.buttonA "Wesprzyj teraz"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/pt-BR/aboutTor.dtd b/chrome/locale/pt-BR/aboutTor.dtd index 26c3f08f..0f69f353 100644 --- a/chrome/locale/pt-BR/aboutTor.dtd +++ b/chrome/locale/pt-BR/aboutTor.dtd @@ -30,3 +30,7 @@ <!ENTITY aboutTor.newsletter.link_text "Inscreva-se para receber Notícias do Tor."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor é livre para usar por causa de doações de pessoas como você."> <!ENTITY aboutTor.donationBanner.buttonA "Doe Agora"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/ro/aboutTor.dtd b/chrome/locale/ro/aboutTor.dtd index 07488af9..8a0c22e6 100644 --- a/chrome/locale/ro/aboutTor.dtd +++ b/chrome/locale/ro/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "Abonează-te la Tor News."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor poate fi folosit gratuit datorită donațiilor de la oameni ca tine."> <!ENTITY aboutTor.donationBanner.buttonA "Donează Acum"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/ru/aboutTor.dtd b/chrome/locale/ru/aboutTor.dtd index daf12810..0a9259e1 100644 --- a/chrome/locale/ru/aboutTor.dtd +++ b/chrome/locale/ru/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "Подпишитесь на новости Tor"> <!ENTITY aboutTor.donationBanner.freeToUse "Tor бесплатен благодаря пожертвованиям таких людей, как вы."> <!ENTITY aboutTor.donationBanner.buttonA "Пожертвовать"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/sv-SE/aboutTor.dtd b/chrome/locale/sv-SE/aboutTor.dtd index 2e1f82fc..54bd5eb5 100644 --- a/chrome/locale/sv-SE/aboutTor.dtd +++ b/chrome/locale/sv-SE/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "Anmäl dig till Tor-nyheter."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor är gratis att använda på grund av donationer från människor som du."> <!ENTITY aboutTor.donationBanner.buttonA "Donera nu"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/th/aboutTor.dtd b/chrome/locale/th/aboutTor.dtd index d9671769..5f5f950c 100644 --- a/chrome/locale/th/aboutTor.dtd +++ b/chrome/locale/th/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "สมัครรับข่าวสารเกี่ยวกับ Tor"> <!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> <!ENTITY aboutTor.donationBanner.buttonA "ร่วมบริจาค"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/tr/aboutTor.dtd b/chrome/locale/tr/aboutTor.dtd index d36cc0fd..cc24c2b6 100644 --- a/chrome/locale/tr/aboutTor.dtd +++ b/chrome/locale/tr/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "Tor Duyurularına Abone Olun"> <!ENTITY aboutTor.donationBanner.freeToUse "Tor sizin gibi insanların bağışları ile desteklendiği için ücretsiz olarak kullanılabilir."> <!ENTITY aboutTor.donationBanner.buttonA "Bağış Yapın"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/vi/aboutTor.dtd b/chrome/locale/vi/aboutTor.dtd index 39ade34a..ebf65463 100644 --- a/chrome/locale/vi/aboutTor.dtd +++ b/chrome/locale/vi/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "Đăng kí nhận tin tức từ Tor."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> <!ENTITY aboutTor.donationBanner.buttonA "Đóng góp Ngay bây giờ"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/zh-CN/aboutTor.dtd b/chrome/locale/zh-CN/aboutTor.dtd index 5b4f5fa7..cb786cd9 100644 --- a/chrome/locale/zh-CN/aboutTor.dtd +++ b/chrome/locale/zh-CN/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "订阅 Tor 的最新动态"> <!ENTITY aboutTor.donationBanner.freeToUse "Tor 是免费使用的，因为有和您一样的人捐助。"> <!ENTITY aboutTor.donationBanner.buttonA "立即捐助"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> diff --git a/chrome/locale/zh-CN/torbutton.properties b/chrome/locale/zh-CN/torbutton.properties index 59f1cd2c..c2166c19 100644 --- a/chrome/locale/zh-CN/torbutton.properties +++ b/chrome/locale/zh-CN/torbutton.properties @@ -60,7 +60,7 @@ updateDownloadingPanelUILabel=正下载 %S 更新 # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=连接已经被加密（洋葱服务，%1$S，%2$S 位密钥，%3$S） pageInfo_OnionEncryption=连接已经被加密（洋葱服务） -pageInfo_OnionName=Onion Name: +pageInfo_OnionName=洋葱名字： # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=更多详情 @@ -73,45 +73,45 @@ onionServices.errorPage.onionSite=洋葱站点 onionServices.descNotFound.pageTitle=洋葱站点加载问题 onionServices.descNotFound.header=找不到洋葱站点 onionServices.descNotFound=最有可能的原因是该洋葱站点已下线。请联系洋葱站点管理员。 -onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. +onionServices.descNotFound.longDescription=详情：%S — 请求的洋葱服务标识码未能在哈希算法内找到，因此客户端无法连接到服务。 # Tor SOCKS error 0xF1: onionServices.descInvalid.pageTitle=洋葱站点加载问题 onionServices.descInvalid.header=洋葱站点不可达 onionServices.descInvalid=洋葱站点由于内部错误无法浏览。 -onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed. +onionServices.descInvalid.longDescription=详情：%S — 请求的洋葱服务标识码不能解析，或签名认证失败。 # Tor SOCKS error 0xF2: onionServices.introFailed.pageTitle=洋葱站点加载问题 onionServices.introFailed.header=洋葱站点已断开连接 onionServices.introFailed=最有可能的原因是该洋葱站点已下线。联系洋葱站点管理员。 -onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. +onionServices.introFailed.longDescription=详情：%S — 引导失败，这意味着标识码已被找到，但是服务已不再连接到引导点。有可能服务已改变了标识码，或未运行。 # Tor SOCKS error 0xF3: onionServices.rendezvousFailed.pageTitle=洋葱站点加载问题 onionServices.rendezvousFailed.header=无法连接洋葱站点 onionServices.rendezvousFailed=洋葱站点忙碌或过载。请稍后尝试。 -onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. +onionServices.rendezvousFailed.longDescription=详情：%S — 客户端未能与服务会合，这意味着客户端未能完成连接。 # Tor SOCKS error 0xF4: onionServices.clientAuthMissing.pageTitle=需要验证 onionServices.clientAuthMissing.header=洋葱站点需要验证 onionServices.clientAuthMissing=访问洋葱站点需要一个密钥但未提供。 -onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing. +onionServices.clientAuthMissing.longDescription=详情：%S — 客户端下载了请求的洋葱服务标识码，但因为客户端缺失授权信息，而不能解码它的内容。 # Tor SOCKS error 0xF5: onionServices.clientAuthIncorrect.pageTitle=验证失败 onionServices.clientAuthIncorrect.header=洋葱站点认证失败 onionServices.clientAuthIncorrect=提供的密钥不正确或已被吊销。请与洋葱网站管理员联系。 -onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. +onionServices.clientAuthIncorrect.longDescription=详情：%S — 客户端能下载请求的洋葱服务标识码，但不能用客户端提供的授权信息解码标识码的内容。这可能意味着访问已被撤销。 # Tor SOCKS error 0xF6: onionServices.badAddress.pageTitle=洋葱站点加载问题 onionServices.badAddress.header=无效洋葱站点地址 onionServices.badAddress=提供的洋葱站点地址无效。请检查是否正确输入。 -onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. +onionServices.badAddress.longDescription=详情：%S — 提供的.onion地址失效了。返回该错误，是由于以下原因之一：地址的校验和不匹配、ed25519公钥失效，或编码无效。 # Tor SOCKS error 0xF7: onionServices.introTimedOut.pageTitle=洋葱站点加载问题 onionServices.introTimedOut.header=洋葱站点链路创建超时 onionServices.introTimedOut=洋葱站点连接失败，可能是由于网络连接较差。 -onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. +onionServices.introTimedOut.longDescription=详情：%S — 在试着建立会合回路时，请求的洋葱服务连接超时。 # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description2=%S is requesting that you authenticate. +onionServices.authPrompt.description2=%S请求您的验证。 onionServices.authPrompt.keyPlaceholder=输入您的私钥来使用此洋葱服务 onionServices.authPrompt.done=完成 onionServices.authPrompt.doneAccessKey=天 @@ -130,7 +130,7 @@ onionServices.authPreferences.failedToGetKeys=无法从 Tor 获得密钥 onionServices.authPreferences.failedToRemoveKey=无法移除密钥 # Onion-Location strings. -onionLocation.alwaysPrioritize=Always Prioritize Onions +onionLocation.alwaysPrioritize=始终优先洋葱 onionLocation.alwaysPrioritizeAccessKey=a onionLocation.notNow=暂不 onionLocation.notNowAccessKey=n diff --git a/chrome/locale/zh-TW/aboutTor.dtd b/chrome/locale/zh-TW/aboutTor.dtd index 79e06ab4..8f9cd989 100644 --- a/chrome/locale/zh-TW/aboutTor.dtd +++ b/chrome/locale/zh-TW/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "訂閱 Tor 的新資訊。"> <!ENTITY aboutTor.donationBanner.freeToUse "由於有像您這樣的人的捐款，Tor 可以免費使用。"> <!ENTITY aboutTor.donationBanner.buttonA "立刻捐款"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic.">

1 0

[torbutton/master] Bug 40113: Add strings for EOY 2020 campaign
by gk＠torproject.org 15 Sep '20

15 Sep '20

commit d27b2be209e0fd423dedb4e797abc899f6c60bdd Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Sep 15 14:38:31 2020 +0000 Bug 40113: Add strings for EOY 2020 campaign --- chrome/locale/en-US/aboutTor.dtd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/chrome/locale/en-US/aboutTor.dtd b/chrome/locale/en-US/aboutTor.dtd index 7b231095..13e2d8a2 100644 --- a/chrome/locale/en-US/aboutTor.dtd +++ b/chrome/locale/en-US/aboutTor.dtd @@ -29,3 +29,7 @@ <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> <!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> <!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> + + +<!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic.">

1 0

[tor-browser/tor-browser-81.0b9-10.0-1] Bug 12620: TorBrowser regression tests
by gk＠torproject.org 15 Sep '20

15 Sep '20

commit 3bc0074a2d7e535271a8e0462df8ea4a853e0485 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Aug 27 16:25:00 2014 -0700 Bug 12620: TorBrowser regression tests Regression tests for Bug #2950: Make Permissions Manager memory-only Regression tests for TB4: Tor Browser's Firefox preference overrides. Note: many more functional tests could be made here Regression tests for #2874: Block Components.interfaces from content Bug 18923: Add a script to run all Tor Browser specific tests Regression tests for Bug #16441: Suppress "Reset Tor Browser" prompt. --- run-tbb-tests | 60 +++++++++++++++ tbb-tests/browser.ini | 5 ++ tbb-tests/browser_tor_TB4.js | 162 +++++++++++++++++++++++++++++++++++++++ tbb-tests/browser_tor_bug2950.js | 74 ++++++++++++++++++ tbb-tests/mochitest.ini | 3 + tbb-tests/moz.build | 10 +++ tbb-tests/test_tor_bug2874.html | 25 ++++++ toolkit/toolkit.mozbuild | 3 +- 8 files changed, 341 insertions(+), 1 deletion(-) diff --git a/run-tbb-tests b/run-tbb-tests new file mode 100755 index 000000000000..5e266f9ba4cd --- /dev/null +++ b/run-tbb-tests @@ -0,0 +1,60 @@ +#!/bin/bash + +# This script runs all the Mochitest tests that have been added or +# modified since the last ffxbld commit. +# +# It does not currently run XPCShell tests. We should change this if we +# start using this type or other types of tests. +# +# The logs of the tests are stored in the tbb-tests.log file. +# Ignored tests are listed in the tbb-tests-ignore.txt file. +# +# https://trac.torproject.org/projects/tor/ticket/18923 + +IFS=$'\n' + +if [ -n "$USE_TESTS_LIST" ] && [ -f tbb-tests-list.txt ] +then + echo "Using tests list from file tbb-tests-list.txt" + tests=($(cat tbb-tests-list.txt)) +else + ffxbld_commit=$(git log -500 --format='%an %H' | grep '^ffxbld ' \ + | head -1 | cut -d ' ' -f 2) + + tests=($(git diff --name-status "$ffxbld_commit" HEAD | \ + grep -e '^[AM].*/test_[^/]\+\.$html\|xul$$' \ + -e '^[AM].*/browser_[^/]\+\.js$' \ + | sed 's/^[AM]\s\+//')) +fi + +echo 'The following tests will be run:' +for i in "${!tests[@]}" +do + if [ -z "$USE_TESTS_LIST" ] \ + && grep -q "^${tests[$i]}$" tbb-tests-ignore.txt + then + unset "tests[$i]" + continue + fi + echo "- ${tests[$i]}" +done + +if [ -n "$WRITE_TESTS_LIST" ] +then + rm -f tbb-tests-list.txt + for i in "${!tests[@]}" + do + echo "${tests[$i]}" >> tbb-tests-list.txt + done + exit 0 +fi + +rm -f tbb-tests.log +echo $'\n''Starting tests' +./mach mochitest --log-tbpl tbb-tests.log --setpref security.nocertdb=false \ + "${tests[@]}" + +echo "*************************" +echo "*************************" +echo "Summary of failed tests:" +grep --color=never TEST-UNEXPECTED-FAIL tbb-tests.log diff --git a/tbb-tests/browser.ini b/tbb-tests/browser.ini new file mode 100644 index 000000000000..f481660f1417 --- /dev/null +++ b/tbb-tests/browser.ini @@ -0,0 +1,5 @@ +[DEFAULT] + +[browser_tor_bug2950.js] +[browser_tor_omnibox.js] +[browser_tor_TB4.js] diff --git a/tbb-tests/browser_tor_TB4.js b/tbb-tests/browser_tor_TB4.js new file mode 100644 index 000000000000..af688bee0226 --- /dev/null +++ b/tbb-tests/browser_tor_TB4.js @@ -0,0 +1,162 @@ +// # Test for TB4: Tor Browser's Firefox preference overrides +// Simple regression tests to check the value of each pref and +// decides if it is set as expected. + +// TODO: Write unit tests to check that each pref setting here +// causes the browser to have the desired behavior (a big task). + +function test() { + +let expectedPrefs = [ + // Disable browser auto updaters and associated homepage notifications + ["app.update.auto", false], + ["app.update.enabled", false], + ["browser.search.update", false], + ["browser.rights.3.shown", true], + ["browser.startup.homepage_override.mstone", "ignore"], + ["startup.homepage_welcome_url", ""], + ["startup.homepage_override_url", ""], + + // Disable the "Refresh" prompt that is displayed for stale profiles. + ["browser.disableResetPrompt", true], + + // Disk activity: Disable Browsing History Storage + ["browser.privatebrowsing.autostart", true], + ["browser.cache.disk.enable", false], + ["browser.cache.offline.enable", false], + ["dom.indexedDB.enabled", false], + ["permissions.memory_only", true], + ["network.cookie.lifetimePolicy", 2], + ["security.nocertdb", true], + + // Disk activity: TBB Directory Isolation + ["browser.download.useDownloadDir", false], + ["browser.shell.checkDefaultBrowser", false], + ["browser.download.manager.addToRecentDocs", false], + + // Misc privacy: Disk + ["signon.rememberSignons", false], + ["browser.formfill.enable", false], + ["signon.autofillForms", false], + ["browser.sessionstore.privacy_level", 2], + ["media.cache_size", 0], + + // Misc privacy: Remote + ["browser.send_pings", false], + ["geo.enabled", false], + ["geo.wifi.uri", ""], + ["browser.search.suggest.enabled", false], + ["browser.safebrowsing.malware.enabled", false], + ["extensions.ui.lastCategory", "addons://list/extension"], + ["datareporting.healthreport.uploadEnabled", false], + ["datareporting.policy.dataSubmissionEnabled", false], + ["security.mixed_content.block_active_content", false], // Disable until https://bugzilla.mozilla.org/show_bug.cgi?id=878890 is patched + ["browser.syncPromoViewsLeftMap", "{\"addons\":0, \"passwords\":0, \"bookmarks\":0}"], // Don't promote sync + ["services.sync.engine.prefs", false], // Never sync prefs, addons, or tabs with other browsers + ["services.sync.engine.addons", false], + ["services.sync.engine.tabs", false], + ["extensions.getAddons.cache.enabled", false], // https://blog.mozilla.org/addons/how-to-opt-out-of-add-on-metadata-updates/ + + // Fingerprinting + ["webgl.min_capability_mode", true], + ["webgl.disable-extensions", true], + ["dom.battery.enabled", false], // fingerprinting due to differing OS implementations + ["browser.display.max_font_attempts",10], + ["browser.display.max_font_count",10], + ["gfx.downloadable_fonts.fallback_delay", -1], + ["browser.startup.homepage_override.buildID", "20100101"], + + // Third party stuff + ["network.cookie.cookieBehavior", 1], + ["security.enable_tls_session_tickets", false], + ["network.http.spdy.enabled", false], // Stores state and may have keepalive issues (both fixable) + ["network.http.spdy.enabled.v2", false], // Seems redundant, but just in case + ["network.http.spdy.enabled.v3", false], // Seems redundant, but just in case + + // Proxy and proxy security + ["network.proxy.socks", "127.0.0.1"], + ["network.proxy.socks_port", 9150], + ["network.proxy.socks_remote_dns", true], + ["network.proxy.no_proxies_on", ""], // For fingerprinting and local service vulns (#10419) + ["network.proxy.type", 1], + ["network.security.ports.banned", "9050,9051,9150,9151"], + ["network.dns.disablePrefetch", true], + ["network.protocol-handler.external-default", false], + ["network.protocol-handler.external.mailto", false], + ["network.protocol-handler.external.news", false], + ["network.protocol-handler.external.nntp", false], + ["network.protocol-handler.external.snews", false], + ["network.protocol-handler.warn-external.mailto", true], + ["network.protocol-handler.warn-external.news", true], + ["network.protocol-handler.warn-external.nntp", true], + ["network.protocol-handler.warn-external.snews", true], + + // Network and performance + ["network.http.pipelining", true], + ["network.http.pipelining.aggressive", true], + ["network.http.pipelining.maxrequests", 12], + ["network.http.pipelining.ssl", true], + ["network.http.proxy.pipelining", true], + ["security.ssl.enable_false_start", true], + ["network.http.keep-alive.timeout", 20], + ["network.http.connection-retry-timeout", 0], + ["network.http.max-persistent-connections-per-proxy", 256], + ["network.http.pipelining.reschedule-timeout", 15000], + ["network.http.pipelining.read-timeout", 60000], + // Hacked pref: Now means "Attempt to pipeline at least this many requests together" + ["network.http.pipelining.max-optimistic-requests", 3], + ["security.disable_session_identifiers", true], + + // Extension support + ["extensions.autoDisableScopes", 0], + ["extensions.bootstrappedAddons", "{}"], + ["extensions.checkCompatibility.4.*", false], + ["extensions.databaseSchema", 3], + ["extensions.enabledAddons", "https-everywhere%40eff.org:3.1.4,%7B73a6fe31-595d-460b-a920-fcc0f8843232%7D:2.6.6.1,torbutton%40torproject.org:1.5.2,ubufox%40ubuntu.com:2.6,%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:17.0.5"], + ["extensions.enabledItems", "langpack-en-US@firefox.mozilla.org:,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8"], + ["extensions.enabledScopes", 1], + ["extensions.pendingOperations", false], + ["xpinstall.whitelist.add", ""], + ["xpinstall.whitelist.add.36", ""], + + // Omnibox settings + ["keyword.URL", "https://startpage.com/do/search?q="], + + // Hacks/workarounds: Direct2D seems to crash w/ lots of video cards w/ MinGW? + // Nvida cards also experience crashes without the second pref set to disabled + ["gfx.direct2d.disabled", true], + ["layers.acceleration.disabled", true], + + // Security enhancements + // https://trac.torproject.org/projects/tor/ticket/9387#comment:17 + ["javascript.options.ion.content", false], + ["javascript.options.baselinejit.content", false], + ["javascript.options.asmjs", false], + ["javascript.options.typeinference", false], + + // Enable TLS 1.1 and 1.2: + // https://trac.torproject.org/projects/tor/ticket/11253 + ["security.tls.version.max", 3], + + // Version placeholder + ["torbrowser.version", "UNKNOWN"], + + ]; + +let getPref = function (prefName) { + let type = gPrefService.getPrefType(prefName); + if (type === gPrefService.PREF_INT) return gPrefService.getIntPref(prefName); + if (type === gPrefService.PREF_BOOL) return gPrefService.getBoolPref(prefName); + if (type === gPrefService.PREF_STRING) return gPrefService.getCharPref(prefName); + // Something went wrong. + throw new Error("Can't access pref " + prefName); +}; + +let testPref = function([key, expectedValue]) { + let foundValue = getPref(key); + is(foundValue, expectedValue, "Pref '" + key + "' should be '" + expectedValue +"'."); +}; + +expectedPrefs.map(testPref); + +} // end function test() diff --git a/tbb-tests/browser_tor_bug2950.js b/tbb-tests/browser_tor_bug2950.js new file mode 100644 index 000000000000..010cc6356202 --- /dev/null +++ b/tbb-tests/browser_tor_bug2950.js @@ -0,0 +1,74 @@ +// # Regression tests for tor Bug #2950, Make Permissions Manager memory-only +// Ensures that permissions.sqlite file in profile directory is not written to, +// even when we write a value to Firefox's permissions database. + +// The requisite test() function. +function test() { + +// Needed because of asynchronous part later in the test. +waitForExplicitFinish(); + +// Shortcut +let Ci = Components.interfaces; + +// ## utility functions + +// __uri(spec)__. +// Creates an nsIURI instance from a spec +// (string address such as "http://torproject.org"). +let uri = spec => Services.io.newURI(spec, null, null); + +// __setPermission(spec, key, value)__. +// Sets the site permission of type key to value, for the site located at address spec. +let setPermission = (spec, key, value) => SitePermissions.set(uri(spec), key, value); + +// __getPermission(spec, key)__. +// Reads the site permission value for permission type key, for the site +// located at address spec. +let getPermission = (spec, key) => SitePermissions.get(uri(spec), key); + +// __profileDirPath__. +// The Firefox Profile directory. Expected location of various persistent files. +let profileDirPath = Services.dirsvc.get("ProfD", Components.interfaces.nsIFile).path; + +// __fileInProfile(fileName)__. +// Returns an nsIFile instance corresponding to a file in the Profile directory. +let fileInProfile = fileName => FileUtils.File(profileDirPath + "/" + fileName); + +// ## Now let's run the test. + +let SITE = "http://torproject.org", + KEY = "popup"; + +let permissionsFile = fileInProfile("permissions.sqlite"), + lastModifiedTime = null, + newModifiedTime = null; +if (permissionsFile.exists()) { + lastModifiedTime = permissionsFile.lastModifiedTime; +} +// Read the original value of the permission. +let originalValue = getPermission(SITE, KEY); + +// We need to delay by at least 1000 ms, because that's the granularity +// of file time stamps, it seems. +window.setTimeout( + function () { + // Set the permission to a new value. + setPermission(SITE, KEY, (originalValue === 0) ? 1 : 0); + // Now read back the permission value again. + let newReadValue = getPermission(SITE, KEY); + // Compare to confirm that the permission + // value was successfully changed. + isnot(newReadValue, originalValue, "Set a value in permissions db (perhaps in memory).");; + // If file existed or now exists, get the current time stamp. + if (permissionsFile.exists()) { + newModifiedTime = permissionsFile.lastModifiedTime; + } + // If file was created or modified since we began this test, + // then permissions db is not memory only. Complain! + is(lastModifiedTime, newModifiedTime, "Don't write to permissions.sqlite file on disk."); + // We are done with the test. + finish(); + }, 1100); + +} // test() diff --git a/tbb-tests/mochitest.ini b/tbb-tests/mochitest.ini new file mode 100644 index 000000000000..cc5172733bbe --- /dev/null +++ b/tbb-tests/mochitest.ini @@ -0,0 +1,3 @@ +[DEFAULT] + +[test_tor_bug2874.html] diff --git a/tbb-tests/moz.build b/tbb-tests/moz.build new file mode 100644 index 000000000000..de8a41a67a5c --- /dev/null +++ b/tbb-tests/moz.build @@ -0,0 +1,10 @@ +# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# 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/. + +MOCHITEST_MANIFESTS += ['mochitest.ini'] + +BROWSER_CHROME_MANIFESTS += [ 'browser.ini' ] + diff --git a/tbb-tests/test_tor_bug2874.html b/tbb-tests/test_tor_bug2874.html new file mode 100644 index 000000000000..c0a956e9f687 --- /dev/null +++ b/tbb-tests/test_tor_bug2874.html @@ -0,0 +1,25 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta charset="utf-8"> + <title>Test for Tor Bug 2874</title> + <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> + <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> + <script type="application/javascript"> + is(typeof Components, 'undefined', "The global window object should not expose a Components property to untrusted content."); + </script> +</head> +<body> +<a target="_blank" href="https://trac.torproject.org/projects/tor/ticket/2874">Tor Bug 2874</a> +<p id="display"></p> +<div id="content" style="display: none"> + +</div> +<pre id="test"> +</pre> +</body> +</html> diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild index d092b8b22346..6e35a4602300 100644 --- a/toolkit/toolkit.mozbuild +++ b/toolkit/toolkit.mozbuild @@ -96,7 +96,8 @@ if CONFIG['MOZ_WEBRTC'] and CONFIG['COMPILE_ENVIRONMENT']: ] if CONFIG['ENABLE_TESTS']: - DIRS += ['/testing/specialpowers'] + DIRS += ['/testing/specialpowers', + '/tbb-tests'] DIRS += [ '/testing/gtest',

1 0

[tor-browser/tor-browser-81.0b9-10.0-1] TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 15 Sep '20

15 Sep '20

commit b688682d086d8245c708829d0760f14d6df7a504 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon May 6 15:51:06 2013 -0700 TB3: Tor Browser's official .mozconfigs. Also: Bug #9829.1: new .mozconfig file for the new cross-compiler and ESR24 Changes needed to build Mac in 64bit Bug 10715: Enable Webgl for mingw-w64 again. Disable ICU when cross-compiling; clean-up. Bug 15773: Enable ICU on OS X Bug 15990: Don't build the sandbox with mingw-w64 Bug 12761: Switch to ESR 38 for OS X Updating .mozconfig-asan Bug 12516: Compile hardenend Tor Browser with -fwrapv Bug 18331: Switch to Mozilla's toolchain for building Tor Browser for OS X Bug 17858: Cannot create incremental MARs for hardened builds. Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff (which is part of mar-tools and is not distributed to end-users) with ASan. Bug 13419: Add back ICU for Windows Bug 21239: Use GTK2 for ESR52 Linux builds Bug 23025: Add hardening flags for macOS Bug 24478: Enable debug assertions and tests in our ASan builds --enable-proxy-bypass-protection Bug 27597: ASan build option in tor-browser-build is broken 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. Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING Bug 31450: Set proper BINDGEN_CFLAGS for ASan builds Add an --enable-tor-browser-data-outside-app-dir configure option Add --with-tor-browser-version configure option Bug 21849: Don't allow SSL key logging. Bug 31457: disable per-installation profiles The dedicated profiles (per-installation) feature does not interact well with our bundled profiles on Linux and Windows, and it also causes multiple profiles to be created on macOS under TorBrowser-Data. Bug 31935: Disable profile downgrade protection. Since Tor Browser does not support more than one profile, disable the prompt and associated code that offers to create one when a version downgrade situation is detected. Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT Bug 25741 - TBA: Disable features at compile-time MOZ_NATIVE_DEVICES for casting and the media player MOZ_TELEMETRY_REPORTING for telemetry MOZ_DATA_REPORTING for all data reporting preferences (crashreport, telemetry, geo) Bug 25741 - TBA: Add default configure options in dedicated file Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION Bug 29859: Disable HLS support for now Add --disable-tor-launcher build option Add --enable-tor-browser-update build option Bug 33734: Set MOZ_NORMANDY to False Bug 33851: Omit Parental Controls. Bug 40061: Omit the Windows default browser agent from the build --- .mozconfig | 38 ++++++++++++++++++++++++ .mozconfig-android | 35 ++++++++++++++++++++++ .mozconfig-asan | 43 +++++++++++++++++++++++++++ .mozconfig-mac | 55 +++++++++++++++++++++++++++++++++++ .mozconfig-mingw | 30 +++++++++++++++++++ browser/base/moz.build | 3 ++ browser/installer/Makefile.in | 8 +++++ browser/moz.configure | 8 ++--- build/moz.configure/old.configure | 6 ++++ mobile/android/confvars.sh | 9 ++++++ mobile/android/geckoview/build.gradle | 1 + mobile/android/moz.configure | 17 +++++++++-- mobile/android/torbrowser.configure | 30 +++++++++++++++++++ old-configure.in | 49 +++++++++++++++++++++++++++++++ security/moz.build | 2 +- security/nss/lib/ssl/Makefile | 2 +- toolkit/modules/AppConstants.jsm | 15 ++++++++++ toolkit/modules/moz.build | 3 ++ 18 files changed, 346 insertions(+), 8 deletions(-) diff --git a/.mozconfig b/.mozconfig new file mode 100755 index 000000000000..24efaea57b0b --- /dev/null +++ b/.mozconfig @@ -0,0 +1,38 @@ +. $topsrcdir/browser/config/mozconfig + +# This mozconfig file is not used in official Tor Browser builds. +# It is only intended to be used when doing incremental Linux builds +# during development. The platform-specific mozconfig configuration +# files used in official Tor Browser releases can be found in the +# tor-browser-build repo: +# https://gitweb.torproject.org/builders/tor-browser-build.git/ +# under: +# tor-browser-build/projects/firefox/mozconfig-$OS-$ARCH + +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" +export MOZILLA_OFFICIAL=1 + +ac_add_options --enable-optimize +ac_add_options --enable-official-branding + +# Let's support GTK3 for ESR60 +ac_add_options --enable-default-toolkit=cairo-gtk3 + +ac_add_options --disable-strip +ac_add_options --disable-install-strip +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme +ac_add_options --enable-proxy-bypass-protection + +# Disable telemetry +ac_add_options MOZ_TELEMETRY_REPORTING= + +ac_add_options --disable-tor-launcher +ac_add_options --with-tor-browser-version=dev-build +ac_add_options --disable-tor-browser-update diff --git a/.mozconfig-android b/.mozconfig-android new file mode 100755 index 000000000000..1b5e3f3178b7 --- /dev/null +++ b/.mozconfig-android @@ -0,0 +1,35 @@ +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-arm-linux-androideabi +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" +export MOZILLA_OFFICIAL=1 + +ac_add_options --enable-optimize +ac_add_options --enable-official-branding + +# Android +ac_add_options --enable-application=mobile/android +ac_add_options --target=arm-linux-androideabi +ac_add_options --with-android-ndk="$NDK_BASE" #Enter the android ndk location(ndk r17b) +ac_add_options --with-android-sdk="$SDK_BASE" #Enter the android sdk location +ac_add_options --with-branding=mobile/android/branding/alpha + +# Use Mozilla's Clang blobs +CC="$HOME/.mozbuild/clang/bin/clang" +CXX="$HOME/.mozbuild/clang/bin/clang++" + +#enable ccache to set amount of cache assigned for build. +ac_add_options --with-ccache + +ac_add_options --enable-strip +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-rust-debug + +ac_add_options --disable-updater +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls + +ac_add_options --enable-proxy-bypass-protection + +# Disable telemetry +ac_add_options MOZ_TELEMETRY_REPORTING= diff --git a/.mozconfig-asan b/.mozconfig-asan new file mode 100644 index 000000000000..13232e054d45 --- /dev/null +++ b/.mozconfig-asan @@ -0,0 +1,43 @@ +. $topsrcdir/browser/config/mozconfig + +export CFLAGS="-fsanitize=address -Dxmalloc=myxmalloc" +export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc" +# We need to add -ldl explicitely due to bug 1213698 +export LDFLAGS="-fsanitize=address -ldl" + +# Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff +# (which is part of mar-tools and is not distributed to end-users) with +# ASan. See bug 17858. +export HOST_CFLAGS="" +export HOST_CXXFLAGS="" +export HOST_LDFLAGS="-ldl" + +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" +export MOZILLA_OFFICIAL=1 +export BINDGEN_CFLAGS='--gcc-toolchain=/var/tmp/dist/gcc' + +ac_add_options --enable-address-sanitizer +ac_add_options --disable-jemalloc +ac_add_options --disable-elf-hack + +ac_add_options --enable-optimize +ac_add_options --enable-official-branding + +# Let's support GTK3 for ESR60 +ac_add_options --enable-default-toolkit=cairo-gtk3 + +ac_add_options --enable-tor-browser-update + +ac_add_options --disable-strip +ac_add_options --disable-install-strip +ac_add_options --enable-tests +ac_add_options --enable-debug +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls +ac_add_options --disable-eme +ac_add_options --enable-proxy-bypass-protection + +# Disable telemetry +ac_add_options MOZ_TELEMETRY_REPORTING= diff --git a/.mozconfig-mac b/.mozconfig-mac new file mode 100644 index 000000000000..1f89cab30bbc --- /dev/null +++ b/.mozconfig-mac @@ -0,0 +1,55 @@ +# ld needs libLTO.so from llvm +mk_add_options "export LD_LIBRARY_PATH=$topsrcdir/clang/lib" + +CROSS_CCTOOLS_PATH=$topsrcdir/cctools +CROSS_SYSROOT=$topsrcdir/MacOSX10.7.sdk +CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks +HARDENING_FLAGS="-Werror=format -Werror=format-security -fstack-protector-strong -D_FORTIFY_SOURCE=2" +FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT $HARDENING_FLAGS" + +export CC="$topsrcdir/clang/bin/clang $FLAGS" +export CXX="$topsrcdir/clang/bin/clang++ $FLAGS" +export CPP="$topsrcdir/clang/bin/clang $FLAGS -E" +export LLVMCONFIG=$topsrcdir/clang/bin/llvm-config +export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip -Wl,-pie" +export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin10- +#TODO: bug 1184202 - would be nice if these could be detected with TOOLCHAIN_PREFIX automatically +export AR=${TOOLCHAIN_PREFIX}ar +export RANLIB=${TOOLCHAIN_PREFIX}ranlib +export STRIP=${TOOLCHAIN_PREFIX}strip +export OTOOL=${TOOLCHAIN_PREFIX}otool +export DSYMUTIL=$topsrcdir/clang/bin/llvm-dsymutil + +export HOST_CC="$topsrcdir/clang/bin/clang" +export HOST_CXX="$topsrcdir/clang/bin/clang++" +export HOST_CPP="$topsrcdir/clang/bin/clang -E" +export HOST_CFLAGS="-g" +export HOST_CXXFLAGS="-g" +export HOST_LDFLAGS="-g" + +ac_add_options --target=x86_64-apple-darwin +ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS + +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-macos +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" +export MOZILLA_OFFICIAL=1 + +ac_add_options --enable-application=browser +ac_add_options --enable-strip +ac_add_options --enable-official-branding +ac_add_options --enable-optimize +ac_add_options --disable-debug + +ac_add_options --enable-tor-browser-data-outside-app-dir +ac_add_options --enable-tor-browser-update + +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls +ac_add_options --disable-tests +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme +ac_add_options --enable-proxy-bypass-protection + +# Disable telemetry +ac_add_options MOZ_TELEMETRY_REPORTING= diff --git a/.mozconfig-mingw b/.mozconfig-mingw new file mode 100644 index 000000000000..4fb050308060 --- /dev/null +++ b/.mozconfig-mingw @@ -0,0 +1,30 @@ +CROSS_COMPILE=1 + +ac_add_options --enable-application=browser +ac_add_options --target=i686-w64-mingw32 +ac_add_options --with-toolchain-prefix=i686-w64-mingw32- +ac_add_options --enable-default-toolkit=cairo-windows +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" +export MOZILLA_OFFICIAL=1 + +ac_add_options --disable-debug +ac_add_options --enable-optimize +ac_add_options --enable-strip +ac_add_options --enable-official-branding + +ac_add_options --enable-tor-browser-update +ac_add_options --disable-bits-download + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme +ac_add_options --disable-crashreporter +ac_add_options --disable-maintenance-service +ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls +ac_add_options --disable-tests +ac_add_options --enable-proxy-bypass-protection + +# Disable telemetry +ac_add_options MOZ_TELEMETRY_REPORTING= +ac_add_options --disable-default-browser-agent diff --git a/browser/base/moz.build b/browser/base/moz.build index 316be9c9b7d3..310bbffef44f 100644 --- a/browser/base/moz.build +++ b/browser/base/moz.build @@ -73,6 +73,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk', 'cocoa'): if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk'): DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1 +if CONFIG['TOR_BROWSER_UPDATE']: + DEFINES['TOR_BROWSER_UPDATE'] = 1 + JAR_MANIFESTS += ['jar.mn'] GeneratedFile('content/aboutNetErrorCodes.js', script='gen_aboutneterror_codes.py', diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in index b861ad214a64..0325f0ffab9a 100644 --- a/browser/installer/Makefile.in +++ b/browser/installer/Makefile.in @@ -82,6 +82,14 @@ endif endif endif +ifdef TOR_BROWSER_DISABLE_TOR_LAUNCHER +DEFINES += -DTOR_BROWSER_DISABLE_TOR_LAUNCHER +endif + +ifdef TOR_BROWSER_UPDATE +DEFINES += -DTOR_BROWSER_UPDATE +endif + ifneq (,$(filter WINNT Darwin Android,$(OS_TARGET))) DEFINES += -DMOZ_SHARED_MOZGLUE=1 endif diff --git a/browser/moz.configure b/browser/moz.configure index a251050feb9b..3b6b377235ca 100644 --- a/browser/moz.configure +++ b/browser/moz.configure @@ -5,11 +5,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. imply_option('MOZ_PLACES', True) -imply_option('MOZ_SERVICES_HEALTHREPORT', True) +imply_option('MOZ_SERVICES_HEALTHREPORT', False) imply_option('MOZ_SERVICES_SYNC', True) -imply_option('MOZ_DEDICATED_PROFILES', True) -imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', True) -imply_option('MOZ_NORMANDY', True) +imply_option('MOZ_DEDICATED_PROFILES', False) +imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', False) +imply_option('MOZ_NORMANDY', False) with only_when(target_is_linux & compile_environment): option(env='MOZ_NO_PIE_COMPAT', diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure index 4737529ff11a..6e70cdac30e1 100644 --- a/build/moz.configure/old.configure +++ b/build/moz.configure/old.configure @@ -243,6 +243,12 @@ def old_configure_options(*options): '--with-user-appdir', '--x-includes', '--x-libraries', + + # Tor additions. + '--with-tor-browser-version', + '--enable-tor-browser-update', + '--enable-tor-browser-data-outside-app-dir', + '--enable-tor-launcher', ) def prepare_configure_options(host, target, all_options, *options): # old-configure only supports the options listed in @old_configure_options diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh index 2cfd371a2956..2d0177075c33 100644 --- a/mobile/android/confvars.sh +++ b/mobile/android/confvars.sh @@ -29,9 +29,18 @@ MOZ_ANDROID_BROWSER_INTENT_CLASS=org.mozilla.gecko.BrowserApp MOZ_NO_SMART_CARDS=1 +# Adds MIME-type support for raw video MOZ_RAW=1 # use custom widget for html:select MOZ_USE_NATIVE_POPUP_WINDOWS=1 MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea25febc110} + +### Tor Browser for Android ### + +# Disable telemetry at compile-time +unset MOZ_TELEMETRY_REPORTING + +# Disable data reporting at compile-time +unset MOZ_DATA_REPORTING diff --git a/mobile/android/geckoview/build.gradle b/mobile/android/geckoview/build.gradle index e295f33e208c..231d364c7ca5 100644 --- a/mobile/android/geckoview/build.gradle +++ b/mobile/android/geckoview/build.gradle @@ -92,6 +92,7 @@ android { buildConfigField 'String', "MOZ_APP_DISPLAYNAME", "\"${mozconfig.substs.MOZ_APP_DISPLAYNAME}\""; buildConfigField 'String', "MOZ_APP_UA_NAME", "\"${mozconfig.substs.MOZ_APP_UA_NAME}\""; buildConfigField 'String', "MOZ_UPDATE_CHANNEL", "\"${mozconfig.substs.MOZ_UPDATE_CHANNEL}\""; + buildConfigField 'String', "TOR_BROWSER_VERSION", "\"${mozconfig.substs.TOR_BROWSER_VERSION}\""; // MOZILLA_VERSION is oddly quoted from autoconf, but we don't have to handle it specially in Gradle. buildConfigField 'String', "MOZILLA_VERSION", "\"${mozconfig.substs.MOZILLA_VERSION}\""; diff --git a/mobile/android/moz.configure b/mobile/android/moz.configure index fa510f0a57d3..f7b4df4ac24a 100644 --- a/mobile/android/moz.configure +++ b/mobile/android/moz.configure @@ -10,7 +10,7 @@ project_flag('MOZ_ANDROID_EXCLUDE_FONTS', project_flag('MOZ_ANDROID_HLS_SUPPORT', help='Enable HLS (HTTP Live Streaming) support (currently using the ExoPlayer library)', - default=True) + default=False) option(env='FENNEC_NIGHTLY', help='Enable experimental code for Fennec Nightly users. NOTE: This is *not* equivalent ' @@ -26,9 +26,12 @@ def fennec_nightly(nightly): return bool(nightly) imply_option('MOZ_NORMANDY', False) -imply_option('MOZ_SERVICES_HEALTHREPORT', True) imply_option('MOZ_ANDROID_HISTORY', True) imply_option('--enable-small-chunk-size', True) +# Comment this so we can imply |False| in torbrowser.configure +# The Build system doesn't allow multiple imply_option() +# calls with the same key. +#imply_option('MOZ_SERVICES_HEALTHREPORT', True) @depends(target) def check_target(target): @@ -39,6 +42,8 @@ def check_target(target): 'Build_Instructions/Simple_Firefox_for_Android_build ' 'for more information about the necessary options.') +include('torbrowser.configure') + include('../../toolkit/moz.configure') include('../../build/moz.configure/android-sdk.configure') include('../../build/moz.configure/java.configure') @@ -50,3 +55,11 @@ option(env='MOZ_ANDROID_FAT_AAR_ARCHITECTURES', help='Comma-separated list of Android CPU architectures like "armeabi-v7a,arm64-v8a,x86,x86_64"') set_config('MOZ_ANDROID_FAT_AAR_ARCHITECTURES', depends('MOZ_ANDROID_FAT_AAR_ARCHITECTURES')(lambda x: x)) + +project_flag('MOZ_ANDROID_NETWORK_STATE', + help='Include permission for accessing WiFi/network state on Android', + default=False) + +project_flag('MOZ_ANDROID_LOCATION', + help='Include permission for accessing fine and course-grain Location on Android', + default=False) diff --git a/mobile/android/torbrowser.configure b/mobile/android/torbrowser.configure new file mode 100644 index 000000000000..2ff6215eedc9 --- /dev/null +++ b/mobile/android/torbrowser.configure @@ -0,0 +1,30 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# 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/. + +# Set Tor Browser default config + +imply_option('MOZ_ANDROID_EXCLUDE_FONTS', False) + +# Disable uploading crash reports and dump files to an external server +# This is still configured in old-configure. Uncomment when this moves +# to the python config +#imply_option('MOZ_CRASHREPORTER', False) + +# Disable uploading information about the browser configuration and +# performance to an external server +imply_option('MOZ_SERVICES_HEALTHREPORT', False) + +# Disable creating telemetry and data reports that are uploaded to an +# external server +# These aren't actually configure options. These are disabled in +# confvars.sh, but they look like configure options so we'll document +# them here, as well. +#XXX: no confvars.sh here +#imply_option('MOZ_TELEMETRY_REPORTING', False) +#imply_option('MOZ_DATA_REPORTING', False) + +imply_option('MOZ_ANDROID_NETWORK_STATE', False); +imply_option('MOZ_ANDROID_LOCATION', False); diff --git a/old-configure.in b/old-configure.in index 696b31c10dff..dfe7a74b1669 100644 --- a/old-configure.in +++ b/old-configure.in @@ -1926,6 +1926,55 @@ if test -n "$MOZ_UPDATER"; then AC_DEFINE(MOZ_UPDATER) fi +dnl ======================================================== +dnl Tor additions +dnl ======================================================== +MOZ_ARG_WITH_STRING(tor-browser-version, +[ --with-tor-browser-version=VERSION + Set Tor Browser version, e.g., 7.0a1], + TOR_BROWSER_VERSION="$withval") + +if test -z "$TOR_BROWSER_VERSION"; then + AC_MSG_ERROR([--with-tor-browser-version is required for Tor Browser.]) +fi + +MOZ_ARG_ENABLE_BOOL(tor-browser-update, +[ --enable-tor-browser-update + Enable Tor Browser update], + TOR_BROWSER_UPDATE=1, + TOR_BROWSER_UPDATE= ) + +if test -n "$TOR_BROWSER_UPDATE"; then + AC_DEFINE(TOR_BROWSER_UPDATE) +fi + +MOZ_ARG_ENABLE_BOOL(tor-browser-data-outside-app-dir, +[ --enable-tor-browser-data-outside-app-dir + Enable Tor Browser data outside of app directory], + TOR_BROWSER_DATA_OUTSIDE_APP_DIR=1, + TOR_BROWSER_DATA_OUTSIDE_APP_DIR= ) + +if test -n "$TOR_BROWSER_DATA_OUTSIDE_APP_DIR"; then + AC_DEFINE(TOR_BROWSER_DATA_OUTSIDE_APP_DIR) +fi + +AC_DEFINE_UNQUOTED(TOR_BROWSER_VERSION,$TOR_BROWSER_VERSION) +AC_DEFINE_UNQUOTED(TOR_BROWSER_VERSION_QUOTED,"$TOR_BROWSER_VERSION") +AC_SUBST(TOR_BROWSER_UPDATE) +AC_SUBST(TOR_BROWSER_DATA_OUTSIDE_APP_DIR) + +MOZ_ARG_DISABLE_BOOL(tor-launcher, +[ --disable-tor-launcher + Do not include Tor Launcher], + TOR_BROWSER_DISABLE_TOR_LAUNCHER=1, + TOR_BROWSER_DISABLE_TOR_LAUNCHER=) + +if test -n "$TOR_BROWSER_DISABLE_TOR_LAUNCHER"; then + AC_DEFINE(TOR_BROWSER_DISABLE_TOR_LAUNCHER) +fi + +AC_SUBST(TOR_BROWSER_DISABLE_TOR_LAUNCHER) + dnl ======================================================== dnl parental controls (for Windows Vista) dnl ======================================================== diff --git a/security/moz.build b/security/moz.build index dec6f3ef7e21..f00f9fe5d7a7 100644 --- a/security/moz.build +++ b/security/moz.build @@ -85,7 +85,7 @@ gyp_vars['nss_dist_obj_dir'] = '$PRODUCT_DIR/dist/bin' gyp_vars['disable_tests'] = 1 gyp_vars['disable_dbm'] = 1 gyp_vars['disable_libpkix'] = 1 -gyp_vars['enable_sslkeylogfile'] = 1 +gyp_vars['enable_sslkeylogfile'] = 0 # pkg-config won't reliably find zlib on our builders, so just force it. # System zlib is only used for modutil and signtool unless # SSL zlib is enabled, which we are disabling immediately below this. diff --git a/security/nss/lib/ssl/Makefile b/security/nss/lib/ssl/Makefile index 8a8b06f4b508..90571bb3e256 100644 --- a/security/nss/lib/ssl/Makefile +++ b/security/nss/lib/ssl/Makefile @@ -41,7 +41,7 @@ endif # Enable key logging by default in debug builds, but not opt builds. # Logging still needs to be enabled at runtime through env vars. -NSS_ALLOW_SSLKEYLOGFILE ?= $(if $(BUILD_OPT),0,1) +NSS_ALLOW_SSLKEYLOGFILE ?= 0 ifeq (1,$(NSS_ALLOW_SSLKEYLOGFILE)) DEFINES += -DNSS_ALLOW_SSLKEYLOGFILE=1 endif diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm index da47d20b293c..4192ee5b1c44 100644 --- a/toolkit/modules/AppConstants.jsm +++ b/toolkit/modules/AppConstants.jsm @@ -342,6 +342,14 @@ this.AppConstants = Object.freeze({ MOZ_WIDGET_TOOLKIT: "@MOZ_WIDGET_TOOLKIT@", ANDROID_PACKAGE_NAME: "@ANDROID_PACKAGE_NAME@", + TOR_BROWSER_VERSION: "@TOR_BROWSER_VERSION@", + TOR_BROWSER_DATA_OUTSIDE_APP_DIR: +#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR + true, +#else + false, +#endif + DEBUG_JS_MODULES: "@DEBUG_JS_MODULES@", MOZ_BING_API_CLIENTID: "@MOZ_BING_API_CLIENTID@", @@ -419,4 +427,11 @@ this.AppConstants = Object.freeze({ #else false, #endif + + TOR_BROWSER_UPDATE: +#ifdef TOR_BROWSER_UPDATE + true, +#else + false, +#endif }); diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build index 1dbbb685efcd..348ea91f5f2e 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build @@ -296,6 +296,9 @@ for var in ('MOZ_ALLOW_ADDON_SIDELOAD', if CONFIG[var]: DEFINES[var] = True +if CONFIG['TOR_BROWSER_UPDATE']: + DEFINES['TOR_BROWSER_UPDATE'] = 1 + JAR_MANIFESTS += ['jar.mn'] DEFINES['TOPOBJDIR'] = TOPOBJDIR

1 0

[tor-browser/tor-browser-81.0b9-10.0-1] Bug 40069: Add helpers for message passing with extensions
by gk＠torproject.org 15 Sep '20

15 Sep '20

commit 3c9d70da4292b8a855a31874f59d15f71f3fa086 Author: Alex Catarineu <acat(a)torproject.org> Date: Sun Aug 2 19:12:25 2020 +0200 Bug 40069: Add helpers for message passing with extensions --- toolkit/components/extensions/ExtensionParent.jsm | 47 +++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/toolkit/components/extensions/ExtensionParent.jsm b/toolkit/components/extensions/ExtensionParent.jsm index b7bf99accb73..33c3359af04c 100644 --- a/toolkit/components/extensions/ExtensionParent.jsm +++ b/toolkit/components/extensions/ExtensionParent.jsm @@ -264,6 +264,8 @@ const ProxyMessenger = { /** @type Map<number, ParentPort> */ ports: new Map(), + _torRuntimeMessageListeners: [], + init() { this.conduit = new BroadcastConduit(ProxyMessenger, { id: "ProxyMessenger", @@ -326,6 +328,10 @@ const ProxyMessenger = { }, async recvRuntimeMessage(arg, { sender }) { + // We need to listen to some extension messages in Tor Browser + for (const listener of this._torRuntimeMessageListeners) { + listener(arg); + } arg.firstResponse = true; let kind = await this.normalizeArgs(arg, sender); let result = await this.conduit.castRuntimeMessage(kind, arg); @@ -1870,6 +1876,45 @@ for (let name of StartupCache.STORE_NAMES) { StartupCache[name] = new CacheStore(name); } +async function torSendExtensionMessage(extensionId, message) { + // This should broadcast the message to all children "conduits" + // listening for a "RuntimeMessage". Those children conduits + // will either be extension background pages or other extension + // pages listening to browser.runtime.onMessage. + const result = await ProxyMessenger.conduit.castRuntimeMessage("messenger", { + extensionId, + holder: new StructuredCloneHolder(message), + firstResponse: true, + sender: { + id: extensionId, + envType: "addon_child", + }, + }); + return result + ? result.value + : Promise.reject({ message: ERROR_NO_RECEIVERS }); +} + +async function torWaitForExtensionMessage(extensionId, checker) { + return new Promise(resolve => { + const msgListener = msg => { + try { + if (msg && msg.extensionId === extensionId) { + const deserialized = msg.holder.deserialize({}); + if (checker(deserialized)) { + const idx = ProxyMessenger._torRuntimeMessageListeners.indexOf( + msgListener + ); + ProxyMessenger._torRuntimeMessageListeners.splice(idx, 1); + resolve(deserialized); + } + } + } catch (e) {} + }; + ProxyMessenger._torRuntimeMessageListeners.push(msgListener); + }); +} + var ExtensionParent = { GlobalManager, HiddenExtensionPage, @@ -1881,6 +1926,8 @@ var ExtensionParent = { promiseExtensionViewLoaded, watchExtensionProxyContextLoad, DebugUtils, + torSendExtensionMessage, + torWaitForExtensionMessage, }; // browserPaintedPromise and browserStartupPromise are promises that

1 0

[tor-browser/tor-browser-81.0b9-10.0-1] Bug 28044: Integrate Tor Launcher into tor-browser
by gk＠torproject.org 15 Sep '20

15 Sep '20

commit 2370826450ec667fe481151b8e0f319c5cd4f6d8 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Feb 26 10:07:17 2019 -0500 Bug 28044: Integrate Tor Launcher into tor-browser Build and package Tor Launcher as part of the browser (similar to how pdfjs is handled). If a Tor Launcher extension is present in the user's profile, it is removed. --- browser/extensions/moz.build | 5 +++++ browser/installer/package-manifest.in | 5 +++++ toolkit/mozapps/extensions/internal/XPIProvider.jsm | 10 ++++++++++ 3 files changed, 20 insertions(+) diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build index f71ece63c42d..9787ecf81592 100644 --- a/browser/extensions/moz.build +++ b/browser/extensions/moz.build @@ -11,3 +11,8 @@ DIRS += [ 'webcompat', 'report-site-issue' ] + +if not CONFIG['TOR_BROWSER_DISABLE_TOR_LAUNCHER']: + DIRS += [ + 'tor-launcher', + ] diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 2865597f498e..9cb8a3c65d7b 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -252,6 +252,11 @@ @RESPATH@/browser/chrome/browser.manifest @RESPATH@/chrome/pdfjs.manifest @RESPATH@/chrome/pdfjs/* +#ifndef TOR_BROWSER_DISABLE_TOR_LAUNCHER +@RESPATH@/browser/chrome/torlauncher.manifest +@RESPATH@/browser/chrome/torlauncher/* +@RESPATH@/browser/@PREF_DIR@/torlauncher-prefs.js +#endif @RESPATH@/chrome/toolkit@JAREXT@ @RESPATH@/chrome/toolkit.manifest @RESPATH@/chrome/recording.manifest diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index 14bbba2b39b9..87e4d3ee9e45 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -1462,6 +1462,16 @@ var XPIStates = { for (let [id, file] of loc.readAddons()) { knownIds.delete(id); + // Since it is now part of the browser, uninstall the Tor Launcher + // extension. This will remove the Tor Launcher .xpi from user + // profiles on macOS. + if (id === "tor-launcher(a)torproject.org") { + logger.debug("Uninstalling the Tor Launcher extension."); + loc.installer.uninstallAddon(id); + changed = true; + continue; + } + let xpiState = loc.get(id); if (!xpiState) { // If the location is not supported for sideloading, skip new

1 0

[tor-browser/tor-browser-81.0b9-10.0-1] Bug 13028: Prevent potential proxy bypass cases.
by gk＠torproject.org 15 Sep '20

15 Sep '20

commit 451ec3d3123c848798217b0cf2b2fd533c7d94ae Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 29 14:30:19 2014 -0700 Bug 13028: Prevent potential proxy bypass cases. It looks like these cases should only be invoked in the NSS command line tools, and not the browser, but I decided to patch them anyway because there literally is a maze of network function pointers being passed around, and it's very hard to tell if some random code might not pass in the proper proxied versions of the networking code here by accident. --- security/nss/lib/certhigh/ocsp.c | 8 ++++++++ .../lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c | 21 +++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/security/nss/lib/certhigh/ocsp.c b/security/nss/lib/certhigh/ocsp.c index cea8456606bf..86fa971cfbef 100644 --- a/security/nss/lib/certhigh/ocsp.c +++ b/security/nss/lib/certhigh/ocsp.c @@ -2932,6 +2932,14 @@ ocsp_ConnectToHost(const char *host, PRUint16 port) PRNetAddr addr; char *netdbbuf = NULL; + // XXX: Do we need a unittest ifdef here? We don't want to break the tests, but + // we want to ensure nothing can ever hit this code in production. +#if 1 + printf("Tor Browser BUG: Attempted OSCP direct connect to %s, port %u\n", host, + port); + goto loser; +#endif + sock = PR_NewTCPSocket(); if (sock == NULL) goto loser; diff --git a/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c b/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c index e8698376b5be..85791d84a932 100644 --- a/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c +++ b/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c @@ -1334,6 +1334,13 @@ pkix_pl_Socket_Create( plContext), PKIX_COULDNOTCREATESOCKETOBJECT); + // XXX: Do we need a unittest ifdef here? We don't want to break the tests, but + // we want to ensure nothing can ever hit this code in production. +#if 1 + printf("Tor Browser BUG: Attempted pkix direct socket connect\n"); + PKIX_ERROR(PKIX_PRNEWTCPSOCKETFAILED); +#endif + socket->isServer = isServer; socket->timeout = timeout; socket->clientSock = NULL; @@ -1433,6 +1440,13 @@ pkix_pl_Socket_CreateByName( localCopyName = PL_strdup(serverName); + // XXX: Do we need a unittest ifdef here? We don't want to break the tests, but + // we want to ensure nothing can ever hit this code in production. +#if 1 + printf("Tor Browser BUG: Attempted pkix direct connect to %s\n", serverName); + PKIX_ERROR(PKIX_PRNEWTCPSOCKETFAILED); +#endif + sepPtr = strchr(localCopyName, ':'); /* First strip off the portnum, if present, from the end of the name */ if (sepPtr) { @@ -1582,6 +1596,13 @@ pkix_pl_Socket_CreateByHostAndPort( PKIX_ENTER(SOCKET, "pkix_pl_Socket_CreateByHostAndPort"); PKIX_NULLCHECK_THREE(hostname, pStatus, pSocket); + // XXX: Do we need a unittest ifdef here? We don't want to break the tests, but + // we want to ensure nothing can ever hit this code in production. +#if 1 + printf("Tor Browser BUG: Attempted pkix direct connect to %s, port %u\n", hostname, + portnum); + PKIX_ERROR(PKIX_PRNEWTCPSOCKETFAILED); +#endif prstatus = PR_GetHostByName(hostname, buf, sizeof(buf), &hostent);

1 0

[tor-browser/tor-browser-81.0b9-10.0-1] Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 15 Sep '20

15 Sep '20

commit b4c5d90c163467ea91e8d012d60984a6e7b734e9 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Feb 19 23:05:08 2020 +0100 Bug 10760: Integrate TorButton to TorBrowser core Because of the non-restartless nature of Torbutton, it required a two-stage installation process. On mobile, it was a problem, because it was not loading when the user opened the browser for the first time. Moving it to tor-browser and making it a system extension allows it to load when the user opens the browser for first time. Additionally, this patch also fixes Bug 27611. Bug 26321: New Circuit and New Identity menu items Bug 14392: Make about:tor behave like other initial pages. Bug 25013: Add torbutton as a tor-browser submodule --- .gitmodules | 3 ++ browser/base/content/aboutDialog.xhtml | 38 +++++++++++------ browser/base/content/browser-doctype.inc | 6 +++ browser/base/content/browser-menubar.inc | 49 ++++++++++++++++------ browser/base/content/browser-sets.inc | 2 + browser/base/content/browser.js | 1 + browser/base/content/browser.xhtml | 26 +++++++++++- .../controlcenter/content/identityPanel.inc.xhtml | 17 ++++++++ browser/installer/package-manifest.in | 2 + docshell/base/nsAboutRedirector.cpp | 6 ++- docshell/build/components.conf | 1 + mobile/android/installer/package-manifest.in | 4 ++ toolkit/moz.build | 1 + .../mozapps/extensions/internal/XPIProvider.jsm | 9 ++++ toolkit/torproject/torbutton | 1 + .../lib/environments/browser-window.js | 6 ++- 16 files changed, 142 insertions(+), 30 deletions(-) diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000000..2f03bd8e22df --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "toolkit/torproject/torbutton"] + path = toolkit/torproject/torbutton + url = https://git.torproject.org/torbutton.git diff --git a/browser/base/content/aboutDialog.xhtml b/browser/base/content/aboutDialog.xhtml index 69cbf846bbef..5274cbc02831 100644 --- a/browser/base/content/aboutDialog.xhtml +++ b/browser/base/content/aboutDialog.xhtml @@ -7,11 +7,11 @@ <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> <?xml-stylesheet href="chrome://browser/content/aboutDialog.css" type="text/css"?> <?xml-stylesheet href="chrome://branding/content/aboutDialog.css" type="text/css"?> +<?xml-stylesheet href="chrome://torbutton/skin/aboutDialog.css" type="text/css"?> + <!DOCTYPE window [ -#ifdef XP_MACOSX #include browser-doctype.inc -#endif ]> <window xmlns:html="http://www.w3.org/1999/xhtml" @@ -28,7 +28,7 @@ data-l10n-id="aboutDialog-title" #endif role="dialog" - aria-describedby="version distribution distributionId communityDesc contributeDesc trademark" + aria-describedby="version distribution distributionId projectDesc helpDesc trademark trademarkTor" > #ifdef XP_MACOSX #include macWindow.inc.xhtml @@ -132,24 +132,36 @@ <label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-exp-creditsLink"></label> </description> </vbox> - <description class="text-blurb" id="communityDesc" data-l10n-id="community-2"> - <label is="text-link" href="http://www.mozilla.org/" data-l10n-name="community-mozillaLink"></label> - <label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-creditsLink"></label> +  + <description class="text-blurb" id="communityDesc" data-l10n-id="community-2" hidden="true"></description> + <description class="text-blurb" id="contributeDesc" data-l10n-id="helpus" hidden="true"></description> + <description class="text-blurb" id="projectDesc"> + &project.start; + <label is="text-link" href="https://www.torproject.org/"> + &project.tpoLink; + </label>&project.end; </description> - <description class="text-blurb" id="contributeDesc" data-l10n-id="helpus"> - <label is="text-link" href="https://donate.mozilla.org/?utm_source=firefox&utm_medium=referral&…" data-l10n-name="helpus-donateLink"></label> - <label is="text-link" href="http://www.mozilla.org/contribute/" data-l10n-name="helpus-getInvolvedLink"></label> + <description class="text-blurb" id="helpDesc"> + &help.start; + <label is="text-link" href="https://donate.torproject.org/"> + &help.donateLink; + </label> + &help.or; + <label is="text-link" href="https://community.torproject.org/"> + &help.getInvolvedLink; + </label>&help.end; </description> </vbox> </vbox> </hbox> <vbox id="bottomBox"> - <hbox pack="center"> - <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="bottomLinks-license"></label> - <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:rights" data-l10n-id="bottomLinks-rights"></label> - <label is="text-link" class="bottom-link" href="https://www.mozilla.org/privacy/" data-l10n-id="bottomLinks-privacy"></label> + <hbox id="newBottom" pack="center" position="1"> + <label is="text-link" class="bottom-link" href="https://support.torproject.org/">&bottomLinks.questions;</label> + <label is="text-link" class="bottom-link" href="https://community.torproject.org/relay/">&bottomLinks.grow;</label> + <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license">&bottomLinks.license;</label> </hbox> <description id="trademark" data-l10n-id="trademarkInfo"></description> + <description id="trademarkTor">&tor.TrademarkStatement;</description> </vbox> </vbox> diff --git a/browser/base/content/browser-doctype.inc b/browser/base/content/browser-doctype.inc index 9aa278773158..48cf6cd3eda0 100644 --- a/browser/base/content/browser-doctype.inc +++ b/browser/base/content/browser-doctype.inc @@ -14,3 +14,9 @@ %syncBrandDTD; <!ENTITY % brandingsDTD SYSTEM "chrome://browser/locale/brandings.dtd"> %brandingsDTD; +<!ENTITY % torbuttonDTD SYSTEM "chrome://torbutton/locale/torbutton.dtd"> +%torbuttonDTD; +<!ENTITY % aboutTorDTD SYSTEM "chrome://torbutton/locale/aboutTor.dtd"> +%aboutTorDTD; +<!ENTITY % aboutDialogDTD SYSTEM "chrome://torbutton/locale/aboutDialog.dtd"> +%aboutDialogDTD; diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc index 1efe3f82aec1..d2e94ca441dc 100644 --- a/browser/base/content/browser-menubar.inc +++ b/browser/base/content/browser-menubar.inc @@ -34,6 +34,18 @@ command="Tools:NonFissionWindow" accesskey="s" label="New Non-Fission Window"/> #endif + <menuseparator/> + <menuitem id="menu_newIdentity" + accesskey="&torbutton.context_menu.new_identity_key;" + key="torbutton-new-identity-key" + label="&torbutton.context_menu.new_identity;" + oncommand="torbutton_new_identity();"/> + <menuitem id="menu_newCircuit" + accesskey="&torbutton.context_menu.new_circuit_key;" + key="torbutton-new-circuit-key" + label="&torbutton.context_menu.new_circuit;" + oncommand="torbutton_new_circuit();"/> + <menuseparator/> <menuitem id="menu_openLocation" hidden="true" command="Browser:OpenLocation" @@ -454,17 +466,28 @@ #endif data-l10n-id="menu-help"> <menupopup id="menu_HelpPopup" onpopupshowing="buildHelpMenu();"> - <menuitem id="menu_openHelp" +  + <box id="feedbackPage"/> + <box id="helpSafeMode"/> + <box id="menu_HelpPopup_reportPhishingtoolmenu"/> + <box id="menu_HelpPopup_reportPhishingErrortoolmenu"/> +  + <menuitem id="torBrowserUserManual" + oncommand="gBrowser.selectedTab = gBrowser.addTab('https://tb-manual.torproject.org/' + Services.locale.requestedLocale, {triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal()});" + label="&aboutTor.torbrowser_user_manual.label;" + accesskey="&aboutTor.torbrowser_user_manual.accesskey;"/> +  +  #else - /> + /> --> #endif - <menuitem id="menu_openTour" - oncommand="openTourPage();" data-l10n-id="menu-help-show-tour"/> +  <menuitem id="help_importFromAnotherBrowser" command="cmd_help_importFromAnotherBrowser" data-l10n-id="menu-help-import-from-another-browser"/> <menuitem id="menu_keyboardShortcuts" @@ -473,22 +496,22 @@ <menuitem id="troubleShooting" oncommand="openTroubleshootingPage()" onclick="checkForMiddleClick(this, event);" data-l10n-id="menu-help-troubleshooting-info"/> - <menuitem id="feedbackPage" +  +  +  +  <menuseparator id="helpPolicySeparator" hidden="true"/> <menuitem id="helpPolicySupport" diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc index d03e3c4301d1..6c634a53b30a 100644 --- a/browser/base/content/browser-sets.inc +++ b/browser/base/content/browser-sets.inc @@ -376,4 +376,6 @@ data-l10n-id="hide-other-apps-shortcut" modifiers="accel,alt"/> #endif + <key id="torbutton-new-identity-key" modifiers="accel shift" key="U" oncommand="torbutton_new_identity()"/> + <key id="torbutton-new-circuit-key" modifiers="accel shift" key="L" oncommand="torbutton_new_circuit()"/> </keyset> diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 04f2d0195ab8..7764aacd1491 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -620,6 +620,7 @@ var gPageIcons = { }; var gInitialPages = [ + "about:tor", "about:blank", "about:newtab", "about:home", diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml index 965fb8b98b81..f0c59f98886c 100644 --- a/browser/base/content/browser.xhtml +++ b/browser/base/content/browser.xhtml @@ -29,6 +29,8 @@ <?xml-stylesheet href="chrome://browser/skin/searchbar.css" type="text/css"?> <?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css" type="text/css"?> <?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css" type="text/css"?> +<?xml-stylesheet href="chrome://torbutton/skin/tor-circuit-display.css" type="text/css"?> +<?xml-stylesheet href="chrome://torbutton/skin/torbutton.css" type="text/css"?> # All DTD information is stored in a separate file so that it can be shared by # hiddenWindowMac.xhtml. @@ -106,11 +108,18 @@ Services.scriptloader.loadSubScript("chrome://browser/content/places/places-menupopup.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/search/autocomplete-popup.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this); + Services.scriptloader.loadSubScript("chrome://torbutton/content/tor-circuit-display.js", this); + Services.scriptloader.loadSubScript("chrome://torbutton/content/torbutton.js", this); window.onload = gBrowserInit.onLoad.bind(gBrowserInit); window.onunload = gBrowserInit.onUnload.bind(gBrowserInit); window.onclose = WindowIsClosing; + //onLoad Handler + try { + window.addEventListener("load", torbutton_init, false); + } catch (e) {} + window.addEventListener("MozBeforeInitialXULLayout", gBrowserInit.onBeforeInitialXULLayout.bind(gBrowserInit), { once: true }); @@ -790,7 +799,8 @@ class="subviewbutton subviewbutton-iconic" label="&newPrivateWindow.label;" key="key_privatebrowsing" - command="Tools:PrivateBrowsing"/> + command="Tools:PrivateBrowsing" + hidden="true"/> #ifdef NIGHTLY_BUILD <toolbarbutton id="appMenu-fission-window-button" class="subviewbutton subviewbutton-iconic" @@ -806,7 +816,19 @@ <toolbarbutton id="appMenuRestoreLastSession" label="&appMenuHistory.restoreSession.label;" class="subviewbutton subviewbutton-iconic" - command="Browser:RestoreLastSession"/> + command="Browser:RestoreLastSession" + hidden="true"/> + <toolbarseparator/> + <toolbarbutton id="appMenuNewIdentity" + class="subviewbutton subviewbutton-iconic" + key="torbutton-new-identity-key" + label="&torbutton.context_menu.new_identity;" + oncommand="torbutton_new_identity();"/> + <toolbarbutton id="appMenuNewCircuit" + class="subviewbutton subviewbutton-iconic" + key="torbutton-new-circuit-key" + label="&torbutton.context_menu.new_circuit;" + oncommand="torbutton_new_circuit();"/> <toolbarseparator/> <toolbaritem id="appMenu-zoom-controls" class="toolbaritem-combined-buttons" closemenu="none">  diff --git a/browser/components/controlcenter/content/identityPanel.inc.xhtml b/browser/components/controlcenter/content/identityPanel.inc.xhtml index 7e3badbff3b3..e32fd66ff16f 100644 --- a/browser/components/controlcenter/content/identityPanel.inc.xhtml +++ b/browser/components/controlcenter/content/identityPanel.inc.xhtml @@ -60,6 +60,23 @@ oncommand="gIdentityHandler.showSecuritySubView();"/> </hbox> +  + <hbox id="circuit-display-container" class="identity-popup-section"> + <vbox id="circuit-display-content" flex="1" role="group" + aria-labelledby="circuit-display-headline"> + <hbox id="circuit-display-header" align="center"> + <label id="circuit-display-headline" + role="heading" aria-level="2">&torbutton.circuit_display.title;</label> + </hbox> + <html:ul id="circuit-display-nodes" dir="auto"/> + </vbox> + <vbox id="circuit-reload-content" flex="1"> + <html:button id="circuit-reload-button" + onclick="torbutton_new_circuit()">&torbutton.circuit_display.new_circuit;</html:button> + <hbox id="circuit-guard-note-container"/> + </vbox> + </hbox> +  <hbox class="identity-popup-section" when-connection="not-secure secure secure-ev secure-cert-user-overridden file extension cert-error-page https-only-error-page"> diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 9cb8a3c65d7b..d2113da95cdf 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -257,6 +257,8 @@ @RESPATH@/browser/chrome/torlauncher/* @RESPATH@/browser/@PREF_DIR@/torlauncher-prefs.js #endif +@RESPATH@/chrome/torbutton.manifest +@RESPATH@/chrome/torbutton/* @RESPATH@/chrome/toolkit@JAREXT@ @RESPATH@/chrome/toolkit.manifest @RESPATH@/chrome/recording.manifest diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp index 26fd0dca54eb..fd6f6a4972a1 100644 --- a/docshell/base/nsAboutRedirector.cpp +++ b/docshell/base/nsAboutRedirector.cpp @@ -150,7 +150,11 @@ static const RedirEntry kRedirMap[] = { {"crashcontent", "about:blank", nsIAboutModule::HIDE_FROM_ABOUTABOUT | nsIAboutModule::URI_CAN_LOAD_IN_CHILD | - nsIAboutModule::URI_MUST_LOAD_IN_CHILD}}; + nsIAboutModule::URI_MUST_LOAD_IN_CHILD}, + {"tor", "chrome://torbutton/content/aboutTor/aboutTor.xhtml", + nsIAboutModule::URI_MUST_LOAD_IN_CHILD | + nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | + nsIAboutModule::ALLOW_SCRIPT}}; static const int kRedirTotal = mozilla::ArrayLength(kRedirMap); NS_IMETHODIMP diff --git a/docshell/build/components.conf b/docshell/build/components.conf index 70dbcd661099..b5bf16f4cae8 100644 --- a/docshell/build/components.conf +++ b/docshell/build/components.conf @@ -27,6 +27,7 @@ about_pages = [ 'srcdoc', 'support', 'telemetry', + 'tor', 'url-classifier', 'webrtc', ] diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index 17d6471c4742..055eb4717447 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -137,6 +137,10 @@ @BINPATH@/chrome/devtools@JAREXT@ @BINPATH@/chrome/devtools.manifest +; Torbutton +@BINPATH@/chrome/torbutton@JAREXT@ +@BINPATH@/chrome/torbutton.manifest + ; [Default Preferences] ; All the pref files must be part of base to prevent migration bugs #ifdef MOZ_GECKOVIEW_JAR diff --git a/toolkit/moz.build b/toolkit/moz.build index b6f792da7124..3451334de15c 100644 --- a/toolkit/moz.build +++ b/toolkit/moz.build @@ -23,6 +23,7 @@ DIRS += [ 'pluginproblem', 'profile', 'themes', + 'torproject/torbutton', ] if CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['MOZ_DEFAULT_BROWSER_AGENT']: diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index 87e4d3ee9e45..a27888278f77 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -1462,6 +1462,15 @@ var XPIStates = { for (let [id, file] of loc.readAddons()) { knownIds.delete(id); + // Uninstall torbutton if it is installed in the user profile + if (id === "torbutton(a)torproject.org" && + loc.name === KEY_APP_PROFILE) { + logger.debug("Uninstalling torbutton from user profile."); + loc.installer.uninstallAddon(id); + changed = true; + continue; + } + // Since it is now part of the browser, uninstall the Tor Launcher // extension. This will remove the Tor Launcher .xpi from user // profiles on macOS. diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton new file mode 160000 index 000000000000..9a3956916b98 --- /dev/null +++ b/toolkit/torproject/torbutton @@ -0,0 +1 @@ +Subproject commit 9a3956916b9897d668138dd450ad5a8be9d38e02 diff --git a/tools/lint/eslint/eslint-plugin-mozilla/lib/environments/browser-window.js b/tools/lint/eslint/eslint-plugin-mozilla/lib/environments/browser-window.js index 76e03f2d49bb..2ff107b553b2 100644 --- a/tools/lint/eslint/eslint-plugin-mozilla/lib/environments/browser-window.js +++ b/tools/lint/eslint/eslint-plugin-mozilla/lib/environments/browser-window.js @@ -75,7 +75,11 @@ function getGlobalScriptIncludes(scriptPath) { "browser/components/search/content/" ) .replace("chrome://browser/content/", "browser/base/content/") - .replace("chrome://global/content/", "toolkit/content/"); + .replace("chrome://global/content/", "toolkit/content/") + .replace( + "chrome://torbutton/content/", + "toolkit/torproject/torbutton/chrome/content/" + ); for (let mapping of Object.getOwnPropertyNames(MAPPINGS)) { if (sourceFile.includes(mapping)) {

1 0

[tor-browser/tor-browser-81.0b9-10.0-1] Bug 12974: Disable NTLM and Negotiate HTTP Auth
by gk＠torproject.org 15 Sep '20

15 Sep '20

commit d3262a2354bb096ef2561927b187794ec75cfeda Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 27 15:19:10 2014 -0700 Bug 12974: Disable NTLM and Negotiate HTTP Auth This is technically an embargoed Mozilla bug, so I probably shouldn't provide too many details. Suffice to say that NTLM and Negotiate auth are bad for Tor users, and I doubt very many (or any of them) actually need it. The Mozilla bug is https://bugzilla.mozilla.org/show_bug.cgi?id=1046421 --- extensions/auth/nsHttpNegotiateAuth.cpp | 4 ++++ netwerk/protocol/http/nsHttpNTLMAuth.cpp | 3 +++ 2 files changed, 7 insertions(+) diff --git a/extensions/auth/nsHttpNegotiateAuth.cpp b/extensions/auth/nsHttpNegotiateAuth.cpp index 99720475b9dd..1c08fcf3da7e 100644 --- a/extensions/auth/nsHttpNegotiateAuth.cpp +++ b/extensions/auth/nsHttpNegotiateAuth.cpp @@ -152,6 +152,10 @@ nsHttpNegotiateAuth::ChallengeReceived(nsIHttpAuthenticableChannel* authChannel, nsIAuthModule* rawModule = (nsIAuthModule*)*continuationState; *identityInvalid = false; + + /* Always fail Negotiate auth for Tor Browser. We don't need it. */ + return NS_ERROR_ABORT; + if (rawModule) { return NS_OK; } diff --git a/netwerk/protocol/http/nsHttpNTLMAuth.cpp b/netwerk/protocol/http/nsHttpNTLMAuth.cpp index 0a30de051014..891aaadfd758 100644 --- a/netwerk/protocol/http/nsHttpNTLMAuth.cpp +++ b/netwerk/protocol/http/nsHttpNTLMAuth.cpp @@ -168,6 +168,9 @@ nsHttpNTLMAuth::ChallengeReceived(nsIHttpAuthenticableChannel* channel, *identityInvalid = false; + /* Always fail Negotiate auth for Tor Browser. We don't need it. */ + return NS_ERROR_ABORT; + // Start a new auth sequence if the challenge is exactly "NTLM". // If native NTLM auth apis are available and enabled through prefs, // try to use them.

1 0

[tor-browser/tor-browser-81.0b9-10.0-1] Bug 3547: Block all plugins.
by gk＠torproject.org 15 Sep '20

15 Sep '20

commit 3977591a0e94bba2f3269e5cf0cc2b8168b2e8a2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Dec 4 16:03:13 2012 -0800 Bug 3547: Block all plugins. We cannot use the @mozilla.org/extensions/blocklist;1 service, because we actually want to stop plugins from ever entering the browser's process space and/or executing code (for example, AV plugins that collect statistics/analyse urls, magical toolbars that phone home or "help" the user, skype buttons that ruin our day, and censorship filters). Hence we rolled our own. See https://trac.torproject.org/projects/tor/ticket/3547#comment:6 for musings on a better way. Until then, it is delta-darwinism for us. --- dom/plugins/base/PluginFinder.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dom/plugins/base/PluginFinder.cpp b/dom/plugins/base/PluginFinder.cpp index dfac7b052567..aa06842dd3f5 100644 --- a/dom/plugins/base/PluginFinder.cpp +++ b/dom/plugins/base/PluginFinder.cpp @@ -478,6 +478,9 @@ nsresult PluginFinder::ScanPluginsDirectory(nsIFile* pluginsDir, *aPluginsChanged = false; + // Block all plugins + return NS_OK; + #ifdef PLUGIN_LOGGING nsAutoCString dirPath; pluginsDir->GetNativePath(dirPath);

1 0

[tor-browser/tor-browser-81.0b9-10.0-1] Add TorStrings module for localization
by gk＠torproject.org 15 Sep '20

15 Sep '20

commit 23d3d071dca47e4665ecdcb221812eee28ba08f7 Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Jul 24 21:15:20 2020 +0200 Add TorStrings module for localization --- browser/modules/TorStrings.jsm | 490 +++++++++++++++++++++++++++++++++++++++++ browser/modules/moz.build | 1 + 2 files changed, 491 insertions(+) diff --git a/browser/modules/TorStrings.jsm b/browser/modules/TorStrings.jsm new file mode 100644 index 000000000000..e8a8d37ae373 --- /dev/null +++ b/browser/modules/TorStrings.jsm @@ -0,0 +1,490 @@ +"use strict"; + +var EXPORTED_SYMBOLS = ["TorStrings"]; + +const { XPCOMUtils } = ChromeUtils.import( + "resource://gre/modules/XPCOMUtils.jsm" +); +const { Services } = ChromeUtils.import( + "resource://gre/modules/Services.jsm" +); +const { getLocale } = ChromeUtils.import( + "resource://torbutton/modules/utils.js" +); + +XPCOMUtils.defineLazyGlobalGetters(this, ["DOMParser"]); +XPCOMUtils.defineLazyGetter(this, "domParser", () => { + const parser = new DOMParser(); + parser.forceEnableDTD(); + return parser; +}); + +/* + Tor DTD String Bundle + + DTD strings loaded from torbutton/tor-launcher, but provide a fallback in case they aren't available +*/ +class TorDTDStringBundle { + constructor(aBundleURLs, aPrefix) { + let locations = []; + for (const [index, url] of aBundleURLs.entries()) { + locations.push(`<!ENTITY % dtd_${index} SYSTEM "${url}">%dtd_${index};`); + } + this._locations = locations; + this._prefix = aPrefix; + } + + // copied from testing/marionette/l10n.js + localizeEntity(urls, id) { + // Use the DOM parser to resolve the entity and extract its real value + let header = `<?xml version="1.0"?><!DOCTYPE elem [${this._locations.join( + "" + )}]>`; + let elem = `<elem id="elementID">&${id};</elem>`; + let doc = domParser.parseFromString(header + elem, "text/xml"); + let element = doc.querySelector("elem[id='elementID']"); + + if (element === null) { + throw new Error(`Entity with id='${id}' hasn't been found`); + } + + return element.textContent; + } + + getString(key, fallback) { + if (key) { + try { + return this.localizeEntity(this._bundleURLs, `${this._prefix}${key}`); + } catch (e) {} + } + + // on failure, assign the fallback if it exists + if (fallback) { + return fallback; + } + // otherwise return string key + return `$(${key})`; + } +} + +/* + Tor Property String Bundle + + Property strings loaded from torbutton/tor-launcher, but provide a fallback in case they aren't available +*/ +class TorPropertyStringBundle { + constructor(aBundleURL, aPrefix) { + try { + this._bundle = Services.strings.createBundle(aBundleURL); + } catch (e) {} + + this._prefix = aPrefix; + } + + getString(key, fallback) { + if (key) { + try { + return this._bundle.GetStringFromName(`${this._prefix}${key}`); + } catch (e) {} + } + + // on failure, assign the fallback if it exists + if (fallback) { + return fallback; + } + // otherwise return string key + return `$(${key})`; + } +} + +/* + Security Level Strings +*/ +var TorStrings = { + /* + Tor Browser Security Level Strings + */ + securityLevel: (function() { + let tsb = new TorDTDStringBundle( + ["chrome://torbutton/locale/torbutton.dtd"], + "torbutton.prefs.sec_" + ); + let getString = function(key, fallback) { + return tsb.getString(key, fallback); + }; + + // read localized strings from torbutton; but use hard-coded en-US strings as fallbacks in case of error + let retval = { + securityLevel: getString("caption", "Security Level"), + customWarning: getString("custom_warning", "Custom"), + overview: getString( + "overview", + "Disable certain web features that can be used to attack your security and anonymity." + ), + standard: { + level: getString("standard_label", "Standard"), + tooltip: getString("standard_tooltip", "Security Level : Standard"), + summary: getString( + "standard_description", + "All Tor Browser and website features are enabled." + ), + }, + safer: { + level: getString("safer_label", "Safer"), + tooltip: getString("safer_tooltip", "Security Level : Safer"), + summary: getString( + "safer_description", + "Disables website features that are often dangerous, causing some sites to lose functionality." + ), + description1: getString( + "js_on_https_sites_only", + "JavaScript is disabled on non-HTTPS sites." + ), + description2: getString( + "limit_typography", + "Some fonts and math symbols are disabled." + ), + description3: getString( + "click_to_play_media", + "Audio and video (HTML5 media), and WebGL are click-to-play." + ), + }, + safest: { + level: getString("safest_label", "Safest"), + tooltip: getString("safest_tooltip", "Security Level : Safest"), + summary: getString( + "safest_description", + "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts." + ), + description1: getString( + "js_disabled", + "JavaScript is disabled by default on all sites." + ), + description2: getString( + "limit_graphics_and_typography", + "Some fonts, icons, math symbols, and images are disabled." + ), + description3: getString( + "click_to_play_media", + "Audio and video (HTML5 media), and WebGL are click-to-play." + ), + }, + custom: { + summary: getString( + "custom_summary", + "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels." + ), + }, + learnMore: getString("learn_more_label", "Learn more"), + learnMoreURL: `https://tb-manual.torproject.org/${getLocale()}/security-settings/`, + restoreDefaults: getString("restore_defaults", "Restore Defaults"), + advancedSecuritySettings: getString( + "advanced_security_settings", + "Advanced Security Settings\u2026" + ), + }; + return retval; + })() /* Security Level Strings */, + + /* + Tor about:preferences#tor Strings + */ + settings: (function() { + let tsb = new TorDTDStringBundle( + ["chrome://torlauncher/locale/network-settings.dtd"], + "" + ); + let getString = function(key, fallback) { + return tsb.getString(key, fallback); + }; + + let retval = { + categoryTitle: getString("torPreferences.categoryTitle", "Tor"), + torPreferencesHeading: getString( + "torPreferences.torSettings", + "Tor Settings" + ), + torPreferencesDescription: getString( + "torPreferences.torSettingsDescription", + "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." + ), + learnMore: getString("torPreferences.learnMore", "Learn More"), + bridgesHeading: getString("torPreferences.bridges", "Bridges"), + bridgesDescription: getString( + "torPreferences.bridgesDescription", + "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another." + ), + useBridge: getString("torPreferences.useBridge", "Use a bridge"), + selectBridge: getString( + "torsettings.useBridges.default", + "Select a bridge" + ), + requestBridgeFromTorProject: getString( + "torsettings.useBridges.bridgeDB", + "Request a bridge from torproject.org" + ), + requestNewBridge: getString( + "torPreferences.requestNewBridge", + "Request a New Bridge\u2026" + ), + provideBridge: getString( + "torPreferences.provideBridge", + "Provide a bridge" + ), + provideBridgeDirections: getString( + "torsettings.useBridges.label", + "Enter bridge information from a trusted source." + ), + provideBridgePlaceholder: getString( + "torsettings.useBridges.placeholder", + "type address:port (one per line)" + ), + advancedHeading: getString("torPreferences.advanced", "Advanced"), + advancedDescription: getString( + "torPreferences.advancedDescription", + "Configure how Tor Browser connects to the internet." + ), + useLocalProxy: getString("torsettings.useProxy.checkbox", "I use a proxy to connect to the Internet"), + proxyType: getString("torsettings.useProxy.type", "Proxy Type"), + proxyTypeSOCKS4: getString("torsettings.useProxy.type.socks4", "SOCKS4"), + proxyTypeSOCKS5: getString("torsettings.useProxy.type.socks5", "SOCKS5"), + proxyTypeHTTP: getString("torsettings.useProxy.type.http", "HTTP/HTTPS"), + proxyAddress: getString("torsettings.useProxy.address", "Address"), + proxyAddressPlaceholder: getString( + "torsettings.useProxy.address.placeholder", + "IP address or hostname" + ), + proxyPort: getString("torsettings.useProxy.port", "Port"), + proxyUsername: getString("torsettings.useProxy.username", "Username"), + proxyPassword: getString("torsettings.useProxy.password", "Password"), + proxyUsernamePasswordPlaceholder: getString( + "torsettings.optional", + "Optional" + ), + useFirewall: getString( + "torsettings.firewall.checkbox", + "This computer goes through a firewall that only allows connections to certain ports" + ), + allowedPorts: getString( + "torsettings.firewall.allowedPorts", + "Allowed Ports" + ), + allowedPortsPlaceholder: getString( + "torPreferences.firewallPortsPlaceholder", + "Comma-seperated values" + ), + requestBridgeDialogTitle: getString( + "torPreferences.requestBridgeDialogTitle", + "Request Bridge" + ), + submitCaptcha: getString( + "torsettings.useBridges.captchaSubmit", + "Submit" + ), + contactingBridgeDB: getString( + "torPreferences.requestBridgeDialogWaitPrompt", + "Contacting BridgeDB. Please Wait." + ), + solveTheCaptcha: getString( + "torPreferences.requestBridgeDialogSolvePrompt", + "Solve the CAPTCHA to request a bridge." + ), + captchaTextboxPlaceholder: getString( + "torsettings.useBridges.captchaSolution.placeholder", + "Enter the characters from the image" + ), + incorrectCaptcha: getString( + "torPreferences.requestBridgeErrorBadSolution", + "The solution is not correct. Please try again." + ), + showTorDaemonLogs: getString( + "torPreferences.viewTorLogs", + "View the Tor logs." + ), + showLogs: getString("torPreferences.viewLogs", "View Logs\u2026"), + torLogDialogTitle: getString( + "torPreferences.torLogsDialogTitle", + "Tor Logs" + ), + copyLog: getString("torsettings.copyLog", "Copy Tor Log to Clipboard"), + + learnMoreTorBrowserURL: `https://tb-manual.torproject.org/${getLocale()}/about/`, + learnMoreBridgesURL: `https://tb-manual.torproject.org/${getLocale()}/bridges/`, + learnMoreNetworkSettingsURL: `about:blank`, + }; + + return retval; + })() /* Tor Network Settings Strings */, + + /* + Tor Onion Services Strings, e.g., for the authentication prompt. + */ + onionServices: (function() { + let tsb = new TorPropertyStringBundle( + "chrome://torbutton/locale/torbutton.properties", + "onionServices." + ); + let getString = function(key, fallback) { + return tsb.getString(key, fallback); + }; + + const kProblemLoadingSiteFallback = "Problem Loading Onionsite"; + const kLongDescFallback = "Details: %S"; + + let retval = { + learnMore: getString("learnMore", "Learn more"), + learnMoreURL: `https://support.torproject.org/${getLocale()}/onionservices/client-auth/`, + errorPage: { + browser: getString("errorPage.browser", "Browser"), + network: getString("errorPage.network", "Network"), + onionSite: getString("errorPage.onionSite", "Onionsite"), + }, + descNotFound: { // Tor SOCKS error 0xF0 + pageTitle: getString("descNotFound.pageTitle", kProblemLoadingSiteFallback), + header: getString("descNotFound.header", "Onionsite Not Found"), + longDescription: getString("descNotFound.longDescription", kLongDescFallback), + }, + descInvalid: { // Tor SOCKS error 0xF1 + pageTitle: getString("descInvalid.pageTitle", kProblemLoadingSiteFallback), + header: getString("descInvalid.header", "Onionsite Cannot Be Reached"), + longDescription: getString("descInvalid.longDescription", kLongDescFallback), + }, + introFailed: { // Tor SOCKS error 0xF2 + pageTitle: getString("introFailed.pageTitle", kProblemLoadingSiteFallback), + header: getString("introFailed.header", "Onionsite Has Disconnected"), + longDescription: getString("introFailed.longDescription", kLongDescFallback), + }, + rendezvousFailed: { // Tor SOCKS error 0xF3 + pageTitle: getString("rendezvousFailed.pageTitle", kProblemLoadingSiteFallback), + header: getString("rendezvousFailed.header", "Unable to Connect to Onionsite"), + longDescription: getString("rendezvousFailed.longDescription", kLongDescFallback), + }, + clientAuthMissing: { // Tor SOCKS error 0xF4 + pageTitle: getString("clientAuthMissing.pageTitle", "Authorization Required"), + header: getString("clientAuthMissing.header", "Onionsite Requires Authentication"), + longDescription: getString("clientAuthMissing.longDescription", kLongDescFallback), + }, + clientAuthIncorrect: { // Tor SOCKS error 0xF5 + pageTitle: getString("clientAuthIncorrect.pageTitle", "Authorization Failed"), + header: getString("clientAuthIncorrect.header", "Onionsite Authentication Failed"), + longDescription: getString("clientAuthIncorrect.longDescription", kLongDescFallback), + }, + badAddress: { // Tor SOCKS error 0xF6 + pageTitle: getString("badAddress.pageTitle", kProblemLoadingSiteFallback), + header: getString("badAddress.header", "Invalid Onionsite Address"), + longDescription: getString("badAddress.longDescription", kLongDescFallback), + }, + introTimedOut: { // Tor SOCKS error 0xF7 + pageTitle: getString("introTimedOut.pageTitle", kProblemLoadingSiteFallback), + header: getString("introTimedOut.header", "Onionsite Circuit Creation Timed Out"), + longDescription: getString("introTimedOut.longDescription", kLongDescFallback), + }, + authPrompt: { + description: + getString("authPrompt.description2", "%S is requesting that you authenticate."), + keyPlaceholder: getString("authPrompt.keyPlaceholder", "Enter your key"), + done: getString("authPrompt.done", "Done"), + doneAccessKey: getString("authPrompt.doneAccessKey", "d"), + invalidKey: getString("authPrompt.invalidKey", "Invalid key"), + failedToSetKey: + getString("authPrompt.failedToSetKey", "Failed to set key"), + }, + authPreferences: { + header: getString("authPreferences.header", "Onion Services Authentication"), + overview: getString("authPreferences.overview", "Some onion services require that you identify yourself with a key"), + savedKeys: getString("authPreferences.savedKeys", "Saved Keys"), + dialogTitle: getString("authPreferences.dialogTitle", "Onion Services Keys"), + dialogIntro: getString("authPreferences.dialogIntro", "Keys for the following onionsites are stored on your computer"), + onionSite: getString("authPreferences.onionSite", "Onionsite"), + onionKey: getString("authPreferences.onionKey", "Key"), + remove: getString("authPreferences.remove", "Remove"), + removeAll: getString("authPreferences.removeAll", "Remove All"), + failedToGetKeys: getString("authPreferences.failedToGetKeys", "Failed to get keys"), + failedToRemoveKey: getString("authPreferences.failedToRemoveKey", "Failed to remove key"), + }, + }; + + return retval; + })() /* Tor Onion Services Strings */, + + /* + OnionLocation + */ + onionLocation: (function() { + const tsb = new TorPropertyStringBundle( + ["chrome://torbutton/locale/torbutton.properties"], + "onionLocation." + ); + const getString = function(key, fallback) { + return tsb.getString(key, fallback); + }; + + const retval = { + alwaysPrioritize: getString( + "alwaysPrioritize", + "Always Prioritize Onionsites" + ), + alwaysPrioritizeAccessKey: getString("alwaysPrioritizeAccessKey", "a"), + notNow: getString("notNow", "Not Now"), + notNowAccessKey: getString("notNowAccessKey", "n"), + description: getString( + "description", + "Website publishers can protect users by adding a security layer. This prevents eavesdroppers from knowing that you are the one visiting that website." + ), + tryThis: getString("tryThis", "Try this: Onionsite"), + onionAvailable: getString("onionAvailable", "Onionsite available"), + learnMore: getString("learnMore", "Learn more"), + learnMoreURL: `https://tb-manual.torproject.org/${getLocale()}/onion-services/`, + always: getString("always", "Always"), + askEverytime: getString("askEverytime", "Ask you every time"), + prioritizeOnionsDescription: getString( + "prioritizeOnionsDescription", + "Prioritize onionsites when they are available." + ), + onionServicesTitle: getString("onionServicesTitle", "Onion Services"), + }; + + return retval; + })() /* OnionLocation */, + + /* + Tor Deamon Configuration Key Strings + */ + + // TODO: proper camel case + configKeys: { + /* Bridge Conf Settings */ + useBridges: "UseBridges", + bridgeList: "Bridge", + /* Proxy Conf Strings */ + socks4Proxy: "Socks4Proxy", + socks5Proxy: "Socks5Proxy", + socks5ProxyUsername: "Socks5ProxyUsername", + socks5ProxyPassword: "Socks5ProxyPassword", + httpsProxy: "HTTPSProxy", + httpsProxyAuthenticator: "HTTPSProxyAuthenticator", + /* Firewall Conf Strings */ + reachableAddresses: "ReachableAddresses", + + /* BridgeDB Strings */ + clientTransportPlugin: "ClientTransportPlugin", + }, + + /* + about:config preference keys + */ + + preferenceKeys: { + defaultBridgeType: "extensions.torlauncher.default_bridge_type", + recommendedBridgeType: + "extensions.torlauncher.default_bridge_recommended_type", + }, + + /* + about:config preference branches + */ + preferenceBranches: { + defaultBridge: "extensions.torlauncher.default_bridge.", + bridgeDBBridges: "extensions.torlauncher.bridgedb_bridge.", + }, +}; diff --git a/browser/modules/moz.build b/browser/modules/moz.build index 6a8b14b684a7..eb77e4f8b101 100644 --- a/browser/modules/moz.build +++ b/browser/modules/moz.build @@ -153,6 +153,7 @@ EXTRA_JS_MODULES += [ 'TabsList.jsm', 'TabUnloader.jsm', 'ThemeVariableMap.jsm', + 'TorStrings.jsm', 'TransientPrefs.jsm', 'webrtcUI.jsm', 'ZoomUI.jsm',

1 0