tor-commits March 2015

tor-commits@lists.torproject.org

23 participants
1889 discussions

[bridgedb/master] Update German (de) translations.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 55892c1e3a6e5abfae41314d67583c72724141e4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 19 23:27:08 2015 +0000 Update German (de) translations. * THANKS to trantor, Ettore Atalan, unknwon_anonymous, konstibae, Locke, Tobias Bannert, qbi, Sebastian, and debakel. --- lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 103 ++++++++++++++++---------- 1 file changed, 65 insertions(+), 38 deletions(-) diff --git a/lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po index 9d20817..163b56c 100644 --- a/lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po @@ -1,21 +1,25 @@ # Translations template for BridgeDB. -# Copyright (C) 2014 'The Tor Project, Inc.' +# Copyright (C) 2015 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Isis <isis(a)torproject.org>, 2014 # trantor <clucko3(a)gmail.com>, 2014 +# Ettore Atalan <atalanttore(a)googlemail.com>, 2014 # unknwon_anonymous <jackjohnson0001(a)yahoo.com>, 2014 +# konstibae <konstibae(a)gmail.com>, 2014 # Locke <locke(a)dena-design.de>, 2011 -# Tobias Bannert, 2013 -# Tobias Bannert, 2014 +# qbi <kubieziel(a)googlemail.com>, 2015 +# Sebastian <sebix+transifex(a)sebix.at>, 2015 +# debakel <spam1(a)mrtz.me>, 2014 +# Tobias Bannert <tobannert(a)gmail.com>, 2013 +# Tobias Bannert <tobannert(a)gmail.com>, 2014 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: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-07-26 02:03+0000\n" -"Last-Translator: Isis <isis(a)torproject.org>\n" +"POT-Creation-Date: 2015-02-03 03:24+0000\n" +"PO-Revision-Date: 2015-03-04 18:22+0000\n" +"Last-Translator: qbi <kubieziel(a)googlemail.com>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -35,17 +39,17 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:121 +#: lib/bridgedb/HTTPServer.py:122 msgid "Sorry! Something went wrong with your request." -msgstr "Entschuldigung, etwas lief fehl bei Ihrer Anfrage." +msgstr "Wir bitten um Entschuldigung. Bei Ihrer Anfrage lief etwas fehl." #: lib/bridgedb/strings.py:18 msgid "[This is an automated message; please do not reply.]" -msgstr "[Dies ist eine automatische Nachricht, bitte nicht antworten.]" +msgstr "[Das ist eine automatische Nachricht. Bitte antworten Sie nicht darauf.]" #: lib/bridgedb/strings.py:20 msgid "Here are your bridges:" -msgstr "Hier sind Ihre Brücken:" +msgstr "Hier sind Ihre Brücken-Server (Bridges):" #: lib/bridgedb/strings.py:22 #, python-format @@ -104,7 +108,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "Die Brückendatenbank kann Brücken mit verschiedenen %stypen steckbarer Transporte%s bereitstellen, die helfen können Ihre Verbindungen zum Tor-Netzwerk zu verschleiern, was es für jeden der Ihren Internetverkehr beobachtet, schwierig machen kann festzustellen, dass sie Tor benutzen.\n\n" +msgstr "Die Brückendatenbank kann Brücken-Server mit verschiedenen %stypen der Pluggable Transports%s bereitstellen. Diese können helfen, Ihre Verbindungen zum Tor-Netzwerk zu verschleiern. Damit wird es für Dritte schwieriger festzustellen, dass sie Tor benutzen.\n\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: lib/bridgedb/strings.py:54 @@ -112,7 +116,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "Einige Brücken mit IPv6-Adressen sind ebenfalls vorhanden, auch wenn einige \nsteckbare Transportwege nicht IPv6-kompatibel sind.\n\n" +msgstr "Einige Brücken mit IPv6-Adressen sind ebenfalls vorhanden, auch wenn einige \nsteckbare Transporte nicht IPv6-kompatibel sind.\n\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -126,7 +130,7 @@ msgid "" "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 "Zusätzlich hat die Brückendatenbank viele ganz einfache Vanillabrücken %s ohne jegliche steckbaren Transporte %s, was vielleicht nicht so toll klingt, aber Sie können dennoch dabei helfen in vielen Fällen die Internetzensur zu umgehen.\n\n" +msgstr "Zusätzlich hat die Brückendatenbank viele erkömmliche Brücken-Server %s ohnePluggable Transports %s. Das klingt vielleicht weniger toll. Es hilft Ihnen dennoch, in vielen Fällen die Internetzensur zu umgehen.\n\n" #: lib/bridgedb/strings.py:76 msgid "What are bridges?" @@ -135,11 +139,11 @@ msgstr "Was sind Brücken?" #: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "%s Brücken %s sind Tor-Relais, die Ihnen helfen die Zensur zu umgehen." +msgstr "%s Brücken-Server %s sind Tor-Relais, die Ihnen helfen die Zensur zu umgehen." #: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" -msgstr "Ich brauche einen alternativen Weg, um Brücken zu erhalten!" +msgstr "Ich brauche einen anderen Weg, um Adressen von Brücken-Servern zu erhalten." #: lib/bridgedb/strings.py:83 #, python-format @@ -147,17 +151,17 @@ 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 "Eine weitere Möglichkeit, um Brücken zu erhalten, ist eine E-Mail an %s zu senden. \nBitte beachte Sie, dass Sie die E-Mail von einem der folgenden E-Mail-Anbieter versenden: \n%s, %s oder %s." +msgstr "Sie können auch eine E-Mail an %s schicken, um Adressen von Brücken-Servern zu erhalten. Die E-Mail muss von einem der folgenden E-Mail-Anbieter geschickt werden: %s, %s oder %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" -msgstr "Meine Brücken funktionieren nicht! Ich brauche Hilfe!" +msgstr "Meine Brücken-Server funktionieren nicht! Ich brauche Hilfe!" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:92 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "Sollte Ihr Tor nicht funktionieren, senden Sie bitte eine E-Mail an %s." +msgstr "Sollte Tor bei Ihnen nicht funktionieren, senden Sie bitte eine E-Mail an %s." #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". @@ -167,19 +171,19 @@ 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 "Versuchen Sie so viele Informationen über ihren Fall wie möglich mit einzubeziehen, \neinschließlich einer Liste der Brücken und der steckbaren Transporte die Sie versuchten zu benutzen, \nIhre Tor-Browser-Version, und jegliche Meldungen die Tor gegeben hat, usw." +msgstr "Versuchen Sie in Ihrer E-Mail möglichst viele Informationen über Ihr Problem einzubeziehen, \neinschließlich einer Liste der Brücken-Server und der Pluggable Transports, die Sie versuchten zu benutzen, \nIhre Tor-Browser-Version, und jegliche Meldungen, die Tor gegeben hat, usw." #: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" -msgstr "Hier sind Ihre Brückenleitungen:" +msgstr "Hier sind Ihre Brückenadressen:" #: lib/bridgedb/strings.py:104 msgid "Get Bridges!" -msgstr "Brücken erhalten!" +msgstr "Erhalten Sie Adressen von Brücken-Servern!" #: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" -msgstr "Bitte die Optionen für den Brückentyp auswählen:" +msgstr "Bitte wählen Sie die Optionen für den Brückentyp aus:" #: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" @@ -192,11 +196,11 @@ msgstr "Benötigen Sie eine %s?" #: lib/bridgedb/strings.py:114 msgid "Your browser is not displaying images properly." -msgstr "Bilder werden in Ihrem Browser nicht ordnungsgemäß dargestellt." +msgstr "Bilder werden in Ihrem Browser nicht korrekt dargestellt." #: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." -msgstr "Bitte die Zeichen aus dem oberen Bild eingeben." +msgstr "Bitte geben Sie die Zeichen aus dem oberen Bild ein." #: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" @@ -215,14 +219,14 @@ msgstr "Um Brücken zum Tor-Browser hinzuzufügen, bitte der Anleitung auf der S msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" -msgstr "Wenn der Dialog mit den »Tor-Netzwerkeinstellungen« erscheint, \nbitte auf »Konfigurieren« klicken und dem Assistenten folgen: " +msgstr "Wenn der Dialog mit den »Tor-Netzwerkeinstellungen« erscheint, \nklicken Sie auf »Konfigurieren« und folgen den Anweisungen des Assistenten: " #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:129 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" -msgstr "Blockiert oder zensiert Ihr Internetdienstanbieter die Verbindungen zum Tor-Netzwerk?" +msgstr "Blockiert oder zensiert Ihr Internetanbieter (ISP) die Verbindungen zum Tor-Netzwerk?" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:133 @@ -231,7 +235,7 @@ msgid "" "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 "»Ja« auswählen und dann auf »Weiter« klicken. Um Ihre neuen Brücken zu konfigurieren, die \nZeilen mit den Brücken kopieren und sie in das Texteingabefeld einfügen. Zum Schluss auf \n»Verbinden« klicken und Sie sollten loslegen können! Falls Ihnen Schwierigkeiten begegnen, \nversuchen Sie bitte den »Hilfe«-Knopf im Assistenten der »Tor- Netzwerkeinstellungen« zu klicken, \num weitere Hilfe zu erhalten." +msgstr "Wählen Sie »Ja« und klicken dann auf »Weiter«. Um Ihre neuen Brücken zu konfigurieren, kopieren Sie die \nZeilen mit den Adressen der Brücken und fügen sie in das Texteingabefeld ein. Zum Schluss klicken Sie auf \n»Verbinden« und Sie können loslegen! Falls Sie Schwierigkeiten haben, \nversuchen Sie bitte auf den »Hilfe«-Knopf im Assistenten der »Tor- Netzwerkeinstellungen« zu klicken, \num weitere Hilfe zu erhalten." #: lib/bridgedb/strings.py:141 msgid "Displays this message." @@ -242,7 +246,7 @@ msgstr "Diese Nachricht anzeigen." #. "plain-ol'-vanilla" bridges. #: lib/bridgedb/strings.py:145 msgid "Request vanilla bridges." -msgstr "Vanille Brücken anfordern." +msgstr "Standard-Brücken anfordern." #: lib/bridgedb/strings.py:146 msgid "Request IPv6 bridges." @@ -251,7 +255,7 @@ msgstr "IPv6-Brücken anfordern." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". #: lib/bridgedb/strings.py:148 msgid "Request a Pluggable Transport by TYPE." -msgstr "Einen anschließbaren Transporttypen nach Typ anfordern." +msgstr "Einen Pluggable Transport des TYPs anfordern." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". @@ -259,15 +263,15 @@ msgstr "Einen anschließbaren Transporttypen nach Typ anfordern." msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Eine Kopie des öffentlichen GnuPG-Schlüssels der Brückendatenbank erhalten." -#: lib/bridgedb/templates/base.html:91 +#: lib/bridgedb/templates/base.html:89 msgid "Report a Bug" msgstr "Einen Fehler melden" -#: lib/bridgedb/templates/base.html:93 +#: lib/bridgedb/templates/base.html:92 msgid "Source Code" msgstr "Quellcode" -#: lib/bridgedb/templates/base.html:96 +#: lib/bridgedb/templates/base.html:95 msgid "Changelog" msgstr "Änderungsprotokoll" @@ -275,19 +279,42 @@ msgstr "Änderungsprotokoll" msgid "Contact" msgstr "Kontakt" +#: lib/bridgedb/templates/bridges.html:81 +msgid "Select All" +msgstr "Alles auswählen" + +#: lib/bridgedb/templates/bridges.html:87 +msgid "Show QRCode" +msgstr "QRCode anzeigen" + +#: lib/bridgedb/templates/bridges.html:100 +msgid "QRCode for your bridge lines" +msgstr "QRCode für Ihre Brückenverbindungen" + #. 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!". :) -#: lib/bridgedb/templates/bridges.html:66 +#: lib/bridgedb/templates/bridges.html:115 +#: lib/bridgedb/templates/bridges.html:175 msgid "Uh oh, spaghettios!" msgstr "Hoppla, Spaghetti!" -#: lib/bridgedb/templates/bridges.html:72 +#: lib/bridgedb/templates/bridges.html:116 +msgid "It seems there was an error getting your QRCode." +msgstr "Es gab vermutlich einen Fehler bei Beschaffen Ihres QR-Codes." + +#: lib/bridgedb/templates/bridges.html:121 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "Dieser QR-Code beinhaltet Ihre Brückenverbindungen. Scannen Sie ihn mit einem QR-Code-Leser um ihre Brückenverbindungen auf ihre mobile und andere Geräte zu kopieren." + +#: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..." msgstr "Im Moment sind keine Brücken verfügbar …" -#: lib/bridgedb/templates/bridges.html:73 +#: lib/bridgedb/templates/bridges.html:182 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -348,7 +375,7 @@ msgstr "keine" #. 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." -#: lib/bridgedb/templates/options.html:130 +#: lib/bridgedb/templates/options.html:127 #, python-format msgid "%sY%ses!" msgstr "%sJ%sa!" @@ -356,7 +383,7 @@ msgstr "%sJ%sa!" #. 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"! -#: lib/bridgedb/templates/options.html:154 +#: lib/bridgedb/templates/options.html:151 #, python-format msgid "%sG%set Bridges" msgstr "%sB%srücken erhalten"

