July 2014 - tor-commits - lists.torproject.org

[bridgedb/develop] Add CHANGELOG entry for #12635.
by isis＠torproject.org 25 Jul '14

25 Jul '14

commit b3b3d877f8d3356145b5131c2c7e1d452f86398f Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jul 26 02:48:29 2014 +0000 Add CHANGELOG entry for #12635. --- CHANGELOG | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 2d4d027..94cef31 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -17,6 +17,12 @@ Changes in version 0.2.3 - 2014-07-XXX demonstrate the issue and test for future regressions. The issue pointed out has also been fixed. + * FIXES #12635 https://bugs.torproject.org/12635 + The links in BridgeDB's email and HTTPS distributor UIs have been + changed from the obsolete + https://www.torproject.org/projects/torbrowser.html.en#downloads-beta + to https://www.torproject.org/projects/torbrowser.html. + And include the following general changes: * UPDATE translation: Chinese - Taiwan (zh_TW)

1 0

[bridgedb/develop] Fix TBB download links to remove obsolete "#downloads-beta" anchor.
by isis＠torproject.org 25 Jul '14

25 Jul '14

commit 27ffc9c2da75154799e1db7ac76d7733439f08f1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jul 26 02:36:49 2014 +0000 Fix TBB download links to remove obsolete "#downloads-beta" anchor. * FIXES #12635. --- lib/bridgedb/strings.py | 2 +- lib/bridgedb/templates/bridges.html | 2 +- lib/bridgedb/templates/howto.html | 2 +- lib/bridgedb/templates/index.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/strings.py b/lib/bridgedb/strings.py index d223f63..8da9994 100644 --- a/lib/bridgedb/strings.py +++ b/lib/bridgedb/strings.py @@ -212,5 +212,5 @@ BridgeDB can provide bridges with several types of Pluggable Transports[0], EMAIL_REFERENCE_LINKS = { "WELCOME0": "[0]: https://www.torproject.org/docs/pluggable-transports.html", - "HOWTO_TBB1": "[0]: https://www.torproject.org/projects/torbrowser.html.en#downloads-beta", + "HOWTO_TBB1": "[0]: https://www.torproject.org/projects/torbrowser.html", } diff --git a/lib/bridgedb/templates/bridges.html b/lib/bridgedb/templates/bridges.html index 1d7bb65..7e44513 100644 --- a/lib/bridgedb/templates/bridges.html +++ b/lib/bridgedb/templates/bridges.html @@ -32,7 +32,7 @@ ${answer} <div class="container-fluid" id="howto" style="align-content: left;"> ${_(strings.HOWTO_TBB[1]) % \ - ("""<a href="https://www.torproject.org/projects/torbrowser.html.en#downloads-beta" + ("""<a href="https://www.torproject.org/projects/torbrowser.html" target="_blank">""", """</a>""")} ${_(strings.HOWTO_TBB[2])} diff --git a/lib/bridgedb/templates/howto.html b/lib/bridgedb/templates/howto.html index 705d774..b10f1b2 100644 --- a/lib/bridgedb/templates/howto.html +++ b/lib/bridgedb/templates/howto.html @@ -17,7 +17,7 @@ <div class="container-fluid" id="howto" style="align-content: left;"> ${_(strings.HOWTO_TBB[1]) % \ - ("""<a href="https://www.torproject.org/projects/torbrowser.html.en#downloads-beta" + ("""<a href="https://www.torproject.org/projects/torbrowser.html" target="_blank">""", """</a>""")} ${_(strings.HOWTO_TBB[2])} diff --git a/lib/bridgedb/templates/index.html b/lib/bridgedb/templates/index.html index 09ef237..469b27a 100644 --- a/lib/bridgedb/templates/index.html +++ b/lib/bridgedb/templates/index.html @@ -11,7 +11,7 @@ ${_("Step %s1%s") % ("""""", """""")} ${_("Download %s Tor Browser %s") % \ - ("""<a href="https://www.torproject.org/projects/torbrowser.html.en#downloads-beta" + ("""<a href="https://www.torproject.org/projects/torbrowser.html" target="_blank" accesskey="1">""", """</a>""")}

1 0

[bridgedb/develop] Merge branch 'fix/12635-tbb-dl-links' into develop
by isis＠torproject.org 25 Jul '14

25 Jul '14

commit c0701916570b0e1c7fd314c41a45b69f71846d14 Merge: b185241 27ffc9c Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jul 26 02:45:03 2014 +0000 Merge branch 'fix/12635-tbb-dl-links' into develop lib/bridgedb/strings.py | 2 +- lib/bridgedb/templates/bridges.html | 2 +- lib/bridgedb/templates/howto.html | 2 +- lib/bridgedb/templates/index.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

1 0

[bridgedb/develop] Add CHANGELOG entry for #11139.
by isis＠torproject.org 25 Jul '14

25 Jul '14

commit 548c7a237113b2e827588f834d9ad44a9430a200 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jul 26 02:28:06 2014 +0000 Add CHANGELOG entry for #11139. --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index b1d340f..2d4d027 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -8,6 +8,9 @@ Changes in version 0.2.3 - 2014-07-XXX configurable options to fuzzy match and block addresses which are similar enough to those in the blacklist. + * FIXES #11139 https://bugs.torproject.org/11139 + You can now email BridgeDB from Riseup email addresses! + * FIXES #12147 https://bugs.torproject.org/12147 An additional issue with BridgeDB's code for scheduling actions was identified by Robert Ransom, who also provided a unittest to

1 0

[bridgedb/develop] Add Romanian (ro) translations.
by isis＠torproject.org 25 Jul '14

25 Jul '14

