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

[bridgedb/develop] Merge branch 'fix/12091-dkim-dunno' into fix/9874-automate-email-tests
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 862b996d9fdec8f0d2b33be9eab065d4e0abd715 Merge: 6fbe6f0 712f116 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 5 03:07:45 2014 +0000 Merge branch 'fix/12091-dkim-dunno' into fix/9874-automate-email-tests lib/bridgedb/test/test_email_autoresponder.py | 21 ++++++++++--- lib/bridgedb/test/test_email_dkim.py | 39 +++++++++++++++++++++---- 2 files changed, 50 insertions(+), 10 deletions(-)

1 0

[bridgedb/develop] Add timeout to SMTPAutoresponder unittests.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit d5ca5f67d8e78ae0134985f7a0e6f36b6a8be7f0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 5 03:08:06 2014 +0000 Add timeout to SMTPAutoresponder unittests. Some of them were taking a *really* long time on some hosts, particularly these two: - test_SMTPAutoresponder_reply_transport_invalid - test_SMTPAutoresponder_reply_transport_valid --- lib/bridgedb/test/test_email_autoresponder.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/bridgedb/test/test_email_autoresponder.py b/lib/bridgedb/test/test_email_autoresponder.py index 880afa6..3cc802b 100644 --- a/lib/bridgedb/test/test_email_autoresponder.py +++ b/lib/bridgedb/test/test_email_autoresponder.py @@ -290,6 +290,8 @@ a ball of timey-wimey, wibbly-warbly... stuff.""" class SMTPAutoresponderTests(unittest.TestCase): """Unittests for :class:`bridgedb.email.autoresponder.SMTPAutoresponder`.""" + timeout = 10 + def setUp(self): self.config = _createConfig() self.context = _createMailServerContext(self.config)

1 0

[bridgedb/develop] Add unittest for checkDKIM() with two `X-DKIM-Authentication-Results:` headers.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 712f11699ad799e5df9d21fe5e63c8d73652eb05 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 5 03:01:42 2014 +0000 Add unittest for checkDKIM() with two `X-DKIM-Authentication-Results:` headers. * ADD a new unittest, test_checkDKIM_good_dunno(), to test_email_dkim.py, which checks that a received email with two ``X-DKIM-Authentication-Results:`` headers (the first one good, the second ``dunno``) properly returns False. * FIXES #12091. Actually, it doesn't. It just proves that the changes in my `fix/9874-automate-email-tests` branch fix #12091. Either way, it's fixed, these unittests prove it. --- lib/bridgedb/test/test_email_dkim.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/bridgedb/test/test_email_dkim.py b/lib/bridgedb/test/test_email_dkim.py index ee022b0..499a3c1 100644 --- a/lib/bridgedb/test/test_email_dkim.py +++ b/lib/bridgedb/test/test_email_dkim.py @@ -73,3 +73,14 @@ get bridges result = dkim.checkDKIM(message, self.domainRules.get("gmail.com")) self.assertIs(result, False) + + def test_checkDKIM_good_dunno(self): + """A good DKIM verification header, *plus* an + ``X-DKIM-Authentication-Results: dunno`` header should return False. + """ + messageList = self.badMessage.split('\n') + messageList.insert(2, "X-DKIM-Authentication-Results: dunno") + message = self._createMessage('\n'.join(messageList)) + result = dkim.checkDKIM(message, + self.domainRules.get("gmail.com")) + self.assertIs(result, False)

1 0

[bridgedb/develop] Split unittest for SMTPAutoresponder DKIM runChecks().
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit e9aa7bbacfadc700b5fb88548009d669c60c33aa Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 5 02:55:38 2014 +0000 Split unittest for SMTPAutoresponder DKIM runChecks(). We should specifically check that a received email containing a X-DKIM-Authentication-Results: dunno header doesn't successfully pass the domain checks called in SMTPAutoresponder.runChecks(). * CHANGE test_SMTPAutoresponder_runChecks_badDKIM() into test_SMTPAutoresponder_runChecks_DKIM_dunno() and test_SMTPAutoresponder_runChecks_DKIM_bad(). --- lib/bridgedb/test/test_email_autoresponder.py | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/test/test_email_autoresponder.py b/lib/bridgedb/test/test_email_autoresponder.py index ed22a72..880afa6 100644 --- a/lib/bridgedb/test/test_email_autoresponder.py +++ b/lib/bridgedb/test/test_email_autoresponder.py @@ -535,13 +535,26 @@ class SMTPAutoresponderTests(unittest.TestCase): self.responder.incoming.canonicalFromSMTP = smtpFrom self.assertFalse(self.responder.runChecks(emailFrom)) - def test_SMTPAutoresponder_runChecks_badDKIM(self): - """runChecks() should catch emails with bad DKIM headers for canonical - domains which we've configured to check DKIM verification results for. + def test_SMTPAutoresponder_runChecks_DKIM_dunno(self): + """runChecks() should catch emails with bad DKIM headers + (``"X-DKIM-Authentication-Results: dunno"``) for canonical domains + which we're configured to check DKIM verification results for. """ - emailFrom = Address('dkimlikewat(a)gmail.com') + emailFrom = Address('dkimlikedunno(a)gmail.com') header = "X-DKIM-Authentication-Results: dunno" self._getIncomingLines(str(emailFrom)) self.message.lines.insert(3, header) self._setUpResponder() self.assertFalse(self.responder.runChecks(emailFrom)) + + def test_SMTPAutoresponder_runChecks_DKIM_bad(self): + """runChecks() should catch emails with bad DKIM headers + (``"X-DKIM-Authentication-Results: dunno"``) for canonical domains + which we're configured to check DKIM verification results for. + """ + emailFrom = Address('dkimlikewat(a)gmail.com') + header = "X-DKIM-Authentication-Results: wowie zowie there's a sig here" + self._getIncomingLines(str(emailFrom)) + self.message.lines.insert(3, header) + self._setUpResponder() + self.assertFalse(self.responder.runChecks(emailFrom))