1 0

[bridgedb/master] Update Spanish (es) translations.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 4cf045d92c0bbea9ae9d32749b173010887289e5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 19 23:32:59 2015 +0000 Update Spanish (es) translations. * THANKS to dark_yoshi, toypurina, BL, NinjaTuna, Noel Torres, Paola Falcon, strel, and Jonis. --- lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 79 +++++++++++++++++--------- 1 file changed, 52 insertions(+), 27 deletions(-) diff --git a/lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po index ec057f0..b681b88 100644 --- a/lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po @@ -1,22 +1,24 @@ # Translations template for BridgeDB. -# Copyright (C) 2014 'The Tor Project, Inc.' +# Copyright (C) 2015 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Isis <isis(a)torproject.org>, 2014 # dark_yoshi <angelargi(a)yahoo.es>, 2014 +# toypurina <biolenta(a)riseup.net>, 2014 +# BL <tresemes3(a)gmail.com>, 2014 # NinjaTuna <nort0ngh0st(a)hotmail.com>, 2011 # Noel Torres <envite(a)rolamasao.org>, 2013 # Paola Falcon <cacoepy(a)gmail.com>, 2014 -# strel, 2013-2014 +# Jonis <srvial(a)hotmail.com>, 2014 +# strel, 2013-2015 # strel, 2012 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: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-07-26 23:10+0000\n" -"Last-Translator: Isis <isis(a)torproject.org>\n" +"POT-Creation-Date: 2015-02-03 03:24+0000\n" +"PO-Revision-Date: 2015-02-14 13:50+0000\n" +"Last-Translator: strel\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,9 +38,9 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:121 +#: lib/bridgedb/HTTPServer.py:122 msgid "Sorry! Something went wrong with your request." -msgstr "¡Lo sentimos! Algo fue mal con su solicitud." +msgstr "¡Lo siento! Algo fue mal con tu solicitud." #: lib/bridgedb/strings.py:18 msgid "[This is an automated message; please do not reply.]" @@ -53,7 +55,7 @@ msgstr "Aquí están sus bridges:" 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 "Ha superado el límite. Por favor, ¡más despacio! El tiempo mínimo entre mensajes de correo\nelectrónico es %s horas. Se ignoran todos los correos adicionales durante este período de tiempo." +msgstr "Ha excedido el límite de velocidad. Por favor, ¡más despacio! El tiempo mínimo entre correos electrónicos es %s horas. Los siguientes correos durante este periodo de tiempo serán ignorados. " #: lib/bridgedb/strings.py:25 msgid "" @@ -68,7 +70,7 @@ msgstr "¡Bienvenido a BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: lib/bridgedb/strings.py:30 msgid "Currently supported transport TYPEs:" -msgstr "TYPEs (tipos) de 'transport' (transportes) soportados:" +msgstr "Transport TYPEs actualmente soportados:" #: lib/bridgedb/strings.py:31 #, python-format @@ -91,7 +93,7 @@ msgstr "Claves públicas" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "Este correo electrónico fue generado con arcos iris, unicornios, y centellas\npara %s el %s a las %s." +msgstr "Este correo fue generado con arcoiris, unicornios y chispitas para %s el %s a las %s." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -105,7 +107,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "BridgeDB (base de datos de repetidores puente) puede proporcionar bridges con\nvarios %stipos de Pluggable Transports%s (transportes conectables), que pueden\nayudar a ofuscar sus conexiones a la red Tor, haciendo que sea más difícil que\nalguien vea su tráfico de Internet para determinar que está utilizando Tor.\n" +msgstr "BridgeDB puede proveer bridges con varios %stipos de Pluggable Transports%s que pueden ayudar a ofuscar sus conexiones a la red Tor, haciendo que sea más difícil para alguien que esté viendo su tráfico en la red el determinar que ud. está usando Tor.\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: lib/bridgedb/strings.py:54 @@ -127,7 +129,7 @@ msgid "" "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 "Además, BridgeDB tiene un montón de sencillos-clásicos-estándar (vanilla) bridges\n%s sin ningún Pluggable Transport %s, lo que tal vez no suena tan molón, pero que\ntodavía pueden ayudar a eludir la censura en Internet en muchos casos.\n\n" +msgstr "Además, BridgeDB tiene un montón de sencillos-clásicos-estándar (vanilla) bridges\n%s sin ningún Pluggable Transport %s, lo que tal vez no suena tan molón, pero que\naún pueden ayudar a eludir la censura en Internet en muchos casos.\n\n\n" #: lib/bridgedb/strings.py:76 msgid "What are bridges?" @@ -148,11 +150,11 @@ 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 "Otra forma de obtener bridges es enviar un correo a %s. Por favor observe que debe\nenviar el correo electrónico usando una dirección de uno de los siguientes proveedores\nde correo electrónico:\n%s, %s o %s" +msgstr "Otra forma de obtener repetidores puente (bridges) es enviar un correo electrónico a %s. Por favor observe que tiene que enviar el correo usando la dirección de uno de los siguientes proveedores de correo electrónico:\n%s, %s or %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" -msgstr "¡Mis puentes no funcionan! ¡Necesito ayuda!" +msgstr "¡Mis bridges/puentes no funcionan! ¡Necesito ayuda!" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:92 @@ -180,7 +182,7 @@ msgstr "¡Obtener bridges!" #: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" -msgstr "Por favor, selecciona las opciones para el tipo de bridge:" +msgstr "Por favor, selecciona opciones para el tipo de bridge:" #: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" @@ -209,7 +211,7 @@ msgstr "Cómo comenzar a usar tus bridges" msgid "" "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" "Browser download page %s to start Tor Browser." -msgstr "Para introducir bridges (repetidores puente) en el Navegador Tor, sigue las\ninstrucciones de la %s página de descarga del Navegador Tor %s para iniciarlo." +msgstr "Para introducir bridges (repetidores puente) en el Tor Browser, sigue las\ninstrucciones de la %s página de descarga del Tor Browser %s para iniciarlo." #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:125 @@ -260,15 +262,15 @@ msgstr "Solicitar un Pluggable Transport por TYPE." msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Obtener una copia de la clave pública GnuPG de BridgeDB." -#: lib/bridgedb/templates/base.html:91 +#: lib/bridgedb/templates/base.html:89 msgid "Report a Bug" msgstr "Reportar una falla" -#: lib/bridgedb/templates/base.html:93 +#: lib/bridgedb/templates/base.html:92 msgid "Source Code" msgstr "Código fuente" -#: lib/bridgedb/templates/base.html:96 +#: lib/bridgedb/templates/base.html:95 msgid "Changelog" msgstr "Registro de cambios" @@ -276,19 +278,42 @@ msgstr "Registro de cambios" msgid "Contact" msgstr "Contactar" +#: lib/bridgedb/templates/bridges.html:81 +msgid "Select All" +msgstr "Seleccionar todos" + +#: lib/bridgedb/templates/bridges.html:87 +msgid "Show QRCode" +msgstr "Mostrar código QR" + +#: lib/bridgedb/templates/bridges.html:100 +msgid "QRCode for your bridge lines" +msgstr "Código QR para sus líneas de repetidores puente" + #. 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!". :) -#: lib/bridgedb/templates/bridges.html:66 +#: lib/bridgedb/templates/bridges.html:115 +#: lib/bridgedb/templates/bridges.html:175 msgid "Uh oh, spaghettios!" msgstr "Oh oh, ¡la liamos!" -#: lib/bridgedb/templates/bridges.html:72 +#: lib/bridgedb/templates/bridges.html:116 +msgid "It seems there was an error getting your QRCode." +msgstr "Parece que hubo un error al obtener su código QR." + +#: lib/bridgedb/templates/bridges.html:121 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "Este código QR contiene sus líneas de repetidores puente (bridges). Escanéelo con un lector de códigos QR para copiar sus líneas de puentes a dispositivos móviles/celulares y otros dispositivos." + +#: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..." msgstr "Ahora mismo no hay ningún bridge disponible..." -#: lib/bridgedb/templates/bridges.html:73 +#: lib/bridgedb/templates/bridges.html:182 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -303,7 +328,7 @@ msgstr "Paso %s1%s" #: lib/bridgedb/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "Descargar el %s Navegador Tor %s" +msgstr "Descarga %s Tor Browser %s" #: lib/bridgedb/templates/index.html:25 #, python-format @@ -323,7 +348,7 @@ msgstr "Paso %s3%s" #: lib/bridgedb/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Ahora %s añada los bridges al Navegador Tor %s" +msgstr "Ahora %s añada los bridges al Tor Browser %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -349,7 +374,7 @@ msgstr "ninguno" #. 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." -#: lib/bridgedb/templates/options.html:130 +#: lib/bridgedb/templates/options.html:127 #, python-format msgid "%sY%ses!" msgstr "¡%sS%sí!" @@ -357,7 +382,7 @@ msgstr "¡%sS%sí!" #. 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"! -#: lib/bridgedb/templates/options.html:154 +#: lib/bridgedb/templates/options.html:151 #, python-format msgid "%sG%set Bridges" msgstr "%sO%sbtener bridges"

