- tor-commits - lists.torproject.org

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 16 Feb '16

16 Feb '16

commit 322ef3bd1d33a8ed0c95e44bddc2f494fbe6312c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 16 21:15:17 2016 +0000 Update translations for https_everywhere --- fil/https-everywhere.dtd | 38 +++++++++++++++++++------------------- fil/https-everywhere.properties | 4 ++-- fil/ssl-observatory.dtd | 2 +- it/https-everywhere.dtd | 8 ++++---- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/fil/https-everywhere.dtd b/fil/https-everywhere.dtd index e06d3d0..9f3bc6f 100644 --- a/fil/https-everywhere.dtd +++ b/fil/https-everywhere.dtd @@ -2,35 +2,35 @@ <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_description "I-encrypt ang Web! Awtomatikong gamitin ang HTTPS security sa maraming sites."> <!ENTITY https-everywhere.about.version "Bersyon"> -<!ENTITY https-everywhere.about.created_by "Ginawa ni/ng"> -<!ENTITY https-everywhere.about.and ", and"> -<!ENTITY https-everywhere.about.librarians "Ruleset Librarians"> -<!ENTITY https-everywhere.about.thanks "Salamat kay/sa"> -<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including"> -<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others. We are grateful for their excellent work!"> -<!ENTITY https-everywhere.about.contribute "Kung nagustuhan mo ang HTTPS Everywhere, baka magustuhan mo rin ang"> -<!ENTITY https-everywhere.about.donate_tor "Paano mag-donate sa Tor"> +<!ENTITY https-everywhere.about.created_by "Ginawa nina"> +<!ENTITY https-everywhere.about.and "at"> +<!ENTITY https-everywhere.about.librarians "Mga Ruleset Librarian"> +<!ENTITY https-everywhere.about.thanks "Salamat sa"> +<!ENTITY https-everywhere.about.many_contributors "Maraming maraming contributor, kasama sina"> +<!ENTITY https-everywhere.about.noscript "Gayundin, ang ilang bahagi ng HTTPS Everywhere ay batay sa code mula sa NoScript nina Giorgio Maone at marami pang iba. Lubos kaming nagpapasalamat sa kanilang mahusay na trabaho!"> +<!ENTITY https-everywhere.about.contribute "Kung nagustuhan mo ang HTTPS Everywhere, baka magustuhan mo ring"> +<!ENTITY https-everywhere.about.donate_tor "Mag-donate sa Tor"> <!ENTITY https-everywhere.about.tor_lang_code "fil"> <!ENTITY https-everywhere.about.or "o"> -<!ENTITY https-everywhere.about.donate_eff "Paano mag-donate sa EFF"> +<!ENTITY https-everywhere.about.donate_eff "Mag-donate sa EFF"> <!ENTITY https-everywhere.menu.about "Tungkol sa HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences"> -<!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.globalDisable "Disable HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests"> -<!ENTITY https-everywhere.menu.showCounter "Show Counter"> -<!ENTITY https-everywhere.menu.viewAllRules "View All Rules"> +<!ENTITY https-everywhere.menu.observatory "Mga Preference sa SSL Observatory"> +<!ENTITY https-everywhere.menu.globalEnable "I-enable ang HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.globalDisable "I-disable ang HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.blockHttpRequests "I-block ang lahat ng HTTP requests"> +<!ENTITY https-everywhere.menu.showCounter "Ipakita ang Counter"> +<!ENTITY https-everywhere.menu.viewAllRules "Tingnan ang Lahat ng Rules"> -<!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Preferences"> -<!ENTITY https-everywhere.prefs.enable_all "Enable All"> -<!ENTITY https-everywhere.prefs.disable_all "Disable All"> +<!ENTITY https-everywhere.prefs.title "Mga Preference sa HTTPS Everywhere"> +<!ENTITY https-everywhere.prefs.enable_all "I-enable Lahat"> +<!ENTITY https-everywhere.prefs.disable_all "I-disable Lahat"> <!ENTITY https-everywhere.prefs.reset_defaults "Ibalik sa Defaults"> <!ENTITY https-everywhere.prefs.search "Maghanap"> <!ENTITY https-everywhere.prefs.site "Site"> <!ENTITY https-everywhere.prefs.notes "Notes"> <!ENTITY https-everywhere.prefs.list_caption "Aling HTTPS redirection rules ang dapat gamitin?"> -<!ENTITY https-everywhere.prefs.enabled "Enabled"> +<!ENTITY https-everywhere.prefs.enabled "Naka-enable"> <!ENTITY https-everywhere.prefs.ruleset_howto "Puwede kang matuto kung paano magsulat ng sarili mong rulesets (para magdagdag ng support para sa iba pang web sites)"> <!ENTITY https-everywhere.prefs.here_link "dito"> <!ENTITY https-everywhere.prefs.toggle "Toggle"> diff --git a/fil/https-everywhere.properties b/fil/https-everywhere.properties index fe2ef52..3fb7f42 100644 --- a/fil/https-everywhere.properties +++ b/fil/https-everywhere.properties @@ -1,5 +1,5 @@ -https-everywhere.menu.globalEnable = Enable HTTPS Everywhere -https-everywhere.menu.globalDisable = Disable HTTPS Everywhere +https-everywhere.menu.globalEnable = I-enable ang HTTPS Everywhere +https-everywhere.menu.globalDisable = I-disable ang HTTPS Everywhere https-everywhere.menu.enableDisable = Enable / Disable Rules https-everywhere.menu.noRules = (Walang Rules para sa Page na Ito) https-everywhere.menu.unknownRules = (Hindi Alam ang Rules para sa Page na Ito) diff --git a/fil/ssl-observatory.dtd b/fil/ssl-observatory.dtd index 78781b2..294766e 100644 --- a/fil/ssl-observatory.dtd +++ b/fil/ssl-observatory.dtd @@ -86,7 +86,7 @@ looked at. Mouseover the options for further details:"> <!ENTITY ssl-observatory.prefs.show "Show advanced options"> -<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences"> +<!ENTITY ssl-observatory.prefs.title "Mga Preference sa SSL Observatory"> <!ENTITY ssl-observatory.prefs.use "Gamitin ang Observatory?"> <!ENTITY ssl-observatory.warning.title "BABALA mula sa SSL Observatory ng EFF"> diff --git a/it/https-everywhere.dtd b/it/https-everywhere.dtd index a5b74e8..cd5bc12 100644 --- a/it/https-everywhere.dtd +++ b/it/https-everywhere.dtd @@ -37,7 +37,7 @@ <!ENTITY https-everywhere.prefs.reset_default "Ripristina configurazione predefinita"> <!ENTITY https-everywhere.prefs.view_xml_source "Mostra sorgente XML"> -<!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.stable_rules "Regole stabil"> +<!ENTITY https-everywhere.chrome.stable_rules_description "Forza connessione criptate a questi siti:"> +<!ENTITY https-everywhere.chrome.experimental_rules "Regole sperimentali"> +<!ENTITY https-everywhere.chrome.experimental_rules_description "Possono causare avvisi o rotture. Normalmente disabilitato.">