1 0

[bridgedb/develop] Add #9874 #12086 #12089 #12090 #12091 and #12147 to CHANGELOG for 0.2.2.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit e7b3d6e7b973ad107aa0779f492b40123e69ed88 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jun 6 17:26:36 2014 +0000 Add #9874 #12086 #12089 #12090 #12091 and #12147 to CHANGELOG for 0.2.2. --- CHANGELOG | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 76fe023..3b07e5b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,82 @@ +Changes in version 0.2.2 - 2014-06-XXX + + * FIXES #9874 https://trac.torproject.org/projects/tor/ticket/9874 + BridgeDB's email and HTTPS distributors were written in a manner + that makes them largely impossible to write unittests for. Since + the recent rewrite of BridgeDB's email distributor server backends + for version 0.2.1, BridgeDB email distributor is now testable and + has near 100% code coverage, see + https://coveralls.io/r/isislovecruft/bridgedb + + * FIXES #12086 https://trac.torproject.org/projects/tor/ticket/12086 + BridgeDB was found to accept incoming emails sent to any email + address whose local part included the word bridges, e.g. emails + sent to 'givemebridges(a)serious.ly' would be responded to as if + they were destined for BridgeDB's real email address. + - BridgeDB now strictly checks that the local part of the email + address that an incoming email was sent to (after removing plus + aliases, i.e. '+es_ES', '+fa', etc.) exactly matches BridgeDB + configured email address username. + - BridgeDB now checks that the domain name portion of the email + address that an incoming email was sent to either matches the + domain name portion of BridgeDB's configured email address, or + is a subdomain of that domain. + + * FIXES #12089 https://trac.torproject.org/projects/tor/ticket/12089 + There has been a bug for quite some time now where BridgeDB could + be used to email arbitrary email addresses (as long as these + addresses were ones which BridgeDB allows, i.e. Gmail or Yahoo + email addresses). This was due to BridgeDB not checking that the + email address used in the SMTP 'MAIL FROM:' command on an incoming + message matched the one used in that email's 'From:' + header. + - BridgeDB now checks that the email addresses in the SMTP 'MAIL + FROM:' and the 'From:' header on that incoming email match, in + addition to the previous checks that the email address' domain + is in the set of allowed domains. + + * FIXES #12090 https://trac.torproject.org/projects/tor/ticket/12090 + BridgeDB has been replying with an empty email. I don't actually + know for sure if this one is fixed. Before deploying version + 0.2.1, the continuous integration tests showed email responses + being correctly generated, and I was also able to receive + correctly formed email responses from BridgeDB on a local testing + instance on my laptop. It appears that this bug occurs only on the + deployment server at ponticum.torproject.org, possibly due to the + outdated Python version in Debian Wheezy. I have not been able to + reproduce this bug on any other machine. + + * FIXES #12091 https://trac.torproject.org/projects/tor/ticket/12091 + BridgeDB wasn't properly ignoring emails whose DKIM signature + verification header read "X-DKIM-Authentication-Results: dunno". + - Bridgedb now marks incoming emails which have a + "X-DKIM-Authentication-Results: dunno" header as invalid and + ignores them. + + * FIXES #12147 https://trac.torproject.org/projects/tor/ticket/12147 + If a user refreshed https://bridges.torproject.org/bridges after + successfully solving a CAPTCHA, BridgeDB would reply with a new + set of bridges for each page refresh. This was due to the use of + `getIterval()` in `IPBasedDistributor.getBridgesForIP()`.The + correct function to use is `getIntervalStart()`. This had been + noted in a "XXX FIXME" comment above the call for quite some time, + however, when the `bridgedb.schedule` (previously called + `bridgedb.Time`) module was revised to support CAPTCHA timeouts + (#11215), the call to `getInterval()` was mistakenly not replaced + with the correct function. + - BridgeDB CAPTCHAs must be solved within 10 minutes. + - Hashring rotation for bridges in BridgeDB HTTPS distributor + occurs every 3 hours. Refreshing the page with bridges on it + will return these same bridges for that time period, and + afterwards redirect back to the CAPTCHA page. + THANKS TO francisco on IRC and arma for reporting the bug. + +And include the following general changes: + * FIXES an issue where, when verifying GnuPG signatures made by + BridgeDB's email distributor, GnuPG would error, saying, "invalid + armor header". + + Changes in version 0.2.1 - 2014-05-16 * FIXES #5463 https://trac.torproject.org/projects/tor/ticket/5463 Emails sent from BridgeDB's email distributor should now be signed.