commit b1852416ed50e30939bb765f586000c1b5bf4588 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jul 26 02:28:56 2014 +0000 Add Romanian (ro) translations. --- lib/bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po | 359 ++++++++++++++++++++++++++ 1 file changed, 359 insertions(+) diff --git a/lib/bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po new file mode 100644 index 0000000..3a7b63c --- /dev/null +++ b/lib/bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po @@ -0,0 +1,359 @@ +# Translations template for BridgeDB. +# Copyright (C) 2014 'The Tor Project, Inc.' +# This file is distributed under the same license as the BridgeDB project. +# +# Translators: +# Adda.17 <adrianatrifoi(a)gmail.com>, 2013 +# isus <isus(a)openmailbox.org>, 2014 +# laura berindei <lauraagavriloae(a)yahoo.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-13 19:40+0000\n" +"Last-Translator: isus <isus(a)openmailbox.org>\n" +"Language-Team: Romanian (http://www.transifex.com/projects/p/torproject/language/ro/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: ro\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" + +#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in +#. any string (regardless of capitalization and/or punctuation): +#. "BridgeDB" +#. "pluggable transport" +#. "pluggable transports" +#. "obfs2" +#. "obfs3" +#. "scramblesuit" +#. "fteproxy" +#. "Tor" +#. "Tor Browser" +#: lib/bridgedb/HTTPServer.py:121 +msgid "Sorry! Something went wrong with your request." +msgstr "Ne cerem scuze ! Ceva a funcţionat prost !" + +#: lib/bridgedb/strings.py:18 +msgid "[This is an automated message; please do not reply.]" +msgstr "[ Acesta este un mesaj automat ; va rugam nu răspundeţi ]" + +#: lib/bridgedb/strings.py:20 +msgid "Here are your bridges:" +msgstr "Acestea sînt punțile pentru dvs:" + +#: 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 "Ați depășit rata limită. Încetiniți vă rog! Timpul minim între\nemailuri este %s ore. Toate emailurile în acest interval vor fi ignorate." + +#: lib/bridgedb/strings.py:25 +msgid "" +"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" +msgstr "COMMANDs: (combină COMMANDs pentru a specifica mai multe opțiuni simultan)" + +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 +msgid "Welcome to BridgeDB!" +msgstr "Bine aţi venit la BridgeDB!" + +#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". +#: lib/bridgedb/strings.py:30 +msgid "Currently supported transport TYPEs:" +msgstr "TYPEs transport suportate curent:" + +#: lib/bridgedb/strings.py:31 +#, python-format +msgid "Hey, %s!" +msgstr "Buna , %s!" + +#: lib/bridgedb/strings.py:32 +msgid "Hello, friend!" +msgstr "Buna , prietene !" + +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +msgid "Public Keys" +msgstr "Chei publice" + +#. 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 "Acest email a fost generat cu curcubee, inorogi și scîntei pentru %s în %s la %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 poate oferi punți cu cîteva %stypes de Pluggable Transports%s,\nce pot obfusca conexiunile dvs către Tor Network, făcînd mai dificilă determinarea traficului Tor pentru oricine vă urmărește traficul de internet.\n\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 "Unele punți cu adrese IPv6 sînt disponibile, deși unele Pluggable\nTransports nu sînt compatibile cu IPv5.\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 "În plus, BridgeDB are multe punți simple %s fără nici o\nPluggable Transport %s ce poate nu pare așa cool, dar care pot\nde asemenea să ocolească cenzura internet în multe cazuri.\n\n" + +#: lib/bridgedb/strings.py:76 +msgid "What are bridges?" +msgstr "Ce sunt punțile? " + +#: lib/bridgedb/strings.py:77 +#, python-format +msgid "%s Bridges %s are Tor relays that help you circumvent censorship." +msgstr "%s punți %s sînt Tor relays care vă ajută să ocoliți cenzura." + +#: lib/bridgedb/strings.py:82 +msgid "I need an alternative way of getting bridges!" +msgstr "Am nevoie de o cale alternativă de a obține punțile !" + +#: lib/bridgedb/strings.py:83 +#, python-format +msgid "" +"Another way to get bridges is to send an email to %s. Please note that you must\n" +"send the email using an address from one of the following email providers:\n" +"%s, %s or %s." +msgstr "Alt mod de a obține punție este să trimiteți un email la %s. Remarcați că trebuie să trimiteți un email de la unul din următorii privederi::\n%s, %s or %s." + +#: lib/bridgedb/strings.py:90 +msgid "My bridges don't work! I need help!" +msgstr "Punțile mele nu funcționează! Am nevoie de ajutor!" + +#. 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 "Daca Tor nu funcţionează trimiteţi un mesaj la %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 "" +"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 "Încercați să includeți cît mai multe informații despre cazul dvs pe cît puteți, includeți lista de punți și Pluggable Transports pe care ați încercat să le folosiți, versiunea de Tor Browser și orice alt mesaj dat de Tor, etc." + +#: lib/bridgedb/strings.py:103 +msgid "Here are your bridge lines:" +msgstr "Acestea sînt liniile de punți:" + +#: lib/bridgedb/strings.py:104 +msgid "Get Bridges!" +msgstr "Ia punți!" + +#: lib/bridgedb/strings.py:108 +msgid "Please select options for bridge type:" +msgstr "Alegeți opțiunile pentru tipul de punte:" + +#: lib/bridgedb/strings.py:109 +msgid "Do you need IPv6 addresses?" +msgstr "Aveți nevoie de adrese IPv6?" + +#: lib/bridgedb/strings.py:110 +#, python-format +msgid "Do you need a %s?" +msgstr "Aveți nevoie de %s?" + +#: lib/bridgedb/strings.py:114 +msgid "Your browser is not displaying images properly." +msgstr "Browserul nu afișează imaginile corect." + +#: lib/bridgedb/strings.py:115 +msgid "Enter the characters from the image above..." +msgstr "Introduceți caracterele din imaginea de mai sus..." + +#: lib/bridgedb/strings.py:119 +msgid "How to start using your bridges" +msgstr "Cum să începeți să folosiți punțile" + +#. 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 "Pentru a introduce în Tor Browser, urmați instrucțiunile de la %s Tor Browser download page %s pentru a porni 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 "Cînd apare dialogul 'Tor Network Settings', clic 'Configure' și urmați vrăjitorul pînă cînd vă cere:" + +#. 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 "Internet Service Providerul (ISP) dvs blochează sau cenzurează conexiunile către rețeaua Tor?" + +#. 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 "Alegeți 'Yes' și apoi clic 'Next'. Pentru a configura noile punți, copiați și colați liniile cu punțile în căsuța de text. În final, clic 'Connect' și totul e gata! Dacă aveți probleme, clic pe 'Help' din vrăjitorul 'Tor Network Settings'." + +#: lib/bridgedb/strings.py:141 +msgid "Displays this message." +msgstr "Afișează acest mesaj." + +#. 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 "Cere punți simple." + +#: lib/bridgedb/strings.py:146 +msgid "Request IPv6 bridges." +msgstr "Cere punți IPv6." + +#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". +#: lib/bridgedb/strings.py:148 +msgid "Request a Pluggable Transport by TYPE." +msgstr "Cereți un Pluggable Transport după 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 "Obțineți o copie a cheii GnuPG publice a BridgeDB." + +#: lib/bridgedb/templates/base.html:91 +msgid "Report a Bug" +msgstr "Raporați un bug" + +#: lib/bridgedb/templates/base.html:93 +msgid "Source Code" +msgstr "Cod sursă" + +#: lib/bridgedb/templates/base.html:96 +msgid "Changelog" +msgstr "Schimbări" + +#: lib/bridgedb/templates/base.html:98 +msgid "Contact" +msgstr "Contact" + +#. 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 +msgid "Uh oh, spaghettios!" +msgstr "O, spagettios!" + +#: lib/bridgedb/templates/bridges.html:72 +msgid "There currently aren't any bridges available..." +msgstr "Acum nu sînt punți disponibile..." + +#: lib/bridgedb/templates/bridges.html:73 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "Poate ar trebui să încercați %s înapoi %s și să alegeți un alt tip de punte!" + +#: lib/bridgedb/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "Pas %s1%s" + +#: lib/bridgedb/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Descarcă %s Tor Browser %s" + +#: lib/bridgedb/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Pas %s2%s" + +#: lib/bridgedb/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "Ia %s punți %s" + +#: lib/bridgedb/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Pas %s3%s" + +#: lib/bridgedb/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "Acum %s adăugați punțile la 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 "%sD%soar dă-mi punțle!" + +#: lib/bridgedb/templates/options.html:52 +msgid "Advanced Options" +msgstr "Opțiuni avansate" + +#: lib/bridgedb/templates/options.html:88 +msgid "No" +msgstr "Nu" + +#: lib/bridgedb/templates/options.html:89 +msgid "none" +msgstr "nimic" + +#. 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 +#, python-format +msgid "%sY%ses!" +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 +#, python-format +msgid "%sG%set Bridges" +msgstr "%sI%sa punți"