1 0

[gettor/master] Indent links (#17424)
by ilv＠torproject.org 16 Feb '16

16 Feb '16

commit fafda21febe9f982ff5fa58896366d002d342713 Author: ilv <ilv(a)users.noreply.github.com> Date: Tue Feb 16 17:46:09 2016 -0300 Indent links (#17424) --- gettor/core.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gettor/core.py b/gettor/core.py index 97f7ce3..a12853b 100644 --- a/gettor/core.py +++ b/gettor/core.py @@ -253,16 +253,16 @@ class Core(object): t32, t64 = [t for t in providers[pname].split(",") if t] link, signature, chs32 = [l for l in t32.split("$") if l] - link = "%s: %s" % (pname, link) + link = " %s: %s" % (pname, link) links32[link] = signature link, signature, chs64 = [l for l in t64.split("$") if l] - link = "%s: %s" % (pname, link.lstrip()) + link = " %s: %s" % (pname, link.lstrip()) links64[link] = signature else: link, signature, chs32 = [l for l in providers[pname].split("$") if l] - link = "%s: %s" % (pname, link) + link = " %s: %s" % (pname, link) links32[link] = signature #providers[pname] = providers[pname].replace(",", "")

1 0

[gettor/master] Removed beta release from downloads
by ilv＠torproject.org 16 Feb '16

16 Feb '16

commit 1487fd8e512982f9a7e82bc2765e1e12abbf6d82 Author: ilv <ilv(a)users.noreply.github.com> Date: Tue Feb 16 17:26:02 2016 -0300 Removed beta release from downloads --- gettor/http.py | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/gettor/http.py b/gettor/http.py index 2a63502..081b81c 100644 --- a/gettor/http.py +++ b/gettor/http.py @@ -44,7 +44,6 @@ OS = { RE = { 'os': '(.*)-(\w+)', 'alpha': '\d\.\d(\.\d)*a\d+', - 'beta': '\d\.\d(\.\d)*b\d+', 'stable': '\d\.\d(\.\d)*' } @@ -214,16 +213,11 @@ class HTTP(object): 'alpha': { 'latest_version': '', 'downloads': {} - }, - 'beta': { - 'latest_version': '', - 'downloads': {} } } self.releases = { 'alpha': '%s/latest/alpha' % self.server, - 'beta': '%s/latest/beta' % self.server, 'stable': '%s/latest/stable' % self.server, 'updated_at': strftime("%Y-%m-%d %H:%M:%S", gmtime()) } @@ -237,18 +231,12 @@ class HTTP(object): # we'll use the latest one lv['alpha']['latest_version'] = v - elif re.match(RE['beta'], v): - if v > lv['beta']['latest_version']: - # we'll use the latest one - lv['beta']['latest_version'] = v - elif re.match(RE['stable'], v): if v > lv['stable']['latest_version']: # we'll use the latest one lv['stable']['latest_version'] = v latest_alpha = lv['alpha']['latest_version'] - latest_beta = lv['beta']['latest_version'] latest_stable = lv['stable']['latest_version'] # another iteration to add the links @@ -266,11 +254,6 @@ class HTTP(object): lv['alpha']['downloads'][OS[osys]] = {} self._add_links(lv, 'alpha', version, OS[osys]) - elif latest_beta and version == latest_beta \ - and re.match(RE['beta'], version): - lv['beta']['downloads'][OS[osys]] = {} - self._add_links(lv, 'beta', version, OS[osys]) - elif latest_stable and version == latest_stable \ and re.match(RE['stable'], version): lv['stable']['downloads'][OS[osys]] = {}

1 0

[gettor/master] We still don't distribut Orbot/Orfox
by ilv＠torproject.org 16 Feb '16

16 Feb '16

commit 206d6025dc0880bccfc78941ce3e756b48121787 Author: ilv <ilv(a)users.noreply.github.com> Date: Tue Feb 16 02:15:28 2016 -0300 We still don't distribut Orbot/Orfox --- upload/landing_gh.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upload/landing_gh.tpl b/upload/landing_gh.tpl index 9e083f1..c10c15b 100644 --- a/upload/landing_gh.tpl +++ b/upload/landing_gh.tpl @@ -6,7 +6,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="description" content=""> <meta name="author" content=""> - <title>GetTor | Download Tor Browser for Android, Windows, Linux, OS X</title> + <title>GetTor | Download Tor Browser for Windows, Linux, OS X</title> <link href="css/bootstrap.min.css" rel="stylesheet"> <link href="css/gettor.css" rel="stylesheet"> </head>

1 0

[gettor/master] Better name for OS (twitter/xmpp)
by ilv＠torproject.org 16 Feb '16

16 Feb '16

commit e45a517df93e762865520fa671acc493293c94ea Author: ilv <ilv(a)users.noreply.github.com> Date: Tue Feb 16 17:27:15 2016 -0300 Better name for OS (twitter/xmpp) --- gettor/twitter.py | 8 +++++++- gettor/xmpp.py | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/gettor/twitter.py b/gettor/twitter.py index 7fedffe..deced9b 100644 --- a/gettor/twitter.py +++ b/gettor/twitter.py @@ -24,6 +24,12 @@ import blacklist """Twitter channel for distributing links to download Tor Browser.""" +OS = { + 'osx': 'Mac OS X', + 'linux': 'Linux', + 'windows': 'Windows' +} + class ConfigError(Exception): pass @@ -234,7 +240,7 @@ class TwitterBot(object): ) reply = self._get_msg('links', 'en') - reply = reply % (req['os'], req['lc'], links) + reply = reply % (OS[req['os']], links) elif req['type'] == 'mirrors': self.log.info('mirrors; none; %s' % req['lc']) diff --git a/gettor/xmpp.py b/gettor/xmpp.py index 1bea716..4df7ac9 100644 --- a/gettor/xmpp.py +++ b/gettor/xmpp.py @@ -30,6 +30,12 @@ import blacklist """XMPP module for processing requests.""" +OS = { + 'osx': 'Mac OS X', + 'linux': 'Linux', + 'windows': 'Windows' +} + class ConfigError(Exception): pass @@ -316,7 +322,7 @@ class XMPP(object): req['lc'] ) reply = self._get_msg('links', 'en') - reply = reply % (req['os'], req['lc'], links) + reply = reply % (OS[req['os']], links) except (core.ConfigError, core.InternalError) as e: # if core failes, send the user an error message, but keep going