1 0

[bridgedb/develop] Merge branch 'fix/9874-automate-email-tests' into develop
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 9ba031fc944082e6da6c298bff50c2fcb54f92a7 Merge: e2de6af a78d22c Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jun 6 04:30:23 2014 +0000 Merge branch 'fix/9874-automate-email-tests' into develop .travis.requirements.txt | 9 + .travis.yml | 43 +- doc/sphinx/source/bridgedb.EmailServer.rst | 8 - doc/sphinx/source/bridgedb.email.autoresponder.rst | 8 + doc/sphinx/source/bridgedb.email.dkim.rst | 8 + doc/sphinx/source/bridgedb.email.request.rst | 8 + doc/sphinx/source/bridgedb.email.server.rst | 8 + doc/sphinx/source/bridgedb.email.templates.rst | 8 + doc/sphinx/source/bridgedb.rst | 7 +- doc/sphinx/source/conf.py | 7 +- lib/bridgedb/email/__init__.py | 1 + lib/bridgedb/email/autoresponder.py | 646 +++++++++++++++ lib/bridgedb/email/dkim.py | 55 ++ lib/bridgedb/email/server.py | 734 +++++------------ lib/bridgedb/test/email_helpers.py | 160 ++++ lib/bridgedb/test/test_email_autoresponder.py | 562 +++++++++++++ lib/bridgedb/test/test_email_dkim.py | 86 ++ lib/bridgedb/test/test_email_server.py | 845 +++++++++++--------- lib/bridgedb/test/util.py | 10 + requirements.txt | 4 +- setup.py | 2 +- 21 files changed, 2276 insertions(+), 943 deletions(-)

1 0

