tor-commits
Threads by month
- ----- 2025 -----
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
July 2015
- 18 participants
- 1250 discussions
commit 2ffcf5c9c47b2023b4e42c5889aa8899dc6a01da
Author: Isis Lovecruft <isis(a)torproject.org>
Date: Sat Jul 25 03:24:57 2015 +0000
Update Spanish (es) translations.
* THANKS TO Edward Navarro and Ignacio Rodríguez.
---
bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 35 ++++++++++++++++--------------
1 file changed, 19 insertions(+), 16 deletions(-)
diff --git a/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po
index b681b88..9b41809 100644
--- a/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po
@@ -6,6 +6,8 @@
# dark_yoshi <angelargi(a)yahoo.es>, 2014
# toypurina <biolenta(a)riseup.net>, 2014
# BL <tresemes3(a)gmail.com>, 2014
+# Edward Navarro <enavarro(a)umbrella.co>, 2015
+# Ignacio Rodríguez <ignacio(a)sugarlabs.org>, 2015
# NinjaTuna <nort0ngh0st(a)hotmail.com>, 2011
# Noel Torres <envite(a)rolamasao.org>, 2013
# Paola Falcon <cacoepy(a)gmail.com>, 2014
@@ -16,9 +18,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n"
-"POT-Creation-Date: 2015-02-03 03:24+0000\n"
-"PO-Revision-Date: 2015-02-14 13:50+0000\n"
-"Last-Translator: strel\n"
+"POT-Creation-Date: 2015-03-19 22:13+0000\n"
+"PO-Revision-Date: 2015-07-03 07:21+0000\n"
+"Last-Translator: Ignacio Rodríguez <ignacio(a)sugarlabs.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"
@@ -38,9 +40,9 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:122
+#: lib/bridgedb/HTTPServer.py:107
msgid "Sorry! Something went wrong with your request."
-msgstr "¡Lo siento! Algo fue mal con tu solicitud."
+msgstr "¡Lo sentimos! Algo mal pasó con tu solicitud."
#: lib/bridgedb/strings.py:18
msgid "[This is an automated message; please do not reply.]"
@@ -209,26 +211,27 @@ msgstr "Cómo comenzar a usar tus bridges"
#: 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 "Para introducir bridges (repetidores puente) en el Tor Browser, sigue las\ninstrucciones de la %s página de descarga del Tor Browser %s para iniciarlo."
+"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
+"page %s and then follow the instructions there for downloading and starting\n"
+"Tor Browser."
+msgstr "Para introducir bridges (repetidores puente) en el Navegador Tor, primero vaya\na la %s página de descarga del Navegador Tor %s y luego siga las instrucciones\nallí para descargar e iniciar el Navegador Tor."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:125
+#: lib/bridgedb/strings.py:126
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Cuando el cuadro de 'Configuraciones de red Tor' aparezca, haz clic en 'Configurar'\ny sigue el asistente hasta que pregunte:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:129
+#: lib/bridgedb/strings.py:130
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "¿Su proveedor de Internet (ISP) bloquea o censura de alguna manera las conexiones a la red Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:133
+#: lib/bridgedb/strings.py:134
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"
@@ -236,29 +239,29 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Selecciona 'Sí' y luego haz clic en 'Siguiente'. Para configurar tus nuevos\nbridges, copia y pega las líneas de bridges en el cuadro de texto.\nPor último, haz clic en 'Conectar', ¡y listo!\nSi encuentras problemas, prueba dando clic en el botón 'Ayuda'\nen el asistente de 'Configuraciones de red Tor' para asistencia adicional."
-#: lib/bridgedb/strings.py:141
+#: lib/bridgedb/strings.py:142
msgid "Displays this message."
msgstr "Muestra este mensaje."
#. 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
+#: lib/bridgedb/strings.py:146
msgid "Request vanilla bridges."
msgstr "Solicitar bridges estándar (vanilla)."
-#: lib/bridgedb/strings.py:146
+#: lib/bridgedb/strings.py:147
msgid "Request IPv6 bridges."
msgstr "Solicitar bridges IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:148
+#: lib/bridgedb/strings.py:149
msgid "Request a Pluggable Transport by TYPE."
msgstr "Solicitar un Pluggable Transport por TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:151
+#: lib/bridgedb/strings.py:152
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Obtener una copia de la clave pública GnuPG de BridgeDB."
1
0