1 0

[bridgedb/develop] Fix twisted.python.versions.Version import; upstream moved the class.
by isis＠torproject.org 25 Jul '14

25 Jul '14

commit c87a047cd7138f9317479431ff4d74cb99fc427a Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jul 26 01:25:33 2014 +0000 Fix twisted.python.versions.Version import; upstream moved the class. --- lib/bridgedb/txrecaptcha.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/txrecaptcha.py b/lib/bridgedb/txrecaptcha.py index 2185112..779e00e 100644 --- a/lib/bridgedb/txrecaptcha.py +++ b/lib/bridgedb/txrecaptcha.py @@ -20,7 +20,7 @@ from twisted.internet import defer from twisted.internet import protocol from twisted.internet import reactor from twisted.python import failure -from twisted.python.util import Version +from twisted.python.versions import Version from twisted.web import client from twisted.web.http_headers import Headers from twisted.web.iweb import IBodyProducer

1 0

[bridgedb/develop] Rewrite several sections of README.
by isis＠torproject.org 25 Jul '14

25 Jul '14

commit f20779b57b9729a15ce7aba85711a06f9efa6f45 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Mar 29 07:50:48 2014 +0000 Rewrite several sections of README. --- README | 59 +++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 47 insertions(+), 12 deletions(-) diff --git a/README b/README index 8d372de..2a2fa81 100644 --- a/README +++ b/README @@ -160,20 +160,39 @@ the ```HTTPS_CERT_FILE``` option, and a private key where ```HTTPS_KEY_FILE``` points to. The defaults are 'cert' and 'privkey.pem', respectively. #### CAPTCHAs -To enable Captchas on the webserver interface, set these options in -bridgedb.conf: + +BridgeDB has two ways to use CAPTCHAs on webpages. The first uses reCaptcha_, +an external Google service (this requires an account with them), which +BridgeDB fetches the CAPTCHAs images from for each incoming request from a +client. The second method uses a local cache of pre-made CAPTCHAs, created by +scripting Gimp using gimp-captcha_. The latter cannot easily be run on +headless server, unfortunately, because Gimp requires an X server to be +installed. + +.. _reCaptcha: https://www.google.com/recaptcha +.. gimp-capthca: https://github.com/isislovecruft/gimp-captcha + +##### reCaptcha +To enable fetching CAPTCHAs from the reCaptcha API server, set these options +in bridgedb.conf: RECAPTCHA_ENABLED RECAPTCHA_PUB_KEY RECAPTCHA_SEC_KEY -A [recaptcha.net](https://www.google.com/recaptcha) account is required. +##### gimp-captcha +To enable using a local cache of CAPTCHAs, set the following options:: + + GIMP_CAPTCHA_ENABLED + GIMP_CAPTCHA_DIR + GIMP_CAPTCHA_HMAC_KEYFILE + GIMP_CAPTCHA_RSA_KEYFILE #### GnuPG email signing -Add these two options to your bridgedb.conf: +Add these two options to your bridgedb.conf:: - EMAIL_GPG_SIGNING_ENABLED - EMAIL_GPG_SIGNING_KEY + EMAIL_GPG_SIGNING_ENABLED + EMAIL_GPG_SIGNING_KEY The former may be either True or False, and the latter must point to the ascii-armored private key file. The keyfile must not be passphrase protected. @@ -207,14 +226,25 @@ Enter the following commands at the ```sqlite>``` prompt: To run BridgeDB, simply make any necessary changes to bridgedb.conf, and do: ```bridgedb```. -When you have new lists of bridges, replace the old files and do: +And remember that all files/directories in ```bridgedb.conf``` are assumed +relative to the runtime directory. By default, BridgeDB uses the current +working directory; you can, however specify an a different runtime directory:: - bridgedb --reload + bridgedb -r /srv/bridges.torproject.org/run Make sure that the files and directories referred to in bridgedb.conf exist. However, many of them, if not found, will be touched on disk so that attempts to read/write from/to them will not raise excessive errors. +When you have new lists of bridges from the Bridge Authority, replace the old +files and do:: + + bridgedb --reload + +Or just give it a SIGHUP:: + + kill -s SIGHUP `cat .../run/bridgedb.pid` + #### To extract bucket files of all unallocated bridges: Edit the configuration file value ```FILE_BUCKETS``` according to your needs. For example, the following is a possible configuration: @@ -229,13 +259,18 @@ the same pool and the third one similarly 3 bridges. These files can then be handed out to trusted parties via mail or fed to other distribution mechanisms such as Twitter. +To dump all buckets to their files, send BridgeDB a ```SIGUSR1``` signal by +doing:: + + kill -s SIGUSR1 `cat .../run/bridgedb.pid` + #### To use with HTTPS: Just connect to the appropriate port. -#### To use with email: -Any mail sent to the email port with a destination username as defined by the -EMAIL_USERNAME configuration option (default is 'bridge', e.g. bridges@...) -and sent from a yahoo or gmail address (by default, configured with the +#### To use with email: Any mail sent to the email port with a destination +username as defined by the EMAIL_USERNAME configuration option (default is +'bridge', e.g. bridges@...) and sent from an ```(a)riseup.net```, +```(a)gmail.com```, or ```(a)yahoo.com``` address (by default, configured with the EMAIL_DOMAINS option). ### Support

1 0

[bridgedb/develop] Add @riseup.net to EMAIL_DOMAIN[S|_RULES|_MAP] settings.
by isis＠torproject.org 25 Jul '14

25 Jul '14