1 0

[bridgedb/master] Update Farsi (fa) translations.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit b21e09cf0b3d99f38541cc81c993ae524c9d243c Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Mar 20 00:55:45 2015 +0000 Update Farsi (fa) translations. * THANKS to arashaalaei, signal89, ardeshir, Gilberto, johnholzer, Mohammad Hossein, perspolis, and Setareh. --- lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po | 63 ++++++++++++++++++-------- 1 file changed, 43 insertions(+), 20 deletions(-) diff --git a/lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po index d3d1193..5e9ebc8 100644 --- a/lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po @@ -1,13 +1,13 @@ # Translations template for BridgeDB. -# Copyright (C) 2014 'The Tor Project, Inc.' +# Copyright (C) 2015 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Isis <isis(a)torproject.org>, 2014 # arashaalaei <aalaeiarash(a)gmail.com>, 2011 # signal89 <ali.faraji90(a)gmail.com>, 2014 # ardeshir, 2013 -# Gilberto, 2014 +# Gilberto, 2014-2015 +# johnholzer <johnholtzer123(a)gmail.com>, 2014 # Mohammad Hossein <desmati(a)gmail.com>, 2014 # perspolis <rezarms(a)yahoo.com>, 2011 # Setareh <setareh.salehee(a)gmail.com>, 2014 @@ -15,9 +15,9 @@ 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: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-07-26 01:58+0000\n" -"Last-Translator: Isis <isis(a)torproject.org>\n" +"POT-Creation-Date: 2015-02-03 03:24+0000\n" +"PO-Revision-Date: 2015-02-17 22:11+0000\n" +"Last-Translator: Gilberto\n" "Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,7 +37,7 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:121 +#: lib/bridgedb/HTTPServer.py:122 msgid "Sorry! Something went wrong with your request." msgstr "متاسف هستیم، در رابطه با درخواست شما خطایی رخ داده است." @@ -132,12 +132,12 @@ msgstr "همچنین BridgeDB شامل تعداد زیادی پل های ابت #: lib/bridgedb/strings.py:76 msgid "What are bridges?" -msgstr "bridge ها چه هستند؟" +msgstr "پل ها چه هستند؟" #: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "%s پل ها %s هستند بازپخش کننده تور که کمک می کنند به شما برای دور زدن سانسور." +msgstr "%s پل ها %s هستند بازپخش کننده های تور هستند که به شما برای دور زدن سانسورکمک می کنند ." #: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" @@ -149,11 +149,11 @@ 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 "یک راه دیگر برای دریافت پل ها ارسال ایمیل به آدرس %s است. توجه کنید ایمیلی که ارسال می کنید، حتماً از طریق یکی از شرکت های زیر باشد:\n%s, %s یا %s" +msgstr "یک طریق دیگری که میتوانید پلها را بگیرید, از طریق فزستادن یک ایمیل به %s میباشد. لطفا دقت فر مایید که شما باید ایمیل خود را حتما از یکی از فراهمکنند گان ایمیلی زیر بفرستیذ: %s %s و یا %s ." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" -msgstr "به کمک احتیاج دارم! bridge های من کار نمی‌کنند!" +msgstr "به کمک احتیاج دارم! پل های من کار نمی‌کنند!" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:92 @@ -261,15 +261,15 @@ msgstr "درخواست یک روش Transport جایگزین براساس TYPE" msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "دریافت یک کپی از کلید عمومی BridgeDB" -#: lib/bridgedb/templates/base.html:91 +#: lib/bridgedb/templates/base.html:89 msgid "Report a Bug" msgstr "گزارش یک باگ" -#: lib/bridgedb/templates/base.html:93 +#: lib/bridgedb/templates/base.html:92 msgid "Source Code" msgstr "کد منبع" -#: lib/bridgedb/templates/base.html:96 +#: lib/bridgedb/templates/base.html:95 msgid "Changelog" msgstr "لیست تغییرات" @@ -277,19 +277,42 @@ msgstr "لیست تغییرات" msgid "Contact" msgstr "تماس" +#: lib/bridgedb/templates/bridges.html:81 +msgid "Select All" +msgstr "انتخاب همه" + +#: lib/bridgedb/templates/bridges.html:87 +msgid "Show QRCode" +msgstr "نمایش QRCode" + +#: lib/bridgedb/templates/bridges.html:100 +msgid "QRCode for your bridge lines" +msgstr "QRCode برای خطوط پل خود" + #. 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!". :) -#: lib/bridgedb/templates/bridges.html:66 +#: lib/bridgedb/templates/bridges.html:115 +#: lib/bridgedb/templates/bridges.html:175 msgid "Uh oh, spaghettios!" msgstr "اوه اوه، کنسرو اسپاگتی!" -#: lib/bridgedb/templates/bridges.html:72 +#: lib/bridgedb/templates/bridges.html:116 +msgid "It seems there was an error getting your QRCode." +msgstr "به نظر می رسد یک خطا در گرفتن QRCode شما وجود دارد." + +#: lib/bridgedb/templates/bridges.html:121 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "این QRCode شامل خطوط پل خود. اسکن آن را با یک خواننده QRCode برای کپی خطوط پل خود بر روی تلفن همراه و دستگاه های دیگر." + +#: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..." msgstr "در حال حاضر هیچ پل ی در دسترس نیست" -#: lib/bridgedb/templates/bridges.html:73 +#: lib/bridgedb/templates/bridges.html:182 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -314,7 +337,7 @@ msgstr "مرحله %s2%s" #: lib/bridgedb/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "دریافت %sbridge ها %s" +msgstr "دریافت %s پل‌ ها %s" #: lib/bridgedb/templates/index.html:36 #, python-format @@ -350,7 +373,7 @@ 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." -#: lib/bridgedb/templates/options.html:130 +#: lib/bridgedb/templates/options.html:127 #, python-format msgid "%sY%ses!" msgstr "%sب%sله!" @@ -358,7 +381,7 @@ msgstr "%sب%sله!" #. 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"! -#: lib/bridgedb/templates/options.html:154 +#: lib/bridgedb/templates/options.html:151 #, python-format msgid "%sG%set Bridges" msgstr "%sد%sریافت پل‌ها"