1 0

[gettor/master] Better name for OS
by ilv＠torproject.org 16 Feb '16

16 Feb '16

commit 6f7b7b33317076d176531b6918390cf2b8c2c928 Author: ilv <ilv(a)users.noreply.github.com> Date: Tue Feb 16 17:26:47 2016 -0300 Better name for OS --- gettor/smtp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gettor/smtp.py b/gettor/smtp.py index 1cc8db3..32b43ae 100644 --- a/gettor/smtp.py +++ b/gettor/smtp.py @@ -374,7 +374,7 @@ class SMTP(object): try: links_subject = self._get_msg('links_subject', 'en') links_msg = self._get_msg('links_msg', 'en') - links_msg = links_msg % (os, links) + links_msg = links_msg % (OS[os], links) self._send_email( from_addr,

1 0

[gettor/master] Updated messages sent by twitter/xmpp bots according to #17424
by ilv＠torproject.org 16 Feb '16

16 Feb '16

commit b8a1100afa66edb8b76e6a164524978239b16448 Author: ilv <ilv(a)users.noreply.github.com> Date: Tue Feb 16 17:29:16 2016 -0300 Updated messages sent by twitter/xmpp bots according to #17424 --- lang/twitter/i18n/en/LC_MESSAGES/en.po | 55 ++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/lang/twitter/i18n/en/LC_MESSAGES/en.po b/lang/twitter/i18n/en/LC_MESSAGES/en.po new file mode 100644 index 0000000..46c2738 --- /dev/null +++ b/lang/twitter/i18n/en/LC_MESSAGES/en.po @@ -0,0 +1,55 @@ +domain "en" + +#: Links +msgid "links" +msgstr "You requested Tor Browser for %s.\n\ +\n\ +You will need only one of the links below to download the bundle. If a link\n\ +does not work for you, try the next one.\n\ +\n\ +%s" + +#: Mirrors message +msgid "mirrors" +msgstr "Hi! this is the GetTor robot.\n\ +\n\ +Thank you for your request. Below you will find an updated list of\n\ +mirrors of Tor Project's website.\n\ +\n\ +%s" + +#: Help +msgid "help" +msgstr "Hi! This is the GetTor robot. I am here to help you download the\n\ +latest version of Tor Browser.\n\ +\n\ +Please reply to this message with one of the options below:\n\ +\n\ + windows\n\ + linux\n\ + osx\n\ + mirrors\n\ +\n\ +I will then send you the download instructions." + +#: Mirrors unavailable message +msgid "mirrors_unavailable" +msgstr "Hello there! this is the 'GetTor' robot.\n\ +\n\ +I'm sorry, I can't send you mirrors right now, please try again later.\n\ +\n\ +Still need help? If you have any questions, trouble connecting to Tor\n\ +network, or need to talk to a human, please contact our support team at:\n\ +\n\ + help(a)rt.torproject.org\n\ +\n\ +We are ready to answer your queries in English, Farsi, Chinese, Arabic,\n\ +French and Spanish." + +#: Internal error +msgid "internal_error" +msgstr "Internal error" + +#: Internal error +msgid "message_error" +msgstr "Message too long."

1 0

[gettor/master] Use Tor Browser instead of Tor Browser Bundle
by ilv＠torproject.org 16 Feb '16

16 Feb '16

commit 5eaa85908dc5498ea8818b7e7632d9f2030ba479 Author: ilv <ilv(a)users.noreply.github.com> Date: Tue Feb 16 02:13:41 2016 -0300 Use Tor Browser instead of Tor Browser Bundle --- upload/bundles2github.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upload/bundles2github.py b/upload/bundles2github.py index 2e3c888..ee157f0 100644 --- a/upload/bundles2github.py +++ b/upload/bundles2github.py @@ -40,7 +40,7 @@ def upload_new_release(github_repo, version, upload_dir): release = target_repo.create_release( 'v{}'.format(version), target_commitish="master", - name='Tor Browser Bundle {}'.format(version), + name='Tor Browser {}'.format(version), body='', draft=True, )

1 0

[tor/master] Fix a NULL dereference on unit test failure. CID 1353177.
by nickm＠torproject.org 16 Feb '16

16 Feb '16

commit 31c96a36994470cd63c5a71cdbd0e3acea987228 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 16 12:55:41 2016 -0500 Fix a NULL dereference on unit test failure. CID 1353177. --- src/test/test_routerlist.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c index fdbd5ab..eaf8a55 100644 --- a/src/test/test_routerlist.c +++ b/src/test/test_routerlist.c @@ -434,8 +434,10 @@ test_routerlist_router_is_already_dir_fetching(void *arg) done: /* If a connection is never set up, connection_free chokes on it. */ - buf_free(mocked_connection->inbuf); - buf_free(mocked_connection->outbuf); + if (mocked_connection) { + buf_free(mocked_connection->inbuf); + buf_free(mocked_connection->outbuf); + } tor_free(mocked_connection); UNMOCK(connection_get_by_type_addr_port_purpose); }

1 0

[tor/master] Set or_ap/dir_ap.port on the invalid addr case. Bug in no released Tor. CID 1353178 and 1353179.
by nickm＠torproject.org 16 Feb '16

16 Feb '16

commit 549493846782efa7d6655317844782b6acade1b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 16 12:58:02 2016 -0500 Set or_ap/dir_ap.port on the invalid addr case. Bug in no released Tor. CID 1353178 and 1353179. --- src/or/directory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index fc610d0..ecf6da8 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1004,7 +1004,7 @@ directory_initiate_command(const tor_addr_t *or_addr, uint16_t or_port, } else { /* the family doesn't matter here, so make it IPv4 */ tor_addr_make_null(&or_ap.addr, AF_INET); - or_port = 0; + or_ap.port = or_port = 0; } if (tor_addr_port_is_valid(dir_addr, dir_port, 0)) { @@ -1013,7 +1013,7 @@ directory_initiate_command(const tor_addr_t *or_addr, uint16_t or_port, } else { /* the family doesn't matter here, so make it IPv4 */ tor_addr_make_null(&dir_ap.addr, AF_INET); - dir_port = 0; + dir_ap.port = dir_port = 0; } directory_initiate_command_rend(&or_ap, &dir_ap,

1 0