commit 03f006a2a7662d03ffced6fc8e90ae711edefcbc Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Mar 29 07:51:32 2014 +0000 Add @riseup.net to EMAIL_DOMAIN[S|_RULES|_MAP] settings. --- bridgedb.conf | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/bridgedb.conf b/bridgedb.conf index 9ea28cb..28c98b4 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -295,11 +295,16 @@ EMAIL_SMTP_PORT = 25 EMAIL_USERNAME = "bridges" # Canonical versions of domains that we will reply to. -EMAIL_DOMAINS = ["gmail.com", "yahoo.com"] +EMAIL_DOMAINS = ["gmail.com", "yahoo.com", "riseup.net"] # Map from unofficial domain to canonical domain. -EMAIL_DOMAIN_MAP = {"mail.google.com": "gmail.com", - "googlemail.com": "gmail.com"} +EMAIL_DOMAIN_MAP = { + "mail.google.com": "gmail.com", + "googlemail.com": "gmail.com", + "mail.riseup.net": "riseup.net", + "fulvetta.riseup.net": "riseup.net", + "mx1.riseup.net": "riseup.net", +} # Map from canonical domain to list of options for that domain. Recognized # options are: @@ -308,8 +313,11 @@ EMAIL_DOMAIN_MAP = {"mail.google.com": "gmail.com", # with the value "pass", then drop the message. # # Note that unrecognized options are ignored; be sure to spell them right! -EMAIL_DOMAIN_RULES = {'gmail.com': ["ignore_dots", "dkim"], - 'yahoo.com': ["dkim"]} +EMAIL_DOMAIN_RULES = { + 'gmail.com': ["ignore_dots", "dkim"], + 'yahoo.com': ["dkim"], + 'riseup.net': ["ignore_dots"] +} # A mapping of whitelisted email addresses to GnuPG key fingerprints: EMAIL_WHITELIST = {}

1 0

[bridgedb/develop] Update translations for email provider strings by hand.
by isis＠torproject.org 25 Jul '14

25 Jul '14