1 0

[bridgedb/master] Update Finnish (fi) translations.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 83a90272bbcf1b8e64b99a8b56c3df90eacc76bf Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Mar 20 00:57:23 2015 +0000 Update Finnish (fi) translations. * THANKS to Jorma Karvonen, Spacha, Ossi Kallunki, Sami Kuusisto, viljaminojonen, and Finland355. --- lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po | 63 ++++++++++++++++++-------- 1 file changed, 44 insertions(+), 19 deletions(-) diff --git a/lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po index 660be76..a2afaa5 100644 --- a/lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po @@ -1,20 +1,22 @@ # Translations template for BridgeDB. -# Copyright (C) 2014 'The Tor Project, Inc.' +# Copyright (C) 2015 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Isis <isis(a)torproject.org>, 2014 -# karvjorm <karvonen.jorma(a)gmail.com>, 2014 +# Jorma Karvonen <karvonen.jorma(a)gmail.com>, 2015 +# Jorma Karvonen <karvonen.jorma(a)gmail.com>, 2014 +# Spacha <miikasikala96(a)gmail.com>, 2015 # Ossi Kallunki <ossikallunki(a)gmail.com>, 2013 +# Sami Kuusisto <sami(a)6sto.com>, 2014 # viljaminojonen <Viljami.Nojonen(a)live.com>, 2014 # Finland355 <ville.ehrukainen2(a)gmail.com>, 2014 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: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-07-26 01:58+0000\n" -"Last-Translator: Isis <isis(a)torproject.org>\n" +"POT-Creation-Date: 2015-02-03 03:24+0000\n" +"PO-Revision-Date: 2015-03-03 18:01+0000\n" +"Last-Translator: Jorma Karvonen <karvonen.jorma(a)gmail.com>\n" "Language-Team: Finnish (http://www.transifex.com/projects/p/torproject/language/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +36,7 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:121 +#: lib/bridgedb/HTTPServer.py:122 msgid "Sorry! Something went wrong with your request." msgstr "Pyyntösi epäonnistui jostain syystä." @@ -51,7 +53,7 @@ msgstr "Tässä ovat sinun siltasi." 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 "Olet ylittänyt nopeusrajan. Hidasta hiukan! Minimiaika viestien välillä on %s tunnissa. Kaikki lisäviestit tämän ajan jälkeen ohitetaan." +msgstr "Olet ylittänyt nopeusrajan. Hidasta hiukan! Minimiaika viestien välillä on %s tunnissa. Kaikki lisäviestit tämän ajan kuluessa ohitetaan." #: lib/bridgedb/strings.py:25 msgid "" @@ -125,7 +127,7 @@ msgid "" "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 "Lisäksi BridgeDB:llä on useita tavallisia siltoja %s ilman mitään irrotettavia\nPluggable Transports %s-siirtoja, jotka eivät ehkä kuulosta herkullisilta, mutta\nne voivat silti auttaa kiertämään internet-sensuuria monissa tapauksissa.\n" +msgstr "Lisäksi BridgeDB:llä on useita tavallisia siltoja %s ilman mitään irrotettavia\nPluggable Transports %s-siirtoja, jotka eivät ehkä kuulosta herkullisilta, mutta\nne voivat silti auttaa monissa tapauksissa kiertämään internet-sensuuria.\n" #: lib/bridgedb/strings.py:76 msgid "What are bridges?" @@ -150,7 +152,7 @@ msgstr "Toinen tapa siltojen hankkimiseen on lähettää sähköpostia osoittees #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" -msgstr "Siltani ei toimi! Tarvitsen apua!" +msgstr "Siltani eivät toimi! Tarvitsen apua!" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:92 @@ -182,7 +184,7 @@ msgstr "Valitse valitsimet siltatyypille:" #: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" -msgstr "Tarvitsetko IPv6 osoitteita?" +msgstr "Tarvitsetko IPv6-osoitteita?" #: lib/bridgedb/strings.py:110 #, python-format @@ -258,15 +260,15 @@ msgstr "Pyydä TYPE-tyyppistä irrotettavaa Pluggable Transport-siirtoa." msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Hae kopio BridgeDB:n julkisesta GnuPG-avaimesta." -#: lib/bridgedb/templates/base.html:91 +#: lib/bridgedb/templates/base.html:89 msgid "Report a Bug" msgstr "Ilmoita ohjelmointivirheestä" -#: lib/bridgedb/templates/base.html:93 +#: lib/bridgedb/templates/base.html:92 msgid "Source Code" msgstr "Lähdekoodi" -#: lib/bridgedb/templates/base.html:96 +#: lib/bridgedb/templates/base.html:95 msgid "Changelog" msgstr "Muutosloki" @@ -274,19 +276,42 @@ msgstr "Muutosloki" msgid "Contact" msgstr "Yhteystieto" +#: lib/bridgedb/templates/bridges.html:81 +msgid "Select All" +msgstr "Valitse kaikki" + +#: lib/bridgedb/templates/bridges.html:87 +msgid "Show QRCode" +msgstr "Näytä QR-koodi" + +#: lib/bridgedb/templates/bridges.html:100 +msgid "QRCode for your bridge lines" +msgstr "Siltariviesi QR-koodi" + #. 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!". :) -#: lib/bridgedb/templates/bridges.html:66 +#: lib/bridgedb/templates/bridges.html:115 +#: lib/bridgedb/templates/bridges.html:175 msgid "Uh oh, spaghettios!" msgstr "Jossain on pulma!" -#: lib/bridgedb/templates/bridges.html:72 +#: lib/bridgedb/templates/bridges.html:116 +msgid "It seems there was an error getting your QRCode." +msgstr "Tapahtui virhe QR-koodia noudettassa." + +#: lib/bridgedb/templates/bridges.html:121 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "Tämä QR-koodi sisältää siltarivisi. Skannaa se QR-koodinlukijalla kopioidaksesi siltarivit matkapuhelimeesi ja muihin laitteisiin." + +#: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..." msgstr "Tällä hetkellä ei ole yhtään siltaa saatavilla..." -#: lib/bridgedb/templates/bridges.html:73 +#: lib/bridgedb/templates/bridges.html:182 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -347,7 +372,7 @@ msgstr "ei mitään" #. 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." -#: lib/bridgedb/templates/options.html:130 +#: lib/bridgedb/templates/options.html:127 #, python-format msgid "%sY%ses!" msgstr "%sK%syllä!" @@ -355,7 +380,7 @@ msgstr "%sK%syllä!" #. 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"! -#: lib/bridgedb/templates/options.html:154 +#: lib/bridgedb/templates/options.html:151 #, python-format msgid "%sG%set Bridges" msgstr "%sH%sae sillat"

1 0

