tor-commits May 2018

tor-commits@lists.torproject.org

17 participants
1514 discussions

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 25 May '18

25 May '18

commit 708a02b2ebf068347986ca59e579b8b89a5ee195 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 25 09:15:51 2018 +0000 Update translations for https_everywhere_completed --- it/https-everywhere.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/it/https-everywhere.dtd b/it/https-everywhere.dtd index 7f2628451..67c777b23 100644 --- a/it/https-everywhere.dtd +++ b/it/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Esporta impostazioni"> <!ENTITY https-everywhere.prefs.reset_defaults "Ripristina la configurazione predefinita"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "Ciò reimposterà ogni regola al suo stato predefinito. Continuare?"> <!ENTITY https-everywhere.chrome.stable_rules "Regole stabil"> <!ENTITY https-everywhere.chrome.stable_rules_description "Forza connessione criptate a questi siti:">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 25 May '18

25 May '18

commit afe6ec725c4bb060950e353f30c5bfd112878121 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 25 09:15:43 2018 +0000 Update translations for https_everywhere --- it/https-everywhere.dtd | 2 +- pt_PT/https-everywhere.dtd | 41 ++++++++++++++++ pt_PT/https-everywhere.properties | 8 +++ pt_PT/ssl-observatory.dtd | 101 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 151 insertions(+), 1 deletion(-) diff --git a/it/https-everywhere.dtd b/it/https-everywhere.dtd index 28b387383..67c777b23 100644 --- a/it/https-everywhere.dtd +++ b/it/https-everywhere.dtd @@ -23,7 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Esporta impostazioni"> <!ENTITY https-everywhere.prefs.reset_defaults "Ripristina la configurazione predefinita"> -<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "Ciò reimposterà ogni regola al suo stato predefinito. Continuare?"> <!ENTITY https-everywhere.chrome.stable_rules "Regole stabil"> <!ENTITY https-everywhere.chrome.stable_rules_description "Forza connessione criptate a questi siti:"> diff --git a/pt_PT/https-everywhere.dtd b/pt_PT/https-everywhere.dtd new file mode 100644 index 000000000..1e71f2b42 --- /dev/null +++ b/pt_PT/https-everywhere.dtd @@ -0,0 +1,41 @@ +<!ENTITY https-everywhere.about.title "About HTTPS Everywhere"> +<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> +<!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites."> +<!ENTITY https-everywhere.about.version "Version"> +<!ENTITY https-everywhere.about.rulesets_version "Rulesets version for"> +<!ENTITY https-everywhere.about.add_new_rule "Add New Rule"> + +<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF"> +<!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences"> +<!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.blockUnencryptedRequests "Block all unencrypted requests"> +<!ENTITY https-everywhere.menu.showCounter "Show Counter"> +<!ENTITY https-everywhere.menu.viewAllRules "View All Rules"> + +<!ENTITY https-everywhere.options.generalSettings "General Settings"> +<!ENTITY https-everywhere.options.advancedSettings "Advanced Settings"> +<!ENTITY https-everywhere.options.importSettings "Import Settings"> +<!ENTITY https-everywhere.options.import "Import"> +<!ENTITY https-everywhere.options.enableMixedRulesets "Enable mixed content rulesets"> +<!ENTITY https-everywhere.options.showDevtoolsTab "Show Devtools tab"> +<!ENTITY https-everywhere.options.autoUpdateRulesets "Auto-update rulesets"> +<!ENTITY https-everywhere.options.imported "Your settings have been imported."> + +<!ENTITY https-everywhere.prefs.export_settings "Export Settings"> +<!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> + +<!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> +<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> +<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules"> +<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default."> +<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site"> +<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site"> +<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host"> +<!ENTITY https-everywhere.chrome.host "Host:"> +<!ENTITY https-everywhere.chrome.show_advanced "Show advanced"> +<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced"> +<!ENTITY https-everywhere.chrome.rule_name "Rule name"> +<!ENTITY https-everywhere.chrome.regex "Matching regex"> +<!ENTITY https-everywhere.chrome.redirect_to "Redirect to"> +<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel"> diff --git a/pt_PT/https-everywhere.properties b/pt_PT/https-everywhere.properties new file mode 100644 index 000000000..be838311a --- /dev/null +++ b/pt_PT/https-everywhere.properties @@ -0,0 +1,8 @@ +https-everywhere.menu.globalEnable = Enable HTTPS Everywhere +https-everywhere.menu.globalDisable = Disable HTTPS Everywhere +https-everywhere.menu.enableDisable = Enable / Disable Rules +https-everywhere.menu.noRules = (No Rules for This Page) +https-everywhere.menu.unknownRules = (Rules for This Page Unknown) +https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar. +https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values. +https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests diff --git a/pt_PT/ssl-observatory.dtd b/pt_PT/ssl-observatory.dtd new file mode 100644 index 000000000..69f1cfd69 --- /dev/null +++ b/pt_PT/ssl-observatory.dtd @@ -0,0 +1,101 @@ + +<!ENTITY ssl-observatory.popup.details "Details and Privacy Information"> +<!ENTITY ssl-observatory.popup.later "Ask Me Later"> +<!ENTITY ssl-observatory.popup.no "No"> + +<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks +against your browser by sending the certificates you receive to the +Observatory. Turn this on?"> + + + +<!ENTITY ssl-observatory.popup.title +"Should HTTPS Everywhere use the SSL Observatory?"> + +<!ENTITY ssl-observatory.popup.yes "Yes"> + + + +<!ENTITY ssl-observatory.prefs.adv_priv_opts1 +"It is safe to enable this, unless you use a very +intrusive corporate network:"> + +<!ENTITY ssl-observatory.prefs.adv_priv_opts2 +"Safe, unless you use a corporate network with secret intranet server names:"> + +<!ENTITY ssl-observatory.prefs.alt_roots +"Submit and check certificates signed by non-standard root CAs"> + +<!ENTITY ssl-observatory.prefs.alt_roots_tooltip +"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority. If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce. So we leave it off by default."> + +<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity"> +<!ENTITY ssl-observatory.prefs.anonymous_unavailable +"Check certificates using Tor for anonymity (requires Tor)"> +<!ENTITY ssl-observatory.prefs.anonymous_tooltip +"This option requires Tor to be installed and running"> + +<!ENTITY ssl-observatory.prefs.asn +"When you see a new certificate, tell the Observatory which ISP you are connected to"> + +<!ENTITY ssl-observatory.prefs.asn_tooltip +"This will fetch and send the "Autonomous System number" of your network. This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common."> + +<!ENTITY ssl-observatory.prefs.show_cert_warning +"Show a warning when the Observatory detects a revoked certificate not caught by your browser"> + +<!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip +"This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong."> + +<!ENTITY ssl-observatory.prefs.done "Done"> + +<!ENTITY ssl-observatory.prefs.explanation +"HTTPS Everywhere can use EFF's SSL Observatory. This does two things: (1) +sends copies of HTTPS certificates to the Observatory, to help us +detect 'man in the middle' attacks and improve the Web's security; and (2) +lets us warn you about insecure connections or attacks on your browser."> + + + +<!ENTITY ssl-observatory.prefs.explanation2 + +"For example, when you visit https://www.something.com, the certificate +received by the Observatory will indicate that somebody visited +www.something.com, but not who visited the site, or what specific page they +looked at. Mouseover the options for further details:"> + +<!ENTITY ssl-observatory.prefs.hide "Hide advanced options"> + +<!ENTITY ssl-observatory.prefs.nonanon +"Check certificates even if Tor is not available"> + +<!ENTITY ssl-observatory.prefs.nonanon_tooltip +"We will still try to keep the data anonymous, but this option is less secure"> + +<!ENTITY ssl-observatory.prefs.priv_dns +"Submit and check certificates for non-public DNS names"> + +<!ENTITY ssl-observatory.prefs.priv_dns_tooltip +"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system."> + +<!ENTITY ssl-observatory.prefs.show "Show advanced options"> + +<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences"> + +<!ENTITY ssl-observatory.prefs.use "Use the Observatory?"> +<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory"> +<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain"> +<!ENTITY ssl-observatory.warning.okay "I understand"> +<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:"> +<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection. (These warnings can be disabled in the "SSL Observatory" tab of the HTTPS Everywhere preferences dialog.)"> + +<!ENTITY ssl-observatory.prefs.self_signed +"Submit and check self-signed certificates"> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +"This is recommended; cryptographic problems are especially common in self-signed embedded devices">

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 25 May '18