commit e798a4495c1f422b45ce5df71f1db6115d681ae6 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jul 26 01:32:22 2014 +0000 Update translations for email provider strings by hand. Since it's a single "%s, " that was added to the string for email providers, I've update every single english string and all of their translations by hand. This will save us losing those translations (otherwise they'd all fallback to English!), but Transifex and the automation scripts are probably going to get mad at me that I updated the strings myself. Fuck Transifex. --- lib/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po | 9 +++++---- lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 9 +++++---- lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 9 +++++---- lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 9 +++++---- lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 9 +++++---- lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po | 9 +++++---- lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po | 9 +++++---- lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 9 +++++---- lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po | 9 +++++---- lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 9 +++++---- lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po | 9 +++++---- lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 9 +++++---- lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po | 9 +++++---- lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po | 9 +++++---- lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po | 9 +++++---- lib/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po | 9 +++++---- lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 9 +++++---- lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po | 9 +++++---- lib/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po | 9 +++++---- lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 9 +++++---- lib/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po | 9 +++++---- lib/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po | 9 +++++---- lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po | 9 +++++---- lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po | 9 +++++---- lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 9 +++++---- lib/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po | 9 +++++---- 26 files changed, 130 insertions(+), 104 deletions(-) diff --git a/lib/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po index 9fd4f2f..64f5ba8 100644 --- a/lib/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Isis <isis(a)torproject.org>, 2014 # Ahmad Gharbeia <gharbeia(a)gmail.com>, 2014 # allamiro <allamiro(a)gmail.com>, 2011 # Mohamed El-Feky <elfeky.m(a)gmail.com>, 2014 @@ -18,8 +19,8 @@ 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-20 05:50+0000\n" -"Last-Translator: Sherief Alaa <sheriefalaa.w(a)gmail.com>\n" +"PO-Revision-Date: 2014-07-26 02:05+0000\n" +"Last-Translator: Isis <isis(a)torproject.org>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -150,8 +151,8 @@ msgstr "أحتاج إلى وسيلة بديلة للحصول على bridges!" 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 or %s." -msgstr "وكطريقة أخري للحصول علي bridges هو ان ترسل بريد الكتروني إلي %s. يرجى ملاحظة أنه يجب إرسال البريد الإلكتروني باستخدام عنوان من أحد مزودي خدمات البريد الإلكتروني التاليين: %s او %s." +"%s, %s or %s." +msgstr "وكطريقة أخري للحصول علي bridges هو ان ترسل بريد الكتروني إلي %s. يرجى ملاحظة أنه يجب إرسال البريد الإلكتروني باستخدام عنوان من أحد مزودي خدمات البريد الإلكتروني التاليين: %s, %s او %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" diff --git a/lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po index 4143b67..d504945 100644 --- a/lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Isis <isis(a)torproject.org>, 2014 # autofunk78 <villum(a)autofunk.dk>, 2014 # DavidNielsen <gnomeuser(a)gmail.com>, 2014 # OliverMller <theoliver(a)live.co.uk>, 2011 @@ -12,8 +13,8 @@ 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-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-05-21 19:03+0000\n" -"Last-Translator: autofunk78 <villum(a)autofunk.dk>\n" +"PO-Revision-Date: 2014-07-26 19:03+0000\n" +"Last-Translator: Isis <isis(a)torproject.org>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -136,8 +137,8 @@ msgstr "Jeg har brug for en alternativ metode til at få broer på!" 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 or %s." -msgstr "En anden måde at finde broer er at sende en email til %s. Bemærk venligst at du skal\nsende emailen fra en konto hos en af de følgende email udbydere:\n%s eller %s." +"%s, %s or %s." +msgstr "En anden måde at finde broer er at sende en email til %s. Bemærk venligst at du skal\nsende emailen fra en konto hos en af de følgende email udbydere:\n%s, %s eller %s." #: lib/bridgedb/strings.py:79 msgid "My bridges don't work! I need help!" diff --git a/lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po index 5f447f2..9d20817 100644 --- a/lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # 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 # unknwon_anonymous <jackjohnson0001(a)yahoo.com>, 2014 # Locke <locke(a)dena-design.de>, 2011 @@ -13,8 +14,8 @@ 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-02 14:31+0000\n" -"Last-Translator: Tobias Bannert\n" +"PO-Revision-Date: 2014-07-26 02:03+0000\n" +"Last-Translator: Isis <isis(a)torproject.org>\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" @@ -145,8 +146,8 @@ msgstr "Ich brauche einen alternativen Weg, um Brücken zu erhalten!" 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 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 oder %s." +"%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." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" diff --git a/lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po index e20412b..6d2d260 100644 --- a/lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Isis <isis(a)torproject.org>, 2014 # Adrian Pappas <pappasadrian(a)gmail.com>, 2014 # andromeas <andromeas(a)hotmail.com>, 2014 # isv31 <ix4svs(a)gmail.com>, 2014 @@ -15,8 +16,8 @@ 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-06-16 22:10+0000\n" -"Last-Translator: isv31 <ix4svs(a)gmail.com>\n" +"PO-Revision-Date: 2014-07-26 22:10+0000\n" +"Last-Translator: Isis <isis(a)torproject.org>\n" "Language-Team: Greek (http://www.transifex.com/projects/p/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -147,8 +148,8 @@ msgstr "Χρειάζομαι έναν εναλλακτικό τρόπο για 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 or %s." -msgstr "Εναλλακτικά, για να μάθετε γέφυρες, στείλτε email στο %s. Σημείωση: Το email πρέπει να σταλεί χρησιμοποιώντας έναν από τους παρακάτω παρόχους:\n%s ή %s." +"%s, %s or %s." +msgstr "Εναλλακτικά, για να μάθετε γέφυρες, στείλτε email στο %s. Σημείωση: Το email πρέπει να σταλεί χρησιμοποιώντας έναν από τους παρακάτω παρόχους:\n%s, %s ή %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" diff --git a/lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po index 6262ed6..ec057f0 100644 --- a/lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # 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 # NinjaTuna <nort0ngh0st(a)hotmail.com>, 2011 # Noel Torres <envite(a)rolamasao.org>, 2013 @@ -14,8 +15,8 @@ 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-08 23:10+0000\n" -"Last-Translator: Paola Falcon <cacoepy(a)gmail.com>\n" +"PO-Revision-Date: 2014-07-26 23:10+0000\n" +"Last-Translator: Isis <isis(a)torproject.org>\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" @@ -146,8 +147,8 @@ msgstr "¡Necesito un modo alternativo de conseguir puentes!" 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 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 o %s" +"%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" #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" diff --git a/lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po index 3c1c2fc..d3d1193 100644 --- a/lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # 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 @@ -15,8 +16,8 @@ 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-06-25 05:10+0000\n" -"Last-Translator: Mohammad Hossein <desmati(a)gmail.com>\n" +"PO-Revision-Date: 2014-07-26 01:58+0000\n" +"Last-Translator: Isis <isis(a)torproject.org>\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" @@ -147,8 +148,8 @@ msgstr "به یک راه دیگر برای دریافت bridge ها احتیاج 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 or %s." -msgstr "یک راه دیگر برای دریافت پل ها ارسال ایمیل به آدرس %s است. توجه کنید ایمیلی که ارسال می کنید، حتماً از طریق یکی از شرکت های زیر باشد:\n%s یا %s" +"%s, %s or %s." +msgstr "یک راه دیگر برای دریافت پل ها ارسال ایمیل به آدرس %s است. توجه کنید ایمیلی که ارسال می کنید، حتماً از طریق یکی از شرکت های زیر باشد:\n%s, %s یا %s" #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" diff --git a/lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po index e859271..660be76 100644 --- a/lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # 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 # Ossi Kallunki <ossikallunki(a)gmail.com>, 2013 # viljaminojonen <Viljami.Nojonen(a)live.com>, 2014 @@ -12,8 +13,8 @@ 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-19 07:40+0000\n" -"Last-Translator: karvjorm <karvonen.jorma(a)gmail.com>\n" +"PO-Revision-Date: 2014-07-26 01:58+0000\n" +"Last-Translator: Isis <isis(a)torproject.org>\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" @@ -144,8 +145,8 @@ msgstr "Tarvitsen vaihtoehtoisen tavan tavoittaa sillat!" 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 or %s." -msgstr "Toinen tapa siltojen hankkimiseen on lähettää sähköpostia osoitteeseen %s. Huomaa,\nettä sinun on lähetettävä sähköpostiviesti käyttäen yhtä seuraavien sähköpostitarjoajien\nosoitetta:\n%s tai %s." +"%s, %s or %s." +msgstr "Toinen tapa siltojen hankkimiseen on lähettää sähköpostia osoitteeseen %s. Huomaa,\nettä sinun on lähetettävä sähköpostiviesti käyttäen yhtä seuraavien sähköpostitarjoajien\nosoitetta:\n%s, %s tai %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" diff --git a/lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po index 05ff96d..109c360 100644 --- a/lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # 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 # Frisson Reynald <frissonreynald(a)yahoo.fr>, 2014 @@ -19,8 +20,8 @@ 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-02 02:59+0000\n" -"Last-Translator: fayçal fatihi <ofaycal.geo.x(a)gmail.com>\n" +"PO-Revision-Date: 2014-07-26 01:59+0000\n" +"Last-Translator: Isis <isis(a)torproject.org>\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" @@ -151,8 +152,8 @@ msgstr "J'ai besoin d'une alternative pour obtenir des adresses de bridges !" 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 or %s." -msgstr "Une autre alternative pour obtenir bridges est d'envoyer un email à %s. Veuillez noter que vous devez envoyer un email en utilisant une adresse email d'un des fournisseurs d'accès suivant: %s ou %s." +"%s, %s or %s." +msgstr "Une autre alternative pour obtenir bridges est d'envoyer un email à %s. Veuillez noter que vous devez envoyer un email en utilisant une adresse email d'un des fournisseurs d'accès suivant: %s, %s ou %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" diff --git a/lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po index 01a5ee7..23d7226 100644 --- a/lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # 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 @@ -12,8 +13,8 @@ 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-19 17:51+0000\n" -"Last-Translator: yahoe.001\n" +"PO-Revision-Date: 2014-07-26 02:00+0000\n" +"Last-Translator: Isis <isis(a)torproject.org>\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" @@ -144,8 +145,8 @@ msgstr "J'ai besoin d'une alternative pour obtenir des ponts!" 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 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 ou %s." +"%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." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" diff --git a/lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po index af52bb1..99879f3 100644 --- a/lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # 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 # gogo <trebelnik2(a)gmail.com>, 2012 @@ -11,8 +12,8 @@ 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-06-30 13:01+0000\n" -"Last-Translator: Ana B\n" +"PO-Revision-Date: 2014-07-26 02:01+0000\n" +"Last-Translator: Isis <isis(a)torproject.org>\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" @@ -143,8 +144,8 @@ msgstr "Trebam alternativni način dobivanja mostova!" 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 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 ili %s." +"%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." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" diff --git a/lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po index d11c31b..a2c19e4 100644 --- a/lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Isis <isis(a)torproject.org>, 2014 # Blackywantscookies <gaborcika111(a)gmail.com>, 2014 # Cerbo <taiurin(a)gmail.com>, 2014 # vargaviktor <viktor.varga(a)gmail.com>, 2013 @@ -12,8 +13,8 @@ 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-06-24 14:51+0000\n" -"Last-Translator: Blackywantscookies <gaborcika111(a)gmail.com>\n" +"PO-Revision-Date: 2014-07-27 14:51+0000\n" +"Last-Translator: Isis <isis(a)torproject.org>\n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/torproject/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -144,8 +145,8 @@ msgstr "Szükségem van egy alternatív módra a Hidak beszerzéséhez!" 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 or %s." -msgstr "Másik módszer hidak beszerzésére email küldésével lehetséges a %s címre. \nKérem vegye figyelembe azt hogy az email küldéséhez használjon egyet az alábbi email szolgáltatók közül. \n%s vagy %s" +"%s, %s or %s." +msgstr "Másik módszer hidak beszerzésére email küldésével lehetséges a %s címre. \nKérem vegye figyelembe azt hogy az email küldéséhez használjon egyet az alábbi email szolgáltatók közül. \n%s, %s vagy %s" #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" diff --git a/lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po index ba7d480..3fd8817 100644 --- a/lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Isis <isis(a)torproject.org>, 2014 # fetidyoo <tru74368(a)yahoo.com>, 2011 # Francesca Ciceri <madamezou(a)zouish.org>, 2014 # ironbishop <ironbishop(a)fsfe.org>, 2011 @@ -19,8 +20,8 @@ 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-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-05-20 15:51+0000\n" -"Last-Translator: Paolo Stivanin <paolostivanin(a)gmail.com>\n" +"PO-Revision-Date: 2014-07-26 02:01+0000\n" +"Last-Translator: Isis <isis(a)torproject.org>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -143,8 +144,8 @@ msgstr "Mi serve un altro modo per avere dei bridge!" 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 or %s." -msgstr "Un altro modo per ottenere dei bridge è inviare un'email a %s. Nota che devi\ninviare l'email usando un indirizzo tra uno dei seguenti provider di email:\n%s o %s." +"%s, %s or %s." +msgstr "Un altro modo per ottenere dei bridge è inviare un'email a %s. Nota che devi\ninviare l'email usando un indirizzo tra uno dei seguenti provider di email:\n%s, %s o %s." #: lib/bridgedb/strings.py:79 msgid "My bridges don't work! I need help!" diff --git a/lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po index 76232ac..af8fb84 100644 --- a/lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Isis <isis(a)torproject.org>, 2014 # brt <87(a)itokei.info>, 2013 # plazmism <gomidori(a)live.jp>, 2013 # plazmism <gomidori(a)live.jp>, 2014 @@ -12,8 +13,8 @@ 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-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-06-03 15:41+0000\n" -"Last-Translator: plazmism <gomidori(a)live.jp>\n" +"PO-Revision-Date: 2014-07-27 02:02+0000\n" +"Last-Translator: Isis <isis(a)torproject.org>\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -136,8 +137,8 @@ msgstr "ブリッジを得る他の方法が必要です!" 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 or %s." -msgstr "ブリッジを入手する別のやり方は %s までメールを送ることです。以下のメールプロバイダのうちの1つのアドレスを使用してメールを送信しなければならないことにご注意ください: %s または %s" +"%s, %s or %s." +msgstr "ブリッジを入手する別のやり方は %s までメールを送ることです。以下のメールプロバイダのうちの1つのアドレスを使用してメールを送信しなければならないことにご注意ください: %s、%s または %s" #: lib/bridgedb/strings.py:79 msgid "My bridges don't work! I need help!" diff --git a/lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po index 95a26bc..671aef4 100644 --- a/lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Isis <isis(a)torproject.org>, 2014 # Seng Sutha <sutha(a)open.org.kh>, 2014 # Sokhem Khoem <sokhem(a)open.org.kh>, 2014 # Sok Sophea <sksophea(a)gmail.com>, 2014 @@ -12,8 +13,8 @@ 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-06-10 02:50+0000\n" -"Last-Translator: Sokhem Khoem <sokhem(a)open.org.kh>\n" +"PO-Revision-Date: 2014-07-27 02:03+0000\n" +"Last-Translator: Isis <isis(a)torproject.org>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -144,8 +145,8 @@ msgstr "ខ្ញុំត្រូវការវិធីសាស្ត 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 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 or %s." +"%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/strings.py:90 msgid "My bridges don't work! I need help!" diff --git a/lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po index 8650ef5..252e368 100644 --- a/lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Isis <isis(a)torproject.org>, 2014 # Ojārs Balcers <ojars.balcers(a)gmail.com>, 2012 # Ojārs Balcers <ojars.balcers(a)gmail.com>, 2013-2014 msgid "" @@ -10,8 +11,8 @@ 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-06-16 17:01+0000\n" -"Last-Translator: Ojārs Balcers <ojars.balcers(a)gmail.com>\n" +"PO-Revision-Date: 2014-07-26 02:01+0000\n" +"Last-Translator: Isis <isis(a)torproject.org>\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/torproject/language/lv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -142,8 +143,8 @@ msgstr "Man nepieciešams alternatīvs tiltu iegūšanas veids!" 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 or %s." -msgstr "Vēl cits veids kā saņemt tiltu sarakstus ir nosūtīt e-pastu uz %s. Lūdzu, ievērojiet, ka e-pasts jānosūta no norādīto e-pasta pakalpojumu sniedzēju nodrošinātas adreses:\n%s vai %s." +"%s, %s or %s." +msgstr "Vēl cits veids kā saņemt tiltu sarakstus ir nosūtīt e-pastu uz %s. Lūdzu, ievērojiet, ka e-pasts jānosūta no norādīto e-pasta pakalpojumu sniedzēju nodrošinātas adreses:\n%s, %s vai %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" diff --git a/lib/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po index b631bb7..093bfed 100644 --- a/lib/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Isis <isis(a)torproject.org>, 2014 # Allan Nordhøy <comradekingu(a)gmail.com>, 2014 # Harald <haarektrans(a)gmail.com>, 2014 # lateralus, 2013 @@ -12,8 +13,8 @@ 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-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-06-06 21:30+0000\n" -"Last-Translator: Allan Nordhøy <comradekingu(a)gmail.com>\n" +"PO-Revision-Date: 2014-07-26 02:03+0000\n" +"Last-Translator: Isis <isis(a)torproject.org>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -136,8 +137,8 @@ msgstr "Jeg trenger en alternativ måte å få broer på!" 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 or %s." -msgstr "En annen måte å tilknytte seg broer på er å sende en epost til %s. Merk at du må\nsende eposten fra en adresse tilhørende en av følgende epost-tilbydere:\n%s eller %s." +"%s, %s or %s." +msgstr "En annen måte å tilknytte seg broer på er å sende en epost til %s. Merk at du må\nsende eposten fra en adresse tilhørende en av følgende epost-tilbydere:\n%s, %s eller %s." #: lib/bridgedb/strings.py:79 msgid "My bridges don't work! I need help!" diff --git a/lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po index cecc09d..aa534e9 100644 --- a/lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Isis <isis(a)torproject.org>, 2014 # Adriaan Callaerts <adriaan.callaerts(a)gmail.com>, 2013 # Ann Boen <ann.boen(a)gmail.com>, 2014 # erwindelaat <erwin.de.laat(a)cleveridge.org>, 2014 @@ -17,8 +18,8 @@ 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-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-06-02 15:22+0000\n" -"Last-Translator: Ann Boen <ann.boen(a)gmail.com>\n" +"PO-Revision-Date: 2014-07-27 02:02+0000\n" +"Last-Translator: Isis <isis(a)torproject.org>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -141,8 +142,8 @@ msgstr "Ik heb een alternatieve manier nodig om bridges te verkrijgen!" 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 or %s." -msgstr "Een andere manier om bridges te bemachtingen is door een email te sturen naar %s. \nHoudt er rekening mee dat u een email moet sturen door gebruik te maken van een adres van een de volgende providers:\n%s of %s." +"%s, %s or %s." +msgstr "Een andere manier om bridges te bemachtingen is door een email te sturen naar %s. \nHoudt er rekening mee dat u een email moet sturen door gebruik te maken van een adres van een de volgende providers:\n%s, %s of %s." #: lib/bridgedb/strings.py:79 msgid "My bridges don't work! I need help!" diff --git a/lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po index ec21fcb..719a918 100644 --- a/lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Isis <isis(a)torproject.org>, 2014 # Aron <aron.plotnikowski(a)cryptolab.net>, 2014 # Aron <aron.plotnikowski(a)cryptolab.net>, 2013 # JerBen <ayurveda63(a)gmail.com>, 2012 @@ -15,8 +16,8 @@ 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-06-25 10:05+0000\n" -"Last-Translator: Aron <aron.plotnikowski(a)cryptolab.net>\n" +"PO-Revision-Date: 2014-07-26 02:05+0000\n" +"Last-Translator: Isis <isis(a)torproject.org>\n" "Language-Team: Polish (http://www.transifex.com/projects/p/torproject/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -147,8 +148,8 @@ msgstr "Potrzebuję alternatywnego sposobu na pozyskanie mostków!" 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 or %s." -msgstr "Innym sposobem uzyskania bridges jest wysłanie e-maila do %s. Proszę pamiętaj, że musisz \nwysłać e-mail za uzywając adresu z jednego z następujących dostawców usługi email:\n%s lub %s." +"%s, %s or %s." +msgstr "Innym sposobem uzyskania bridges jest wysłanie e-maila do %s. Proszę pamiętaj, że musisz \nwysłać e-mail za uzywając adresu z jednego z następujących dostawców usługi email:\n%s, %s lub %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" diff --git a/lib/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po index 7d63c77..2c00039 100644 --- a/lib/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Isis <isis(a)torproject.org>, 2014 # André Monteiro <andre.monteir(a)gmail.com>, 2014 # kagazz <lourenxo_619(a)hotmail.com>, 2014 # Manuela Silva <manuela.silva(a)sky.com>, 2014 @@ -14,8 +15,8 @@ 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-04 11:20+0000\n" -"Last-Translator: Sérgio Marques <smarquespt(a)gmail.com>\n" +"PO-Revision-Date: 2014-07-26 02:04+0000\n" +"Last-Translator: Isis <isis(a)torproject.org>\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -146,8 +147,8 @@ msgstr "Preciso de uma alternativa para obter pontes!" 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 or %s." -msgstr "Outro método para obter pontes é escrever uma mensagem para %s. Tenha em atenção\nque tem de enviar a mensagem através de um dos seguintes fornecedores de correio:\n%s ou %s." +"%s, %s or %s." +msgstr "Outro método para obter pontes é escrever uma mensagem para %s. Tenha em atenção\nque tem de enviar a mensagem através de um dos seguintes fornecedores de correio:\n%s, %s ou %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" diff --git a/lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po index 6548767..4521e63 100644 --- a/lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Isis <isis(a)torproject.org>, 2014 # Communia <ameaneantie(a)riseup.net>, 2013-2014 # Augustine <evandro(a)geocities.com>, 2013 # Humberto Sartini <humberto(a)hss.blog.br>, 2014 @@ -14,8 +15,8 @@ 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-04 22:50+0000\n" -"Last-Translator: Communia <ameaneantie(a)riseup.net>\n" +"PO-Revision-Date: 2014-07-26 02:05+0000\n" +"Last-Translator: Isis <isis(a)torproject.org>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -146,8 +147,8 @@ msgstr "Preciso de um outro modo de obter pontes!" 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 or %s." -msgstr "Outro modo de obter pontes é enviando um e-mail para %s. Por favor, lembre que você deve enviar o e-mail utilizando um endereço de um dos seguintes provedores de e-mail: \n%s ou %s. " +"%s, %s or %s." +msgstr "Outro modo de obter pontes é enviando um e-mail para %s. Por favor, lembre que você deve enviar o e-mail utilizando um endereço de um dos seguintes provedores de e-mail: \n%s, %s ou %s. " #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" diff --git a/lib/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po index 13b9ab0..96a4dae 100644 --- a/lib/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Isis <isis(a)torproject.org>, 2014 # Evgrafov Denis <stereodenis(a)gmail.com>, 2014 # Eugene, 2013 # foo <im-infamous(a)yandex.ru>, 2014 @@ -15,8 +16,8 @@ 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-05 18:43+0000\n" -"Last-Translator: Vitaliy Grishenko <vitolink(a)gmail.com>\n" +"PO-Revision-Date: 2014-07-26 02:03+0000\n" +"Last-Translator: Isis <isis(a)torproject.org>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -147,8 +148,8 @@ msgstr "Мне нужен альтернативный способ получе 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 or %s." -msgstr "Другим способом получения мостов является отправка электронного письма на адрес %s. Пожалуйста, обратите внимание на то, что вы должны \nотправить электронный запрос с использованием одного из перечисленных сервисов:\n%s или %s." +"%s, %s or %s." +msgstr "Другим способом получения мостов является отправка электронного письма на адрес %s. Пожалуйста, обратите внимание на то, что вы должны \nотправить электронный запрос с использованием одного из перечисленных сервисов:\n%s, %s или %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" diff --git a/lib/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po index 62c7622..1e4eb36 100644 --- a/lib/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Isis <isis(a)torproject.org>, 2014 # Anders Jensen-Urstad <anders(a)unix.se>, 2014 # GabSeb, 2014 # Petomatick <petomatick(a)hotmail.com>, 2011 @@ -13,8 +14,8 @@ 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-06-17 09:50+0000\n" -"Last-Translator: phst <transifex(a)sturman.se>\n" +"PO-Revision-Date: 2014-07-26 02:05+0000\n" +"Last-Translator: Isis <isis(a)torproject.org>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -145,8 +146,8 @@ msgstr "Jag behöver ett alternativt sätt att skaffa bryggor på!" 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 or %s." -msgstr "Ett annat sätt att få nya bryggor är att skicka e-post till %s. Du måste skicka mailet\nfrån en adress hos någon av följande epostleverantörer:\n%s eller %s." +"%s, %s or %s." +msgstr "Ett annat sätt att få nya bryggor är att skicka e-post till %s. Du måste skicka mailet\nfrån en adress hos någon av följande epostleverantörer:\n%s, %s eller %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" diff --git a/lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po index 0605021..afd22d8 100644 --- a/lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Isis <isis(a)torproject.org>, 2014 # eromytsatiffird <driffitastymore(a)gmail.com>, 2014 # Emre <conan(a)operamail.com>, 2013 # erg26 <ergungorler(a)gmail.com>, 2012 @@ -17,8 +18,8 @@ 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-15 06:30+0000\n" -"Last-Translator: zeki <zeki.ozguryazilim(a)gmail.com>\n" +"PO-Revision-Date: 2014-07-26 02:03+0000\n" +"Last-Translator: Isis <isis(a)torproject.org>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -149,8 +150,8 @@ msgstr "Bridges edinmek için başka bir yola ihtiyacım var!" 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 or %s." -msgstr "Köprüleri almanın diğer bir yolu da %s adresine bir e-posta göndermektir.\nLütfen e-postanın aşağıdaki e-posta sağlayıcılardan birinden alınmış bir\nadresten gönderilmesi gerektiğini unutmayın:\n%s veya %s." +"%s, %s or %s." +msgstr "Köprüleri almanın diğer bir yolu da %s adresine bir e-posta göndermektir.\nLütfen e-postanın aşağıdaki e-posta sağlayıcılardan birinden alınmış bir\nadresten gönderilmesi gerektiğini unutmayın:\n%s, %s veya %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" diff --git a/lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po index 502fa97..e7696c8 100644 --- a/lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Isis <isis(a)torproject.org>, 2014 # ghostishev, 2014 # LinuxChata, 2014 # AVATOR <sclub2018(a)yandex.ua>, 2013 @@ -11,8 +12,8 @@ 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-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-05-17 18:12+0000\n" -"Last-Translator: LinuxChata\n" +"PO-Revision-Date: 2014-07-26 02:03+0000\n" +"Last-Translator: Isis <isis(a)torproject.org>\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -135,8 +136,8 @@ msgstr "Мені потрібен альтернативний спосіб от 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 or %s." -msgstr "Ще один спосіб отримати bridges - це відправити лист на адресу %s. Зверніть увагу, що\nВи повинні надіслати лист, використовуючи адресу від одного з наступних постачальників\nпослуг електронної пошти:\n%s або %s." +"%s, %s or %s." +msgstr "Ще один спосіб отримати bridges - це відправити лист на адресу %s. Зверніть увагу, що\nВи повинні надіслати лист, використовуючи адресу від одного з наступних постачальників\nпослуг електронної пошти:\n%s, %s або %s." #: lib/bridgedb/strings.py:79 msgid "My bridges don't work! I need help!" diff --git a/lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po index aa17299..79cd315 100644 --- a/lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Isis <isis(a)torproject.org>, 2014 # Wu Ming Shi, 2013 # Wu Ming Shi, 2013 # Wu Ming Shi, 2013 @@ -16,8 +17,8 @@ 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-20 12:20+0000\n" -"Last-Translator: Wu Ming Shi\n" +"PO-Revision-Date: 2014-07-26 02:02+0000\n" +"Last-Translator: Isis <isis(a)torproject.org>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -148,8 +149,8 @@ msgstr "需要使用其他获取方式获取网桥！" 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 or %s." -msgstr "获得 bridges（网桥）的另一种方法是向 %s 发送一封邮件。注意：您只能使用以下邮件服务商提供的邮件地址发送：%s 或 %s 。" +"%s, %s or %s." +msgstr "获得 bridges（网桥）的另一种方法是向 %s 发送一封邮件。注意：您只能使用以下邮件服务商提供的邮件地址发送：%s， %s 或 %s 。" #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" diff --git a/lib/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po index af5a4bb..9ce852b 100644 --- a/lib/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Isis <isis(a)torproject.org>, 2014 # danfong <danfong.hsieh(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-05 18:43+0000\n" -"Last-Translator: danfong <danfong.hsieh(a)gmail.com>\n" +"PO-Revision-Date: 2014-07-26 02:03+0000\n" +"Last-Translator: Isis <isis(a)torproject.org>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -141,8 +142,8 @@ msgstr "我需要使用其他方式取得橋接!" 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 or %s." -msgstr "取得橋接的另一種方式是發送電子郵件至 %s。請注意，您必須 \n使用來自下列電子郵件提供者之一的位址發送電子郵件: \n%s 或 %s。" +"%s, %s or %s." +msgstr "取得橋接的另一種方式是發送電子郵件至 %s。請注意，您必須 \n使用來自下列電子郵件提供者之一的位址發送電子郵件: \n%s，%s 或 %s。" #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!"

1 0

[bridgedb/develop] Add riseup.net to HTTPS "I need an alternative way of getting bridges!".
by isis＠torproject.org 25 Jul '14

25 Jul '14

commit 07791b83e9b99050214c0b128eae03fd32adc5b8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 16 19:50:29 2014 +0000 Add riseup.net to HTTPS "I need an alternative way of getting bridges!". --- lib/bridgedb/strings.py | 2 +- lib/bridgedb/templates/base.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/strings.py b/lib/bridgedb/strings.py index a631da7..d223f63 100644 --- a/lib/bridgedb/strings.py +++ b/lib/bridgedb/strings.py @@ -83,7 +83,7 @@ OTHER_DISTRIBUTORS = { 1: _("""\ Another way to get bridges is to send an email to %s. Please note that you must send the email using an address from one of the following email providers: -%s or %s."""), +%s, %s or %s."""), } HELP = { diff --git a/lib/bridgedb/templates/base.html b/lib/bridgedb/templates/base.html index 1673c3a..05d6285 100644 --- a/lib/bridgedb/templates/base.html +++ b/lib/bridgedb/templates/base.html @@ -70,6 +70,7 @@ ${next.body(strings, rtl=rtl, lang=lang, **kwargs)} ${_(strings.OTHER_DISTRIBUTORS[1]) % \ ("""<a href="mailto:bridges@torproject.org">bridges(a)torproject.org</a>""", + """<a href="https://riseup.net/">Riseup</a>""", """<a href="https://mail.google.com/">Gmail</a>""", """<a href="https://mail.yahoo.com/">Yahoo</a>""")}

1 0