[bridgedb/master] Update English (en_GB) translations.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 9a78d44b5807874b7298149115b16fdd5426f8af Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 19 23:31:37 2015 +0000 Update English (en_GB) translations. * THANKS to Andi Chandler, Richard Shaylor, and ronnietse. --- lib/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po | 387 +++++++++++++++++++---- 1 file changed, 334 insertions(+), 53 deletions(-) diff --git a/lib/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po index 589b1ed..9399e46 100644 --- a/lib/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po @@ -1,17 +1,18 @@ # Translations template for BridgeDB. -# Copyright (C) 2013 ORGANIZATION +# Copyright (C) 2015 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Translators: -# richardshaylor <rshaylor(a)me.com>, 2014 +# Andi Chandler <andi(a)gowling.com>, 2014-2015 +# Richard Shaylor <rshaylor(a)me.com>, 2014 +# ronnietse <tseronnie(a)ymail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2014-01-21 22:00+0000\n" -"Last-Translator: richardshaylor <rshaylor(a)me.com>\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2015-02-03 03:24+0000\n" +"PO-Revision-Date: 2015-03-19 14:19+0000\n" +"Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,82 +21,362 @@ msgstr "" "Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/bridgedb/templates/base.html:33 +#. 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" +#: lib/bridgedb/HTTPServer.py:122 +msgid "Sorry! Something went wrong with your request." +msgstr "Sorry! Something went wrong with your request." + +#: lib/bridgedb/strings.py:18 +msgid "[This is an automated message; please do not reply.]" +msgstr "[This is an automated message; please do not reply.]" + +#: lib/bridgedb/strings.py:20 +msgid "Here are your bridges:" +msgstr "Here are your bridges:" + +#: lib/bridgedb/strings.py:22 +#, 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 "You have exceeded the rate limit. Please slow down! The minimum time between\nemails is %s hours. All further emails during this time period will be ignored." + +#: lib/bridgedb/strings.py:25 +msgid "" +"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" +msgstr "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" + +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 +msgid "Welcome to BridgeDB!" +msgstr "Welcome to BridgeDB!" + +#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". +#: lib/bridgedb/strings.py:30 +msgid "Currently supported transport TYPEs:" +msgstr "Currently supported transport TYPEs:" + +#: lib/bridgedb/strings.py:31 +#, python-format +msgid "Hey, %s!" +msgstr "Hey, %s!" + +#: lib/bridgedb/strings.py:32 +msgid "Hello, friend!" +msgstr "Hello, friend!" + +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +msgid "Public Keys" +msgstr "Public Keys" + +#. 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." +#: lib/bridgedb/strings.py:37 +#, python-format +msgid "" +"This email was generated with rainbows, unicorns, and sparkles\n" +"for %s on %s at %s." +msgstr "This email was generated with rainbows, unicorns, and sparkles\nfor %s on %s at %s." + +#. 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". +#: lib/bridgedb/strings.py:47 +#, 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 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\nwhich can help obfuscate your connections to the Tor Network, making it more\ndifficult for anyone watching your internet traffic to determine that you are\nusing Tor.\n" + +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: lib/bridgedb/strings.py:54 +msgid "" +"Some bridges with IPv6 addresses are also available, though some Pluggable\n" +"Transports aren't IPv6 compatible.\n" +"\n" +msgstr "Some bridges with IPv6 addresses are also available, though some Pluggable\nTransports aren't IPv6 compatible.\n\n" + +#. 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. +#: lib/bridgedb/strings.py:63 +#, 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 "Additionally, BridgeDB has plenty of plain old vanilla bridges %s without any\nPluggable Transports %s which maybe doesn't sound as cool, but they can still\nhelp to circumvent internet censorship in many cases.\n" + +#: lib/bridgedb/strings.py:76 msgid "What are bridges?" msgstr "What are bridges?" -#: lib/bridgedb/templates/base.html:34 +#: lib/bridgedb/strings.py:77 #, python-format -msgid "" -"%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "%s Bridge relays %s are Tor relays that help you circumvent censorship." +msgid "%s Bridges %s are Tor relays that help you circumvent censorship." +msgstr "%s Bridges %s are Tor relays that help you circumvent censorship." -#: lib/bridgedb/templates/base.html:39 +#: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" msgstr "I need an alternative way of getting bridges!" -#: lib/bridgedb/templates/base.html:40 +#: lib/bridgedb/strings.py:83 #, python-format msgid "" -"Another way to find public bridge addresses is to send an email (from a %s " -"or a %s address) to %s with the line 'get bridges' by itself in the body of " -"the mail." -msgstr "Another way to find public bridge addresses is to send an email (from a %s or a %s address) to %s with the line 'get bridges' by itself in the body of the mail." +"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 "Another way to get bridges is to send an email to %s. Please note that you must\nsend the email using an address from one of the following email providers:\n%s, %s or %s." -#: lib/bridgedb/templates/base.html:48 +#: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" msgstr "My bridges don't work! I need help!" -#: lib/bridgedb/templates/base.html:49 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:92 #, python-format +msgid "If your Tor doesn't work, you should email %s." +msgstr "If your Tor doesn't work, you should email %s." + +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:96 msgid "" -"If your Tor doesn't work, you should email %s. Try including as much info " -"about your case as you can, including the list of bridges you used, the " -"bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "If your Tor doesn't work, you should email %s. Try including as much info about your case as you can, including the list of bridges you used, the bundle filename/version you used, the messages that Tor gave out, etc." +"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 "Try including as much info about your case as you can, including the list of\nbridges and Pluggable Transports you tried to use, your Tor Browser version,\nand any messages which Tor gave out, etc." + +#: lib/bridgedb/strings.py:103 +msgid "Here are your bridge lines:" +msgstr "Here are your bridge lines:" + +#: lib/bridgedb/strings.py:104 +msgid "Get Bridges!" +msgstr "Get Bridges!" + +#: lib/bridgedb/strings.py:108 +msgid "Please select options for bridge type:" +msgstr "Please select options for bridge type:" + +#: lib/bridgedb/strings.py:109 +msgid "Do you need IPv6 addresses?" +msgstr "Do you need IPv6 addresses?" + +#: lib/bridgedb/strings.py:110 +#, python-format +msgid "Do you need a %s?" +msgstr "Do you need a %s?" + +#: lib/bridgedb/strings.py:114 +msgid "Your browser is not displaying images properly." +msgstr "Your browser is not displaying images properly." + +#: lib/bridgedb/strings.py:115 +msgid "Enter the characters from the image above..." +msgstr "Enter the characters from the image above..." + +#: lib/bridgedb/strings.py:119 +msgid "How to start using your bridges" +msgstr "How to start using your bridges" -#: lib/bridgedb/templates/bridges.html:10 +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 +#, python-format +msgid "" +"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" +"Browser download page %s to start Tor Browser." +msgstr "To enter bridges into Tor Browser, follow the instructions on the %s Tor\nBrowser download page %s to start Tor Browser." + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:125 +msgid "" +"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" +"the wizard until it asks:" +msgstr "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\nthe wizard until it asks:" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:129 msgid "" -"To use the above lines, go to Vidalia's Network settings page, and click " -"\"My ISP blocks connections to the Tor network\". Then add each bridge " -"address one at a time." -msgstr "To use the above lines, go to Vidalia's Network settings page, and click \"My ISP blocks connections to the Tor network\". Then add each bridge address one at a time." +"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" +"to the Tor network?" +msgstr "Does your Internet Service Provider (ISP) block or otherwise censor connections\nto the Tor network?" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:133 +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 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\npaste the bridge lines into the text input box. Finally, click 'Connect', and\nyou should be good to go! If you experience trouble, try clicking the 'Help'\nbutton in the 'Tor Network Settings' wizard for further assistance." + +#: lib/bridgedb/strings.py:141 +msgid "Displays this message." +msgstr "Displays this message." + +#. 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. +#: lib/bridgedb/strings.py:145 +msgid "Request vanilla bridges." +msgstr "Request vanilla bridges." + +#: lib/bridgedb/strings.py:146 +msgid "Request IPv6 bridges." +msgstr "Request IPv6 bridges." + +#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". +#: lib/bridgedb/strings.py:148 +msgid "Request a Pluggable Transport by TYPE." +msgstr "Request a Pluggable Transport by TYPE." + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: lib/bridgedb/strings.py:151 +msgid "Get a copy of BridgeDB's public GnuPG key." +msgstr "Get a copy of BridgeDB's public GnuPG key." + +#: lib/bridgedb/templates/base.html:89 +msgid "Report a Bug" +msgstr "Report a Bug" + +#: lib/bridgedb/templates/base.html:92 +msgid "Source Code" +msgstr "Source Code" + +#: lib/bridgedb/templates/base.html:95 +msgid "Changelog" +msgstr "Changelog" + +#: lib/bridgedb/templates/base.html:98 +msgid "Contact" +msgstr "Contact" + +#: lib/bridgedb/templates/bridges.html:81 +msgid "Select All" +msgstr "Select All" + +#: lib/bridgedb/templates/bridges.html:87 +msgid "Show QRCode" +msgstr "Show QRCode" -#: lib/bridgedb/templates/bridges.html:13 -msgid "No bridges currently available" -msgstr "No bridges currently available" +#: lib/bridgedb/templates/bridges.html:100 +msgid "QRCode for your bridge lines" +msgstr "QRCode for your bridge lines" -#: lib/bridgedb/templates/captcha.html:6 -msgid "Upgrade your browser to Firefox" -msgstr "Upgrade your browser to Firefox" +#. 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!". :) +#: lib/bridgedb/templates/bridges.html:115 +#: lib/bridgedb/templates/bridges.html:175 +msgid "Uh oh, spaghettios!" +msgstr "Uh oh, spaghettios!" -#: lib/bridgedb/templates/captcha.html:8 -msgid "Type the two words" -msgstr "Type the two words" +#: lib/bridgedb/templates/bridges.html:116 +msgid "It seems there was an error getting your QRCode." +msgstr "It seems there was an error getting your QRCode." -#: lib/bridgedb/templates/index.html:6 -msgid "Step 1" -msgstr "Step 1" +#: lib/bridgedb/templates/bridges.html:121 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy your bridge lines onto mobile and other devices." + +#: lib/bridgedb/templates/bridges.html:181 +msgid "There currently aren't any bridges available..." +msgstr "There are no bridges available currently..." + +#: lib/bridgedb/templates/bridges.html:182 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "Perhaps you should try %s going back %s and choosing a different bridge type!" -#: lib/bridgedb/templates/index.html:8 +#: lib/bridgedb/templates/index.html:11 #, python-format -msgid "Get %s Tor Browser Bundle %s" -msgstr "Get %s Tor Browser Bundle %s" +msgid "Step %s1%s" +msgstr "Step %s1%s" #: lib/bridgedb/templates/index.html:13 -msgid "Step 2" -msgstr "Step 2" +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Download %s Tor Browser %s" + +#: lib/bridgedb/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Step %s2%s" -#: lib/bridgedb/templates/index.html:15 +#: lib/bridgedb/templates/index.html:27 #, python-format msgid "Get %s bridges %s" msgstr "Get %s bridges %s" -#: lib/bridgedb/templates/index.html:19 -msgid "Step 3" -msgstr "Step 3" +#: lib/bridgedb/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Step %s3%s" + +#: lib/bridgedb/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "Now %s add the bridges to Tor Browser %s" + +#. 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.) +#: lib/bridgedb/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "%sJ%sust give me bridges!" + +#: lib/bridgedb/templates/options.html:52 +msgid "Advanced Options" +msgstr "Advanced Options" + +#: lib/bridgedb/templates/options.html:88 +msgid "No" +msgstr "No" + +#: lib/bridgedb/templates/options.html:89 +msgid "none" +msgstr "none" + +#. 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." +#: lib/bridgedb/templates/options.html:127 +#, python-format +msgid "%sY%ses!" +msgstr "%sY%ses!" -#: lib/bridgedb/templates/index.html:21 +#. 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"! +#: lib/bridgedb/templates/options.html:151 #, python-format -msgid "Now %s add the bridges to Tor %s" -msgstr "Now %s add the bridges to Tor %s" +msgid "%sG%set Bridges" +msgstr "%sG%set Bridges"

