Unverified Commit fe22faf2 authored by Isis Lovecruft's avatar Isis Lovecruft
Browse files

Merge branch 'fix/11139-riseup_r1' into develop

parents 45213d83 695b5856
......@@ -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 ```@riseup.net```,
```@gmail.com```, or ```@yahoo.com``` address (by default, configured with the
EMAIL_DOMAINS option).
### Support
......
......@@ -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 = {}
......
......@@ -3,6 +3,7 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
# Isis <isis@torproject.org>, 2014
# Ahmad Gharbeia <gharbeia@gmail.com>, 2014
# allamiro <allamiro@gmail.com>, 2011
# Mohamed El-Feky <elfeky.m@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&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\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@gmail.com>\n"
"PO-Revision-Date: 2014-07-26 02:05+0000\n"
"Last-Translator: Isis <isis@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!"
......
......@@ -3,6 +3,7 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
# Isis <isis@torproject.org>, 2014
# autofunk78 <villum@autofunk.dk>, 2014
# DavidNielsen <gnomeuser@gmail.com>, 2014
# OliverMller <theoliver@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&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\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@autofunk.dk>\n"
"PO-Revision-Date: 2014-07-26 19:03+0000\n"
"Last-Translator: Isis <isis@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!"
......
......@@ -3,6 +3,7 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
# Isis <isis@torproject.org>, 2014
# trantor <clucko3@gmail.com>, 2014
# unknwon_anonymous <jackjohnson0001@yahoo.com>, 2014
# Locke <locke@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&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\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@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!"
......
......@@ -3,6 +3,7 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
# Isis <isis@torproject.org>, 2014
# Adrian Pappas <pappasadrian@gmail.com>, 2014
# andromeas <andromeas@hotmail.com>, 2014
# isv31 <ix4svs@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&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\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@gmail.com>\n"
"PO-Revision-Date: 2014-07-26 22:10+0000\n"
"Last-Translator: Isis <isis@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!"
......
......@@ -3,6 +3,7 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
# Isis <isis@torproject.org>, 2014
# dark_yoshi <angelargi@yahoo.es>, 2014
# NinjaTuna <nort0ngh0st@hotmail.com>, 2011
# Noel Torres <envite@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&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\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@gmail.com>\n"
"PO-Revision-Date: 2014-07-26 23:10+0000\n"
"Last-Translator: Isis <isis@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!"
......
......@@ -3,6 +3,7 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
# Isis <isis@torproject.org>, 2014
# arashaalaei <aalaeiarash@gmail.com>, 2011
# signal89 <ali.faraji90@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&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\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@gmail.com>\n"
"PO-Revision-Date: 2014-07-26 01:58+0000\n"
"Last-Translator: Isis <isis@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!"
......
......@@ -3,6 +3,7 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
# Isis <isis@torproject.org>, 2014
# karvjorm <karvonen.jorma@gmail.com>, 2014
# Ossi Kallunki <ossikallunki@gmail.com>, 2013
# viljaminojonen <Viljami.Nojonen@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&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\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@gmail.com>\n"
"PO-Revision-Date: 2014-07-26 01:58+0000\n"
"Last-Translator: Isis <isis@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!"
......
......@@ -3,6 +3,7 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
# Isis <isis@torproject.org>, 2014
# apaddlingduck, 2014
# fayçal fatihi <ofaycal.geo.x@gmail.com>, 2014
# Frisson Reynald <frissonreynald@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&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\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@gmail.com>\n"
"PO-Revision-Date: 2014-07-26 01:59+0000\n"
"Last-Translator: Isis <isis@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!"
......
......@@ -3,6 +3,7 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
# Isis <isis@torproject.org>, 2014
# Lunar <lunar@torproject.org>, 2013
# mehditaileb <mehditaileb@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&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\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@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!"
......
......@@ -3,6 +3,7 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
# Isis <isis@torproject.org>, 2014
# Ana B, 2013-2014
# Armando Vega <synaan@gmail.com>, 2012
# gogo <trebelnik2@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&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\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@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!"
......
......@@ -3,6 +3,7 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
# Isis <isis@torproject.org>, 2014
# Blackywantscookies <gaborcika111@gmail.com>, 2014
# Cerbo <taiurin@gmail.com>, 2014
# vargaviktor <viktor.varga@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&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\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@gmail.com>\n"
"PO-Revision-Date: 2014-07-27 14:51+0000\n"
"Last-Translator: Isis <isis@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!"
......
......@@ -3,6 +3,7 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
# Isis <isis@torproject.org>, 2014
# fetidyoo <tru74368@yahoo.com>, 2011
# Francesca Ciceri <madamezou@zouish.org>, 2014
# ironbishop <ironbishop@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&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\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@gmail.com>\n"
"PO-Revision-Date: 2014-07-26 02:01+0000\n"
"Last-Translator: Isis <isis@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!"
......
......@@ -3,6 +3,7 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
# Isis <isis@torproject.org>, 2014
# brt <87@itokei.info>, 2013
# plazmism <gomidori@live.jp>, 2013
# plazmism <gomidori@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&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\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@live.jp>\n"
"PO-Revision-Date: 2014-07-27 02:02+0000\n"
"Last-Translator: Isis <isis@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!"
......
......@@ -3,6 +3,7 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
# Isis <isis@torproject.org>, 2014
# Seng Sutha <sutha@open.org.kh>, 2014
# Sokhem Khoem <sokhem@open.org.kh>, 2014
# Sok Sophea <sksophea@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&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\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@open.org.kh>\n"
"PO-Revision-Date: 2014-07-27 02:03+0000\n"
"Last-Translator: Isis <isis@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!"
......
......@@ -3,6 +3,7 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
# Isis <isis@torproject.org>, 2014
# Ojārs Balcers <ojars.balcers@gmail.com>, 2012
# Ojārs Balcers <ojars.balcers@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&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\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@gmail.com>\n"
"PO-Revision-Date: 2014-07-26 02:01+0000\n"
"Last-Translator: Isis <isis@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!"
......
......@@ -3,6 +3,7 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
# Isis <isis@torproject.org>, 2014
# Allan Nordhøy <comradekingu@gmail.com>, 2014
# Harald <haarektrans@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&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\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@gmail.com>\n"
"PO-Revision-Date: 2014-07-26 02:03+0000\n"
"Last-Translator: Isis <isis@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!"
......
......@@ -3,6 +3,7 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
# Isis <isis@torproject.org>, 2014
# Adriaan Callaerts <adriaan.callaerts@gmail.com>, 2013
# Ann Boen <ann.boen@gmail.com>, 2014
# erwindelaat <erwin.de.laat@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&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\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@gmail.com>\n"
"PO-Revision-Date: 2014-07-27 02:02+0000\n"
"Last-Translator: Isis <isis@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!"
......