February 2016 - tor-commits - lists.torproject.org

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

16 Feb '16

commit 583f599f88d1f0978c6a699fdd0db18e868fb775 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 16 21:45:16 2016 +0000 Update translations for https_everywhere --- fil/https-everywhere.dtd | 12 ++++++------ fil/https-everywhere.properties | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fil/https-everywhere.dtd b/fil/https-everywhere.dtd index 9f3bc6f..091fadc 100644 --- a/fil/https-everywhere.dtd +++ b/fil/https-everywhere.dtd @@ -28,16 +28,16 @@ <!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.notes "Mga Paunawa"> <!ENTITY https-everywhere.prefs.list_caption "Aling HTTPS redirection rules ang dapat gamitin?"> <!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"> +<!ENTITY https-everywhere.prefs.toggle "I-toggle"> <!ENTITY https-everywhere.prefs.reset_default "Ibalik sa Default"> <!ENTITY https-everywhere.prefs.view_xml_source "Tingnan ang XML Source"> -<!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 "Mga stable na rules"> +<!ENTITY https-everywhere.chrome.stable_rules_description "Puwersahin ang mga naka-encrypt na koneksyon sa mga website na ito:"> +<!ENTITY https-everywhere.chrome.experimental_rules "Mga experimental na rules"> +<!ENTITY https-everywhere.chrome.experimental_rules_description "Maaaring hindi gumana o magkaroon ng mga babala. Default na naka-disable."> diff --git a/fil/https-everywhere.properties b/fil/https-everywhere.properties index 3fb7f42..ea0041b 100644 --- a/fil/https-everywhere.properties +++ b/fil/https-everywhere.properties @@ -1,8 +1,8 @@ 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.enableDisable = I-enable / I-disable ang 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) -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.toolbar.hint = Gumagana na ngayon ang HTTPS Everywhere. Puwede mo itong i-toggle para sa bawat site sa pamamamagitan ng pag-click sa icon sa 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

1 0

[translation/tor-messenger-privproperties_completed] Update translations for tor-messenger-privproperties_completed
by translation＠torproject.org 16 Feb '16

16 Feb '16

commit 80adea766fa79df3a98ce8ca7e2509b5c2e676f0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 16 21:16:53 2016 +0000 Update translations for tor-messenger-privproperties_completed --- it/priv.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/it/priv.properties b/it/priv.properties index 79d75fa..592b68d 100644 --- a/it/priv.properties +++ b/it/priv.properties @@ -1 +1,2 @@ priv.account=Generazione della chiave privata per %S (%S)... +priv.failed=Generazione chiave fallita: %S

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 16 Feb '16

16 Feb '16

commit 8480a4c0c0d231066333c7311fefbd615af70a0f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 16 21:15:45 2016 +0000 Update translations for mat-gui_completed --- it.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/it.po b/it.po index 5e975f8..34e5478 100644 --- a/it.po +++ b/it.po @@ -10,13 +10,14 @@ # Maxime <maijin21(a)gmail.com>, 2013 # Random_R, 2013-2014 # Rossano Praderi <dshortway(a)gmail.com>, 2013 +# Walter Nosay, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-03 20:54+0100\n" -"PO-Revision-Date: 2015-12-26 00:49+0000\n" -"Last-Translator: Giuseppe Pignataro <rogepix(a)gmail.com>\n" +"POT-Creation-Date: 2016-02-10 23:06+0100\n" +"PO-Revision-Date: 2016-02-16 20:53+0000\n" +"Last-Translator: Walter Nosay\n" "Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -79,12 +80,12 @@ msgid "Reduce the produced PDF size and quality" msgstr "Riduci la dimensione e qualità del PDF prodotto" #: mat-gui:238 -msgid "Add unsupported file to archives" -msgstr "Aggiungi file non supportato agli achivi" +msgid "Remove unsupported file from archives" +msgstr "Rimuovi file non supportati dagli archivi" #: mat-gui:241 -msgid "Add non-supported (and so non-anonymised) file to output archive" -msgstr "Aggiungi file non supportato (e quindi non anonimizzato) all'archivio di destinazione" +msgid "Remove non-supported (and so non-anonymised) file from output archive" +msgstr "Rimuovi file non supportati (e non anonimizzati) dall'archivio di uscita" #: mat-gui:280 msgid "Unknown"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 16 Feb '16

16 Feb '16

commit 155386ef4a452cd493a10ea40cbb47a45f3c651d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 16 21:15:41 2016 +0000 Update translations for mat-gui --- it.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/it.po b/it.po index cd55048..34e5478 100644 --- a/it.po +++ b/it.po @@ -10,13 +10,14 @@ # Maxime <maijin21(a)gmail.com>, 2013 # Random_R, 2013-2014 # Rossano Praderi <dshortway(a)gmail.com>, 2013 +# Walter Nosay, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2016-02-11 09:31+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-02-16 20:53+0000\n" +"Last-Translator: Walter Nosay\n" "Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -80,11 +81,11 @@ msgstr "Riduci la dimensione e qualità del PDF prodotto" #: mat-gui:238 msgid "Remove unsupported file from archives" -msgstr "" +msgstr "Rimuovi file non supportati dagli archivi" #: mat-gui:241 msgid "Remove non-supported (and so non-anonymised) file from output archive" -msgstr "" +msgstr "Rimuovi file non supportati (e non anonimizzati) dall'archivio di uscita" #: mat-gui:280 msgid "Unknown"

1 0

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

16 Feb '16

commit a6a7418eaf37f470e4484bea74544d64f4840533 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 16 21:15:24 2016 +0000 Update translations for https_everywhere_completed --- it/https-everywhere.dtd | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/it/https-everywhere.dtd b/it/https-everywhere.dtd index 6d5a2bb..cd5bc12 100644 --- a/it/https-everywhere.dtd +++ b/it/https-everywhere.dtd @@ -37,18 +37,7 @@ <!ENTITY https-everywhere.prefs.reset_default "Ripristina configurazione predefinita"> <!ENTITY https-everywhere.prefs.view_xml_source "Mostra sorgente XML"> -<!ENTITY https-everywhere.source.downloading "Scaricamento"> -<!ENTITY https-everywhere.source.filename "Nome file"> -<!ENTITY https-everywhere.source.unable_to_download "Impossibile scaricare il sorgente."> - -<!ENTITY https-everywhere.popup.title "Notifiche di HTTPS Everywhere 4.0development.11"> -<!ENTITY https-everywhere.popup.paragraph1 "Ops! Stavi usando la versione stabile di HTTPS Everywhere ma potremmo aver accidentalmente eseguito un upgrade alla più recente versione di sviluppo!"> -<!ENTITY https-everywhere.popup.paragraph2 "Ritornare alla versione stabile?"> -<!ENTITY https-everywhere.popup.paragraph3 "Continuando con la nostra versione di sviluppo ci aiuterai a migliorare HTTPS Everywhere! -In caso di bug, segnalali all'indirizzo https-everywhere(a)eff.org. Ci scusiamo per eventuali inconvenienti e ti ringraziamo per utilizzare HTTPS Everywhere."> -<!ENTITY https-everywhere.popup.keep "Rimani sulla versione di sviluppo"> -<!ENTITY https-everywhere.popup.revert "Scarica l'ultima versione stabile"> - -<!ENTITY https-everywhere.ruleset-tests.status_title "Test delle regole di HTTPS Everywhere"> -<!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Annulla"> -<!ENTITY https-everywhere.ruleset-tests.status_start_button "Avvia"> +<!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

[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