1 0

[bridgedb/master] Update French (fr_CA) translations.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 7bf60fe53484168088db637158ce5b14f4d494c7 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Mar 20 01:01:13 2015 +0000 Update French (fr_CA) translations. * THANKS to Lunar, mehditaileb, Onizuka, and yahoe.001. --- lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po | 64 +++++++++++++++-------- 1 file changed, 43 insertions(+), 21 deletions(-) diff --git a/lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po index 23d7226..740cfe3 100644 --- a/lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po @@ -1,20 +1,19 @@ # Translations template for BridgeDB. -# Copyright (C) 2014 'The Tor Project, Inc.' +# Copyright (C) 2015 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Isis <isis(a)torproject.org>, 2014 # Lunar <lunar(a)torproject.org>, 2013 # mehditaileb <mehditaileb(a)liberte-info.net>, 2011 # Onizuka, 2013 -# yahoe.001, 2014 +# yahoe.001, 2014-2015 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: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-07-26 02:00+0000\n" -"Last-Translator: Isis <isis(a)torproject.org>\n" +"POT-Creation-Date: 2015-02-03 03:24+0000\n" +"PO-Revision-Date: 2015-02-14 13:41+0000\n" +"Last-Translator: yahoe.001\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +33,7 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:121 +#: lib/bridgedb/HTTPServer.py:122 msgid "Sorry! Something went wrong with your request." msgstr "Désolé! Quelque chose a mal tourné avec votre requête." @@ -111,7 +110,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "Des ponts avec des adresses IPv6 sont aussi disponibles, bien que des transports\nenfichables ne soient pas compatibles avec IPv6.\n\n" +msgstr "Des ponts avec des adresses IPv6 sont aussi proposés, bien que certains transports\nenfichables ne soient pas compatibles avec IPv6.\n\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -146,7 +145,7 @@ 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 "Une autre façon d'obtenir des ponts est d'envoyer un courriel à %s. Veuillez prendre\nnote que vous devez utiliser une adresse d'un des fournisseurs de courriel suivants :\n%s, %s ou %s." +msgstr "Une autre façon d'obtenir des ponts est d'envoyer un courriel à %s. Veuillez prendre\nnote que vous devez envoyer le courriel en utilisant une adresse d'un des fournisseurs\nde courriel suivants :\n%s, %s ou %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" @@ -170,7 +169,7 @@ msgstr "Essayez d'inclure autant d'infos sur votre cas que possible, incluant la #: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" -msgstr "Voici vos lignes de ponts :" +msgstr "Voici vos lignes de pont :" #: lib/bridgedb/strings.py:104 msgid "Get Bridges!" @@ -214,7 +213,7 @@ msgstr "Pour saisir vos ponts dans le navigateur Tor, suivez les instructions\ns msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" -msgstr "Quand la fenêtre « Paramètres réseau de Tor » s'affiche, cliquez sur « Configurer » et\nsuivez l'assistant jusqu'à ce qu'il demande :" +msgstr "Quand la fenêtre « Paramètres du réseau Tor » s'affiche, cliquez sur « Configurer » et\nsuivez l'assistant jusqu'à ce qu'il demande :" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:129 @@ -230,7 +229,7 @@ msgid "" "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 "Sélectionnez « Oui » et ensuite cliquez sur « Suivant ». Pour configurer vos\nnouveaux ponts, copiez et collez vos lignes de ponts dans la boîte de saisie\nde texte. Enfin cliquez sur « Connecter » et vous devriez avoir fini! Si vous éprouvez\ndes problèmes, essayez de cliquez sur le bouton « Aide » dans l'assistant des\n« Paramètres du réseau Tor » pour un un soutien supplémentaire." +msgstr "Sélectionnez « Oui » et ensuite cliquez sur « Suivant ». Pour configurer vos\nnouveaux ponts, copiez et collez vos lignes de pont dans la boîte de saisie\nde texte. Enfin cliquez sur « Connecter » et vous devriez avoir fini! Si vous éprouvez\ndes problèmes, essayez de cliquez sur le bouton « Aide » dans l'assistant des\n« Paramètres du réseau Tor » pour un un soutien supplémentaire." #: lib/bridgedb/strings.py:141 msgid "Displays this message." @@ -258,15 +257,15 @@ msgstr "Demander un transport enfichable par TYPE." msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Obtenir une copie de la clef GnuPG publique de BridgeDB." -#: lib/bridgedb/templates/base.html:91 +#: lib/bridgedb/templates/base.html:89 msgid "Report a Bug" msgstr "Rapporter un bogue" -#: lib/bridgedb/templates/base.html:93 +#: lib/bridgedb/templates/base.html:92 msgid "Source Code" msgstr "Code source" -#: lib/bridgedb/templates/base.html:96 +#: lib/bridgedb/templates/base.html:95 msgid "Changelog" msgstr "Journal des changements" @@ -274,19 +273,42 @@ msgstr "Journal des changements" msgid "Contact" msgstr "Contact" +#: lib/bridgedb/templates/bridges.html:81 +msgid "Select All" +msgstr "Tout sélectionner" + +#: lib/bridgedb/templates/bridges.html:87 +msgid "Show QRCode" +msgstr "Montrer le code QR" + +#: lib/bridgedb/templates/bridges.html:100 +msgid "QRCode for your bridge lines" +msgstr "Code QR de vos lignes de pont" + #. 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!". :) -#: lib/bridgedb/templates/bridges.html:66 +#: lib/bridgedb/templates/bridges.html:115 +#: lib/bridgedb/templates/bridges.html:175 msgid "Uh oh, spaghettios!" msgstr "Une erreur est survenue!" -#: lib/bridgedb/templates/bridges.html:72 +#: lib/bridgedb/templates/bridges.html:116 +msgid "It seems there was an error getting your QRCode." +msgstr "Il semble avoir eu une erreur de récupération de votre code QR." + +#: lib/bridgedb/templates/bridges.html:121 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "Ce code QR contient vos lignes de pont. Balayez-le avec un lecteur de codes QR pour copier vos lignes de pont sur votre appareil." + +#: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..." -msgstr "Il n'y a présentement aucun pont disponible..." +msgstr "Aucun pont n'est disponible présentement..." -#: lib/bridgedb/templates/bridges.html:73 +#: lib/bridgedb/templates/bridges.html:182 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -347,7 +369,7 @@ msgstr "aucun" #. 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." -#: lib/bridgedb/templates/options.html:130 +#: lib/bridgedb/templates/options.html:127 #, python-format msgid "%sY%ses!" msgstr "%sO%sui!" @@ -355,7 +377,7 @@ msgstr "%sO%sui!" #. 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"! -#: lib/bridgedb/templates/options.html:154 +#: lib/bridgedb/templates/options.html:151 #, python-format msgid "%sG%set Bridges" msgstr "%sO%sbtenir des ponts"

