[tor-commits] [bridgedb/master] Update existing translations.
phw at torproject.org
phw at torproject.org
Fri Jun 7 17:03:49 UTC 2019
commit 449027f527e44d049c4f65e0485760c1d4fcebfc
Author: Philipp Winter <phw at nymity.ch>
Date: Mon May 20 18:11:59 2019 -0700
Update existing translations.
Also, fix a unit test that broke because of an updated translation
string.
---
bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po | 352 ++++++++++++-----------
bridgedb/i18n/az/LC_MESSAGES/bridgedb.po | 333 ++++++++++++----------
bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po | 349 ++++++++++++-----------
bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po | 350 +++++++++++------------
bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po | 396 +++++++++++++-------------
bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 378 ++++++++++++------------
bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 353 +++++++++++------------
bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 367 +++++++++++++-----------
bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po | 338 +++++++++++-----------
bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 406 +++++++++++++-------------
bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po | 370 ++++++++++++------------
bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po | 343 +++++++++++-----------
bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 422 +++++++++++++--------------
bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po | 404 ++++++++++++++++++++++----
bridgedb/i18n/he/LC_MESSAGES/bridgedb.po | 418 ++++++++++++++++++++++-----
bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 385 ++++++++++++-------------
bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po | 353 +++++++++++------------
bridgedb/i18n/id/LC_MESSAGES/bridgedb.po | 400 +++++++++++++-------------
bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 351 ++++++++++++-----------
bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po | 348 ++++++++++++-----------
bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po | 418 +++++++++++++++++++++++----
bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po | 342 +++++++++++-----------
bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po | 410 +++++++++++++++++++++-----
bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po | 414 ++++++++++++++++++++++-----
bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po | 366 ++++++++++++------------
bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 356 +++++++++++------------
bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po | 344 +++++++++++-----------
bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po | 400 +++++++++++++-------------
bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 378 ++++++++++++------------
bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po | 378 ++++++++++++------------
bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po | 427 ++++++++++++++--------------
bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po | 345 +++++++++++-----------
bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po | 341 +++++++++++-----------
bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po | 374 ++++++++++++------------
bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po | 379 ++++++++++++------------
bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po | 328 +++++++++++----------
bridgedb/i18n/templates/bridgedb.pot | 184 ++++++------
bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po | 403 +++++++++++++-------------
bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po | 352 +++++++++++------------
bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 350 +++++++++++------------
bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po | 415 ++++++++++++++-------------
bridgedb/test/test_https_server.py | 2 +-
42 files changed, 8385 insertions(+), 6737 deletions(-)
diff --git a/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po
index fa77860..0a071e3 100644
--- a/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po
@@ -3,34 +3,42 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
+# Abderrahman Ait Ali <abde.aitali at live.com>, 2017
# A. Hassan <a_hassan at outlook.com>, 2015
# Ahmad Gharbeia <gharbeia at gmail.com>, 2014
# allamiro <allamiro at gmail.com>, 2011
# Ash <ali.shatrieh at gmail.com>, 2014
+# blah bleh <wshalash at protonmail.ch>, 2018
+# ButterflyOfFire, 2018
# debo debo <a.adeebo at yahoo.com>, 2015
# Mohamed El-Feky <elfeky.m at gmail.com>, 2014
+# Elias Saba <elias55saba at gmail.com>, 2018
# AnonymousLady <farah.jaza at hotmail.com>, 2014
# 0xidz <ghoucine at gmail.com>, 2014
-# KACIMI LAMINE <k_lamine27 at yahoo.fr>, 2015
+# lamine Kacimi <k_lamine27 at yahoo.fr>, 2015
+# Khaled Hosny, 2018
+# maher tharwat <mahmoud_tharwat2002 at hotmail.com>, 2016
# محمد الحرقان <malham1 at gmail.com>, 2011
# Nudroid A <Nudroid at outlook.com>, 2015
+# shadows99 <nabils51 at gmail.com>, 2019
# Sherief Alaa <sheriefalaa.w at gmail.com>, 2013-2014
# Sherief Alaa <sheriefalaa.w at gmail.com>, 2013
# Valetudinarian <themcnx at gmail.com>, 2014
+# yahia zakaria <yahiazak at hotmail.com>, 2015
# محمد الحرقان <malham1 at gmail.com>, 2011
# محيي الدين <tx99h4 at hotmail.com>, 2014
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-22 16:42+0000\n"
-"Last-Translator: A. Hassan <a_hassan at outlook.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-04-04 10:15+0000\n"
+"Last-Translator: shadows99 <nabils51 at gmail.com>\n"
+"Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\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"
+"Generated-By: Babel 1.3\n"
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
@@ -45,57 +53,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "عذراً! حدث خطأ في طلبك."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "ابلغ عن خطأ بالبرنامج"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "كود البرنامج"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "التغييرات"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "اتصل بنا"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "حدد الكل"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "أظهر رمز الاستجابة السريع (QRCode)"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "رمز الاستجابة السريع لخطوط الوصل"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "للأسف لم يتم العثور علي ما طلبت"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "يبدو أن هناك خطأ في الحصول على رمزك للإاستجابة السريع."
+
+#: 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:131
+msgid "There currently aren't any bridges available..."
+msgstr "لا يوجد أي bridges متاحة حاليا"
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "ربما تحتاج إلى %s العودة %s و اختيار نوع bridge مختلف"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "خطوة %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "حمل %s متصفح Tor %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "خطوة %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "احصل على %s bridges %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "خطوة %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "الآن %s أضف الـbridges إلى متصفح Tor %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.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sف%sقط أعطني bridges!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "خيارات متقدمة"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "لا"
+
+#: 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:124
+#, 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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sأ%sصل علي Bridges"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[هذه رسالة تلقائية ؛ الرجاء عدم الرد.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "الـ bridges الخاصة بك:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 "لقد تخطيت الحد المسموح به. الرجاء الانتظار! الحد الأدنى من الوقت بين الرسائل هو %s ساعات. كل رسائل البريد القادمة خلال تلك الفتره سيتم تجاهلها."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
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
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "مرحبا بكم في BridgeDB"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "وسائل النقل المتاحه TYPE:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "مرحبا، %s "
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "مرحبا ,صديقي!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "مفاتيح عامة"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -106,7 +239,7 @@ msgstr "هذا البريد تم إنشائه لـ %s يوم %s الساعة %s"
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -117,7 +250,7 @@ msgid ""
msgstr "BridgeDB يستطيع توفير %s انواع من الـ Pluggable Transports %s وهي تساعد علي تعتيم اتصالاتك بالـ Tor Network، و كنتيجة لذلك يكون من الصعب علي أي احد يراقب حركة مرورك على الإنترنت بتحديد اذا ما كنت تستخدم Tor.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -129,7 +262,7 @@ msgstr "بعض الـ bridges لها عناوين IPv6، ولكنها ليست
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -138,33 +271,33 @@ msgid ""
"\n"
msgstr "بالأضافة إلي ذلك، BridgeDB يحتوي علي bridges %s عادية بدون أي Pluggable Transports %s تستطيع ايضا المساعدة في التحايل على رقابة على الإنترنت في الكثير من الاحيان.\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "ما هي bridges؟"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Bridges %s هي عبارة عن مرحلات Tor تساعدك علي التحايل علي الحجب."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "أحتاج إلى وسيلة بديلة للحصول على bridges!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, 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. يرجى ملاحظة أنّه يجب ارسال البريد الإلكتروني من احدى العناوين البريدية التالية: %s أو %s أو %s."
+msgstr "طريقة أخرى للحصول على جسور هي عبر إرسال بريد إلكتروني إلى %s. يرجى ملاحظة أنّه يجب ارسال البريد الإلكتروني عبر عنوان بريدي من إحدى مزودي خدمة البريد الالكتروني التاليين: %s أو %s أو %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "bridges لا تعمل! أنا بحاجة إلى مساعدة!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "في حال عدم عمل Tor, ارسل بريد الكتروني الى %s."
@@ -172,71 +305,71 @@ msgstr "في حال عدم عمل Tor, ارسل بريد الكتروني الى
#. 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
+#: bridgedb/strings.py:121
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 "حاول ان تتضمن رسالتك علي معلومات كثيرة عن مشكلتك، بما في ذلك قائمة الـbridges و Pluggable Transports الذي تحاول استخدامهم، ورقم نسخة Tor Browser وأي رسائل اظهرها Tor، إلخ."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "ها هي سطور الـBridges الخاصة بك:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "أحصل علي Bridges"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "من فضلك حدد الخيارات لنوع الـbridge"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "هل تحتاج عناوين IPv6؟"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "هل تحتاج إلي %s؟"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "متصفحك لا يعرض الصور بشكل صحيح"
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "أدخل الحروف أو الأرقام من الصورة أعلاه ..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "كيف تبدأ باستعمال الـbridges"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, 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 "لتتمكن من إدخال جسور إلى المتصفح ، أذهب إلى %s صفحة تحميلات المتصفح %s وأتبع التعليمات المذكورة بها لتحميل وبدء المتصفح "
+msgstr "لتتمكن من إدخال جسور إلى المتصفح Tor، أذهب إلى %s صفحة تحميلات المتصفح Tor %s وأتبع التعليمات المذكورة فيها من اجل تحميل وبدء المتصفح Tor"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "عند ظهور شاشة 'إعدادات شبكة Tor'، اضغط علي 'تكوين' و اتبع التعليمات حتي تسألك عن:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "هل يقوم مزود خدمة الإنترنت (ISP) الخاص بك بمنع الاتصالات بشبكة Tor أو مراقبتها بطريقة أخرى؟"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
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"
@@ -244,153 +377,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "اختار 'نعم' ثم 'Next' ثم قم بلصق الـbridges الجديدة في المربع. ثم اختار 'اتصال' و اذا واجهتك مشكلة اضغط علي 'مساعدة' في نافذة اعداد Tor."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
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
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "أطلب bridges عادية."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "أطلب IPv6 bridges"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "أطلب Pluggable Transport بـ TYPE"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "احصل على نسخة من مفتاح GnuPG العام الخاص بـBridgeDB"
-
-#: 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 "التغييرات"
-
-#: 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 "أظهر الرمز المربّع"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "الرمز المربّع التابع لخطوط جسرك"
-
-#. 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 "يبدو أن هناك خطأ في الحصول على الرمز المربّع الخاص بك."
-
-#: 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 "هذا الرمز المربّع يحتوي على خطوط جسرك .اقرأ الرمز بقارئ الرموز المربعة لنسخ خطوط جسرك الى الهاتف الجوال او أجهزة اخرى."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "لا يوجد أي bridges متاحة حاليا"
-
-#: 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 و اختيار نوع bridge مختلف"
-
-#: 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 متصفح Tor %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 bridges %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 أضف الـbridges إلى متصفح Tor %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قط أعطني bridges!"
-
-#: 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صل علي Bridges"
diff --git a/bridgedb/i18n/az/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/az/LC_MESSAGES/bridgedb.po
index 8c71518..649a847 100644
--- a/bridgedb/i18n/az/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/az/LC_MESSAGES/bridgedb.po
@@ -1,21 +1,22 @@
# Translations template for BridgeDB.
-# Copyright (C) 2014 'The Tor Project, Inc.'
+# Copyright (C) 2015 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# E <ehuseynzade at gmail.com>, 2014-2015
+# D, 2014-2015
+# Emin Mastizada <emin at linux.com>, 2016
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-07-26 02:11+0000\n"
-"PO-Revision-Date: 2015-01-03 18:01+0000\n"
-"Last-Translator: E <ehuseynzade at gmail.com>\n"
-"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/torproject/language/az/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2018-01-17 21:21+0000\n"
+"Last-Translator: Emin Mastizada <emin at linux.com>\n"
+"Language-Team: Azerbaijani (http://www.transifex.com/otf/torproject/language/az/)\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"
+"Generated-By: Babel 1.3\n"
"Language: az\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -30,57 +31,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:121
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Üzr istəyirik! Tələbinlə bağlı nə isə səhv oldu."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Problemi Xəbər Ver"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Mənbə Kodu"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Dəyişikliklər"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Əlaqə"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Hamısını Seç"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "QR Kodu Göstər"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "Körpü sətirləriniz üçün QR Kod"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Vay dədəm!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Görünür QR Kodunuzu almada səhv yarandı."
+
+#: 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 "Bu QR Kodunda körpü sətirləriniz var. Bunu QR Kod oxuyucularla gözdən keçirin və körpü sətirlərinizi mobil və digər cihazlara köçürün."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Hazırda mümkün körpü yoxdur..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Çox güman ki, sən %s geri qayıdıb %s başqa körpü növü seçməli idin!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "%s1-ci%s Addım"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "%s Tor Səyyahını %s Endir"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "%s2-ci%s Addım"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "%s Körpü %s Əldə Et"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "%s3-cü%s Addım"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "İndi %s körpüləri Tor Səyyahına əlavə et %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.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sS%sadəcə mənə körpüləri ver!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Təkmilləşdirilmiş Seçimlər"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Xeyr"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "heç biri"
+
+#. 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:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sB%səli!"
+
+#. 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:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sK%sörpü Əldə Et"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
-msgstr "[Bu avtomatik cavabdır, lütfən cavab yazma.]"
+msgstr "[Bu avtomatik mesajdır, lütfən cavab yazmayın.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
-msgstr "Bu da sənin körpülərin:"
+msgstr "Bu da körpüləriniz:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 "Səs limitini keçmisən. Lütfən yavaşla! Emaillər arası minimal vaxt\n%s saatdır. Bu zaman kəsiyində daxil edilən diər emaillər ləğv ediləcəkdir."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "ƏMRLƏR: (bir neçə seçimi müəyyənləşdirmək üçün ƏMRLƏRi birləşdir)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "BridgeDB-ə xoş gəlkmisən!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Mövcud dəstəklənən nəqliyyat NÖVləri:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Ey, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Salam, dost!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "İctimai Açarlar"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -91,7 +217,7 @@ msgstr "Bu email göy qurşağı, təbuynuz və qığılcımla hazırlanıb\n%s
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -102,7 +228,7 @@ msgid ""
msgstr "BridgeDB müxtəlif %s növ Pluggable Transport %s vasitəsilə körpülər müəyyən \nedə bilər, bu sənin internet trafikini yoxlamaq istəyən hər hansı şəxs üçün \nəlaqələrini Tor Network ilə kölgələyərək sənin Tor istifadə etdiyini müəyyən \netməsinə daha çox mane olacaqdır.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -114,7 +240,7 @@ msgstr "Pluggable Transports vasitəsilə mövcud olan IPv6 ünvanlı bir çox \
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -123,20 +249,20 @@ msgid ""
"\n"
msgstr "Bundan əlavə BridgeDB Pluggable Transports %s olmayan bir sıra darıxdırıcı \nkörpülər %s də vardır, amma onlar yenə də internet senzurasından \nsovuşmağı bacarırlar.\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Körpülər nədir?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Körpülər %s Tor-un keçidi olub sənə senzuradan sovuşmağa kömək edir."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Körpülərin əldə edilməsinin alternativ yollarını axtarıram!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -144,12 +270,12 @@ msgid ""
"%s, %s or %s."
msgstr "Körpüləri əldə etməyin başqa yolu da %s emailinə məktub yazmaqdır. Lütfən, yadında\nsaxla ki, email göndərən zaman aşağıdakı email təmin edicilərindən birini istifadə etməlisən:\n%s, %s və ya %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Körpülərim işlərmir! Köməyə ehtiyacım var!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Əgər Tor işləmirsə, sən %s ünvanına yazmalısan."
@@ -157,70 +283,71 @@ msgstr "Əgər Tor işləmirsə, sən %s ünvanına yazmalısan."
#. 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
+#: bridgedb/strings.py:121
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 "Yaranan vəziyyət haqqında ətraflı məlumat yazmağa çalış; körpülərin siyahısı və \nistifadə etməyə çalışdığı Pluggable Transport-un adı, Tor Browser versiyan və \nTor tərəfindən aldığın hər hansı mesaj və s."
+msgstr "Yaranan vəziyyət haqqında ətraflı məlumat yazmağa çalış; körpülərin siyahısı və \nistifadə etməyə çalışdığı Pluggable Transport-un adı, Tor Səyyahının versiyası və \nTor tərəfindən aldığın hər hansı mesaj və s."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Sənin körpü sətirlərin:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Körpü Əldə Et!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Lütfən, körpü növləri üçün seçimləri müəyyənləşdir:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "IPv6 ünvanlara ehtiyacın var?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "%s ehtiyacın var?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Sənin brauzerin şəkilləri göstərə bilmir."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Yuxarıdakı şəkildən işarələri daxil et..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Körpüləri necə istifadə edəcəksən"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, 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örpüləri Tor Browser-ə daxil etmək üçün %s Tor Browser-dəki qaydalara riayət edərək \n%s səhifəsini yüklə ki, Tor Browser başlasın."
+"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 "Körpüləri Tor Səyyahına əlavə etmək üçün ilk olaraq %s Tor Səyyahını endirmə\nsəhifəsinə %s gedin və daha sonra endirib Tor Səyyahını qurmaq üçün oradakı\naddımları izləyin."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:125
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "'Tor Şəbəkə Parametrləri' dialoqu sıçrayıb açılsa, 'Konfiqurasiya' düyməsini kliklə\nvə vizardın dediklərinə bu sualı verənə qədər riayət et:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:129
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "İnternet Xidmət Təqdimatçısı (İXT) sənin Tor şəbəkəsinə girişini kilidləyir və ya \nəlaqələrə məhdudiyyətlər qoyur?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:133
+#: bridgedb/strings.py:159
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"
@@ -228,130 +355,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Əvvəl 'Bəli' və daha sonra 'Növbəti'-ni seç. Yeni körpülərini konfiqurasiya \netmək üçün körpü sətirlərini köçür və idxal qutusuna yapışdır. Ən son olaraq, \n'Əlaqə Yarat' düyməsini kliklə və məncə indi davam etmək üçün yaxşı vaxtdır! \nHər hansı problemlə üzləşsən, dəstək üçün 'Tor Şəbəkə Parametrləri' vizardında \n'Kömək' düyməsini kliklə."
-#: lib/bridgedb/strings.py:141
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Bu mesajı göstərir."
#. 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
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Vanil körpü xahiş et."
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "IPv6 körpü xahiş et."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:148
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "TYPE-a görə Pluggable Transport xahiş et."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:151
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "BridgeDB-nin ictimai GnuPG açarının üzünü əldə et."
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Report a Bug"
-msgstr "Problemi Xəbər Ver"
-
-#: lib/bridgedb/templates/base.html:94
-msgid "Source Code"
-msgstr "Mənbə Şifrəsi"
-
-#: lib/bridgedb/templates/base.html:97
-msgid "Changelog"
-msgstr "Dəyişikliklər"
-
-#: lib/bridgedb/templates/base.html:99
-msgid "Contact"
-msgstr "Əlaqə"
-
-#. 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 "Vay dədəm!"
-
-#: lib/bridgedb/templates/bridges.html:72
-msgid "There currently aren't any bridges available..."
-msgstr "Hazırda mümkün körpü yoxdur..."
-
-#: lib/bridgedb/templates/bridges.html:73
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Çox güman ki, sən %s geri qayıdıb %s başqa körpü növü seçməli idin!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "%s1-ci%s Addım"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "%s Tor Browser %s Yüklə"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "%s2-ci%s Addım"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "%s Körpü %s Əldə Et"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "%s3-cü%s Addım"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "İndi %s körpüləri Tor Browser-nə əlavə et %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 "%sS%sadəcə mənə körpü ver!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Ətraflı Seçimlər"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Xeyr"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "heç biri"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:130
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sB%səli!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:154
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sK%sörpü Əldə Et"
diff --git a/bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po
index 2d95c12..9a0d45a 100644
--- a/bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po
@@ -1,21 +1,24 @@
# Translations template for BridgeDB.
-# Copyright (C) 2014 'The Tor Project, Inc.'
+# Copyright (C) 2015 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
# aramaic <aramaicbg at gmail.com>, 2015
+# Kaloyan Nikolov <kotipuka01 at gmail.com>, 2016
+# Maxi <kutia0001 at gmail.com>, 2015
+# Tsvetan Nikolov <slakware at gmail.com>, 2015
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-07-26 02:11+0000\n"
-"PO-Revision-Date: 2015-01-14 12:40+0000\n"
-"Last-Translator: aramaic <aramaicbg at gmail.com>\n"
-"Language-Team: Bulgarian (http://www.transifex.com/projects/p/torproject/language/bg/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-01-15 12:20+0000\n"
+"Last-Translator: erinm\n"
+"Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\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"
+"Generated-By: Babel 1.3\n"
"Language: bg\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -30,68 +33,193 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:121
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
-msgstr "Sorry! Something went wrong with your request."
+msgstr "Съжаляваме! Нещо се обърка с заявката ви."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Докладвай проблем"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Сорс код"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Дневник на промените"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Контакт"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Избeри всичко"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Покажи QR Код"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR Код за вашите bridge линии"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ооо, спагетки!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Изглежда е имало грешка при получаване на вашия QR Код."
+
+#: 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 "Този QRCode съдържа вашите мостови линии. Сканирайте го с QR Код четец да копирате вашите мостови линии към мобилни и други устройства."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "В момента няма налични bridges ..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Най вероятно трябва да %s се върнете %s и изберете различенt bridge тип!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Стъпка %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Свали %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Стъпка %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Вземи %s bridges %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Стъпка %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Сега %sдобавете bridges към Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sП%sросто ми дайте bridges!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Разширени възможности"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Не"
+
+#: 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:124
+#, 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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sВ%sземи Bridges"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Автоматично съобщение; моля не отговаряйте.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Това са вашите мрежови bridges:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 часа. Всички следващи и-мейли по време на този период ще бъдат анулирани."
+msgstr "Надхвърлихте позволения период за е-поща . Моля забавете! Минималния период между две е-пощи е %s часа. Всички следващи е-пощи по време на този период ще бъдат анулирани."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
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
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Добре дошли в BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Актуални поддържани транспорт TYPEs:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Хей, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Здравей, приятел!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Обществен ключ"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
-msgstr "Този и-мейл беше генериран с дъги, уникорни, и заря\nза %s на %s при %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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,10 +227,10 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "BridgeDB може да предложи bridges с много %stypes на Pluggable Transports%s,\nкоито могат да помогнат да подсигурят вашата връзка към Tor Network, правейки я по\nтрудна за наблюдение за всеки наблюдаващ вашия интернет трафик да открие че ползвате Tor\n \n"
+msgstr "BridgeDB може да предложи bridges с много %sвидове на Pluggable Transports%s,\nкоито могат да помогнат да подсигурят вашата връзка към Tor Network, правейки я по\nтрудна за наблюдение за всеки наблюдаващ вашия интернет трафик да открие че ползвате Tor\n \n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -114,244 +242,143 @@ msgstr "Някой bridges с IPv6 адреси са също налични, н
#. 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
+#: bridgedb/strings.py:88
#, 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 има много plain-ol'-vanilla bridges %s без никакви\nPluggable Transports %s които не изглеждат толкова добре, но все пак могат\nда помогнат за заобикаляне на интернет цензората в много случаи.\n\n"
+msgstr "Допълнително, BridgeDB има много plain-ol'-vanilla bridges %s без никакви\nPluggable Transports %s които не изглеждат толкова добре, но все пак могат\nда помогнат за заобикаляне на интернет цензурата в много случаи.\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Какво са bridges?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Bridges %s са Tor relays които помагат за заобикаляне на цензурата."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Имам нужда от алтернативен вариант за намиране на bridges!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, 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 "Друг вариант за набавяне на bridges е пращане на и-мейл до %s. Моля отбележете че вие трябва да\nпратите и-мейл използвайки адрес на един от следните доставчици:\n%s, %s or %s."
+msgstr "Друг вариант за набавяне на bridges е пращане на е-поща до %s. Моля отбележете, че вие трябва да\nизпратите е-поща използвайки адрес на един от следните доставчици:\n%s, %s or %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Моите bridges не работят! Имам нужда от помощ!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ако вашия Tor не работи, изпратете и-мейл до %s."
+msgstr "Ако вашия Tor не работи, изпратете е-поща до %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
+#: bridgedb/strings.py:121
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 "Опитайте се да включите колкото се може повече информация за вашия случай, включително списък на\nbridges и Pluggable Transports които сте използвали, вашата Tor Browser версия,\nи всяко съобщение с което Tor е отговорил, и т.н."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Тус са вашите bridge връзки:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Вземете Bridges!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Моля изберете опция за вид bridge:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Нуждаете ли се от IPv6 адреси?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Нуздаете ли се от %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Вашия браузер не показва правилно изображения."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Въведете символите от изображението от горе..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Как да започнете да използвате вашите bridges"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, 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 "За да въведете bridges в 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 "За въвеждане на bridges в Tor Browser, първо отидете на \n%s Tor Browser уеб страницата за сваляне %s и след това \nследвайте инструкциите там за сваляне и стартиране на \nTor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:125
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Когато 'Tor Network Settings' прозорец се отвори, кликнете 'Configure' и следвайте\nсъветника докато не попита:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:129
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Цензурира ли или блокира връзката ви вашия Интернет доставчик (ISP)\nдо Tor мрежата?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:133
+#: bridgedb/strings.py:159
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 "Изберете 'Yes' и след това кликнете 'Next'. За да конфигурирате вашите нови bridges, копирайте и\nпоставете bridge линии в прозореца за текстово въвеждане. На края натиснете 'Connect', и\nтрябва да сте готови! Ако срещате трудности, отидете на 'Help'\nбутона в 'Tor Network Settings' съветника за помощ."
+msgstr "Изберете 'Да' и след това кликнете 'Напред'. За да конфигурирате вашите нови bridges, копирайте и\nпоставете bridge редовете в прозореца за текстово въвеждане. На края натиснете 'Свържи се', и\nтрябва да сте готови! Ако срещате трудности, отидете на 'Помощ' бутона в 'Tor Network Settings' съветника за помощ."
-#: lib/bridgedb/strings.py:141
+#: bridgedb/strings.py:167
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
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
-msgstr "Изисквай vanilla bridges."
+msgstr "Заяви стандартни bridges."
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
-msgstr "Изисквай IPv6 bridges."
+msgstr "Заяви IPv6 bridges."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:148
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
-msgstr "Изисквай Pluggable Transport по TYPE."
+msgstr "Заяви Pluggable Transport според TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:151
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Вземи копие на BridgeDB's обществен GnuPG ключ."
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Report a Bug"
-msgstr "Информирай за проблем"
-
-#: lib/bridgedb/templates/base.html:94
-msgid "Source Code"
-msgstr "Source код"
-
-#: lib/bridgedb/templates/base.html:97
-msgid "Changelog"
-msgstr "Дневник на промените"
-
-#: lib/bridgedb/templates/base.html:99
-msgid "Contact"
-msgstr "Контакт"
-
-#. 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:72
-msgid "There currently aren't any bridges available..."
-msgstr "В момента няма налични bridges ..."
-
-#: lib/bridgedb/templates/bridges.html:73
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Най вероятно трябва да %s се върнете %s и изберете различенt bridge тип!"
-
-#: 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 Tor Browser %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 bridges %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добавете bridges към Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sJ%sust дай ми bridges!"
-
-#: 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:130
-#, 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:154
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sВ%sземи Bridges"
diff --git a/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po
index 2be8825..f169b0e 100644
--- a/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po
@@ -4,24 +4,24 @@
#
# Translators:
# Albert <provisionalib at hotmail.com>, 2013
-# Assumpta Anglada <assumptaanglada at gmail.com>, 2014
+# Assumpta <assumptaanglada at gmail.com>, 2014
# Eloi García i Fargas, 2014
-# Humbert <humbert.costas at gmail.com>, 2014
+# Humbert, 2014
# isis <isis at torproject.org>, 2015
# laia_, 2014-2015
# Toni Hermoso Pulido <toniher at softcatala.cat>, 2012
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 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"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2018-04-12 18:54+0000\n"
+"Last-Translator: IDRASSI Mounir <mounir.idrassi at idrix.fr>\n"
+"Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\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"
+"Generated-By: Babel 1.3\n"
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -36,57 +36,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Quelcom ha anat malament amb la petició."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Comunica un error"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Codi font"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Registre de canvis"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Contacte"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Selecciona-ho tot"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Mostra el codi QR"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "Codi QR per les línies de ponts"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Vatua l'olla!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Hi ha hagut un error en obtenir el codi QR"
+
+#: 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 "Aquest codi QR conté les línies de pont. Escannegeu-lo amb un lector de codis QR per copiar les línies de pont al mòbil i a altres dispositius. "
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "No hi ha ponts disponibles en aquests moments."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Proveu %s tornant a %s i triant un tipus diferent de pont."
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Pas %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Descarrega %s Navegador Tor %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Pas %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Descarrega %s ponts %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Pas %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Ara %s adjunta els ponts al Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sJ%sust donem els meus bridges!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Opcions Avançades"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "No"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "Cap"
+
+#. 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:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sS%sí!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sD%sescarrega Bridges"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Aquest és un missatge automàtic, no el respongui.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Els vostres ponts: "
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 "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
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (combina COMMANDs per especificar les múltiples opcions simultàniament)"
+msgstr "COMMANDs: (combina COMMANDs per especificar diverses opcions simultàniament)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Benvingut a BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Actualment suportant transport TYPEs:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Hola, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Hola, amic!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Claus Públiques"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -97,7 +222,7 @@ msgstr "Aquest correu va ser creat amb unicorns, arcs de Sant Martí i espurnes\
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -105,10 +230,10 @@ 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 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"
+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
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -120,7 +245,7 @@ msgstr "També hi ha ponts disponibles amb adreces IPv6, tot i que alguns Plugga
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -129,20 +254,20 @@ msgid ""
"\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
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Què són els ponts?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Ponts %s són repetidors Tor que ajuden a esquivar la censura."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Em cal una manera alternativa d'obtenir ponts."
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -150,61 +275,61 @@ msgid ""
"%s, %s or %s."
msgstr "Una altra manera d'aconseguir ponts és enviar un correu electrònic a %s. Tingueu en compte que heu\nd'enviar el correu amb una adreça d'un dels següents proveïdors de correu:\n%s, %s or %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "No em funcionen els ponts! Ajuda!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
-msgstr "Si Tor no us funciona, hauríeu d'enviar un correu a %s."
+msgstr "Si Tor no us funciona, envieu un correu a %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
+#: bridgedb/strings.py:121
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 "Incloeu el màxim d'informació sobre el vostre cas, inclosa la llista de\nponts i de Pluggable Transports que heu intentat utilizar, la vostra versió de Tor Browser,\ni qualsevol missatge que Tor hagi donat, etc."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Les vostres línies de ponts:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Descarregueu ponts!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Seleccioneu les opcions pel tipus de pont:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Necessiteu adreces IPv6?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Necessiteu un %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "El navegador no està mostrant les imatges correctament."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Introduïu els caràcters de la imatge superior..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Com començar a utilitzar els ponts"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -213,21 +338,21 @@ msgid ""
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:126
+#: bridgedb/strings.py:151
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:130
+#: bridgedb/strings.py:155
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:134
+#: bridgedb/strings.py:159
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,153 +360,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
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:142
+#: bridgedb/strings.py:167
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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Demanar ponts estàndard."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Demanar ponts IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
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:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Fer una còpia de la clau pública GnuPG del BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Comunicar un Bug"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Codi font"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Canviar el log"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Contacte"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Selecciona-ho tot"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Mostra el codi QR"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "Codi QR per les línies de ponts"
-
-#. 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 "Ueeeee, espaguetiiiiis!!!!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Hi ha hagut un error en obtenir el codi QR"
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Aquest codi QR conté les línies de pont. Escannegeu-lo amb un lector de codis QR per copiar les línies de pont al mòbil i a altres dispositius. "
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "No hi han ponts disponibles en aquests moments..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Potser hauries de provar %s tirant enrer %s i triant un tipus diferent de pont!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Pas %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Descarrega %s Navegador Tor %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Pas %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Descarrega %s ponts %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Pas %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Ara %s adjunta els ponts al Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sJ%sust donem els meus bridges!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Opcions Avançades"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "No"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "Cap"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sY%ses!"
-
-#. 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 "%sG%set Bridges"
+msgstr "Descarregar una còpia de la clau pública GnuPG del BridgeDB."
diff --git a/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po
index e6d1e84..9a0e93e 100644
--- a/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po
@@ -6,26 +6,28 @@
# A5h8d0wf0x <littleslyfoxie28 at gmail.com>, 2014
# Adam Slovacek <adamslovacek at gmail.com>, 2013
# Elisa <valhalla at gishpuppy.com>, 2011
+# Filip Hruska <fhr at fhrnet.eu>, 2015
# Sanky <gsanky+transifex at gmail.com>, 2011
# Jiří Vírava <appukonrad at gmail.com>, 2014
+# Michal Stanke <mstanke at mozilla.cz>, 2018
# mxsedlacek, 2014
# Radek Bensch <inactive+Radog at transifex.com>, 2013
-# Tomas Palik <heidfeld at email.cz>, 2015
-# Vlastimil Burián <burian.vlastimil2 at gmail.com>, 2015
+# Tomas Palik, 2015
+# Vlastimil Burián <inactive+burianvlastimil at transifex.com>, 2015
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-03 20:57+0000\n"
-"Last-Translator: Vlastimil Burián <burian.vlastimil2 at gmail.com>\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/torproject/language/cs/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2018-10-25 18:02+0000\n"
+"Last-Translator: Michal Stanke <mstanke at mozilla.cz>\n"
+"Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\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"
+"Generated-By: Babel 1.3\n"
"Language: cs\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
@@ -38,68 +40,193 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
-msgstr "Promiňte! Něco se stalo špatně s vaším požadavkem."
+msgstr "Promiňte. Váš požadavek se nepodařilo provést."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Nahlásit chybu"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Zdrojový kód"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Seznam změn"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Označit vše"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Zobrazit QR kód"
+
+#: bridgedb/https/templates/bridges.html:52
+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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ježíšku na křížku!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Při zpracování vašeho QR kódu zřejmě nastala chyba."
+
+#: 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 "Tento QR kód obsahuje linky pro váš most. Pro zkopírování na mobilní nebo jiná zařízení naskenujte QR kód čtečkou."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Nyní nejsou k dispozici žádné mosty..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Možná by jste měl zkusit %s jít zpět %s a vybrat jiný typ mostů!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Krok %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Stáhnout %sprohlížeč Tor %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Krok %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Získat %s mosty %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Krok %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Nyní %s přidejte mosty do prohlížeče Tor %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.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sJ%sen mi dejte mosty!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Rozšířená nastavení"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Ne"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+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."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sN%sastavit mosty"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
-msgstr "[Toto je automatická zpráva; prosím, neodpovídejte na ni]"
+msgstr "[Toto je automatická zpráva. Neodpovídejte na ni prosím.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Zde jsou vaše mosty:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 "Překročil jste mezní limit. Prosíme zpomalte! Minimální čas nezi emaily je %s hodin. Všechny následující emaily během této časové doby budou ignorovány."
+msgstr "Překročili jste limit počtu požadavků. Zpomalte prosím. Minimální čas mezi e-maily je %s hodin. Všechny následující e-maily během této časové doby budou ignorovány."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "PŘÍKAZY: (kombinujte příkazy pro zadávání více možností současně)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Vítejte v BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "V současnosti podporované transport TYPEs:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Hey, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Ahoj, příteli!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Veřejné klíče"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
-msgstr "Tento email byl generován s duhou, jednorožci a jiskřičkami\npro %s data %s v %s"
+msgstr "Tento duhový e-mail plný jednorožců a hvězd byl generován pro %s dne %s v %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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -107,283 +234,158 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "BridgeDB může nabídnou mosty s několika %stypes of Pluggable Transports%s,\ncož může pomoci zmást vaše připojení k Tor Network, a udělat složitější pro kohokoli\nsledovat vaši internetovou aktivitu k určení zda používáte Tor.\n\n"
+msgstr "BridgeDB může nabídnou mosty s několika %s typy Pluggable Transports%s,\ncož může zamaskovat vaše připojení k síti Tor a znesnadnit pro kohokoli\nsledovat vaši internetovou aktivitu a určit, zda Tor používáte\nnebo nikoliv.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
-msgstr "Někteté mosty s IPv6 adresami jsou také k dispozici, přestože některé Pluggable Transports\nnejsou kompaktibilní s IPv6.\n"
+msgstr "K dispozici jsou také některé mosty s IPv6 adresami, přestože některé Pluggable Transports\nnejsou s IPv6 kompatibilní.\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
+#: bridgedb/strings.py:88
#, 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 "Dodatečně, BridgeDB má spustu nudných vanilkových mostů %s bez žádných \nPluggable Transports %s což sice nemusí znít tak super, ale úpořád mohou\npomoci obejít internetovou cenzuru v mnoha případech.\n\n"
+msgstr "BridgeDB má také spoustu obyčejných mostů %s bez žádných \nPluggable Transports %s. To sice nemusí znít tak super, ale pořád vám mohou v mnoha případech\npomoci obejít internetovou cenzuru.\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
-msgstr "Co jsou mosty?"
+msgstr "Co jsou to mosty?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Mosty %s jsou Tor přenosy které vám pomáhají obejít cenzuru."
+msgstr "%s Mosty %s jsou uzly Toru, které vám pomáhají obejít cenzuru."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
-msgstr "Chci mosty zjistit jiným způsobem!"
+msgstr "Potřebuji jiný způsob jak získat most!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, 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 "Další způsob jak dostat mosty je poslat email na %s. Prosíme mějte na paměti že musíte poslat email pouze z adresy od následujících poskytovatelů emailu:\n%s, %s nebo %s."
+msgstr "Další způsob, jak získat mosty, je poslat e-mail na %s. Mějte prosím na paměti, že musíte poslat e-mail pouze ze schránky následujících poskytovatelů e-mailových služeb:\n%s, %s nebo %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Mé mosty nefungují. Potřebuji pomoc!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
-msgstr "Pokud váš Tor nepracuje měl by jste nám poslat email %s."
+msgstr "Pokud vám Tor nefunguje, pošlete nám e-mail na %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
+#: bridgedb/strings.py:121
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 "Pokuste se popsat co nejvíce informací o vašem případu, včetně listu\nmostů a pluggable Transports které jste se pokusili použít, vaši verzi Tor Browser,\na jaké Tor poslal ven, atd."
+msgstr "Napište nám co nejvíce o vašem problému, včetně seznamu\nmostů a pluggable Transports, které jste se pokusili použít, vaši verzi prohlížeče Tor,\nvšechny zprávy, které jste od Toru získali, atd."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Zde jsou vaše linky k mostům: "
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
-msgstr "Získejte Mosty!"
+msgstr "Získat mosty!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
-msgstr "Prosím vyberte nastavení pro typ mostů:"
+msgstr "Vyberte úrosím nastavení pro typ mostu:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Potřebujete IPv6 adresu?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Potřebujete %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
-msgstr "Váš prohlížeč nezobrazuje obrázky správně."
+msgstr "Váš prohlížeč nezobrazuje správně obrázky."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
-msgstr "Vložte písmena z obrázku výše..."
+msgstr "Zadejte písmena z obrázku výše..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Jak začít používat mosty."
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, 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 "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."
+msgstr "K vložení mostů do prohlížeče Tor, postupujte podle instrukcí ke stažení a spuštění na %s stránce\nke stažení prohlížeče Tor %s."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
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:"
+msgstr "Když vyskočí 'Nastavení sítě Tor', klepněte na 'Konfigurovat' a postupujte\npodle průvodce, dokud se nezeptá:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
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?"
+msgstr "Blokuje nebo jinak cenzuruje váš poskytovatel internetového připojení (ISP) spojení se sítí Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
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 "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."
+msgstr "Vyberte 'Ano' a poté klikněte 'Další'. Pro nastavení nových mostů zkopírujte a\nvložte linky k mostům do textového pole. Nakonec klikněte na 'Připojit' a\nto by už mělo být všechno. Pokud narazíte na problémy, zkuste kliknout na tlačítko 'Pomoc'\nv dialogu průvodce 'Nastavení sítě Tor'."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
-msgstr "Požadovat vanilla mosty."
+msgstr "Požádat o obyčejné mosty."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
-msgstr "Požadovat IPv6 mosty."
+msgstr "Požádat o IPv6 mosty."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
-msgstr "Požadovat Pluggable Transport od TYPE."
+msgstr "Požádat o Pluggable Transport s TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
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:89
-msgid "Report a Bug"
-msgstr "Nahlásit chybu"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Zdrojový kód"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Seznam změn"
-
-#: 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Ježíšku na křížku!"
-
-#: 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:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Možná by jste měl zkusit %s jít zpět %s a vybrat jiný typ mostů!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Krok %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Stáhnout %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Krok %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Získej %s mosty %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Krok %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Nyní %s přidejte mosty do Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sJ%sen mi dejte mosty!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Rozšířené možnosti"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Ne"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-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:127
-#, python-format
-msgid "%sY%ses!"
-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:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sN%sastavit Bridges"
+msgstr "Získat kopii veřejného GnuPG klíče BridgeDB."
diff --git a/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po
index 6f61862..c377a7d 100644
--- a/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po
@@ -6,21 +6,23 @@
# Christian Villum <villum at autofunk.dk>, 2014-2015
# David Nielsen <gnomeuser at gmail.com>, 2014
# Mogelbjerg <jan at mogelbjerg.dk>, 2015
+# Lasse Møller <hal9k at riseup.net>, 2016
+# scootergrisen, 2017-2018
# OliverMller <theoliver at live.co.uk>, 2011
# Thomas Pryds <thomas at pryds.eu>, 2014
# Tore Bjørnson <tore.bjornson at gmail.com>, 2013
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-04 15:32+0000\n"
-"Last-Translator: Mogelbjerg <jan at mogelbjerg.dk>\n"
-"Language-Team: Danish (http://www.transifex.com/projects/p/torproject/language/da/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2018-10-17 02:20+0000\n"
+"Last-Translator: scootergrisen\n"
+"Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\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"
+"Generated-By: Babel 1.3\n"
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -35,68 +37,193 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
-msgstr "Beklager, noget gik galt med din anmodning."
+msgstr "Beklager. Noget gik galt med din anmodning."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Rapportér en fejl"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Kildekode"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Ændringslog"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Marker alle"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Vis QRCode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QRCode for dine brolinjer"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ups, vi står i lort til halsen!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Det lader til at der opstod en fejl ved hentningen af din QRCode."
+
+#: 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 "Denne QRCode indeholder dine brolinjer. Scan den med en QRCode-læser for at kopiere dine brolinjer over til mobile og andre enheder."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Der er i øjeblikket ingen tilgængelige broer..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr " Du kunne måse prøve %s at gå tilbage %s og vælge en anden brotype!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Trin %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Download %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Trin %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Få %s broer %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Trin %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "%s Tilføj broer til Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sB%sare giv mig broer!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Avancerede indstillinger"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Nej"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "ingen"
+
+#. 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:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sJ%sa!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sH%sent broer"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Dette er en automatisk meddelelse; Svar venligst ikke.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Her er dine broer:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 "Du har overskredet ratebegrænsningen. Sænk venligst hastigheden! Den minimale tid mellem\nemails er %s timer. Yderligere emails sendt i denne period vil blive ignoreret."
+msgstr "Du har overskredet ratebegrænsningen. Sænk venligst hastigheden! Den minimale tid mellem\ne-mails er %s timer. Yderligere e-mails sendt i denne periode vil blive ignoreret."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (Kombiner COMMANDs for at specifierer adskillige valgmuligheder på en gang)"
+msgstr "COMMANDs: (kombiner COMMANDs for at angive flere valgmuligheder samtidigt)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Velkommen til BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
-msgstr "Transport TYPEs som er understøttet i øjeblikket:"
+msgstr "Transport TYPE'er som er understøttet i øjeblikket:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Hej %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Hej min ven!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Offentlige nøgler"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
-msgstr "Denne email til %s blev skabt ved hjælp af regnbuer, enhjørninger og glitter %s klokken %s."
+msgstr "Denne e-mail til %s blev skabt ved hjælp af regnbuer,\nenhjørninger og glitter %s klokken %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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -104,283 +231,158 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "BridgeDB kan formidle broer med adskillige typer %sPluggable Transports%s som kan hjælpe med at sløre dine forbindelser til Tor netværket, og dermed gøre det vanskeligere for nogen som kan se din internet trafik at bestemme at du bruger Tor.\n"
+msgstr "BridgeDB kan formidle broer med adskillige typer %sUdskiftelige transporter%s\nsom kan hjælpe med at sløre dine forbindelser til Tor-netværket, og dermed\ngøre det vanskeligere for nogen som kan se din internet trafik at bestemme\nat du bruger Tor.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
-msgstr "Nogle broer med IPv6 adresser er også tilgængelige, men ikke alle Pluggable\nTransports understøtter IPv6.\n\n"
+msgstr "Nogle broer med IPv6-adresser er også tilgængelige, men ikke alle udskiftelige\ntransporter understøtter 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
+#: bridgedb/strings.py:88
#, 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 har ydermere masser af konventionelle broer %s uden nogen Pluggable Transports %s hvilket måske ikke lyder så smart, men de kan stadigvæk hjælpe med at omgå internet censur i mange tilfælde.\n"
+msgstr "BridgeDB har ydermere masser af konventionelle broer %s uden nogen\nudskiftelige transporter %s hvilket måske ikke lyder så smart, men de kan\nstadigvæk hjælpe med at omgå internet censur i mange tilfælde.\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Hvad er broer?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s broer %s er Tor relæer som hjælper dig med at omgå censur."
+msgstr "%s Broer %s er Tor-relæer som hjælper dig med at omgå censur."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Jeg har brug for en alternativ metode til at få broer på!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, 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 "En anden måde at finde broer er at sende en email til %s. Bemærk venligst at du skal\nsende mailen fra en konto hos en af de følgende email-udbydere:\n%s, %s eller %s."
+msgstr "En anden måde at finde broer er at sende en e-mail til %s. Bemærk venligst at du skal\nsende mailen fra en konto hos en af de følgende e-mailudbydere:\n%s, %s eller %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Mine broer virker ikke! Jeg har brug for hjælp!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
-msgstr "Hvis Tor ikke virker for dig kan du sende en email til %s."
+msgstr "Hvis Tor ikke virker for dig kan du sende en e-mail til %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
+#: bridgedb/strings.py:121
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 "Prøv at inkluderer så meget information om din sag som muligt, der i blandt: En liste af broer og Pluggable Transports du har prøvet at bruge, din Tor Browser version, hvilke beskeder Tor gav, etc."
+msgstr "Prøv at inkluderer så meget information om din sag som muligt, der i blandt:\nEn liste af broer og udskiftelige transporter du har prøvet at bruge, din\nTor Browser-version, hvilke beskeder Tor gav, osv."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Her er dine bro linjer:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Find broer!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Vælg venligst brotype muligheder:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Har du brug for IPv6 adresser?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Har du brug for en %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
-msgstr "Din browser kan ikke vise billeder korrekt."
+msgstr "Din browser kan ikke vise billeder ordentligt."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Indtast tegnene fra billedet ovenfor..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Sådan starter du med at bruge dine broer"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, 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 "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."
+msgstr "For at tage broer ind i Tor Browser, gå da først til %s Tor Browser\ndownloadside %s og følg instruktionerne i hvordan Tor Browser \ndownloades og startes."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
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:"
+msgstr "Når \"Tor-netværksindstillinger\"-dialogen popper op, så klik på \"Konfigurer\" og følg guiden til den siger:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
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?"
+msgstr "Blokerer eller på anden vis censurerer din internetudbyder forbindelser\ntil Tor-netværket?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
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 "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."
+msgstr "Vælg \"Ja\" og klik så på \"Næste\". For at konfigurere dine nye broer, kopiér\nog indsæt brolinjerne i den næste input boks. Klik til sidst 'Forbind', og så\ner du klar! Hvis du støder på problemer, så prøv at klikke på\n\"Hjælp\"-knappen i \"Tor-netværksindstillinger\"-guiden for at få yderligere hjælp."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Anmod almindelige broer."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
-msgstr "Amod IPv6 broer."
+msgstr "Anmod IPv6-broer."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
-msgstr "Anmod om Pluggable Transport efter TYPE."
+msgstr "Anmod om udskiftelig transport efter TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Hent en kopi af BridgeDB's offentlige GnuPG nøgle."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Rapporter en fejl"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Kildekode"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Ændringer"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kontakt"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Marker alle"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Vis QRCode"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QRCode for dine brolinier."
-
-#. 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 "Ups, vi står i lort til halsen"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Det lader til at der opstod en fejl ved hentningen af din QRCode."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Denne QRCode indeholder dine brolinier. Scan den med en QRCode-læser for at kopiere dine brolinier over til mobile og andre enheder."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Der er i øjeblikket ingen tilgængelige broer..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Du kunne måse prøve %s at gå tilbage %s og vælge en anden brotype!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Trin %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Hent %s Tor Browseren %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Trin %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Få %s broer %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Trin %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Tilføj nu %s broer til Tor Browseren %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 "%sB%sare giv mig bridges!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Advancerede indstillinger"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Nej"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "ingen"
-
-#. 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 "%sJ%sa!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sH%sent Bridges"
diff --git a/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po
index 67f5afb..e28fdef 100644
--- a/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po
@@ -3,31 +3,34 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
+# Christian Kaindl <crisscross.kaindl at outlook.de>, 2015
# trantor <clucko3 at gmail.com>, 2014
# Ettore Atalan <atalanttore at googlemail.com>, 2014
# jschfr <hello at janschoefer.com>, 2015
# unknwon_anonymous <jackjohnson0001 at yahoo.com>, 2014
# Junge Limba <jungelimba at gmail.com>, 2015
-# konstibae <konstibae at gmail.com>, 2014
+# Konstantin BB, 2014
# Locke <locke at dena-design.de>, 2011
# qbi <kubieziel at googlemail.com>, 2015
+# Roland Illig <roland.illig at gmx.de>, 2018
# Sebastian <sebix+transifex at sebix.at>, 2015
# debakel <spam1 at mrtz.me>, 2014
# Tobias Bannert <tobannert at gmail.com>, 2013
# Tobias Bannert <tobannert at gmail.com>, 2014
-# Toralf Förster <toralf.foerster at gmx.de>, 2015
+# Toralf Förster <inactive+toralf at transifex.com>, 2015
+# try once, 2015
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-16 18:33+0000\n"
-"Last-Translator: Toralf Förster <toralf.foerster at gmx.de>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2018-06-11 23:31+0000\n"
+"Last-Translator: Roland Illig <roland.illig at gmx.de>\n"
+"Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\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"
+"Generated-By: Babel 1.3\n"
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -42,57 +45,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Wir bitten um Entschuldigung. Bei Ihrer Anfrage lief etwas schief."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Einen Fehler melden"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Quellcode"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Änderungsprotokoll"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Alles auswählen"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "QRCode anzeigen"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QRCode für Ihre Brückenverbindungen"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Oh, es ist etwas schief gegangen!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Es gab vermutlich einen Fehler beim Beschaffen Ihres QR-Codes."
+
+#: 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 "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."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Im Moment sind keine Brücken verfügbar …"
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Möglicherweise sollten Sie versuchen %s zurückzugehen %s und einen anderen Brückentyp auszuwählen!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Schritt %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "%s Tor Browser %s herunterladen"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Schritt %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "%s Brücken %s erhalten"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Schritt %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Jetzt %s bitte die Brücken zum Tor-Browser hinzufügen %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.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sM%sir nur Brücken geben!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Erweiterte Optionen"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Nein"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "keine"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sJ%sa!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sB%srücken erhalten"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Das ist eine automatische Nachricht. Bitte antworten Sie nicht darauf.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Hier sind Ihre Brücken-Server (Bridges):"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 "Sie haben den Grenzwert überschritten. Bitte verlangsamen! Der kleinste Abstand zwischen \nden E-Mails beträgt %s Stunden. Alle weiteren E-Mails, während dieser Zeit, werden ignoriert."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "Befehle: (Befehle kombinieren, um mehrere Optionen gleichzeitig anzugeben)"
+msgstr "BEFEHLE: (Kombinieren Sie BEFEHLE um mehrere Möglichkeiten gleichzeitig anzugeben)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
-msgstr "Willkommen bei der Brückendatenbank!"
+msgstr "Willkommen bei BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Aktuell unterstützte Transporttypen:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Hallo, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Hallo Freund!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Öffentliche Schlüssel"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -103,7 +231,7 @@ msgstr "Diese E-Mail wurde für %s am %s um %s mit Regenbogen, Einhörnern und G
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -111,10 +239,10 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "Die Brückendatenbank kann Brücken-Server mit verschiedenen %stypen der Pluggable Transports%s bereitstellen. Diese können helfen, Ihre Verbindungen zum Tor-Netzwerk zu verschleiern. Damit wird es für Dritte schwieriger festzustellen, dass sie Tor benutzen.\n\n"
+msgstr "BridgeDB kann Brücken-Server mit verschiedenen %stypen der Pluggable Transports%s\nbereitstellen. Diese können helfen, Ihre Verbindungen zum Tor Network zu verschleiern. Damit wird es für Dritte schwieriger\nfestzustellen, dass Sie\nTor benutzen.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -126,7 +254,7 @@ msgstr "Einige Brücken mit IPv6-Adressen sind ebenfalls vorhanden, auch wenn ei
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -135,20 +263,20 @@ msgid ""
"\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
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Was sind Brücken?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, 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 dabei helfen, die Zensur zu umgehen."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Ich brauche einen anderen Weg, um Adressen von Brücken-Servern zu erhalten."
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -156,12 +284,12 @@ msgid ""
"%s, %s or %s."
msgstr "Sie können auch eine E-Mail an %s schicken, um Adressen von Brücken-Servern zu erhalten. Die E-Mail muss von einem der folgenden E-Mail-Anbieter geschickt werden: %s, %s oder %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Meine Brücken-Server funktionieren nicht! Ich brauche Hilfe!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Sollte Tor bei Ihnen nicht funktionieren, senden Sie bitte eine E-Mail an %s."
@@ -169,48 +297,48 @@ msgstr "Sollte Tor bei Ihnen nicht funktionieren, senden Sie bitte eine E-Mail a
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr "Versuchen Sie in Ihrer E-Mail möglichst viele Informationen über Ihr Problem einzubeziehen, \neinschließlich einer Liste der Brücken-Server und der Pluggable Transports, die Sie versuchten zu benutzen, \nIhre Tor-Browser-Version, und jegliche Meldungen, die Tor gegeben hat, usw."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Hier sind Ihre Brückenadressen:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Erhalten Sie Adressen von Brücken-Servern!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Bitte wählen Sie die Optionen für den Brückentyp aus:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Benötigen Sie IPv6-Adressen?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Benötigen Sie eine %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Bilder werden in Ihrem Browser nicht korrekt dargestellt."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Bitte geben Sie die Zeichen aus dem oberen Bild ein."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "So starten Sie die Benutzung Ihrer Brücken"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -219,21 +347,21 @@ msgid ""
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:126
+#: bridgedb/strings.py:151
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:130
+#: bridgedb/strings.py:155
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:134
+#: bridgedb/strings.py:159
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"
@@ -241,153 +369,28 @@ 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:142
+#: bridgedb/strings.py:167
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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Standard-Brücken anfordern."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "IPv6-Brücken anfordern."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
-msgstr "Einen Pluggable Transport des TYPs anfordern."
+msgstr "Einen Pluggable Transport des TYPEs anfordern."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Eine Kopie des öffentlichen GnuPG-Schlüssels der Brückendatenbank erhalten."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Einen Fehler melden"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Quellcode"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Änderungsprotokoll"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kontakt"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Alles auswählen"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "QRCode anzeigen"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QRCode für Ihre Brückenverbindungen"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-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 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."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Im Moment sind keine Brücken verfügbar …"
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-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
-msgid "Step %s1%s"
-msgstr "Schritt %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "%s Tor Browser %s herunterladen"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Schritt %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "%s Brücken %s erhalten"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Schritt %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Jetzt %s bitte die Brücken zum Tor-Browser hinzufügen %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 "%sM%sir nur Brücken geben!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Erweiterte Optionen"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Nein"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "keine"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sJ%sa!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sB%srücken erhalten"
diff --git a/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po
index bbbbe92..91fc639 100644
--- a/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po
@@ -1,28 +1,35 @@
# 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:
# Adrian Pappas <pappasadrian at gmail.com>, 2014
+# Aikaterini Katmada, 2015
# andromeas <andromeas at hotmail.com>, 2014
+# A Papac <ap909219 at protonmail.com>, 2018
# oahanx, 2014
-# isv31 <ix4svs at gmail.com>, 2014
+# Ilias Giannaros <iliasgnrs at gmail.com>, 2015
+# isv31 <36b043a6 at anon.leemail.me>, 2014
# kotkotkot <kotakota at gmail.com>, 2013
# kotkotkot <kotakota at gmail.com>, 2012
-# mitzie <zacharias.mitzelos at gmail.com>, 2013
+# LOUKAS SKOUROLIAKOS, 2015
+# Orion Belt <orionbelt2 at gmail.com>, 2018
+# Panos <alwayslivid at protonmail.com>, 2018-2019
+# Sofia K., 2018
+# mitzie <accounts at mitzelos.com>, 2013
# Wasilis Mandratzis <inactive+Wasilis at transifex.com>, 2013
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-07-26 02:11+0000\n"
-"PO-Revision-Date: 2014-10-15 17:11+0000\n"
-"Last-Translator: oahanx\n"
-"Language-Team: Greek (http://www.transifex.com/projects/p/torproject/language/el/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-01-15 12:20+0000\n"
+"Last-Translator: erinm\n"
+"Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\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"
+"Generated-By: Babel 1.3\n"
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -37,68 +44,193 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:121
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
-msgstr "Συγγνώμη! Κάτι πήγε στραβά με το αίτημα σας."
+msgstr "Συγνώμη! Κάτι πήγε στραβά με το αίτημά σας."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Αναφορά Προβλήματος"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Πηγαίος Κώδικας"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Αρχείο καταγραφής αλλαγών"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Επαφή"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Επιλογή όλων"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Εμφάνιση QRCode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QRCode για τις γέφυρές σας"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ουπς, κάτι πήγε στραβά!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Από ό,τι φαίνεται, υπήρξε ένα πρόβλημα κατά την ανάκτηση του QRCode σας. "
+
+#: 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 "Αυτό το QRCode περιέχει τις γραμμές γέφυρας. Διαβάστε το με ένα QRCode scanner για να αντιγράψετε τις γραμμές γέφυρας σε κινήτη και άλλη συσκευή."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Δεν υπάρχουν διαθέσιμες γέφυρες..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Δοκιμάστε να %s πάτε πίσω %s και να επιλέξετε διαφορετικό τύπο γέφυρας!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Βήμα %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Κατεβάστε τον %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Βήμα %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Αποκτήστε τις %s γέφυρες%s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Βήμα %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Τώρα %s προσθέστε τις γέφυρες στον Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sΑ%sπλώς δώσε μου γέφυρες!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Επιλογές για προχωρημένους"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Όχι"
+
+#: 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:124
+#, 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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sΛ%sήψη Γεφυρών"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
-msgstr "[Αυτό είναι ένα αυτοματοποιημενο μήνυμα, παρακαλούμε μην απαντήσετε]"
+msgstr "[Αυτό είναι ένα αυτοματοποιημένο μήνυμα· παρακαλώ μην απαντήσετε.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
-msgstr "Εδώ είναι οι γέφυρες σας:"
+msgstr "Ορίστε, οι γέφυρές σας:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 "Ξεπέρασες το όριο. Παρακαλώ, πιό αργά! Ο ελάχιστος χρόνος μεταξύ διαδοχικών email\n είναι %s ώρες. Όλα τα ενδιάμεσα email σε αυτό το χρονικό διάστημα θα αγνοούνται."
+msgstr "Ξεπεράσατε το όριο. Παρακαλώ, πιο αργά! Ο ελάχιστος χρόνος μεταξύ διαδοχικών email\n είναι %s ώρες. Όλα τα ενδιάμεσα email σε αυτό το χρονικό διάστημα θα αγνοούνται."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "ΕΝΤΟΛΕΣ: (συνδυάστε ΕΝΤΟΛΕΣ για να επιλέξετε πολλαπλές παραμέτρους ταυτόχρονα)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Καλώς ήρθατε στο BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Υποστηριζόμενα transport TYPEs:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
-msgstr "Γειά σου, %s!"
+msgstr "Γειά σας, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Γεια σου, φίλε!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Δημόσια Κλειδιά"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
-msgstr "Αυτό το email παρήχθη με αγάπη, ουράνια τόξα και χρυσόσκονη\nγια τον/την %s, %s στις %s."
+msgstr "Αυτό το email παρήχθη με αγάπη, ουράνια τόξα και χρυσόσκονη\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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -106,22 +238,22 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "Η BridgeDB μπορεί να παρέχει γέφυρες με διάφορους %sτύπους Pluggable Transports%s,\nτα οποία μπορούν να κρύψουν τις συνδέσεις σας στο Tor Network, κάνοντάς το δυσκολότερο για κάποιον που παρακολουθεί τη δικτυακή δραστηριότητά σας να καταλάβει πως χρησιμοποιείτε Tor.\n\n"
+msgstr "Η BridgeDB μπορεί να παρέχει γέφυρες με διάφορους %sτύπους Pluggable Transports%s,\nτα οποία μπορούν να κρύψουν τις συνδέσεις σας στο δίκτυο Tor, κάνοντας το\nδυσκολότερο για κάποιον που παρακολουθεί τη κίνηση σας να καταλάβει πως\nχρησιμοποιείτε Tor.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
-msgstr "Υπάρχουν γέφυρες με διευθύνσεις IPv6 addresses, αλλά κάποια Pluggable\nTransports δεν είναι συμβατά με IPv6.\n\n"
+msgstr "Υπάρχουν γέφυρες με διευθύνσεις IPv6, αλλά κάποια Pluggable\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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -130,20 +262,20 @@ msgid ""
"\n"
msgstr "Επίσης, η BridgeDB έχει πολλές παλιές καλές γέφυρες %s χωρίς\nPluggable Transports %s που ίσως δεν ακούγεται καταπληκτικό, αλλά σε πολλές περιπτώσεις μπορούν να σας βοηθήσουν να παρακάμψετε τη λογοκρισία.\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Τι είναι οι γέφυρες;"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "Οι %s Γέφυρες %s είναι Tor αναμεταδότες που βοηθούν στην παράκαμψη της λογοκρισίας. "
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
-msgstr "Χρειάζομαι έναν εναλλακτικό τρόπο για χρησιμοποιηση γέφυρων! "
+msgstr "Χρειάζομαι έναν εναλλακτικό τρόπο για λήψη γεφυρών! "
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -151,12 +283,12 @@ msgid ""
"%s, %s or %s."
msgstr "Εναλλακτικά μπορείτε να λάβετε γέφυρες στελνοντας email στο %s. Πρέπει να στείλετε email χρησιμοποιώντας μία διευθυνση email από έναν από τους παρακάτω πάροχους:\n%s, %s or %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Οι γέφυρες μου δεν λειτουργούν! Χρειάζομαι βοήθεια! "
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Αν το Tor σας δε δουλεύει, παρακαλώ στείλτε email στο %s."
@@ -164,201 +296,100 @@ msgstr "Αν το Tor σας δε δουλεύει, παρακαλώ στείλ
#. 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
+#: bridgedb/strings.py:121
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 "Παρακαλώ δώστε μας όσο το δυνατόν περισσότερες πληροφορίες για το σφάλμα που συναντήσατε, όπως τη λίστα γεφυρών και τα Pluggable Transports που προσπαθήσετε να χρησιμοποιήσετε, την έκδοση του Tor Browser, ό,τι μηνύματα έδειξε το Tor κτλ."
+msgstr "Παρακαλώ δώστε μας όσο το δυνατόν περισσότερες πληροφορίες για το \nσφάλμα που συναντήσατε, όπως τη λίστα γεφυρών και τα Pluggable Transports \nπου προσπαθήσατε να χρησιμοποιήσετε, την έκδοση του Tor Browser, \nό,τι μηνύματα έδειξε το Tor, κτλ."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
-msgstr "Ιδού οι γραμμές για τις γέφυρές σας:"
+msgstr "Ορίστε, οι γραμμές για τις γέφυρές σας:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Λήψη Γεφυρών!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Παρακαλώ επιλέξτε τις επιλογές για τον τύπο της γέφυρας:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
-msgstr "Χρειάζεσαι μια διεύθυνση IPv6;"
+msgstr "Χρειάζεστε μια διεύθυνση IPv6;"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Μήπως χρειάζεστε ένα %s;"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
-msgstr "Ο φυλλομετρητής σας δεν εμφανίζει τις εικόνες σωστά."
+msgstr "Ο browser σας δεν εμφανίζει τις εικόνες σωστά."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Εισάγετε τους χαρακτήρες από την παραπάνω φωτογραφία..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Πώς να αρχίσετε να χρησιμοποιείτε τις γέφυρες σας"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, 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 σελίδα download του Tor Browser %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 "Για να εισάγετε bridges στο Tor Browser, αρχικά επιλέξτε %s Tor Browser σελίδα\nκατεβάσματος%s έπειτα ακολουθήστε τις οδηγίες για κατέβασμα και εκκίνηση του \nTor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:125
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Όταν φτάσετε στο διάλογο \"Ρυθμίσεις δικτύου του Tor\" , επιλέξτε \"Ρύθμιση\" και ακολουθήστε τους διαλόγους μέχρι να σας ρωτήσει:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:129
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
-msgstr "Γνωρίζετε αν ο πάροχος (ISP) σας μπλοκάρει ή με οποιοδήποτε τρόπο ελέγχει συνδέσεις\nστο δίκτυο Tor?"
+msgstr "Ο πάροχος (ISP) σας μπλοκάρει ή με οποιοδήποτε τρόπο λογοκρίνει συνδέσεις\nστο δίκτυο Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:133
+#: bridgedb/strings.py:159
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 "Επιλέξτε \"Ναι\" και μετά πατήστε \"Επόμενο\" Για να ρυθμίσετε τις νέες σας γέφυρες, αντιγράψτε τις γραμμές με τις διευθύνσεις των γεφυρών στο κουτί κειμένου. Μετά πατήστε \"Σύνδεση\" και πρέπει να είστε εντάξει! Αν αντιμετωπίσετε προβλήματα, επιλέξτε το κουμπί \"Βοήθεια\" στις \"Ρυθμίσεις δικτύου του Tor\"."
+msgstr "Επιλέξτε \"Ναι\" και μετά πατήστε \"Επόμενο\". Για να ρυθμίσετε τα νέα σας \nbridges, αντιγράψτε τις γραμμές με τις διευθύνσεις των bridges στο κουτί \nκειμένου. Μετά πατήστε \"Σύνδεση\" και πρέπει να είστε εντάξει! Αν \nαντιμετωπίσετε προβλήματα, επιλέξτε το κουμπί \"Βοήθεια\" στις \"Ρυθμίσεις \nδικτύου του Tor\"."
-#: lib/bridgedb/strings.py:141
+#: bridgedb/strings.py:167
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
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
-msgstr "Αίτηση γεφυρών βανίλια."
+msgstr "Αίτηση παλιών καλών bridges."
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Αίτηση IPv6 γεφυρών."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:148
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Ζητήστε ένα Pluggable Transport βάσει TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:151
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Λάβετε ένα αντίγραφο του δημοσίου GnuPG κλειδιού του BridgeDB."
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Report a Bug"
-msgstr "Αναφορά Προβλήματος"
-
-#: lib/bridgedb/templates/base.html:94
-msgid "Source Code"
-msgstr "Πηγαίος Κώδικας"
-
-#: lib/bridgedb/templates/base.html:97
-msgid "Changelog"
-msgstr "Αρχείο καταγραφής αλλαγών"
-
-#: lib/bridgedb/templates/base.html:99
-msgid "Contact"
-msgstr "Επαφή"
-
-#. 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:72
-msgid "There currently aren't any bridges available..."
-msgstr "Δεν υπάρχουν καθόλου διαθέσιμες γέφυρες..."
-
-#: lib/bridgedb/templates/bridges.html:73
-#, 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 Tor Browser %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 προσθέστε τις γέφυρες στο Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%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:130
-#, 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:154
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sΛ%sήψη Γεφυρών"
diff --git a/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po
index 67d2555..8bb8bff 100644
--- a/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po
@@ -1,23 +1,23 @@
# Translations template for BridgeDB.
# Copyright (C) 2015 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
-#
+#
# Translators:
# Andi Chandler <andi at gowling.com>, 2014-2015
# Richard Shaylor <rshaylor at me.com>, 2014
# ronnietse <tseronnie at ymail.com>, 2014
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-07 13:19+0000\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2017-09-19 23:30+0000\n"
"Last-Translator: Andi Chandler <andi at gowling.com>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\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"
+"Generated-By: Babel 1.3\n"
"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -32,57 +32,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Sorry! Something went wrong with your request."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Report a Bug"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Source Code"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Changelog"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Contact"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Select All"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Show QRCode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QRCode for your bridge lines"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Uh oh, spaghettios!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "It seems there was an error getting your QRCode."
+
+#: 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 "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy your bridge lines onto mobile and other devices."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "There are no bridges available currently..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Perhaps you should try %s going back %s and choosing a different bridge type!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Step %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Download %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Step %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Get %s bridges %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Step %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Now %s add the bridges to Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sJ%sust give me bridges!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Advanced Options"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "No"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "none"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sY%ses!"
+
+#. 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:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sG%set Bridges"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[This is an automated message; please do not reply.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Here are your bridges:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "You have exceeded the rate limit. Please slow down! The minimum time between\nemails is %s hours. All further emails during this time period will be ignored."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Welcome to BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Currently supported transport TYPEs:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Hey, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Hello, friend!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Public Keys"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -93,7 +218,7 @@ msgstr "This email was generated with rainbows, unicorns, and sparkles\nfor %s o
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -104,7 +229,7 @@ msgid ""
msgstr "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\nwhich can help obfuscate your connections to the Tor Network, making it more\ndifficult for anyone watching your internet traffic to determine that you are\nusing Tor.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -116,7 +241,7 @@ msgstr "Some bridges with IPv6 addresses are also available, though some Pluggab
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -125,20 +250,20 @@ msgid ""
"\n"
msgstr "Additionally, BridgeDB has plenty of plain old vanilla bridges %s without any\nPluggable Transports %s which maybe doesn't sound as cool, but they can still\nhelp to circumvent internet censorship in many cases.\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "What are bridges?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Bridges %s are Tor relays that help you circumvent censorship."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "I need an alternative way of getting bridges!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -146,12 +271,12 @@ msgid ""
"%s, %s or %s."
msgstr "Another way to get bridges is to send an email to %s. Please note that you must\nsend the email using an address from one of the following email providers:\n%s, %s or %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "My bridges don't work! I need help!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "If your Tor doesn't work, you should email %s."
@@ -159,48 +284,48 @@ msgstr "If your Tor doesn't work, you should email %s."
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
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 "Try including as much info about your case as you can, including the list of\nbridges and Pluggable Transports you tried to use, your Tor Browser version,\nand any messages which Tor gave out, etc."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Here are your bridge lines:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Get Bridges!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Please select options for bridge type:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Do you need IPv6 addresses?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Do you need a %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Your browser is not displaying images properly."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Enter the characters from the image above..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "How to start using your bridges"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -209,21 +334,21 @@ msgid ""
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:126
+#: bridgedb/strings.py:151
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:130
+#: bridgedb/strings.py:155
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:134
+#: bridgedb/strings.py:159
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"
@@ -231,153 +356,28 @@ 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:142
+#: bridgedb/strings.py:167
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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Request vanilla bridges."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Request IPv6 bridges."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
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:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Get a copy of BridgeDB's public GnuPG key."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Report a Bug"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Source Code"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Changelog"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Contact"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Select All"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Show QRCode"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QRCode for your bridge lines"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Uh oh, spaghettios!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "It seems there was an error getting your QRCode."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy your bridge lines onto mobile and other devices."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "There are no bridges available currently..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Perhaps you should try %s going back %s and choosing a different bridge type!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Step %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Download %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Step %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Get %s bridges %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Step %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Now %s add the bridges to Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sJ%sust give me bridges!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Advanced Options"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "No"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "none"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sY%ses!"
-
-#. 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 "%sG%set Bridges"
diff --git a/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po
index 9b41809..d0883fb 100644
--- a/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po
@@ -5,27 +5,33 @@
# Translators:
# dark_yoshi <angelargi at yahoo.es>, 2014
# toypurina <biolenta at riseup.net>, 2014
+# B. K., 2016
# BL <tresemes3 at gmail.com>, 2014
-# Edward Navarro <enavarro at umbrella.co>, 2015
-# Ignacio Rodríguez <ignacio at sugarlabs.org>, 2015
+# Edward Navarro, 2015
+# Emma Peel, 2017-2019
+# eulalio barbero espinosa <eulaliob at gmail.com>, 2016
+# Ignacio Rodríguez <inactive+i5o at transifex.com>, 2015
# NinjaTuna <nort0ngh0st at hotmail.com>, 2011
# Noel Torres <envite at rolamasao.org>, 2013
# Paola Falcon <cacoepy at gmail.com>, 2014
+# ROSA CRUELLS <thelmacat65 at hotmail.com>, 2015
# Jonis <srvial at hotmail.com>, 2014
-# strel, 2013-2015
+# strel, 2013-2016
# strel, 2012
+# Werwolf NS <inactive+WerwolfNS at transifex.com>, 2017
+# 322ccc6cfb939d448f1137bdc72c015b, 2016
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-03 07:21+0000\n"
-"Last-Translator: Ignacio Rodríguez <ignacio at sugarlabs.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-03-10 11:12+0000\n"
+"Last-Translator: Emma Peel\n"
+"Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\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"
+"Generated-By: Babel 1.3\n"
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -40,68 +46,193 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
-msgstr "¡Lo sentimos! Algo mal pasó con tu solicitud."
+msgstr "¡Lo sentimos! Algo ha fallado al procesar tu solicitud."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Informar sobre un error"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Código fuente"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Registro de cambios"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Contacto"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Seleccionar todos"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Mostrar código QR"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "Código QR para tus líneas de puentes"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Oh oh, ¡la liamos! "
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Parece que hubo un error al obtener tu código QR. "
+
+#: 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 "Este código QR contiene sus líneas de puente. Escanéalo con un lector de códigos QR para copiar tus líneas de puente a dispositivos móviles y otros dispositivos."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Ahora mismo no hay ningún puente disponible..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "¡Tal vez deberías probar a %s retroceder %s y seleccionar un tipo distinto de puente!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Paso %s1%s "
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Descarga %s el Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Paso %s2%s "
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Consigue %s puentes %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Paso %s3%s "
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Ahora %s añade los puentes al Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "¡Dame %sS%sólo puentes! "
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Opciones avanzadas"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "No"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "ninguno"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "¡%sS%sí!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sC%sonseguir Puentes"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
-msgstr "[Este es un mensaje automático; por favor no responda.]"
+msgstr "[Este es un mensaje automático; por favor no respondas.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
-msgstr "Aquí están sus bridges:"
+msgstr "Aquí tienes tus puentes:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 "Ha excedido el límite de velocidad. Por favor, ¡más despacio! El tiempo mínimo entre correos electrónicos es %s horas. Los siguientes correos durante este periodo de tiempo serán ignorados. "
+msgstr "Has excedido el límite de cuota. Por favor, ¡más despacio! El tiempo mínimo entre correos electrónicos es %s horas. Durante este periodo se ignorarán los correos. "
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (combine COMMANDs (comandos) para especificar múltiples opciones simultáneamente)"
+msgstr "COMMANDs: (combina COMMANDs para especificar de manera simultánea opciones múltiples)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "¡Bienvenido a BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
-msgstr "Transport TYPEs actualmente soportados:"
+msgstr "TIPOs de transporte soportados actualmente:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "¡Eh, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "¡Hola amigo!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Claves públicas"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
-msgstr "Este correo fue generado con arcoiris, unicornios y chispitas para %s el %s a las %s."
+msgstr "Este correo fue generado con arcoiris, unicornios y estrellitas para %s el %s a las %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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -109,283 +240,158 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "BridgeDB puede proveer bridges con varios %stipos de Pluggable Transports%s que pueden ayudar a ofuscar sus conexiones a la red Tor, haciendo que sea más difícil para alguien que esté viendo su tráfico en la red el determinar que ud. está usando Tor.\n"
+msgstr "BridgeDB puede proporcionar puentes con diferentes %stipos de Pluggable Transports%s que pueden ayudar a ofuscar tus conexiones a la red Tor, dificultando determinar que estás usando Tor para alguien que esté observando tu tráfico de Internet.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
-msgstr "También hay disponibles varios bridges con direcciones IPv6, aunque algunos\nPluggable Trasnports no son compatibles con IPv6.\n\n"
+msgstr "También hay disponibles varios puentes con direcciones IPv6, aunque algunos Transportes conectables no son compatibles con 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
+#: bridgedb/strings.py:88
#, 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 "Además, BridgeDB tiene un montón de sencillos-clásicos-estándar (vanilla) bridges\n%s sin ningún Pluggable Transport %s, lo que tal vez no suena tan molón, pero que\naún pueden ayudar a eludir la censura en Internet en muchos casos.\n\n\n"
+msgstr "Además, BridgeDB tiene un montón de puentes estándar %s sin ningún Pluggable Transport %s , lo que tal vez no suena tan molón, pero que todavía pueden ayudar a eludir la censura en Internet en muchos casos.\n\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
-msgstr "¿Qué son los puentes ('bridges')?"
+msgstr "¿Qué son los puentes?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "Los %s bridges %s son un tipo de repetidores Tor que le ayudan a eludir la censura."
+msgstr "Los %s puentes %s son repetidores Tor que te ayudan a eludir la censura."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
-msgstr "¡Necesito un modo alternativo de conseguir puentes!"
+msgstr "¡Necesito un modo alternativo de obtención de puentes de red!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, 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 "Otra forma de obtener repetidores puente (bridges) es enviar un correo electrónico a %s. Por favor observe que tiene que enviar el correo usando la dirección de uno de los siguientes proveedores de correo electrónico:\n%s, %s or %s."
+msgstr "Otra forma de obtener puentes de red es enviar un correo a %s. Ten en cuenta que tienes que enviar el correo usando una dirección de uno de los siguientes proveedores de correo electrónico:\n%s, %s o %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
-msgstr "¡Mis bridges/puentes no funcionan! ¡Necesito ayuda!"
+msgstr "¡Mis puentes funcionan! ¡Necesito ayuda!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
-msgstr "Si su Tor no funciona, debe enviar un correo a %s"
+msgstr "Si Tor no funciona, debes enviar un correo a %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
+#: bridgedb/strings.py:121
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 "Intenta incluir tanta información como puedas de tu caso, incluyendo la lista de\nbridges (repetidores puente) y Pluggable Transports (transportes conectables) que\nintentaste usar, tu versión de Navegador Tor y cualquier mensaje que haya dado Tor, etc."
+msgstr "Intenta incluir tanta información como puedas sobre tu caso, incluyendo la lista de\npuentes y Pluggable Transports que intentaste usar, versión de Tor Browser y cualquier mensaje que Tor haya dado, etc."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
-msgstr "Aquí están tus líneas de bridge:"
+msgstr "Estas son tus líneas de puente de red:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
-msgstr "¡Obtener bridges!"
+msgstr "¡Obtener puentes!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
-msgstr "Por favor, selecciona opciones para el tipo de bridge:"
+msgstr "Por favor, selecciona opciones para el tipo de puente:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "¿Necesitas direcciones IPv6?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "¿Necesitas un %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Tu navegador no está mostrando las imágenes correctamente."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Introduce los caracteres de la imagen de arriba..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
-msgstr "Cómo comenzar a usar tus bridges"
+msgstr "Cómo comenzar a usar los puentes"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, 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 "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."
+msgstr "Para introducir puentes de red en el Tor Browser, ve a la %s página de descarga del Tor Browser %s y sigue las instrucciones de descarga e inicio del Tor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
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:"
+msgstr "Cuando aparezca el cuadro 'Configuración de red Tor', haz clic en 'Configurar'\ny sigue al asistente hasta que pregunte:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
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?"
+msgstr "¿Tu 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:134
+#: bridgedb/strings.py:159
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 "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."
+msgstr "Selecciona 'Sí' y luego haz clic en 'Siguiente'. Para configurar tus nuevos\npuentes, copia y pega las líneas de puentes en el recuadro de texto.\nPor último, haz clic en 'Conectar', ¡y listo! Si hay algún problema, prueba en 'Ayuda' en el asistente de 'Configuración de red Tor' para asistencia adicional."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
-msgstr "Solicitar bridges estándar (vanilla)."
+msgstr "Solicitar puentes estándar."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
-msgstr "Solicitar bridges IPv6."
+msgstr "Solicitar puente de red IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
-msgstr "Solicitar un Pluggable Transport por TYPE."
+msgstr "Solicitar un Pluggable Transport por TYPE ."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Obtener una copia de la clave pública GnuPG de BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Reportar una falla"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Código fuente"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Registro de cambios"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Contactar"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Seleccionar todos"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Mostrar código QR"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "Código QR para sus líneas de repetidores puente"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Oh oh, ¡la liamos!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Parece que hubo un error al obtener su código QR."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Este código QR contiene sus líneas de repetidores puente (bridges). Escanéelo con un lector de códigos QR para copiar sus líneas de puentes a dispositivos móviles/celulares y otros dispositivos."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Ahora mismo no hay ningún bridge disponible..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "¡Tal vez debas probar %s volviendo atrás %s y seleccionando un tipo diferente de bridge!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Paso %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Descarga %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Paso %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Obtenga los %s puentes ('bridges') %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Paso %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Ahora %s añada los bridges al Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "¡%sS%sólo dame los bridges!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Opciones avanzadas"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "No"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "ninguno"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "¡%sS%sí!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sO%sbtener bridges"
diff --git a/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po
index 0b9b793..692a7f9 100644
--- a/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po
@@ -4,27 +4,31 @@
#
# Translators:
# arashaalaei <aalaeiarash at gmail.com>, 2011
-# signal89 <ali.faraji90 at gmail.com>, 2014
+# signal89, 2014
+# Amir Moezzi <amirreza.mz at yahoo.com>, 2017
# ardeshir, 2013
-# Gilberto, 2014-2015
+# Ehsan Ab <a.ehsan70 at gmail.com>, 2015
+# NoProfile, 2014-2015
# johnholzer <johnholtzer123 at gmail.com>, 2014
+# Mehrad Rousta <mehrad77 at gmail.com>, 2018
# Mohammad Hossein <desmati at gmail.com>, 2014
# perspolis <rezarms at yahoo.com>, 2011
+# masoudd <relive.mn at gmail.com>, 2018
# Setareh <setareh.salehee at gmail.com>, 2014
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 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"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-05-12 17:54+0000\n"
+"Last-Translator: Reza Ghasemi\n"
+"Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\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"
+"Generated-By: Babel 1.3\n"
"Language: fa\n"
-"Plural-Forms: nplurals=1; plural=0;\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):
@@ -37,68 +41,193 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
-msgstr "متاسف هستیم، در رابطه با درخواست شما خطایی رخ داده است."
+msgstr "متاسفانه در رابطه با درخواست شما خطایی رخ داده است."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "گزارش یک باگ"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "کد منبع"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "لیست تغییرات"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "تماس"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "گزینش همه"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "نمایش QRCode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QRCode برای خطوط پل خود"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "آخ آخ، اشتباه شد!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "به نظر می رسد یک خطا در گرفتن QRCode شما وجود دارد."
+
+#: 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 "این QRCode شامل خطوط پل خود. اسکن آن را با یک خواننده QRCode برای کپی خطوط پل خود بر روی تلفن همراه و دستگاه های دیگر."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "هماکنون هیچ پلی در دسترس نیست..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr " شاید شما باید سعی کنید %s بازگشت %s و انتخاب نوع پل های مختلف!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "مرحله %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "دانلود %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "مرحله %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "دریافت %s پل ها %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "مرحله %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "حالا %s اضافه کردن پل ها به Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sف%sقط بده به من پل ها را!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "گزینههای پیشرفته"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "نه"
+
+#: 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:124
+#, 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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sد%sریافت پلها"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
-msgstr "[این یک پیام خودکار می باشد، لطفا پاسخ ندهید.]"
+msgstr "[این یک پیام خودکار میباشد، لطفا پاسخ ندهید.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "فهرست پلهای شما:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "دستورات: (ترکیب دستورات برای مشخص کردن گزینه های متعدد به طور همزمان)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
-msgstr "به BridgeDB خوش آمدید!"
+msgstr "به BridgeDB خوشآمدید!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
-msgstr "انواع ممکن از TYPE های انتقال:"
+msgstr "در حال حاضر مدل های حمل و نقل پشتیبانی شده هستند : "
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "سلام، %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
-msgstr "سلام دوست من!"
+msgstr "سلام دوستم!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
-msgstr "Public Key ها"
+msgstr "کلیدهای عمومی"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
-msgstr "این ایمیل با رنگین کمان ها، اسب های تکشاخ و زرق و برق برای %s بر %s و در %s تولید شده است."
+msgstr "این ایمیل با رنگینکمانها، اسبهای تکشاخ و زرق و برق برای %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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -109,7 +238,7 @@ msgid ""
msgstr "BridgeDB می تواند پل ها با %sانواع متعددی از Pluggable Transports%s فراهم کند که کمک می کنند اتصال شما به Tor Network تا حد امکان مبهم و ناشناس باقی بماند و هیچ کس دیگری نتواند به راحتی به اتصال شما به اینترنت نظارت کند و تشخیص بدهد که شما از Tor استفاده می کنید.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -121,7 +250,7 @@ msgstr "بعضی از پلها با آدرسهای IPv6 در دسترس ه
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -130,20 +259,20 @@ msgid ""
"\n"
msgstr "همچنین BridgeDB شامل تعداد زیادی پل های ابتدایی و قدیمی است که %s Pluggable Transports ندارند %s و ممکن است بی مصرف به نظر برسند اما همچنان ممکن است در موارد متعددی جهت دور زدن فیلترینگ به شما کمک کنند.\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "پل ها چه هستند؟"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s پل ها %s هستند بازپخش کننده های تور هستند که به شما برای دور زدن سانسورکمک می کنند ."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "به یک راه دیگر برای دریافت bridge ها احتیاج دارم!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -151,12 +280,12 @@ msgid ""
"%s, %s or %s."
msgstr "یک طریق دیگری که میتوانید پلها را بگیرید, از طریق فزستادن یک ایمیل به %s میباشد. لطفا دقت فر مایید که شما باید ایمیل خود را حتما از یکی از فراهمکنند گان ایمیلی زیر بفرستیذ: %s %s و یا %s ."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
-msgstr "به کمک احتیاج دارم! پل های من کار نمیکنند!"
+msgstr "به کمک احتیاج دارم! پلهای من کار نمیکنند!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "اگر تور شما کار نمی کند, شما باید ایمیل کنید %s."
@@ -164,48 +293,48 @@ msgstr "اگر تور شما کار نمی کند, شما باید ایمیل ک
#. 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
+#: bridgedb/strings.py:121
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 "سعی کنید تا می توانید اطلاعات بیشتری را فراهم کنید. از جمله لیست پل ها و Pluggable Transports هایی که استفاده کرده اید. همچنین شماره نسخه Tor Browser و هر پیغامی که Tor به شما داده است."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "خطوط پل شما در اینجا:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
-msgstr "دریافت پل ها!"
+msgstr "دریافت پلها!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "لطفا گزینه نوع پل را انتخاب کنید:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "آیا شما به آدرس های IPv6 نیاز دارید؟"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "آیا شما نیاز دارید به یک %s؟"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "مرورگر شما تصاویر را به درستی نمایش نمی دهد."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "کاراکتر ها را از تصویر بالا وارد کنید..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "چگونگی از پلهای خود استفاده کنید"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -214,21 +343,21 @@ msgid ""
msgstr "برای ورود به پل در مرورگر Tor ، برای اولین بار %s به دانلود مرورگر Tor \nصفحه %s و پس از آن به دنبال دستورالعمل دانلود و استفاده از\nمرورگر Tor بروید."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
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:130
+#: bridgedb/strings.py:155
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:134
+#: bridgedb/strings.py:159
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,153 +365,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "'بله' را انتخاب کرده و سپس 'بعدی' را انتخاب کنید. برای پیکربندی پل جدید خود, copy و paste کنید خطوط پل را در متن جعبه ورودی. در نهایت, روی 'اتصال' کلیک کنید,\nراه درستش این است! اگر مشکلی پیش آمد, کلیک کنید روی کلید 'راهنما'\nدر 'تنظیمات شبکه تور' wizard برای اطلاعات بیشتر."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
-msgstr "این پیام را نمایش می دهد."
+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
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "درخواست پلهای عادی"
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "درخواست پلهای IPv6"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
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:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "دریافت یک کپی از کلید عمومی BridgeDB"
-
-#: 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 "لیست تغییرات"
-
-#: 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 "QRCode برای خطوط پل خود"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html: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 "به نظر می رسد یک خطا در گرفتن QRCode شما وجود دارد."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "این QRCode شامل خطوط پل خود. اسکن آن را با یک خواننده QRCode برای کپی خطوط پل خود بر روی تلفن همراه و دستگاه های دیگر."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "در حال حاضر هیچ پل ی در دسترس نیست"
-
-#: lib/bridgedb/templates/bridges.html: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 Tor Browser %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 اضافه کردن پل ها به Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%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ریافت پلها"
+msgstr "دریافت یک رونوشت از کلیدِ GnuPG عمومیِ BridgeDB"
diff --git a/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po
index 1b4028d..73a05e2 100644
--- a/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po
@@ -3,26 +3,29 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
+# Hessu Lumberi <pitkahessu at hotmail.com>, 2015
# Jorma Karvonen <karvonen.jorma at gmail.com>, 2015
# Jorma Karvonen <karvonen.jorma at gmail.com>, 2014
# Spacha <miikasikala96 at gmail.com>, 2015
# Ossi Kallunki <ossikallunki at gmail.com>, 2013
+# Pietu1998 <smiley at pietu1998.net>, 2016
# Riku Viitanen <riisseli4 at gmail.com>, 2015
# Sami Kuusisto <sami at 6sto.com>, 2014
+# Thomas <lab777ee at hotmail.com>, 2015
# viljaminojonen <Viljami.Nojonen at live.com>, 2014
# Finland355 <ville.ehrukainen2 at gmail.com>, 2014
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-05 15:01+0000\n"
-"Last-Translator: Riku Viitanen <riisseli4 at gmail.com>\n"
-"Language-Team: Finnish (http://www.transifex.com/projects/p/torproject/language/fi/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-01-15 12:20+0000\n"
+"Last-Translator: erinm\n"
+"Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\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"
+"Generated-By: Babel 1.3\n"
"Language: fi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -37,57 +40,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Pyyntösi epäonnistui jostain syystä."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Ilmoita ohjelmointivirheestä"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Lähdekoodi"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Muutosloki"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Yhteystieto"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Valitse kaikki"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Näytä QR-koodi"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "Siltariviesi QR-koodi"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Jossain on pulma!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Tapahtui virhe QR-koodia noudettassa."
+
+#: 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 "Tämä QR-koodi sisältää siltarivisi. Skannaa se QR-koodinlukijalla kopioidaksesi siltarivit matkapuhelimeesi ja muihin laitteisiin."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Tällä hetkellä ei ole yhtään siltaa saatavilla..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Ehkä sinun pitäisi yrittää %s palaamalla %s ja valitsemalla eri siltatyyppi!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Vaihe %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Lataa %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Vaihe %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Hanki %s sillat %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Vaihe %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Nyt %s lisää sillat Tor Browseriin %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.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sA%snna minulle vain sillat!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Lisävalitsimet"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Ei"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "ei mitään"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sK%syllä!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sH%sae sillat"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Tämä on automaattinen viesti; älä vastaa tähän.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Tässä ovat sinun siltasi."
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 "Olet ylittänyt nopeusrajan. Hidasta hiukan! Minimiaika viestien välillä on %s tunnissa. Kaikki lisäviestit tämän ajan kuluessa ohitetaan."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "KOMENNOT: (yhdistä KOMENNOT määritelläksesi useita valitsimia samanaikaisesti)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Tervetuloa BridgeDB :hen!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Nykyiset tuetut transport TYPE-siirtotyypit:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Hei, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Hei ystävä!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Julkiset avaimet"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -98,7 +226,7 @@ msgstr "Tämä sähköposti tuotettiin käyttäjälle %s %s klo %s"
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -109,7 +237,7 @@ msgid ""
msgstr "BridgeDB voi tarjota usean %styyppisiä irrotettavia Pluggable Transports%s-siirtoja,\njotka voivat auttaa peittämään yhteytesi Tor Network-verkkoon, mikä tekee vaikeammaksi\nkenellekään seurata internet-liikennettäsi ottaakseen selvää, että käytätkö Tor-palvelua.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -121,7 +249,7 @@ msgstr "Myös joitakin siltoja IPv6-osoitteilla on saatavilla, vaikka jotkut irr
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -130,20 +258,20 @@ msgid ""
"\n"
msgstr "Lisäksi BridgeDB:llä on useita tavallisia siltoja %s ilman mitään irrotettavia\nPluggable Transports %s-siirtoja, jotka eivät ehkä kuulosta herkullisilta, mutta\nne voivat silti auttaa monissa tapauksissa kiertämään internet-sensuuria.\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Mitä ovat sillat?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s-sillat %s ovat Tor-välitysjärjestelmiä, jotka auttavat kiertämään sensurointia."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Tarvitsen vaihtoehtoisen tavan tavoittaa sillat!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -151,12 +279,12 @@ msgid ""
"%s, %s or %s."
msgstr "Toinen tapa siltojen hankkimiseen on lähettää sähköpostia osoitteeseen %s. Huomaa,\nettä sinun on lähetettävä sähköpostiviesti käyttäen yhtä seuraavien sähköpostitarjoajien\nosoitetta:\n%s, %s tai %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Siltani eivät toimi! Tarvitsen apua!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Jos Tor ei toimi sinulla, sinun pitäisi sähköpostittaa %s."
@@ -164,71 +292,71 @@ msgstr "Jos Tor ei toimi sinulla, sinun pitäisi sähköpostittaa %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
+#: bridgedb/strings.py:121
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 "Yritä sisällyttää niin paljon tietoa tapauksestasi kuin voit, mukaanlukien siltojen\nluettelo ja irrotettavat Pluggable Transport-siirrot, joita yritit käyttää,\nTor Browser-versio, ja kaikki viestit, jotka Tor ilmoitti, jne."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Tässä ovat siltarivisi:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Hae sillat!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Valitse valitsimet siltatyypille:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Tarvitsetko IPv6-osoitteita?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Tarvitsetko %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Selaimesi ei näytä kuvia oikein."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Syötä merkit yläpuolella olevasta kuvasta..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Kuinka aloitat siltojesi käytön"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, 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 "Lsiätäksesi siltoja Tor-selaimeen, mene %s Tor-selaimen lataussivulle %s ja seuraa ohjeita siellä ladataksesi ja käynnistääksesi Tor-selaimen."
+msgstr "Lisätäksesi siltauksia Tor Browseriin mene %s Tor Browserin lataussivulle %s ja seuraa ohjeita siellä ladataksesi ja käynnistääksesi Tor Browserin."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Kun ’Tor-verkkoasetukset’-valintaikkuna ponnahtaa näkyviin, napsauta ’Configure’ ja seuraa asetusvelhoa, kunnes se kysyy:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Estääkö tai sensuroiko Internet-palvelutarjoajasi (ISP) muuten yhteyksiä\nTor-verkkoon?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
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,153 +364,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Valitse ’Kyllä’ ja napsauta sitten ’Seuraava’. Uusien siltojen konfiguroimiseksi kopioi ja\nliitä siltarivit tekstisyöteikkunaan. Napsauta lopuksi ’Yhdistä’, ja siirtymisen pitäisi\nonnistua! Jos kohtaat pulmia, yritä saada lisäapua napsauttamalla ’Opaste’-\npainiketta ’Tor-verkkoasetukset’-asetusvelhossa."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Näyttää tämän viestin."
#. 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
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Pyydä tavallisia siltoja."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Pyydä IPv6-siltoja."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Pyydä TYPE-tyyppistä irrotettavaa Pluggable Transport-siirtoa."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Hae kopio BridgeDB:n julkisesta GnuPG-avaimesta."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Ilmoita ohjelmointivirheestä"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Lähdekoodi"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Muutosloki"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Yhteystieto"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Valitse kaikki"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Näytä QR-koodi"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "Siltariviesi QR-koodi"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Jossain on pulma!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Tapahtui virhe QR-koodia noudettassa."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Tämä QR-koodi sisältää siltarivisi. Skannaa se QR-koodinlukijalla kopioidaksesi siltarivit matkapuhelimeesi ja muihin laitteisiin."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Tällä hetkellä ei ole yhtään siltaa saatavilla..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Ehkä sinun pitäisi yrittää %s palaamalla %s ja valitsemalla eri siltatyyppi!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Vaihe %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Lataa %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Vaihe %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Hanki %s sillat %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Vaihe %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Nyt %s lisää sillat Tor Browseriin %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 "%sA%snna minulle vain sillat!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Lisävalitsimet"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Ei"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "ei mitään"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sK%syllä!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sH%sae sillat"
diff --git a/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po
index 65015dc..32c57a7 100644
--- a/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po
@@ -3,34 +3,40 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
+# AO <ao at localizationlab.org>, 2018-2019
# apaddlingduck, 2014
# Boubou <cece31840 at gmail.com>, 2015
# Cryptie <cryptie at fsfe.org>, 2014
# elouann, 2015
-# fayçal fatihi, 2014
+# fayçal fatihi <ofaycal.geo.x at gmail.com>, 2014
+# AO <ao at localizationlab.org>, 2017-2018
+# AO <ao at localizationlab.org>, 2016-2017
# Frisson Reynald <frissonreynald at yahoo.fr>, 2014
-# hpatte <hadrien.44 at gmail.com>, 2014
+# hpatte, 2014
# Lucas Leroy <lerlucas at rocketmail.com>, 2014
# Lunar <lunar at torproject.org>, 2013
# Onizuka, 2013
# mehditaileb <mehditaileb at liberte-info.net>, 2011
+# Olivier <calicoj at me.com>, 2015
# Onizuka, 2013
+# Sabrina Cater <sabcat at gmx.fr>, 2015
+# syl_, 2016
# themen <themen2004 at gmail.com>, 2014
# Towinet, 2014-2015
-# Trans-fr, 2015
+# AO <ao at localizationlab.org>, 2015
# Yannick Heintz, 2014
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-24 16:42+0000\n"
-"Last-Translator: elouann\n"
-"Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-05-17 16:23+0000\n"
+"Last-Translator: AO <ao at localizationlab.org>\n"
+"Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\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"
+"Generated-By: Babel 1.3\n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -45,68 +51,193 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
-msgstr "Désolé ! Un problème est survenu suite à votre requête."
+msgstr "Désolé ! Un problème est survenu à la suite de votre requête."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Signaler un bogue"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Code source"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Journal des changements"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Contact"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Tout sélectionner"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Afficher le code QR"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "Code QR pour vos lignes de ponts"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Un problème est survenu !"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Il semble qu’il y ait eu une erreur de récupération de votre code QR."
+
+#: 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 "Ce code QR contient vos lignes de ponts. Lisez-le avec un lecteur de codes QR pour copier vos lignes de pont (Bridges) sur vos appareils, mobiles ou autres."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Aucun pont n’est disponible actuellement…"
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Vous devriez peut-être %s revenir en arrière %s et choisir un différent type de pont !"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Étape %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Télécharger %s le Navigateur Tor %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Étape %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Obtenir des %s ponts %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Étape %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Maintenant, %s ajouter les ponts au navigateur Le Navigateur Tor %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.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "Donnez-moi %sj%suste des ponts !"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Options avancées"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Non"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "aucun"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sO%sui !"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sO%sbtenir des ponts"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ceci est un message automatique, merci de ne pas répondre.]"
+msgstr "[Ceci est un message automatisé ; veuillez ne pas y répondre.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
-msgstr "Voici vos bridges :"
+msgstr "Voici vos ponts :"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 "Vous avez dépassé la limite. Veuillez ralentir ! La durée minimum entre courriels\nest de %s heures. Tout autre courriel durant cette période sera ignoré."
+msgstr "Vous avez dépassé la limite. Veuillez ralentir ! La durée minimum entre courriels est de %s heures. Tout autre courriel durant cette période sera ignoré."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDES: (combiner des commandes pour spécifier plusieurs options en même temps)"
+msgstr "COMMANDES : (combiner des commandes pour spécifier plusieurs options simultanément)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
-msgstr "Bienvenue à BridgeDB!"
+msgstr "Bienvenue à BridgeDB !"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
-msgstr "TYPEs de transport pris en charge actuellement:"
+msgstr "TYPE de transport pris en charge actuellement :"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
-msgstr "Salut, %s!"
+msgstr "Bonjour, %s !"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
-msgstr "Bonjour, l'ami !"
+msgstr "Bonjour, l’ami !"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Clés publiques"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
-msgstr "Ce courriel a été généré avec des arcs en ciel, des licornes, et des étincelles pour %s, %s à %s."
+msgstr "Ce courriel a été généré avec des arcs en ciel, des licornes et des étincelles pour %s le %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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -114,57 +245,57 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "BridgeDB peut fournir des bridges avec plusieurs %stypes de transports enfichables%s, qui peuvent aider à brouiller vos connexions au réseau Tor, ce qui rend plus difficile pour tous ceux qui regardent votre trafic Internet de déterminer que vous utilisez Tor.\n"
+msgstr "BridgeDB peut fournir des ponts avec plusieurs %stypes de transports enfichables%s, qui peuvent aider à brouiller vos connexions vers le réseau Tor. Il est ainsi plus difficile pour quiconque surveille votre trafic Internet de déterminer que vous utilisez Tor.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
-msgstr "Certains bridges avec les adresses IPv6 sont également disponibles, bien que certains Transports soient enfichables ; ils ne sont pas compatibles avec l'IPv6.\n"
+msgstr "Certains ponts sont aussi proposés avec des adresses IPv6, bien que certains transports enfichables ne soient pas compatibles avec IPv6.\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
+#: bridgedb/strings.py:88
#, 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 "De plus, BridgeDB contient beaucoup de bridges \"classiques\" %s sans aucun\nTransports Enfichables (Pluggable Transports) %s, ne semblant pas être aussi cool, mais pouvant toutefois\naider à contourner la censure Internet dans des nombreux cas.\n"
+msgstr "De plus, BridgeDB propose de nombreux ponts traditionnels %s sans transport enfichable %s qui peuvent quand même aider à contourner la censure Internet dans bien des cas.\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
-msgstr "Que sont les bridges ?"
+msgstr "Que sont les ponts ?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Bridges %s sont des relais Tor qui vous aident à contourner la censure."
+msgstr "%s Les ponts%s sont des relais Tor qui vous aident à contourner la censure."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
-msgstr "J'ai besoin d'une alternative pour obtenir des adresses de bridges !"
+msgstr "Il me faut une autre façon d’obtenir des ponts !"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, 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 "Une autre façon d'obtenir des ponts est d'envoyer un courriel à %s. Veuillez prendre\nnote que vous devez envoyer le courriel en utilisant une adresse d'un des fournisseurs\nde courriel suivants :\n%s, %s ou %s."
+msgstr "Une autre façon d’obtenir des ponts est d’envoyer un courriel à %s. Veuillez prendre note que vous devez envoyer le courriel en utilisant une adresse provenant d’un des fournisseurs de courriel suivants :\n%s, %s ou %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
-msgstr "Mes bridges ne fonctionnent pas, j'ai besoin d'aide !"
+msgstr "Mes ponts ne fonctionnent pas, j’ai besoin d’aide !"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Si votre Tor ne fonctionne pas, vous devriez envoyer un courriel à %s."
@@ -172,225 +303,100 @@ msgstr "Si votre Tor ne fonctionne pas, vous devriez envoyer un courriel à %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
+#: bridgedb/strings.py:121
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 "Essayez d'inclure autant d'infos que possible concernant votre cas, y compris la liste des\nponts et des Transports Enfichables (Pluggable Transports) que vous avez essayé d'utiliser, votre version de Tor Browser,\net n'importes quel autres messages que Tor vous a sorti, etc."
+msgstr "Essayez d’inclure autant de renseignements sur votre cas que possible, incluant la liste de ponts et de transports enfichables que vous avez essayé d’utiliser, votre version du Navigateur Tor et tout message donné par Tor, etc."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
-msgstr "Voici vos lignes de bridges:"
+msgstr "Voici vos lignes de ponts :"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
-msgstr "Obtenez des bridges !"
+msgstr "Obtenez des ponts !"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
-msgstr "Sélectionnez vos choix pour le type de bridge, s'il vous plaît:"
+msgstr "Veuillez choisir des options pour le type de ponts :"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
-msgstr "Avez-vous besoin des adresses IPv6?"
+msgstr "Avez-vous besoin d’adresses IPv6 ?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
-msgstr "Avez-vous besoin un %s?"
+msgstr "Avez-vous besoin d’un transport enfichable (%s) ?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
-msgstr "Votre navigateur n'affiche pas correctement les images."
+msgstr "Votre navigateur n’affiche pas les images correctement."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
-msgstr "Inscrire les caractères de l'image ci-dessus…"
+msgstr "Saisir les caractères de l’image ci-dessus…"
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
-msgstr "Comment démarrer l'utilisation de vos Bridges."
+msgstr "Comment commencer à utiliser vos ponts ?"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, 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 "Pour entrer (saisir) des bridges dans le Navigateur Tor (Tor Browser), allez tout d'abord à la %s page de téléchargement du navigateur Tor %s puis suivez les instructions là-bas afin de télécharger puis démarrer le navigateur Tor."
+msgstr "Pour saisir des ponts dans le Navigateur Tor, rendez-vous d’abord à la %s page de téléchargement du Navigateur Tor %s et suivez les instructions que vous y trouverez pour télécharger et démarrer le Navigateur Tor."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
-msgstr "Quand la boite de dialogue 'Paramètres Réseaux Tor' s'affiche, cliquez 'Configurer' et suivez l'assistant jusqu'à ce qu’il demande :"
+msgstr "Quand la fenêtre « Paramètres du réseau Tor » s’affiche, cliquez sur « Configurer » et suivez l’assistant jusqu’à ce qu’il demande :"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
-msgstr "Est-ce que votre fournisseur d'accès à Internet (FAI) bloquent ou censurent les connexions vers le réseau Tor ?"
+msgstr "Votre fournisseur d’accès à Internet (FAI) bloque-t-il ou censure-t-il vos connexions au réseau Tor ?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
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 "Sélectionnez 'Oui' et ensuite cliquez 'Suivant'. Pour configurer vos nouveaux bridges, copiez et collez les lignes bridges dans le champ de texte. Enfin, cliquez 'Connexion', et tout devrait marcher ! Si vous avez des difficultés, essayez le bouton 'Aide' dans 'Paramètres Réseaux Tor' pour plus d’assistance."
+msgstr "Sélectionnez « Oui » et cliquez ensuite sur « Suivant ». Pour configurer vos nouveaux ponts, copiez et collez les lignes de ponts dans la boîte de saisie de texte. Enfin, cliquez sur « Se connecter » et vous devriez avoir fini ! Si vous éprouvez des problèmes, cliquez sur le bouton « Aide » dans l’assistant des « Paramètres du réseau Tor » pour un soutien supplémentaire."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
-msgstr "Afficher ce message."
+msgstr "Affiche ce 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
-msgstr "Demander des bridges \"classiques\"."
+msgstr "Demander des ponts traditionnels."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
-msgstr "Demander des bridges IPv6."
+msgstr "Demander des ponts IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
-msgstr "Demander un Pluggable Transport par TYPE."
+msgstr "Demander un transport enfichable par TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Obtenir une copie de la clef GnuPG publique BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Signaler un bogue"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Le code source"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Changelog"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Contact"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Tout sélectionner"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Montrer QRCode"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QRCode pour vos lignes de bridges"
-
-#. 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 "Houlà!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Il semblerait qu'il y ai eu une erreur en chargeant votre QRCode."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Ce QRCode contient vos lignes de bridge. Scannez-le avec un lecteur de QRCode pour copier vos lignes de bridge dans votre mobile ou d'autres appareils."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Il n'y a pas de bridge disponible en ce moment…"
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Peut-être vous devriez revenir %s en arrière %s et choisir un différent type de bridge !"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Etape %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Télécharger %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Etape %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Récupérez les %s addresses de bridge %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Etape %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Maintenant %s ajoutez les bridges au navigateur Tor %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 "Donnez-moi %sj%suste des bridges !"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Options avancées"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Non"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "aucun"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sO%sui!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sO%sbtenir des bridges"
+msgstr "Obtenir une copie de la clé GnuPG publique de BridgeDB."
diff --git a/bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po
index 6aff6d7..6d5e9ac 100644
--- a/bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po
@@ -1,101 +1,385 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2015 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
+# Eu <luz.armas at udc.es>, 2014
# manuel meixide <m.meixide at gmail.com>, 2013
-# mbouzada <mbouzada at gmail.com>, 2013
+# Miguel Anxo Bouzada <mbouzada at gmail.com>, 2013
+# pepepenha <pepepenha at hotmail.com>, 2014
+# Xnake, 2016
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-05-08 15:33+0000\n"
-"Last-Translator: manuel meixide <m.meixide at gmail.com>\n"
-"Language-Team: Galician (http://www.transifex.com/projects/p/torproject/language/gl/)\n"
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-02-06 11:07+0000\n"
+"Last-Translator: Oscar Guardiola <Oscar.Guardiola at davinci-ti.es>\n"
+"Language-Team: Galician (http://www.transifex.com/otf/torproject/language/gl/)\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"
+"Generated-By: Babel 1.3\n"
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. "BridgeDB"
+#. "pluggable transport"
+#. "pluggable transports"
+#. "obfs2"
+#. "obfs3"
+#. "scramblesuit"
+#. "fteproxy"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/https/server.py:167
+msgid "Sorry! Something went wrong with your request."
+msgstr "Sentímolo! Algo foi mal coa súa solicitude."
+
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Informar dun Bug"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Código Fonte"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Rexistro de Cambios"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Contacto"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Seleccionar todo"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Amosar Código QR"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "Código QR para as súas liñas ponte"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ups!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Semella que houbo un erro obtendo o seu Código QR."
+
+#: 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 "Este Código QR contén as súas liñas ponte. Escanéeo cun lector de códigos QR para copiar as súas liñas ponte nun móbil e outros dispositivos."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Non hai pontes dispoñibles agora mesmo..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Quizais debería tentar %s indo hacia atrás %s i elexindo un tipo de ponte diferente!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Paso %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Descargar %s Tor Bowser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Paso %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Obter as %s pontes %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Paso %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Agora %s engada as pontes ao Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sS%sóamente dame pontes!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Opcións Avanzadas"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Non"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "ningún"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sS%si!"
+
+#. 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:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sO%sbter Pontes"
+
+#: bridgedb/strings.py:43
+msgid "[This is an automated message; please do not reply.]"
+msgstr "[Esta é unha mensaxe automática; por favor non responda.]"
+
+#: bridgedb/strings.py:45
+msgid "Here are your bridges:"
+msgstr "Estes son os seus bridges:"
+
+#: bridgedb/strings.py:47
+#, 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 "Excedeu o límite de taxa. Por favor vaia a modo! O tempo mínimo entre correos electrónicos é %s horas. Todos os novos correos electrónicos durante este período de tempo serán ignorados."
+
+#: bridgedb/strings.py:50
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr "COMANDOs: (combinar COMANDOs para especificar múltiples opcións simultáneamente)"
+
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: bridgedb/strings.py:53
+msgid "Welcome to BridgeDB!"
+msgstr "Dámoslle a benvida a BridgeDB!"
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: bridgedb/strings.py:55
+msgid "Currently supported transport TYPEs:"
+msgstr "TIPOs de transporte soportados actualmente:"
+
+#: bridgedb/strings.py:56
+#, python-format
+msgid "Hey, %s!"
+msgstr "Ola, %s!"
+
+#: bridgedb/strings.py:57
+msgid "Hello, friend!"
+msgstr "Ola amigo/a!"
+
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+msgid "Public Keys"
+msgstr "Claves públicas"
+
+#. TRANSLATORS: This string will end up saying something like:
+#. "This email was generated with rainbows, unicorns, and sparkles
+#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
+#: bridgedb/strings.py:62
+#, python-format
+msgid ""
+"This email was generated with rainbows, unicorns, and sparkles\n"
+"for %s on %s at %s."
+msgstr "Este email foi xenerado con arcos da vella, unicornios, e faíscas\npara %s en %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".
+#: bridgedb/strings.py:72
+#, 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 pode proporcionar pontes con distintos %stipos de Transportes Enchufables%s,\nque poden axudar a ofuscar a súas conexións á Rede Tor, facendo máis\ndifícil para calquera que vixíe o seu tráfico de internet determinar se vostede está\nempregando Tor.\n\n"
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:79
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr "Tamén están dispoñibles algunhas pontes con direccións IPv6, aínda que algúns Transportes\nEnchufables non son compatibles con 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.
+#: bridgedb/strings.py:88
+#, 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 "Adicionalmente, BridgeDB ten unha morea de pontes tradicionais de toda a vida %s sen ningún\nTransporte Enchufable %s o que non pode sonar molón, pero todavía\naxudan a evitar a censura de internet en moitos casos.\n\n"
+
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Que son os repetidores ponte?"
-#: lib/bridgedb/templates/base.html:34
+#: bridgedb/strings.py:102
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Repetidores Ponte %s son repetidores Tor que axudan a burlar a censura."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr "%s Pontes %s son retransmisores Tor que lle axudan a evitar a censura."
-#: lib/bridgedb/templates/base.html:39
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Eu necesito un xeito alternativo de obter pontes!"
-#: lib/bridgedb/templates/base.html:40
+#: bridgedb/strings.py:108
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Outra forma de atopar os enderezos de pontes públicas é enviar un correo electrónico (desde un %s ou un enderezo %s) para %s coa liña 'get bridges' por si soa no corpo do correo electrónico."
+"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 "Outro xeito de obter pontes e enviando un email a %s. Por favor teña en conta que debe\nenviar o email empregando unha dirección dende un dos seguintes proveedores de email:\n%s, %s ou %s."
-#: lib/bridgedb/templates/base.html:48
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "As miñas pontes non funcionan! Necesito axuda!"
-#: lib/bridgedb/templates/base.html:49
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:117
#, python-format
-msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Se o Tor non funciona, ten que enviar un correo-e a %s. Probe incluír tanta información sobre o seu caso como poida, incluíndo a lista de pontes que usou, o nome do paquete/versión que usou, as mensaxes que Tor lle deu , etc"
+msgid "If your Tor doesn't work, you should email %s."
+msgstr "Se o seu Tor non funciona, debe enviar un email a %s."
-#: lib/bridgedb/templates/bridges.html:10
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:121
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Para usar as liñas máis arriba, ten que ir á páxina de Configuración de rede do Vidalia, e premer en \"O meu ISP bloquea as conexións á rede Tor\". A continuación, engada un enderezo dunha ponte de cada vez."
+"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 "Tente incluir tanta información como poida acerca do seu caso, incluindo a lista de\npontes de Transportes Enchufables que tentou usar, a súa versión do Tor Browser,\ne calquera mensaxes que Tor dera, etc."
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Non hai pontes actualmente dispoñibles"
+#: bridgedb/strings.py:128
+msgid "Here are your bridge lines:"
+msgstr "Estas son as súas liñas ponte:"
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Actualiza o teu navegador a Firefox"
+#: bridgedb/strings.py:129
+msgid "Get Bridges!"
+msgstr "Obter Pontes!"
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Escriba as dúas palabras"
+#: bridgedb/strings.py:133
+msgid "Please select options for bridge type:"
+msgstr "Por favor seleccione opcións para o tipo de ponte:"
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Paso 1"
+#: bridgedb/strings.py:134
+msgid "Do you need IPv6 addresses?"
+msgstr "Necesita direccións IPv6?"
-#: lib/bridgedb/templates/index.html:8
+#: bridgedb/strings.py:135
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Obter o %s Paquete Navegador Tor %s"
+msgid "Do you need a %s?"
+msgstr "Necesita vostede un %s?"
-#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Paso 2"
+#: bridgedb/strings.py:139
+msgid "Your browser is not displaying images properly."
+msgstr "O seu navegador non está amosando imaxes adecuadamente."
-#: lib/bridgedb/templates/index.html:15
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Obter as %s pontes %s"
+#: bridgedb/strings.py:140
+msgid "Enter the characters from the image above..."
+msgstr "Introduza os caracteres da imaxen de enrriba..."
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Paso 3"
+#: bridgedb/strings.py:144
+msgid "How to start using your bridges"
+msgstr "Cómo comenzar a usar as súas pontes"
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:146
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Agora %s engada as pontes a Tor %s"
+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 "Para introducir pontes no Tor Browser, primeiro vaia á %s páxina de descarga de\nTor Browser %s e siga as instruccións dadas para descargar e arrancar\no Tor Browser."
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:151
+msgid ""
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr "Cando apareza o diálogo 'Axustes de Rede de Tor', prema 'Configurar' e siga\no asistente ata que pregunte:"
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:155
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr "O seu Porveedor de Servicios de Internet (ISP) bloquea ou censura conexións\ná rede Tor?"
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:159
+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 "Seleccione 'Si' e prema en 'Seguinte'. Para configurar as súas novas pontes, copie e\npegue as liñas ponte na caixa de entrada de texto. Finalmente, prema 'Conectar', e\ndebería poder comenzar! Se ten algún problema, intente premendo o botón\n'Axuda' no asistente de 'Axustes de Rede de Tor' para axuda adicional."
+
+#: bridgedb/strings.py:167
+msgid "Displays this message."
+msgstr "Amosa esta mensaxe."
+
+#. 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.
+#: bridgedb/strings.py:171
+msgid "Request vanilla bridges."
+msgstr "Solicitar pontes estándar."
+
+#: bridgedb/strings.py:172
+msgid "Request IPv6 bridges."
+msgstr "Solicitar pontes IPv6"
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: bridgedb/strings.py:174
+msgid "Request a Pluggable Transport by TYPE."
+msgstr "Solicitar un Transporte Enchufable por TIPO."
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: bridgedb/strings.py:177
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr "Obter unha copia da clave pública GnuPG de BridgeDB."
diff --git a/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po
index f700478..6419a0b 100644
--- a/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po
@@ -1,105 +1,391 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2015 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
-# aharonoosh <aharonoosh1 at gmail.com>, 2012
+# aharon, 2012
# Elifelet <arab.with.nargila at gmail.com>, 2014
-# GenghisKhan <genghiskhan at gmx.ca>, 2013
+# Dvir Rosen <ndvnis at gmail.com>, 2014
+# GenghisKhan <genghiskhan at gmx.ca>, 2013,2015
+# ION, 2017-2018
+# Johnny Diralenzo, 2015
# Kunda, 2014
-# Cuvint Chofschy <static.172 at gmail.com>, 2012
+# Kunda, 2015
+# Ron Don, 2015
+# Ruben <drarbib at gmail.com>, 2014
+# static172 <static.172 at gmail.com>, 2012
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-01-30 12:30+0000\n"
-"Last-Translator: Kunda\n"
-"Language-Team: Hebrew (http://www.transifex.com/projects/p/torproject/language/he/)\n"
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2018-10-17 12:25+0000\n"
+"Last-Translator: ION\n"
+"Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\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"
+"Generated-By: Babel 1.3\n"
"Language: he\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\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"
+#: bridgedb/https/server.py:167
+msgid "Sorry! Something went wrong with your request."
+msgstr "סליחה! משהו השתבש בבקשה שלך."
+
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "דווח על תקל"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "קוד מקור"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "יומן שינויים"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "צור קשר"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "בחר הכל"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "הצג קוד QR"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "קוד QR לרשימת הגשרים שלך"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "אוי ואבוי!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "נראה שנפלה טעות בקבלת קוד ה-QR שלך."
+
+#: 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 "קוד QR זה מכיל את רשימת הגשרים שלך. סרוק אותו באמצעות קורא קוד QR על מנת להעתיק את רשימת הגשרים שלך לטלפון נייד ומכשירים אחרים."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "אין כרגע גשרים זמינים כלשהם..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "נסה לחזור %s לאחור %s ולבחור גשר מסוג אחר!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "שלב %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "הורד את %s דפדפן Tor %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "שלב %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "השג %s גשרים %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "שלב %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "%s הוסף את הגשרים לדפדפן Tor %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.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sר%sק תן לי גשרים!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "אפשרויות מתקדמות"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "לא"
+
+#: 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:124
+#, 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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sק%sבל גשרים"
+
+#: bridgedb/strings.py:43
+msgid "[This is an automated message; please do not reply.]"
+msgstr "[זוהי הודעה אוטומטית; נא לא להשיב.]"
-#: lib/bridgedb/templates/base.html:33
+#: bridgedb/strings.py:45
+msgid "Here are your bridges:"
+msgstr "הנה הגשרים שלך:"
+
+#: bridgedb/strings.py:47
+#, 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 "חרגת ממגבלת הקצב. אנא האט! הזמן המזערי בין דוא״לים הוא %s שעות. כל הדוא״לים הנוספים במהלך פרק זמן זה ייתקלו בהתעלמות."
+
+#: bridgedb/strings.py:50
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr "פקודות: (שלב פקודות כדי לציין אפשרויות מרובות בו־זמנית)"
+
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: bridgedb/strings.py:53
+msgid "Welcome to BridgeDB!"
+msgstr "ברוך הבא אל BridgeDB!"
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: bridgedb/strings.py:55
+msgid "Currently supported transport TYPEs:"
+msgstr "transport TYPEs הנתמכים כרגע:"
+
+#: bridgedb/strings.py:56
+#, python-format
+msgid "Hey, %s!"
+msgstr "היי, %s!"
+
+#: bridgedb/strings.py:57
+msgid "Hello, friend!"
+msgstr "שלום, חבר!"
+
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+msgid "Public Keys"
+msgstr "מפתחות ציבוריים"
+
+#. TRANSLATORS: This string will end up saying something like:
+#. "This email was generated with rainbows, unicorns, and sparkles
+#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
+#: bridgedb/strings.py:62
+#, 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".
+#: bridgedb/strings.py:72
+#, 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מסווי תעבורה%s, המסייעים לטשטש את עקבות התחברותך לרשת Tor ובכך מקשים על גורמים המפקחים על חיבור האינטרנט שלך להבחין בכך שאתה עושה שימוש ב-Tor.\n"
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:79
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr "מספר גשרים עם כתובות IPv6 זמינים גם כן, אע\"פ שמספר תעבורות נתיקות אינן תואמות IPv6.\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.
+#: bridgedb/strings.py:88
+#, 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 ללא מסווי תעבורה כלשהם %s, מה שאולי לא נשמע מגניב, אך הם עדין יכולים לעזור לעקוף צנזורת אינטרנט במקרים רבים.\n"
+
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "מהם גשרים?"
-#: lib/bridgedb/templates/base.html:34
+#: bridgedb/strings.py:102
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s ממסרי גשר %s הינם ממסרי Tor אשר מסייעים לך לעקוף צנזורה."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr "%s גשרים %s הם ממסרי Tor העוזרים לך לעקוף צנזורה."
-#: lib/bridgedb/templates/base.html:39
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
-msgstr "אני זקוק לדרך חלופית לקבלת גשרים!"
+msgstr "אני צריך דרך חלופית לקבלת גשרים!"
-#: lib/bridgedb/templates/base.html:40
+#: bridgedb/strings.py:108
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "דרך אחרת למציאת כתובת של גשר פומבי הינה שליחת דוא״ל (מתוך כתובת %s או %s) אל %s עם השורה 'get bridges' כשלעצמו בתוך גוף ההודעה."
+"Another way to get bridges is to send an email to %s. Please note that you must\n"
+"send the email using an address from one of the following email providers:\n"
+"%s, %s or %s."
+msgstr "דרך נוספת להשיג גשרים היא לשלוח דוא״ל אל%s. אנא שים לב שאתה חייב לשלוח את הדוא״ל ע\"י שימוש באחד מספקי הדוא\"ל הבאים:\n%s, %s או %s."
-#: lib/bridgedb/templates/base.html:48
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
-msgstr "הגשרים שלי לא עובדים! אני זקוק לעזרה!"
+msgstr "הגשרים שלי לא עובדים! אני צריך עזרה!"
-#: lib/bridgedb/templates/base.html:49
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:117
#, python-format
-msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "אם Tor לא עובד אצלך, עליך לשלוח דוא״ל אל %s. נסה לכלול כמה שיותר מידע אודות המקרה שלך ככל שביכולתך לעשות כן, כולל את רשימת הגשרים אשר השתמשת בה, שם הקובץ/גרסא של האגודה (bundle) שהשתמשת, ההודעות אשר Tor מסר וכו׳."
+msgid "If your Tor doesn't work, you should email %s."
+msgstr "אם Tor לא עובד, עליך לשלוח דוא״ל אל%s."
-#: lib/bridgedb/templates/bridges.html:10
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:121
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "כדי להשתמש בשורות לעיל, המשך אל עמוד הגדרות רשת בתוך Vidalia, והקלק \"ספק האינטרנט שלי חוסם חיבורים לרשת Tor\". אחרי כן הוסף כל כתובת גשר אחת בכל פעם."
+"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 "נסה לכלול כמה שיותר פרטים על המקרה שלך ככל יכולתך, לרבות רשימת הגשרים ומסווי התעבורה אותם ניסית, גרסת דפדפן Tor שברשותך, כל הודעה כתובה שהתקבלה ב-Tor ביחס לבעיה וכל פרט נוסף שרלוונטי בעיניך."
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "אין גשרים זמינים כעת"
+#: bridgedb/strings.py:128
+msgid "Here are your bridge lines:"
+msgstr "להלן שורות הגשר שלך:"
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "שדרג את הדפדפן שלך אל Firefox"
+#: bridgedb/strings.py:129
+msgid "Get Bridges!"
+msgstr "השג גשרים!"
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "הקש את שתי המילים"
+#: bridgedb/strings.py:133
+msgid "Please select options for bridge type:"
+msgstr "אנא בחר אפשרויות לסוג הגשר:"
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "צעד 1"
+#: bridgedb/strings.py:134
+msgid "Do you need IPv6 addresses?"
+msgstr "האם אתה צריך כתובות IPv6?"
-#: lib/bridgedb/templates/index.html:8
+#: bridgedb/strings.py:135
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "השג את %s חבילת הדפדפן של Tor %s"
+msgid "Do you need a %s?"
+msgstr "האם אתה צריך %s?"
-#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "צעד 2"
+#: bridgedb/strings.py:139
+msgid "Your browser is not displaying images properly."
+msgstr "הדפדפן שלך לא מציג תמונות כראוי."
-#: lib/bridgedb/templates/index.html:15
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "השג %s גשרים %s"
+#: bridgedb/strings.py:140
+msgid "Enter the characters from the image above..."
+msgstr "הכנס את התווים מהתמונה למעלה..."
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "צעד 3"
+#: bridgedb/strings.py:144
+msgid "How to start using your bridges"
+msgstr "איך להתחיל להשתמש בגשרים שלך"
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:146
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "כעת %s הוסף את הגשרים אל Tor %s"
+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 "כדי להכניס גשרים לתוך דפדפן Tor, ראשית לך אל %s דף הורדת דפדפן Tor %s ולאחר מכן עקוב אחר ההוראות עבור הורדה והתחלה של דפדפן Tor."
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:151
+msgid ""
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr "כאשר הדו־שיח 'הגדרות רשת Tor' יצוץ, לחץ על 'הגדר' ועקוב אחר האשף עד שהוא ישאל:"
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:155
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr "האם ספק שירותי האינטרנט שלך חוסם או מצנזר חיבורים אל רשת Tor?"
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:159
+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 "בחר 'כן' ואז לחץ על 'הבא'. כדי לתצר את הגשרים החדשים שלך, העתק והדבק את שורות הגשרים לתוך תיבת הקלט של המלל. לבסוף, לחץ על 'התחבר' ואתה אמור להיות מוכן! אם תחווה תקלה, נסה ללחוץ על הכפתור 'עזרה' באשף 'הגדרות רשת Tor' לסיוע נוסף."
+
+#: bridgedb/strings.py:167
+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.
+#: bridgedb/strings.py:171
+msgid "Request vanilla bridges."
+msgstr "בקש גשרים מהסוג הישן."
+
+#: bridgedb/strings.py:172
+msgid "Request IPv6 bridges."
+msgstr "בקש גשרי IPv6."
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: bridgedb/strings.py:174
+msgid "Request a Pluggable Transport by TYPE."
+msgstr "בקש תעבורה נתיקה ע\"י TYPE."
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: bridgedb/strings.py:177
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr "קבל עותק של מפתח ה-GPG הציבורי של BridgeDB."
diff --git a/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po
index a8c72f0..650afd7 100644
--- a/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po
@@ -5,21 +5,22 @@
# Translators:
# Ana B, 2013-2014
# Armando Vega <synaan at gmail.com>, 2012
-# skiddiep <lyricaltumor at gmail.com>, 2014-2015
+# Igor <lyricaltumor at gmail.com>, 2016-2017
+# Igor <lyricaltumor at gmail.com>, 2014-2015
# Tomislav Siroglavić <tomsiro at gmail.com>, 2014
# gogo <trebelnik2 at gmail.com>, 2012
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-22 11:41+0000\n"
-"Last-Translator: skiddiep <lyricaltumor at gmail.com>\n"
-"Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2018-04-12 18:54+0000\n"
+"Last-Translator: Igor <lyricaltumor at gmail.com>\n"
+"Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/language/hr_HR/)\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"
+"Generated-By: Babel 1.3\n"
"Language: hr_HR\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"
@@ -34,68 +35,193 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Oprostite! Nešto je pošlo po krivu s Vašim zahtjevom."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Prijavite grešku"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Izvorni kod"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Zapisnik o promjenama"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Odaberi sve"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Pokaži QR kod"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR kod za Vaše linije mostova"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "O ne, greška!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Čini se da je došlo do greške pri dobavljanju Vašeg QR koda."
+
+#: 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 "Ovaj QR kod sadrži Vaše linije mostova. Skenirajte ga s čitačem QR koda da bi kopirali linije mostova na mobilne i ostale uređaje."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Trenutno nema dostupnih mostova..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Možda bi trebali probati %s vratiti se nazad %s i odabrati neki drugi tip mosta!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Korak %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Preuzmi %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Korak %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Preuzmi %s mostove %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Korak %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Sad %s dodaj mostove u Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sS%samo mi daj mostove!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Napredne opcije"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Ne"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "ništa"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sD%sa!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sP%sreuzmi mostove"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ovo je automatizirana poruka; molimo ne odgovarati.]"
+msgstr "[Ovo je automatizirana poruka; molimo ne odgovarajte na nju.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
-msgstr "Ovdje su vaši mostovi:"
+msgstr "Ovo su vaši mostovi:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 "Prešli ste limit. Molimo usporite! Minimum vremena između emailova je %s sati. Svi daljnji emailovi tijekom ovog vremenskog perioda bit će ignorirani."
+msgstr "Prešli ste limit. Molimo usporite! Vremenski minimum između emailova\nje %s sati. Svi daljnji emailovi tijekom ovog perioda će biti ignorirani."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "COMMANDs: (kombinirajte COMMANDs kako bi naznačili više opcija istovremeno)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Dobrodošli u BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
-msgstr "Trenutno podržani transport TYPEs:"
+msgstr "Trenutno podržani tipovi transporta:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Bok, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Bok, prijatelju!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Javni ključevi"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
-msgstr "Ovaj email je sastavljen s dugama, jednorozima i iskricama\nza %s na %s u %s."
+msgstr "Ovaj email je sastavljen od duge, jednoroga i iskrica\nza %s na %s u %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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -103,283 +229,158 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "BridgeDB nudi mostove s različitim %stipovima Pluggable Transports%s\nkoji mogu pomoći prikriti Vaše veze s Tor mrežom, otežavajući onome tko\nprati Vaš internet promet da vidi da koristite Tor.\n"
+msgstr "BridgeDB nudi mostove s različitim %stipovima priključnih transporta%s\nkoji mogu pomoći prikriti Vaše veze s Tor mrežom, otežavajući onome tko\nprati Vaš Internet promet da vidi da koristite Tor.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
-msgstr "Neki mostovi s IPv6 adresama su također dostupni, no neki Pluggable \nTransports nisu kompatibilni s IPv6.\n\n"
+msgstr "Također su dostupni neki mostovi s IPv6 adresama, no neki priključni transporti nisu kompatibilni s IPv6.\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
+#: bridgedb/strings.py:88
#, 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 "Nadalje, BridgeDB ima mnoštvo dobrih, starih mostova %s bez ikakvih\nPluggable Transports %s koji možda ne zvuče prezanimljivo, ali mogu\npomoći zaobići internet cenzuru u mnogo slučajeva.\n"
+msgstr "Nadalje, BridgeDB ima mnoštvo dobrih, starih mostova %s bez ikakvih\npriključnih transporta %s koji možda ne zvuče prezanimljivo, ali mogu\npomoći zaobići Internet cenzuru u mnogo slučajeva.\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Što su mostovi?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Mostovi %s su Tor releji koji vam pomažu zaobići cenzuru."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
-msgstr "Trebam alternativni način dobivanja mostova!"
+msgstr "Trebam alternativni način preuzimanja mostova!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, 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 "Još jedan način za dobiti mostove je da pošaljete email na %s. Imajte na umu da morate\nposlati email koristeći adresu jednog od sljedećih davatelja email usluge: %s %s ili %s."
+msgstr "Još jedan način za preuzimanje mostova je da pošaljete email na %s. Imajte na umu da morate\nposlati email koristeći adresu jednog od sljedećih davatelja email usluge: %s, %s ili %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Moji mostovi ne rade! Treba mi pomoć!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ako vaš Tor ne radi, pošaljite email na %s."
+msgstr "Ako Vaš Tor ne radi, pošaljite email na %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
+#: bridgedb/strings.py:121
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 "Pokušajte naznačiti što više informacija o vašem slučaju, uključujući popis\nmostova i Pluggable Transports koje ste pokušali koristiti, verziju vašeg Tor Browsera,\ni bilo kakve poruke koje je Tor izbacio, itd."
+msgstr "Pokušajte uključiti što više informacija o svom slučaju, uključujući popis\nmostova i priključnih transporta koje ste pokušali koristiti, verziju svog Tor Browsera,\ni bilo kakve poruke koje je Tor izbacio, itd."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
-msgstr "Ovdje su linije vaših mostova:"
+msgstr "Ovo su linije vaših mostova:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
-msgstr "Dobijte Mostove!"
+msgstr "Preuzmite mostove!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Molimo odaberite opcije za tip mosta:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
-msgstr "Trebaju li vam IPv6 adrese?"
+msgstr "Trebaju li Vam IPv6 adrese?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Trebate li %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Vaš preglednik ne prikazuje slike ispravno."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Unesite znakove sa slike iznad..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
-msgstr "Kako početi koristite Vaše mostove"
+msgstr "Kako početi koristite mostove"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, 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 "Kako bi unijeli mostove u Tor Preglednik, prvo odite na %s Tor Preglednik stranicu\nza preuzimanje %s te zatim slijedite upute za preuzimanje i pokretanje\nTor Preglednika."
+msgstr "Kako bi unijeli mostove u Tor Browser, prvo posjetite %s Tor Browser stranicu\nza preuzimanje %s, a zatim slijedite upute za preuzimanje i pokretanje\nTor Browsera."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
-msgstr "Kad iskoči prozorčić 'Tor Mrežne Postavke', kliknite 'Konfiguriraj' i slijedite\nčarobnjaka dok ne upita:"
+msgstr "Kad se pojavi dijaloški okvir 'Postavke Tor mreže', kliknite 'Konfiguriraj' i slijedite\nčarobnjaka dok ne upita:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
-msgstr "Blokira li vaš Internet Service Provider (ISP - pružatelj internet usluge) ili ikako drugačije cenzurira veze\ns Tor mrežom?"
+msgstr "Blokira li Vaš Internet Service Provider (ISP - pružatelj internet usluge) ili ikako drugačije cenzurira veze\ns Tor mrežom?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
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 "Odaberite 'Da', a zatim 'Sljedeće'. Da bi konfigurirali vaše nove mostove, kopirajte i \nzalijepite linije mostova u kućicu za unos teksta. Na kraju, kliknite 'Spoji se', i \nsve bi trebalo biti u redu! Ako naiđete na probleme, probajte kliknuti dugme 'Pomoć'\nu 'Tor Mrežne Postavke' čarobnjaku za daljnju pomoć."
+msgstr "Odaberite 'Da', a zatim 'Sljedeće'. Da bi konfigurirali svoje nove mostove, kopirajte i \nzalijepite linije mostova u kućicu za unos teksta. Na kraju, kliknite 'Spoji se', i \nsve bi trebalo biti u redu! Ako naiđete na probleme, probajte kliknuti 'Pomoć'\nu čarobnjaku 'Postavke Tor mreže' za daljnju pomoć."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Prikazuje ovu poruku."
#. 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
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Zatraži dobre, stare mostove."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Zatraži IPv6 mostove."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
-msgstr "Zatraži Pluggable Transport po TYPE."
+msgstr "Zatraži priključni transport po tipu."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Dobij kopiju BridgeDB javnog GnuPG ključa."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Prijavi Greški"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Izvorni Kod"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Zapisnik o promjenama"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kontakt"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Odaberi Sve"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Pokaži QR kod"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QR kod za Vaše linije mostova"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "O ne, greška!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Čini se da je došlo do greške pri dobavljanju Vašeg QR koda."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Ovaj QRKod sadrži Vaše linije mostova. Skenirajte ga s čitačem QR koda da bi kopirali linije mostova na mobilne i ostale uređaje."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Trenutno nema dostupnih mostova..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Možda bi trebali probati %s vratiti se nazad %s i odabrati neki drugi tip mosta!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Korak %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Preuzmi %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Korak %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Dobijte %s mostove %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Korak %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Sad %s dodaj mostove u Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sS%samo mi daj mostove!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Napredne Opcije"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Ne"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "ništa"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sD%sa!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sD%sobij Bridges"
+msgstr "Preuzmi kopiju BridgeDB-ovog javnog GnuPG ključa."
diff --git a/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po
index 6246b33..0b6d9fe 100644
--- a/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po
@@ -3,23 +3,24 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Blackywantscookies <gaborcika at citromail.hu>, 2014
+# benewfy <benewfy at gmail.com>, 2015
+# Blackywantscookies, 2014
# Lajos Pasztor <mrlajos at gmail.com>, 2014
-# Cerbo <taiurin at gmail.com>, 2014
-# vargaviktor <viktor.varga at gmail.com>, 2013,2015
+# Gergő Felde <taiurin at gmail.com>, 2014
+# vargaviktor <viktor.varga at gmail.com>, 2013,2015,2018
# vargaviktor <viktor.varga at gmail.com>, 2011
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-16 23:41+0000\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2018-12-28 15:07+0000\n"
"Last-Translator: vargaviktor <viktor.varga at gmail.com>\n"
-"Language-Team: Hungarian (http://www.transifex.com/projects/p/torproject/language/hu/)\n"
+"Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\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"
+"Generated-By: Babel 1.3\n"
"Language: hu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -34,57 +35,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Elnézést! Valami rosszul működött a kérésed közben."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Hiba jelentése"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Forrás kód"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Változások"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kapcsolat"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Mindent kijelöl"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "QR Kód megjelenítése"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR Kód a híd sorokhoz"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Hoppá!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Úgytűnik a QR Kód hibás."
+
+#: 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 "Ez a QR Kód a híd sorait tartalmazza. Olvassa be egy QR Kód olvasóval, hogy átmásolja a Híd sorokat mobil és egyéb eszközeire."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Jelenleg nincsenek rendelkezésre álló hidak..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Talán megpróbálhatnál %s vissza menni %s és másik Híd típust választani."
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Lépés %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Letöltés %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Lépés %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "%s Hidak %s beszerzése"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Lépés %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Most %s a hidak hozzáadása a Tor Browser-hez %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.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sC%ssak adjál már nekem hidakat!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Haladó beállítások"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Nem"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "Semmi"
+
+#. 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:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sS%szeretnék!"
+
+#. 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:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sS%szerezni Bridge -et!"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Ez egy automata levél, kérjük ne válaszoljon.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Itt vannak a hídjaid:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 túllépte a megadott mérték határt. Kérünk lassítson le! A minimum idő email-ek között\n%s óra. Minden további emailt ez az idő alatt elutasítunk."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "COMMANDs: (kombinálja COMMANDs-okat hogy többféle opciót adhasson meg egyszerre)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Üdvözöl a BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Jelenleg támogatott átviteli típusok: "
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Hé, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Hello!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Nyilvános kulcsok"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -95,7 +221,7 @@ msgstr "Ez az email szivárványokkal, unikornisokkal, és ragyogásokkal volt g
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -103,10 +229,10 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "BridgeDB hidakat tud bisztosítani számos %stípusával a Pluggable Transports%s -nak\namely segíti a kapcsolataidat összekeverni a Tor Network -ben, ezzel sokkal\nnehezebbé teszi akárkinek hogy megnézze az internet forgalmadat és hogy meghatározzák hogy Tor -t használsz.\n\n"
+msgstr "BridgeDB hidakat tud biztosítani számos %stípusával a Pluggable Transports%s -nak\namely segíti a kapcsolatait összekeverni a Tor Network-ben, ezzel sokkal\nnehezebbé teszi akárkinek hogy megnézze az internet forgalmát és hogy meghatározza hogy Tor-t használ.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -118,7 +244,7 @@ msgstr "Néhány híd IPv6 címekkel is elérhető, habár négány Pluggable\nT
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -127,20 +253,20 @@ msgid ""
"\n"
msgstr "Ezen felül, BridgeDB -nek van sok régi módi \"vanília\" hídjai %s melyek Csatlakoztatható Szállítók %s nélkül vannak\nmely talán nem hallatszik szuperül, de ők még mindig\ntudnak segíteni kikerülni az internet cenzúráját.\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Mik is a Hidak?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "A %s Hidak %s azok Tor relék, melyek segítik önt a cenzúra elkerülésében."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Szükségem van egy alternatív módra a Hidak beszerzéséhez!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -148,84 +274,84 @@ msgid ""
"%s, %s or %s."
msgstr "Egy másik módja, hogy megkapd a bridge listát küldj emailt a %s címre. Kérlek vedd figyelembe\naz emailt az alábbi email szolgáltató címekről küldd:\n%s, %s or %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "A Hídjaim nem működnek! Segítségre van szükségem!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ha a Tor böngésződ nem működik, akkor küldj egy email-t %s."
+msgstr "Ha a Tor böngészője nem működik, akkor küldjön egy email-t %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
+#: bridgedb/strings.py:121
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 "Probáljon minél több információt megadn amennyit csak tud, beleértve a listáját \na %s hidaknak és Pluggable Transports -nak, amelyet használni próbált, A Tor Browser verzióját,\nés minden üzenetet melyet Tor adott ki, stb."
+msgstr "Próbáljon minél több információt megadni amennyit csak tud, beleértve a listáját \na %s hidaknak és Pluggable Transports -nak, amelyet használni próbált, A Tor Browser verzióját,\nés minden üzenetet melyet Tor adott ki, stb."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Itt vannak a híd soraid:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Hidak szerzése!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
-msgstr "Kérem, válasszon opciót a híd típushoz:"
+msgstr "Kérjük, válasszon opciót a híd típushoz:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Kellenek önnek IPv6 címek?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Szüksége van egy %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Ez a böngésző nem jeleníti meg a képeket rendesen."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Adja meg a karaktereket amik a fenti képen láthatóak ..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Hogyan kezdjük használni a hidat "
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, 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 "A hidak beállításához a Tor böngészőben, először látogasson el a %s Tor böngésző letöltés oldalra %s és kövesse az útmutatást a Tor böngésző letöltéséről és használatáról."
+msgstr "A hidak beállításához a Tor Browser-ben, először látogasson el a %s Tor böngésző letöltés oldalra %s és kövesse az útmutatást a Tor böngésző letöltéséről és használatáról."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Amikor a 'Tor Hálózati Beállítások' dialógus felugrik, kattintson a 'Konfigurálás'-ra és kövesse\na varászlót amíg az kéri hogy:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Blokkolja vagy cenzúrázza az ön internet szolgáltatója (ISP) a kapcsolatokat\na Tor hálózatához?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
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"
@@ -233,153 +359,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Válassza hogy 'Igen' és utána kattintson a 'Következő\"-re. Az ön új hidjai konfigurásához, másolja\nés illessze be a Híd sorokat a felugró ablakba. Végül, kattintson 'Kapcsolódás'-ra, és \nmár készen is van. Ha valamilyen hibát tapasztal, próbáljon a 'Segítség'\n gombra kattintani a 'Tor hálózati beállítások' varázslóban a tobábbi segítségért."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Megjeleníti ezt az ütenetet."
#. 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
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Nem csatlakoztatható szállító híd kérelme."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "IPV6 híd kérése."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Egy csatlakoztatható szállító kérelme TYPE szerint."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Másolat szertése a BridgeDB's publikus GnuPG kulcsából."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Hiba jelentése"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Forrás kód"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Változások"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kapcsolat"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Mindent kijelöl"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "QR Kód megjelenítése"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QR Kód a híd sorokhoz"
-
-#. 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 "Hoppá!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Úgytűnik a QR Kód hibás."
-
-#: 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 "Ez a QR Kód a híd sorait tartalmazza. Olvassa be egy QR Kód olvasóval, hogy átmásolja a Híd sorokat mobil és egyéb eszközeire."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Jelenleg nincsenek rendelkezésre álló hidak..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Talán megpróbálhatnál %s vissza menni %s és másik Híd típust választani."
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Lépés %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Letöltés %s Tor Böngésző %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Lépés %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "%s Hidak %s szertése"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Lépés %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Most %s a hidak hozzáadása a Tor Böngészőhöz %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 "%sC%ssak adjál már nekem hidakat!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Haladó beállítások"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Nem"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "Semmi"
-
-#. 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 "%sS%szeretnék!"
-
-#. 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 "%sS%szerezni Bridge -et!"
diff --git a/bridgedb/i18n/id/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/id/LC_MESSAGES/bridgedb.po
index c16aeec..197ac30 100644
--- a/bridgedb/i18n/id/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/id/LC_MESSAGES/bridgedb.po
@@ -3,27 +3,33 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Anthony Santana, 2014
-# Astryd Viandila Dahlan <astrydviandila at yahoo.com>, 2015
+# anzhyo, 2014
+# Astryd Viandila Dahlan, 2015
# cholif yulian <cholifyulian123 at gmail.com>, 2015
# constantius damar wicaksono <constantiusdamar at gmail.com>, 2015
-# Dwi Cahyono, 2015
+# Dwi Cahyono <dwexz_cie at yahoo.com>, 2015
+# Ferriandy Chianiago <gpl4all at gmail.com>, 2015
+# ical, 2019
+# Lucas Susanto <susantolucas at yahoo.com>, 2018
# MasIs <is.roadster at gmail.com>, 2013
# L1Nus <multazam_ali at me.com>, 2014
+# Ngalim Siregar <ngalim.siregar at gmail.com>, 2015
# km242saya <pencurimangga at gmail.com>, 2014
-# Zamani Karmana <zamani.karmana at gmail.com>, 2015
+# Wahyu Utomo Nurindrayanto <wahyutomo66 at gmail.com>, 2016
+# Yerry Borang <yerry.borang at gmail.com>, 2019
+# zk, 2015
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-29 15:04+0000\n"
-"Last-Translator: Zamani Karmana <zamani.karmana at gmail.com>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n"
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-03-23 06:24+0000\n"
+"Last-Translator: Yerry Borang <yerry.borang at gmail.com>\n"
+"Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\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"
+"Generated-By: Babel 1.3\n"
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
@@ -38,64 +44,193 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
-msgstr "Maaf! Telah terjadi masalah dengan permintaan Anda."
+msgstr "Maaf! Telah terjadi kesalahan dengan permintaan Anda."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Laporkan bug"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Kode Sumber"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Perubahan"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontak"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Pilih Semua"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Tampilkan QRCode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QRCode untuk bridge Anda"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ada masalah!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Ada masalah saat mengambil QRCode Anda."
+
+#: 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 "QRCode ini berisi jalur bridge Anda. Scan dengan pembaca QRCode untuk menyimpan jalur bridge Anda ke dalam perangkat mobile ataupun perangkat lainnya."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Belum ada bridge yang tersedia..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Mungkin Anda perlu mencoba %s kembali %s dan memilih tipe bridge yang berbeda"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Langkah %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Unduh %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Langkah %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Dapatkan %s bridge %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Langkah %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Sekarang %s tambahkan bridge ke Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sB%serikan saya bridge!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Pilihan Lebih Lanjut"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Tidak"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "Tidak ada"
+
+#. 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:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sY%sa!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sD%sapatkan Jembatan!"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ini adalah pesan otomatis; tolong jangan dibalas.]"
+msgstr "[Ini adalah pesan otomatis; mohon untuk tidak dibalas.]"
+
+#: bridgedb/strings.py:45
+msgid "Here are your bridges:"
+msgstr "Berikut jembatan Anda:"
-#: lib/bridgedb/templates/base.html:34
+#: bridgedb/strings.py:47
#, 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 "Anda telah melampaui batas laju. Mohon perlambat! Waktu minimum antara\nsurel yaitu %s jam. Semua surel selanjutnya selama waktu periode ini akan diabaikan."
+msgstr "Anda telah melampaui batas yang ditetapkan. Mohon perlambat! Waktu jeda minimum antara\nsurel adalah %s jam. Semua surel lainnya selama waktu periode ini akan diabaikan."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "PERINTAH: (gabungkan PERINTAH untuk menetapkan beberapa opsi secara bersamaan)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Selamat datang di BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
-msgstr "Saat ini mendukung transport TYPEs:"
+msgstr "Saat ini mendukung transport TYPE:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Hai, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Halo, kawan!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Kunci Publik"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
-msgstr "Surel ini dibuat dengan rainbow, unicorn, dan sparkle\nuntuk %s pada hari %s jam %s."
+msgstr "Surel ini dihasilkan dengan pelangi, unikorn, dan kilauan\nuntuk %s pada %s jam %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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -103,10 +238,10 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "BridgeDB dapat menyediakan jembatan dengan beberapa %stypes dari Pluggable Transports%s,\nyang dapat membantu mengaburkan sambungan Anda ke Tor Network, mempersulit\nbagi siapapun melihat lalu lintas internet Anda untuk menentukan bahwa Anda\nmenggunakan Tor.\n\n"
+msgstr "BridgeDB dapat menyediakan jembatan dengan beberapa %stipe dari Pluggable Transports%s,\nyang dapat membantu mengaburkan sambungan Anda ke Tor Network, mempersulit\nsiapapun melihat lalu lintas internet Anda untuk menentukan bahwa Anda\nmenggunakan Tor.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -118,29 +253,29 @@ msgstr "Beberapa jembatan dengan alamat IPv6 juga tersedia, walaupun beberapa Pl
#. 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
+#: bridgedb/strings.py:88
#, 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 "Tambahan, BridgeDB mempunyai plain-ol'-vanilla bridges %s tanpa\nPluggable Transports %s yang mana mungkin tidak terdengar keren, tapi mereka masih dapat membantu untuk gangguan sensor internet di beberapa kasus .\n\n"
+msgstr "Sebagai tambahan, BridgeDB memiliki banyak jembatan biasa saja %s tanpa\nPluggable Transports %s yang mungkin tidak terdengar keren, tapi dalam banyak kasus\nmereka masih bisa membantu untuk menghindari sensor pada internet.\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Apa itu jembatan?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Jembatan %s adalah relai Tor yang membantu Anda menghindari sensor"
+msgstr "%s Jembatan %s adalah relai Tor yang membantu Anda menghindari sensor."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Saya membutuhkan cara lain untuk mendapatkan jembatan!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -148,12 +283,12 @@ msgid ""
"%s, %s or %s."
msgstr "Cara lain untuk mendapatkan Jembatan adalah dengan mengirimkan surel ke %s.\nMohon dicatat bahwa Anda harus mengirim surel menggunakan alamat dari\nsalah satu penyedia layanan surel berikut: %s, %s atau %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Jembatan saya tidak bekerja! Saya butuh bantuan!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Jika Tor Anda tidak bekerja, mohon kirim surel ke %s."
@@ -161,225 +296,100 @@ msgstr "Jika Tor Anda tidak bekerja, mohon kirim surel ke %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
+#: bridgedb/strings.py:121
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 "Coba sertakan sebanyak mungkin info tentang kasus Anda, termasuk daftar jembatan dan Pluggable Transports yang Anda coba gunakan, versi Peramban Tor Anda, dan pesan apapun yang diberikan oleh Tor, dll."
+msgstr "Coba sertakan sebanyak mungkin info tentang masalah Anda, termasuk daftar jembatan dan Pluggable Transports yang Anda coba gunakan, versi Tor Browser Anda, dan pesan apapun yang diberikan oleh Tor, dll."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Berikut jembatan Anda:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Dapatkan Jembatan!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Mohon pilih opsi untuk tipe jembatan:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
-msgstr "Apakah anda membutuhkan IP versi 6 ?"
+msgstr "Apakah Anda membutuhkan alamat IPv6?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
-msgstr "Apakah anda membutuhkan %s?"
+msgstr "Apakah Anda membutuhkan %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
-msgstr "Perambah anda tidak menampilkan gambar dengan tepat."
+msgstr "Peramban Anda tidak menampilkan gambar dengan benar."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
-msgstr "Masukkan karakter dari gambar diatas..."
+msgstr "Masukkan karakter dari gambar di atas..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
-msgstr "Bagaimana cara memulai menggunakan Bridges anda"
+msgstr "Cara memulai menggunakan jembatan Anda"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, 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 "untuk memasuki bridge ke dalam Browser Tor, pertama menuju %s Tor Browser download\npage %s dan kemudian ikuti instruksi disana untuk download and start\n Browser Tor."
+msgstr "Untuk memasukkan jembatan ke dalam Tor Browser, pertama kunjungi %s Halaman\nunduhan Tor Browser %s dan kemudian ikuti petunjuk di sana untuk mengunduh dan\nmemulai Tor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
-msgstr "ketika muncul dialog 'Tor Network setting', klik 'Configure' dan ikuti\nwizard sampai meminta"
+msgstr "Ketika muncul dialog 'Pengaturan Jaringan Tor', klik 'Konfigurasi' dan ikuti\npenuntun sampai ia meminta:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
-msgstr "Apakah penyedia layanan internet (ISP) anda menutup akses \nke jaringan Tor ?"
+msgstr "Apakah Penyedia Layanan Internet (ISP) Anda menutup akses atau menyensor\nkoneksi ke jaringan Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
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 "pilih 'Yes' dan kemudian klik 'Next'. untuk mengkonfigurasi bridges baru anda, copy dan\npaste jalur bridge kedalam box input teks. Akhirnya, click 'Connect', dan\nanda harus baik untuk go! jika anda mengalami kesulitan, coba klik tombol 'Help'\ndi wizard 'Tor Network Settings' bantuan lanjutan."
+msgstr "Pilih 'Ya' dan kemudian klik 'Lanjut'. Untuk mengkonfigurasi jembatan baru Anda, salin dan\ntempel alamat jembatan ke dalam kotak teks masukan. Akhirnya, klik 'Sambung', dan\nAnda siap menjelajah! Jika Anda mengalami kesulitan, coba klik tombol 'Bantuan'\ndi penuntun 'Pengaturan Jaringan Tor' untuk petunjuk lebih lanjut."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Tampilkan pesan ini"
#. 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
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
-msgstr "permintaan vanilla bridges"
+msgstr "Minta jembatan yang biasa."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
-msgstr "permintaan IPv6 bridges"
+msgstr "Minta jembatan IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
-msgstr "permintaan pluggable transport oleh TYPE"
+msgstr "Minta Pluggable Transport berdasarkan TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Dapatkan copy dari BridgeDB's public GnuPG key."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Laporkan Bug"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "kode sumber"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "daftar Perubahan"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kontak"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Pilih Semua"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Perlihatkan KodeQR"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QRCode untuk jalur bridge anda"
-
-#. 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 "Waduh, ibu kos ngamuk!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Terlihat ada yang error dalam mendapatkan QRCode anda"
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr " QRCode ini berisi jalur bridge anda. Scan dengan QRCode reader untuk meng- copy jalur bridge anda ke dalam mobile dan perangkat lain"
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Sekarang tidak tersedia bridges"
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Mungkin anda harus mencoba %s kembali %s dan memilih tipe bridge yang berbeda"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Langkah %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Unduh %s Peramban Tor %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Langkah %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Dapatkan %s bridges %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Langkah %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Sekarang %s tambahkan bridges ke Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sJ%sust berikan saya bridges!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Opsi Lanjutan"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Tidak"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "Tidak ada"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sY%sa!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sG%set Bridges"
+msgstr "Dapatkan salinan kunci publik GnuPG BridgeDB."
diff --git a/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po
index bc2252b..10857dd 100644
--- a/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po
@@ -3,30 +3,37 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
+# Alberto <alberto.pilato at gmail.com>, 2015
+# Alessandro Toffalini, 2017
+# DarkGreninja <leonardo.pantani at gmail.com>, 2017
# fetidyoo <tru74368 at yahoo.com>, 2011
# Francesca Ciceri <madamezou at zouish.org>, 2014
# HostFat <hostfat at gmail.com>, 2015
# ironbishop <ironbishop at fsfe.org>, 2011
# ironbishop <ironbishop at fsfe.org>, 2011
# Jacob Appelbaum <jacob at appelbaum.net>, 2009
+# Leunam X1 <leunam.x1 at gmail.com>, 2016
# Luca Marzo <luca at jeckodevelopment.it>, 2011
-# n0on3 <a.n0on3 at gmail.com>, 2011
+# Matteo Anese <anese.matteo at gmail.com>, 2015
+# mattia_b89 <mattia.b89 at gmail.com>, 2019
+# Alessandro Manfredi <a.n0on3 at gmail.com>, 2011
# Paolo Stivanin <paolostivanin at gmail.com>, 2014
# Random_R, 2013
# Random_R, 2013-2015
+# Sebastiano Pistore <SebastianoPistore.info at protonmail.ch>, 2018
# fetidyoo <tru74368 at yahoo.com>, 2011
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-16 17:23+0000\n"
-"Last-Translator: Random_R\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-04-13 09:03+0000\n"
+"Last-Translator: mattia_b89 <mattia.b89 at gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\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"
+"Generated-By: Babel 1.3\n"
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -41,57 +48,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Siamo spiacenti ma qualcosa è andato storto con la tua richiesta."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Segnala un Problema"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Codice sorgente"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Novità"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Contatti"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Seleziona tutto"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Mostra Codice QR"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "Codice QR per le tue bridge lines"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Figo!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Sembra che ci sia stato un errore nell'ottenere il tuo QRCode."
+
+#: 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 "Questo codice QR contiene le tue linee ponte. Scansionalo con un lettore QR per copiare le tue linee ponte sul telefono cellulare o su altri dispositivi."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Non ci sono bridge disponibili al momento..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Potresti provare a %s tornare indietro %s e scegliere un tipo di bridge diverso!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Passo %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Scarica %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Passo %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Ottenere dei %s bridge %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Passo %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Ora %s aggiungi i bridge al Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sD%sammi i bridge e basta!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Opzioni Avanzate"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "No"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "nessuno"
+
+#. 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:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sS%sì!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sO%sttieni Bridge"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
-msgstr "[Questo è un messaggio automatico, si prega di non rispondere.]"
+msgstr "[Questo è un messaggio inviato automaticamente, si prega di non rispondere.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Ecco i tuoi bridge:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 "Hai superato il limite massimo. Per favore rallenta! Il tempo minimo tra le email\nè di %s ore. Tutte le altre email durante questo periodo di tempo verranno ignorate."
+msgstr "Hai superato il limite massimo di email. Per favore rallenta! Il tempo minimo tra le email è di %s ore. Tutte le altre email che verranno inviate durante questo periodo di tempo verranno ignorate."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "COMMANDs: (combina i COMMANDs per specificare opzioni multiple simultaneamente)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Benvenuto/a su BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Transport TYPEs attualmente supportati:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Hey, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Ciao amico!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Chiavi Pubbliche"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -102,7 +234,7 @@ msgstr "Questa email è stata generata con arcobaleni, unicorni e scintille\nper
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -113,7 +245,7 @@ msgid ""
msgstr "BridgeDB può fornire dei bridge con numerosi %stipi di Pluggable Transports%s,\ni quali possono aiutare ad offuscare la tua connessione alla Rete Tor, rendendo\npiù difficile a chiunque vedere il tuo traffico internet per determinare che stai\nusando Tor.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -125,7 +257,7 @@ msgstr "Sono disponibili anche alcuni bridge con indirizzi IPv6, sebbene alcuni
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -134,20 +266,20 @@ msgid ""
"\n"
msgstr "In aggiunta, BridgeDB ha anche numerosi bridge vanilla %s senza alcun\nPluggable Transports %s, il che forse non suona bene, ma possono ancora\naiutare ad aggirare la censura in internet in molti casi.\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Cosa sono i bridge?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Bridge %s sono relay di Tor che ti aiutano ad aggirare la censura."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Mi serve un altro modo per avere dei bridge!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -155,12 +287,12 @@ msgid ""
"%s, %s or %s."
msgstr "Un altro modo di ottenere i bridge è inviare un'email a %s. Nota che devi\ninviare l'email usando uno degli indirizzi tra i seguenti provider email:\n%s, %s o %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "I miei bridge non funzionano! Mi serve aiuto!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Se Tor non ti funziona, manda un'email a %s."
@@ -168,48 +300,48 @@ msgstr "Se Tor non ti funziona, manda un'email a %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
+#: bridgedb/strings.py:121
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 "Cerca di includere più informazioni possibili sul tuo caso, incluso l'elenco di\nbridge e Pluggable Transports che hai provato a usare, la versione di Tor Browser,\nqualsiasi messaggio ti abbia mostrato Tor, ecc."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Ecco le tue linee bridge:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Ottieni dei Bridge!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Seleziona le opzioni per il tipo di bridge:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Ti servono indirizzi IPv6?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Ti serve un %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Il tuo browser non mostra le immagini in modo corretto."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Inserisci i caratteri nell'immagine sopra..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Come iniziare a usare i tuoi bridge"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -218,21 +350,21 @@ msgid ""
msgstr "Per inserire i bridge in Tor Browser, prima vai nella %s pagina di download di\nTor Browser %s e poi segui lì le istruzioni per scaricare ed avviare Tor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Quando appare la finestra delle 'Impostazioni Rete Tor', clicca 'Configura' e\nsegui la procedura giudata finchè non chiede:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Il tuo Internet Service Provider (ISP) blocca o censura le connessioni alla\nrete Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
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"
@@ -240,153 +372,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Seleziona 'Sì' e poi clicca 'Avanti'. Per configurare i nuovi bridge, copia e\nincolla le linee bridge nella casella di testo. Infine, clicca 'Connetti' e dovrebbe\nessere tutto pronto! Se avrai problemi, prova a cliccare il pulsante 'Aiuto'\nnella procedura guidata 'Impostazioni Rete Tor' per avere assistenza."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Mostra questo messaggio."
#. 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
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Richiedi bridge vanilla."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Richiedi bridge IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Richiedi un Pluggable Transport by TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Ottieni una copia della chiave pubblica GnuPG di BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Segnala un Errore"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Codice Sorgente"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Changelog"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Contatti"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Seleziona tutto"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Mostra QRCode"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QRCode per le tue linee ponte"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Uh oh, spaghettios!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Sembra esserci stato un errore nell'ottenere il tuo QRCode."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Questo QRCode contiene le tue linee ponte. Scansionalo con un lettore QRCode per copiare le tue linee ponte su mobile o altri dispositivi."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Non ci sono bridge disponibili al momento..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Potresti provare a %s tornare indietro %s e scegliere un tipo di bridge diverso!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Passo %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Scarica %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Passo %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Ottenere dei %s bridge %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Passo %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Ora %s aggiungi i bridge a Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sD%sammi i bridge e basta!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Opzioni Avanzate"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "No"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "nessuno"
-
-#. 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 "%sS%sì!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sO%sttieni Bridge"
diff --git a/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po
index 8edd083..6979bb4 100644
--- a/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po
@@ -3,24 +3,26 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
+# 323484, 2018
# brt <87 at itokei.info>, 2013
# ABE Tsunehiko, 2014-2015
-# タカハシ <gomidori at live.jp>, 2013
-# タカハシ <gomidori at live.jp>, 2014
+# azumukupoe, 2017
+# タカハシ <indexial at outlook.jp>, 2013
+# タカハシ <indexial at outlook.jp>, 2014
# Masaki Saito <rezoolab at gmail.com>, 2013
# 藤前 甲 <m1440809437 at hiru-dea.com>, 2014
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-05-22 16:01+0000\n"
-"Last-Translator: ABE Tsunehiko\n"
-"Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-01-15 12:20+0000\n"
+"Last-Translator: erinm\n"
+"Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\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"
+"Generated-By: Babel 1.3\n"
"Language: ja\n"
"Plural-Forms: nplurals=1; plural=0;\n"
@@ -35,57 +37,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
-msgstr "申し訳ありませんが、リクエストに問題がありました。"
+msgstr "申し訳ありません！リクエストに問題がありました。"
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "バグを報告する"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "ソースコード"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "変更履歴"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "お問い合わせ"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "すべて選択"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "QR コードを表示"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "あなたのブリッジラインの QR コード"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "おっとスパゲッティ！"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "QR コードを作成する際にエラーが発生しました。"
+
+#: 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 "この QR コードはあなたのブリッジラインを含みます。携帯端末などのデバイスで読み込むことで、ブリッジラインをコピーできます。"
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "今の時点では利用できるブリッジがありません..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "おそらく 、 %s 戻って %s 異なるブリッジタイプを選択してみるべきでしょう。"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "ステップ %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "%s Tor Browser %s をダウンロード"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "ステップ %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "%s ブリッジ %s を手に入れる"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "ステップ %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "%s Tor Browser にブリッジを追加します %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sあ%sの、ください、 bridges!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "高度な設定"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "いいえ"
+
+#: 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:124
+#, 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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sG%set Bridges"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[このメールは自動送信されたメッセージです。返信しないでください。]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "あなたのブリッジはこちら:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 "レート制限を超過しました。メール間の最小時間は %s 時間です。この期間中にさらに送信したメールは全て無視されます。"
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "コマンド: (コマンドを組み合わせて、同時に複数のオプションを指定する)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "BridgeDB へようこそ！"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "現在サポートされているトランスポートタイプ:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "どうも %s さん！"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "どうも、こんにちは！"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "公開鍵"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -96,7 +223,7 @@ msgstr "このメールは %s に %s %s に rainbow 及び unicorn 、 sparkle
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -107,7 +234,7 @@ msgid ""
msgstr "BridgeDB は、%sタイプの Pluggable Transports%s でブリッジを提供します。\nTor ネットワークへの接続を悟られづらくすることに役立ち、あなたの\nインターネットトラフィックを監視している誰かがあなたが Tor を使用していることを判別することがさらに難しくなります。\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -119,7 +246,7 @@ msgstr "IPv6 のアドレスのブリッジも利用できるものがありま
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -128,20 +255,20 @@ msgid ""
"\n"
msgstr "加えて、 BridgeDB は、 %s Pluggable Transport %s のない多くの何の変哲もない\n通常のブリッジを持ち、それはクールには思えないかもしれません。しかし、多くの場合、インターネット検閲を回避するのになお有効です。\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "ブリッジとは？"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s ブリッジ %s は、 インターネット検閲を回避する助けとなる Tor リレーです。"
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "ブリッジを得る他の方法が必要です!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -149,12 +276,12 @@ msgid ""
"%s, %s or %s."
msgstr "ブリッジを入手する別のやり方は %s までメールを送ることです。\n以下のメールプロバイダのうちの1つのアドレスを使用してメールを送信しなければならないことにご注意ください:\n %s 、 %s または %s"
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "私のブリッジが動きません! 助けてください!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Tor がうまく動作しない場合、 %s までメールを下さい。"
@@ -162,48 +289,48 @@ msgstr "Tor がうまく動作しない場合、 %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
+#: bridgedb/strings.py:121
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 "あなたが使おうとしたブリッジや Pluggable Transports 、 ご利用の Tor Browser バージョン、そして Tor が出力したメッセージ等などを含み、出来る限りあなたのケースに関する多くの情報を含めてみてください。"
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "あなたのブリッジラインはこちらです:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "ブリッジを入手！"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "ブリッジタイプのオプションを選択してください:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "IPv6 アドレスが必要ですか？"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "%s が必要ですか？"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "ご利用のブラウザは適切に画像を表示していません。"
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "上記の画像から文字を入力してください..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "ブリッジ使用の始め方"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -212,175 +339,50 @@ msgid ""
msgstr "Tor Browser にブリッジを登録する前に、まずは %s Tor Browser ダウンロードページ %s に移動して Tor Browser のダウンロード方法と始め方の説明をご覧ください。"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "「Tor ネットワーク設定」ダイアログがポップアップした際、設定をクリックして\n聞かれるまでウィザードに従ってください。"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "ご利用のインターネットサービスプロバイダー (ISP) は Tor ネットワークへの接続をブロックないし\n別のやり方で検閲していますか？"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
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 "「はい」を選択して、「次」をクリックしてください。新しいブリッジを構成するために、テキスト\n入力ボックスにブリッジラインをコピーペーストしてください。最後に、「接続」をクリックして、\nさあ準備が出来たはずです！何か問題があったら、さらなる助けを得るために「Tor\nネットワーク設定」ウィザード内「ヘルプ」ボタンをクリックしてください。"
+msgstr "「はい」を選択して、「次」をクリックしてください。新しいブリッジを構成するために、テキスト\n入力ボックスにブリッジラインをコピーペーストしてください。最後に、「接続」をクリックして、\nさあ準備が出来たはずです！何か問題があったら、さらなる助けを得るために\n「Tor ネットワーク設定」ウィザード内「ヘルプ」ボタンをクリックしてください。"
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
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
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "vanilla ブリッジをリクエスト"
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "IPv6 ブリッジをリクエスト"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "タイプごとに Pluggable Transport をリクエスト"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
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 "変更履歴"
-
-#: 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 "QR コードを表示"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "あなたのブリッジラインの QR コード"
-
-#. 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 "QR コードを作成する際にエラーが発生しました。"
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "この QR コードはあなたのブリッジラインを含みます。携帯端末などのデバイスで読み込むことで、ブリッジラインをコピーできます。"
-
-#: 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 Tor Browser %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 Tor Browser にブリッジを追加します %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sあ%sの、ください、 bridges!"
-
-#: 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 "%sG%set Bridges"
diff --git a/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po
index e877b87..2ab52d3 100644
--- a/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po
@@ -1,104 +1,398 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2015 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# ilbe123 <a3057016 at drdrb.net>, 2014
+# Chris Park <utopinator at gmail.com>, 2016
+# snotree <cknblue at gmail.com>, 2017
# cwt96 <cwt967 at naver.com>, 2012
-# Dr.what <javrick6 at naver.com>, 2014
-# pCsOrI <pcsori at gmail.com>, 2012
+# 고영욱 <greenknite at naver.com>, 2015
+# Hyuntae Chun, 2017
+# Oliver Lee <imsesaok at tuta.io>, 2018
+# Jamin <bakzaa at gmail.com>, 2014
+# Dr.what <javrick6 at naver.com>, 2014-2015
+# Gu Hong Min <placidmoon1 at gmail.com>, 2015
+# 류종헌, 2015
+# Myeongjin <aranet100 at gmail.com>, 2016
+# Oliver Lee <imsesaok at tuta.io>, 2019
+# 이피시소리 <pcsori at gmail.com>, 2012
+# Philipp Sauter <qt123 at pm.me>, 2018
+# Sam Ryoo <samryoo at gmail.com>, 2014
+# Sangmin Lee <sangminlee7648 at gmail.com>, 2016
+# Revi_, 2014
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-05-06 06:40+0000\n"
-"Last-Translator: ilbe123 <a3057016 at drdrb.net>\n"
-"Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n"
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-04-10 07:57+0000\n"
+"Last-Translator: Oliver Lee <imsesaok at tuta.io>\n"
+"Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\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"
+"Generated-By: Babel 1.3\n"
"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/bridgedb/templates/base.html:33
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. "BridgeDB"
+#. "pluggable transport"
+#. "pluggable transports"
+#. "obfs2"
+#. "obfs3"
+#. "scramblesuit"
+#. "fteproxy"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/https/server.py:167
+msgid "Sorry! Something went wrong with your request."
+msgstr "죄송합니다! 당신의 요청에 무언가 문제가 있습니다."
+
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "버그를 보고하기"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "소스 코드"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "변경 기록"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "연락하기"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "모두 선택"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "QR코드 보기"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "브릿지 선 QR코드"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "어머나, 뭔가 잘못되었습니다!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "QR 코드를 불러 오는 중 오류가 생긴 것 같습니다."
+
+#: 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 "이 QR코드는 당신의 브릿지 행을 포함하고 있습니다. 브릿지 행을 다른 기기로 복사하려면 QR코드 리더로 스캔하세요."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "현재 사용할 수 있는 브릿지가 없습니다..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "%s 되돌아가서 %s 다른 브릿지 타입도 골라보세요!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "%s1%s단계 "
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "%s Tor 브라우저 %s를 다운받습니다 "
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "%s2%s단계 "
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "%s 브릿지 %s를 가져옵니다"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "%s3%s단계 "
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "이제 %s 브릿지를 Tor 브라우저에 추가합니다 %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.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%s그%s냥 브릿지 주세요!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "고급 옵션"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "아니오"
+
+#: 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:124
+#, 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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%s브%s릿지 얻기"
+
+#: bridgedb/strings.py:43
+msgid "[This is an automated message; please do not reply.]"
+msgstr "[이것은 자동으로 생성된 메시지입니다; 회신하지 마십시오.]"
+
+#: bridgedb/strings.py:45
+msgid "Here are your bridges:"
+msgstr "당신의 브릿지는 다음과 같습니다:"
+
+#: bridgedb/strings.py:47
+#, 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 시간입니다. 이 기간 동안의 추가적인 모든 이메일은 무시될 것입니다."
+
+#: bridgedb/strings.py:50
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr "COMMANDs: (COMMANDs를 섞어서 여러 옵션을 동시에 구체화 하세요)"
+
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: bridgedb/strings.py:53
+msgid "Welcome to BridgeDB!"
+msgstr "BridgeDB 에 오신 것을 환영합니다!"
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: bridgedb/strings.py:55
+msgid "Currently supported transport TYPEs:"
+msgstr "지원이 되는 transport TYPEs"
+
+#: bridgedb/strings.py:56
+#, python-format
+msgid "Hey, %s!"
+msgstr "저기, %s야! "
+
+#: bridgedb/strings.py:57
+msgid "Hello, friend!"
+msgstr "안녕 친구!"
+
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+msgid "Public Keys"
+msgstr "공개 키"
+
+#. TRANSLATORS: This string will end up saying something like:
+#. "This email was generated with rainbows, unicorns, and sparkles
+#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
+#: bridgedb/strings.py:62
+#, python-format
+msgid ""
+"This email was generated with rainbows, unicorns, and sparkles\n"
+"for %s on %s at %s."
+msgstr "이 이메일은 %s에게 %s에 %s에서\n무지개, 유니콘 그리고 반짝이로 작성되었습니다."
+
+#. 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".
+#: bridgedb/strings.py:72
+#, 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삽입형 장치%s 와의 브릿지를 제공합니다.\n이것은 Tor 네트워크와의 연결을 난독화 시키며 누군가 인터넷 트래픽을\n감시하는 사람이 당신이 Tor 네트워크를 사용하고 있다는 것을 식별하기 어렵게 합니다.\n\n"
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:79
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr "몇몇 브리지는 IPv6 주소도 지원하나,\nPluggable Transports는 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.
+#: bridgedb/strings.py:88
+#, 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 Pluggable Transport가 없는 %s\n흔해빠진 브릿지들도 많아요. 대단한 소리같지 않겠지만,\n그래도 여러 모로 인터넷 검열 우회를 도와줍니다.\n\n"
+
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "'브릿지'란?"
-#: lib/bridgedb/templates/base.html:34
+#: bridgedb/strings.py:102
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "중계 서버 브릿지 %s 중에서, %s 가 여러분의 검열 우회를 도와줄 수 있는 Tor 중계 서버 입니다."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr "%s Bridges %s는 당신이 검열을 피할수 있게 하는 Tor 릴레이입니다. "
-#: lib/bridgedb/templates/base.html:39
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "브릿지를 얻는 다른 방법이 없을까요?"
-#: lib/bridgedb/templates/base.html:40
+#: bridgedb/strings.py:108
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "공개된 브릿지 주소를 찾을 때, 통신선에 'get brides'라고 이메일을 적어서 보내는 방법도 있습니다.(메일을 보내는 사람의 주소 표기는 from %s 또는 %s 주소)"
+"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/templates/base.html:48
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "브릿지가 맛이 갔어요! 도와줘요!"
-#: lib/bridgedb/templates/base.html:49
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:117
#, python-format
-msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "귀하의 토르가 작동하지 않는다면, %s의 이메일을 보내셔야 합니다. 가능한 한 많은 정보를 포함해서 보내주세요. 예를 들면 귀하가 사용한 브릿지의 목록, 귀하가 사용하는 번들의 파일 이름과 버전, 귀하의 토르가 맛 갔을 때 나온 메세지. 이 외에도 적을 수 있는 여러 가지."
+msgid "If your Tor doesn't work, you should email %s."
+msgstr "만약 Tor가 작동하지 않으면, %s로 이메일을 보내 주세요. "
-#: lib/bridgedb/templates/bridges.html:10
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:121
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "위 통신선을 사용하시려면 'Vidalia's Network settings'-비달리아 네트워크 설정-페이지에 들어간 후, 'My ISP blocks connections to the Tor network'-Tor 네트워크에 내 ISP 연결을 차단-을 클릭합니다. 그러면 한번에 각각의 브릿지 주소를 추가 할 수 있습니다."
+"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 "가능한 한 많은 정보를 포함해주세요.\n예를 들어 브릿지 목록 및 사용하려는 Pluggable Transport,\nTor 브라우저 버전, Tor가 준 메시지 등."
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "현재 이용 가능한 브릿지 없음"
+#: bridgedb/strings.py:128
+msgid "Here are your bridge lines:"
+msgstr "당신의 브릿지 행들은 다음과 같습니다:"
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "당신의 브라우저를 파이어폭스로 업그레이드 하세요!"
+#: bridgedb/strings.py:129
+msgid "Get Bridges!"
+msgstr "브릿지를 얻으세요!"
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "두개의 단어를 입력하십시오"
+#: bridgedb/strings.py:133
+msgid "Please select options for bridge type:"
+msgstr "브릿지 종류에 관한 옵션을 골라 주세요:"
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "1단계"
+#: bridgedb/strings.py:134
+msgid "Do you need IPv6 addresses?"
+msgstr "IPv6 주소가 필요합니까?"
-#: lib/bridgedb/templates/index.html:8
+#: bridgedb/strings.py:135
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Tor %s Browser Bundle %s를 입수"
+msgid "Do you need a %s?"
+msgstr "%s 가 필요합니까?"
-#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "2단계"
+#: bridgedb/strings.py:139
+msgid "Your browser is not displaying images properly."
+msgstr "브라우저가 사진을 정상적으로 불러오지 못합니다."
-#: lib/bridgedb/templates/index.html:15
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "%s 브릿지 %s를 입수"
+#: bridgedb/strings.py:140
+msgid "Enter the characters from the image above..."
+msgstr "위 그림의 문자를 입력하십시오..."
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "3단계"
+#: bridgedb/strings.py:144
+msgid "How to start using your bridges"
+msgstr "브릿지를 사용하는 방법"
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:146
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "곧 바로 %s Tor 브리지를 추가 %s"
+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 "Tor 브라우저에 브리지를 입력하려면 먼저 %s Tor 브라우저 다운로드로 이동하십시오.\n페이지 %s로 이동 후 다음 지침에 따라 다운로드 및 시작을 수행하십시오.\nTor 브라우저."
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:151
+msgid ""
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr "'Tor 네트워크 설정' 대화창이 뜨면, '설정'을 클릭하고 아래 질문이 나올때까지\n마법사를 따라주세요:"
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:155
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr "당신의 인터넷 서비스 제공자(ISP)가 Tor 네트워크 접속을 차단 또는 검열하나요?"
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:159
+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 "'예' 혹은 'Yes' 버튼을 누르신 후 '다음' 혹은 'Next' 버튼을 눌러 주세요.\n브릿지를 설정하시려면, 이 메일로 받으신 브릿지를 텍스트 박스에 복사하신 다음,\n'접속' 혹은 'Connect'를 눌러 주시면 작동될 것입니다!\n만약 문제가 있다면, 'Tor 네트워크 설정' 마법사의 '도움말' 혹은 'Help' 버튼을 눌러 도움을 받으세요."
+
+#: bridgedb/strings.py:167
+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.
+#: bridgedb/strings.py:171
+msgid "Request vanilla bridges."
+msgstr "일반 브릿지를 요청합니다."
+
+#: bridgedb/strings.py:172
+msgid "Request IPv6 bridges."
+msgstr "IPv6 브릿지를 요청합니다."
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: bridgedb/strings.py:174
+msgid "Request a Pluggable Transport by TYPE."
+msgstr "삽입형 장치를 TYPE를 통해서 요청하세요."
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: bridgedb/strings.py:177
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr "BridgeDB의 공개 GnuPG 키를 얻습니다."
diff --git a/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po
index 1e1366b..a1ccaa5 100644
--- a/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po
@@ -3,21 +3,21 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Ojārs Balcers <ojars.balcers at gmail.com>, 2012
-# Ojārs Balcers <ojars.balcers at gmail.com>, 2013-2015
+# Ojars Balcers <ojars.balcers at gmail.com>, 2012
+# Ojars Balcers <ojars.balcers at gmail.com>, 2013-2015
# ThePirateDuck <thepirateduck.w at gmail.com>, 2014
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-20 10:46+0000\n"
-"Last-Translator: Ojārs Balcers <ojars.balcers at gmail.com>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/torproject/language/lv/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2018-04-12 18:54+0000\n"
+"Last-Translator: IDRASSI Mounir <mounir.idrassi at idrix.fr>\n"
+"Language-Team: Latvian (http://www.transifex.com/otf/torproject/language/lv/)\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"
+"Generated-By: Babel 1.3\n"
"Language: lv\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
@@ -32,57 +32,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Atvainojiet! Notikusi ar Jūsu pieprasījumu saistīta kļūme."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Ziņot par kļūdu"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Pirmkods"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Izmaiņu žurnāls"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Sazināties"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Atlasīt visu"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Parādīt QRCode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QRCode Jūsu tiltu rindā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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ak, man' dieniņ!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Sķiet, ka, saņemot Jūsu QRCode, notika kļūda."
+
+#: 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 "Jūsu tiltu rindas ir QRCode. Skenējiet to ar QRCode lasītāju, lai iekopētu Jūsu tiltu rindas mobilajā tālrunī un citās iekārtās."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Šobrīd nav pieejamu tiltu..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Iespējams, ka Jums jāmēģina %s atgriezties %s un izvēlēties citu tiltu veidu!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Solis %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Lejuplādēt %s Pārlūku Tor %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Solis %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Saņemt %s tiltus %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Solis %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Tagad %s pievienot Pārlūkam Tor tiltus %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.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sT%sikai dodiet man tiltus!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Lietpratēju opcijas "
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Nē"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "nekas"
+
+#. 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:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sJ%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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sS%saņemt tiltus"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Šis ir automātisks ziņojums; lūdzu neatbildiet.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Te ir Jūsu tilti:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 "Jūs esat pārsniedzis pārraides normu. Lūdzu, lēnāk. Minimālais laika ilgums starp\ne-pastiem ir %s stundas. Šajā laika posmā visi turpmākie e-pasti tiks ignorēti."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "COMMANDs: (apvienot KOMANDA's, lai vienlaicīgi norādītu dažādas opcijas)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Sveicināti BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Šobrīd atbalstītie transporta VEIDI:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Hei, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Sveiks, draug!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Publiskās atslēgas"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -93,7 +218,7 @@ msgstr "This email was generated with rainbows, unicorns, and sparkles\npriekš
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -104,7 +229,7 @@ msgid ""
msgstr "BridgeDB var nodrošināt tiltus ar dažādiem %stypes Pluggable Transports%s,\nkas var palīdzēt maskēt Jūsu savienojumu ar Tor Network, tādējādi padarot sarežģītāk ikvienam, kas seko Jūsu interneta datu plūsmai, noteikt, ka lietojat Tor.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -116,7 +241,7 @@ msgstr "Ir pieejami daži tilti ar IPv6 adresēm; tanī pat laikā daži Pluggab
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -125,20 +250,20 @@ msgid ""
"\n"
msgstr "Turklāt BridgeDB ir pietiekami daudz parastu, vienkāršu tiltu %s bez jebkādiem\nPluggable Transports %s, kas iespējams neizklausās tik inčīgi, bet arī tie var\ndaudzos gadījumos palīdzēt apiet interneta cenzūru.\n \n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Kas ir tilti?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Tilti %s ir Tor retranslatori, kas palīdz Jums apiet cenzūru."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Man nepieciešams alternatīvs tiltu iegūšanas veids!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -146,12 +271,12 @@ msgid ""
"%s, %s or %s."
msgstr "Vēlviens veids kā saņemt tiltus ir nosūtīt e-pastu uz %s. Lūdzu, ievērojiet, ka e-pasts ir\njānosūta no viena no sekojošajiem e-pasta pakalpojumu sniedzējiem:\n%s, %s vai %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Mani tilti nestrādā! Man nepieciešama palīdzība!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Ja Jūsu Tor nestrādā, Jums jānosūta e-pasts %s."
@@ -159,48 +284,48 @@ msgstr "Ja Jūsu Tor nestrādā, Jums jānosūta e-pasts %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
+#: bridgedb/strings.py:121
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 "Centieties iekļaut pēc iespējas daudz informāciju par savu situāciju, tostarp pievienojot to tiltu un Pluggable Transports sarakstu, kurus centāties izmantot, savu Tor Browser versiju un visus Tor ziņojumus, un citu līdzīgu informāciju."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Te ir Jūsu tiltu līnijas:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Saņemt Tiltus!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Lūdzu, izvēlieties tilta veida opcijas:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Vai ir nepieciešamas IPv6 adreses?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Vai ir nepieciešams %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Jūsu pārlūks neattēlo attēlus pareizi."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Ievadīt burtus no augstāk parādītā attēla..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Kā sākt izmantot Jūsu tiltus"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -209,21 +334,21 @@ msgid ""
msgstr "Lai pārlūkā Tor ievadītu tiltus, vispirms dodieties uz %s pārlūka Tor lejuplādes \nlapu %s un tad sekojiet pārlūka Tor lejupielādes un sākšanas norādēm."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Kad uznirst dialogs \"Tor tīkla iestatījumi\", noklikšķiniet \"Konfigurēt\" un sēkojiet\nvednim līdz tas jautā:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Vai Jūsu Interneta pakalpojumu sniedzējs (ISP) bloķē vai citādā veidā cenzē savienojumus\nar tīklu Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
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"
@@ -231,153 +356,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Atlasiet \"Jā\" un tad noklikšķiniet \"Tālāk\". Lai konfigurētu savus jaunos tiltus, kopējiet un\nielīmējiet tiltu līnijas teksta ievades lodziņā. Beigās noklišķiniet \"Izveidot savienojumu\" un\nvisam vajadzētu notikt! Ja ir problēmas, turpmākai palīdzībai pamēģiniet noklišķināt vednī \"Tor tīkla iestatījumi\" pogu \"Palīdzība\"."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Rāda ziņojumu."
#. 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
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Pieprasīt parastos tiltus."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Pieprasīt IPv6 tiltus."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Pieprasīt Pluggable Transport pēc TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Saņemt BridgeDB publiskās GnuPG atslēgas kopiju."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Ziņot par kļūdu"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Pirmkods"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Izmaiņu žurnāls"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Sazināties"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Atlasīt visu"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Parādīt QRCode"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QRCode Jūsu tiltu rindā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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Ak, man' dieniņ!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Sķiet, ka, saņemot Jūsu QRCode, notika kļūda."
-
-#: 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 "Jūsu tiltu rindas ir QRCode. Skenējiet to ar QRCode lasītāju, lai iekopētu Jūsu tiltu rindas mobilajā tālrunī un citās iekārtās."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Šobrīd nav pieejamu tiltu..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Iespējams, ka Jums jāmēģina %s atgriezties %s un izvēlēties citu tiltu veidu!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Solis %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Lejuplādēt %s Pārlūku Tor %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Solis %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Saņemt %s tiltus %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Solis %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Tagad %s pievienot Pārlūkam Tor tiltus %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 "%sT%sikai dodiet man tiltus!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Lietpratēju opcijas "
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Nē"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "nekas"
-
-#. 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 "%sJ%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 "%sS%saņemt tiltus"
diff --git a/bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po
index d509e3c..3b33515 100644
--- a/bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po
@@ -1,101 +1,383 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2015 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
-# VHR <viktor.hr at gmail.com>, 2014
+# Cacko Cackoas <cackothe at gmail.com>, 2015
+# Viktor Hristov, 2014
+# Zarko Gjurov <zarkogjurov at gmail.com>, 2017-2018
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-03-12 22:21+0000\n"
-"Last-Translator: VHR <viktor.hr at gmail.com>\n"
-"Language-Team: Macedonian (http://www.transifex.com/projects/p/torproject/language/mk/)\n"
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2018-11-06 01:52+0000\n"
+"Last-Translator: Zarko Gjurov <zarkogjurov at gmail.com>\n"
+"Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\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"
+"Generated-By: Babel 1.3\n"
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
-msgstr "Што се премостувања?"
+#. 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"
+#: bridgedb/https/server.py:167
+msgid "Sorry! Something went wrong with your request."
+msgstr "Извинете! Се случи грешка со вашето барање."
+
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Пријави проблем"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Изворен код"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Лог на измени"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Контакт"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Одбери се"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Покажи QR код"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR код за вашите мост конекции"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Леле мајко!"
-#: lib/bridgedb/templates/base.html:34
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Има грешка во добивањето на вашиот QR код."
+
+#: 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 "Овој QR код ги содржи вашите мост конекции. Скенирај го со QR код читач т.е. со камерата за да ги копирате мост конекции на вашиот мобилен телефон или друг уред."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Моментално нема достапни мостови..."
+
+#: bridgedb/https/templates/bridges.html:132
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s релеи за Премостувања %s се Tor релеи кои ти помагаат да го заобиколиш цензурирањето."
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Можеби треба да пробате %s вратете се назад %s и изберете друг тип на мост!"
-#: lib/bridgedb/templates/base.html:39
-msgid "I need an alternative way of getting bridges!"
-msgstr "Ми треба алтернативен начин да добијам премостувања!"
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Чекор %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Преземи %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Чекор %s2%s"
-#: lib/bridgedb/templates/base.html:40
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Земи %s мостови %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Чекор %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Сега %s додади ги мостовите во Tor Browser%s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sС%sамо дај ми мост конекции!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Напредни опции"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Не"
+
+#: 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:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sД%sа! Ми требаат IPv6 адреси."
+
+#. 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:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sО%sвозможи Мостови"
+
+#: bridgedb/strings.py:43
+msgid "[This is an automated message; please do not reply.]"
+msgstr "[Ова е автоматска порака; Ве молиме не одговарајте.]"
+
+#: bridgedb/strings.py:45
+msgid "Here are your bridges:"
+msgstr "Ова се вашите мостови:"
+
+#: bridgedb/strings.py:47
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Друг начин да се најдат адресите на јавните премостувања е да се прати е-пошта (од %s или %s адреса) на %s со текст 'get bridges' во содржината на поштата."
+"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/templates/base.html:48
-msgid "My bridges don't work! I need help!"
-msgstr "Моите премостувања не функционираат! Ми треба помош!"
+#: bridgedb/strings.py:50
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr "КОМАНДИ: (комбинирајте КОМАНДИ да посочите повеќе опции истовремено)"
-#: lib/bridgedb/templates/base.html:49
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: bridgedb/strings.py:53
+msgid "Welcome to BridgeDB!"
+msgstr "Добредојдовте во BridgeDB!"
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: bridgedb/strings.py:55
+msgid "Currently supported transport TYPEs:"
+msgstr "Моментално подржани ТИПОВИ на транспорт:"
+
+#: bridgedb/strings.py:56
+#, python-format
+msgid "Hey, %s!"
+msgstr "Здраво, %s!"
+
+#: bridgedb/strings.py:57
+msgid "Hello, friend!"
+msgstr "Здраво, пријателу!"
+
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+msgid "Public Keys"
+msgstr "Јавни клучеви"
+
+#. TRANSLATORS: This string will end up saying something like:
+#. "This email was generated with rainbows, unicorns, and sparkles
+#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
+#: bridgedb/strings.py:62
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Ако твојот Tor не функционира, треба да пратиш е-пошта на %s. Пробај да внесеш колку што можеш повеќе информации за твојот случај, вклушително и листа од премостувања кои ги користиш, името/верзијата на пакетот кој го користиш, пораките кои ги добиваш од Tor, итн."
+"This email was generated with rainbows, unicorns, and sparkles\n"
+"for %s on %s at %s."
+msgstr "Оваа е-пошта беше создадена со дождот, виножита, еднорози, и искри за %s на %s во %s ."
-#: lib/bridgedb/templates/bridges.html:10
+#. 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".
+#: bridgedb/strings.py:72
+#, python-format
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "За да ги користиш горниве линии, оди на страната на подесувања на Vidalia's Network, и избери \"Мојот ISP ги блокира врските кон мрежата на Tor\". Потоа додај ја адресата на секое премостување еднаш."
+"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што можат да помогнат при маскирање на вашите поврзувања кон Tor мрежата,\nправејќи ја\nпотешка за секој кој го надгледува вашиот Интернет сообраќај да утврди дека вие\nкористите Tor.\n"
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Премостувањата се моментално недостапни"
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:79
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr "Некои мостови со IPv6 адреси се исто така достапни, преку некои Pluggable\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.
+#: bridgedb/strings.py:88
+#, 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\n"
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Надгради го твојот прегледувач во Firefox"
+#: bridgedb/strings.py:101
+msgid "What are bridges?"
+msgstr "Што се мостови?"
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Напиши ги двата збора"
+#: bridgedb/strings.py:102
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr "%s Мостови %s се Tor јазли / чворови кои ви помагаат во заобиколувањето на цензурата."
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Чекор 1"
+#: bridgedb/strings.py:107
+msgid "I need an alternative way of getting bridges!"
+msgstr "Ми треба алтернативен начин да добијам мостови!"
-#: lib/bridgedb/templates/index.html:8
+#: bridgedb/strings.py:108
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Земи %s пакет прелистувач Tor %s"
+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да пратите е-пошта користејќи адреса на еден од следниве е-пошта / е-маил провајдери:\n%s, %s или %s."
-#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Чекор 2"
+#: bridgedb/strings.py:115
+msgid "My bridges don't work! I need help!"
+msgstr "Моите мостови не функционираат! Ми треба помош!"
-#: lib/bridgedb/templates/index.html:15
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:117
#, python-format
-msgid "Get %s bridges %s"
-msgstr "Земи %s премостувања %s"
+msgid "If your Tor doesn't work, you should email %s."
+msgstr "Ако твојот Tor не работи, тогаш треба да пратите е-пошта на %s."
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:121
+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 "Вклучете што е можно повеќе информации за вашиот случај, вклучувајќи ја вашата листа на мостови и Pluggable Transports кои пробавте да ги користите, вашата верзија на Tor Browser,\nи сите пораки кои ги дава Tor во случајот, итн."
+
+#: bridgedb/strings.py:128
+msgid "Here are your bridge lines:"
+msgstr "Ова се вашите мост коненции:"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Чекор 3"
+#: bridgedb/strings.py:129
+msgid "Get Bridges!"
+msgstr "Добиј мостови!"
-#: lib/bridgedb/templates/index.html:21
+#: bridgedb/strings.py:133
+msgid "Please select options for bridge type:"
+msgstr "Одберете опции за тип на мост:"
+
+#: bridgedb/strings.py:134
+msgid "Do you need IPv6 addresses?"
+msgstr "Дали ви требаат IPv6 адреси?"
+
+#: bridgedb/strings.py:135
+#, python-format
+msgid "Do you need a %s?"
+msgstr "Дали ти треба %s?"
+
+#: bridgedb/strings.py:139
+msgid "Your browser is not displaying images properly."
+msgstr "Вашиот прелистувач не ги покажува сликите правилно."
+
+#: bridgedb/strings.py:140
+msgid "Enter the characters from the image above..."
+msgstr "Внесете ги карактерите од сликата погоре:"
+
+#: bridgedb/strings.py:144
+msgid "How to start using your bridges"
+msgstr "Како да започнете со користење на мостови"
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:146
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Сега %s додај ги премостувањата во Tor %s"
+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 "Да внесете мостови во Tor Browser, прво одете на %s Tor Browser за преземање\nстраната %s и потоа следете ги инструкциите за преземање и стартување на Tor Browser."
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:151
+msgid ""
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr "Кога дијалогот 'Tor мрежни поставки' ќе се појави, кликнете на 'Конфигурирај' и следете\nго инсталерот додека да ве праша:"
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:155
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr "Дали вашиот Интернет сервис провајдер (ISP) блокира или цензурира поврзувања кон Tor мрежата?"
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:159
+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 "Одберете 'Да' и кликнете 'Следно'. За да ги конфигурирате вашите нови мостови, копирајте и\nзалепете ја мост линијата во текст полето. На крај кликнете 'Поврзи', и\nби требало да сте готови! Ако имате проблеми, пробајте со кликање на 'Помош'\nкопчето во 'Tor мрежни подесувања' и следете ги инструкциите."
+
+#: bridgedb/strings.py:167
+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.
+#: bridgedb/strings.py:171
+msgid "Request vanilla bridges."
+msgstr "Побарува стандардни мостови."
+
+#: bridgedb/strings.py:172
+msgid "Request IPv6 bridges."
+msgstr "Побарува IPv6 мостови."
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: bridgedb/strings.py:174
+msgid "Request a Pluggable Transport by TYPE."
+msgstr "Побарува Pluggable Transport по тип."
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: bridgedb/strings.py:177
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr "Преземи копија од јавниот GnuPG клуч на BridgeDB."
diff --git a/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po
index 94bd12a..ca9505f 100644
--- a/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po
@@ -1,102 +1,388 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2015 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
-# shahril <mohd_shahril_96 at yahoo.com>, 2013
+# abuyop <abuyop at gmail.com>, 2017
+# Celine Yap Suet Ling <celine.sodawine at gmail.com>, 2017
+# danial abd talib <muhammaddanialabdtalib at gmail.com>, 2014
+# kz_gtr <kz_gtr at yahoo.com>, 2014
+# Mohd Rukhairy Abdul Rahman <rukhairy at gmail.com>, 2014
+# Mohd Shahril Bin Zainol Abidin <mohd_shahril_96 at yahoo.com>, 2013
+# theundertakerjr666 <theundertakerjr666 at yahoo.com>, 2019
# Weldan Jamili <mweldan at gmail.com>, 2012
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-11-05 05:30+0000\n"
-"Last-Translator: shahril <mohd_shahril_96 at yahoo.com>\n"
-"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/torproject/language/ms_MY/)\n"
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-05-09 01:07+0000\n"
+"Last-Translator: abuyop <abuyop at gmail.com>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/otf/torproject/language/ms_MY/)\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"
+"Generated-By: Babel 1.3\n"
"Language: ms_MY\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
-msgstr "Apakah itu bridges ?"
+#. 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"
+#: bridgedb/https/server.py:167
+msgid "Sorry! Something went wrong with your request."
+msgstr "Maaf! Terdapat sedikit kesulitan dengan permintaan anda."
+
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Lapor kesilapan kod"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Kod Sumber"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Sejarah log"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kenalan"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Pilih Semua"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Tunjuk Kod QR"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR Kod untuk talian 'bridge'"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Alamak, spaghettios!"
-#: lib/bridgedb/templates/base.html:34
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Terdapat ralat ketika cuba mendapatkan KodQR anda."
+
+#: 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 "QR Kod ini mengandungi talian 'bridge' anda. Sila imbas QR Kod untuk membuat salinan talian 'bridge' ke mobil dan alat-alat lain"
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Tidak ada alat 'bridge' pada masa ini..."
+
+#: bridgedb/https/templates/bridges.html:132
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Bridge relays %s adalah tor relays yang akan membantu anda menghindari penapisan Internet."
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Anda boleh cuba %s balik ke %s dan pilih jenis 'bridge' lain!"
-#: lib/bridgedb/templates/base.html:39
-msgid "I need an alternative way of getting bridges!"
-msgstr "Saya perlukan cara alternatif untuk mendapatkan bridges!"
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Langkah %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Muat turun%s Pelayar Web Tor %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Langkah%s2%s"
-#: lib/bridgedb/templates/base.html:40
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Dapatkan %s titi %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Langkah%s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Kemudian%s tambah bridges tersebut ke Pelayar Web Tor %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.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sPilih%s secara automatik 'bridges'!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Pilihan Lanjutan"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Tidak"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "tiada"
+
+#. 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:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sY%sa!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sG%suna Bridges"
+
+#: bridgedb/strings.py:43
+msgid "[This is an automated message; please do not reply.]"
+msgstr "[Ini adalah mesej automatik; tidak perlu balas.]"
+
+#: bridgedb/strings.py:45
+msgid "Here are your bridges:"
+msgstr "Ini adalah titi anda:"
+
+#: bridgedb/strings.py:47
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Cara lain bagi mencari alamat bridges awam adalah dengan menghantar email (dari %s atau alamat %s) ke %s dengan menulis 'get bridges' pada badan email tersebut."
+"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 "Awak telah mencapai had yang ditetapkan. Harap bersabar! Masa minimum yang ditetapkan diantara email adalah %s jam. Mana-mana emel yang di hantar pada masa ini tidak akan dilayan."
-#: lib/bridgedb/templates/base.html:48
-msgid "My bridges don't work! I need help!"
-msgstr "Bridges saya tidak berfungsi! Saya perlukan bantuan!"
+#: bridgedb/strings.py:50
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr "COMMANDs: (cantum COMMANDs untuk mendapat lebih dari satu pilihan dalam satu)"
-#: lib/bridgedb/templates/base.html:49
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: bridgedb/strings.py:53
+msgid "Welcome to BridgeDB!"
+msgstr "Selamat Datang ke BridgeDB"
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: bridgedb/strings.py:55
+msgid "Currently supported transport TYPEs:"
+msgstr "JENIS angkutan semasa yang disokong:"
+
+#: bridgedb/strings.py:56
+#, python-format
+msgid "Hey, %s!"
+msgstr "Hai, %s!"
+
+#: bridgedb/strings.py:57
+msgid "Hello, friend!"
+msgstr "Hai, kawan!"
+
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+msgid "Public Keys"
+msgstr "Kunci Awam"
+
+#. TRANSLATORS: This string will end up saying something like:
+#. "This email was generated with rainbows, unicorns, and sparkles
+#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
+#: bridgedb/strings.py:62
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Jika Tor kamu tidak berfungsi, kamu patut menghantar e-mel kepada %s. Cuba masukkan sebanyak mana info yang boleh terhadap permasalahan kamu, termasuk senarai bridges yang kamu guna, dan nama fail bundle dan versi bundle yang kamu guna, dan mesej yang Tor tunjukkan, dan lain-lain."
+"This email was generated with rainbows, unicorns, and sparkles\n"
+"for %s on %s at %s."
+msgstr "Email ini dihasilkan dengan pelangi,kuda bertanduk satu, dan kelipan untuk %s diatas %s pada %s"
-#: lib/bridgedb/templates/bridges.html:10
+#. 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".
+#: bridgedb/strings.py:72
+#, python-format
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Untuk menggunakan bridges di bawah, pergi ke halaman tetapan Rangkaian Vidalia, dan klik \"ISP saya menyekat sambungan saya ke rangkaian Tor\". Kemudian tambah setiap alamat bridges satu per satu."
+"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 boleh memberi sambungan 'bridge' dengan beberapa %sjenis sambungan (Pluggable Transports)%s,\nyang boleh meyembungi hubungan anda dalam Rangkaian Tor, yang membolehkan rangkaian anda dilindungi daripada pihak awam yang menapis litar Tor.\n\n"
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Tiada bridges pada masa sekarang."
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:79
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr "Bridge tertentu dengan alamat-alamat IPv6 juga boleh didapati, walaupun ada jenis Pluggable\n Transports yang tidak IPv6 serasi\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.
+#: bridgedb/strings.py:88
+#, 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 "Selain itu, BridgeDB mempunyai banyak bridges yang dicadang %stanpa diperlukan\nPluggable Transports %s yang boleh memberi rasa tidak sedap, tetapi ia masih boleh menolong rangkaian anda dilindungi dalam kebanyakan kes.\n"
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Menaik taraf firefox anda"
+#: bridgedb/strings.py:101
+msgid "What are bridges?"
+msgstr "Apakah itu 'bridges'?"
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Tulis dua perkataan itu."
+#: bridgedb/strings.py:102
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr "%s Bridges %s adalah sambungan Tor yang menolong anda dari tapisan internet."
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Langkah 1"
+#: bridgedb/strings.py:107
+msgid "I need an alternative way of getting bridges!"
+msgstr "Saya perlukan jalan lain untuk dapatkan titi!"
-#: lib/bridgedb/templates/index.html:8
+#: bridgedb/strings.py:108
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Dapatkan %s Tor Browser Bundle %s."
+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 "Cara lain untuk dapatkan bridge adalah untuk menghantar email kepada %s. Sila ambil perhatian anda harus\nmenghantar email dengan mengunakan alamat yang diberi oleh syarikat yang menyediakan email:\n%s,%s atau %s."
-#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Langkah 2"
+#: bridgedb/strings.py:115
+msgid "My bridges don't work! I need help!"
+msgstr "'Bridge' saya tidak berfungsi! Saya perlukan bantuan!"
-#: lib/bridgedb/templates/index.html:15
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:117
#, python-format
-msgid "Get %s bridges %s"
-msgstr "Dapatkan %s bridges %s"
+msgid "If your Tor doesn't work, you should email %s."
+msgstr "Jika konfigurasi Tor tidak berfungsi, anda patut email %s."
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:121
+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 "Sila beri sebanyak mungkin informasi tentang kes anda, sila beri kandungan senarai bridge dan hubungan Pluggable Transport yang telah diguna, versi Pelayar Web Tor, dan segala mesej yang Tor paparkan, dan lain-lain .. "
+
+#: bridgedb/strings.py:128
+msgid "Here are your bridge lines:"
+msgstr "Berikut adalah bridge anda:"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Langkah 3"
+#: bridgedb/strings.py:129
+msgid "Get Bridges!"
+msgstr "Dapat sambungan Bridges!"
-#: lib/bridgedb/templates/index.html:21
+#: bridgedb/strings.py:133
+msgid "Please select options for bridge type:"
+msgstr "Sila pilih jenis bridge:"
+
+#: bridgedb/strings.py:134
+msgid "Do you need IPv6 addresses?"
+msgstr "Anda perlukan alamat IPv6?"
+
+#: bridgedb/strings.py:135
+#, python-format
+msgid "Do you need a %s?"
+msgstr "Perlukah anda %s?"
+
+#: bridgedb/strings.py:139
+msgid "Your browser is not displaying images properly."
+msgstr "Pelayar anda tidak memaparkan imej dengan betul."
+
+#: bridgedb/strings.py:140
+msgid "Enter the characters from the image above..."
+msgstr "Masukkan imej aksara yang tertera..."
+
+#: bridgedb/strings.py:144
+msgid "How to start using your bridges"
+msgstr "Bagaimana cara untuk mula mengunakan bridges"
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:146
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Kemudian %s tambah bridges tersebut ke Tor %s"
+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 "Untuk masuk bridges ke dalam Pelayar Web Tor, langkah pertama sila pilih %s halaman muat turun Pelayar Web Tor \n%s dan ikut arahan untuk muat turun dan mula Pelayar Web Tor Browser "
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:151
+msgid ""
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr "Bila pilihan dialog jenis hubungan 'Tor Network Settings' dipaparkan, klik 'Konfigurasi' dan ikut nasihat yang disyorkan sehingga:"
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:155
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr "Adakah Pembekal Perkhidmatan Internet saya (ISP) menghalang sambungan kepada rangkaian Tor?"
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:159
+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 "Pilih 'Ya' dan klik 'langkah seterusnya'. Untuk konfigurasi bridge baru, buat salinan jaringan bridges ke dalam kotak input teks. Step akhir, klik 'Hubung', dan anda patut dapat keputusan positif! Jika anda ada kesulitan, sila cuba klik 'Bantuan' dalam 'Tor Network Settings' guru untuk bantuan seterusnya"
+
+#: bridgedb/strings.py:167
+msgid "Displays this message."
+msgstr "Papar mesej ini."
+
+#. 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.
+#: bridgedb/strings.py:171
+msgid "Request vanilla bridges."
+msgstr "Pinta bridges yang disyorkan."
+
+#: bridgedb/strings.py:172
+msgid "Request IPv6 bridges."
+msgstr "Pinta IPv6 bridges."
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: bridgedb/strings.py:174
+msgid "Request a Pluggable Transport by TYPE."
+msgstr "Pinta jalinan Pluggable Transport secara TYPE."
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: bridgedb/strings.py:177
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr "Dapatkan salinan dari BridgeDB GnuPG kunci awam."
diff --git a/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po
index a51b70e..60e81a7 100644
--- a/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po
@@ -4,24 +4,26 @@
#
# Translators:
# Allan Nordhøy <epost at anotheragency.no>, 2014
+# Allan Nordhøy <epost at anotheragency.no>, 2016-2017
# Erik Matson <erik at norwenglish.net>, 2015
-# Harald <haarektrans at gmail.com>, 2014
+# Harald H. <haarektrans at gmail.com>, 2014
# Kristian Andre Henriksen <kris.andre.h at gmail.com>, 2015
-# lateralus, 2013
+# 81149148127a5edca7d06dcbfba79969, 2013
+# Pål Fiksdal <plf715 at gmail.com>, 2015
# Per Thorsheim <transifex at thorsheim.net>, 2015
# thor574 <thor.hovden at gmail.com>, 2014
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-23 12:17+0000\n"
-"Last-Translator: Erik Matson <erik at norwenglish.net>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2017-12-29 18:29+0000\n"
+"Last-Translator: Allan Nordhøy <epost at anotheragency.no>\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\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"
+"Generated-By: Babel 1.3\n"
"Language: nb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -36,57 +38,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
-msgstr "Dette var leit! Noe gikk galt med forespørselen din."
+msgstr "Beklager! Noe gikk galt med forespørselen din."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Innrapporter feil"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Kildekode"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Endringslogg"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Velg alt"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Vis QR-kode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR-kode for dine brolinjer"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Oisann!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Det oppsto en feil ved innhenting av din QR-kode."
+
+#: 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 "Denne QR koden inneholder dine brolinjer. Skann den med en QR leser for å kopiere dine brolinjer over på mobile og andre enheter."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Det er for tiden ingen tilgjengelige broer…"
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Kanskje du bør prøve %s gå tilbake til %s og velge en annen brotype!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Steg %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Last ned %s Tor-nettleseren %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Steg %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Tilknytt %s broer %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Steg %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Nå %s legg til broer til Tor-nettleseren %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.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sB%sare gi meg noen broer!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Avanserte valg"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Nei"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "ingen"
+
+#. 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:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sJ%sa!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sT%silknytt broer"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
-msgstr "[Dette er en automatisert melding; vennligst ikke svar.]"
+msgstr "[Dette er en automatisert melding; ikke svar.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Her er dine broer:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 "Du har gått over hastighetsbegrensningen. Vennligst ta det med ro! Minste tid mellom e-poster er %s timer. Alle videre eposter i denne tidsperioden vil bli ignorert."
+msgstr "Du har overskredet hastighetsbegrensningen. Ta det med ro! Minste tid mellom e-poster er %s timer. Alle videre e-poster i denne tidsperioden vil bli ignorert."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "KOMMANDOer: (kombiner KOMMANDer to å angi flere valg samtidig)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Velkommen til BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Nåværende støttede transport TYPEr:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Hei, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Hallo, lille venn!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Offentlige nøkler"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -97,7 +224,7 @@ msgstr "Denne e-posten ble laget med regnbuer, enhjørninger og stjerneskudd for
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -108,7 +235,7 @@ msgid ""
msgstr "I BridgeDB finnes broer med flere %styper av pluggbare transporter%s,\nsom kan hjelpe deg med å tilsløre dine tilkoblinger til Tor-nettverket, noe som gjør det\nvanskelig for noen som overvåker din internett-trafikk å fastsette hvorvidt du\nbruker Tor eller ei\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -120,29 +247,29 @@ msgstr "Noen broer med IPv6-adresser er også tilgjelgelige, dog er noen pluggba
#. 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
+#: bridgedb/strings.py:88
#, 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 "Merk også, BridgeDB har massevis av standardbroer med fabrikkoppsett %s uten\nnoen pluggbare transporter %s hvilket kanskje ikke høres så tøft ut, men de kan fremdeles\nbehjelpe omgåelse av internettsensur i de fleste fall.\n\n"
+msgstr "Merk også, BridgeDB har massevis av standardbroer med fabrikkoppsett %s uten\nnoen pluggbare transporter %s hvilket kanskje ikke høres så tøft ut, men de kan fremdeles\nbehjelpe omgåelse av Internettsensur i de fleste fall.\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Hva er broer?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Broer %s er Tor-tilknyttninger som hjelper deg med å omgå sensur."
+msgstr "%s Broer %s er Tor-rutingsstafettoppsett som hjelper deg med å omgå sensur."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Jeg trenger en alternativ måte å få broer på!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -150,238 +277,113 @@ msgid ""
"%s, %s or %s."
msgstr "En annen måte tilknytte seg broer er å sende en e-post til %s. Merk at du må sende\ne-post fra en adresse tilhørende en av følgende e-posttilbydere:\n%s, %s eller %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Broene mine virker ikke! Jeg trenger hjelp!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
-msgstr "Hvis din Tor ikke virker, burde du skrive epost til %s."
+msgstr "Hvis din Tor ikke virker, burde du skrive e-post til %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
+#: bridgedb/strings.py:121
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 "Prøv å få med så mye info om dit tilfelle du kan, inkludert en liste over\nbroene og pluggbare transporter du prøvde å bruke, din Tor-nettleser-versjon,\nog alle meldinger Tor måtte produsere, osv."
+msgstr "Prøv å få med så mye info om ditt brukstilfelle du kan, inkludert en liste over\nbroene og de pluggbare transportene du prøvde å bruke, din Tor-nettleser-versjon,\nog alle meldinger Tor måtte ha produsert, osv."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Her er dine bro-linjer:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
-msgstr "Få broer!"
+msgstr "Tilknytt broer!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Gjør valg for brotype:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Trenger du IPv6-adresser?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Trenger du en %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Nettleseren din viser ikke bilder ordentlig."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
-msgstr "Skriv inn bokstavene fra bildet ovenfor..."
+msgstr "Skriv inn bokstavene fra bildet ovenfor…"
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Hvordan starte med bruk av dine broer"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, 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 "For å sette opp broer i Tor Browser, først gå til %s Tor Browser download\nsiden %s følg så instruksene for nedlasting og start av Tor Browser."
+msgstr "For å sette opp broer i Tor-nettleseren, gå først til %s siden for nedlasting av Tor-nettleser\n%s følg så instruksene for nedlasting og start av Tor-nettleseren."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Når 'Tor nettverks-innstillinger' dialogboksen spretter opp, trykk på 'oppsett' og følg\nveiviseren til den forespør:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Sensurerer, eller blokkerer på annen måte, din internetttilbyder (ISP) tilkoblinger\ntil Tor-nettverket?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
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 "Velg 'Ja' og klikk så 'Neste'. For å sette opp nye broer, kopier og\nlim inn brolinjene i tekstboksen. Til slutt, trykk 'Koble til', og\ndu burde være klar til kamp! Hvis du får problemer, trykk 'Hjelp'\n-knappen i \"Tor-nettverksinnstillinger'-veiviseren for ytterligere hjelp."
+msgstr "Velg 'Ja' og klikk så 'Neste'. For å sette opp de nye broene dine, kopier og\nlim inn brolinjene i tekstboksen. Til slutt, trykk 'Koble til', og\ndu burde være klar til kamp! Hvis du får problemer, trykk 'Hjelp'\n-knappen i \"Tor-nettverksinnstillinger'-veiviseren for ytterligere hjelp."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Vis denne meldingen."
#. 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
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Be om broer med \"vanilla\" fabrikkoppsett."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Etterspør IPv6-broer."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Be om en pluggbar transport etter TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Få kopi av BridgeDBs offentlige GnuPG-nøkkel."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Rapporter en feil"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Kildekode"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Endringslogg"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kontakt"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Velg alle"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Vis QR kode"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QR kode for dine brolinjer"
-
-#. 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 "På tryne i myra!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Det oppsto en feil ved innhenting av din QR kode."
-
-#: 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 "Denne QR koden inneholder dine brolinjer. Skann den med en QR leser for å kopiere dine brolinjer over på mobile og andre enheter."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Det er for tiden ingen tilgjengelige broer..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Kanskje du bør prøve %s gå tilbake til %s og velge en annen brotype!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Steg %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Last ned %s Tor-nettleser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Steg %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Hent %s broer %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Steg %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Nå %s legg til broer til Tor-nettleser %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 "%sB%sare gi meg noen broer!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Avanserte valg"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Nei"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "ingen"
-
-#. 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 "%sJ%sa!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sT%silknytt broer"
diff --git a/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po
index 2880ab0..5ae1637 100644
--- a/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po
@@ -4,29 +4,33 @@
#
# Translators:
# Adriaan Callaerts <adriaan.callaerts at gmail.com>, 2013
+# André Koot <meneer at tken.net>, 2016
# Ann Boen <ann.boen at gmail.com>, 2014
-# Cleveridge <erwin.de.laat at cleveridge.org>, 2014
+# bacovane <bart-ts at tushmail.com>, 2018-2019
+# Cleveridge <erwin.de.laat at cleveridge.org>, 2014,2016
# Dick, 2014
# Johann Behrens <info at wmrkameleon.nl>, 2013
-# Mart3000, 2015
+# 53a60eabbf5124a226a7678001f9a57b, 2015
+# Not Much <1028484728393 at protonmail.com>, 2018
# Shondoit Walker <shondoit at gmail.com>, 2011
# Marco Brohet <inactive+therbom at transifex.com>, 2012
# Tom Becht <tombecht at live.nl>, 2014
# Tonko Mulder <tonko at tonkomulder.nl>, 2015
+# Tonnes <tonnes.mb at gmail.com>, 2019
# math1985 <transifex at matthijsmelissen.nl>, 2013
# BBLN <webmaster at bbln.nl>, 2014
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-19 21:02+0000\n"
-"Last-Translator: Mart3000\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/torproject/language/nl/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-04-14 17:58+0000\n"
+"Last-Translator: Tonnes <tonnes.mb at gmail.com>\n"
+"Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\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"
+"Generated-By: Babel 1.3\n"
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -41,57 +45,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
-msgstr "Sorry! Er is iets mis gegaan met je verzoek."
+msgstr "Sorry! Er is iets misgegaan met uw aanvraag."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Een bug melden"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Broncode"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Wijzigingslogboek"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Contact"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Alles selecteren"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Laat de QRCode zien"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QRCode voor uw bridge regels"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Helaas pindakaas!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Er was een fout tijdens het ophalen van uw QRCode"
+
+#: 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 "Deze QRCode bevat uw bridge regels. Scan het met een QRCode lezer om uw bridge regels te kopiëren naar mobiele of andere apparaten."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Er zijn momenteel geen bridges beschikbaar..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Misschien moet je proberen %s terug te gaan %s en een ander bridge type te selecteren!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Stap %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Download %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Stap %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Download %s bridges %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Stap %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Nu %s voeg de bridges toe aan Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sG%seef me gewoon bridges!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Geavanceerde opties"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Nee"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "geen"
+
+#. 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:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sJ%sa!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sK%srijg Bridges"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Dit is een automatisch bericht, gelieve niet te beantwoorden.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Hier zijn je bridges:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 "Je hebt de rate limiet overschreden. Graag rustiger aan! De minimale tijd tussen\ne-mailberichten is %s uur. Alle verdere e-mails gedurende deze periode worden genegeerd."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "COMMANDs: (combineer commando's om meerdere opties tegelijkertijd te specificeren)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Welkom bij BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Huidig ondersteunde transport TYPEs:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Hoi, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Hallo, vriend!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Publieke Sleutels"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -102,7 +231,7 @@ msgstr "Deze email is gegenereerd met regenbogen, eenhoorns, en fonkelingen voor
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -113,7 +242,7 @@ msgid ""
msgstr "BridgeDB kan voorzien in bridges met meerdere Pluggable Transports%s %stypes,\ndie helpen bij het verduisteren van uw connecties naar het Tor netwerk,\nwaardoor het moeilijker wordt voor anderen om uw internet traffic te bekijken en vast te stellen dat u Tor gebruikt.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -125,7 +254,7 @@ msgstr "Sommige bridges met IPv6 adressen zijn eveneens beschikbaar, maar sommig
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -134,20 +263,20 @@ msgid ""
"\n"
msgstr "Verder heeft BridgeDB genoeg oude vanilla bridges %s zonder enige\nPluggable Transports %s wat mogelijk niet zo cool klinkt, maar deze kunnen nog steeds helpen bij het omzeilen van internetcensuur in de meeste gevallen.\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Wat zijn bridges?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Bridges %s zijn Tor relays die je helpen censuur te omzeilen."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Ik heb een alternatieve manier nodig om bridges te verkrijgen!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -155,61 +284,61 @@ msgid ""
"%s, %s or %s."
msgstr "Een alternatieve manier om bridges te verkrijgen is door een email te sturen naar %s. Houd er wel rekening mee dat je\nde email verstuurd via een van de volgende email aanbieders:\n%s, %s of %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Mijn bridges werken niet! Ik heb hulp nodig!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
-msgstr "Als uw Tor niet werkt, email dan naar %s."
+msgstr "Als je Tor niet werkt, email dan naar %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
+#: bridgedb/strings.py:121
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 "Probeer zoveel mogelijk informatie toe te voegen over je situatie als je kan, waaronder de lijst met \nbridges en Pluggable Transports die je geprobeerd hebt te gebruiken, je Tor Browser versie,\nen alle meldingen welke Tor heeft uitgegeven, etc."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Hier zijn je bridge regels:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Krijg Bridges!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Selecteer opties voor bridge type:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
-msgstr "Heeft u IPv6 adressen nodig?"
+msgstr "Heb je IPv6 adressen nodig?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
-msgstr "Heeft u een %s nodig?"
+msgstr "Heb je een %s nodig?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Uw browser vertoont afbeeldingen niet naar behoren."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
-msgstr "Voer de karakters in van de afbeelding hier beneden..."
+msgstr "Voer de tekens in van de afbeelding hier beneden..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Hoe te starten met het gebruik van je bridges"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -218,21 +347,21 @@ msgid ""
msgstr "Om bridges toe te voegen in Tor Browser, ga eerst naar %s Tor Browser download pagina %s en volg dan de instructies voor het downloaden en starten van Tor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Wanneer de 'Tor Network Settings' dialoog opent, klik 'Configure' en volg\nde wizard totdat deze vraagt om:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Blokkeert of censureert je internetprovider (ISP) verbindingen\nnaar het Tor netwerk?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
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"
@@ -240,153 +369,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Selecteer 'Ja' en klik vervolgens 'Next'. Om je nieuwe bridges te configureren, kopieer en\nplak je de bridge regels in het invoerveld. Vervolgens klik je 'Connect', en\nben je klaar om te gaan! Als je problemen ervaart, klik dan de 'Help'\nknop in de 'Tor Network Settings' wizard voor verdere hulp."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Toont dit bericht."
#. 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
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Vraag vanilla bridges aan."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Verzoek IPv6 bridges"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Vraag een Pluggable Transport op TYPE aan."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Verkrijg een kopie van BridgeDB's publieke GnuPG key."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Rapporteer een bug"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Broncode"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Wijzigingslogboek"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Contact"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Alles selecteren"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Laat de QRCode zien"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QRCode voor je bridge regels"
-
-#. 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 "Helaas pindakaas!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Er was een fout tijdens het ophalen van je QRCode"
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Deze QRCode bevat je bridge regels. Scan het met een QRCode lezer om je bridge regels te kopiëren naar een mobiel of andere apparaten."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Er zijn momenteel geen bridges beschikbaar..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Misschien moet je proberen %s terug te gaan %s en een ander bridge type te selecteren!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Stap %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Download %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Stap %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Download %s bridges %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Stap %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Nu %s voeg de bridges toe aan Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "Geef me %sg%sewoon bridges!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Geavanceerde Opties"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Nee"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "geen"
-
-#. 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 "%sJ%sa!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sK%srijg Bridges"
diff --git a/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po
index 6d266e8..50acee4 100644
--- a/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po
@@ -7,26 +7,26 @@
# Aron <aron.plotnikowski at cryptolab.net>, 2013
# JerBen <ayurveda63 at gmail.com>, 2012
# bogdrozd <bog.d at gazeta.pl>, 2013
-# Dawid <hoek at hoek.pl>, 2014
+# Dawid Job <hoek at tuta.io>, 2014
# Rikson <Ers at mail2tor.com>, 2014
# Karol Obartuch <kobartuch at luc.edu>, 2015
# Krzysztof Łojowski <maxxxrally at gmail.com>, 2014
# oirpos <kuba2707 at gmail.com>, 2015
-# seb, 2014-2015
+# sebx, 2014-2015
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-16 10:48+0000\n"
-"Last-Translator: Karol Obartuch <kobartuch at luc.edu>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/torproject/language/pl/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-01-15 12:20+0000\n"
+"Last-Translator: erinm\n"
+"Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\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"
+"Generated-By: Babel 1.3\n"
"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
@@ -39,57 +39,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Przepraszamy! Ale coś poszło nie tak z Twoim zapytaniem."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Zgłoś Błąd"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Kod źródłowy"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Lista zmian"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Zaznacz wszystko"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Pokaż KodQR"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "KodQR dla Twoich linii bridge"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ups, coś poszło nie tak!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Wygląda na to, że napotkaliśmy na błąd podczas próby pobrania Twojego kodu QR."
+
+#: 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 "Ten KodQR zawiera Twoje linie bridge. Przeskanuj je czytnikiem kodów QR, aby skopiować je do Twojego telefonu lub innych urządzeń."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Aktualnie nie ma dostępnych żadnych mostów..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Prawdpododobnie powinieneś spróbować %s wrócić %s i wybrać inny typ mostu!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Krok %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Pobierz %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Krok %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Pobierz %s mostki %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Krok %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Teraz %s dodaj mosty do Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sP%so prostu daj mi mosty!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Opcje zaawansowane"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Nie"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "brak"
+
+#. 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:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sT%sak!"
+
+#. 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:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sP%sozyskaj mosty"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[To jest wiadomość generowana automatycznie; prosimy na nią nie odpisywać.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Oto Twoje mostki:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 "Przekroczono limit szybkości. Proszę zwolnij! Minimalny czas pomiędzy \nwiadomości e-mail to %s godzin. Wszystkie dodatkowe e-maile w tym okresie będą ignorowane."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "POLECENIA: (łącz polecenia, aby sprecyzować kilka opcji jednocześnie)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Witamy w BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Obecnie obsługiwane transport TYPEs:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Witaj, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Witaj przyjacielu!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Klucze Publiczne"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -100,7 +225,7 @@ msgstr "Ten email zastał wygenerowany przez tęcze, jednorożce i gwiazdki \ndl
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -111,7 +236,7 @@ msgid ""
msgstr "BridgeDB może dostarczać połączenia mostkowe z kilkoma %stypes włączanymi protokołami%s,\nktóre mogą pomóc ukryć Twoje połączenie do Sieci Tor, tworząc trudniejsze\ndo podsłuchania dla osób obserwujących ruch sieci w celu ustalenia gdzie się znajdujesz\nużywając Tor.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -123,7 +248,7 @@ msgstr "Niektóre połączenia mostkowe z adresami IPv6 są również dostępne,
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -132,20 +257,20 @@ msgid ""
"\n"
msgstr "Dodatkowo, BridgeDB posiada sporo regularnych mostów %s bez \njakichkolwiek pluggable transports %s, które mogą wydawać się niezbyt przydatne, \njednak w wielu przypadkach mogą pomóc w obejściu cenzury.\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Czym są mostki?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Mosty %s są węzłami w sieci Tor pomagającymi w ominięciu cenzury."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Potrzebuję alternatywnego sposobu na pozyskanie mostków!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -153,12 +278,12 @@ msgid ""
"%s, %s or %s."
msgstr "Innym sposobem na pozyskanie mostu jest wysłanie wiadomości e-mail na adres %s. Proszę pamiętać, że należy \nwysłać wiadomość używając adresu jednego z następujących dostawców poczty elektronicznej:\n%s, %s lub %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Moje mostki nie działają! Potrzebuję pomocy!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Jeśli Twój Tor nie działa, powinieneś wysłać wiadomość e-mail na adres %s."
@@ -166,48 +291,48 @@ msgstr "Jeśli Twój Tor nie działa, powinieneś wysłać wiadomość e-mail na
#. 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
+#: bridgedb/strings.py:121
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 "Spróbuj zawrzeć jak najwiecej informacji o swoim problemie, uwzględniając listę mostów i Pluggable Transports, których próbowałeś użyć, wersję Tor Browser, wszelkie komunikaty, które zwrócił Tor i inne."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Oto Twoje połączenia z wykorzystaniem mostów:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Zdobądź Mosty!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Proszę wybrać opcje dla typu mostu:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Czy potrzebujesz adresów IPv6?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Czy potrzebujesz %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Twoja przeglądarka nie wyświetla obrazów prawidłowo."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Wprowadź tekst z obrazka powyżej..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Jak zacząć używać mostów"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -216,21 +341,21 @@ msgid ""
msgstr "Aby wprowadzić mosty do Tor Browser, postępuj zgodnie z instrukcjami na %s stronie \npobierania Tor Browser %s, aby uruchomić Tor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Po pojawieniu się okna 'Ustawienia Sieci Tor' naciśnij przycisk \"Konfiguruj\", a następnie postępuj zgodnie ze\nwskazówkami kreatora do momentu pytania o:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Czy Twój dostawca usług internetowych (ISP) blokuje lub cenzuruje połączenia do sieci Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
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"
@@ -238,153 +363,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Wybierz 'Tak' a następnie kliknij 'Dalej'. Aby skonfigurować swoje nowe \nmosty, skopiuj i wklej każdy most w nowym wierszu w polu tekstowym. \nNa koniec kliknij 'Połącz' i to wszystko! Jeśli napotkasz jakiekolwiek problemy, naciśnij przycisk 'Pomoc' w kreatorze 'Ustawienia Sieci Tor' w celu uzyskania dalszych porad."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Wyświetla tę wiadomość."
#. 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
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Poproś o regularne mosty."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Poproś o mosty IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Poproś o Pluggable Transport przez TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Uzyskaj kopię klucza publicznego GnuPG BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Zgłoś Błąd"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Kod źródłowy"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Lista zmian"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kontakt"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Zaznacz wszystko"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Pokaż KodQR"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "KodQR dla Twoich linii bridge"
-
-#. 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 "Ups, coś poszło nie tak!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Wygląda na to, że napotkaliśmy na błąd podczas próby pobrania Twojego kodu QR."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Ten KodQR zawiera Twoje linie bridge. Przeskanuj je czytnikiem kodów QR, aby skopiować je do Twojego telefonu lub innych urządzeń."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Aktualnie nie ma dostępnych żadnych mostów..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Prawdpododobnie powinieneś spróbować %s wrócić %s i wybrać inny typ mostu!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Krok %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Pobierz %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Krok %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Pobierz %s mostki %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Krok %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Teraz %s dodaj mosty do Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sP%so prostu daj mi mosty!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Opcje zaawansowane"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Nie"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "brak"
-
-#. 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 "%sT%sak!"
-
-#. 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 "%sP%sozyskaj mosty"
diff --git a/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po
index 1d98531..c61065c 100644
--- a/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po
@@ -3,28 +3,33 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
+# Alberto Castro, 2015
+# Alberto Castro, 2017
# alfalb.as, 2015
# André Monteiro <andre.monteir at gmail.com>, 2014
# Bruno D. Rodrigues <bruno.rodrigues at litux.org>, 2015
# kagazz <lourenxo_619 at hotmail.com>, 2014
-# alfalb_mansil, 2014
-# MMSRS, 2015
-# Andrew Melim <nokostya.translation at gmail.com>, 2014
-# Pedro Albuquerque <palbuquerque73 at gmail.com>, 2014-2015
-# Sérgio Marques <smarquespt at gmail.com>, 2014
+# Manuela Silva <inactive+h_manuela_rodsilva at transifex.com>, 2015
+# MS <manuelarodsilva at gmail.com>, 2014,2017-2018
+# Manuela Silva <inactive+h_manuela_rodsilva at transifex.com>, 2015
+# Manuela Silva <inactive+h_manuela_rodsilva at transifex.com>, 2015
+# MS <manuelarodsilva at gmail.com>, 2018
+# Drew Melim <nokostya.translation at gmail.com>, 2014
+# Pedro Albuquerque <pmra at gmx.com>, 2014-2015
+# Sérgio Marques <smarquespt at gmail.com>, 2014,2016
# TiagoJMMC <tiagojmmc at gmail.com>, 2014
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-02 23:34+0000\n"
-"Last-Translator: Bruno D. Rodrigues <bruno.rodrigues at litux.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-01-15 12:20+0000\n"
+"Last-Translator: erinm\n"
+"Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/pt/)\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"
+"Generated-By: Babel 1.3\n"
"Language: pt\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -39,57 +44,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Desculpe! Ocorreu algo de errado com o seu pedido."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Reportar um erro"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Código fonte"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Registo de alterações"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Contactos"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Selecionar tudo"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Mostrar Código QR"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "Código QR para as suas linhas de ponte"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ocorreu um erro!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Parece que ocorreu um erro ao obter o seu Código QR."
+
+#: 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 "Este QRCode contém as suas linhas de ponte. Pesquise-as com um leitor de código QR para copiar as linhas de ponte para os dispositivos móveis e outros dispositivos."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Atualmente, não existem pontes disponíveis..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Talvez devesse experimentar %s e voltar a %s, e escolhendo um tipo de ponte diferente!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Passo %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Transferir %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Passo %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Obter %s pontes %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Passo %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Agora, %s adicione as pontes ao Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sD%sisponibilizem-me pontes!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Opções Avançadas"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Não"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "nenhuma"
+
+#. 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:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sS%sim!"
+
+#. 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:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sO%sbter Pontes"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Esta é uma mensagem automática; por favor, não responda.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Aqui estão as suas pontes:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 "Excedeu a taxa limite. Por favor abrande! O tempo mínimo entre mensagens\neletrónicas é de %s horas. Todas as mensagens seguintes durante este período serão ignoradas."
+msgstr "Excedeu a taxa limite. Por favor, abrande! O tempo mínimo entre e-mails \né de %s horas. Todos os e-mails seguintes durante este período serão ignorados."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "COMANDOS: (combine COMANDOS para especificar múltiplas opções em simultâneo)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Bem-vindo ao BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Transport TYPEs suportados:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Olá, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Olá, amigo!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Chaves Públicas"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -100,7 +230,7 @@ msgstr "Esta mensagem foi gerada com arco-íris, unicórnios e estrelas\npara %s
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -108,57 +238,57 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "A BridgeDB pode fornecer pontes com vários %stypes de Pluggable Transports%s,\nque poderão ajudar a ocultar as suas ligações à Tor Network, tornando mais difícil\na filtragem do seu tráfego de Internet para determinar se está a usar o Tor.\n"
+msgstr "BridgeDB pode disponibilizar pontes com vários %stipos de Transportes Ligáveis%s,\nque podem ajudar a ocultar as suas ligações à Rede Tor, tornando mais difícil\npara alguém monitorizar o seu tráfego na Internet para determinar se está a utilizar o Tor.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
-msgstr "Também estão disponíveis algumas pontes com endereços IPv6. \nNo entanto, alguns Pluggable Transports não são compatíveis com ligações IPv6.\n\n"
+msgstr "Também estão disponíveis algumas pontes com endereços de IPv6, embora\nalguns Transportes Ligáveis não são compatíveis com 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
+#: bridgedb/strings.py:88
#, 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 "Adicionalmente, a BridgeDB tem imensas pontes %s simples, normais e regulares\nmas sem qualquer Pluggable Transports %s, o que pode não parecer aliciante, mas\nque, ainda assim, ajudam a contornar a censura na Internet.\n"
+msgstr "Adicionalmente, BridgeDB tem imensas pontes %s simples, normais e regulares,\nsem quaisquer Transportes Ligáveis %s, o que poderá não parecer ótimo, mas estes,\nainda assim, ajudam a contornar a censura na Internet, na maioria dos casos.\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "O que são pontes?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Pontes %s são relays Tor para ajudar a contornar a censura."
+msgstr "%s Pontes %s são retransmissões Tor que o ajudam a contornar a censura."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
-msgstr "Preciso de uma alternativa para obter pontes!"
+msgstr "Eu preciso de uma alternativa para obter pontes!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, 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 "Outra forma de obter pontes é enviar uma mensagem para %s. Por favor, note que\na mensagem tem de ser enviada de um dos seguintes fornecedores de serviço:\n%s, %s ou %s."
+msgstr "Outra forma para obter pontes, é enviar uma mensagem para %s. Por favor, note que\ndeve enviar a mensagem utilizando um endereço dos seguintes fornecedores de e-mail\n%s, %s ou %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "As minhas pontes não funcionam! Eu preciso de ajuda!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Se o seu Tor não funciona, deve enviar uma mensagem para %s."
@@ -166,224 +296,100 @@ msgstr "Se o seu Tor não funciona, deve enviar uma mensagem para %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
+#: bridgedb/strings.py:121
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 "Tente incluir o máximo de informação sobre os problemas. Deve incluir a lista\nde pontes e Pluggable Transports que tentou utilizar, a sua versão Tor e \nquaisquer mensagens que o Tor retornou..."
+msgstr "Tente incluir o máximo de informação possível sobre o seu caso, incluindo a lista\nde ligações e Transportes Ligáveis que tentou utilizar, a versão do seu Tor Browser e \nquaisquer mensagens que o Tor devolveu, etc."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Aqui estão as suas linhas de ponte:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
-msgstr "Obter pontes!"
+msgstr "Obter Pontes!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
-msgstr "Por favor selecione as opções para o tipo de ponte:"
+msgstr "Por favor, selecione as opções para o tipo de ponte:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
-msgstr "Necessita de endereços IPv6?"
+msgstr "Precisa de endereços de IPv6?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
-msgstr "Necessita de %s?"
+msgstr "Precisa de %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
-msgstr "O seu navegador não está a mostrar as imagens apropriadamente."
+msgstr "O seu navegador não está a exibir as imagens devidamente."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
-msgstr "Introduza os caracteres da imagem acima..."
+msgstr "Insira os carateres da imagem acima..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
-msgstr "Como utilizar as suas pontes"
+msgstr "Como começar a utilizar as suas pontes"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, 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 inserir pontes no Tor Browser, siga as instruções na página de transferências\n%s do Tor Browser %s para iniciar o 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 "Para inserir as ligações no Tor Browser, aceda primeiro à pagina %s para transferir o Tor Browser %s\ne depois siga as instruções sobre com transferir e utilizar o\nTor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Assim que o diálogo de rede Tor aparecer, clique em Configurar e siga\nas intruções do assistente até que lhe pergunte:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
-msgstr "O seu fornecedor de serviço Internet (ISP) bloqueia ou censura as ligações\n à rede Tor?"
+msgstr "O seu Provedor de Serviço da Internet (ISP) bloqueia ou então censura as ligações\n à rede Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
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 "Selecione 'Sim' e clique em 'Seguinte'. Para configurar as novas pontes, copie e\ncole as linhas de pontes na caixa de texto. Finalmente, clique em 'Conetar' e\ndeverá estar pronto para continuar! Se ocorrerem erros, clique em 'Ajuda' no\nassistente de 'Configurações da Rede Tor' para mais assistência."
+msgstr "Selecione 'Sim' e depois clique em 'Seguinte'. Para configurar as suas novas pontes, copie e\ncole as linhas de ponte na caixa de texto. Finalmente, clique em 'Ligar' e\ndeverá estar pronto para continuar! Se encontrar problemas, tente clicar na 'Ajuda' no\nassistente de 'Configurações da Rede Tor' para mais assistência."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
-msgstr "Mostra esta mensagem."
+msgstr "Exibe esta mensagem."
#. 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
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Solicita as pontes básicas."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
-msgstr "Solicita pontes IPv6."
+msgstr "Solicita pontes de IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
-msgstr "Solicita um Pluggable Transport por TYPE."
+msgstr "Solicita um Transporte de Conexão por TIPO"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Obter uma cópia da chave pública GnuPG da BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Reportar um erro"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Código fonte"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Registo de alterações"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Contactos"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Escolher todos"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Mostrar QRCode"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QRCode para as suas linhas de ponte"
-
-#. 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 "Ocorreu um erro!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Parece que ocorreu um erro ao obter o seu QRCode."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Este QRCode contém as suas linhas de ponte. Leia-o com um leitor de QRCode para copiar as linhas de ponte para dispositivos móveis."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Atualmente não existem pontes livres..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Experimente utilizar %s voltando a %s e escolhendo um tipo de ponte diferente!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Passo %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Transferir %s Navegador Tor %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Passo %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Obtenha %s pontes %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Passo %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Agora %s adiciona as ligações ao Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sA%spenas quero as pontes!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Opções avançadas"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Não"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "nenhuma"
-
-#. 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 "%sS%sim!"
-
-#. 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 "%sO%sbter pontes"
diff --git a/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po
index 0ebe010..9118c88 100644
--- a/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po
@@ -3,25 +3,35 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Communia <ameaneantie at riseup.net>, 2013-2015
+# Communia <ameaneantie at riseup.net>, 2013-2017
+# André Almeida <andrefalmeida at protonmail.com>, 2018
+# anominino anomino <anominino at riseup.net>, 2018
+# Cláudio Carvalho <znnb at mail.com>, 2018
+# Cy Belle <cyb3ll3 at protonmail.com>, 2019
+# Danton Medrado, 2015
+# Eduardo Bonsi, 2015,2018
+# Eduardo Loeffel Noce Gobi <eduardogobi at outlook.com>, 2016-2017
# Augustine <evandro at geocities.com>, 2013
-# Humberto Sartini <humberto at hss.blog.br>, 2014
+# Humberto Sartini, 2014
# Isabel Ferreira, 2014
+# jhqpinto <jhqpinto at vivaldi.net>, 2018
# João Paulo S.S <contato1908 at gmail.com>, 2015
+# Kaio Soares Rauta <kaio_soares_rauta at yahoo.com.br>, 2015
+# Luciana Dark Blue <lucianadarkblue at gmail.com>, 2015
# m4lqu1570 <>, 2012
# Rodrigo Emmanuel Santana Borges <rodrigoesborges at gmail.com>, 2014
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-16 19:39+0000\n"
-"Last-Translator: Communia <ameaneantie at riseup.net>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-05-10 18:26+0000\n"
+"Last-Translator: Cy Belle <cyb3ll3 at protonmail.com>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\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"
+"Generated-By: Babel 1.3\n"
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -36,68 +46,193 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Desculpe! Algo errado ocorreu com a sua solicitação."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Relatar um Bug"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Código Fonte:"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Registro de alterações"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Contato"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Selecionar tudo"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Mostrar Código QR"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "Código QR para as suas pontes de conexão"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ai, caramba!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Parece que houve um erro ao obter o seu Código QR."
+
+#: 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 "Este Código QR contém as suas pontes de conexão. Escaneie com um leitor de Código QR para copiar as pontes de conexão para dispositivos móveis e outros aparelhos."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Atualmente não há nenhuma ponte disponível..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Talvez você deva tentar %s voltar %s e escolher um outro tipo de ponte!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Passo %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Fazer download do %s Navegador Tor %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Passo %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Obter %s pontes %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Passo %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Agora, %s inserir as pontes no Navegador Tor %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.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sA%spenas me dê pontes!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Opções Avançadas"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Não"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "nenhum"
+
+#. 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:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sS%sim!"
+
+#. 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:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sObter%s Bridges"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Esta é uma mensagem automática; por favor, não responda.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Aqui estão suas pontes:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 "Você excedeu o limite. Mais devagar, por favor! O tempo mínimo entre\ne-mails é de %s horas. Todos os outros e-mails serão ignorados durante este período."
+msgstr "Você excedeu o quantidade limite. Mais devagar, por favor! O tempo mínimo entre\ne-mails é de %s horas. Todos os outros e-mails serão ignorados durante este período."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMANDOS: (combinar COMANDOS para especificar múltiplas opções simultaneamente)"
+msgstr "COMANDOS: (combine COMANDOS para especificar múltiplas opções simultaneamente)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Bem vindo ao BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
-msgstr "TYPEs de transport que possuem suporte atualmente:"
+msgstr "TIPOS de transporte compatíveis no momento:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Olá, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Olá, amigo!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Chaves Públicas"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
-msgstr "Este e-mail foi gerado com arco-íris, unicórnios e purpurina, por %s, %s, às %s."
+msgstr "Este e-mail foi gerado com arco-íris, unicórnios e brilho, para %s, em %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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -105,44 +240,44 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "BridgeDB pode fornecer pontes com vários %stipos de Transportes Plugáveis%s,\nque podem ajudar a ofuscar suas conexões com a Rede Tor, tornando mais\nddifícil para qualquer um ver seu tráfego de internet para determinar que você está\nusando o Tor.\n"
+msgstr "BridgeDB pode fornecer pontes com vários %stipos de Transportadores Plugáveis%s,\nque podem ajudar a ocultar as suas conexões com a rede Tor, tornando mais difícil,\npara quem estiver observando o seu tráfego na Internet, saber ao certo se você está usando Tor.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
-msgstr "Algumas pontes com endereços IPv6 também estão disponíveis, mas alguns PLUGGABLE TRNAPORTS não são compatíveis com o IPv6.\n"
+msgstr "Algumas pontes com endereços IPv6 também estão disponíveis, embora alguns Transportadores Plugáveis não sejam compatíveis com 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
+#: bridgedb/strings.py:88
#, 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 "Além disso, BridgeDB tem muitas pontes tradicionais %s sem nenhum PLUGGABLE TRANSPORTS%s, que podem ajudar a driblar a censura na internet em muitos casos.\n"
+msgstr "Além disso, BridgeDB tem várias pontes simples %s sem quaisquer Transportadores Plugáveis %s, o que talvez não pareça tão legal, mas pode ajudar a driblar a censura na Internet em muitos casos.\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "O que são pontes?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Pontes %s são retransmissores Tor que ajudam a driblar a censura."
+msgstr "%s Pontes %s são relés Tor que ajudam a driblar a censura."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Preciso de um outro modo de obter pontes!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -150,12 +285,12 @@ msgid ""
"%s, %s or %s."
msgstr "Outro modo de obter pontes é enviando um e-mail para %s. Por favor, lembre que você deve enviar o e-mail utilizando um endereço registrado em um dos seguintes provedores de e-mail: \n%s, %s ou %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Minhas pontes não funcionam! Preciso de ajuda!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Se o Tor não funcionar, envie um e-mail %s."
@@ -163,48 +298,48 @@ msgstr "Se o Tor não funcionar, envie um e-mail %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
+#: bridgedb/strings.py:121
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 "Tente incluir o máximo de informações possíveis sobre o seu caso, como a lista das pontes e dos PLUGGABLE TRANSPORTS que você tentou usar, a versão do seu navegador Tor e todas as mensagens que o Tor emitiu, etc."
+msgstr "Tente incluir o máximo de informações possíveis sobre o seu caso, junto com a lista de \npontes e Transportadores Plugáveis que você tentou utilizar, a versão do seu Navegador Tor\ne toda mensagem que o Tor tenha dado, etc."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
-msgstr "Veja sua pontes ativas:"
+msgstr "Aqui estão as suas pontes de conexão:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Obtenha Pontes!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Por favor, selecione as opções de tipos de pontes:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Você precisa de endereços IPv6?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Você precisa de %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Seu navegador não está mostrando as imagens corretamente."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Digite os caracteres da imagem acima..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Como começar a usar as suas pontes"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -213,175 +348,50 @@ msgid ""
msgstr "Para adicionar pontes ao Navegador Tor, primeiro vá ao %s página de download\ndo Navegador Tor %s e siga as instruções para fazer o download e iniciá-lo."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Quando a janela 'Configurações da Rede Tor' aparecer, clique em 'Configurar' e siga\no assistente até que ele pergunte:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "O seu Provedor de Serviços de Internet (PSI) bloqueia ou censura conexões\nà rede Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
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 "Selecione 'Sim' e clique em 'Próximo'. Para configurar suas novas pontes, copie e\ncole as coordenadas das pontes na caixa de texto de saída. Por fim, clique em 'Conectar'.\nIsso deve ser o suficiente! Se você encontrar problemas, tente clicar no botão\n'Ajuda' no assistente de 'Configurações da Rede Tor', para mais assistência."
+msgstr "Selecione 'Sim' e clique em 'Próximo'. Para configurar as suas novas pontes, copie e cole as pontes de conexão na caixa de entrada de texto. Em seguida, clique em 'Conectar' e tudo deverá estar pronto! Caso haja problemas, clique no botão 'Ajuda' do assistente de 'Configurações da Rede Tor' para mais suporte."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Mostrar essa mensagem."
#. 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
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
-msgstr "Solicitar pontes VANILLA."
+msgstr "Solicitar pontes simples."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Solicitar pontes IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
-msgstr "Requerer Transporte Plugável por TYPE"
+msgstr "Solicitar um Transportador Plugável por TIPO."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Obter uma cópia da chave pública GnuPG do BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Relatar um Bug"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Código Fonte:"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Registro de alterações"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Contato"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Selecionar tudo"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Mostrar QRCode"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QRCode para as suas linhas de ponte"
-
-#. 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 "Ops, um erro!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Parece que houve um erro ao obter seu QRCode"
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Seu QRCode contém as linhas de pontes. Digitalizá-lo com um leitor de QRCode para copiar suas linhas de ponte para dispositivos móveis e outros."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Atualmente não há nenhuma ponte disponível..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Talvez você deva tentar %s voltar %s e escolher um outro tipo de ponte!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Passo %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Fazer download do %s Navegador Tor %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Passo %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Obter %s pontes %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Passo %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Agora, %s inserir as pontes no Navegador Tor %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 "%sS%só me dê bridges!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Opções Avançadas"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Não"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "nenhum"
-
-#. 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 "%sS%sim!"
-
-#. 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 "%sO%sbtenha Bridges"
diff --git a/bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po
index 30d3cb4..599051c 100644
--- a/bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po
@@ -3,25 +3,27 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Adda.17 <adrianatrifoi at gmail.com>, 2013
+# A C <ana at shiftout.net>, 2019
+# Adda.17 <inactive+Adda.17 at transifex.com>, 2013
+# Adrian Staicu <astaicu at gmail.com>, 2017
# Ana <ana_maria_js at yahoo.com>, 2015
-# axel_89 <axel_rap at yahoo.com>, 2015
+# axel_89, 2015
# Di N., 2015
-# Isus Satanescu <isus at openmailbox.org>, 2014
+# Isus Satanescu <inactive+isus at transifex.com>, 2014
# laura berindei <lauraagavriloae at yahoo.com>, 2014
# clopotel <yo_sergiu05 at yahoo.com>, 2014
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-29 13:56+0000\n"
-"Last-Translator: Di N.\n"
-"Language-Team: Romanian (http://www.transifex.com/projects/p/torproject/language/ro/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-01-08 20:34+0000\n"
+"Last-Translator: A C <ana at shiftout.net>\n"
+"Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/ro/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
@@ -36,68 +38,193 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
-msgstr "Scuze ! Ceva a n-a mers cum trebuie!"
+msgstr "Scuze ! Ceva n-a mers cum trebuie!"
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Raportează un bug"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Cod sursă"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Schimbări"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Contact"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Selectare totală"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Arată QRcod-ul"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "Cod QR pentru punțile tale"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Oops, ca să vezi!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Se pare că s-a produs o eroare în obținerea codului QR."
+
+#: 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 "Codul QR conține punțile tale. Scanează-l cu un cititor de coduri QR pentru a copia liniile tale de punte pe mobil sau alt device."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Pe moment nu există punți disponibile..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Poate ar trebui să %s mergi înapoi %s și să alegi un alt tip de punte!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Pasul %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Descarcă %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Pasul %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Obține %s punți %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Pasul %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Acum %s adaugă punțile în Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sD%soar dă-mi punțile odată!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Opțiuni avansate"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Nu"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "niciunul/niciuna"
+
+#. 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:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sD%sa!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sO%sbține Bridges"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Acesta este un mesaj automat; te rugăm să nu răspunzi.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Acestea sunt punțile tale:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 "Ai depășit rata limită. Te rugăm să o iei mai încet! Timpul minim între\ne-mail-uri este %s ore. Toate e-mail-urile în acest interval vor fi ignorate."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "COMMANDs: (combină COMMANDs pentru a specifica mai multe opțiuni simultan)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Bine ai venit la BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
-msgstr "TYPEs transport suportate actual:"
+msgstr "Transport TYPE-uri suportate momentan:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Bună , %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Bună, prietene!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Chei publice"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
-msgstr "Acest e-mail a fost generat cu curcubee, inorogi și scântei \npentru %s în %s la %s."
+msgstr "Acest e-mail a fost generat cu inorogi, curcubee și scântei \npentru %s în %s la %s."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor".
#. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -105,10 +232,10 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "BridgeDB poate oferi punți cu câteva %stypes de Pluggable Transports%s,\nce pot \"umbri\" conexiunile tale către Tor Network, făcând mai dificil,\npentru cine îți urmărește traficul de Internet, să determine că de fapt\nfolosești Tor.\n"
+msgstr "BridgeDB poate oferi punți cu diferite tipuri de %sPluggable Transports %s,\nce pot ascunde conexiunile tale către Tor Network, făcând mai dificil \nde observat că folosești Tor\npentru cine îți urmărește traficul de Internet.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -120,268 +247,143 @@ msgstr "Unele punți cu adrese IPv6 sunt disponibile, deși unele Pluggable\nTra
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
"help to circumvent internet censorship in many cases.\n"
"\n"
-msgstr "În plus, BridgeDB are multe punți simple %s fără nici o\nPluggable Transport %s ce poate nu pare așa cool, dar care pot\nde asemenea să ocolească cenzura internetului, în multe cazuri.\n\n"
+msgstr "În plus, BridgeDB are multe punți simple %s fără niciun\nTransport Conectabil %s ce poate nu par așa cool, dar care pot\ntotuși să ajute la evitarea cenzurii Internetului în multe cazuri.\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Ce sunt punțile? "
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s punți %s sunt releuri Tor care te ajută să ocolești cenzura."
+msgstr "%s Punțile %s sunt releuri Tor care te ajută să eviți cenzura."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
-msgstr "Am nevoie de o cale alternativă de a obține punțile !"
+msgstr "Am nevoie de o cale alternativă de a obține punțile!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, 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 "O altă cale pentru a face punți este să trimiți un email către %s. Nu uita că\ntrebuie sa trimiți email-ul folosind o adresă de la unul dintre următorii furnizori de e-mail:\n%s, %s sau %s."
+msgstr "O altă cale pentru a obține punți este să trimiți un email către %s. Nu uita că\ntrebuie sa trimiți email-ul folosind o adresă de la unul dintre următorii furnizori de e-mail:\n%s, %s sau %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Punțile mele nu funcționează! Am nevoie de ajutor!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
-msgstr "Daca Tor nu funcţionează, trimite un mesaj la %s ."
+msgstr "Dacă Tor nu funcţionează pentru tine, trimite un mesaj la %s ."
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
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 "Încercă să includezi cât mai multe informații despre cazul tău pe cât posibil, include lista de punți și Pluggable Transports pe care ai încercat să le foloseşti, versiunea de Tor Browser și orice alt mesaj dat de Tor, etc."
+msgstr "Încercă să incluzi cât mai multe informații despre cazul tău pe cât posibil, include lista de \npunți și Pluggable Transports pe care ai încercat să le foloseşti, versiunea de navigator Tor Browser\nși orice alt mesaj dat de Tor, etc."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
-msgstr "Acestea sunt liniile de punți:"
+msgstr "Acestea sunt liniile tale de punți:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
-msgstr "Ia punți!"
+msgstr "Obține punți!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Alege opțiunile pentru tipul de punte:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Ai nevoie de adrese IPv6?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Ai nevoie de %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Browserul nu afișează imaginile corect."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Introdu caracterele din imaginea de mai sus..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Cum să începi să foloseşti punțile"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, 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 "Pentru a introduce punți în browser-ul Tor, mai întâi trebuie mers la %s descărcare browser Tor\npagină %s și apoi trebuie urmate instrucțiunile de descărcare și inițializare\na browser-ului Tor."
+msgstr "Pentru a introduce punți în Tor Browser, mai întâi mergi la %s pagina de descărcare Tor Browser\n%s și apoi urmează instrucțiunile de descărcare și inițializare\na Tor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
-msgstr "Când apare dialogul 'Setări rețea Tor', selectează 'Configurează' și urmează \nindicațiile programului până când îți cere:"
+msgstr "Când apare dialogul 'Setări rețea Tor', selectează 'Configurare' și urmează \nindicațiile programului până când va cere:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Furnizorul de servicii de Internet (ISP) îți blochează sau cenzurează conexiunile către rețeaua Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
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 "Selectează 'Da' și apoi alege 'Următorul'. Pentru a configura noile punți, copiază și colează liniile cu punțile în căsuța de text. În final, selectează 'Conectare' și totul e gata! Dacă ai probleme, click pe 'Help' din 'Setări Rețea Tor'."
+msgstr "Selectează 'Da' și apoi alege 'Următorul'. Pentru a configura noile punți, copiază și lipește \npunțile în căsuța de text. În final, selectează 'Conectează-te' și totul e gata! \nDacă ai probleme, apasă butonul 'Ajutor' din 'Setări Rețea Tor'."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Afișează acest mesaj."
#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
#. same non-Pluggable Transport bridges described above as being
#. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Cere punți simple."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Cere punți IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
-msgstr "Cere un Pluggable Transport după TYPE."
+msgstr "Solicită un Transport Conectabil după TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Obține o copie a cheii GnuPG publice a BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Raportează un bug"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Cod sursă"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Schimbări"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Contact"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Selectare totală"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Arată QRcod-ul"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "Cod QR pentru liniile tale de punte"
-
-#. 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 "Oops, ca să vezi!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Se pare că s-a produs o eroare în încercarea de a recupera codul QR."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Codul QR conține liniile tale de punte. Scanează-l cu un cititor de coduri QR pentru a copia liniile tale de punte pe mobil sau alt device."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Acum nu sunt punți disponibile..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Poate ar trebui să încerci %s înapoi %s și să alegeți un alt tip de punte!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Pas %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Descarcă %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Pas %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Ia %s punți %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Pas %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Acum %s adăugați punțile la Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sD%soar dă-mi punțile odată!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Opțiuni avansate"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Nu"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "niciunul/niciuna"
-
-#. 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 "%sD%sa!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sI%sa punți"
diff --git a/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po
index 21bdb1b..f1b1475 100644
--- a/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po
@@ -3,29 +3,40 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
+# Andrey, 2017
# Andrey Yoker Ogurchikov <domovoy.yoker at gmail.com>, 2014
-# Evgrafov Denis <stereodenis at gmail.com>, 2014
+# Антон Толмачев <a.tolmachev at richart-consalt.ru>, 2016
+# Denis Denis <stereodenis at gmail.com>, 2014
+# Dmitry Schneider <adamred280 at live.ru>, 2019
# Eugene, 2013
# foo <im-infamous at yandex.ru>, 2014
-# Ivan, 2015
-# joshua ridney <yachtcrew at mail.ru>, 2015
-# liquixis <liquixis at gmail.com>, 2012
+# Иван Лапенков, 2015
+# John Doe <koops1997+tmpgithub at gmail.com>, 2019
+# joshua ridney, 2015
+# Kalyuzhniy Aleksey, 2017
+# liquixis, 2012
+# Misha Dyachuk <Wikia at scryptmail.com>, 2016
# Oleg, 2014
-# Sergey Briskin <sergey.briskin at gmail.com>, 2014
+# Roberto Brigante, 2017
+# Sergey Briskin, 2014
+# Timofey Lisunov <solokot at gmail.com>, 2018
# Valid Olov, 2014
+# vb[fbk <kisn23 at mail.ru>, 2015
+# Виктор Ерухин <rewanh59 at gmail.com>, 2016
# Vitaliy Grishenko, 2014
+# Uho Lot <yavinav at gmail.com>, 2016
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-23 09:34+0000\n"
-"Last-Translator: Ivan\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-05-01 09:18+0000\n"
+"Last-Translator: Dmitry Schneider <adamred280 at live.ru>\n"
+"Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\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"
+"Generated-By: Babel 1.3\n"
"Language: ru\n"
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
@@ -40,68 +51,193 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
-msgstr "Извините! Возникла проблема с вашим запросом."
+msgstr "Извините! Что-то пошло не так с вашим запросом."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Сообщить об ошибке"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Исходный код"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Журнал изменений"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Контакты"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Выбрать все"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Показать QR-код"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR-код для адресов ретрансляторов"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Эх, что-то пошло не так!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Похоже, произошла ошибка при получении QR-кода."
+
+#: 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 "Этот QR-код содержит адреса ретрансляторов. Отсканируйте его устройством, считывающим QR-код, чтобы скопировать адреса рестрансляторов на мобильные и другие устройства."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "На данный момент нет доступных мостов..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Возможно, вам стоит попробовать %s вернуться%s и выбрать другой тип моста!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Шаг %s№1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Скачайте %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Шаг %s№2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Установите %s мосты %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Шаг %s№3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Затем %s добавьте адреса мостов в Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sП%sросто добавьте ваш адрес моста!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Дополнительные настройки"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Нет"
+
+#: 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:124
+#, 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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sПолучить адреса мостов%s"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
-msgstr "[Сообщение было сформировано автоматически, пожалуйста, не отвечайте на него.]"
+msgstr "[Это автоматическое сообщение, пожалуйста, не отвечайте на него.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
-msgstr "Подготовленные мосты:"
+msgstr "Ваши адреса мостов:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 часов. Все последующие письма в течение этого времени будут проигнорированы."
+msgstr "Вы превысили допустимый лимит. Пожалуйста, повторите запрос позже!\nПовторить запрос можно через %s часов. Сообщения, отправленные до этого времени, будут проигнорированы."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "КОМАНДЫ: (комбинируйте команды, чтобы одновременно использовать несколько опций)"
+msgstr "КОМАНДЫ: (совмещайте команды, чтобы использовать несколько функций одновременно)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Добро пожаловать в BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
-msgstr "Поддерживаемые типы транспорта - TYPEs:"
+msgstr "Текущий поддерживаемой тип передачи - TYPEs:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
-msgstr "Э-ге-гей, %s!"
+msgstr "Эй, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
-msgstr "Привет, друг!"
+msgstr "Здравствуй, друг!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Открытые ключи"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
-msgstr "Это электронное письмо было сгенерировано при помощи радуги, единорогов и северного сияния\nдля %s в %s, в %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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -109,283 +245,158 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "BridgeDB может предоставить вам мосты с несколькими %s типами Pluggable Transports%s,\nчто позволяет запутать ваше соединение с Tor Network. Благодаря этому перехватчикам трафика\nсложнее установить факт использования сети Tor.\n"
+msgstr "BridgeDB может работать с несколькими %s типами передачи данных%s,\nчто помогает снизить риск обнаружения и скрыть ваше соединение с Tor Network. Благодаря этому ваш трафик в сети Tor отследить будет практически невозможно.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
-msgstr "Доступны некоторые мосты, поддерживающие адреса IPv6, хотя некоторые Pluggable\nTransports не совместимы с IPv6.\n\n"
+msgstr "Существуют мосты, поддерживающие работу с адресами IPv6, но в большинстве случаев передача данных по адресам IPv6 не поддерживается.\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
+#: bridgedb/strings.py:88
#, 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, не поддерживающих\nподключаемый транспорт %s, что может показаться не таким клёвым, но они во многих случаях\nмогут помочь обходить интернет-цензуру.\n"
+msgstr "Более того, BridgeDB содержит множество стандартных мостов %s, не поддерживающий передачу данных %s, что может повлиять на отображение страницы сайта, так-же они во многих случаях, помогают обойти интернет-цензуру.\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
-msgstr "Что такое ретранслятор типа мост?"
+msgstr "Что такое соединение типа мост?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Мосты %s - это ретрансляторы Tor, которые позволяют вам обходить цензуру."
+msgstr "%s Мост %s — это сетевое соединение в сети Tor, которое позволяет вам просматривать заблокированные сайты."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
-msgstr "Мне нужен альтернативный способ получения списка мостов!"
+msgstr "Другой способ получение списка соединений типа мост!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, 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что вы должны отправить электронный запрос с использованием одного из перечисленных сервисов: %s, %s или %s."
+msgstr "Другим способом для получения списка мостов является отправка электронного сообщения на адрес %s. Обратите внимание, вы должны отправить электронный запрос только с использованием одного из доступных сервисов: %s, %s или %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
-msgstr "Мои мосты не работают! Помогите!"
+msgstr "Нет соединения с мостом! Помогите!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
-msgstr "Если ваш Tor не работает, напишите нам %s."
+msgstr "Если Tor не запускается, напишите нам на электронный адрес %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
+#: bridgedb/strings.py:121
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 "Постарайтесь предоставить исчерпывающую информацию о вашей проблеме, включая список мостов и Pluggable Transports, которые вы пытались использовать, версию ПО Tor Browser\nи все полученные от Tor уведомления."
+msgstr "Для быстрого устранения вашей проблемы в сообщении необходимо указать полную информацию о проблеме, включая имя моста и соединение, которое вы использовали для передачи данных, а также версию Tor Browser."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
-msgstr "Подготовленные адреса ретрансляторов:"
+msgstr "Строка ввода адресов мостов:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
-msgstr "Получите ретрансляторы!"
+msgstr "Получить адрес моста!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
-msgstr "Пожалуйста, выберите опции для типа ретранслятора:"
+msgstr "Пожалуйста, выберите параметры типа моста:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
-msgstr "Нужны ли вам адреса IPv6?"
+msgstr "Используете адреса IPv6?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
-msgstr "Вам нужен %s?"
+msgstr "Будете использовать %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
-msgstr "Ваш браузер не показывает изображения должным образом."
+msgstr "Браузер некорректно отображает изображения."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Введите символы с изображения..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
-msgstr "Как начать пользоваться ретрансляторами"
+msgstr "Как использовать мосты?"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, 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 "Узнать как добавить ретрансляторы в %s Tor Browser можно на странице загрузок Tor Browser %s где речь о \nзагрузке и запуске Tor Browser."
+msgstr "Чтобы добавить новый мост в %s Tor Browser, необходимо перейти на страницу загрузки Tor Browser %s и следовать инструкциям по скачиванию и запуску Tor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
-msgstr "Когда появится окно 'Сетевые настройки Tor', нажмите 'Настроить' и следуйте инструкциям установщика, пока он не задаст вопрос:"
+msgstr "Перейти во вкладку 'Сетевые настройки Tor', далее нажать 'Настроить' и следовать инструкциям установщика, пока вы не увидите вопрос:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
-msgstr "Ваш интернет провайдер (ISP) блокирует или как-либо цензурирует подключения к сети Tor?"
+msgstr "Блокирует ли ваш интернет провайдер подключения к сети Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
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 "Выберите 'Да' и нажмите 'Далее'. Для настройки ваших новых мостов скопируйте и\nвставьте их адреса в поле для ввода текста. Нажмите 'Подключиться' и \nвсе должно заработать! Если у вас возникла проблема, попробуйте нажать на кнопку 'Помощь'\nв мастере 'Сетевые настройки Tor' для получения помощи."
+msgstr "Выберите 'Да' и нажмите 'Далее'. Для настройки ваших новых мостов скопируйте и\nвставьте их адреса в поле для ввода текста. И нажимаете 'Подключиться'! Если у вас возникли проблемы с подключением, попробуйте воспользоваться кнопкой 'Помощь'\nво вкладке 'Сетевые настройки Tor' для получения помощи."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
-msgstr "Отображает это сообщение."
+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
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
-msgstr "Запросить адреса обычных мостов."
+msgstr "Запросить обычные мосты."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Запросить мосты с поддержкой IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
-msgstr "Запросить подключаемый транспорт по TYPE"
+msgstr "Запросить подключаемый транспорт TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Получить копию открытого GnuPG ключа BridgeDB."
-
-#: 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 "Лог изменений"
-
-#: 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 "Показать QR-код"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QR-код для адресов ретрансляторов"
-
-#. 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 "Похоже, произошла ошибка при получении QR-кода."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Этот QR-код содержит Ваши адреса ретрансляторов. Отсканируйте его устройством, считывающим QR-код, чтобы скопировать Ваши адреса рестрансляторов на мобильные и другие устройства"
-
-#: 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 Tor Browser %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 добавьте мосты в Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%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олучить мосты"
+msgstr "Получить копию открытого GnuPG-ключа BridgeDB."
diff --git a/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po
index 241b182..23e3b7d 100644
--- a/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po
@@ -5,23 +5,24 @@
# Translators:
# elo, 2014
# FooBar <thewired at riseup.net>, 2015
+# Marek Čápek <capek.marek at gmail.com>, 2019
# Michal Slovák <michalslovak2 at hotmail.com>, 2013
# Roman 'Kaktuxista' Benji <romanbeno273 at gmail.com>, 2014
# StefanH <inactive+StefanH at transifex.com>, 2014
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-03 19:16+0000\n"
-"Last-Translator: FooBar <thewired at riseup.net>\n"
-"Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-04-10 06:45+0000\n"
+"Last-Translator: Marek Čápek <capek.marek at gmail.com>\n"
+"Language-Team: Slovak (http://www.transifex.com/otf/torproject/language/sk/)\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"
+"Generated-By: Babel 1.3\n"
"Language: sk\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
@@ -34,57 +35,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
-msgstr "Prepáčte! Niečo je zle s vašou požiadavkou."
+msgstr "Prepáčte! Pri spracovaní vašej požiadavky sa vyskytla chyba."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Nahlásiť chybu"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Zdrojový kód"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Posledné zmeny"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Označiť všetko"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Zobraziť QR Kód"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR kód vašich premostení"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Do pekla!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Zdá sa že nastala chyba pri získavaní vášho QR kódu."
+
+#: 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 "Tento QR kód obsahuje vaše prehostenia. Možete ho zoskenovať čítačkou QR kódov, ktorou ich skopírujete do mobilu či iných zariadení"
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Práve niesú dostupné žiadne premostenia..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Možno by ste mohli skúsiť %s ísť späť %s a vybrať si iný typ premostenia."
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Krok %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Stiahnuť %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Krok %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Získajte %s premostenia %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Krok %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Teraz %s pridajte premostenia do Tor Browsera %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.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sL%sen mi zobrazte premostenia!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Pokročilé možnosti"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Nie"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "žiadne"
+
+#. 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:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sÁ%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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sN%sastaviť Bridges"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Toto je automatická správa; prosím, neodpovedajte.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Tu sú vaše premostenia:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 "Prekročili ste rate limit. Prosím spomaľte. Minimálny čas medzi emailmi je %s hodín. Všetky dalšie emaily počas tejto doby budú ignorované."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "PRÍKAZY: (kombinujte príkazy na zadanie viac možností naraz)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Vitajte v BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Práve podporované transport typy:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Hej, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Ahoj, priateľ!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Verejné kľúče"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -95,7 +221,7 @@ msgstr "Tento email bol generovaný s dúhami, jednorožcami a trblietkami pre %
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -106,7 +232,7 @@ msgid ""
msgstr "BridgeDB vám dokáže ponúknuť niekolko typov %spremostení s Pluggable Transports%s,\nktoré vám pomôžu maskovať vaše pripojenie na Tor Network, ktoré ztaží každému kto sleduje vaše internetové pripojenie zistiť to že používate Tor.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -118,7 +244,7 @@ msgstr "Niektoré premostenia s IPv6 adresami sú taktiež dostupné, ale niekto
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -127,20 +253,20 @@ msgid ""
"\n"
msgstr "Dodatočne, BridgeDB má dosť pôvodnych premostení %s bez žiadnych Pluggable Transports %s ktoré možno niesu až také cool, ale vo veľa prípadoch stále dokážu obísť cenzúrovanie internetu.\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Čo sú to premostenia?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s premostenia %s sú Tor relaye ktoré vám pomáhaju obísť cenzúru."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Potrebujem iný spôsob ako získať premostenia!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -148,12 +274,12 @@ msgid ""
"%s, %s or %s."
msgstr "Dalším spôsobom ako získať premostenia je poslať mail na %s. \nEmail však musíte poslať pomocou adresy od jedného z týchto poskytovateľov:\n%s, %s alebo %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Moje premostenia nefungujú! Potrebujem pomoc!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Ak váš Tor nefunguje, skúste napísať email %s."
@@ -161,71 +287,71 @@ msgstr "Ak váš Tor nefunguje, skúste napísať email %s."
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:96
+#: bridgedb/strings.py:121
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 "Skúste napísať čo najviac informacií o vašom prípade, vrátane zoznamu premostení a Pluggable Transportov ktoré ste skúšali použiť, verzia Tor Browseru, a hlášky ktoré Tor vypísal, apod."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Tu sú vaše premostenia:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Získať premostenia!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Prosím vyberte si možnosti na typ premostenia:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Potrebujete IPv6 adresy?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Potrebujete %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Váš prehliadač nezobrazuje obrázky správne."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Vložte znaky z obrázku vyššie..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Ako začať používať vaše premostenia"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, 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 "Na zadanie premostení do Tor Browsera, najprv choďte na %s download stránku Tor Browsera %s a riaďte sa inštrukiacmi na stiahnutie a zapnutie Tor Browsera."
+msgstr "Na zadanie premostení do Tor Browsera, najprv choďte na download stránku %s %s Tor Browsera a riaďte sa inštrukiacmi na stiahnutie a zapnutie Tor Browsera."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Keď vyskočia 'Tor Sieťové Nastavenia', kliknite na 'Konfigurovať' a pokračujte ďalej kým sa váš insťalátor nespýta:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Blokuje alebo nejak cenzuruje váš Poskytovateľ Internetu (ISP) pripojenia k Sieti Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
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"
@@ -233,153 +359,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Označte 'Áno' a potom kliknite na 'Ďalej'. Na konfiguráciu nových premostení, skopírujte premostenia do políčka na text. Potom kliknite na 'Pripojiť' a už by to malo fungovať. Ak máte nejaké problemy, kliknite na tlačidlo 'Pomoc' v 'Tor sieťových nastaveniach' pre viac informacií. "
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Zobrazí túto sprá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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Požiadať o pôvodné premostenia."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Požiadať o IPv6 premostenia."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Požiadať o Pluggable Transport podla typu."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Stiahnite si kópiu verejného klúča GNUPG pre BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Nahlásiť chybu"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Zdrojový kód"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Posledné zmeny"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kontakt"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Označiť všetko"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Zobraziť QR Kód"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QR kód vašich premostení"
-
-#. 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 "Do pekla!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Zdá sa že nastala chyba pri získavaní vášho 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 vaše prehostenia. Možete ho zoskenovať čítačkou QR kódov, ktorou ich skopírujete do mobilu či iných zariadení"
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Práve niesú dostupné žiadne premostenia..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Možno by ste mohli skúsiť %s ísť späť %s a vybrať si iný typ premostenia."
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Krok %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Stiahnuť %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Krok %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Získajte %s premostenia %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Krok %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Teraz %s pridajte premostenia do Tor Browsera %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 "%sL%sen mi zobrazte premostenia!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Pokročilé možnosti"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Nie"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "žiadne"
-
-#. 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Á%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:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sN%sastaviť Bridges"
diff --git a/bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po
index 91049c7..e3c8f9b 100644
--- a/bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po
@@ -4,18 +4,19 @@
#
# Translators:
# Bujar Tafili, 2015
+# Mirela Pacani <milela00 at gmail.com>, 2016
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-23 22:30+0000\n"
-"Last-Translator: Bujar Tafili\n"
-"Language-Team: Albanian (http://www.transifex.com/projects/p/torproject/language/sq/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-01-15 12:20+0000\n"
+"Last-Translator: Besnik <besnik at programeshqip.org>\n"
+"Language-Team: Albanian (http://www.transifex.com/otf/torproject/language/sq/)\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"
+"Generated-By: Babel 1.3\n"
"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -30,57 +31,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Kërkojmë ndjesë! Diçka shkoi keq me kërkesën tuaj."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Raportoni një gabim"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Kodi Burimor"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Regjistri i ndryshimeve"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Përzgjidhini të Gjitha"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Tregoni Kodin QR"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "Kodi QR përlinjat e urave tuaja"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Çfarë tersi!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Duket se u has një gabim, duke marrë Kodin tuaj QR."
+
+#: 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 "Ky Kod QR përmban linja urash. Skanojeni me një lexues Kodi QR, që t'i kopjoni linjat e urave tuaja në celular, apo në pajisje të tjera."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Këtë çast s'ka asnjë urë të disponueshme..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr " Ndoshta duhet të provoni të %s shkoni prapa %s dhe të zgjidhni një lloj të ndryshëm ure!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Hapi %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Shkarkoni %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Hapi %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Merrni %s ura %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Hapi %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Tani %s shtojini urat tek Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sM%së jepni urat!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Opsionet e Përparuara"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Jo"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "asnjë"
+
+#. 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:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sP%so!"
+
+#. 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:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sM%serrni Urat"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Ky është një mesazh automatik; ju lutemi mos u përgjigjni.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Këtu janë urat tuaja:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 "Ju e keni kapërcyer kufirin. Ju lutemi, më ngadalë! Koha minimum midis \ne-postave është %s orë. Të gjitha e-postat e tjera gjatë kësaj periudhe kohe do të injorohen."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "COMMANDs: (kombinojini COMMANDs për të specifikuar zgjedhje të shumëfishta njëkohësisht)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Mirë se erdhët tek BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Transport TYPEs të mbështetura këtë çast: "
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Hej, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Përshëndetje mik!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Kyça Publikë"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -91,7 +217,7 @@ msgstr "Kjo e-postë është gjeneruar me ylberë, njëbrirësha dhe shkëndija\
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -102,7 +228,7 @@ msgid ""
msgstr "BridgeDB mund të ofrojë ura me shumë %slloje të Pluggable Transports%s,\nqë mund të ndihmojë fshehjen e lidhjeve tuaja për Tor Network, duke e bërë atë më \ntë vështirë për këdo që vëzhgon trafikun tuaj të internetit, për të përcaktuar nëse ju jeni\nduke përdorur Tor.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -114,7 +240,7 @@ msgstr "Disa ura me adresa IPv6 janë po ashtu të mundshme, ndonëse disa Plugg
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -123,33 +249,33 @@ msgid ""
"\n"
msgstr "Përveç kësaj, BridgeDB ka shumë ura %s të bezdisshme, pa ndonjë\nPluggable Transports %s, çka ndoshta nuk do të tingëllojë mirë, por ata ende\nmund të ndihmojnë që ta anashkaloni censurën e internetit në shumë raste.\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Ç'janë urat?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Urat %s janë rele Tor, që ju ndihmojnë të anashkaloni censurën."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Më nevojitet një mënyrë alternative për përftimin e urave!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, 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 "NJë mënyrë tjetër për të përftuar ura është të dërgoni një e-postë tek %s. ju lutemi vini re se ju duhet\nta dërgoni e-postën, duke përdorur një adresë nga njëri prej ofruesve të e-postës në vijim:\n%s, %s ose %s."
+msgstr "Një mënyrë tjetër për të përftuar ura është të dërgoni një e-postë tek %s. ju lutemi vini re se ju duhet\nta dërgoni e-postën, duke përdorur një adresë nga njëri prej ofruesve të e-postës në vijim:\n%s, %s ose %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Urat e mia nuk punojnë! Më duhet ndihmë!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Nëse Tor i juaj nuk punon, ju duhet t'i dërgoni e-postë %s."
@@ -157,48 +283,48 @@ msgstr "Nëse Tor i juaj nuk punon, ju duhet t'i dërgoni e-postë %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
+#: bridgedb/strings.py:121
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 "Përpiquni të përfshini sa më shumë informacion që të mundeni rreth rastit tuaj, duke vendosur edhe listën e\nurave dhe Pluggable Transports që provuat të përdorni, versionin tuaj të Tor Browser,\nsi dhe çdo mesazh që ka dhënë Tor, etj."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Këtu janë linjat e urave tuaja:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Merrni Ura!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Ju lutemi përzgjidhni mundësitë për llojin e urës:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "A ju nevojiten adresat IPv6?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "A ju nevojitet një %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Shfletuesi juaj nuk po i shfaq si duhet imazhet."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Futini karakteret nga imazhi më sipër..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Si të nisni t'i përdorni urat tuaja"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -207,21 +333,21 @@ msgid ""
msgstr "Për t'i futur urat në Tor Browser, së pari shkoni tek %s faqja e shkarkimit \ntë Tor Browser %s dhe më pas ndiqini instruksionet aty, që ta shkarkoni dhe nisni \nTor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Kur dialogu i \"Konfigurimit të Rrjetit Tor\" të kërcejë, klikoni \"Konfiguroni\" dhe ndiqni\nasistentin derisa ta kërkojë ai:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "A i pengon apo i censuron Ofruesi juaj i Shërbimt Internet (ISP) lidhjet\ntek rrjeti Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
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"
@@ -229,153 +355,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Përzgjidhni \"Po\" dhe më pas klikoni \"Tjetri\". Që të konfiguroni urat tuaja të reja, kopjojini dhe\nngjitini linjat e urave në kutinë e futjes së tekstit. Më në fund, klikoni \"Lidhuni\", dhe\ndo të jeni gati për t'ia nisur! Nëse do të përjetoni probleme, përpiquni të klikoni butonin \"Ndihmë\" \ntek asistenti i \"Konfigurimit të Rrjetit Tor\", për më shumë mbështetje."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Shfaq këtë mesazh."
#. 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
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Kërkoni urat vanilje ose non-Pluggable Transport."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Kërkoni urat IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Kërkoni një Pluggable Transport nëpërmjet TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Merrni një kopje të kyçit publik GnuPG të BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Raportoni një gabim"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Kodi Burimor"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Regjistri i ndryshimeve"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kontakt"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Përzgjidhini të Gjitha"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Tregoni Kodin QR"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "Kodi QR përlinjat e urave tuaja"
-
-#. 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 "Çfarë tersi!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Duket se u has një gabim, duke marrë Kodin tuaj QR."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Ky Kod QR përmban linja urash. Skanojeni me një lexues Kodi QR, që t'i kopjoni linjat e urave tuaja në celular, apo në pajisje të tjera."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Këtë çast s'ka asnjë urë të disponueshme..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr " Ndoshta duhet të provoni të %s shkoni prapa %s dhe të zgjidhni një lloj të ndryshëm ure!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Hapi %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Shkarkoni %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Hapi %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Merrni %s ura %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Hapi %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Tani %s shtojini urat tek Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sM%së jepni urat!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Opsionet e Përparuara"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Jo"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "asnjë"
-
-#. 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 "%sP%so!"
-
-#. 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 "%sM%serrni Urat"
diff --git a/bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po
index 105597e..89ba25b 100644
--- a/bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po
@@ -3,21 +3,25 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
+# an lykin <lykin at protonmail.com>, 2018
+# Pseudoscops, 2018
# obj.petit.a, 2014
# Ivan Radeljic <radeljicivan85 at gmail.com>, 2014-2015
+# Lidija <llazic.bgd at gmail.com>, 2015
# Milenko Doder <milenko.doder at 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&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'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 at gmail.com>\n"
-"Language-Team: Serbian (http://www.transifex.com/p/torproject/language/sr/)\n"
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2018-08-29 01:57+0000\n"
+"Last-Translator: Pseudoscops\n"
+"Language-Team: Serbian (http://www.transifex.com/otf/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"
+"Generated-By: Babel 1.3\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"
@@ -32,57 +36,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
-msgstr "Извините! Нешто се лоше десило са вашим захтевом."
+msgstr "Извините! Догодила се грешка са вашим захтевом."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Пријавите грешку"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Изворни код"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Дневник измена"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Контакт"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Обележи све"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Прикажи QRCode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR код за ваше линије премошћивања"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ух, страшно!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Дошло је до грешке при набавлјању вашег QR kода."
+
+#: 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 "QR код садржи ваше линије премошћивања. Скенирајет га са читаћем QR кода да бисте ископирали ваше линије премошћивања на моблине као и на друге уређаје."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Тренутно нема доступних премошћивача..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Можда бисте требали да покушате %s да се вратите %s и изаберете другу врсту премошћивача!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Корак %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Преузмите %s прегледач Тор %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Корак %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Добијте %s премошћиваче %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Корак %s3%s"
+
+#: bridgedb/https/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.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sС%sамо ми дај премошћиваче!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Напредне опције"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Не"
+
+#: 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:124
+#, 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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sД%sобијте премошћиваче"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Ово је аутоматска порука; молимо вас да не одговарате.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Ево Ваших премошћивача:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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
+#: bridgedb/strings.py:50
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
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Добродошли у BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
-msgstr "Тренутно подржани transport TYPEs:"
+msgstr "Тренутно подржани ТИП преноса:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Здраво, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Здраво, пријатељу!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Јавни кључеви"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -93,7 +222,7 @@ msgstr "Ова е-пошта је направљена са дугама, јед
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -101,57 +230,57 @@ msgid ""
"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"
+msgstr "BridgeDB може обезбедити премошћиваче са неколико %s типова прикључних преноса %s,\nшто може помоћи прикривању ваших конекција са Мрежом Тор, како би било\nкоме ко посматра ваш интенет саобраћај било теже да утврди да\nкористите Тор.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
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"
+msgstr "Неки премошћивачи са IPv6 адресама су такође доступни, мада неки прикључиви\nпреноси нису компатибилни са 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
+#: bridgedb/strings.py:88
#, 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"
+msgstr "Поред тога, BridgeDB има пуно најобичнијих премошћчивача %s без икаквих\nприкључних преноса %s што можда не звучи толико кул, али они ипак\nу много случајева могу помоћи да се заобиђе интернет цензура.\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Шта су премошћивачи?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Премошћивачи %s су Тор преносници који Вам помажу да заобиђете цензуру."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Потребан ми је алтернативан начин за добијање премошћивача!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, 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."
+msgstr "Још један начин добијања премошћивача је да се пошаље и-мејл на %s. Узмите у обзир да\nморате послати и-мејл користећи адресу једног од следећих и-мејл провајдера.\n%s, %s или %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Моји премошћивачи не раде! Потребна ми је помоћ!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Ако Ваш Тор не ради, пошаљите електронску пошту %s."
@@ -159,225 +288,100 @@ msgstr "Ако Ваш Тор не ради, пошаљите електронс
#. 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
+#: bridgedb/strings.py:121
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."
+msgstr "Унесите што више информација о вашем случају, укључујући списак\nмостова и прикљуивих транспорта које сте покушали да користите, \nверзију вашег тор претраживача, било \nкоју поруку коју вам је Тор избацио, итд."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
-msgstr "Evo vaših premošćivača:"
+msgstr "Ево Ваших линија премошћивача:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Добијте премошћиваче!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Молимо Вас, изаберите опције за врсту премошћивача:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Да ли су Вам потребне IPv6 адресе?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Да ли Вам треба %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Ваш прегледач не приказује слике исправно."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Унесите знакове са слике изнад..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Како да почнете са коришћењем Ваших премошћивача"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, 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."
+msgstr "Да бисте унели премошћиваче у претраживач Tor, први идите на страници %s за преузимање %s \nпретраживача Тор и тамо пратите упутства за преузимање и покретање претрачивача Тор."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
-msgstr "Када се 'Подешавања Тор мреже' дијалог појави, кликните 'Конфигуриши' и пратите упутства док не питају:"
+msgstr "Када се дијалог 'Подешавања Тор мреже' појави, кликните 'Конфигуриши' и пратите упутства до питања:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
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
+#: bridgedb/strings.py:159
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ć."
+msgstr "Изаберите 'Да' и кликните на 'Следеће'. Да бисте конфигурисали своје нове премошћиваче, копирајте и\nналепите линије премошчивача у поље за унос текста. Коначно, кликните на 'конектуј се', i\nможете да почнете! Ако будете имали проблема, кликните на дугме 'Помоћ'\nу чаробњакз за подешавања мреже Тор за даљу помоћ."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
-msgstr "Приказује ову слику."
+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
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
-msgstr "Zahtevati vanila mostove."
+msgstr "Захтева базичне премошћиваче."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
-msgstr "Затражите IPv6 премошћиваче."
+msgstr "Захтева IPv6 премошћиваче."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
-msgstr "Zahtevati Priključivi Transport po TIPU."
+msgstr "Захтеба прикључиви пренос по ТИПУ."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
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обијте премошћиваче"
+msgstr "Добијте копију кључа BridgeDB јавног GnuPG."
diff --git a/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po
index 3c3e4d4..8cc0f27 100644
--- a/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po
@@ -5,25 +5,28 @@
# Translators:
# Anders Jensen-Urstad <anders at unix.se>, 2014
# Emil Johansson <emil.a.johansson at gmail.com>, 2015
-# GabSeb, 2014
+# Gabor Sebastiani, 2014
+# Jacob Andersson <jacob.c.andersson at protonmail.com>, 2018
+# Jonatan Nyberg, 2017
+# Jonatan Nyberg, 2018-2019
# Peter Michanek <peter at michanek.se>, 2015
# Petomatick <petomatick at hotmail.com>, 2011
# ph AA, 2015
-# phst <transifex at sturman.se>, 2014
+# phst, 2014
# leveebreaks, 2014
# WinterFairy <winterfairy at riseup.net>, 2013
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-30 21:24+0000\n"
-"Last-Translator: Peter Michanek <peter at michanek.se>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-05-01 08:49+0000\n"
+"Last-Translator: Jonatan Nyberg\n"
+"Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\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"
+"Generated-By: Babel 1.3\n"
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -38,57 +41,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Något gick tyvärr fel med din förfrågan."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Rapportera ett fel"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Källkod"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Ändringslogg"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Markera allt"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Visa QR-kod"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR-kod för dina brorader"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Bomber och granater, något gick snett!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Det verkar som att ett fel orsakade problem att få din QR-kod."
+
+#: 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 "Denna QR-kod innehåller dina rader med broar. Skanna den med en QR-kodläsare för att kopiera dina rader med broar till mobila och andra enheter."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "För närvarande finns inga broar tillgängliga..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Prova att %s gå tillbaka %s för att välja en annan typ av bro!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Steg %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Hämta %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Steg %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Skaffa %s broar %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Steg %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Lägg nu till %s broarna till Tor Browser%s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sB%sara ge mig broar!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Avancerade inställningar"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Nej"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "inget"
+
+#. 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:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sJ%sa!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sH%sämta broar"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Detta är ett automatiskt meddelande; Var god svara ej]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
-msgstr "Här är dina bryggor:"
+msgstr "Här är dina broar:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 "Du har överskridit din nivå. Ta det lugnt! Minsta tillåtna tiden mellan epost är %s timmar. Epost utöver detta kommer att ignoreras."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "KOMMANDOn: (kombinera KOMMANDOn för att ange flera val på en gång)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Välkommen till BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "För närvarande stöds följande transport TYPEs:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Hej, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Hej, kompis!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Publika nycklar"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -99,7 +227,7 @@ msgstr "Det här mailet skapades med hjälp av regnbågar, enhörningar och \net
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -107,44 +235,44 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "BridgeDB kan tillhandahålla bryggor med flera %styper av Pluggable Transports%s,\nsom kan omforma din trafik till Tor Network, vilket gör det svårare för någon\nsom avlyssnar din internetuppkoppling att veta ifall du använder Tor.\n\n"
+msgstr "BridgeDB kan tillhandahålla broar med flera %styper av Pluggable Transports%s,\nsom kan omforma din trafik till Tor Network, vilket gör det svårare för någon\nsom avlyssnar din internetuppkoppling att veta ifall du använder Tor.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
-msgstr "Det finns några bryggor med IPv6-adresser tillgängliga, men vissa Pluggable\nTransports är inte IPv6-kompatibla.\n"
+msgstr "Det finns några broar med IPv6-adresser tillgängliga, men vissa Pluggable\nTransports är inte IPv6-kompatibla.\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
+#: bridgedb/strings.py:88
#, 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 "Dessutom har BridgeDB några alldeles vanliga bryggor %s utan Pluggable\nTransports %s vilket kanske inte låter så häftigt, men i många fall kan de \nfortfarande hjälpa dig med att kringgå internet-censur.\n\n"
+msgstr "Dessutom har BridgeDB några alldeles vanliga broar %s utan Pluggable\nTransports %s vilket kanske inte låter så häftigt, men i många fall kan de \nfortfarande hjälpa dig med att kringgå internet-censur.\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
-msgstr "Vad är bryggor?"
+msgstr "Vad är broar?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Bryggor %s är Tor-reläer som hjälper dig kringgå censur."
+msgstr "%s Broar %s är Tor-reläer som hjälper dig kringgå censur."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
-msgstr "Jag behöver ett alternativt sätt att skaffa bryggor på!"
+msgstr "Jag behöver ett alternativt sätt att skaffa broar på!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -152,12 +280,12 @@ msgid ""
"%s, %s or %s."
msgstr "Ett annat sätt att få nya broar är att skicka e-post till %s. Du måste skicka mailet\nfrån en adress hos någon av följande e-postleverantörer:\n%s, %s eller %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
-msgstr "Mina bryggor fungerar inte! Jag behöver hjälp!"
+msgstr "Mina broar fungerar inte! Jag behöver hjälp!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Om Tor inte fungerar för dig så kan du e-posta %s."
@@ -165,225 +293,100 @@ msgstr "Om Tor inte fungerar för dig så kan du e-posta %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
+#: bridgedb/strings.py:121
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 "Försök att berätta så mycket om problemet som du kan, bland annat vilka\nbryggor och Pluggable Transports som du försökt använda, vilken version av Tor Browser du använder, vilka felmeddelanden som Tor visat, etc."
+msgstr "Försök att berätta så mycket om problemet som du kan, bland annat vilka\nbroar och Pluggable Transports som du försökt använda, vilken version av Tor Browser du använder, vilka felmeddelanden som Tor visat, etc."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
-msgstr "Här är dina rader med bryggor:"
+msgstr "Här är dina rader med broar:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
-msgstr "Skaffa Bryggor!"
+msgstr "Skaffa broar!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
-msgstr "Välj alternativ för typ av brygga:"
+msgstr "Välj alternativ för typ av bro:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Behöver du en IPv6-adress?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Behöver du %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Din webbläsare visar inte bilder korrekt."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Skriv in tecknen från bilden ovan..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
-msgstr "Hur du börjar använda dina bryggor"
+msgstr "Hur du börjar använda dina broar"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, 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 "För att ange bryggor i Tor Borwser, gå till nedladdningssidan %s Tor Browser %s och följ instruktionerna för att ladda ner och starta Tor Browser."
+msgstr "För att ange broar i Tor Browser, gå till %s hämtningssidan för Tor Browser %s och följ instruktionerna för att hämta och starta Tor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "När dialogen \"Nätverksinställningar för Tor\" visas, välj \"Konfigurera\" och följ\nstegen tills du kommer till frågan:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Blockerar eller filtrerar din Internetleverantör (ISP) anslutningar till Tor network?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
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 "Välj 'Ja' och klicka sedan på 'Nästa'. För att konfigurera nya bryggor, kopiera och klistra in bryggraderna i textrutan. Klicka slutligen på 'Anslut' och det borde vara klart för användning! Om du får problem, prova att klicka på 'Hjälp'-knappen i 'Tor Network Settings' för vidare hjälp."
+msgstr "Välj 'Ja' och klicka sedan på 'Nästa'. För att konfigurera nya broar, kopiera och klistra in broraderna i textrutan. Klicka slutligen på 'Anslut' och det borde vara klart för användning! Om du får problem, prova att klicka på 'Hjälp'-knappen i 'Tor Network Settings' för vidare hjälp."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Visa detta meddelande."
#. 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
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
-msgstr "Leta efter vanliga bryggor."
+msgstr "Leta efter vanliga broar."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
-msgstr "Begär IPv6-bryggor"
+msgstr "Begär IPv6-broar"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Leta efter en Pluggable Transport av en viss TYPE"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Hämta en kopia av BridgeDB:s publika GnuPG-nyckel."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Rapportera en bugg"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Källkod"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Ändringslogg"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kontakt"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Markera Allt"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Visa QR-kod"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QR-kod för dina rader med bryggor"
-
-#. 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 "Bomber och granater, nåt gick snett!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Det verkar som att ett fel orsakade problem att få din QR-kod."
-
-#: 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 "Denna QR-kod innehåller dina rader med bryggor. Skanna den med en QR-kodläsare för att kopiera dina rader med bryggor till mobila och andra enheter."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "För närvarande finns inga bryggor tillgängliga..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Prova att %s gå tillbaka %s för att välja en annan typ av brygga!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Steg %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Ladda ner %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Steg %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Skaffa %s bryggor %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Steg %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Nu kan du %s lägga till bryggor i Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sG%se mig bryggor!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Avancerade inställningar"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Nej"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "inget"
-
-#. 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 "%sJ%sa!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sH%sämta Bridges"
diff --git a/bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po
index 94444e6..855f43c 100644
--- a/bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po
@@ -1,21 +1,25 @@
# Translations template for BridgeDB.
-# Copyright (C) 2014 'The Tor Project, Inc.'
+# Copyright (C) 2015 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
+# Anto Sujesh <sujeshantoj at gmail.com>, 2015
+# deadrat <jayabharat at live.com>, 2017
+# Ephraim Raj <ephraimraj11299 at gmail.com>, 2016
# git12a <git12 at openmailbox.org>, 2015
+# Senthil Kumar <paranthaba at gmail.com>, 2017
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-07-26 02:11+0000\n"
-"PO-Revision-Date: 2015-02-13 10:18+0000\n"
-"Last-Translator: git12a <git12 at openmailbox.org>\n"
-"Language-Team: Tamil (http://www.transifex.com/projects/p/torproject/language/ta/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-01-15 12:20+0000\n"
+"Last-Translator: erinm\n"
+"Language-Team: Tamil (http://www.transifex.com/otf/torproject/language/ta/)\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"
+"Generated-By: Babel 1.3\n"
"Language: ta\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -30,57 +34,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:121
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "மன்னிக்கவும்! உங்கள் வேண்டுகோளிற்கு ஏதோஒரு தவறு நேர்ந்துள்ளது."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "ஒரு பிழையை அறிக்கைசெய்க"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "மூல தொகுப்பு"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "மாற்றம்குறிக்கும் கோப்பு"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "தொடர்பு கொள்"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "அனைத்தையும் தேர்ந்தெடு"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "க்யு ஆர் குறியீடு காண்பி "
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "உங்களுடைய bridge வரிகளுக்கான QRCode"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr " ஐயகோ, பிரச்சனை!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "க்யு ஆர் குறியீடு எடுக்க முடியாது"
+
+#: 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 "இந்த QRCode உங்கள் bridge வரிகளை உள்ளடக்கியுள்ளது. செல்லிடபேசி மற்றும் வேறு சாதனங்களில் உங்கள் bridge வரிகளை நிரலெடுக்க QRCode வாசிப்பான் மூலம் இதை ஊடுறுவி பார்க்கவும்."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "தற்சமயம் Bridge-கள் யேதும் இல்லை..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "ஒருவேளை நீங்கள் %s முயற்சிக்க பின்னே சென்று %s வேறொரு வகை தேர்வு செய்யலாம்!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "அடி %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "பதிவிறக்கவும் %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "அடி %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "%s Bridge-களை %s பெறுக"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "அடி %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "இப்பொழுது %s bridge-களை Tor Browser-உள் %s சேர்க்கவும்"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sநே%sரயடியாக bridge-களை கொடுக்கவும்!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "மேம்பட்ட விருப்பங்கள்"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "இல்லை"
+
+#: 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:124
+#, 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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sபெ%sருக Bridge-களை"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[ இது ஒரு தானியங்கி செய்தி; தயவு செய்து பதில் அனுப்ப வேண்டாம்.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "இதோ உங்கள் bridges:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 "நீங்கள் வீத வரம்பு மீறி விட்டீர்கள். தயவு செய்து மெதுவடையவும்! மின்னஞ்சல்களின் இடையே குறைந்தபட்ச நேரம் %s மணிகள். இந்த நேரத்தினுள் அனைத்து மின்னஞ்சல்களும் நிராகரிக்கப்படும்."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "கட்டளைகள்: (பல விருப்பங்களை குறிப்பிட கட்டளைகளை ஒரேசமயத்தில் ஒன்றியினைகவும்)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "BridgeDB-யினுள் நல்வரவு"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "தற்போது ஆதரவு உள்ள Transport TYPE-கள் "
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "ஹே, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "ஹலோ, தோழா!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "பொது சாவிகள்"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -91,7 +220,7 @@ msgstr "இந்த மின்னஞ்சல் வானவில், ய
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -102,7 +231,7 @@ msgid ""
msgstr "BridgeDB-யால் %sபலவகையான Pluggable Transports%s bridge-களை தரமுடியும்,\nஇவை உங்கள் Tor Network இணைப்புகளை விளங்காதவண்ணம் ஆக்கவுதவி, உங்களின் \nஇணைய போக்குவரத்தை கண்கானிப்பவருக்கு நீங்கள் Tor பயன்படுத்துகிறீர்கள் எனக்கன்டறிய மேலும்\nகடினம் ஆக்கும்.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -114,7 +243,7 @@ msgstr "சில IPv6 முகவரிக்கொண்ட bridge-களு
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -123,20 +252,20 @@ msgid ""
"\n"
msgstr "கூடுதலாக, BridgeDB-யினுள் ஏராளமான பழையமுறை bridge-கள் \n%s Pluggable Transports வசதியில்லாமல் உள்ளது %s உணர்ச்சி ஊட்டுகிறவாறு இல்லாவிட்டாலும், \nஇவையால் பல சந்தர்ப்பங்களில் இனைய தணிக்கையை கடக்க உதவும்.\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Bridges என்றால் என்ன?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Bridge-கள் %s எனும் Tor Relay-கள் தணிக்கையை கடக்க உதவும்"
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "எனக்கு Bridge-களை பெறுவதற்கு ஓர் மாற்று வழி வேண்டும்"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -144,12 +273,12 @@ msgid ""
"%s, %s or %s."
msgstr "Bridge-களை பெறுவதற்கு ஓர் மாற்றுவழி %s முகவரிக்கு ஒரு மின்னஞ்சல் அனுப்பலாம்.\nதயவு செய்யது கவனிக்கவும், நீங்கள் கட்டாயமாக கீழ்கண்ட மின்னஞ்சல் சேவைகளின் முகவரியிலிருந்து மட்டுமே மின்னஞ்சல் அனுப்பலாம் :\n%s, %s or %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "என் Bridge-கள் வேலை செய்யவில்லை! எனக்கு உதவி தேவை!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "உங்கள் Tor வேலை செய்யவில்லை எனில், நீங்கள் %s தொடர்புகொள்க "
@@ -157,70 +286,71 @@ msgstr "உங்கள் Tor வேலை செய்யவில்லை
#. 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
+#: bridgedb/strings.py:121
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 "உங்கள் வழக்கு குறித்து அதிகபட்ச தகவல்களை சேருங்கள், இதில் நீங்கள் பயன்படுத்த முயற்சித்த bridges\nமற்றும் Pluggable Transports, தங்களின் Tor Browser பதிப்பு எண் ஆகியவை அடங்கும், மற்றும் Tor\nகூரியதகவல்கள் போன்றவற்றையும் சேர்க்கவும்."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "இதோ உங்கள் bridge வரிசைகள்: "
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Bridge-களை பெறுக!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Bridge வகை விருப்பங்களை தேர்ந்தெடுக்கவும்:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "உங்களுக்கு IPv6 முகவரிகள் வேண்டுமா?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "உங்களுக்கு ஒரு %s தேவையா?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr " தங்களின் browser படங்களை சரியாக காட்டவில்லை."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "மேலே உள்ள படத்தில் இருக்கும் எழுத்துக்கள் உள்ளிடவும்..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "தங்களின் bridge-களை பயன்படுத்த தொடங்குவது எப்படி"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, 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 "Bridge-களை Tor Browser-னுள் உள்ளிட, %s Tor Browser பதிவிறக்க பக்கத்தில் %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 உலாவியில் bridgeகளை உள்ளீடு செய்ய, முதலில் %s Tor உலாவி பதிவிறக்க பக்கத்திற்கு சென்று %s மேலும் பிறகு அங்கு Tor உலாவியை பதிவிறக்கம் மற்றும் தொடங்குவதற்கான அறிவுறுத்தல்களை பின்பற்றுங்கள்."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:125
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "'Tor நெட்வொர்க் அமைப்புகள்' உரையாடல் மேல்தோன்றும் பொழுது, 'கட்டமைக்க' கிளிக்செய்து \nவழிகாட்டியை அது கேட்கும்வரை பின்பற்றவும்:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:129
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "உங்களின் இணைய சேவை வழங்கும் (ISP) நிறுவனம் Tor நெட்வொர்கை தடுக்கிறதா அல்லது \nவேறுவழியில் தணிக்கை செய்கிறதா? "
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:133
+#: bridgedb/strings.py:159
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"
@@ -228,130 +358,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "'ஆம்' தேர்ந்தெடுத்து பின்னர் 'அடுத்து' கிளிக் செய்யவும். தங்களின் புதிய bridge-களை கட்டமைக்க, \nவரிசைகளை வாக்கியம் உள்ளீtடு பெட்டியில் நகல்எடுத்து பேஸ்ட் செய்யவும். இறுதியாக, 'இணைக்க' கிளிக் \nசெய்தவுடன், நீங்கள் செல்ல தயார்! நீங்கள் பிரச்சினையை சந்தித்தால், 'Tor நெட்வொர்க் அமைப்புகள்' \nவழிகாட்டியில் உள்ள 'உதவி' பொத்தானை கிளிக் செய்து மேலும் உதவி பெறவும்."
-#: lib/bridgedb/strings.py:141
+#: bridgedb/strings.py:167
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
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "பழையமுறையான bridge-களை விண்ணப்பிக்கவும்."
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "IPv6 bridge-களை விண்ணப்பிக்கவும்."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:148
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Pluggable Transport bridge-களை TYPE வகையில் விண்ணப்பிக்கவும்."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:151
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr " BridgeDB-யுடைய பொது GnuPG சாவியின் ஒரு நகலை பெறவும்."
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Report a Bug"
-msgstr "ஒரு பிழையை அறிக்கைசெய்க"
-
-#: lib/bridgedb/templates/base.html:94
-msgid "Source Code"
-msgstr "மூல தொகுப்பு"
-
-#: lib/bridgedb/templates/base.html:97
-msgid "Changelog"
-msgstr "மாற்றம்குறிக்கும் கோப்பு"
-
-#: lib/bridgedb/templates/base.html:99
-msgid "Contact"
-msgstr "தொடர்பு கொள்"
-
-#. 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:72
-msgid "There currently aren't any bridges available..."
-msgstr "தற்சமயம் Bridge-கள் யேதும் இல்லை..."
-
-#: lib/bridgedb/templates/bridges.html:73
-#, 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 Tor Browser %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 Bridge-களை %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 bridge-களை Tor Browser-உள் %s சேர்க்கவும்"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sநே%sரயடியாக bridge-களை கொடுக்கவும்!"
-
-#: 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:130
-#, 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:154
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sபெ%sருக Bridge-களை"
diff --git a/bridgedb/i18n/templates/bridgedb.pot b/bridgedb/i18n/templates/bridgedb.pot
index 978655e..bc6080f 100644
--- a/bridgedb/i18n/templates/bridgedb.pot
+++ b/bridgedb/i18n/templates/bridgedb.pot
@@ -1,27 +1,23 @@
# Translations template for BridgeDB.
# Copyright (C) 2015 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
-# Isis Lovecruft <isis at torproject.org>, 2015.
-#
-#, fuzzy
-#
+#
# Translators:
-# runasand <runa.sandvik at gmail.com>, 2011
-# Isis Lovecruft <isis at torproject.org>, 2012-2015
+# runasand <inactive+runasand at transifex.com>, 2011
msgid ""
msgstr ""
-"Project-Id-Version: bridgedb 0.3.1+255.g3454779.dirty\n"
-"Report-Msgid-Bugs-To: "
-"'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords"
-"=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2017-09-19 09:41+0000\n"
+"Last-Translator: runasand <inactive+runasand at transifex.com>\n"
+"Language-Team: English (http://www.transifex.com/otf/torproject/language/en/)\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"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 +32,35 @@ msgstr ""
#. "Tor Browser"
#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
-msgstr ""
+msgstr "Sorry! Something went wrong with your request."
#: bridgedb/https/templates/base.html:79
msgid "Report a Bug"
-msgstr ""
+msgstr "Report a Bug"
#: bridgedb/https/templates/base.html:82
msgid "Source Code"
-msgstr ""
+msgstr "Source Code"
#: bridgedb/https/templates/base.html:85
msgid "Changelog"
-msgstr ""
+msgstr "Changelog"
#: bridgedb/https/templates/base.html:88
msgid "Contact"
-msgstr ""
+msgstr "Contact"
#: bridgedb/https/templates/bridges.html:35
msgid "Select All"
-msgstr ""
+msgstr "Select All"
#: bridgedb/https/templates/bridges.html:40
msgid "Show QRCode"
-msgstr ""
+msgstr "Show QRCode"
#: bridgedb/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
-msgstr ""
+msgstr "QRCode for your bridge lines"
#. TRANSLATORS: Please translate this into some silly way to say
#. "There was a problem!" in your language. For example,
@@ -73,56 +69,58 @@ msgstr ""
#: bridgedb/https/templates/bridges.html:67
#: bridgedb/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
-msgstr ""
+msgstr "Uh oh, spaghettios!"
#: bridgedb/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
-msgstr ""
+msgstr "It seems there was an error getting your QRCode."
#: 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 ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy your bridge lines onto mobile and other devices."
#: bridgedb/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
-msgstr ""
+msgstr "There currently aren't any bridges available..."
#: bridgedb/https/templates/bridges.html:132
#, python-format
-msgid " Perhaps you should try %s going back %s and choosing a different bridge type!"
-msgstr ""
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr " Perhaps you should try %s going back %s and choosing a different bridge type!"
#: bridgedb/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
-msgstr ""
+msgstr "Step %s1%s"
#: bridgedb/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
-msgstr ""
+msgstr "Download %s Tor Browser %s"
#: bridgedb/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
-msgstr ""
+msgstr "Step %s2%s"
#: bridgedb/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
-msgstr ""
+msgstr "Get %s bridges %s"
#: bridgedb/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
-msgstr ""
+msgstr "Step %s3%s"
#: bridgedb/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
+msgstr "Now %s add the bridges to Tor Browser %s"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
@@ -131,19 +129,19 @@ msgstr ""
#: bridgedb/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
-msgstr ""
+msgstr "%sJ%sust give me bridges!"
#: bridgedb/https/templates/options.html:51
msgid "Advanced Options"
-msgstr ""
+msgstr "Advanced Options"
#: bridgedb/https/templates/options.html:86
msgid "No"
-msgstr ""
+msgstr "No"
#: bridgedb/https/templates/options.html:87
msgid "none"
-msgstr ""
+msgstr "none"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
@@ -151,7 +149,7 @@ msgstr ""
#: bridgedb/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
-msgstr ""
+msgstr "%sY%ses!"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
@@ -159,50 +157,50 @@ msgstr ""
#: bridgedb/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
-msgstr ""
+msgstr "%sG%set Bridges"
#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
-msgstr ""
+msgstr "[This is an automated message; please do not reply.]"
#: bridgedb/strings.py:45
msgid "Here are your bridges:"
-msgstr ""
+msgstr "Here are your bridges:"
#: bridgedb/strings.py:47
#, 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 ""
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr "You have exceeded the rate limit. Please slow down! The minimum time between\nemails is %s hours. All further emails during this time period will be ignored."
#: bridgedb/strings.py:50
-msgid "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr ""
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
-msgstr ""
+msgstr "Welcome to BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
-msgstr ""
+msgstr "Currently supported transport TYPEs:"
#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
-msgstr ""
+msgstr "Hey, %s!"
#: bridgedb/strings.py:57
msgid "Hello, friend!"
-msgstr ""
+msgstr "Hello, friend!"
#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
-msgstr ""
+msgstr "Public Keys"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
@@ -212,7 +210,7 @@ msgstr ""
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
-msgstr ""
+msgstr "This email was generated with rainbows, unicorns, and sparkles\nfor %s on %s at %s."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
@@ -223,11 +221,10 @@ msgstr ""
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"
+"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr ""
+msgstr "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\nwhich can help obfuscate your connections to the Tor Network, making it more\ndifficult for anyone watching your internet traffic to determine that you are\nusing Tor.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#: bridgedb/strings.py:79
@@ -235,7 +232,7 @@ msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
-msgstr ""
+msgstr "Some bridges with IPv6 addresses are also available, though some Pluggable\nTransports aren't IPv6 compatible.\n\n"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
@@ -245,45 +242,42 @@ msgstr ""
#: bridgedb/strings.py:88
#, 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"
+"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 ""
+msgstr "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\nPluggable Transports %s which maybe doesn't sound as cool, but they can still\nhelp to circumvent internet censorship in many cases.\n\n"
#: bridgedb/strings.py:101
msgid "What are bridges?"
-msgstr ""
+msgstr "What are bridges?"
#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr ""
+msgstr "%s Bridges %s are Tor relays that help you circumvent censorship."
#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
-msgstr ""
+msgstr "I need an alternative way of getting bridges!"
#: bridgedb/strings.py:108
#, python-format
msgid ""
-"Another way to get bridges is to send an email to %s. Please note that you "
-"must\n"
+"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 ""
+msgstr "Another way to get bridges is to send an email to %s. Please note that you must\nsend the email using an address from one of the following email providers:\n%s, %s or %s."
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
-msgstr ""
+msgstr "My bridges don't work! I need help!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
-msgstr ""
+msgstr "If your Tor doesn't work, you should email %s."
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
@@ -293,40 +287,40 @@ 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 ""
+msgstr "Try including as much info about your case as you can, including the list of\nbridges and Pluggable Transports you tried to use, your Tor Browser version,\nand any messages which Tor gave out, etc."
#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
-msgstr ""
+msgstr "Here are your bridge lines:"
#: bridgedb/strings.py:129
msgid "Get Bridges!"
-msgstr ""
+msgstr "Get Bridges!"
#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
-msgstr ""
+msgstr "Please select options for bridge type:"
#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
-msgstr ""
+msgstr "Do you need IPv6 addresses?"
#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
-msgstr ""
+msgstr "Do you need a %s?"
#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
-msgstr ""
+msgstr "Your browser is not displaying images properly."
#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
-msgstr ""
+msgstr "Enter the characters from the image above..."
#: bridgedb/strings.py:144
msgid "How to start using your bridges"
-msgstr ""
+msgstr "How to start using your bridges"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
#: bridgedb/strings.py:146
@@ -335,57 +329,53 @@ 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 ""
+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".
#: bridgedb/strings.py:151
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and "
-"follow\n"
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
-msgstr ""
+msgstr "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\nthe wizard until it asks:"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:155
msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor "
-"connections\n"
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
-msgstr ""
+msgstr "Does your Internet Service Provider (ISP) block or otherwise censor connections\nto the Tor network?"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:159
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"
+"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 ""
+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."
#: bridgedb/strings.py:167
msgid "Displays this message."
-msgstr ""
+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.
#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
-msgstr ""
+msgstr "Request vanilla bridges."
#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
-msgstr ""
+msgstr "Request IPv6 bridges."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
-msgstr ""
+msgstr "Request a Pluggable Transport by TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr ""
-
+msgstr "Get a copy of BridgeDB's public GnuPG key."
diff --git a/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po
index 23c5743..0dd1a08 100644
--- a/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po
@@ -8,25 +8,32 @@
# Emir Sarı <bitigchi at openmailbox.org>, 2014
# Emre <conan at operamail.com>, 2013
# erg26 <ergungorler at gmail.com>, 2012
+# erg26 <ergungorler at gmail.com>, 2012
+# eromytsatiffird <driffitastymore at gmail.com>, 2014
# Fomas <fomas.adana at gmail.com>, 2015
-# Idil Yuksel <perfectionne at gmail.com>, 2014
+# Idil Yuksel <idilyuksel at hotmail.com>, 2014
+# Kaya Zeren <kayazeren at gmail.com>, 2015-2016,2018-2019
+# Ozancan Karataş <ozancankaratas96 at outlook.com>, 2015
+# ozkansib <s.ozkan at gyte.edu.tr>, 2014
+# Idil Yuksel <idilyuksel at hotmail.com>, 2014
# Sercan Altundaş <>, 2012
# ozkansib <s.ozkan at gyte.edu.tr>, 2014
# Tekel Bira <psycookie at gmail.com>, 2012
-# Volkan Gezer <volkangezer at gmail.com>, 2014-2015
+# Volkan Gezer <volkangezer at gmail.com>, 2014-2016
+# zeki <zeki.ozguryazilim at gmail.com>, 2014
# zeki <zeki.ozguryazilim at gmail.com>, 2014
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-20 14:58+0000\n"
-"Last-Translator: Fomas <fomas.adana at gmail.com>\n"
-"Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-04-09 02:36+0000\n"
+"Last-Translator: Kaya Zeren <kayazeren at gmail.com>\n"
+"Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\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"
+"Generated-By: Babel 1.3\n"
"Language: tr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -41,68 +48,193 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
-msgstr "Üzgünüz! İsteğinizle ilgili bir hata oluştu."
+msgstr "Üzgünüz! İsteğiniz ile ilgili bir şeyler ters gitti."
+
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Bir Hata Bildirin"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Kaynak Kodu"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Sürüm Notları"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "İletişim"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Tümünü Seç"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "QR Kodunu Görüntüle"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "Köprü satırlarınızın QR Kodu"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Haydi hayırlısı!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "QR Kodunuzun alınmasında bir sorun çıkmış gibi görünüyor."
+
+#: 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 "Bu QR Kodunda köprü satırlarınız bulunuyor. Köprü satırlarınızı bir mobil aygıta ya da başka aygıtlara kopyalamak için bu kodu bir QR Kodu tarayıcısına okutun."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Şu anda kullanılabilecek bir köprü yok..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Belki %s geri dönmeyi %s ve farklı bir köprü türü seçmeyi denemelisiniz!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "%s1%s. Adım"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "%s Tor Browser Uygulamasını %s indirin"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "%s2%s. Adım"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "%s Köprüleri %s edinin"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "%s3%s. Adım"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Şimdi %s Tor Browser üzerine köprüler ekleyin %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.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sB%sana sadece köprüleri verin!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Gelişmiş Ayarlar"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Hayır"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "hiçbiri"
+
+#. 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:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sE%svet!"
+
+#. 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:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sK%söprüleri Al"
-#: lib/bridgedb/strings.py:18
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
-msgstr "[Bu otomatik bir mesajdır; lütfen yanıtlamayınız.]"
+msgstr "[Bu otomatik bir iletidir; lütfen yanıtlamayın.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "İşte köprüleriniz:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 "E-posta kotanızı aştınız. Lütfen yavaşlayın! E-postalar arasındaki minimum zaman %s saattir.\nBu süre içinde göndereceğiniz diğer e-postalarınız yok sayılacaktır."
+msgstr "E-posta sınırınızı aştınız. Lütfen yavaşlayın! E-postalar arasındaki en az zaman %s saattir.\nBu süre içinde göndereceğiniz diğer e-postalarınız gözardı edilecektir."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "KOMUTlar: (birden fazla seçeneğı aynı anda belirtmek için KOMUTları birleştirin)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "BridgeDB'ye Hoş Geldiniz!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
-msgstr "Şu an desteklenen taşıyıcı TYPEları:"
+msgstr "Şu an desteklenen aktarım TÜRleri:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Selam, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Selam, arkadaş!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
-msgstr "Açık Anahtarlar"
+msgstr "Herkese Açık Anahtarlar"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
-msgstr "Bu e-posta %s için %s tarihinde %s saatinde gökkuşakları,\ntek boynuzlu atlar ve pırıltılarla oluşturulmuştur."
+msgstr "Bu e-posta %s için %s %s tarihinde gökkuşakları, tek boynuzlu atlar\nve ışıltılarla oluşturuldu."
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -110,283 +242,158 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "BridgeDB, birçok %stür Eklenebilir Aktarımlar%s içeren\nköprü sağlayabilir.\nBu şekilde İnternet trafiğinizi izleyen birinin Tor kullandığınızı\nanlamasını zorlaştırmak için Tor Ağı'na yaptığınız\nbağlantıları karıştırmanıza yardımcı olabilir.\n\n"
+msgstr "BridgeDB, çeşitli %stürde Değiştirilebilir Taşıyıcılar%s içeren köprüler sağlayabilir.\nBöylece Tor Ağı üzerine yaptığınız bağlantılar karıştırılarak, İnternet trafiğinizi\nizleyen birinin Tor kullandığınızı anlaması zorlaştırılabilir.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
-msgstr "IPv6 kullanan bazı köprüler de mevcut olmasının yanında bazı Eklenebilir Aktarımlar\nIPv6 uyumlu değildir.\n\n"
+msgstr "IPv6 kullanan bazı köprüler olmasına rağmen bazı Değiştirilebilir Taşıyıcılar\nIPv6 ile uyumlu değildir.\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
+#: bridgedb/strings.py:88
#, 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 "Ek olarak BridgeDB %s hiçbir Eklenebilir Aktarıma sahip olmayan %s birçok düz\nözelliksiz köprüye sahiptir. Adları hoş olmayabilir ancak hala çoğu durumda sansürü\naşmaya yardım edebilirler.\n\n"
+msgstr "Ayrıca BridgeDB %s üzerinde herhangi bir Değiştirilebilir Taşıyıcı kullanmayan %s birçok eski, sıradan\nve özelliksiz vanilla köprüsü bulunur. Kulağa pek iyi gelmeyebilir ancak bu köprüler hala pek çok\ndurumda İnternet engellemelerini aşmakta yardımcı olabilir.\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Köprü nedir?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Köprüler %s sansürü aşmanıza yardımcı olan Tor aktarıcılarıdır."
+msgstr "%s Köprüler %s İnternet kısıtlamalarını aşmanıza yardımcı olan Tor aktarıcılarıdır."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
-msgstr "Köprü adresi edinmek için başka bir yola gereksinimim var!"
+msgstr "Köprüleri edinmek için başka bir yola gerek duyuyorum!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, 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 "Köprüleri almanın diğer bir yolu da %s adresine bir e-posta göndermektir.\nLütfen e-postanın aşağıdaki e-posta sağlayıcılardan birinden alınmış bir\nadresten gönderilmesi gerektiğini unutmayın:\n%s, %s veya %s."
+msgstr "Köprüleri edinmenin diğer bir yolu da %s adresine bir e-posta göndermektir.\nLütfen e-postanın aşağıdaki e-posta sağlayıcıların birinden alınmış bir\nadresten gönderilmesi gerektiğini unutmayın:\n%s, %s ya da %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
-msgstr "Köprülerim çalışmıyor! Yardıma ihtiyacım var!"
+msgstr "Köprülerim çalışmıyor! Yardım gerek!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
-msgstr "Tor'unuz çalışmıyorsa %s adresine e-posta göndermelisiniz. "
+msgstr "Tor uygulamanız çalışmıyorsa %s adresine e-posta göndermelisiniz."
#. 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
+#: bridgedb/strings.py:121
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 "Durumunuz hakkında olabildiğince fazla bilgi verin.\nÖrneğin kullanmaya çalıştığınız Eklenebilir Taşıyıcılar, Tor Browser sürümünüz, Tor'un gösterdiği tüm hata iletileri vb."
+msgstr "Durumunuz hakkında olabildiğince fazla bilgi verin.\nKullanmaya çalıştığınız köprü listesi ve Değiştirilebilir Taşıyıcılar, Tor Browser sürümünüz,\nTor tarafından görüntülenen tüm iletiler gibi."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "İşte köprü satırlarınız:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Köprüleri Al!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
-msgstr "Lütfen köprü türü için seçenekleri belirleyin:"
+msgstr "Lütfen köprü türü seçeneklerini belirleyin:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
-msgstr "IPv6 adreslerine ihtiyacınız var mı?"
+msgstr "IPv6 adresleri gerekli mi?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
-msgstr "%s ihtiyacınız var mı?"
+msgstr "%s gerekli mi?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
-msgstr "Tarayıcınız resimleri düzgün görüntülemiyor."
+msgstr "Tarayıcınız görselleri düzgün görüntülemiyor."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
-msgstr "Yukarıdaki görseldeki karakterlerini giriniz..."
+msgstr "Yukarıdaki görselde bulunan karakterleri yazın..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
-msgstr "Köprülerinizi kullanmaya nasıl başlarsınız"
+msgstr "Köprülerinizi nasıl kullanabilirsiniz"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, 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 "Tor Browser'a köprü tanımlamak için önce %s Tor Browser indirme sayfasına %s gidip, oradaki Tor Browser'ı indirme ve başlatma yönergelerini izleyin."
+msgstr "Tor Browser üzerine köprüler eklemek için\n%s Tor Browser indirme sayfasına %s\ngidin ve Tor Browser indirme ve başlatma yönergelerini izleyin."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
-msgstr "'Tor Ağ Ayarları' penceresi açıldığında, 'Yapılandır'ı tıklayın ve şunu soruncaya dek\nsihirbazı izleyin:"
+msgstr "'Tor Ağı Ayarları' penceresi açıldığında, 'Ayarla' üzerine tıklayın ve şu soru soruluncaya\ndek yardımcıyı izleyin:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
-msgstr "İnternet Servis Sağlayıcınız (ISP) Tor ağına bağlantıyı engelliyor\nveya başka şekillerde sansür uyguluyor mu?"
+msgstr "İnternet Hizmeti Sağlayıcınız (ISS) Tor ağına olan bağlantıları engelliyor\nya da başka şekillerde bir sansür uyguluyor mu?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
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 "'Evet' ve ardından 'İleri' tıklayın. Yeni köprülerinizi yapılandırmak için,\nköprü satırlarını kopyalayarak metin kutusuna yapıştırın. 'Bağlan'ı da tıkladığınızda artık hazırsınız! Eğer sorun yaşıyorsanız, daha fazla yardım için 'Tor Ağ Ayarları' sihirbazındaki 'Yardım' düğmesine tıklamayı deneyin."
+msgstr "'Evet' seçip ardından 'İleri' üzerine tıklayın. Yeni köprülerinizi ayarlamak için köprü\nsatırlarını kopyalayarak metin kutusuna yapıştırın.\n'Bağlan' üzerine tıkladığınızda artık hazırsınız! Sorun yaşıyorsanız, daha fazla yardım almak için 'Tor Ağı Ayarları' yardımcısındaki 'Yardım' düğmesine tıklamayı deneyin."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Bu iletiyi görüntüler."
#. 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
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Normal köprüler iste."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "IPv6 köprüleri iste."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
-msgstr "TYPE uyumlu bir eklenebilir taşıyıcı talep et."
+msgstr "TYPE uyumlu bir Değiştirilebilir Taşıyıcı iste."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "BridgeDB'nin ortak GnuPG anahtar kopyasını al."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Bir Hata Bildir"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Kaynak Kodu"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Değişim günlüğü"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "İletişim"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Hepsini Seç"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "QR Kodunu Göster"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "Köprü satırlarınız için QR Kodu"
-
-#. 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 "Bu da nesi!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "QR Kodunuzu alınırken bir hata olmuş gibi görünüyor."
-
-#: 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 "Bu QR Kodu köprü satırlarınızı içeriyor. Köprü satırlarınızı bir mobil cihaza veya diğer cihazlara kopyalamak için bir QR Tarayıcı kullanın."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Şu anda kullanılabilecek bir köprü yok..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Belki %s geri dönmeyi %s ve farklı bir köprü türü seçmeyi denemelisiniz!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Adım %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "%s Tor Browser'ı %s İndirin"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Adım %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "%s Köprüleri %s edinin"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Adım %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Şimdi %s köprüleri Tor Tarayıcı'ya ekleyin %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 "%sB%sana köprüleri ver!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "İleri Seçenekler"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Hayır"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "hiçbiri"
-
-#. 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 "%sE%svet!"
-
-#. 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 "Köprüleri %sA%sl"
+msgstr "Herkese açık BridgeDB GnuPG anahtarının bir kopyasını al."
diff --git a/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po
index 1de17e2..7edd38e 100644
--- a/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po
@@ -3,26 +3,28 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
+# Bogdan Kulynych <bogdan.kulynych at gmail.com>, 2019
# Eugene ghostishev, 2014
# LinuxChata, 2014-2015
# Oleksii Golub <sclub2018 at yandex.ua>, 2015
# Oleksii Golub <sclub2018 at yandex.ua>, 2013
-# Yasha <yasha88888 at hotmail.com>, 2015
+# Vira Motorko <ato4ka at i.ua>, 2017
+# f5a88f9e30127107e3f9ea67ac1be70b, 2015
# Андрій Бандура <andriykopanytsia at gmail.com>, 2014
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-13 17:46+0000\n"
-"Last-Translator: Yasha <yasha88888 at hotmail.com>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-04-05 23:58+0000\n"
+"Last-Translator: Bogdan Kulynych <bogdan.kulynych at gmail.com>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/otf/torproject/language/uk/)\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"
+"Generated-By: Babel 1.3\n"
"Language: uk\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"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
@@ -35,57 +37,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Ми приносимо наші вибачення! Щось пішло не так з Вашим запитом."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Повідомити про помилку"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Код"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Список змін"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Контакт"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Вибрати всі"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Показати QR-код"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR-код для адрес ретрансляторів"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Отакої!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Здається, що сталася помилка при отриманні вашого QR-коду."
+
+#: 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 "Цей QR-код містить адреси Ваших ретрансляторів. Відскануйте його пристроєм для зчитування QR-кодів, щоб скопіювати адреси Ваших ретрансляторів на мобільні та інші пристрої."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "В даний час немає доступних мостів..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Можливо, Вам слід спробувати %s повернутися %s і вибрати інший тип мосту!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Крок %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Завантажити %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Крок %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Отримайте %s мости %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Крок %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Тепер %s додай bridges до Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sТ%sільки дай мені мости!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Розширені Параметри"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Ні"
+
+#: 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:124
+#, 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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sО%sтримати мости"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Це автоматичне повідомлення; будь ласка, не відповідайте.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Ваші мости:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "Команди: (комбінувати команди вказавши кілька варіантів одночасно)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Ласкаво просимо у BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "У даний час підтримуються transport TYPE:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Привіт, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Привіт, друже!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Відкриті ключі"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -96,7 +223,7 @@ msgstr "Цей лист був згенеровано з райдугами, є
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -104,44 +231,44 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "BridgeDB може забезпечити bridges з декількома %sтипами Pluggable Transports%s,\nякі можуть допомогти приховати свої зв'язки з Tor мережею, що ускладнює роботу\nдля тих, хто перевіряє Ваш інтернет-трафік, щоб визначити, що Ви\nвикористовуєте Tor. \n"
+msgstr "BridgeDB може забезпечити мости з декількома %sтипами вставних транспортерів%s,\nякі можуть допомогти приховати свої зв'язки з мережею Tor, що ускладнює роботу\nдля тих, хто перевіряє Ваш інтернет-трафік, щоб визначити, що Ви\nвикористовуєте Tor. \n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
-msgstr "Деякі мости з адресами IPv6, також доступні, хоча деякі Pluggable\nTransports не сумісні з IPv6.\n"
+msgstr "Деякі мости з адресами IPv6 також доступні, хоча деякі вставні\nтранспортери не сумісні з IPv6.\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
+#: bridgedb/strings.py:88
#, 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 має багато plain-ol'-vanilla bridges %s без\nPluggable Transports %s, які, можливо, не звучать гарно, але вони \nможуть допомогти обійти інтернет-цензуру в багатьох випадках.\n"
+msgstr "Крім того, BridgeDB має багато простих як двері мостів %s без\nвставних транспортерів %s, які, можливо, не звучать гарно, але вони \nможуть допомогти обійти інтернет-цензуру в багатьох випадках.\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Що таке ретранслятор типу міст?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Мости %s є Tor реле, які допоможуть Вам обійти цензуру."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Мені потрібен альтернативний спосіб отримання списку мостів!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -149,12 +276,12 @@ msgid ""
"%s, %s or %s."
msgstr "Ще один спосіб отримати bridges - це відправити лист на адресу %s. Зверніть увагу, що\nВи повинні надіслати лист, використовуючи адресу від одного з наступних постачальників\nпослуг електронної пошти:\n%s, %s або %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Мої мости не працюють! Допоможіть!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Якщо Ваш Tor не працює, Ви можете відправити нам електронного листа %s."
@@ -162,48 +289,48 @@ msgstr "Якщо Ваш Tor не працює, Ви можете відправ
#. 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
+#: bridgedb/strings.py:121
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 "Спробуйте додати якнайбільше інформації про Ваш випадок, в тому числі список\nbridges і Pluggable Transports, що Ви намагалися використовувати, версію браузера Tor,\nі будь-які повідомлення, які Tor видавав, і т.д."
+msgstr "Спробуйте додати якнайбільше інформації про Ваш випадок, в тому числі список\nмостів і вставних транспортерів, які Ви пробували використовувати, версію браузера Tor,\nі будь-які повідомлення, які Tor видавав, і т.д."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Лінії для Вашого мосту:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Отримати Bridges!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Будь ласка, оберіть параметри типу міст:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Вам потрібні адреси IPv6?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Вам потрібен %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Ваш браузер не відображає зображення належним чином."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Введіть зображенні символи ..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Як почати користуватися Вашими мостами"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -212,21 +339,21 @@ msgid ""
msgstr "Щоб додати ретранслятори у Tor Browser, спочатку ідіть на %s сторінку завантаження Tor Browser %s а потім слідуйте інструкціям для скачування і запуску Tor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Коли діалог \"Налаштування мережі Tor\" відкриється, натисніть \"Налаштувати\" і дотримуйтесь\nпідказкам майстра, допоки він не запросить:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Вашій інтернет-провайдер (ISP) блокує або цензурує з'єднання\nдо мережі Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
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,153 +361,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Виберіть \"Так\", а потім натисніть \"Далі\". Для налаштування нових bridges, скопіюйте і\nвставте лінії bridge у поле для введення тексту. Потім, натисніть 'Підключатися', і\nвсе повинно працювати! Якщо у Вас виникли проблеми, спробуйте натиснути \"Довідка\" \nв майстрові \"Мережеві параметри Tor' для отримання додаткової допомоги."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
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
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Запит на отримання vanilla bridges."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Запит на отримання IPv6 bridges."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Запит на отримання Pluggable Transport по TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Отримати копію відкритого GnuPG ключа для BridgeDB."
-
-#: 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 "Список змін"
-
-#: 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 "Показати QR-код"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QR-код для адрес ретрансляторів"
-
-#. 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 "Ой-ой, spaghettios!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Здається, було помилкою отримання вашого QR-код."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Це QR-код містить адреси Ваших ретрансляторів. Відскануйте його пристроєм для зчитування QR-кодів, щоб скопіювати адреси Ваших ретрансляторів на мобільні та інші пристрої."
-
-#: 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 Tor Browser %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 додай bridges до Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%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тримати мости"
diff --git a/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po
index e2bc012..c646c83 100644
--- a/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po
@@ -6,24 +6,26 @@
# khi, 2013
# khi, 2013
# khi, 2013
-# Christopher Meng <cickumqt at gmail.com>, 2012
+# Christopher Meng <i at cicku.me>, 2012
# hanl <iamh4n at gmail.com>, 2011
-# Meng3, 2014
+# Meng San, 2014,2016
# leungsookfan <leung.sookfan at riseup.net>, 2014
+# Meng San, 2016
+# Mingye Wang <arthur200126 at gmail.com>, 2016
# khi, 2014-2015
-# YF <yfdyh000 at gmail.com>, 2014-2015
+# YFdyh000 <yfdyh000 at gmail.com>, 2014-2015
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-16 14:41+0000\n"
-"Last-Translator: khi\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2018-06-10 07:15+0000\n"
+"Last-Translator: Colin Childs <colin at torproject.org>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\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"
+"Generated-By: Babel 1.3\n"
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
@@ -38,57 +40,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "抱歉，你的邮件请求出现问题。"
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "报告 Bug"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "源代码"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "更改日志"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "联系方式"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "选择全部"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "显示二维码"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "网桥二维码"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "哎哟哟！"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "获取二维码时出错。"
+
+#: 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:131
+msgid "There currently aren't any bridges available..."
+msgstr "现在没有可用的网桥。"
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "试试 %s后退%s到前一页面，然后选择其他类型的网桥。"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "第 %s 1 %s 步"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "下载 %s Tor 浏览器 %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "第 %s 2 %s 步"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "获取 %s bridges %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "第 %s 3 %s 步"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "如何 %s 在 Tor 浏览器添加网桥%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.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr " 直接给我网桥(%sJ%s)！ "
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "高级选项"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "否"
+
+#: 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:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "是(%sY%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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "获取网桥(%sG%s)"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[这是一封自动生成的邮件，请勿回复。]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "以下是为你提供的网桥："
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 "您已超出了发送频率的限制，请慢慢来！两封邮件之间需要最少 %s 小时的间隔。在间隔期间发出的所有邮件将被忽略。"
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "命令：（组合使用命令可同时指定多个选项）"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "欢迎来到 BridgeDB！"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "目前可用的 transport 类型："
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "你好，%s！"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "你好，朋友！"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "公共密匙"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -99,7 +226,7 @@ msgstr "本邮件是对 %s 的自动回复，日期 %s %s。"
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -107,10 +234,10 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "BridgeDB 能提供 %s 几种 Pluggable Transports %s 类型网桥，可用于混淆 Tor 网络的连接，从而让网络监控者难以判断你在使用 Tor。\n"
+msgstr "BridgeDB 提供多种%s可拔插传输%s网桥，用于混淆 Tor 网络的连接，从而让网络监控者难以判断你在使用 Tor。\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -122,7 +249,7 @@ msgstr "另外提供一些IPv6格式的网桥，不过某些 Pluggable Transport
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -131,33 +258,33 @@ msgid ""
"\n"
msgstr "此外，BridgeDB 提供很多 %s 非Pluggable Transports %s 的普通网桥。\n虽然听起来不够酷，但是这些普通网桥依然可以在很多情况下帮助绕过审查。\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "什么是网桥？"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s网桥%s即 Tor 中继节点，用于帮助用户绕过审查或封锁。"
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "需要使用其他获取方式获取网桥！"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, 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。注意：必须使用电子邮箱发送请求：%s、%s 或 %s。"
+msgstr "另一种获取网桥的方式是发送电子邮件至 %s。注意：必须使用以下电子邮箱发送请求：%s、%s 或 %s。"
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "用网桥也无法连接，需要帮助！"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "如果 Tor 无法正常运行，请发邮件至 %s。"
@@ -165,48 +292,48 @@ msgstr "如果 Tor 无法正常运行，请发邮件至 %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
+#: bridgedb/strings.py:121
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 "请尽量详细地描述你的情况，包括所用的网桥及其类型，Tor 浏览器版本以及任何 Tor 显示的信息等等。"
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "以下是为你提供的网桥："
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "获得网桥！"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "请选择类型类型。"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "是否需要IPv6地址？"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "是否需要 %s？"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "浏览器无法正确显示图片。"
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "请输入上图中的字符（不区分大小写）..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "如何使用网桥"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -215,21 +342,21 @@ msgid ""
msgstr "如需在 Tor 浏览器中添加网桥，请先根据 %s Tor 浏览器下载页面 %s 的说明下载和启动 Tor 浏览器。"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "当“Tor 网络设置” 对话框出现时，点击“配置” ，然后根据向导操作，直到看到下面的问题："
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "网络提供商（ISP）或其他人是否对 Tor 网络连接进行审查或封锁？"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
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,153 +364,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "选择“是”，然后点击“下一步”。如下添加新的网桥，请将网桥地址行通过复制粘贴的方式输入到文本输入框。最后，点击“连接”就可以连接至 Tor 网络。如有问题需要帮助，请点击“Tor 网络设置”向导窗口中的“帮助”按钮。"
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
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
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "请求普通网桥。"
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "请求IPv6网络。"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "按照类型请求不同的 Pluggable Transport 网桥。"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "获取 BridgeDB 的 GnuPG 公共密匙。"
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "报告 Bug"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "源代码"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "更改日志"
-
-#: 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 "显示二维码"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "网桥二维码"
-
-#. 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 "获取二维码时出错。"
-
-#: 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 "二维码包含网桥信息。利用二维码扫描程序，可将相应的网桥信息复制到手机或其他设备。"
-
-#: 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 "第 %s 1 %s 步"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "下载 %s Tor 浏览器 %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "第 %s 2 %s 步"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "获取 %s bridges %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "第 %s 3 %s 步"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "如何 %s 在 Tor 浏览器添加网桥%s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr " 直接给我网桥(%sJ%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 "是(%sY%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 "获取网桥(%sG%s)"
diff --git a/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po
index c36c522..502b260 100644
--- a/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po
@@ -3,21 +3,25 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
+# Agustín Wu <losangwuyts at gmail.com>, 2016
+# Chi-Hsun Tsai, 2017
# danfong <danfong.hsieh at gmail.com>, 2014
# LNDDYL, 2014
+# guihu, 2016
+# Cheung Hung, 2015
# x4r <xatierlike at gmail.com>, 2015
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2015-02-03 03:24+0000\n"
-"PO-Revision-Date: 2015-03-23 08:01+0000\n"
-"Last-Translator: x4r <xatierlike at gmail.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2019-02-23 14:36+0000\n"
+"Last-Translator: 孟邦 王\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\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"
+"Generated-By: Babel 1.3\n"
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
@@ -32,68 +36,193 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:122
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
-msgstr "抱歉!您的請求發生錯誤。"
+msgstr "抱歉！您的請求發生錯誤。"
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "回報錯誤"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "原始程式碼"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "變更記錄"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "聯絡資訊"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "選擇全部"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "顯示 QRCode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "您橋接用的 QRCode"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "有問題！"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "掃描 QRCode 時似乎發生錯誤"
+
+#: 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 "這個 QRCode 含有您的橋接器相關資訊，利用 QRCode 讀取程式將此資訊複製進行動運算裝置上。"
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "目前沒有任何橋接器接可用....."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr " 也許您應嘗試 %s 回到 %s，然後選擇不同的橋接類型!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "步驟 %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "下載 %s 洋蔥路由瀏覽器 %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "步驟 %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "取得 %s 橋接器 %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "步驟 %s3%s"
+
+#: bridgedb/https/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.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%s %s 給我橋接器！"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "進階選項"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "否"
+
+#: 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:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sY%ses!"
+
+#. 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:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sG%s 設定橋接器"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
-msgstr "[這是一個自動回覆郵件;請不要回覆。]"
+msgstr "[這是一個自動郵件;請不要回覆。]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
-msgstr "這裡是您的橋接:"
+msgstr "這是您的橋接器："
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, 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 "您已超過速度限制。請減慢速度!電子郵件之間的最短時間為 %s 個小時。在這段時間內所有其他的郵件將被忽略。"
+msgstr "您已超過速度限制。請減慢速度！電子郵件之間的最短時間為 %s 個小時。超過的話，在這段時間內所有的郵件將被忽略。"
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "命令:(組合命令可以同時指定多個選項)"
+msgstr "命令：(可將多個命令組合一起以便同時指定多個選項)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
-msgstr "歡迎使用 BridgeDB!"
+msgstr "歡迎使用 BridgeDB！"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
-msgstr "目前支援的傳輸類型:"
+msgstr "目前支援的傳輸類型："
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
-msgstr "嘿，%s!"
+msgstr "嘿，%s！"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
-msgstr "朋友，您好!"
+msgstr "朋友，您好！"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "公開金鑰"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
-msgstr "這封電子郵件使用 rainbows、unicorns 和 sparkles 產生於\n %s 在 %s 在 %s。"
+msgstr "這封電子郵件是為 %s 所產生\n在 %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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -101,44 +230,44 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "BridgeDB 可以使用幾種 Pluggable Transports%s 的 %stypes 來提供橋接，\n它可以幫助您混淆連接到 Tor Network，使其任何人藉由監看您的網路流\n量來確定您正使用 Tor 會更加困難\n。\n"
+msgstr "BridgeDB 可以使用幾種可插拔傳輸 %s 的 %stypes 來提供橋接，\n它可以幫助您混淆連接到 Tor Network，使其任何人藉由監看您的網路流\n量來確定您正使用 Tor 會更加困難\n。\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
-msgstr "有些具有 IPv6 位址的橋接也可用，雖然有些 Pluggable\nTransports 與 IPv6 不相容。\n\n"
+msgstr "有些具有 IPv6 位址的橋接器也可使用，雖然有些 Pluggable\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
+#: bridgedb/strings.py:88
#, 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"
+msgstr "此外，BridgeDB 有普通的橋接器 %s，沒有任何\n可插拔傳輸 %s，這也許聽起來不酷，但它\n仍有助於規避在許多情況下的網路審查。\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
-msgstr "什麼是橋接?"
+msgstr "什麼是橋接器？"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s 橋接 %s 是 Tor 中繼，可幫您規避審查。"
+msgstr "%s 橋接器 %s 是一種洋蔥路由的中繼節點，可幫助您規避審查。"
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
-msgstr "我需要使用其他方式取得橋接!"
+msgstr "我需要使用其他方式取得橋接器！"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -146,237 +275,113 @@ msgid ""
"%s, %s or %s."
msgstr "另一種取得橋接的方式為發送電子郵件至 %s。請注意，您必須 \n使用從下列電子郵件提供廠商之一的位址來發送電子郵件:\n%s, %s 或 %s。"
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
-msgstr "橋接無法正常執行，我需要幫助!"
+msgstr "橋接器無法正常執行，我需要幫助！"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
-msgstr "如果您的 Tor 無法運作，您應該發送電子郵件給 %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
+#: bridgedb/strings.py:121
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 "試著包含有關您情況的盡可能多的資訊，包含您嘗試使用過的 \n橋接和 Pluggable Transports 清單，您的 Tor 瀏覽器版本， \n以及 Tor 給出的任何訊息。"
+msgstr "請儘可能的給我們更多關於您的問題之相關資訊，包含您嘗試使用過的 \n橋接器和可插拔傳輸、您的洋蔥路由瀏覽器版本\n以及洋蔥路由給出的任何訊息。"
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
-msgstr "這裡是您的橋接線路:"
+msgstr "這裡是您的橋接線路："
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
-msgstr "取得橋接!"
+msgstr "取得橋接器："
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
-msgstr "請選擇橋接類型的選項:"
+msgstr "請選擇橋接器類型的選項："
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
-msgstr "您需要 IPv6 位址嗎?"
+msgstr "您需要 IPv6 位址嗎？"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
-msgstr "您需要 %s 嗎?"
+msgstr "您需要 %s 嗎？"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "您的瀏覽器不能正確顯示圖像。"
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
-msgstr "從上面的圖像中輸入字元..."
+msgstr "從上面的圖像中輸入字元....."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
-msgstr "如何開始使用您的橋接"
+msgstr "如何開始使用您的橋接器"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, 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 瀏覽器中，請按照 %s 上的說明，Tor\n瀏覽器下載頁面 %s 來啟動 Tor 瀏覽器。"
+"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 "若要將橋接器加入到洋蔥路由瀏覽器中，首先請到 %s 洋蔥路由瀏覽器下載頁面 %s 並按照頁面上的說明來下載和啟動洋蔥路由瀏覽器。"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:125
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
-msgstr "當「Tor 網路設定」對話彈出時，按一下〔設定〕，然後按照精靈，直到它要求:"
+msgstr "當「洋蔥路由網路設定」對話彈出時，按一下〔設定〕，然後按照設定精靈的導引進行："
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:129
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
-msgstr "您的網際網路服務供應者(ISP)阻擋或審查 Tor 網路連線?"
+msgstr "您的網際網路服務供應商(ISP)阻擋或過濾洋蔥路由網路的連線嗎？"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:133
+#: bridgedb/strings.py:159
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 "選擇〔是〕，然後按一下〔下一步〕。要設定您的新橋接，複製和\n將橋接線路貼上到文字輸入方塊中。最後，按一下〔連接〕就好。\n如果您遇到麻煩，請嘗試按一下「Tor 網路設定」精靈中的〔説明〕\n按鈕尋求進一步的協助 。"
+msgstr "選擇〔是〕，然後按一下〔下一步〕。要設定您的新橋接器，複製和\n將橋接線路貼上到文字輸入方塊中。最後，按一下〔連接〕就好。\n如果您遇到麻煩，請嘗試按一下「洋蔥路由網路設定」精靈中的〔説明〕\n按鈕尋求進一步的協助 。"
-#: lib/bridgedb/strings.py:141
+#: bridgedb/strings.py:167
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
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
-msgstr "請求 vanilla 橋接。"
+msgstr "請求標準橋接器。"
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
-msgstr "請求 IPv6 橋接。"
+msgstr "請求 IPv6 橋接器。"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:148
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
-msgstr "按照 TYPE 請求 Pluggable Transport。"
+msgstr "按照 TYPE 請求可插拔傳輸。"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:151
+#: bridgedb/strings.py:177
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 "變更記錄"
-
-#: 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 "您的橋接的 QRCode"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html: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 "掃描 QRCode 時似乎發生錯誤"
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "這個 QRCode 還有您的橋接資訊。在行動裝置上掃描以獲得您的橋接資訊"
-
-#: 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 Tor 瀏覽器 %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 將橋接加入到 Tor 瀏覽器 %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sJ%sust 給我橋接!"
-
-#: 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 "%sY%ses!"
-
-#. 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 "%sG%set Bridges"
+msgstr "取得 BridgeDB 上的 GnuPG 公開金鑰副本。"
diff --git a/bridgedb/test/test_https_server.py b/bridgedb/test/test_https_server.py
index ba555e8..d68b880 100644
--- a/bridgedb/test/test_https_server.py
+++ b/bridgedb/test/test_https_server.py
@@ -234,7 +234,7 @@ class HowtoResourceTests(unittest.TestCase):
request.method = b'GET'
request.addArg('lang', 'ru')
page = self.howtoResource.render_GET(request)
- self.assertSubstring("следуйте инструкциям установщика", page)
+ self.assertSubstring("следовать инструкциям установщика", page)
class CaptchaProtectedResourceTests(unittest.TestCase):
More information about the tor-commits
mailing list