[bridgedb/develop] Add translator notes about how to translate "plain-ol'-vanilla bridges".
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 7a8e0cfd30270320c324391e1569967423cab4e0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jun 6 17:44:10 2014 +0000 Add translator notes about how to translate "plain-ol'-vanilla bridges". * FIXES part of #12122. --- lib/bridgedb/strings.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/bridgedb/strings.py b/lib/bridgedb/strings.py index cfd682f..4137621 100644 --- a/lib/bridgedb/strings.py +++ b/lib/bridgedb/strings.py @@ -49,6 +49,10 @@ using Tor.\n\n"""), Some bridges with IPv6 addresses are also available, though some Pluggable Transports aren't IPv6 compatible.\n\n"""), +# 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. 2: _("""\ Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any Pluggable Transports %s which maybe doesn't sound as cool, but they can still @@ -120,6 +124,9 @@ button in the 'Tor Network Settings' wizard for further assistance."""), EMAIL_COMMANDS = { "get help": _("Displays this message."), +# TRANSLATORS: Please try to make it clear that "vanilla" here refers to the +# same non-Pluggable Transport bridges described above as being +# "plain-ol'-vanilla" bridges. "get bridges": _("Request vanilla bridges."), "get ipv6": _("Request IPv6 bridges."), # TRANSLATORS: Please DO NOT translate the word the word "TYPE".

1 0

[bridgedb/develop] Rearrange TRANSLATORS comment in bridges.html template so it gets extracted.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit abf170b5e9f1ce15f7240d854209ce44d5181b6a Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jun 6 17:45:09 2014 +0000 Rearrange TRANSLATORS comment in bridges.html template so it gets extracted. * FIXES #12122. This string wasn't getting extracted to the PO template file, lib/bridgedb/i18n/templates/bridgedb.pot. --- lib/bridgedb/templates/bridges.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/templates/bridges.html b/lib/bridgedb/templates/bridges.html index 1dcb474..1d7bb65 100644 --- a/lib/bridgedb/templates/bridges.html +++ b/lib/bridgedb/templates/bridges.html @@ -58,11 +58,13 @@ ${answer} + ## 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!". :) - ${_("""Uh oh, spaghettios!""")} +${_("""Uh oh, spaghettios!""")} +

1 0