1 0

[bridgedb/master] Update Croatian (hr) translations.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 4c89286ef7344aa5263770f51f934c38ee3ed651 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Mar 20 01:02:56 2015 +0000 Update Croatian (hr) translations. * THANKS to Ana B, Armando Vega, skiddiep, Tomislav Siroglavić, and gogo. --- lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 72 +++++++++++++++-------- 1 file changed, 48 insertions(+), 24 deletions(-) diff --git a/lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po index 99879f3..3d6ccbf 100644 --- a/lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po @@ -1,19 +1,20 @@ # Translations template for BridgeDB. -# Copyright (C) 2014 'The Tor Project, Inc.' +# Copyright (C) 2015 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Isis <isis(a)torproject.org>, 2014 # Ana B, 2013-2014 # Armando Vega <synaan(a)gmail.com>, 2012 +# skiddiep <lyricaltumor(a)gmail.com>, 2014-2015 +# Tomislav Siroglavić <tomsiro(a)gmail.com>, 2014 # gogo <trebelnik2(a)gmail.com>, 2012 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: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-07-26 02:01+0000\n" -"Last-Translator: Isis <isis(a)torproject.org>\n" +"POT-Creation-Date: 2015-02-03 03:24+0000\n" +"PO-Revision-Date: 2015-02-16 12:31+0000\n" +"Last-Translator: skiddiep <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,7 +34,7 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:121 +#: lib/bridgedb/HTTPServer.py:122 msgid "Sorry! Something went wrong with your request." msgstr "Oprostite! Nešto je pošlo po krivu s Vašim zahtjevom." @@ -88,7 +89,7 @@ msgstr "Javni ključevi" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "Ovaj email sastavljen je s dugama, jednorozima i iskricama za %s na %s u %s." +msgstr "Ovaj email je sastavljen s dugama, jednorozima i iskricama\nza %s na %s u %s." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -102,7 +103,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "BridgeDB nudi mostove s različitim %stipovima Pluggable Transports%s\nkoji mogu pomutiti vaše veze s Tor Network, čineći težim\nda itko tko prati vaš internet promet vidi da\nkoristite Tor.\n" +msgstr "BridgeDB nudi mostove s različitim %stipovima Pluggable Transports%s\nkoji mogu pomoći prikriti Vaše veze s Tor mrežom, otežavajući onome tko\nprati Vaš internet promet da vidi da koristite Tor.\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: lib/bridgedb/strings.py:54 @@ -145,7 +146,7 @@ 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 "Još jedan način za dobiti mostove je da pošaljete email na %s. Imajte na umu da morate\nposlati email koristeći adresu jednog od sljedećih email providera:\n%s, %s ili %s." +msgstr "Još jedan način za dobiti mostove je da pošaljete email na %s. Imajte na umu da morate\nposlati email koristeći adresu jednog od sljedećih davatelja email usluge: %s %s ili %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" @@ -190,7 +191,7 @@ msgstr "Trebate li %s?" #: lib/bridgedb/strings.py:114 msgid "Your browser is not displaying images properly." -msgstr "Vaš preglednik ima problema s prikazivanjem slika." +msgstr "Vaš preglednik ne prikazuje slike ispravno." #: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." @@ -198,7 +199,7 @@ msgstr "Unesite znakove sa slike iznad..." #: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" -msgstr "Kako početi koristite vaše mostove" +msgstr "Kako početi koristite Vaše mostove" #. TRANSLATORS: Please DO NOT translate "Tor Browser". #: lib/bridgedb/strings.py:121 @@ -213,14 +214,14 @@ msgstr "Kako bi unijeli mostove u Tor Browser, slijedite upute na %s Tor\nBrowse msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" -msgstr "Kada iskoči prozorčić 'Tor Mrežne Postavke', kliknite 'Konfiguriraj' i slijedite\nčarobnjaka dok ne upita:" +msgstr "Kad iskoči prozorčić 'Tor Mrežne Postavke', kliknite 'Konfiguriraj' i slijedite\nčarobnjaka dok ne upita:" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:129 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" -msgstr "Blokira li vaš Internet Service Provider (ISP) ili ikako cenzurira veze\ns Tor mrežom?" +msgstr "Blokira li vaš Internet Service Provider (ISP - pružatelj internet usluge) ili ikako drugačije cenzurira veze\ns Tor mrežom?" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:133 @@ -249,7 +250,7 @@ msgstr "Zatraži IPv6 mostove." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". #: lib/bridgedb/strings.py:148 msgid "Request a Pluggable Transport by TYPE." -msgstr "Zatraži Pluggable Transport od TYPE." +msgstr "Zatraži Pluggable Transport po TYPE." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". @@ -257,40 +258,63 @@ msgstr "Zatraži Pluggable Transport od TYPE." msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Dobij kopiju BridgeDB javnog GnuPG ključa." -#: lib/bridgedb/templates/base.html:91 +#: lib/bridgedb/templates/base.html:89 msgid "Report a Bug" msgstr "Prijavi Greški" -#: lib/bridgedb/templates/base.html:93 +#: lib/bridgedb/templates/base.html:92 msgid "Source Code" msgstr "Izvorni Kod" -#: lib/bridgedb/templates/base.html:96 +#: lib/bridgedb/templates/base.html:95 msgid "Changelog" -msgstr "Changelog" +msgstr "Zapisnik o promjenama" #: lib/bridgedb/templates/base.html:98 msgid "Contact" msgstr "Kontakt" +#: lib/bridgedb/templates/bridges.html:81 +msgid "Select All" +msgstr "Odaberi Sve" + +#: lib/bridgedb/templates/bridges.html:87 +msgid "Show QRCode" +msgstr "Pokaži QR kod" + +#: lib/bridgedb/templates/bridges.html:100 +msgid "QRCode for your bridge lines" +msgstr "QR kod za Vaše linije mostova" + #. 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!". :) -#: lib/bridgedb/templates/bridges.html:66 +#: lib/bridgedb/templates/bridges.html:115 +#: lib/bridgedb/templates/bridges.html:175 msgid "Uh oh, spaghettios!" msgstr "O ne, greška!" -#: lib/bridgedb/templates/bridges.html:72 +#: lib/bridgedb/templates/bridges.html:116 +msgid "It seems there was an error getting your QRCode." +msgstr "Čini se da je došlo do greške pri dobavljanju Vašeg QR koda." + +#: lib/bridgedb/templates/bridges.html:121 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "Ovaj QRKod sadrži Vaše linije mostova. Skenirajte ga s čitačem QR koda da bi kopirali linije mostova na mobilne i ostale uređaje." + +#: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..." msgstr "Trenutno nema dostupnih mostova..." -#: lib/bridgedb/templates/bridges.html:73 +#: lib/bridgedb/templates/bridges.html:182 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " "type!" -msgstr "Možda se trebate %s vratiti nazad %s i odabrati neki drugi tip mosta!" +msgstr "Možda bi trebali probati %s vratiti se nazad %s i odabrati neki drugi tip mosta!" #: lib/bridgedb/templates/index.html:11 #, python-format @@ -346,7 +370,7 @@ msgstr "ništa" #. 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." -#: lib/bridgedb/templates/options.html:130 +#: lib/bridgedb/templates/options.html:127 #, python-format msgid "%sY%ses!" msgstr "%sD%sa!" @@ -354,7 +378,7 @@ msgstr "%sD%sa!" #. 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"! -#: lib/bridgedb/templates/options.html:154 +#: lib/bridgedb/templates/options.html:151 #, python-format msgid "%sG%set Bridges" msgstr "%sD%sobij Bridges"