25 Jul '15
commit af9646b884c11558f11a4f69ca5a5168a1dd756d
Author: Isis Lovecruft <isis(a)torproject.org>
Date: Sat Jul 25 03:26:18 2015 +0000
Update British English (en_GB) translations.
* THANKS TO Andi Chandler.
---
bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po | 29 ++++++++++++++-------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po
index 9399e46..67d2555 100644
--- a/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po
@@ -10,8 +10,8 @@ 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: 2015-02-03 03:24+0000\n"
-"PO-Revision-Date: 2015-03-19 14:19+0000\n"
+"POT-Creation-Date: 2015-03-19 22:13+0000\n"
+"PO-Revision-Date: 2015-07-07 13:19+0000\n"
"Last-Translator: Andi Chandler <andi(a)gowling.com>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n"
"MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:122
+#: lib/bridgedb/HTTPServer.py:107
msgid "Sorry! Something went wrong with your request."
msgstr "Sorry! Something went wrong with your request."
@@ -203,26 +203,27 @@ msgstr "How to start using your bridges"
#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
-"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
-"Browser download page %s to start Tor Browser."
-msgstr "To enter bridges into Tor Browser, follow the instructions on the %s Tor\nBrowser download page %s to start Tor Browser."
+"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
+"page %s and then follow the instructions there for downloading and starting\n"
+"Tor Browser."
+msgstr "To enter bridges into Tor Browser, first go to the %s Tor Browser download\npage %s and then follow the instructions there for downloading and starting\nTor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:125
+#: lib/bridgedb/strings.py:126
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\nthe wizard until it asks:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:129
+#: lib/bridgedb/strings.py:130
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Does your Internet Service Provider (ISP) block or otherwise censor connections\nto the Tor network?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:133
+#: lib/bridgedb/strings.py:134
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"
@@ -230,29 +231,29 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\npaste the bridge lines into the text input box. Finally, click 'Connect', and\nyou should be good to go! If you experience trouble, try clicking the 'Help'\nbutton in the 'Tor Network Settings' wizard for further assistance."
-#: lib/bridgedb/strings.py:141
+#: lib/bridgedb/strings.py:142
msgid "Displays this message."
msgstr "Displays this message."
#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
#. same non-Pluggable Transport bridges described above as being
#. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:145
+#: lib/bridgedb/strings.py:146
msgid "Request vanilla bridges."
msgstr "Request vanilla bridges."
-#: lib/bridgedb/strings.py:146
+#: lib/bridgedb/strings.py:147
msgid "Request IPv6 bridges."
msgstr "Request IPv6 bridges."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:148
+#: lib/bridgedb/strings.py:149
msgid "Request a Pluggable Transport by TYPE."
msgstr "Request a Pluggable Transport by TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:151
+#: lib/bridgedb/strings.py:152
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Get a copy of BridgeDB's public GnuPG key."
1
0
commit ba8fc2d7b8fc9b5e9ff1ea6bf0a24696f30e887f
Author: Isis Lovecruft <isis(a)torproject.org>
Date: Sat Jul 25 03:23:53 2015 +0000
Update Farsi (fa) translations.
* THANKS TO some awesome anonymous person for helping out.
---
bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po
index 5e9ebc8..0b9b793 100644
--- a/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po
@@ -15,8 +15,8 @@ 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: 2015-02-03 03:24+0000\n"
-"PO-Revision-Date: 2015-02-17 22:11+0000\n"
+"POT-Creation-Date: 2015-03-19 22:13+0000\n"
+"PO-Revision-Date: 2015-06-21 08:26+0000\n"
"Last-Translator: Gilberto\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:122
+#: lib/bridgedb/HTTPServer.py:107
msgid "Sorry! Something went wrong with your request."
msgstr "متاسف هستیم، در رابطه با درخواست شما خطایی رخ داده است."
@@ -208,26 +208,27 @@ msgstr "چگونگی از پلهای خود استفاده کنید"
#: 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 "برای وارد کردن پل ها در Tor Browser, دنبال کنید دستورالعمل را در %s Tor\nBrowser صفحه دانلود %s برای شروع Tor Browser."
+"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
+"page %s and then follow the instructions there for downloading and starting\n"
+"Tor Browser."
+msgstr "برای ورود به پل در مرورگر Tor ، برای اولین بار %s به دانلود مرورگر Tor \nصفحه %s و پس از آن به دنبال دستورالعمل دانلود و استفاده از\nمرورگر Tor بروید."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:125
+#: lib/bridgedb/strings.py:126
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "وقتی که صفحه 'تنظیمات شبکه تور' نمایش داده شد, روی گزینه 'پیکربندی' کلیک کنید و دنبال کنید\nتا زمانی که wizard از شما بپرسد:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:129
+#: lib/bridgedb/strings.py:130
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "آیا شرکت ارایه دهنده اینترنت (ISP) شما بلاک می کند و یا سانسور می کند ارتباطات\nشبکه تور شما را؟"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:133
+#: lib/bridgedb/strings.py:134
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"
@@ -235,29 +236,29 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "'بله' را انتخاب کرده و سپس 'بعدی' را انتخاب کنید. برای پیکربندی پل جدید خود, copy و paste کنید خطوط پل را در متن جعبه ورودی. در نهایت, روی 'اتصال' کلیک کنید,\nراه درستش این است! اگر مشکلی پیش آمد, کلیک کنید روی کلید 'راهنما'\nدر 'تنظیمات شبکه تور' wizard برای اطلاعات بیشتر."
-#: lib/bridgedb/strings.py:141
+#: lib/bridgedb/strings.py:142
msgid "Displays this message."
msgstr "این پیام را نمایش می دهد."
#. 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
+#: lib/bridgedb/strings.py:146
msgid "Request vanilla bridges."
msgstr "درخواست پلهای عادی"
-#: lib/bridgedb/strings.py:146
+#: lib/bridgedb/strings.py:147
msgid "Request IPv6 bridges."
msgstr "درخواست پلهای IPv6"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:148
+#: lib/bridgedb/strings.py:149
msgid "Request a Pluggable Transport by TYPE."
msgstr "درخواست یک روش Transport جایگزین براساس TYPE"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:151
+#: lib/bridgedb/strings.py:152
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "دریافت یک کپی از کلید عمومی BridgeDB"
1
0
commit 61214e2f3f941c3f42f5c8238c9c62c1204b0a66
Author: Isis Lovecruft <isis(a)torproject.org>
Date: Sat Jul 25 03:33:16 2015 +0000
Update Catalan (ca) translations.
* THANKS TO laia_.
---
bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po | 71 +++++++++++++++---------------
1 file changed, 36 insertions(+), 35 deletions(-)
diff --git a/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po
index 1413a31..2be8825 100644
--- a/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po
@@ -8,15 +8,15 @@
# Eloi García i Fargas, 2014
# Humbert <humbert.costas(a)gmail.com>, 2014
# isis <isis(a)torproject.org>, 2015
-# laia_ <laiaadorio(a)gmail.com>, 2014-2015
+# laia_, 2014-2015
# Toni Hermoso Pulido <toniher(a)softcatala.cat>, 2012
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n"
-"POT-Creation-Date: 2015-02-03 03:24+0000\n"
-"PO-Revision-Date: 2015-03-20 19:43+0000\n"
-"Last-Translator: isis <isis(a)torproject.org>\n"
+"POT-Creation-Date: 2015-03-19 22:13+0000\n"
+"PO-Revision-Date: 2015-04-20 18:02+0000\n"
+"Last-Translator: laia_\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -36,13 +36,13 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:122
+#: lib/bridgedb/HTTPServer.py:107
msgid "Sorry! Something went wrong with your request."
-msgstr "Perdoni! Quelcom ha anat malament amb la seva petició."
+msgstr "Quelcom ha anat malament amb la petició."
#: lib/bridgedb/strings.py:18
msgid "[This is an automated message; please do not reply.]"
-msgstr "[Aquest es un missatge automàtic; si us plau, no respongui.]"
+msgstr "[Aquest és un missatge automàtic, no el respongui.]"
#: lib/bridgedb/strings.py:20
msgid "Here are your bridges:"
@@ -53,7 +53,7 @@ msgstr "Els vostres ponts: "
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 "Has superat el límit. Siusplau baixa el ritme! El mínim de temps entre\nels correus és de %s hores. La resta de correus durant aquest període de temps seran ignorats."
+msgstr "Heu superat el límit. El mínim de temps entre\nels correus és de %s hores. La resta de correus durant aquest període de temps seran ignorats."
#: lib/bridgedb/strings.py:25
msgid ""
@@ -73,7 +73,7 @@ msgstr "Actualment suportant transport TYPEs:"
#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
-msgstr "Ei, %s!"
+msgstr "Hola, %s!"
#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
@@ -91,7 +91,7 @@ msgstr "Claus Públiques"
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
-msgstr "Aquest correu va ser creat amb unicorns, arcs de Sant Martí i espurnes\nper %s a %s en %s."
+msgstr "Aquest correu va ser creat amb unicorns, arcs de Sant Martí i espurnes\nper a %s el %s a les %s."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
@@ -105,7 +105,7 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "BridgeDB pot proveïr ponts amb diversos %stypes de Pluggable Transports%s,\nque pot provocar ofuscacions a la teva connexió a Tor Network, fent-ho més difícil per a qualsevol veient el teu tràfic de connexió a internet de determinar que estàs\nusant Tor.\n"
+msgstr "BridgeDB pot proveïr ponts amb diversos %stypes de Pluggable Transports%s,\nque poden provocar ofuscacions a la vostra connexió a Tor Network, fent més difícil determinar que esteu usant Tor a qualsevol que vegi el vostre tràfic de connexió a\ninternet \n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#: lib/bridgedb/strings.py:54
@@ -113,7 +113,7 @@ msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
-msgstr "També hi ha alguns ponts amb adreces IPv6, tot i que alguns Pluggable\nTransports no són compatibles amb IPv6.\n\n"
+msgstr "També hi ha ponts disponibles amb adreces IPv6, tot i que alguns Pluggable\nTransports no són compatibles amb IPv6.\n\n"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
@@ -127,7 +127,7 @@ msgid ""
"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
"help to circumvent internet censorship in many cases.\n"
"\n"
-msgstr "A més, BridgeDB té molts ponts %s estàndard sense \nPluggable Transports %s, que potser no són tan interessants, però que també\npoden ajudar a esquivar la censura d'internet, en molts casos.\n"
+msgstr "A més a més, BridgeDB té molts ponts %s estàndard sense \nPluggable Transports %s, que potser no són tan interessants, però que també\npoden ajudar a esquivar la censura d'internet en molts casos.\n"
#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
@@ -136,11 +136,11 @@ msgstr "Què són els ponts?"
#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Ponts %s són mecanismes Tor que ajuden a esquivar la censura."
+msgstr "%s Ponts %s són repetidors Tor que ajuden a esquivar la censura."
#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
-msgstr "Necessito una manera alternativa d'obtenir ponts"
+msgstr "Em cal una manera alternativa d'obtenir ponts."
#: lib/bridgedb/strings.py:83
#, python-format
@@ -158,7 +158,7 @@ msgstr "No em funcionen els ponts! Ajuda!"
#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
-msgstr "Si el teu Tor no funciona, hauries d'enviar un correu a %s."
+msgstr "Si Tor no us funciona, hauríeu d'enviar un correu a %s."
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
@@ -176,87 +176,88 @@ msgstr "Les vostres línies de ponts:"
#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
-msgstr "Descarrega ponts!"
+msgstr "Descarregueu ponts!"
#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
-msgstr "Si us plau, sel·leccioni les opcions pel tipus de pont:"
+msgstr "Seleccioneu les opcions pel tipus de pont:"
#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
-msgstr "Necessites adreces IPv6?"
+msgstr "Necessiteu adreces IPv6?"
#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
-msgstr "Necessites un %s?"
+msgstr "Necessiteu un %s?"
#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
-msgstr "El seu navegador no està mostrant les imatges correctament."
+msgstr "El navegador no està mostrant les imatges correctament."
#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
-msgstr "Introdueixi els caràcters de la imatge superior..."
+msgstr "Introduïu els caràcters de la imatge superior..."
#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
-msgstr "Per començar a utilitzar els ponts"
+msgstr "Com començar a utilitzar els ponts"
#. 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 "Per introduir ponts al Tor Browser, seguiu les instruccions de la pàgina\nde baixada %s del %s Tor Browser per iniciar el Tor Browser."
+"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
+"page %s and then follow the instructions there for downloading and starting\n"
+"Tor Browser."
+msgstr "Per introduir ponts al Tor Browser, primer cal anar a %s de la pàgina de descàrrega\n%s i després seguir les instruccions per descarregar i iniciar\nel Tor Browser. "
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:125
+#: lib/bridgedb/strings.py:126
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Quan aparegui el diàleg 'Configuració Xarxa Tor', clica 'Configura' i segueix\nl'auxiliar fins que pregunti:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:129
+#: lib/bridgedb/strings.py:130
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "El vostre Proveïdor d'Internet (ISP) bloqueja o censura les connexions\namb la xarxa Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:133
+#: lib/bridgedb/strings.py:134
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 "Seleccioneu 'Sí' i després cliqueu 'Següent'. Per configurar els vostres ponts nous, copieu i\nenganxeu les línies del pont al següent quadre d'entrada de text. Finalment, cliqueu 'Connectar', i ja hauria d'estar a punt! Si teniu problemes, intenteu clicar el botó \nd''Ajuda' a l'auxiliar de 'Configuració Xarxa Tor' per més assistència."
+msgstr "Seleccioneu 'Sí' i després cliqueu 'Següent'. Per configurar els ponts nous, copieu i\nenganxeu les línies del pont al següent quadre d'entrada de text. Finalment, cliqueu 'Connectar', i ja hauria d'estar a punt! Si teniu problemes, intenteu clicar el botó \nd''Ajuda' a l'auxiliar de 'Configuració Xarxa Tor' per més assistència."
-#: lib/bridgedb/strings.py:141
+#: lib/bridgedb/strings.py:142
msgid "Displays this message."
msgstr "Mostra aquest missatge."
#. 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
+#: lib/bridgedb/strings.py:146
msgid "Request vanilla bridges."
msgstr "Demanar ponts estàndard."
-#: lib/bridgedb/strings.py:146
+#: lib/bridgedb/strings.py:147
msgid "Request IPv6 bridges."
msgstr "Demanar ponts IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:148
+#: lib/bridgedb/strings.py:149
msgid "Request a Pluggable Transport by TYPE."
msgstr "Demanar un Pluggable Transport per TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:151
+#: lib/bridgedb/strings.py:152
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Fer una còpia de la clau pública GnuPG del BridgeDB."
1
0
commit 345477946ec96f8a978a4243d9446553e17ed96a
Author: Isis Lovecruft <isis(a)torproject.org>
Date: Sat Jul 25 03:37:46 2015 +0000
Add Serbian (sr) translations.
* THANKS TO obj.petit.a, Ivan Radeljic, and Milenko Doder.
---
bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po | 383 ++++++++++++++++++++++++++++++
1 file changed, 383 insertions(+)
diff --git a/bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..105597e
--- /dev/null
+++ b/bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,383 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2015 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+#
+# Translators:
+# obj.petit.a, 2014
+# Ivan Radeljic <radeljicivan85(a)gmail.com>, 2014-2015
+# Milenko Doder <milenko.doder(a)gmail.com>, 2015
+# obj.petit.a, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n"
+"PO-Revision-Date: 2015-07-10 09:32+0000\n"
+"Last-Translator: Milenko Doder <milenko.doder(a)gmail.com>\n"
+"Language-Team: Serbian (http://www.transifex.com/p/torproject/language/sr/)\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: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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:107
+msgid "Sorry! Something went wrong with your request."
+msgstr "Извините! Нешто се лоше десило са вашим захтевом."
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr "[Ово је аутоматска порука; молимо вас да не одговарате.]"
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr "Ево Ваших премошћивача:"
+
+#: 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 "Достигли сте ваш лимит. Молим, успорите! Минимално време између\nе-поште је %s сати. Сва наредна е-пошта током овог периода биће игнорисана. "
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr "COMMANDs: (комбинујте COMMANDs да одредите вишеструке опције истовремено)"
+
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
+msgid "Welcome to BridgeDB!"
+msgstr "Добродошли у BridgeDB!"
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:30
+msgid "Currently supported transport TYPEs:"
+msgstr "Тренутно подржани transport TYPEs:"
+
+#: lib/bridgedb/strings.py:31
+#, python-format
+msgid "Hey, %s!"
+msgstr "Здраво, %s!"
+
+#: lib/bridgedb/strings.py:32
+msgid "Hello, friend!"
+msgstr "Здраво, пријатељу!"
+
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+msgid "Public Keys"
+msgstr "Јавни кључеви"
+
+#. 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 "Ова е-пошта је направљена са дугама, једнорозима и звездицама\nза %s у %s у %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 може обезбедити мостове са више %s типова Pluggable Transports %s,\nшто може помоћи прикривању ваших конекција са Тор Мрежом да би било коме ко\nпосматра ваш интенет саобраћај било теже да утврди да користите Тор.\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 "Неки мостови са IPv6 адресама су такође доступни, мада неки Pluggable\n\nTransports нису компатибилни са IPv6.\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 "Поред тога, BridgeDB има пуно најобичнијих мостова %s без икаквих\nPluggable Transports %s што можда не звучи толико кул, али они ипак\nу много случајева могу помоћи да се заобиђе интернет цензура.\n"
+
+#: lib/bridgedb/strings.py:76
+msgid "What are bridges?"
+msgstr "Шта су премошћивачи?"
+
+#: lib/bridgedb/strings.py:77
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr "%s Премошћивачи %s су Тор преносници који Вам помажу да заобиђете цензуру."
+
+#: lib/bridgedb/strings.py:82
+msgid "I need an alternative way of getting bridges!"
+msgstr "Потребан ми је алтернативан начин за добијање премошћивача!"
+
+#: 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 "Још један начин добијања мостова је да се пошаље и-мејл на %s. Узмите у обзир да\nморате послате и-мејл користећи адресу једног од следећих и-мејл провајдера.\n%s, %s или %s."
+
+#: lib/bridgedb/strings.py:90
+msgid "My bridges don't work! I need help!"
+msgstr "Моји премошћивачи не раде! Потребна ми је помоћ!"
+
+#. 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 "Ако Ваш Тор не ради, пошаљите електронску пошту %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 "Unesite što više informacija o vašem slučaju, uključujući: spisak\nmostova i priključivih transporta koje ste pokušali da koristite, verziju\nvašeg Tor Brauzera, bilo koju sliku koju vam je Tor izbacio, itd."
+
+#: lib/bridgedb/strings.py:103
+msgid "Here are your bridge lines:"
+msgstr "Evo vaših premošćivača:"
+
+#: lib/bridgedb/strings.py:104
+msgid "Get Bridges!"
+msgstr "Добијте премошћиваче!"
+
+#: lib/bridgedb/strings.py:108
+msgid "Please select options for bridge type:"
+msgstr "Молимо Вас, изаберите опције за врсту премошћивача:"
+
+#: lib/bridgedb/strings.py:109
+msgid "Do you need IPv6 addresses?"
+msgstr "Да ли су Вам потребне IPv6 адресе?"
+
+#: lib/bridgedb/strings.py:110
+#, python-format
+msgid "Do you need a %s?"
+msgstr "Да ли Вам треба %s?"
+
+#: lib/bridgedb/strings.py:114
+msgid "Your browser is not displaying images properly."
+msgstr "Ваш прегледач не приказује слике исправно."
+
+#: lib/bridgedb/strings.py:115
+msgid "Enter the characters from the image above..."
+msgstr "Унесите знакове са слике изнад..."
+
+#: lib/bridgedb/strings.py:119
+msgid "How to start using your bridges"
+msgstr "Како да почнете са коришћењем Ваших премошћивача"
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
+#, python-format
+msgid ""
+"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
+"page %s and then follow the instructions there for downloading and starting\n"
+"Tor Browser."
+msgstr "Da biste uneli mostove u Tor Brauzer, prvo idite na %s Tor Brauzer\ndownload stranicu %s , a onda sledite uputstva za preuzimanje i \nstartovanje Tor Brauzera."
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:126
+msgid ""
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr "Када се 'Подешавања Тор мреже' дијалог појави, кликните 'Конфигуриши' и пратите упутства док не питају:"
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:130
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr "Да ли ваш интернет сервис провајдер (ИСП) блокира или на било који начин цензурише повезивање на Тор мрежу?"
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:134
+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 "Selektujte 'Yes' i onda kliknite na 'Next'. Da biste konfigurisali vaše nove mostove,\niskopirajte i pejstujte premošćivače u polje za unos teksta. Konačno, kliknite na\n'Connect', i spremni ste za polazak! Ako budete imali problema, kliknite na 'Help'\ndugme u 'Tor Network Settings' čarobnjaku da biste dobili dalju pomoć."
+
+#: lib/bridgedb/strings.py:142
+msgid "Displays this message."
+msgstr "Приказује ову слику."
+
+#. 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:146
+msgid "Request vanilla bridges."
+msgstr "Zahtevati vanila mostove."
+
+#: lib/bridgedb/strings.py:147
+msgid "Request IPv6 bridges."
+msgstr "Затражите IPv6 премошћиваче."
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:149
+msgid "Request a Pluggable Transport by TYPE."
+msgstr "Zahtevati Priključivi Transport po TIPU."
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:152
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr "Добијте копију BridgeDB јавног GnuPG кључа."
+
+#: lib/bridgedb/templates/base.html:89
+msgid "Report a Bug"
+msgstr "Пријавите грешку."
+
+#: lib/bridgedb/templates/base.html:92
+msgid "Source Code"
+msgstr "Изворни код"
+
+#: lib/bridgedb/templates/base.html:95
+msgid "Changelog"
+msgstr "Promena loga"
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr "Контакт"
+
+#: lib/bridgedb/templates/bridges.html:81
+msgid "Select All"
+msgstr "Обележи све"
+
+#: lib/bridgedb/templates/bridges.html:87
+msgid "Show QRCode"
+msgstr "Прикажи QRCode"
+
+#: lib/bridgedb/templates/bridges.html:100
+msgid "QRCode for your bridge lines"
+msgstr "QR kod za vaše premošćivače"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:115
+#: lib/bridgedb/templates/bridges.html:175
+msgid "Uh oh, spaghettios!"
+msgstr "Ух, страшно!"
+
+#: lib/bridgedb/templates/bridges.html:116
+msgid "It seems there was an error getting your QRCode."
+msgstr "Došlo je do greške pri nabavljanju vašeg QR koda."
+
+#: lib/bridgedb/templates/bridges.html:121
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "QR kod sadrži vaše premošćivače. Skenirajte ga sa čitačem QR koda da biste iskopirali vaše premošćivače na mobilne kao i druge uređaje."
+
+#: lib/bridgedb/templates/bridges.html:181
+msgid "There currently aren't any bridges available..."
+msgstr "Тренутно нема доступних премошћивача..."
+
+#: lib/bridgedb/templates/bridges.html:182
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Можда бисте требали да покушате %s да се вратите %s и изаберете другу врсту премошћивача!"
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Корак %s1%s"
+
+#: lib/bridgedb/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Преузмите %s Тор прегледач %s"
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Корак %s2%s"
+
+#: lib/bridgedb/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Добијте %s премошћиваче %s"
+
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Корак %s3%s"
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Сада %s додајте премошћиваче у Тор прегледач %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 "%sС%sамо ми дај премошћиваче!"
+
+#: lib/bridgedb/templates/options.html:52
+msgid "Advanced Options"
+msgstr "Напредне опције"
+
+#: lib/bridgedb/templates/options.html:88
+msgid "No"
+msgstr "Не"
+
+#: lib/bridgedb/templates/options.html:89
+msgid "none"
+msgstr "нема"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: lib/bridgedb/templates/options.html:127
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sТ%sо!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: lib/bridgedb/templates/options.html:151
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sД%sобијте премошћиваче"
1
0
commit ac80d7d2e8d81859c4409ab51f5e96c063029074
Merge: 94dd106 abece06
Author: Isis Lovecruft <isis(a)torproject.org>
Date: Sat Jul 25 19:23:51 2015 +0000
Merge branch 'release/0.3.3'
.gitattributes | 2 +-
.gitignore | 4 +-
.pylintrc | 2 +-
.travis.requirements.txt | 2 +-
CHANGELOG | 109 +-
MANIFEST.in | 2 +
Makefile | 10 +-
bridgedb.conf | 48 +-
bridgedb/Bridges.py | 684 +++++++
bridgedb/Bucket.py | 288 +++
bridgedb/Main.py | 507 +++++
bridgedb/Stability.py | 295 +++
bridgedb/Storage.py | 466 +++++
bridgedb/__init__.py | 17 +
bridgedb/_langs.py | 26 +
bridgedb/_version.py | 460 +++++
bridgedb/bridgerequest.py | 242 +++
bridgedb/bridges.py | 1797 +++++++++++++++++
bridgedb/captcha.py | 404 ++++
bridgedb/configure.py | 162 ++
bridgedb/crypto.py | 455 +++++
bridgedb/distribute.py | 282 +++
bridgedb/email/__init__.py | 1 +
bridgedb/email/autoresponder.py | 717 +++++++
bridgedb/email/distributor.py | 230 +++
bridgedb/email/dkim.py | 74 +
bridgedb/email/request.py | 175 ++
bridgedb/email/server.py | 507 +++++
bridgedb/email/templates.py | 200 ++
bridgedb/filters.py | 255 +++
bridgedb/geo.py | 82 +
bridgedb/https/__init__.py | 1 +
bridgedb/https/distributor.py | 336 ++++
bridgedb/https/request.py | 146 ++
bridgedb/https/server.py | 1079 +++++++++++
.../https/templates/assets/css/bootstrap.min.css | 7 +
.../templates/assets/css/font-awesome-ie7.min.css | 384 ++++
.../templates/assets/css/font-awesome.min.css | 403 ++++
bridgedb/https/templates/assets/css/main.css | 441 +++++
bridgedb/https/templates/assets/css/rtl.css | 7 +
.../templates/assets/font/fontawesome-webfont.eot | Bin 0 -> 37405 bytes
.../templates/assets/font/fontawesome-webfont.svg | 399 ++++
.../templates/assets/font/fontawesome-webfont.ttf | Bin 0 -> 79076 bytes
.../templates/assets/font/fontawesome-webfont.woff | Bin 0 -> 43572 bytes
.../https/templates/assets/font/lato-bold.woff | Bin 0 -> 46160 bytes
.../https/templates/assets/font/lato-italic.woff | Bin 0 -> 47168 bytes
.../https/templates/assets/font/lato-regular.woff | Bin 0 -> 46108 bytes
bridgedb/https/templates/assets/js/bridges.js | 83 +
bridgedb/https/templates/assets/tor-roots-blue.svg | 95 +
bridgedb/https/templates/assets/tor.svg | 6 +
bridgedb/https/templates/base.html | 100 +
bridgedb/https/templates/bridges.html | 139 ++
bridgedb/https/templates/captcha.html | 49 +
bridgedb/https/templates/howto.html | 36 +
bridgedb/https/templates/index.html | 43 +
bridgedb/https/templates/options.html | 154 ++
bridgedb/https/templates/robots.txt | 1079 +++++++++++
bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po | 396 ++++
bridgedb/i18n/az/LC_MESSAGES/bridgedb.po | 357 ++++
bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po | 357 ++++
bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po | 387 ++++
bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po | 389 ++++
bridgedb/i18n/cy/LC_MESSAGES/bridgedb.po | 102 +
bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 386 ++++
bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 393 ++++
bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 364 ++++
bridgedb/i18n/en/LC_MESSAGES/bridgedb.po | 433 +++++
bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po | 383 ++++
bridgedb/i18n/en_US/LC_MESSAGES/bridgedb.po | 433 +++++
bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po | 359 ++++
bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 391 ++++
bridgedb/i18n/es_CL/LC_MESSAGES/bridgedb.po | 102 +
bridgedb/i18n/eu/LC_MESSAGES/bridgedb.po | 101 +
bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po | 388 ++++
bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po | 388 ++++
bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 396 ++++
bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po | 385 ++++
bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po | 101 +
bridgedb/i18n/he/LC_MESSAGES/bridgedb.po | 105 +
bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 385 ++++
bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po | 385 ++++
bridgedb/i18n/id/LC_MESSAGES/bridgedb.po | 385 ++++
bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 392 ++++
bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po | 386 ++++
bridgedb/i18n/km/LC_MESSAGES/bridgedb.po | 360 ++++
bridgedb/i18n/kn/LC_MESSAGES/bridgedb.po | 102 +
bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po | 104 +
bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po | 383 ++++
bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po | 101 +
bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po | 102 +
bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po | 387 ++++
bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 392 ++++
bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po | 390 ++++
bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po | 389 ++++
bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 387 ++++
bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po | 387 ++++
bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po | 391 ++++
bridgedb/i18n/si_LK/LC_MESSAGES/bridgedb.po | 100 +
bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po | 385 ++++
bridgedb/i18n/sk_SK/LC_MESSAGES/bridgedb.po | 357 ++++
bridgedb/i18n/sl_SI/LC_MESSAGES/bridgedb.po | 359 ++++
bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po | 381 ++++
bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po | 383 ++++
bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po | 389 ++++
bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po | 357 ++++
bridgedb/i18n/templates/bridgedb.pot | 391 ++++
bridgedb/i18n/th/LC_MESSAGES/bridgedb.po | 101 +
bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po | 392 ++++
bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po | 386 ++++
bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 389 ++++
bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po | 382 ++++
bridgedb/interfaces.py | 71 +
bridgedb/parse/__init__.py | 79 +
bridgedb/parse/addr.py | 589 ++++++
bridgedb/parse/descriptors.py | 299 +++
bridgedb/parse/fingerprint.py | 66 +
bridgedb/parse/headers.py | 79 +
bridgedb/parse/nickname.py | 58 +
bridgedb/parse/options.py | 295 +++
bridgedb/parse/versions.py | 129 ++
bridgedb/persistent.py | 264 +++
bridgedb/proxy.py | 476 +++++
bridgedb/qrcodes.py | 77 +
bridgedb/runner.py | 109 ++
bridgedb/safelog.py | 204 ++
bridgedb/schedule.py | 331 ++++
bridgedb/sitecustomize.py | 34 +
bridgedb/strings.py | 565 ++++++
bridgedb/translations.py | 122 ++
bridgedb/txrecaptcha.py | 304 +++
bridgedb/util.py | 389 ++++
.../XXX-bridgedb-database-improvements.txt | 4 +-
doc/proposals/XXX-bridgedb-social-distribution.txt | 2 +-
doc/sphinx/ext/traclinks.py | 47 +
doc/sphinx/source/bridgedb.Dist.rst | 8 -
doc/sphinx/source/bridgedb.Filters.rst | 8 -
doc/sphinx/source/bridgedb.HTTPServer.rst | 8 -
doc/sphinx/source/bridgedb.distribute.rst | 8 +
doc/sphinx/source/bridgedb.email.rst | 1 +
doc/sphinx/source/bridgedb.filters.rst | 8 +
doc/sphinx/source/bridgedb.https.rst | 12 +
doc/sphinx/source/bridgedb.rst | 10 +-
doc/sphinx/source/conf.py | 63 +-
doc/sphinx/source/index.rst | 53 +-
lib/bridgedb/Bridges.py | 711 -------
lib/bridgedb/Bucket.py | 288 ---
lib/bridgedb/Dist.py | 530 -----
lib/bridgedb/Filters.py | 120 --
lib/bridgedb/HTTPServer.py | 932 ---------
lib/bridgedb/Main.py | 573 ------
lib/bridgedb/Stability.py | 237 ---
lib/bridgedb/Storage.py | 468 -----
lib/bridgedb/__init__.py | 17 -
lib/bridgedb/_langs.py | 26 -
lib/bridgedb/_version.py | 197 --
lib/bridgedb/bridgerequest.py | 186 --
lib/bridgedb/bridges.py | 1654 ----------------
lib/bridgedb/captcha.py | 392 ----
lib/bridgedb/configure.py | 157 --
lib/bridgedb/crypto.py | 450 -----
lib/bridgedb/email/__init__.py | 1 -
lib/bridgedb/email/autoresponder.py | 711 -------
lib/bridgedb/email/dkim.py | 73 -
lib/bridgedb/email/request.py | 186 --
lib/bridgedb/email/server.py | 496 -----
lib/bridgedb/email/templates.py | 212 --
lib/bridgedb/geo.py | 82 -
lib/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po | 368 ----
lib/bridgedb/i18n/az/LC_MESSAGES/bridgedb.po | 357 ----
lib/bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po | 357 ----
lib/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po | 386 ----
lib/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po | 363 ----
lib/bridgedb/i18n/cy/LC_MESSAGES/bridgedb.po | 102 -
lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 384 ----
lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 389 ----
lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 364 ----
lib/bridgedb/i18n/en/LC_MESSAGES/bridgedb.po | 433 -----
lib/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po | 382 ----
lib/bridgedb/i18n/en_US/LC_MESSAGES/bridgedb.po | 433 -----
lib/bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po | 359 ----
lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 388 ----
lib/bridgedb/i18n/es_CL/LC_MESSAGES/bridgedb.po | 102 -
lib/bridgedb/i18n/eu/LC_MESSAGES/bridgedb.po | 101 -
lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po | 387 ----
lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po | 386 ----
lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 393 ----
lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po | 383 ----
lib/bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po | 101 -
lib/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po | 105 -
lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 384 ----
lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po | 384 ----
lib/bridgedb/i18n/id/LC_MESSAGES/bridgedb.po | 101 -
lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 391 ----
lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po | 362 ----
lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po | 360 ----
lib/bridgedb/i18n/kn/LC_MESSAGES/bridgedb.po | 102 -
lib/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po | 104 -
lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po | 359 ----
lib/bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po | 101 -
lib/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po | 102 -
lib/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po | 384 ----
lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 390 ----
lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po | 388 ----
lib/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po | 387 ----
lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 386 ----
lib/bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po | 360 ----
lib/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po | 389 ----
lib/bridgedb/i18n/si_LK/LC_MESSAGES/bridgedb.po | 100 -
lib/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po | 361 ----
lib/bridgedb/i18n/sk_SK/LC_MESSAGES/bridgedb.po | 357 ----
lib/bridgedb/i18n/sl_SI/LC_MESSAGES/bridgedb.po | 359 ----
lib/bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po | 380 ----
lib/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po | 387 ----
lib/bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po | 357 ----
lib/bridgedb/i18n/templates/bridgedb.pot | 391 ----
lib/bridgedb/i18n/th/LC_MESSAGES/bridgedb.po | 101 -
lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po | 389 ----
lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po | 384 ----
lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 388 ----
lib/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po | 358 ----
lib/bridgedb/interfaces.py | 19 -
lib/bridgedb/parse/__init__.py | 79 -
lib/bridgedb/parse/addr.py | 592 ------
lib/bridgedb/parse/descriptors.py | 278 ---
lib/bridgedb/parse/fingerprint.py | 46 -
lib/bridgedb/parse/headers.py | 79 -
lib/bridgedb/parse/nickname.py | 58 -
lib/bridgedb/parse/options.py | 296 ---
lib/bridgedb/parse/versions.py | 129 --
lib/bridgedb/persistent.py | 260 ---
lib/bridgedb/proxy.py | 473 -----
lib/bridgedb/qrcodes.py | 77 -
lib/bridgedb/runner.py | 109 --
lib/bridgedb/safelog.py | 197 --
lib/bridgedb/schedule.py | 326 ----
lib/bridgedb/sitecustomize.py | 34 -
lib/bridgedb/strings.py | 299 ---
lib/bridgedb/templates/assets/bridgedb.png | Bin 2946 -> 0 bytes
.../templates/assets/css/bootstrap.min.css | 7 -
lib/bridgedb/templates/assets/css/custom.css | 158 --
.../templates/assets/css/font-awesome-ie7.min.css | 384 ----
.../templates/assets/css/font-awesome.min.css | 403 ----
lib/bridgedb/templates/assets/css/main.css | 24 -
.../templates/assets/font/fontawesome-webfont.eot | Bin 37405 -> 0 bytes
.../templates/assets/font/fontawesome-webfont.svg | 399 ----
.../templates/assets/font/fontawesome-webfont.ttf | Bin 79076 -> 0 bytes
.../templates/assets/font/fontawesome-webfont.woff | Bin 43572 -> 0 bytes
lib/bridgedb/templates/assets/font/lato-bold.woff | Bin 46160 -> 0 bytes
.../templates/assets/font/lato-italic.woff | Bin 47168 -> 0 bytes
.../templates/assets/font/lato-regular.woff | Bin 46108 -> 0 bytes
lib/bridgedb/templates/assets/tor-roots-blue.svg | 95 -
lib/bridgedb/templates/assets/tor.svg | 6 -
lib/bridgedb/templates/base.html | 108 --
lib/bridgedb/templates/bridgedb.asc | 252 ---
lib/bridgedb/templates/bridges.html | 200 --
lib/bridgedb/templates/captcha.html | 63 -
lib/bridgedb/templates/howto.html | 39 -
lib/bridgedb/templates/index.html | 43 -
lib/bridgedb/templates/options.html | 164 --
lib/bridgedb/templates/robots.txt | 1079 -----------
lib/bridgedb/test/deprecated.py | 702 -------
lib/bridgedb/test/deprecated_networkstatus.py | 275 ---
lib/bridgedb/test/email_helpers.py | 181 --
lib/bridgedb/test/legacy_Tests.py | 660 -------
lib/bridgedb/test/test_Bucket.py | 63 -
lib/bridgedb/test/test_HTTPServer.py | 703 -------
lib/bridgedb/test/test_Main.py | 432 -----
lib/bridgedb/test/test_Storage.py | 56 -
lib/bridgedb/test/test_Tests.py | 259 ---
lib/bridgedb/test/test_bridgedb.py | 103 -
lib/bridgedb/test/test_bridgerequest.py | 44 -
lib/bridgedb/test/test_bridges.py | 1647 ----------------
lib/bridgedb/test/test_captcha.py | 337 ----
lib/bridgedb/test/test_configure.py | 67 -
lib/bridgedb/test/test_crypto.py | 392 ----
lib/bridgedb/test/test_email_autoresponder.py | 571 ------
lib/bridgedb/test/test_email_dkim.py | 86 -
lib/bridgedb/test/test_email_request.py | 276 ---
lib/bridgedb/test/test_email_server.py | 544 ------
lib/bridgedb/test/test_email_templates.py | 119 --
lib/bridgedb/test/test_geo.py | 96 -
lib/bridgedb/test/test_https.py | 415 ----
lib/bridgedb/test/test_parse_addr.py | 749 -------
lib/bridgedb/test/test_parse_descriptors.py | 731 -------
lib/bridgedb/test/test_parse_headers.py | 52 -
lib/bridgedb/test/test_parse_nickname.py | 63 -
lib/bridgedb/test/test_parse_options.py | 102 -
lib/bridgedb/test/test_parse_versions.py | 42 -
lib/bridgedb/test/test_persistent.py | 170 --
lib/bridgedb/test/test_persistentSaveAndLoad.py | 163 --
lib/bridgedb/test/test_proxy.py | 590 ------
lib/bridgedb/test/test_qrcodes.py | 73 -
lib/bridgedb/test/test_safelog.py | 336 ----
lib/bridgedb/test/test_schedule.py | 224 ---
lib/bridgedb/test/test_smtp.py | 196 --
lib/bridgedb/test/test_translations.py | 78 -
lib/bridgedb/test/test_txrecaptcha.py | 270 ---
lib/bridgedb/test/test_util.py | 144 --
lib/bridgedb/test/util.py | 179 --
lib/bridgedb/translations.py | 122 --
lib/bridgedb/txrecaptcha.py | 299 ---
lib/bridgedb/util.py | 304 ---
maint/get-completed-translations | 27 +-
requirements.txt | 2 +-
scripts/bridgedb | 2 +-
scripts/get-tor-exits | 17 +-
scripts/setup-tests | 1 +
setup.cfg | 35 +-
setup.py | 41 +-
test/deprecated.py | 448 +++++
test/email_helpers.py | 180 ++
test/https_helpers.py | 161 ++
test/legacy_Tests.py | 334 ++++
test/test_Bucket.py | 63 +
test/test_Main.py | 437 +++++
test/test_Storage.py | 56 +
test/test_Tests.py | 249 +++
test/test_bridgedb.py | 103 +
test/test_bridgerequest.py | 58 +
test/test_bridges.py | 1839 ++++++++++++++++++
test/test_captcha.py | 337 ++++
test/test_configure.py | 67 +
test/test_crypto.py | 393 ++++
test/test_distribute.py | 44 +
test/test_email_autoresponder.py | 572 ++++++
test/test_email_distributor.py | 259 +++
test/test_email_dkim.py | 86 +
test/test_email_request.py | 276 +++
test/test_email_server.py | 544 ++++++
test/test_email_templates.py | 119 ++
test/test_filters.py | 333 ++++
test/test_geo.py | 96 +
test/test_https.py | 437 +++++
test/test_https_distributor.py | 406 ++++
test/test_https_request.py | 91 +
test/test_https_server.py | 963 +++++++++
test/test_interfaces.py | 55 +
test/test_parse_addr.py | 749 +++++++
test/test_parse_descriptors.py | 879 +++++++++
test/test_parse_headers.py | 52 +
test/test_parse_nickname.py | 63 +
test/test_parse_options.py | 102 +
test/test_parse_versions.py | 42 +
test/test_persistent.py | 170 ++
test/test_persistentSaveAndLoad.py | 163 ++
test/test_proxy.py | 590 ++++++
test/test_qrcodes.py | 73 +
test/test_safelog.py | 335 ++++
test/test_schedule.py | 224 +++
test/test_smtp.py | 206 ++
test/test_translations.py | 78 +
test/test_txrecaptcha.py | 270 +++
test/test_util.py | 144 ++
test/util.py | 301 +++
versioneer.py | 2045 +++++++++++++++-----
355 files changed, 50901 insertions(+), 45794 deletions(-)
1
0
commit d7f5b425b6b5ff413dc89e5db6afbba37e53d1fd
Author: Isis Lovecruft <isis(a)torproject.org>
Date: Sat Jul 25 03:30:38 2015 +0000
Update Czech (cs) translations.
* THANKS TO Tomas Palik and Vlastimil Burián.
---
bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po | 78 ++++++++++++++++++++----------
1 file changed, 52 insertions(+), 26 deletions(-)
diff --git a/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po
index f76cd6b..e6d1e84 100644
--- a/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po
@@ -1,5 +1,5 @@
# Translations template for BridgeDB.
-# Copyright (C) 2014 'The Tor Project, Inc.'
+# Copyright (C) 2015 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
@@ -10,13 +10,15 @@
# Jiří Vírava <appukonrad(a)gmail.com>, 2014
# mxsedlacek, 2014
# Radek Bensch <inactive+Radog(a)transifex.com>, 2013
+# Tomas Palik <heidfeld(a)email.cz>, 2015
+# Vlastimil Burián <burian.vlastimil2(a)gmail.com>, 2015
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n"
-"POT-Creation-Date: 2014-07-26 02:11+0000\n"
-"PO-Revision-Date: 2014-10-15 17:11+0000\n"
-"Last-Translator: A5h8d0wf0x <littleslyfoxie28(a)gmail.com>\n"
+"POT-Creation-Date: 2015-03-19 22:13+0000\n"
+"PO-Revision-Date: 2015-07-03 20:57+0000\n"
+"Last-Translator: Vlastimil Burián <burian.vlastimil2(a)gmail.com>\n"
"Language-Team: Czech (http://www.transifex.com/projects/p/torproject/language/cs/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -36,7 +38,7 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:121
+#: lib/bridgedb/HTTPServer.py:107
msgid "Sorry! Something went wrong with your request."
msgstr "Promiňte! Něco se stalo špatně s vaším požadavkem."
@@ -79,7 +81,7 @@ msgstr "Hey, %s!"
msgid "Hello, friend!"
msgstr "Ahoj, příteli!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
msgid "Public Keys"
msgstr "Veřejné klíče"
@@ -207,26 +209,27 @@ msgstr "Jak začít používat mosty."
#: 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 "K vložení mostů do Tor Browser, postupujte podle instrukcí na %s Tor\nBrowser stránce ke stažení %s ke spuštění Tor Browser."
+"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
+"page %s and then follow the instructions there for downloading and starting\n"
+"Tor Browser."
+msgstr "Chcete-li zadat mosty do Tor Browser, jděte nejprve do %s Tor Browser stránky\nke stažení %s, a pak postupujte podle pokynů pro stažení a spuštění\nTor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:125
+#: lib/bridgedb/strings.py:126
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Když dialog 'Tor Nastavení Sítě' vyskočí klikněte na 'Konfigurovat' a postupujte\npodle průvodce dokud nedostanete otázku:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:129
+#: lib/bridgedb/strings.py:130
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Blokuje nebo cenzoruje váš Poskytovatel Služeb Internetu (ISP) připojení k\nTor síti?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:133
+#: lib/bridgedb/strings.py:134
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"
@@ -234,61 +237,84 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Vyberte 'Ano' a poté klikněte 'Další'. Pro konfiguraci nových mostů kopírujte a\nvložte linky k mostům do textového pole pro vložení. Nakonec klikněte na 'Připojit' a\nmělo by to být všechno! Pokud narazíte na problémy, zkuste kliknout na tlačítko 'Pomoc'\nv 'Tor Nastavení Sítě' průvodce pro další pomoc."
-#: lib/bridgedb/strings.py:141
+#: lib/bridgedb/strings.py:142
msgid "Displays this message."
msgstr "Zobrazí tuto zprávu."
#. 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
+#: lib/bridgedb/strings.py:146
msgid "Request vanilla bridges."
msgstr "Požadovat vanilla mosty."
-#: lib/bridgedb/strings.py:146
+#: lib/bridgedb/strings.py:147
msgid "Request IPv6 bridges."
msgstr "Požadovat IPv6 mosty."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:148
+#: lib/bridgedb/strings.py:149
msgid "Request a Pluggable Transport by TYPE."
msgstr "Požadovat Pluggable Transport od TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:151
+#: lib/bridgedb/strings.py:152
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Získat kopii BridgeDS's veřejného GnuPg klíče. "
-#: lib/bridgedb/templates/base.html:92
+#: lib/bridgedb/templates/base.html:89
msgid "Report a Bug"
msgstr "Nahlásit chybu"
-#: lib/bridgedb/templates/base.html:94
+#: lib/bridgedb/templates/base.html:92
msgid "Source Code"
msgstr "Zdrojový kód"
-#: lib/bridgedb/templates/base.html:97
+#: lib/bridgedb/templates/base.html:95
msgid "Changelog"
msgstr "Seznam změn"
-#: lib/bridgedb/templates/base.html:99
+#: lib/bridgedb/templates/base.html:98
msgid "Contact"
msgstr "Kontakt"
+#: lib/bridgedb/templates/bridges.html:81
+msgid "Select All"
+msgstr "Označit vše"
+
+#: lib/bridgedb/templates/bridges.html:87
+msgid "Show QRCode"
+msgstr "Zobrazit QR kód"
+
+#: lib/bridgedb/templates/bridges.html:100
+msgid "QRCode for your bridge lines"
+msgstr "QR kód pro Vaše linky k mostům"
+
#. TRANSLATORS: Please translate this into some silly way to say
#. "There was a problem!" in your language. For example,
#. for Italian, you might translate this into "Mama mia!",
#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:66
+#: lib/bridgedb/templates/bridges.html:115
+#: lib/bridgedb/templates/bridges.html:175
msgid "Uh oh, spaghettios!"
msgstr "Ježíšku na křížku!"
-#: lib/bridgedb/templates/bridges.html:72
+#: lib/bridgedb/templates/bridges.html:116
+msgid "It seems there was an error getting your QRCode."
+msgstr "Zdá se, že nastala chyba při zpracování Vašeho QR kódu"
+
+#: lib/bridgedb/templates/bridges.html:121
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Tento QR kód obsahuje linky pro Váš most. Naskenujte ho čtečkou QR kódů, abyste je zkopírovali na mobil nebo jiná zařízení."
+
+#: lib/bridgedb/templates/bridges.html:181
msgid "There currently aren't any bridges available..."
msgstr "V současnosti zde nejsou žádné mosty k dispozici..."
-#: lib/bridgedb/templates/bridges.html:73
+#: lib/bridgedb/templates/bridges.html:182
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -349,7 +375,7 @@ msgstr "žádné"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:130
+#: lib/bridgedb/templates/options.html:127
#, python-format
msgid "%sY%ses!"
msgstr "%sA%sno!"
@@ -357,7 +383,7 @@ msgstr "%sA%sno!"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:154
+#: lib/bridgedb/templates/options.html:151
#, python-format
msgid "%sG%set Bridges"
msgstr "%sN%sastavit Bridges"
1
0
commit 8c5c78947a1a251566c038bb3e7c0db5df8ca90e
Author: Isis Lovecruft <isis(a)torproject.org>
Date: Sat Jul 25 03:41:55 2015 +0000
Update BridgeDB's .pot file.
---
bridgedb/i18n/templates/bridgedb.pot | 46 ++++++++++++++++------------------
1 file changed, 22 insertions(+), 24 deletions(-)
diff --git a/bridgedb/i18n/templates/bridgedb.pot b/bridgedb/i18n/templates/bridgedb.pot
index cef7027..978655e 100644
--- a/bridgedb/i18n/templates/bridgedb.pot
+++ b/bridgedb/i18n/templates/bridgedb.pot
@@ -10,11 +10,11 @@
# Isis Lovecruft <isis(a)torproject.org>, 2012-2015
msgid ""
msgstr ""
-"Project-Id-Version: bridgedb 0.3.1-208-ga646ccd-dirty\n"
+"Project-Id-Version: bridgedb 0.3.1+255.g3454779.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: 2015-06-25 05:33+0000\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -22,8 +22,6 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 1.3\n"
-"Language: en\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
@@ -36,35 +34,35 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:135
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr ""
-#: bridgedb/https/templates/base.html:89
+#: bridgedb/https/templates/base.html:79
msgid "Report a Bug"
msgstr ""
-#: bridgedb/https/templates/base.html:92
+#: bridgedb/https/templates/base.html:82
msgid "Source Code"
msgstr ""
-#: bridgedb/https/templates/base.html:95
+#: bridgedb/https/templates/base.html:85
msgid "Changelog"
msgstr ""
-#: bridgedb/https/templates/base.html:98
+#: bridgedb/https/templates/base.html:88
msgid "Contact"
msgstr ""
-#: bridgedb/https/templates/bridges.html:84
+#: bridgedb/https/templates/bridges.html:35
msgid "Select All"
msgstr ""
-#: bridgedb/https/templates/bridges.html:90
+#: bridgedb/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr ""
-#: bridgedb/https/templates/bridges.html:103
+#: bridgedb/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr ""
@@ -72,26 +70,26 @@ msgstr ""
#. "There was a problem!" in your language. For example,
#. for Italian, you might translate this into "Mama mia!",
#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:118
-#: bridgedb/https/templates/bridges.html:178
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr ""
-#: bridgedb/https/templates/bridges.html:119
+#: bridgedb/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr ""
-#: bridgedb/https/templates/bridges.html:124
+#: bridgedb/https/templates/bridges.html:73
msgid ""
"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy "
"your bridge lines onto mobile and other devices."
msgstr ""
-#: bridgedb/https/templates/bridges.html:184
+#: bridgedb/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr ""
-#: bridgedb/https/templates/bridges.html:185
+#: bridgedb/https/templates/bridges.html:132
#, python-format
msgid " Perhaps you should try %s going back %s and choosing a different bridge type!"
msgstr ""
@@ -135,22 +133,22 @@ msgstr ""
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: bridgedb/https/templates/options.html:52
+#: bridgedb/https/templates/options.html:51
msgid "Advanced Options"
msgstr ""
-#: bridgedb/https/templates/options.html:88
+#: bridgedb/https/templates/options.html:86
msgid "No"
msgstr ""
-#: bridgedb/https/templates/options.html:89
+#: bridgedb/https/templates/options.html:87
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:130
+#: bridgedb/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -158,7 +156,7 @@ msgstr ""
#. 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"!
-#: bridgedb/https/templates/options.html:154
+#: bridgedb/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr ""
@@ -202,7 +200,7 @@ msgstr ""
msgid "Hello, friend!"
msgstr ""
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr ""
1
0
commit 787ce81cf0520cc769680438fe0aa8b8b46f2e4a
Author: Isis Lovecruft <isis(a)torproject.org>
Date: Sat Jul 25 03:29:24 2015 +0000
Update Danish (da) translations.
* THANKS TO Mogelbjerg.
---
bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 32 ++++++++++++++++--------------
1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po
index c647db3..6f61862 100644
--- a/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po
@@ -5,6 +5,7 @@
# Translators:
# Christian Villum <villum(a)autofunk.dk>, 2014-2015
# David Nielsen <gnomeuser(a)gmail.com>, 2014
+# Mogelbjerg <jan(a)mogelbjerg.dk>, 2015
# OliverMller <theoliver(a)live.co.uk>, 2011
# Thomas Pryds <thomas(a)pryds.eu>, 2014
# Tore Bjørnson <tore.bjornson(a)gmail.com>, 2013
@@ -12,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n"
-"POT-Creation-Date: 2015-02-03 03:24+0000\n"
-"PO-Revision-Date: 2015-02-23 06:50+0000\n"
-"Last-Translator: Christian Villum <villum(a)autofunk.dk>\n"
+"POT-Creation-Date: 2015-03-19 22:13+0000\n"
+"PO-Revision-Date: 2015-07-04 15:32+0000\n"
+"Last-Translator: Mogelbjerg <jan(a)mogelbjerg.dk>\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"
@@ -34,7 +35,7 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:122
+#: lib/bridgedb/HTTPServer.py:107
msgid "Sorry! Something went wrong with your request."
msgstr "Beklager, noget gik galt med din anmodning."
@@ -205,26 +206,27 @@ msgstr "Sådan starter du med at bruge dine broer"
#: 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 "For at tilføje broer til Tor Browseren, følg instruktionerne på %s Tor\nBrowserens hjemmeside %s for at starte Tor Browser."
+"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
+"page %s and then follow the instructions there for downloading and starting\n"
+"Tor Browser."
+msgstr "For at tage broer ind i Tor-browseren, gå da først til %s Tor-bowsers\ndownloadside %s og følg instruktionerne i hvordan Tor-browseren \ndownloades og startes."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:125
+#: lib/bridgedb/strings.py:126
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Når 'Tor netværksindstillinger' vinduet popper op, klik 'Indstil' og følg guiden til den siger:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:129
+#: lib/bridgedb/strings.py:130
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Blokerer eller på anden vis censurerer din internetudbyder forbindelser\ntil Tor netværket?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:133
+#: lib/bridgedb/strings.py:134
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"
@@ -232,29 +234,29 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Vælg 'Ja' og klik så på 'Næste'. For at konfigurere dine nye broer, kopier og indsæt brolinierne i den næste input boks. Klik til sidst 'Forbind', og så er du klar! Hvis du støder på problemer, så prøv at klikke på 'Hjælp'-knappen i 'Tor Netværksindstillinger'-guiden for at få yderligere hjælp."
-#: lib/bridgedb/strings.py:141
+#: lib/bridgedb/strings.py:142
msgid "Displays this message."
msgstr "Vis denne besked."
#. 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
+#: lib/bridgedb/strings.py:146
msgid "Request vanilla bridges."
msgstr "Anmod almindelige broer."
-#: lib/bridgedb/strings.py:146
+#: lib/bridgedb/strings.py:147
msgid "Request IPv6 bridges."
msgstr "Amod IPv6 broer."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:148
+#: lib/bridgedb/strings.py:149
msgid "Request a Pluggable Transport by TYPE."
msgstr "Anmod om Pluggable Transport efter TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:151
+#: lib/bridgedb/strings.py:152
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Hent en kopi af BridgeDB's offentlige GnuPG nøgle."
1
0
commit cf4876da5d588008ab02f9a3e206d1b734e52fca
Author: Isis Lovecruft <isis(a)torproject.org>
Date: Sat Jul 25 03:28:16 2015 +0000
Update German (de) translations.
* THANKS TO jschfr, Junge Limba, and Toralf Förster.
---
bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 48 ++++++++++++++++--------------
1 file changed, 26 insertions(+), 22 deletions(-)
diff --git a/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po
index 163b56c..67f5afb 100644
--- a/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po
@@ -5,7 +5,9 @@
# Translators:
# trantor <clucko3(a)gmail.com>, 2014
# Ettore Atalan <atalanttore(a)googlemail.com>, 2014
+# jschfr <hello(a)janschoefer.com>, 2015
# unknwon_anonymous <jackjohnson0001(a)yahoo.com>, 2014
+# Junge Limba <jungelimba(a)gmail.com>, 2015
# konstibae <konstibae(a)gmail.com>, 2014
# Locke <locke(a)dena-design.de>, 2011
# qbi <kubieziel(a)googlemail.com>, 2015
@@ -13,13 +15,14 @@
# debakel <spam1(a)mrtz.me>, 2014
# Tobias Bannert <tobannert(a)gmail.com>, 2013
# Tobias Bannert <tobannert(a)gmail.com>, 2014
+# Toralf Förster <toralf.foerster(a)gmx.de>, 2015
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n"
-"POT-Creation-Date: 2015-02-03 03:24+0000\n"
-"PO-Revision-Date: 2015-03-04 18:22+0000\n"
-"Last-Translator: qbi <kubieziel(a)googlemail.com>\n"
+"POT-Creation-Date: 2015-03-19 22:13+0000\n"
+"PO-Revision-Date: 2015-06-16 18:33+0000\n"
+"Last-Translator: Toralf Förster <toralf.foerster(a)gmx.de>\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"
@@ -39,9 +42,9 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:122
+#: lib/bridgedb/HTTPServer.py:107
msgid "Sorry! Something went wrong with your request."
-msgstr "Wir bitten um Entschuldigung. Bei Ihrer Anfrage lief etwas fehl."
+msgstr "Wir bitten um Entschuldigung. Bei Ihrer Anfrage lief etwas schief."
#: lib/bridgedb/strings.py:18
msgid "[This is an automated message; please do not reply.]"
@@ -116,7 +119,7 @@ msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
-msgstr "Einige Brücken mit IPv6-Adressen sind ebenfalls vorhanden, auch wenn einige \nsteckbare Transporte nicht IPv6-kompatibel sind.\n\n"
+msgstr "Einige Brücken mit IPv6-Adressen sind ebenfalls vorhanden, auch wenn einige \npluggable Transporte nicht IPv6-kompatibel sind.\n\n"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
@@ -130,7 +133,7 @@ msgid ""
"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
"help to circumvent internet censorship in many cases.\n"
"\n"
-msgstr "Zusätzlich hat die Brückendatenbank viele erkömmliche Brücken-Server %s ohnePluggable Transports %s. Das klingt vielleicht weniger toll. Es hilft Ihnen dennoch, in vielen Fällen die Internetzensur zu umgehen.\n\n"
+msgstr "Zusätzlich hat die BridgeDB viele herkömmliche Brücken-Server %s ohnePluggable Transports %s. Das klingt erst einmal nicht so besonders. Es hilft Ihnen dennoch, in vielen Fällen die Internetzensur zu umgehen.\n\n"
#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
@@ -139,7 +142,7 @@ msgstr "Was sind Brücken?"
#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Brücken-Server %s sind Tor-Relais, die Ihnen helfen die Zensur zu umgehen."
+msgstr "%s Brücken-Server %s sind Tor-Relais, die Ihnen dabei helfen, die Zensur zu umgehen."
#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
@@ -210,26 +213,27 @@ msgstr "So starten Sie die Benutzung Ihrer Brücken"
#: 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 "Um Brücken zum Tor-Browser hinzuzufügen, bitte der Anleitung auf der Seite %s, zum Herunterladen des %s Tor-Browsers folgen, um den Tor-Browser zu starten."
+"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
+"page %s and then follow the instructions there for downloading and starting\n"
+"Tor Browser."
+msgstr "Um Brücken in Tor Browser einzugeben, gehe erst auf die %s Tor Browser Downloadseite %s und folge dort den Anweisungen zum Download und Starten von Tor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:125
+#: lib/bridgedb/strings.py:126
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Wenn der Dialog mit den »Tor-Netzwerkeinstellungen« erscheint, \nklicken Sie auf »Konfigurieren« und folgen den Anweisungen des Assistenten: "
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:129
+#: lib/bridgedb/strings.py:130
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Blockiert oder zensiert Ihr Internetanbieter (ISP) die Verbindungen zum Tor-Netzwerk?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:133
+#: lib/bridgedb/strings.py:134
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"
@@ -237,29 +241,29 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Wählen Sie »Ja« und klicken dann auf »Weiter«. Um Ihre neuen Brücken zu konfigurieren, kopieren Sie die \nZeilen mit den Adressen der Brücken und fügen sie in das Texteingabefeld ein. Zum Schluss klicken Sie auf \n»Verbinden« und Sie können loslegen! Falls Sie Schwierigkeiten haben, \nversuchen Sie bitte auf den »Hilfe«-Knopf im Assistenten der »Tor- Netzwerkeinstellungen« zu klicken, \num weitere Hilfe zu erhalten."
-#: lib/bridgedb/strings.py:141
+#: lib/bridgedb/strings.py:142
msgid "Displays this message."
msgstr "Diese Nachricht anzeigen."
#. 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
+#: lib/bridgedb/strings.py:146
msgid "Request vanilla bridges."
msgstr "Standard-Brücken anfordern."
-#: lib/bridgedb/strings.py:146
+#: lib/bridgedb/strings.py:147
msgid "Request IPv6 bridges."
msgstr "IPv6-Brücken anfordern."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:148
+#: lib/bridgedb/strings.py:149
msgid "Request a Pluggable Transport by TYPE."
msgstr "Einen Pluggable Transport des TYPs anfordern."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:151
+#: lib/bridgedb/strings.py:152
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Eine Kopie des öffentlichen GnuPG-Schlüssels der Brückendatenbank erhalten."
@@ -302,13 +306,13 @@ msgstr "Hoppla, Spaghetti!"
#: lib/bridgedb/templates/bridges.html:116
msgid "It seems there was an error getting your QRCode."
-msgstr "Es gab vermutlich einen Fehler bei Beschaffen Ihres QR-Codes."
+msgstr "Es gab vermutlich einen Fehler beim Beschaffen Ihres QR-Codes."
#: lib/bridgedb/templates/bridges.html:121
msgid ""
"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
" your bridge lines onto mobile and other devices."
-msgstr "Dieser QR-Code beinhaltet Ihre Brückenverbindungen. Scannen Sie ihn mit einem QR-Code-Leser um ihre Brückenverbindungen auf ihre mobile und andere Geräte zu kopieren."
+msgstr "Dieser QR-Code beinhaltet Ihre Brückenverbindungen. Scannen Sie ihn mit einem QR-Code-Leser, um ihre Brückenverbindungen auf ihre mobile und andere Geräte zu kopieren."
#: lib/bridgedb/templates/bridges.html:181
msgid "There currently aren't any bridges available..."
@@ -319,7 +323,7 @@ msgstr "Im Moment sind keine Brücken verfügbar …"
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
-msgstr "Möglicherweise sollten Sie versuchen %s zurück zu gehen %s und einen anderen Brückentyp auszuwählen!"
+msgstr "Möglicherweise sollten Sie versuchen %s zurückzugehen %s und einen anderen Brückentyp auszuwählen!"
#: lib/bridgedb/templates/index.html:11
#, python-format
1
0