[bridgedb/develop] Re-extract translation PO template strings. Fixes #12122.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 1890058bb73eb22a6a580d5cf0a688a51eb2bb50 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jun 6 17:50:47 2014 +0000 Re-extract translation PO template strings. Fixes #12122. --- lib/bridgedb/i18n/templates/bridgedb.pot | 73 +++++++++++++++++------------- 1 file changed, 42 insertions(+), 31 deletions(-) diff --git a/lib/bridgedb/i18n/templates/bridgedb.pot b/lib/bridgedb/i18n/templates/bridgedb.pot index e3738bd..4d351ac 100644 --- a/lib/bridgedb/i18n/templates/bridgedb.pot +++ b/lib/bridgedb/i18n/templates/bridgedb.pot @@ -6,12 +6,12 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: bridgedb 0.1.6-278-gfe45b79\n" +"Project-Id-Version: bridgedb 0.2.1-81-gabf170b-dirty\n" "Report-Msgid-Bugs-To: " "'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…" "=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" -"POT-Creation-Date: 2014-05-16 18:39+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"POT-Creation-Date: 2014-06-06 17:46+0000\n" +"PO-Revision-Date: 2014-06-06 17:48+0000\n" "Last-Translator: Isis Lovecruft <isis(a)torproject.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -107,7 +107,11 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:52 +#. 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:56 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any" @@ -118,20 +122,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:65 +#: lib/bridgedb/strings.py:69 msgid "What are bridges?" msgstr "" -#: lib/bridgedb/strings.py:66 +#: lib/bridgedb/strings.py:70 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "" -#: lib/bridgedb/strings.py:71 +#: lib/bridgedb/strings.py:75 msgid "I need an alternative way of getting bridges!" msgstr "" -#: lib/bridgedb/strings.py:72 +#: lib/bridgedb/strings.py:76 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you " @@ -140,77 +144,77 @@ msgid "" "%s or %s." msgstr "" -#: lib/bridgedb/strings.py:79 +#: lib/bridgedb/strings.py:83 msgid "My bridges don't work! I need help!" msgstr "" -#: lib/bridgedb/strings.py:80 +#: lib/bridgedb/strings.py:84 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "" -#: lib/bridgedb/strings.py:81 +#: lib/bridgedb/strings.py:85 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 "" -#: lib/bridgedb/strings.py:88 +#: lib/bridgedb/strings.py:92 msgid "Here are your bridge lines:" msgstr "" -#: lib/bridgedb/strings.py:89 +#: lib/bridgedb/strings.py:93 msgid "Get Bridges!" msgstr "" -#: lib/bridgedb/strings.py:93 +#: lib/bridgedb/strings.py:97 msgid "Please select options for bridge type:" msgstr "" -#: lib/bridgedb/strings.py:94 +#: lib/bridgedb/strings.py:98 msgid "Do you need IPv6 addresses?" msgstr "" -#: lib/bridgedb/strings.py:95 +#: lib/bridgedb/strings.py:99 #, python-format msgid "Do you need a %s?" msgstr "" -#: lib/bridgedb/strings.py:99 +#: lib/bridgedb/strings.py:103 msgid "Your browser is not displaying images properly." msgstr "" -#: lib/bridgedb/strings.py:100 +#: lib/bridgedb/strings.py:104 msgid "Enter the characters from the image above..." msgstr "" -#: lib/bridgedb/strings.py:104 +#: lib/bridgedb/strings.py:108 msgid "How to start using your bridges" msgstr "" -#: lib/bridgedb/strings.py:105 +#: lib/bridgedb/strings.py:109 #, 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 "" -#: lib/bridgedb/strings.py:108 +#: lib/bridgedb/strings.py:112 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and " "follow\n" "the wizard until it asks:" msgstr "" -#: lib/bridgedb/strings.py:111 +#: lib/bridgedb/strings.py:115 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor " "connections\n" "to the Tor network?" msgstr "" -#: lib/bridgedb/strings.py:114 +#: lib/bridgedb/strings.py:118 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" @@ -219,24 +223,27 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "" -#: lib/bridgedb/strings.py:122 +#: lib/bridgedb/strings.py:126 msgid "Displays this message." msgstr "" -#: lib/bridgedb/strings.py:123 +#. 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:130 msgid "Request vanilla bridges." msgstr "" -#: lib/bridgedb/strings.py:124 +#: lib/bridgedb/strings.py:131 msgid "Request IPv6 bridges." msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:126 +#: lib/bridgedb/strings.py:133 msgid "Request a Pluggable Transport by TYPE." msgstr "" -#: lib/bridgedb/strings.py:127 +#: lib/bridgedb/strings.py:134 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "" @@ -256,15 +263,19 @@ msgstr "" msgid "Contact" msgstr "" -#: lib/bridgedb/templates/bridges.html:65 +#. 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 "" -#: lib/bridgedb/templates/bridges.html:70 +#: lib/bridgedb/templates/bridges.html:72 msgid "There currently aren't any bridges available..." msgstr "" -#: lib/bridgedb/templates/bridges.html:71 +#: lib/bridgedb/templates/bridges.html:73 #, python-format msgid " Perhaps you should try %s going back %s and choosing a different bridge type!" msgstr ""

1 0

[bridgedb/develop] Update Greek (el) translations.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 6e2e716f5b82cf4557cc2ffe28ad2aaca158b94a Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jun 6 19:48:13 2014 +0000 Update Greek (el) translations. * THANKS to pappasadrian. --- lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po index 84b43e8..d9f041d 100644 --- a/lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po @@ -4,17 +4,18 @@ # # Translators: # Translators: +# pappasadrian <pappasadrian(a)gmail.com>, 2014 # kotkotkot <kotakota(a)gmail.com>, 2013 # kotkotkot <kotakota(a)gmail.com>, 2012 -# mitzie <soldizach(a)gmail.com>, 2013 +# mitzie <zacharias.mitzelos(a)gmail.com>, 2013 # Wasilis <inactive+Wasilis(a)transifex.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2013-07-28 18:20+0000\n" -"Last-Translator: kotkotkot <kotakota(a)gmail.com>\n" +"PO-Revision-Date: 2014-04-30 08:52+0000\n" +"Last-Translator: pappasadrian <pappasadrian(a)gmail.com>\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" @@ -25,7 +26,7 @@ msgstr "" #: lib/bridgedb/templates/base.html:33 msgid "What are bridges?" -msgstr "Τι είναι οι γέφυρες?" +msgstr "Τι είναι οι γέφυρες;" #: lib/bridgedb/templates/base.html:34 #, python-format

1 0