1 0

[bridgedb/master] Update French (fr) translations.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 51ff2e038f3276323379c0214b1d427fe7ef114f Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Mar 20 00:59:02 2015 +0000 Update French (fr) translations. * THANKS to apaddlingduck, fayçal fatihi, Boubou, Cryptie, Frisson Reynald, hpatte, Lucas Leroy, Lunar, Onizuka, and mehditaileb. --- lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 61 ++++++++++++++++++-------- 1 file changed, 43 insertions(+), 18 deletions(-) diff --git a/lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po index 109c360..58eef87 100644 --- a/lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po @@ -1,13 +1,15 @@ # Translations template for BridgeDB. -# Copyright (C) 2014 'The Tor Project, Inc.' +# Copyright (C) 2015 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Isis <isis(a)torproject.org>, 2014 # apaddlingduck, 2014 -# fayçal fatihi <ofaycal.geo.x(a)gmail.com>, 2014 +# Boubou <cece31840(a)gmail.com>, 2015 +# Cryptie <cryptie(a)fsfe.org>, 2014 +# fayçal fatihi, 2014 # Frisson Reynald <frissonreynald(a)yahoo.fr>, 2014 # hpatte <hadrien.44(a)gmail.com>, 2014 +# Lucas Leroy <lerlucas(a)rocketmail.com>, 2014 # Lunar <lunar(a)torproject.org>, 2013 # Onizuka, 2013 # mehditaileb <mehditaileb(a)liberte-info.net>, 2011 @@ -19,9 +21,9 @@ 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: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-07-26 01:59+0000\n" -"Last-Translator: Isis <isis(a)torproject.org>\n" +"POT-Creation-Date: 2015-02-03 03:24+0000\n" +"PO-Revision-Date: 2015-02-14 18:31+0000\n" +"Last-Translator: Boubou <cece31840(a)gmail.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -41,9 +43,9 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:121 +#: lib/bridgedb/HTTPServer.py:122 msgid "Sorry! Something went wrong with your request." -msgstr "Désolé ! Quelque chose n'allait pas avec votre demande." +msgstr "Désolé ! Un problème est survenu suite à votre requête." #: lib/bridgedb/strings.py:18 msgid "[This is an automated message; please do not reply.]" @@ -82,7 +84,7 @@ msgstr "Salut, %s!" #: lib/bridgedb/strings.py:32 msgid "Hello, friend!" -msgstr "Bonjour, ami !" +msgstr "Bonjour, l'ami !" #: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 msgid "Public Keys" @@ -96,7 +98,7 @@ msgstr "Les clés publiques" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "Ce courriel a été généré avec des arcs en ciel, des licornes, et des étincelles pour %s sur %s à%s." +msgstr "Ce courriel a été généré avec des arcs en ciel, des licornes, et des étincelles pour %s, %s à %s." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -265,15 +267,15 @@ msgstr "Demander un Pluggable Transport par TYPE." msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Obtenir une copie de la clef GnuPG publique BridgeDB." -#: lib/bridgedb/templates/base.html:91 +#: lib/bridgedb/templates/base.html:89 msgid "Report a Bug" msgstr "Faire un rapport de Bug" -#: lib/bridgedb/templates/base.html:93 +#: lib/bridgedb/templates/base.html:92 msgid "Source Code" msgstr "Le code source" -#: lib/bridgedb/templates/base.html:96 +#: lib/bridgedb/templates/base.html:95 msgid "Changelog" msgstr "Changelog" @@ -281,19 +283,42 @@ msgstr "Changelog" msgid "Contact" msgstr "Contact" +#: lib/bridgedb/templates/bridges.html:81 +msgid "Select All" +msgstr "Tout sélectionner" + +#: lib/bridgedb/templates/bridges.html:87 +msgid "Show QRCode" +msgstr "Montrer QRCode" + +#: lib/bridgedb/templates/bridges.html:100 +msgid "QRCode for your bridge lines" +msgstr "QRCode pour vos bridge lines" + #. 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!". :) -#: lib/bridgedb/templates/bridges.html:66 +#: lib/bridgedb/templates/bridges.html:115 +#: lib/bridgedb/templates/bridges.html:175 msgid "Uh oh, spaghettios!" msgstr "Houlà!" -#: lib/bridgedb/templates/bridges.html:72 +#: lib/bridgedb/templates/bridges.html:116 +msgid "It seems there was an error getting your QRCode." +msgstr "Il semblerait qu'il y ai eu une erreur en chargeant votre QRCode." + +#: lib/bridgedb/templates/bridges.html:121 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "Ce QRCode contient vos bridge lines. Scannez le avec un lecteur de QRCode pour copier vos bridge lines dans votre mobile ou d'autres appareils." + +#: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..." msgstr "Il n'y a pas de bridges disponibles en ce moment…" -#: lib/bridgedb/templates/bridges.html:73 +#: lib/bridgedb/templates/bridges.html:182 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -354,7 +379,7 @@ msgstr "aucun" #. 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." -#: lib/bridgedb/templates/options.html:130 +#: lib/bridgedb/templates/options.html:127 #, python-format msgid "%sY%ses!" msgstr "%sO%sui!" @@ -362,7 +387,7 @@ msgstr "%sO%sui!" #. 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"! -#: lib/bridgedb/templates/options.html:154 +#: lib/bridgedb/templates/options.html:151 #, python-format msgid "%sG%set Bridges" msgstr "%sO%sbtenir Bridges"

1 0

[bridgedb/master] Add skip coverage pragma to import exception line in bridgedb.crypto.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 9b55ea2ad538fdc10e62cfda2e1b736a18d41568 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Feb 22 11:02:41 2015 +0000 Add skip coverage pragma to import exception line in bridgedb.crypto. --- lib/bridgedb/crypto.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/crypto.py b/lib/bridgedb/crypto.py index 63e532b..724d649 100644 --- a/lib/bridgedb/crypto.py +++ b/lib/bridgedb/crypto.py @@ -72,7 +72,7 @@ DIGESTMOD = hashlib.sha1 NEW_BUFFER_INTERFACE = False try: io.BytesIO(buffer('test')) -except TypeError: +except TypeError: # pragma: no cover logging.warn( "This Python version is too old! "\ "It doesn't support new-style buffer interfaces: "\

1 0

[bridgedb/master] Add NO_DISTRIBUTION_COUNTRIES option to config.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit a92cf111584c296a5e589f7412bf5ea27bae5dcd Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Aug 12 03:16:47 2014 +0000 Add NO_DISTRIBUTION_COUNTRIES option to config. This option contains a list of CCs for which, if a bridge is detected to be running on an IP address in one of these countries, it will not be distributed to clients. * FIXES part of #12843. --- bridgedb.conf | 11 ++++++++++- lib/bridgedb/configure.py | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bridgedb.conf b/bridgedb.conf index 1fe61ab..f8b126c 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -15,11 +15,15 @@ # for details. # :copyright: (c) 2007-2014 The Tor Project, Inc. # (c) 2007-2014, all sentient entities within the AUTHORS file -# :version: 0.0.10 +# :version: 0.0.13 #=============================================================================== # # CHANGELOG: # ~~~~~~~~~~ +# Changes in version 0.0.13 - 2015-02-20 +# * ADD NO_DISTRIBUTION_COUNRIES option for refusing to distribute bridges +# whose primary ORAddress is geolocated to any of some certain countries. +# # Changes in version 0.0.12 - 2015-02-06 # * ADD a dictionary of TASKS to be run and the intervals at which they # should be repeated. @@ -187,6 +191,11 @@ COLLECT_TIMESTAMPS = False # Filename that contains blocked bridges list. Comment out to disable. #COUNTRY_BLOCK_FILE = "blocked-bridges" +# (list of two-character, uppercased strings for country codes) Don't +# distribute bridges whose main ORPort IP address is geolocated to any of the +# following countries: +NO_DISTRIBUTION_COUNTRIES = ['IR', 'SY'] + # A list of filenames that contain IP addresses (one per line) of proxies. # All IP-based distributors that see an incoming connection from a proxy # will treat them specially. diff --git a/lib/bridgedb/configure.py b/lib/bridgedb/configure.py index e67a252..83b53d6 100644 --- a/lib/bridgedb/configure.py +++ b/lib/bridgedb/configure.py @@ -111,7 +111,7 @@ def loadConfig(configFile=None, configCls=None): else: setattr(config, attr, os.path.abspath(os.path.expanduser(setting))) - for attr in ["FORCE_PORTS", "FORCE_FLAGS"]: + for attr in ["FORCE_PORTS", "FORCE_FLAGS", "NO_DISTRIBUTION_COUNTRIES"]: setting = getattr(config, attr, []) # Default to empty lists setattr(config, attr, setting)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits March 2015