25 May '18

commit b4876d53822957476b1d35fc060d4e8e9a537fa2 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 25 09:15:25 2018 +0000 Update translations for whisperback --- pt_PT/pt_PT.po | 214 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 214 insertions(+) diff --git a/pt_PT/pt_PT.po b/pt_PT/pt_PT.po new file mode 100644 index 000000000..4e78fef96 --- /dev/null +++ b/pt_PT/pt_PT.po @@ -0,0 +1,214 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-03-20 12:09+0000\n" +"PO-Revision-Date: 2012-02-26 16:11+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Portuguese (Portugal) (http://www.transifex.com/otf/torproject/language/pt_PT/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pt_PT\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. XXX use a better exception +#: ../whisperBack/whisperback.py:56 +#, python-format +msgid "Invalid contact email: %s" +msgstr "" + +#: ../whisperBack/whisperback.py:73 +#, python-format +msgid "Invalid contact OpenPGP key: %s" +msgstr "" + +#: ../whisperBack/whisperback.py:75 +msgid "Invalid contact OpenPGP public key block" +msgstr "" + +#: ../whisperBack/exceptions.py:41 +#, python-format +msgid "" +"The %s variable was not found in any of the configuration files " +"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" +msgstr "" + +#: ../whisperBack/gui.py:110 +msgid "Name of the affected software" +msgstr "" + +#: ../whisperBack/gui.py:112 +msgid "Exact steps to reproduce the error" +msgstr "" + +#: ../whisperBack/gui.py:114 +msgid "Actual result and description of the error" +msgstr "" + +#: ../whisperBack/gui.py:116 +msgid "Desired result" +msgstr "" + +#: ../whisperBack/gui.py:152 +msgid "Unable to load a valid configuration." +msgstr "" + +#: ../whisperBack/gui.py:218 +msgid "Sending mail..." +msgstr "" + +#: ../whisperBack/gui.py:219 +msgid "Sending mail" +msgstr "" + +#. pylint: disable=C0301 +#: ../whisperBack/gui.py:221 +msgid "This could take a while..." +msgstr "" + +#: ../whisperBack/gui.py:236 +msgid "The contact email adress doesn't seem valid." +msgstr "" + +#: ../whisperBack/gui.py:253 +msgid "Unable to send the mail: SMTP error." +msgstr "" + +#: ../whisperBack/gui.py:255 +msgid "Unable to connect to the server." +msgstr "" + +#: ../whisperBack/gui.py:257 +msgid "Unable to create or to send the mail." +msgstr "" + +#: ../whisperBack/gui.py:260 +msgid "" +"\n" +"\n" +"The bug report could not be sent, likely due to network problems. Please try to reconnect to the network and click send again.\n" +"\n" +"If it does not work, you will be offered to save the bug report." +msgstr "" + +#: ../whisperBack/gui.py:273 +msgid "Your message has been sent." +msgstr "" + +#: ../whisperBack/gui.py:280 +msgid "An error occured during encryption." +msgstr "" + +#: ../whisperBack/gui.py:300 +#, python-format +msgid "Unable to save %s." +msgstr "" + +#: ../whisperBack/gui.py:323 +#, python-format +msgid "" +"The bug report could not be sent, likely due to network problems.\n" +"\n" +"As a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n" +"\n" +"Do you want to save the bug report to a file?" +msgstr "" + +#: ../whisperBack/gui.py:383 ../data/whisperback.ui.h:21 +msgid "WhisperBack" +msgstr "" + +#: ../whisperBack/gui.py:384 ../data/whisperback.ui.h:2 +msgid "Send feedback in an encrypted mail." +msgstr "" + +#: ../whisperBack/gui.py:387 +msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" +msgstr "" + +#: ../whisperBack/gui.py:388 +msgid "Tails developers <tails(a)boum.org>" +msgstr "" + +#: ../whisperBack/gui.py:389 +msgid "translator-credits" +msgstr "" + +#: ../whisperBack/gui.py:417 +msgid "This doesn't seem to be a valid URL or OpenPGP key." +msgstr "" + +#: ../data/whisperback.ui.h:1 +msgid "Copyright © 2009-2012 tails(a)boum.org" +msgstr "" + +#: ../data/whisperback.ui.h:3 +msgid "https://tails.boum.org/" +msgstr "" + +#: ../data/whisperback.ui.h:4 +msgid "" +"WhisperBack - Send feedback in an encrypted mail\n" +"Copyright (C) 2009-2012 Tails developers <tails(a)boum.org>\n" +"\n" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 3 of the License, or (at\n" +"your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful, but\n" +"WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" +"General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program. If not, see <http://www.gnu.org/licenses/>.\n" +msgstr "" + +#: ../data/whisperback.ui.h:20 +msgid "" +"If you want us to encrypt messages when we respond to you, add your key ID, " +"a link to your key, or the key as a public key block:" +msgstr "" + +#: ../data/whisperback.ui.h:22 +msgid "Summary" +msgstr "" + +#: ../data/whisperback.ui.h:23 +msgid "Bug description" +msgstr "" + +#: ../data/whisperback.ui.h:24 +msgid "Optional email address to contact you" +msgstr "" + +#: ../data/whisperback.ui.h:25 +msgid "optional PGP key" +msgstr "" + +#: ../data/whisperback.ui.h:26 +msgid "Technical details to include" +msgstr "" + +#: ../data/whisperback.ui.h:27 +msgid "headers" +msgstr "" + +#: ../data/whisperback.ui.h:28 +msgid "debugging info" +msgstr "" + +#: ../data/whisperback.ui.h:29 +msgid "Help" +msgstr "" + +#: ../data/whisperback.ui.h:30 +msgid "Send" +msgstr ""

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 25 May '18

25 May '18

commit a98293833e953e93606a99e619bb062e97268ce8 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 25 09:15:15 2018 +0000 Update translations for torcheck --- pt_PT/torcheck.po | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/pt_PT/torcheck.po b/pt_PT/torcheck.po new file mode 100644 index 000000000..266bde67d --- /dev/null +++ b/pt_PT/torcheck.po @@ -0,0 +1,102 @@ +# TorCheck gettext template +# Copyright (C) 2008-2013 The Tor Project, Inc +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"POT-Creation-Date: 2012-02-16 20:28+PDT\n" +"PO-Revision-Date: 2010-11-30 04:59+0000\n" +"Last-Translator: Appelbaum <jacob(a)appelbaum.net>\n" +"Language-Team: Portuguese (Portugal) (http://www.transifex.com/otf/torproject/language/pt_PT/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: pygettext.py 1.5\n" +"Language: pt_PT\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgid "Congratulations. This browser is configured to use Tor." +msgstr "" + +msgid "" +"Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " +"for further information about using Tor safely. You are now free to browse " +"the Internet anonymously." +msgstr "" + +msgid "There is a security update available for Tor Browser." +msgstr "" + +msgid "" +"<a href=\"https://www.torproject.org/download/download-easy.html\">Click " +"here to go to the download page</a>" +msgstr "" + +msgid "Sorry. You are not using Tor." +msgstr "" + +msgid "" +"If you are attempting to use a Tor client, please refer to the <a " +"href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" +" href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " +"configuring your Tor client</a>." +msgstr "" + +msgid "Sorry, your query failed or an unexpected response was received." +msgstr "" + +msgid "" +"A temporary service outage prevents us from determining if your source IP " +"address is a <a href=\"https://www.torproject.org/\">Tor</a> node." +msgstr "" + +msgid "Your IP address appears to be: " +msgstr "" + +msgid "Are you using Tor?" +msgstr "" + +msgid "This page is also available in the following languages:" +msgstr "" + +msgid "For more information about this exit relay, see:" +msgstr "" + +msgid "" +"The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " +"development, and education of online anonymity and privacy." +msgstr "" + +msgid "Learn More »" +msgstr "" + +msgid "Go" +msgstr "" + +msgid "Short User Manual" +msgstr "" + +msgid "Donate to Support Tor" +msgstr "" + +msgid "Tor Q&A Site" +msgstr "" + +msgid "Volunteer" +msgstr "" + +msgid "JavaScript is enabled." +msgstr "" + +msgid "JavaScript is disabled." +msgstr "" + +msgid "However, it does not appear to be Tor Browser." +msgstr "" + +msgid "Run a Relay" +msgstr "" + +msgid "Stay Anonymous" +msgstr ""

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 25 May '18

25 May '18

commit e7eac44ce572340fe2091fc9cfae01beea0cc3e7 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 25 09:15:04 2018 +0000 Update translations for bridgedb --- pt_PT/LC_MESSAGES/bridgedb.po | 380 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 380 insertions(+) diff --git a/pt_PT/LC_MESSAGES/bridgedb.po b/pt_PT/LC_MESSAGES/bridgedb.po new file mode 100644 index 000000000..c55f0e5f9 --- /dev/null +++ b/pt_PT/LC_MESSAGES/bridgedb.po @@ -0,0 +1,380 @@ +# Translations template for BridgeDB. +# Copyright (C) 2015 'The Tor Project, Inc.' +# This file is distributed under the same license as the BridgeDB project. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2015-07-25 03:40+0000\n" +"PO-Revision-Date: 2011-02-19 16:53+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Portuguese (Portugal) (http://www.transifex.com/otf/torproject/language/pt_PT/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 1.3\n" +"Language: pt_PT\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in +#. any string (regardless of capitalization and/or punctuation): +#. "BridgeDB" +#. "pluggable transport" +#. "pluggable transports" +#. "obfs2" +#. "obfs3" +#. "scramblesuit" +#. "fteproxy" +#. "Tor" +#. "Tor Browser" +#: bridgedb/https/server.py:167 +msgid "Sorry! Something went wrong with your request." +msgstr "" + +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "" + +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: bridgedb/https/templates/bridges.html:67 +#: bridgedb/https/templates/bridges.html:125 +msgid "Uh oh, spaghettios!" +msgstr "" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "" + +#: bridgedb/https/templates/bridges.html:73 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "" + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "" + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: bridgedb/https/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "" + +#: bridgedb/https/templates/options.html:87 +msgid "none" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: bridgedb/https/templates/options.html:124 +#, python-format +msgid "%sY%ses!" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: bridgedb/https/templates/options.html:147 +#, python-format +msgid "%sG%set Bridges" +msgstr "" + +#: bridgedb/strings.py:43 +msgid "[This is an automated message; please do not reply.]" +msgstr "" + +#: bridgedb/strings.py:45 +msgid "Here are your bridges:" +msgstr "" + +#: bridgedb/strings.py:47 +#, python-format +msgid "" +"You have exceeded the rate limit. Please slow down! The minimum time between\n" +"emails is %s hours. All further emails during this time period will be ignored." +msgstr "" + +#: bridgedb/strings.py:50 +msgid "" +"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: bridgedb/strings.py:53 +msgid "Welcome to BridgeDB!" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". +#: bridgedb/strings.py:55 +msgid "Currently supported transport TYPEs:" +msgstr "" + +#: bridgedb/strings.py:56 +#, python-format +msgid "Hey, %s!" +msgstr "" + +#: bridgedb/strings.py:57 +msgid "Hello, friend!" +msgstr "" + +#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 +msgid "Public Keys" +msgstr "" + +#. TRANSLATORS: This string will end up saying something like: +#. "This email was generated with rainbows, unicorns, and sparkles +#. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." +#: bridgedb/strings.py:62 +#, python-format +msgid "" +"This email was generated with rainbows, unicorns, and sparkles\n" +"for %s on %s at %s." +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor". +#. TRANSLATORS: Please DO NOT translate "Tor Network". +#: bridgedb/strings.py:72 +#, python-format +msgid "" +"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" +"which can help obfuscate your connections to the Tor Network, making it more\n" +"difficult for anyone watching your internet traffic to determine that you are\n" +"using Tor.\n" +"\n" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: bridgedb/strings.py:79 +msgid "" +"Some bridges with IPv6 addresses are also available, though some Pluggable\n" +"Transports aren't IPv6 compatible.\n" +"\n" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. regular, or unexciting". Like vanilla ice cream. It refers to bridges +#. which do not have Pluggable Transports, and only speak the regular, +#. boring Tor protocol. Translate it as you see fit. Have fun with it. +#: bridgedb/strings.py:88 +#, python-format +msgid "" +"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" +"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" +"help to circumvent internet censorship in many cases.\n" +"\n" +msgstr "" + +#: bridgedb/strings.py:101 +msgid "What are bridges?" +msgstr "" + +#: bridgedb/strings.py:102 +#, python-format +msgid "%s Bridges %s are Tor relays that help you circumvent censorship." +msgstr "" + +#: bridgedb/strings.py:107 +msgid "I need an alternative way of getting bridges!" +msgstr "" + +#: bridgedb/strings.py:108 +#, python-format +msgid "" +"Another way to get bridges is to send an email to %s. Please note that you must\n" +"send the email using an address from one of the following email providers:\n" +"%s, %s or %s." +msgstr "" + +#: bridgedb/strings.py:115 +msgid "My bridges don't work! I need help!" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: bridgedb/strings.py:117 +#, python-format +msgid "If your Tor doesn't work, you should email %s." +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#. TRANSLATORS: Please DO NOT translate "Tor". +#: bridgedb/strings.py:121 +msgid "" +"Try including as much info about your case as you can, including the list of\n" +"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" +"and any messages which Tor gave out, etc." +msgstr "" + +#: bridgedb/strings.py:128 +msgid "Here are your bridge lines:" +msgstr "" + +#: bridgedb/strings.py:129 +msgid "Get Bridges!" +msgstr "" + +#: bridgedb/strings.py:133 +msgid "Please select options for bridge type:" +msgstr "" + +#: bridgedb/strings.py:134 +msgid "Do you need IPv6 addresses?" +msgstr "" + +#: bridgedb/strings.py:135 +#, python-format +msgid "Do you need a %s?" +msgstr "" + +#: bridgedb/strings.py:139 +msgid "Your browser is not displaying images properly." +msgstr "" + +#: bridgedb/strings.py:140 +msgid "Enter the characters from the image above..." +msgstr "" + +#: bridgedb/strings.py:144 +msgid "How to start using your bridges" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: bridgedb/strings.py:146 +#, python-format +msgid "" +"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" +"page %s and then follow the instructions there for downloading and starting\n" +"Tor Browser." +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: bridgedb/strings.py:151 +msgid "" +"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" +"the wizard until it asks:" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: bridgedb/strings.py:155 +msgid "" +"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" +"to the Tor network?" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: bridgedb/strings.py:159 +msgid "" +"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" +"paste the bridge lines into the text input box. Finally, click 'Connect', and\n" +"you should be good to go! If you experience trouble, try clicking the 'Help'\n" +"button in the 'Tor Network Settings' wizard for further assistance." +msgstr "" + +#: bridgedb/strings.py:167 +msgid "Displays this message." +msgstr "" + +#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the +#. same non-Pluggable Transport bridges described above as being +#. "plain-ol'-vanilla" bridges. +#: bridgedb/strings.py:171 +msgid "Request vanilla bridges." +msgstr "" + +#: bridgedb/strings.py:172 +msgid "Request IPv6 bridges." +msgstr "" + +#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". +#: bridgedb/strings.py:174 +msgid "Request a Pluggable Transport by TYPE." +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: bridgedb/strings.py:177 +msgid "Get a copy of BridgeDB's public GnuPG key." +msgstr ""

1 0

[tor-browser-build/master] Bug 25975: Get a Rust cross-compiler for macOS
by gk＠torproject.org 25 May '18

25 May '18

commit e7f9f6f11e45d1ba15fbbb183ef1ae8b0c3b20c5 Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 25 06:53:05 2018 +0000 Bug 25975: Get a Rust cross-compiler for macOS --- projects/rust/build | 39 +++++++++++++++++++++++++++++++++++++-- projects/rust/config | 12 +++++++++--- 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/projects/rust/build b/projects/rust/build index e20df55..4c81ad8 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -10,10 +10,45 @@ cd /var/tmp/dist/rust-[% c('var/prev_version') %]-[% c('arch') %]-unknown-linux- ./install.sh --prefix=$distdir-rust-old export PATH="$distdir-rust-old/bin:$PATH" -[% IF c("var/linux") %] - [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc') }) %] +[% IF ! c("var/windows") %] + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] [% END -%] +[% IF c("var/osx") %] + # We need to clear `CC` and `LDFLAGS` as they are used for the host platform + # (i.e. Linux). + unset CC + unset LDFLAGS + # Target 10.6 as our toolchain does. Without this explicit declaration Bad + # Things will happen, as a lot of dependent code then assumes that the + # official macOS target, x86_64-apple-darwin, essentially means 10.4. + export MACOSX_DEPLOYMENT_TARGET=10.6 + # The Rust target for macOS is x86_64-apple-darwin, yet our toolchain is built + # for x86_64-apple-darwin10. We can't mix those targets as clang gets confused + # that way. Changing the Rust target to x86_64-apple-darwin10 would require a + # fair amount of patching, thus we create symlinks to prvoide Rust with the + # necessary tools while using our toolchain underneath, targeting 10.6. + cd $cctoolsdir + for f in `ls x86_64-apple-darwin10-*`; do + ln -s $f ${f//x86_64-apple-darwin10/x86_64-apple-darwin} + done + cd .. + ln -s x86_64-apple-darwin10 x86_64-apple-darwin + mkdir -p $distdir/helper + + # We need to adapt our CFLAGS and make sure our flags are passed down to all + # dependencies. Using `CFLAGS_x86_apple-darwin` did not do the trick, so resort + # to a wrapper script. + cat > $distdir/helper/x86_64-apple-darwin-clang << 'EOF' +#!/bin/sh +BASEDIR=/var/tmp/dist/macosx-toolchain +$BASEDIR/cctools/bin/x86_64-apple-darwin-clang -target x86_64-apple-darwin -mlinker-version=136 -B $BASEDIR/cctools/bin -isysroot $BASEDIR/SDK/ -Wl,-syslibroot,$BASEDIR/SDK/ -Wl,-dead_strip -Wl,-pie "$@" +EOF + + chmod +x $distdir/helper/x86_64-apple-darwin-clang + export PATH=$distdir/helper:$PATH +[% END %] + cd $rootdir mkdir /var/tmp/build tar -C /var/tmp/build -xf [% c('input_files_by_name/rust') %] diff --git a/projects/rust/config b/projects/rust/config index 49fc3ab..ae2290b 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -41,13 +41,19 @@ targets: # Rust pieces compiled. configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=[% c("arch") %]-unknown-linux-gnu --set=target.[% c("arch") %]-unknown-linux-gnu.cc=gcc + osx-x86_64: + var: + arch_deps: + - libssl-dev + - pkg-config + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=x86_64-apple-darwin --set=target.x86_64-apple-darwin.cc=x86_64-apple-darwin-clang + input_files: - project: container-image - project: cmake name: cmake - - project: gcc - name: gcc - enable: '[% c("var/linux") %]' + - project: '[% c("var/compiler") %]' + name: '[% c("var/compiler") %]' - URL: 'https://static.rust-lang.org/dist/rustc-[% c("version") %]-src.tar.gz' name: rust sig_ext: asc

1 0

[torbutton/master] Bug 26100: Update deprecated JS and CSS code
by gk＠torproject.org 25 May '18

25 May '18

commit 3047f3fcb9c606a659c6e7ffa7e4d97e33cd0ebe Author: Igor Oliveira <igt0(a)torproject.org> Date: Wed Feb 28 17:38:59 2018 -0300 Bug 26100: Update deprecated JS and CSS code - catch statement can not have if statements. https://bugzilla.mozilla.org/show_bug.cgi?id=1228841 - Use 0o to represent octal numbers. https://bugzilla.mozilla.org/show_bug.cgi?id=1263074 - remove -moz- prefix in css https://bugzilla.mozilla.org/show_bug.cgi?id=1270406 --- src/chrome/content/torbutton.js | 9 ++++++--- src/chrome/skin/aboutTor.css | 6 +++--- src/chrome/skin/tor-circuit-display.css | 4 ++-- src/components/cookie-jar-selector.js | 4 ++-- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index d744d15..4b15c5f 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1140,9 +1140,12 @@ function torbutton_do_new_identity() { // #5715 also makes this synchronous. So we pass a null callback. try { appCacheStorage.asyncEvictStorage(null); - } catch (err if err.name == 'NS_ERROR_NOT_AVAILABLE') { - // We ignore "not available" errors because they occur if a cache - // has not been used, e.g., if no browsing has been done. + } catch (err) { + // We ignore "not available" errors because they occur if a cache + // has not been used, e.g., if no browsing has been done. + if (err.name !== 'NS_ERROR_NOT_AVAILABLE') { + throw err; + } } } } catch(e) { diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 7ba7e7c..873f6d0 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -25,11 +25,11 @@ body { } body { - background-image: -moz-linear-gradient(top, #ffffff, #ffffff 10%, #dddddd 50%, #dddddd); + background-image: linear-gradient(to bottom, #ffffff, #ffffff 10%, #dddddd 50%, #dddddd); } body[toron] { - background-image: -moz-linear-gradient(top, #ffffff, #ffffff 10%, #d5ffd5 50%, #d5ffd5); + background-image: linear-gradient(to bottom, #ffffff, #ffffff 10%, #d5ffd5 50%, #d5ffd5); } /* Hide the entire document by default to avoid showing the incorrect @@ -221,7 +221,7 @@ body .top div.hideIfTorIsUpToDate h1 { padding: 5px 0 0 22px; } -#middle ul:-moz-dir(rtl) { +#middle ul:dir(rtl) { padding: 5px 22px 0 0; } diff --git a/src/chrome/skin/tor-circuit-display.css b/src/chrome/skin/tor-circuit-display.css index 640d595..c9e682a 100644 --- a/src/chrome/skin/tor-circuit-display.css +++ b/src/chrome/skin/tor-circuit-display.css @@ -21,7 +21,7 @@ and lines drawn between them to represent Tor network inter-relay connections. width: 100%; } -#circuit-display-content:-moz-locale-dir(rtl) { +#circuit-display-content:dir(rtl) { background-position: calc(100% - 1em) 1em; } @@ -65,7 +65,7 @@ ul#circuit-display-nodes li { white-space: nowrap; } -ul#circuit-display-nodes li:-moz-locale-dir(rtl) { +ul#circuit-display-nodes li:dir(rtl) { background-position: right center; } diff --git a/src/components/cookie-jar-selector.js b/src/components/cookie-jar-selector.js index f6d579e..4f137d7 100644 --- a/src/components/cookie-jar-selector.js +++ b/src/components/cookie-jar-selector.js @@ -143,7 +143,7 @@ function CookieJarSelector() { var file = getProfileFile("cookies-" + name + ".json"); var foStream = Cc["@mozilla.org/network/file-output-stream;1"] .createInstance(Ci.nsIFileOutputStream); - foStream.init(file, 0x02 | 0x08 | 0x20, 0666, 0); + foStream.init(file, 0x02 | 0x08 | 0x20, 0o666, 0); var data = JSON.stringify(this["cookiesobj-" + name]); foStream.write(data, data.length); foStream.close(); @@ -154,7 +154,7 @@ function CookieJarSelector() { var file = getProfileFile("protected-" + name + ".json"); var foStream = Cc["@mozilla.org/network/file-output-stream;1"] .createInstance(Ci.nsIFileOutputStream); - foStream.init(file, 0x02 | 0x08 | 0x20, 0666, 0); + foStream.init(file, 0x02 | 0x08 | 0x20, 0o666, 0); var data = JSON.stringify(this["protected-" + name]); foStream.write(data, data.length); foStream.close();

1 0

[torbutton/master] Bug 26100: Load extension preferences during initialization
by gk＠torproject.org 25 May '18

25 May '18

commit e5ecb22e0f4bfec84935f8266cc1520642301660 Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon May 14 17:56:18 2018 -0300 Bug 26100: Load extension preferences during initialization Mozilla removed the code that loads the default extension preferences[1]. Thus we need to load them in the startup time. [1] https://bugzilla.mozilla.org/show_bug.cgi?id=1413413 --- src/chrome/content/torbutton.js | 8 ++++---- src/components/cookie-jar-selector.js | 4 ++++ src/components/domain-isolator.js | 11 ++++++++--- src/components/dragDropFilter.js | 2 ++ src/components/startup-observer.js | 9 ++++++--- src/components/torbutton-logger.js | 19 ++++++++++--------- src/modules/default-prefs.js | 30 ++++++++++++++++++++++++++++++ 7 files changed, 64 insertions(+), 19 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index cf39dc2..40d63fd 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1217,7 +1217,7 @@ function torbutton_do_new_identity() { torbutton_log(3, "New Identity: Syncing prefs"); // Force prefs to be synced to disk - m_tb_prefs.savePrefFile(null); + Services.prefs.savePrefFile(null); torbutton_log(3, "New Identity: Clearing permissions"); @@ -1634,7 +1634,7 @@ function torbutton_update_disk_prefs() { } catch (e) {} // Force prefs to be synced to disk - m_tb_prefs.savePrefFile(null); + Services.prefs.savePrefFile(null); } function torbutton_update_fingerprinting_prefs() { @@ -1667,7 +1667,7 @@ function torbutton_update_fingerprinting_prefs() { m_tb_prefs.setBoolPref("extensions.torbutton.resize_new_windows", mode); // Force prefs to be synced to disk - m_tb_prefs.savePrefFile(null); + Services.prefs.savePrefFile(null); } function torbutton_update_isolation_prefs() { @@ -1682,7 +1682,7 @@ function torbutton_update_isolation_prefs() { m_tb_prefs.setBoolPref("security.enable_tls_session_tickets", !isolate); // Force prefs to be synced to disk - m_tb_prefs.savePrefFile(null); + Services.prefs.savePrefFile(null); } // This function closes all XUL browser windows except this one. For this diff --git a/src/components/cookie-jar-selector.js b/src/components/cookie-jar-selector.js index 4f137d7..8456da3 100644 --- a/src/components/cookie-jar-selector.js +++ b/src/components/cookie-jar-selector.js @@ -19,6 +19,10 @@ const kMODULE_CONTRACTID = "@torproject.org/cookie-jar-selector;1"; const kMODULE_CID = Components.ID("e6204253-b690-4159-bfe8-d4eedab6b3be"); const Cr = Components.results; +const Cu = Components.utils; + +Cu.import("resource://torbutton/modules/default-prefs.js", {}) + .ensureDefaultPrefs(); // XXX: Must match the definition in torcookie.js :/ function Cookie(number,name,value,isDomain,host,rawHost,HttpOnly,path,isSecure,isSession, diff --git a/src/components/domain-isolator.js b/src/components/domain-isolator.js index a52cccc..a698439 100644 --- a/src/components/domain-isolator.js +++ b/src/components/domain-isolator.js @@ -16,6 +16,12 @@ const Cc = Components.classes, Ci = Components.interfaces, Cu = Components.utils let logger = Cc["@torproject.org/torbutton-logger;1"] .getService(Components.interfaces.nsISupports).wrappedJSObject; +let { ensureDefaultPrefs } = Cu.import("resource://torbutton/modules/default-prefs.js", {}); +ensureDefaultPrefs(); + +// Import Services object +Cu.import("resource://gre/modules/Services.jsm"); + // Import crypto object (FF 37+). Cu.importGlobalProperties(["crypto"]); @@ -165,6 +171,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm"); function DomainIsolator() { this.wrappedJSObject = this; } + // Firefox component requirements DomainIsolator.prototype = { QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIObserver]), @@ -175,9 +182,7 @@ DomainIsolator.prototype = { if (topic === "profile-after-change") { logger.eclog(3, "domain isolator: set up isolating circuits by domain"); - let prefs = Cc["@mozilla.org/preferences-service;1"] - .getService(Ci.nsIPrefBranch); - if (prefs.getBoolPref("extensions.torbutton.use_nontor_proxy")) { + if (Services.prefs.getBoolPref("extensions.torbutton.use_nontor_proxy")) { tor.isolationEnabled = false; } tor.isolateCircuitsByDomain(); diff --git a/src/components/dragDropFilter.js b/src/components/dragDropFilter.js index 22dde86..916b835 100644 --- a/src/components/dragDropFilter.js +++ b/src/components/dragDropFilter.js @@ -9,6 +9,8 @@ const Cc = Components.classes; const Ci = Components.interfaces; const Cu = Components.utils; +Cu.import("resource://torbutton/modules/default-prefs.js", {}).ensureDefaultPrefs(); + Cu.import("resource://gre/modules/XPCOMUtils.jsm"); // Module specific constants diff --git a/src/components/startup-observer.js b/src/components/startup-observer.js index dac7aff..144d600 100644 --- a/src/components/startup-observer.js +++ b/src/components/startup-observer.js @@ -22,6 +22,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "FileUtils", "resource://gre/modules/FileUtils.jsm"); +Cu.import("resource://torbutton/modules/default-prefs.js", {}).ensureDefaultPrefs(); // Module specific constants const kMODULE_NAME = "Startup"; @@ -96,7 +97,9 @@ StartupObserver.prototype = { let tlps = Cc["@torproject.org/torlauncher-protocol-service;1"] .getService(Ci.nsISupports).wrappedJSObject; socksPortInfo = tlps.TorGetSOCKSPortInfo(); - } catch(e) {} + } catch(e) { + this.logger.log(3, "tor launcher failed " + e); + } // If Tor Launcher is not available, check environment variables. if (!socksPortInfo) { @@ -143,7 +146,7 @@ StartupObserver.prototype = { } // Force prefs to be synced to disk - this._prefs.savePrefFile(null); + Services.prefs.savePrefFile(null); this.logger.log(3, "Synced network settings to environment."); }, @@ -158,7 +161,7 @@ StartupObserver.prototype = { } // In all cases, force prefs to be synced to disk - this._prefs.savePrefFile(null); + Services.prefs.savePrefFile(null); }, QueryInterface: function(iid) { diff --git a/src/components/torbutton-logger.js b/src/components/torbutton-logger.js index 18a5f1e..b25d039 100644 --- a/src/components/torbutton-logger.js +++ b/src/components/torbutton-logger.js @@ -16,17 +16,18 @@ const kMODULE_CID = Components.ID("f36d72c9-9718-4134-b550-e109638331d7"); const Cr = Components.results; const Cc = Components.classes; const Ci = Components.interfaces; +const Cu = Components.utils; -function TorbuttonLogger() { - this.prefs = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefBranch); +Cu.import("resource://torbutton/modules/default-prefs.js", {}).ensureDefaultPrefs(); + +Cu.import("resource://gre/modules/Services.jsm"); +function TorbuttonLogger() { // Register observer - this._branch = this.prefs.QueryInterface(Components.interfaces.nsIPrefBranch); - this._branch.addObserver("extensions.torbutton", this, false); + Services.prefs.addObserver("extensions.torbutton", this, false); - this.loglevel = this.prefs.getIntPref("extensions.torbutton.loglevel"); - this.logmethod = this.prefs.getIntPref("extensions.torbutton.logmethod"); + this.loglevel = Services.prefs.getIntPref("extensions.torbutton.loglevel"); + this.logmethod = Services.prefs.getIntPref("extensions.torbutton.logmethod"); try { var logMngr = Components.classes["@mozmonkey.com/debuglogger/manager;1"] @@ -152,10 +153,10 @@ TorbuttonLogger.prototype = if (topic != "nsPref:changed") return; switch (data) { case "extensions.torbutton.logmethod": - this.logmethod = this.prefs.getIntPref("extensions.torbutton.logmethod"); + this.logmethod = Services.prefs.getIntPref("extensions.torbutton.logmethod"); break; case "extensions.torbutton.loglevel": - this.loglevel = this.prefs.getIntPref("extensions.torbutton.loglevel"); + this.loglevel = Services.prefs.getIntPref("extensions.torbutton.loglevel"); break; } } diff --git a/src/modules/default-prefs.js b/src/modules/default-prefs.js new file mode 100644 index 0000000..d4c948f --- /dev/null +++ b/src/modules/default-prefs.js @@ -0,0 +1,30 @@ +let loaded = false; + +function ensureDefaultPrefs () { + if (loaded) { + return; + } + Components.utils.import("resource://gre/modules/Services.jsm"); + const kDefaultPreferences = "resource://torbutton/defaults/preferences/preferences.js"; + const defaultPrefBranch = Services.prefs.getDefaultBranch(null); + + const context = { + pref: function (aPrefName, aValue) { + const aValueType = typeof aValue; + if (aValueType === "boolean") { + defaultPrefBranch.setBoolPref(aPrefName, aValue); + } else if (aValueType === "number") { + defaultPrefBranch.setIntPref(aPrefName, aValue); + } else if (aValueType === "string") { + defaultPrefBranch.setCharPref(aPrefName, aValue); + } else { + Services.console.logStringMessage( + `Preference ${aPrefName} with value ${aValue} has an invalid value type`); + } + } + }; + Services.scriptloader.loadSubScript(kDefaultPreferences, context); + loaded = true; +} + +let EXPORTED_SYMBOLS = ["ensureDefaultPrefs"];

1 0

[torbutton/master] Bug 26100: Switch from Task.spawn to async/await
by gk＠torproject.org 25 May '18

25 May '18

commit c4a44294290fc96471646ae1ff39fb55d2dedf92 Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon May 14 17:56:26 2018 -0300 Bug 26100: Switch from Task.spawn to async/await Mozilla switched from Task.spawn to async/await[1] and we should follow it since it makes the code simple. [1] https://bugzilla.mozilla.org/show_bug.cgi?id=1353542 --- src/chrome/content/tor-circuit-display.js | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index 5bd02bc..7b12db0 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -28,7 +28,6 @@ let createTorCircuitDisplay = (function () { // Mozilla utilities const { Cu : utils , Ci : interfaces } = Components.utils; Cu.import("resource://gre/modules/Services.jsm"); -Cu.import("resource://gre/modules/Task.jsm"); // Import the controller code. let { controller } = Cu.import("resource://torbutton/modules/tor-control-port.js", {}); @@ -59,8 +58,8 @@ let trimQuotes = s => s ? s.match(/^"(.*)"$/)[1] : undefined; // __getBridge(id)__. // Gets the bridge parameters for a given node ID. If the node // is not currently used as a bridge, returns null. -let getBridge = function* (controller, id) { - let bridges = yield controller.getConf("bridge"); +let getBridge = async function (controller, id) { + let bridges = await controller.getConf("bridge"); if (bridges) { for (let bridge of bridges) { if (bridge.ID && bridge.ID.toUpperCase() === id.toUpperCase()) { @@ -75,9 +74,9 @@ let getBridge = function* (controller, id) { // Returns the type, IP and country code of a node with given ID. // Example: `nodeDataForID(controller, "20BC91DC525C3DC9974B29FBEAB51230DE024C44")` // => `{ type : "default", ip : "12.23.34.45", countryCode : "fr" }` -let nodeDataForID = function* (controller, id) { +let nodeDataForID = async function (controller, id) { let result = {}, - bridge = yield getBridge(controller, id); // type, ip, countryCode; + bridge = await getBridge(controller, id); // type, ip, countryCode; if (bridge) { result.type = "bridge"; result.bridgeType = bridge.type; @@ -89,14 +88,14 @@ let nodeDataForID = function* (controller, id) { result.type = "default"; // Get the IP address for the given node ID. try { - let statusMap = yield controller.getInfo("ns/id/" + id); + let statusMap = await controller.getInfo("ns/id/" + id); result.ip = statusMap.IP; } catch (e) { } } if (result.ip) { // Get the country code for the node's IP address. try { - let countryCode = yield controller.getInfo("ip-to-country/" + result.ip); + let countryCode = await controller.getInfo("ip-to-country/" + result.ip); result.countryCode = countryCode === "??" ? null : countryCode; } catch (e) { } } @@ -105,18 +104,18 @@ let nodeDataForID = function* (controller, id) { // __nodeDataForCircuit(controller, circuitEvent)__. // Gets the information for a circuit. -let nodeDataForCircuit = function* (controller, circuitEvent) { +let nodeDataForCircuit = async function (controller, circuitEvent) { let rawIDs = circuitEvent.circuit.map(circ => circ[0]), // Remove the leading '$' if present. ids = rawIDs.map(id => id[0] === "$" ? id.substring(1) : id); // Get the node data for all IDs in circuit. - return [for (id of ids) yield nodeDataForID(controller, id)]; + return Promise.all(ids.map(id => nodeDataForID(controller, id))); }; // __getCircuitStatusByID(aController, circuitID)__ // Returns the circuit status for the circuit with the given ID. -let getCircuitStatusByID = function* (aController, circuitID) { - let circuitStatuses = yield aController.getInfo("circuit-status"); +let getCircuitStatusByID = async function (aController, circuitID) { + let circuitStatuses = await aController.getInfo("circuit-status"); if (circuitStatuses) { for (let circuitStatus of circuitStatuses) { if (circuitStatus.id === circuitID) { @@ -139,22 +138,22 @@ let collectIsolationData = function (aController, updateUI) { return aController.watchEvent( "STREAM", streamEvent => streamEvent.StreamStatus === "SENTCONNECT", - streamEvent => Task.spawn(function* () { + async (streamEvent) => { if (!knownCircuitIDs[streamEvent.CircuitID]) { logger.eclog(3, "streamEvent.CircuitID: " + streamEvent.CircuitID); knownCircuitIDs[streamEvent.CircuitID] = true; - let circuitStatus = yield getCircuitStatusByID(aController, streamEvent.CircuitID), + let circuitStatus = await getCircuitStatusByID(aController, streamEvent.CircuitID), credentials = circuitStatus ? (trimQuotes(circuitStatus.SOCKS_USERNAME) + "|" + trimQuotes(circuitStatus.SOCKS_PASSWORD)) : null; if (credentials) { - let nodeData = yield nodeDataForCircuit(aController, circuitStatus); + let nodeData = await nodeDataForCircuit(aController, circuitStatus); credentialsToNodeDataMap[credentials] = nodeData; updateUI(); } } - }).then(null, Cu.reportError)); + }); }; // __browserForChannel(channel)__.

1 0

[torbutton/master] Bug 26100: Migrate general.useragent.locale to intl.locale.requested
by gk＠torproject.org 25 May '18

25 May '18

commit 399d2ba81505e4a74535b61f60563f4a9c2a8f6d Author: Igor Oliveira <igt0(a)torproject.org> Date: Wed Feb 28 13:43:48 2018 -0300 Bug 26100: Migrate general.useragent.locale to intl.locale.requested intl.locale.requested is the new way that Gecko handles locales. See https://bugzilla.mozilla.org/show_bug.cgi?id=1414390 --- src/chrome/content/aboutTor/aboutTor-content.js | 6 ++++-- src/chrome/content/menu-overlay.xul | 2 +- src/chrome/content/preferences.js | 5 ++++- src/chrome/content/torbutton.js | 10 +++++----- src/modules/utils.js | 10 ++++++++-- 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index ec515bb..1a8d5cf 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -67,8 +67,10 @@ var AboutTorListener = { onPageLoad: function() { // Arrange to update localized text and links. - bindPrefAndInit("general.useragent.locale", aNewVal => { - this.onLocaleChange(aNewVal); + bindPrefAndInit("intl.locale.requested", aNewVal => { + if (aNewVal !== null) { + this.onLocaleChange(aNewVal); + } }); // Add message and event listeners. diff --git a/src/chrome/content/menu-overlay.xul b/src/chrome/content/menu-overlay.xul index 53654c5..f6c6fbd 100644 --- a/src/chrome/content/menu-overlay.xul +++ b/src/chrome/content/menu-overlay.xul @@ -22,6 +22,6 @@ position="1" label="&aboutTor.torbrowser_user_manual.label;" accesskey="&aboutTor.torbrowser_user_manual.accesskey;" - oncommand="gBrowser.selectedTab = gBrowser.addTab('https://tb-manual.torproject.org/' + Services.prefs.getCharPref('general.useragent.locale'))" /> + oncommand="gBrowser.selectedTab = gBrowser.addTab('https://tb-manual.torproject.org/' + Services.locale.getRequestedLocale())" /> </menupopup> </overlay> diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index 721ff46..36c8818 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -5,6 +5,9 @@ let { utils: Cu } = Components; let { getBoolPref, getIntPref, setBoolPref, setIntPref, getCharPref } = Cu.import("resource://gre/modules/Services.jsm", {}).Services.prefs; +let { getLocale } = + Cu.import("resource://torbutton/modules/utils.js", {}); + // Description elements have the follow names. const descNames = [, "desc_safest", "desc_safer", "desc_standard"]; @@ -67,7 +70,7 @@ function torbutton_set_learn_more_links() { let show_manual = window.opener.torbutton_show_torbrowser_manual(); let locale = "" if (show_manual) { - locale = getCharPref('general.useragent.locale'); + locale = getLocale(); } let links = linkNames.map(name => document.getElementById(name)); links.forEach(link => {; diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 2f1f689..d744d15 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -10,7 +10,7 @@ let { LoadContextInfo } = Cu.import('resource://gre/modules/LoadContextInfo.jsm', {}); let { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); let { showDialog } = Cu.import("resource://torbutton/modules/utils.js", {}); -let { unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); +let { getLocale, unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {}); let { bindPrefAndInit, observe } = Cu.import("resource://torbutton/modules/utils.js", {}); @@ -818,14 +818,14 @@ function torbutton_update_toolbutton() // Bug 1506 P3: Support code for language+uagent spoofing function torbutton_get_general_useragent_locale() { try { - var locale = m_tb_prefs.getCharPref("general.useragent.locale"); + const locale = getLocale(); if (/chrome:\/\//.test(locale)) { - return m_tb_prefs.getComplexValue("general.useragent.locale", + return m_tb_prefs.getComplexValue("intl.locale.requested", Components.interfaces.nsIPrefLocalizedString).data; } return locale; } catch(err) { - torbutton_log(4, "Error while getting general.useragent.locale:" + err); + torbutton_log(4, "Error while getting locale" + err); return 'en-US'; } } @@ -2380,7 +2380,7 @@ function torbutton_show_torbrowser_manual() { // torbutton_show_torbrowser_manual() returns true. function torbutton_init_user_manual_links() { let menuitem = document.getElementById("torBrowserUserManual"); - bindPrefAndInit("general.useragent.locale", val => { + bindPrefAndInit("intl.locale.requested", val => { menuitem.hidden = !torbutton_show_torbrowser_manual(); torbutton_abouttor_message_handler.updateAllOpenPages(); }); diff --git a/src/modules/utils.js b/src/modules/utils.js index fa4405e..0a2649d 100644 --- a/src/modules/utils.js +++ b/src/modules/utils.js @@ -79,6 +79,12 @@ var getEnv = function (name) { return env.exists(name) ? env.get(name) : undefined; }; +// __getLocale +// Reads the browser locale, the default locale is en-US. +var getLocale = function() { + return Services.locale.getRequestedLocale() || "en-US"; +} + // ## Windows // __dialogsByName__. @@ -200,5 +206,5 @@ var unescapeTorString = function(str) { }; // Export utility functions for external use. -let EXPORTED_SYMBOLS = ["bindPref", "bindPrefAndInit", "getEnv", "getPrefValue", - "observe", "showDialog", "unescapeTorString"]; +let EXPORTED_SYMBOLS = ["bindPref", "bindPrefAndInit", "getEnv", "getLocale", + "getPrefValue", "observe", "showDialog", "unescapeTorString"];

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits May 2018