October 2019 - tor-commits - lists.torproject.org

[translation/tor-launcher-network-settings_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed
by translation＠torproject.org 15 Oct '19

15 Oct '19

commit 36cfde38c3b172538252c308477dad31bf0a5a80 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 15 14:52:47 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- es/network-settings.dtd | 22 ++++++---------------- tr/network-settings.dtd | 22 ++++++---------------- 2 files changed, 12 insertions(+), 32 deletions(-) diff --git a/es/network-settings.dtd b/es/network-settings.dtd index ade6e5dfc..cd4499688 100644 --- a/es/network-settings.dtd +++ b/es/network-settings.dtd @@ -26,24 +26,18 @@ <!ENTITY torsettings.optional "Opcional"> <!ENTITY torsettings.useProxy.checkbox "Utilizo un proxy para conectar a Internet."> - -<!ENTITY torsettings.useProxy.type "Tipo de proxy:"> +<!ENTITY torsettings.useProxy.type ""> <!ENTITY torsettings.useProxy.type.placeholder "seleccionar un tipo de proxy"> - -<!ENTITY torsettings.useProxy.address "Dirección:"> +<!ENTITY torsettings.useProxy.address ""> <!ENTITY torsettings.useProxy.address.placeholder "Dirección IP o nombre de máquina (host)"> - -<!ENTITY torsettings.useProxy.port "Puerto:"> - -<!ENTITY torsettings.useProxy.username "Nombre de usuario:"> - -<!ENTITY torsettings.useProxy.password "Contraseña:"> +<!ENTITY torsettings.useProxy.port ""> +<!ENTITY torsettings.useProxy.username ""> +<!ENTITY torsettings.useProxy.password ""> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Esta computadora va a través de un cortafuegos(firewall) que sólo permite conexiones a ciertos puertos"> - -<!ENTITY torsettings.firewall.allowedPorts "Puertos permitidos:"> +<!ENTITY torsettings.firewall.allowedPorts ""> <!ENTITY torsettings.useBridges.checkbox "En mi país se censura a Tor"> <!ENTITY torsettings.useBridges.default "Seleccionar un puente construido"> <!ENTITY torsettings.useBridges.default.placeholder "seleccionar un puente"> @@ -75,18 +69,14 @@ <!ENTITY torPreferences.bridges "Puentes"> <!ENTITY torPreferences.bridgesDescription "Los puentes te ayudan a acceder a la Red Tor en lugares donde Tor está bloqueado. Dependiendo de dónde te encuentres, un puente puede funcionar mejor que otro."> <!ENTITY torPreferences.useBridge "Usa un puente"> - <!ENTITY torPreferences.requestNewBridge "Solicite un Nuevo Puente&#x2026;"> <!ENTITY torPreferences.provideBridge "Proporcionar un puente"> <!ENTITY torPreferences.advanced "Avanzado"> <!ENTITY torPreferences.advancedDescription "Configura cómo el Navegador Tor se conecta a Internet."> <!ENTITY torPreferences.firewallPortsPlaceholder "Valores separados por comas"> <!ENTITY torPreferences.requestBridgeDialogTitle "Solicitar Puente"> - <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contactando con BridgeDB. Espera por favor."> - <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resuelve el CAPTCHA para solicitar un puente."> - <!ENTITY torPreferences.requestBridgeErrorBadSolution "La solución no es correcta. Por favor, inténtalo de nuevo."> <!ENTITY torPreferences.viewTorLogs "Ver los registros de Tor."> <!ENTITY torPreferences.viewLogs "Ver registros&#x2026;"> diff --git a/tr/network-settings.dtd b/tr/network-settings.dtd index a0179c496..ee45cafd1 100644 --- a/tr/network-settings.dtd +++ b/tr/network-settings.dtd @@ -26,24 +26,18 @@ <!ENTITY torsettings.optional "İsteğe bağlı"> <!ENTITY torsettings.useProxy.checkbox "Internete erişmek için vekil sunucu kullanıyorum"> - -<!ENTITY torsettings.useProxy.type "Vekil Sunucu Türü:"> +<!ENTITY torsettings.useProxy.type "Vekil Sunucu Türü"> <!ENTITY torsettings.useProxy.type.placeholder "vekil sunucu türünü seçin"> - -<!ENTITY torsettings.useProxy.address "Adres:"> +<!ENTITY torsettings.useProxy.address "Adres"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresi ya da sunucu adı"> - -<!ENTITY torsettings.useProxy.port "Kapı Numarası:"> - -<!ENTITY torsettings.useProxy.username "Kullanıcı Adı:"> - -<!ENTITY torsettings.useProxy.password "Parola:"> +<!ENTITY torsettings.useProxy.port "Kapı No"> +<!ENTITY torsettings.useProxy.username "Kullanıcı Adı"> +<!ENTITY torsettings.useProxy.password "Parola"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Bu bilgisayarda yalnız belirli kapı numaralarından bağlanılmasına izin veren bir güvenlik duvarı kullanılıyor"> - -<!ENTITY torsettings.firewall.allowedPorts "Kullanılabilecek Kapı Numaraları:"> +<!ENTITY torsettings.firewall.allowedPorts "Kullanılabilecek Kapı Numaraları"> <!ENTITY torsettings.useBridges.checkbox "Bulunduğum ülkede Tor ağı engelleniyor"> <!ENTITY torsettings.useBridges.default "Hazır Köprülerden Seçin"> <!ENTITY torsettings.useBridges.default.placeholder "bir köprü seçin"> @@ -75,18 +69,14 @@ <!ENTITY torPreferences.bridges "Köprüler"> <!ENTITY torPreferences.bridgesDescription "Köprüler Tor bağlantısının engellendiği yerlerden Tor Ağına erişmek için kullanılır.. Bulunduğunuz konuma göre bir köprü türü diğerinden daha uygun olabilir."> <!ENTITY torPreferences.useBridge "Bir köprü kullanın"> - <!ENTITY torPreferences.requestNewBridge "Yeni Köprü İsteğinde Bulunun&#x2026;"> <!ENTITY torPreferences.provideBridge "Bir köprü adresi yazın"> <!ENTITY torPreferences.advanced "Gelişmiş"> <!ENTITY torPreferences.advancedDescription "Tor Browser uygulamasının İnternete nasıl bağlanacağını yapılandırın."> <!ENTITY torPreferences.firewallPortsPlaceholder "Virgül ile ayrılmış değerler"> <!ENTITY torPreferences.requestBridgeDialogTitle "Köprü İsteğinde Bulunun"> - <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Köprü veritabanına bağlanılıyor. Lütfen bekleyin."> - <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Köprü isteği yapmak için güvenlik kodunu çözün."> - <!ENTITY torPreferences.requestBridgeErrorBadSolution "Çözüm doğru değil. Lütfen yeniden deneyin."> <!ENTITY torPreferences.viewTorLogs "Tor günlük kayıtlarına bakın."> <!ENTITY torPreferences.viewLogs "Günlüğü Görüntüle&#x2026;">

1 0

[translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
by translation＠torproject.org 15 Oct '19

15 Oct '19

commit 66b91aa1c5a916127ea1c07fa5d1c83d422bc865 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 15 14:52:41 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- es/network-settings.dtd | 2 +- nl/network-settings.dtd | 4 ++-- tr/network-settings.dtd | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/es/network-settings.dtd b/es/network-settings.dtd index 55e774077..d2d3f7cb3 100644 --- a/es/network-settings.dtd +++ b/es/network-settings.dtd @@ -37,7 +37,7 @@ <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Esta computadora va a través de un cortafuegos(firewall) que sólo permite conexiones a ciertos puertos"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> +<!ENTITY torsettings.firewall.allowedPorts "Puertos permitidos"> <!ENTITY torsettings.useBridges.checkbox "En mi país se censura a Tor"> <!ENTITY torsettings.useBridges.default "Seleccionar un puente construido"> <!ENTITY torsettings.useBridges.default.placeholder "seleccionar un puente"> diff --git a/nl/network-settings.dtd b/nl/network-settings.dtd index bc3d87099..828a7bbeb 100644 --- a/nl/network-settings.dtd +++ b/nl/network-settings.dtd @@ -28,7 +28,7 @@ <!ENTITY torsettings.useProxy.checkbox "I gebruik een proxy om met het internet te verbinden."> <!ENTITY torsettings.useProxy.type "Proxy type"> <!ENTITY torsettings.useProxy.type.placeholder "selecteer een proxytype"> -<!ENTITY torsettings.useProxy.address "Adres 2"> +<!ENTITY torsettings.useProxy.address "Adres"> <!ENTITY torsettings.useProxy.address.placeholder "IP-adres of hostnaam"> <!ENTITY torsettings.useProxy.port "Poort"> <!ENTITY torsettings.useProxy.username "Gebruikersnaam"> @@ -65,7 +65,7 @@ <!ENTITY torPreferences.categoryTitle "Tor"> <!ENTITY torPreferences.torSettings "Tor-instellingen"> <!ENTITY torPreferences.torSettingsDescription "Tor Browser routeert uw verkeer over het Tor-netwerk, mogelijk gemaakt door duizenden vrijwilligers over de hele wereld." > -<!ENTITY torPreferences.learnMore "Meer info"> +<!ENTITY torPreferences.learnMore "Meer informatie"> <!ENTITY torPreferences.bridges "Bridges"> <!ENTITY torPreferences.bridgesDescription "Bridges helpen u toegang te krijgen tot het Tor-netwerk op plaatsen waar Tor is geblokkeerd. Afhankelijke van waar u zich bevindt, werkt de ene bridge mogelijk beter dan de andere."> <!ENTITY torPreferences.useBridge "Een bridge gebruiken"> diff --git a/tr/network-settings.dtd b/tr/network-settings.dtd index 4e811d2b7..ee45cafd1 100644 --- a/tr/network-settings.dtd +++ b/tr/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "İsteğe bağlı"> <!ENTITY torsettings.useProxy.checkbox "Internete erişmek için vekil sunucu kullanıyorum"> -<!ENTITY torsettings.useProxy.type "Proxy Türü"> +<!ENTITY torsettings.useProxy.type "Vekil Sunucu Türü"> <!ENTITY torsettings.useProxy.type.placeholder "vekil sunucu türünü seçin"> <!ENTITY torsettings.useProxy.address "Adres"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresi ya da sunucu adı"> <!ENTITY torsettings.useProxy.port "Kapı No"> -<!ENTITY torsettings.useProxy.username "Kullanıcı adı"> +<!ENTITY torsettings.useProxy.username "Kullanıcı Adı"> <!ENTITY torsettings.useProxy.password "Parola"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Bu bilgisayarda yalnız belirli kapı numaralarından bağlanılmasına izin veren bir güvenlik duvarı kullanılıyor"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> +<!ENTITY torsettings.firewall.allowedPorts "Kullanılabilecek Kapı Numaraları"> <!ENTITY torsettings.useBridges.checkbox "Bulunduğum ülkede Tor ağı engelleniyor"> <!ENTITY torsettings.useBridges.default "Hazır Köprülerden Seçin"> <!ENTITY torsettings.useBridges.default.placeholder "bir köprü seçin">

1 0

[translation/torcheck] https://gitweb.torproject.org/translation.git/commit/?h=torcheck
by translation＠torproject.org 15 Oct '19

15 Oct '19

commit 893c85115508b85b7a4fa9cf06ee4b0109e23ed9 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 15 14:52:13 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torcheck --- nl/torcheck.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nl/torcheck.po b/nl/torcheck.po index 0b841d49d..881183557 100644 --- a/nl/torcheck.po +++ b/nl/torcheck.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2019-10-15 01:05+0000\n" -"Last-Translator: Tonnes <tonnes.mb(a)gmail.com>\n" +"PO-Revision-Date: 2019-10-15 14:42+0000\n" +"Last-Translator: Meteor 0id\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -73,7 +73,7 @@ msgstr "Meer informatie over deze uitgangslocatie, bekijk:" 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 "Het Tor Project is een 501(c)(3)-non-profitorganisatie in de VS die zich inzet voor onderzoek, ontwikkeling en onderwijs van/in online anonimiteit en privacy." +msgstr "Het Tor Project is een 501(c)(3)-organisatie zonder winstoogmerk gevestigd in de VS die zich inzet voor onderzoek, ontwikkeling en onderwijs over online anonimiteit en privacy." msgid "Learn More »" msgstr "Meer info »"

1 0

[translation/torbutton-abouttbupdatedtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-abouttbupdatedtd
by translation＠torproject.org 15 Oct '19

15 Oct '19

commit 661ac86bb86cbec0e59d9916e4ff11655583ff98 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 15 14:51:42 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-abouttbup… --- nl/abouttbupdate.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/abouttbupdate.dtd b/nl/abouttbupdate.dtd index 55c4de7a0..c33192504 100644 --- a/nl/abouttbupdate.dtd +++ b/nl/abouttbupdate.dtd @@ -1,4 +1,4 @@ -<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser-changelog"> +<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser-wijzigingslog"> <!ENTITY aboutTBUpdate.updated "Tor Browser is bijgewerkt."> <!ENTITY aboutTBUpdate.linkPrefix "Bezoek "> <!ENTITY aboutTBUpdate.linkLabel "onze website">

1 0

[translation/torbutton-torbuttondtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd
by translation＠torproject.org 15 Oct '19

15 Oct '19

commit f4b106c8848a50ace57a0ec8938e8479e1083f8d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 15 14:51:21 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- nl/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/torbutton.dtd b/nl/torbutton.dtd index c833d78fd..ebc72f456 100644 --- a/nl/torbutton.dtd +++ b/nl/torbutton.dtd @@ -31,7 +31,7 @@ <!ENTITY torbutton.prefs.sec_safest_label "Veiligste"> <!ENTITY torbutton.prefs.sec_safest_description "Alleen websitefuncties toestaan die voor statische websites en basisservices zijn vereist. Deze wijzigingen zijn van invloed op afbeeldingen, media en scripts."> <!ENTITY torbutton.prefs.sec_safest_list_label "Op de veiligste instelling:"> -<!ENTITY torbutton.prefs.sec_learn_more_label "Meer info"> +<!ENTITY torbutton.prefs.sec_learn_more_label "Meer informatie"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is uitgeschakeld op niet-HTTPS-websites."> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is standaard uitgeschakeld op alle websites."> <!ENTITY torbutton.prefs.sec_limit_typography "Sommige lettertypen en wiskundige symbolen zijn uitgeschakeld.">

1 0

[translation/tba-torbrowserstringsdtd] https://gitweb.torproject.org/translation.git/commit/?h=tba-torbrowserstringsdtd
by translation＠torproject.org 15 Oct '19

15 Oct '19

commit e47d0c8227744b978425d75f32bee1c7989a1f45 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 15 14:49:47 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tba-torbrowserstrin… --- nl/torbrowser_strings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/torbrowser_strings.dtd b/nl/torbrowser_strings.dtd index 6b2548de2..a8e2d7363 100644 --- a/nl/torbrowser_strings.dtd +++ b/nl/torbrowser_strings.dtd @@ -26,7 +26,7 @@ <!ENTITY tor_bootstrap_swipe_for_logs "Veeg naar links om Tor-logs te zien"> <!ENTITY tor_bootstrap_connect "Verbinden"> -<!ENTITY tor_bootstrap_starting_status "We maken verbinding met het Tor-netwerk..."> +<!ENTITY tor_bootstrap_starting_status "We maken verbinding met het Tor-netwerk…"> <!ENTITY pref_tor_network_title "Netwerk"> <!ENTITY pref_tor_select_a_bridge_title "Een bridge selecteren">

1 0

[gettor/master] Fix missing endpoint in twitter responder
by hiro＠torproject.org 15 Oct '19

15 Oct '19

commit b15674b2c32d7759a97de4afb75baf98022a9005 Author: hiro <hiro(a)torproject.org> Date: Tue Oct 15 16:24:28 2019 +0200 Fix missing endpoint in twitter responder --- gettor/utils/twitter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gettor/utils/twitter.py b/gettor/utils/twitter.py index f8fa90d..133ff9a 100644 --- a/gettor/utils/twitter.py +++ b/gettor/utils/twitter.py @@ -57,5 +57,5 @@ class Twitter(object): } } - data = self.twitter_client.post(twitter_new_message_endpoint, json=message) + data = self.twitter_client.post(self.twitter_new_message_endpoint, json=message) return data

1 0

[gettor/master] Fix load settings
by hiro＠torproject.org 15 Oct '19

15 Oct '19

commit 5e08ab00607f792c86ba3aba168b49b48bf6ff94 Author: hiro <hiro(a)torproject.org> Date: Tue Oct 15 16:21:50 2019 +0200 Fix load settings --- gettor/utils/settings.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gettor/utils/settings.py b/gettor/utils/settings.py index c849803..1a33bb2 100644 --- a/gettor/utils/settings.py +++ b/gettor/utils/settings.py @@ -25,13 +25,15 @@ class Settings(object): """ def __init__(self, config=False): - # Default config - self.filename = self.build_filename() + # If a readable config file was provided, use that instead if config: if os.path.isfile(config): self.filename = config + # Default config + self.filename = self.build_filename() + # Dictionary of available languages, # mapped to the language name, in that language self._available_locales = strings.get_locales() @@ -62,7 +64,9 @@ class Settings(object): "dbname": "/srv/gettor.torproject.org/home/gettor/gettor.db", "email_parser_logfile": "/srv/gettor.torproject.org/home/gettor/log/email_parser.log", "email_requests_limit": 30, + "twitter_requests_limit": 1, "sendmail_interval": 10, + "twitter_interval": 10, "sendmail_addr": "gettor(a)torproject.org", "sendmail_host": "localhost", "sendmail_port": 587, @@ -70,7 +74,10 @@ class Settings(object): "consumer_secret": "", "access_key": "", "access_secret": "", - "twitter_handle": "get_tor" + "test_hid": "", + "twitter_handle": "get_tor", + "twitter_messages_endpoint": "https://api.twitter.com/1.1/direct_messages/events/list.json", + "twitter_new_message_endpoint": "https://api.twitter.com/1.1/direct_messages/events/new.json" } def get(self, key):

1 0

[gettor/master] Fix paste error
by hiro＠torproject.org 15 Oct '19

15 Oct '19

commit d52c01158f65bab5b4c2eb577a5c92d9fdc20805 Author: hiro <hiro(a)torproject.org> Date: Tue Oct 15 16:19:08 2019 +0200 Fix paste error --- bin/gettor_service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/gettor_service b/bin/gettor_service index df4580e..7f8b7d5 100755 --- a/bin/gettor_service +++ b/bin/gettor_service @@ -20,7 +20,7 @@ case "$1" in start) - twistd3 --python=scripts/gettor --logfile=log/gettor.log --pidfile=gettor.pid --config=gettor.conf.json + twistd3 --python=scripts/gettor --logfile=log/gettor.log --pidfile=gettor.pid ;; stop) kill -INT `cat gettor.pid`

1 0

[gettor/master] Update options with configs
by hiro＠torproject.org 15 Oct '19

15 Oct '19

commit fd71f48df802a2ecfc2dff4edd8fd8e6768052db Author: hiro <hiro(a)torproject.org> Date: Tue Oct 15 16:18:28 2019 +0200 Update options with configs --- bin/gettor_service | 2 +- gettor/utils/options.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/gettor_service b/bin/gettor_service index da45e9b..df4580e 100755 --- a/bin/gettor_service +++ b/bin/gettor_service @@ -20,7 +20,7 @@ case "$1" in start) - twistd3 --python=scripts/gettor --logfile=log/gettor.log --pidfile=gettor.pid + twistd3 --python=scripts/gettor --logfile=log/gettor.log --pidfile=gettor.pid --config=gettor.conf.json ;; stop) kill -INT `cat gettor.pid` diff --git a/gettor/utils/options.py b/gettor/utils/options.py index ef4b346..54b9204 100644 --- a/gettor/utils/options.py +++ b/gettor/utils/options.py @@ -31,4 +31,4 @@ def parse_settings(): returing translated strings """ strings.load_strings("en") - return load_settings(config=False) + return load_settings(config='gettor.conf.json')

1 0