[tor-commits] [translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
translation at torproject.org
translation at torproject.org
Fri Oct 4 01:16:05 UTC 2019
commit a037fcc9d8269f013dbd375ce9170921b1840350
Author: Translation commit bot <translation at torproject.org>
Date: Fri Oct 4 01:16:01 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
---
ar/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
az/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
be/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
bg/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
bn/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
bs/LC_MESSAGES/bridgedb.po | 138 ++++++++++++++++++++--------------------
ca/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
cs/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
da/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
de/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
el/LC_MESSAGES/bridgedb.po | 140 +++++++++++++++++++++--------------------
en_GB/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
eo/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
es/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
es_AR/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
es_MX/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
et/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
eu/LC_MESSAGES/bridgedb.po | 140 +++++++++++++++++++++--------------------
fa/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
fi/LC_MESSAGES/bridgedb.po | 140 +++++++++++++++++++++--------------------
fr/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
ga/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
gd/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
gl/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
gu/LC_MESSAGES/bridgedb.po | 140 +++++++++++++++++++++--------------------
he/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
hi/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
hr/LC_MESSAGES/bridgedb.po | 140 +++++++++++++++++++++--------------------
hu/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
hy/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
id/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
is/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
it/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
ja/LC_MESSAGES/bridgedb.po | 140 +++++++++++++++++++++--------------------
ka/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
kk/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
km/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
ko/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
lt/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
lv/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
mk/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
ml/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
mr/LC_MESSAGES/bridgedb.po | 140 +++++++++++++++++++++--------------------
ms_MY/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
nb/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
nl/LC_MESSAGES/bridgedb.po | 141 +++++++++++++++++++++--------------------
nl_BE/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
nn/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
pa/LC_MESSAGES/bridgedb.po | 138 ++++++++++++++++++++--------------------
pl/LC_MESSAGES/bridgedb.po | 140 +++++++++++++++++++++--------------------
pt_BR/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
pt_PT/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
ro/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
ru/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
sk/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
sl/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
sq/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
sr/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
sv/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
sw/LC_MESSAGES/bridgedb.po | 140 +++++++++++++++++++++--------------------
ta/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
templates/bridgedb.pot | 143 ++++++++++++++++++++++--------------------
th/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
tr/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
uk/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
ur/LC_MESSAGES/bridgedb.po | 138 ++++++++++++++++++++--------------------
uz/LC_MESSAGES/bridgedb.po | 138 ++++++++++++++++++++--------------------
vi/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
zh_CN/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
zh_HK/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
zh_TW/LC_MESSAGES/bridgedb.po | 142 +++++++++++++++++++++--------------------
71 files changed, 5167 insertions(+), 4881 deletions(-)
diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po
index b8d464f56..b5cae6095 100644
--- a/ar/LC_MESSAGES/bridgedb.po
+++ b/ar/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# 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
@@ -32,17 +31,36 @@ msgid ""
msgstr ""
"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-04 10:15+0000\n"
-"Last-Translator: shadows99 <nabils51 at gmail.com>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\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 1.3\n"
+"Generated-By: Babel 2.7.0\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"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -54,35 +72,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "عذراً! حدث خطأ في طلبك."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "ابلغ عن خطأ بالبرنامج"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "كود البرنامج"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "التغييرات"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "اتصل بنا"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "حدد الكل"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "أظهر رمز الاستجابة السريع (QRCode)"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "رمز الاستجابة السريع لخطوط الوصل"
@@ -90,58 +104,58 @@ msgstr "رمز الاستجابة السريع لخطوط الوصل"
#. "There was a problem!" in your language. For example,
#. for Italian, you might translate this into "Mama mia!",
#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "للأسف لم يتم العثور علي ما طلبت"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "يبدو أن هناك خطأ في الحصول على رمزك للإاستجابة السريع."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "لا يوجد أي bridges متاحة حاليا"
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "خطوة %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "حمل %s متصفح Tor %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "خطوة %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "احصل على %s bridges %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "خطوة %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "الآن %s أضف الـbridges إلى متصفح Tor %s"
@@ -150,27 +164,27 @@ msgstr "الآن %s أضف الـbridges إلى متصفح Tor %s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sف%sقط أعطني bridges!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "خيارات متقدمة"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "لا"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sن%sعم!"
@@ -178,7 +192,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sأ%sصل علي Bridges"
@@ -222,7 +236,7 @@ msgstr "مرحبا، %s "
msgid "Hello, friend!"
msgstr "مرحبا ,صديقي!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "مفاتيح عامة"
@@ -272,7 +286,7 @@ msgid ""
"\n"
msgstr "بالأضافة إلي ذلك، BridgeDB يحتوي علي bridges %s عادية بدون أي Pluggable Transports %s تستطيع ايضا المساعدة في التحايل على رقابة على الإنترنت في الكثير من الاحيان.\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "ما هي bridges؟"
@@ -290,8 +304,8 @@ msgstr "أحتاج إلى وسيلة بديلة للحصول على bridges!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "طريقة أخرى للحصول على جسور هي عبر إرسال بريد إلكتروني إلى %s. يرجى ملاحظة أنّه يجب ارسال البريد الإلكتروني عبر عنوان بريدي من إحدى مزودي خدمة البريد الالكتروني التاليين: %s أو %s أو %s."
+"%s or %s."
+msgstr "وكطريقة أخري للحصول علي bridges هو ان ترسل بريد الكتروني إلي %s. يرجى ملاحظة أنه يجب إرسال البريد الإلكتروني باستخدام عنوان من أحد مزودي خدمات البريد الإلكتروني التاليين: %s او %s."
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -300,54 +314,44 @@ msgstr "bridges لا تعمل! أنا بحاجة إلى مساعدة!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "في حال عدم عمل Tor, ارسل بريد الكتروني الى %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "حاول ان تتضمن رسالتك علي معلومات كثيرة عن مشكلتك، بما في ذلك قائمة الـbridges و Pluggable Transports الذي تحاول استخدامهم، ورقم نسخة Tor Browser وأي رسائل اظهرها Tor، إلخ."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "ها هي سطور الـBridges الخاصة بك:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "أحصل علي Bridges"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "من فضلك حدد الخيارات لنوع الـbridge"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "هل تحتاج عناوين IPv6؟"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "هل تحتاج إلي %s؟"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "متصفحك لا يعرض الصور بشكل صحيح"
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "أدخل الحروف أو الأرقام من الصورة أعلاه ..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "كيف تبدأ باستعمال الـbridges"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -356,21 +360,21 @@ msgid ""
msgstr "لتتمكن من إدخال جسور إلى المتصفح Tor، أذهب إلى %s صفحة تحميلات المتصفح Tor %s وأتبع التعليمات المذكورة فيها من اجل تحميل وبدء المتصفح Tor"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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
+#: bridgedb/strings.py:148
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
+#: bridgedb/strings.py:152
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"
@@ -378,28 +382,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "اختار 'نعم' ثم 'Next' ثم قم بلصق الـbridges الجديدة في المربع. ثم اختار 'اتصال' و اذا واجهتك مشكلة اضغط علي 'مساعدة' في نافذة اعداد Tor."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "أطلب bridges عادية."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "أطلب IPv6 bridges"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "أطلب Pluggable Transport بـ TYPE"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "احصل على نسخة من مفتاح GnuPG العام الخاص بـBridgeDB"
diff --git a/az/LC_MESSAGES/bridgedb.po b/az/LC_MESSAGES/bridgedb.po
index 08aa2088d..d96a0b741 100644
--- a/az/LC_MESSAGES/bridgedb.po
+++ b/az/LC_MESSAGES/bridgedb.po
@@ -1,26 +1,44 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# D, 2014-2015
# Emin Mastizada <emin at linux.com>, 2016
msgid ""
msgstr ""
"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-01-17 21:21+0000\n"
-"Last-Translator: Emin Mastizada <emin at linux.com>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: az\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -32,35 +50,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Üzr istəyirik! Tələbinlə bağlı nə isə səhv oldu."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Problemi Xəbər Ver"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Mənbə Kodu"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Hamısını Seç"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "QR Kodu Göstər"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Körpü sətirləriniz üçün QR Kod"
@@ -68,58 +82,58 @@ msgstr "Körpü sətirləriniz üçün QR Kod"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Vay dədəm!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "%s1-ci%s Addım"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "%s2-ci%s Addım"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "%s3-cü%s Addım"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/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"
@@ -128,27 +142,27 @@ msgstr "İndi %s körpüləri Tor Səyyahına əlavə et %s"
#. 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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Təkmilləşdirilmiş Seçimlər"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Xeyr"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sB%səli!"
@@ -156,7 +170,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sK%sörpü Əldə Et"
@@ -200,7 +214,7 @@ msgstr "Ey, %s!"
msgid "Hello, friend!"
msgstr "Salam, dost!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "İctimai Açarlar"
@@ -250,7 +264,7 @@ 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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Körpülər nədir?"
@@ -268,8 +282,8 @@ msgstr "Körpülərin əldə edilməsinin alternativ yollarını axtarıram!"
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ö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."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -278,54 +292,44 @@ msgstr "Körpülərim işlərmir! Köməyə ehtiyacım var!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: 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."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "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."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Sənin körpü sətirlərin:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Körpü Əldə Et!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Lütfən, körpü növləri üçün seçimləri müəyyənləşdir:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "IPv6 ünvanlara ehtiyacın var?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "%s ehtiyacın var?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Sənin brauzerin şəkilləri göstərə bilmir."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Yuxarıdakı şəkildən işarələri daxil et..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
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".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -334,21 +338,21 @@ msgid ""
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".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -356,28 +360,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ə."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Vanil körpü xahiş et."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "IPv6 körpü xahiş et."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
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".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "BridgeDB-nin ictimai GnuPG açarının üzünü əldə et."
diff --git a/be/LC_MESSAGES/bridgedb.po b/be/LC_MESSAGES/bridgedb.po
index c6f778174..74a1aff67 100644
--- a/be/LC_MESSAGES/bridgedb.po
+++ b/be/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Aleh Ladutska <lad-oleg at yandex.ru>, 2014
# Ulad L, 2018-2019
# Stanislaŭ Silkin <moonblr29 at gmail.com>, 2016
@@ -11,17 +10,36 @@ msgid ""
msgstr ""
"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-01-02 16:51+0000\n"
-"Last-Translator: Ulad L\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Belarusian (http://www.transifex.com/otf/torproject/language/be/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: be\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"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -33,35 +51,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Выбачайце! Штосьці пайшло не так падчас адпраўкі вашага запыта."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Паведамiць пра баг."
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Крынічны код"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "Гісторыя зменаў"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Сувязь"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Абраць Усё"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Паказаць QR-код"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR-код для вашых ліній мастоў"
@@ -69,58 +83,58 @@ msgstr "QR-код для вашых ліній мастоў"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Вой, божухна!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "Здаецца, адбылася памылка падчас атрымання Вашага QR-кода."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "На дадзены момант няма даступных мастоў."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Крок %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Спампуйце %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Крок %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Атрымаць %s масты %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Крок %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Цяпер %s дадайце масты ў Tor Browser %s"
@@ -129,27 +143,27 @@ msgstr "Цяпер %s дадайце масты ў Tor Browser %s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sП%sроста дайце мне гэтыя масты!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Дадатковыя Налады"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Не"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sТ%sак!"
@@ -157,7 +171,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sА%sтрымаць Масты"
@@ -201,7 +215,7 @@ msgstr "Прывітанне, %s!"
msgid "Hello, friend!"
msgstr "Вітаю, сябра!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Публічныя Ключы"
@@ -251,7 +265,7 @@ msgid ""
"\n"
msgstr "Таксама масты BridgeDB маюць мноства стандартных мастоў %s, якія не падтрымоўваюць перадачу дадзенных\nPluggable Transports %s. Гэта гучыць не вельмі добра, і можа паўплываць на тое, як адлюстроўваюцца сайты, аднак масты як і раней,\nдапамагаюць абыходзіць інтэрнэт-цэнзуру.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Што за масты?"
@@ -269,8 +283,8 @@ msgstr "Мне трэба атрымаць масты як-небудзь яшч
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Іншы спосаб атрымаць спіс мастоў – даслаць электронны ліст на адрас %s. Звярніце ўвагу, што вы мусіце\nдаслаць ліст толькі з аднаго с наступных e-mail сэвісаў:\n%s, %s or %s."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -279,54 +293,44 @@ msgstr "Мае масты не працуюць! Патрэбная дапамо
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Калі Ваш Tor не працуе, звярніцеся па e-mail адрасе %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "У паведамленні пастарайцеся даць як мага больш інфармацыі пра праблему, уключаючы імя маста і з'яднання, якое вы выкарыстоўвалі для перадачы дадзенных, а таксама версію браузэра Tor. "
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Вось вашыя лініі мастоў:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Атрымаць масты!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Калі ласка, абярыце налады для тыпу маста:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Ці патрэбны вам IPv6 адрасы?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Ці патрэбны вам %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Ваш браўзэр адлюстроўвае выявы некарэктна."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Увядзіце сімвалы з выявы..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Як пачаць карыстацца мастамі"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -335,21 +339,21 @@ msgid ""
msgstr "Каб дадаць новы мост у браўзэр Tor, трэба перайсці на старонку спампоўвання %s Tor Browser\n %s і трымацца інструкцый па ўсталёўцы\nбраўзэра Tor."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Ці блакуе ваш інтэрнэт-правайдэр злучэнне з сеткай Tor, альбо як-небудзь\nпа-іншаму цэнзуріруе яго?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -357,28 +361,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Абярыце \"Так\" а затым націсніце \"Далей\". Каб наладзіць масты скапіруйце і\nўстаўце радкі мастоў у тэкставае вакенца. Потым націсніце \"Злучыцца\"\nі можаце пачынаць карыстацца браўзэрам. Калі вы сутыкнуліся з праблемамі,\nпаспрабуйце націснуць \"Дапамога\" у вакенцы \"Сеткавыя налады Tor\" каб атрымаць падтрымку."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Даслаць запыт на стандартныя масты."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Запытаць масты IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Даслаць запыт на Pluggable Transport ад TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Атрымайце копію публічнага GnuPG-ключа BridgeDB."
diff --git a/bg/LC_MESSAGES/bridgedb.po b/bg/LC_MESSAGES/bridgedb.po
index 248a3a992..bae95a413 100644
--- a/bg/LC_MESSAGES/bridgedb.po
+++ b/bg/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# aramaic <aramaicbg at gmail.com>, 2015
# Kaloyan Nikolov <kotipuka01 at gmail.com>, 2016
# Maxi <kutia0001 at gmail.com>, 2015
@@ -12,17 +11,36 @@ msgid ""
msgstr ""
"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-01-15 12:20+0000\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: bg\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -34,35 +52,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Съжаляваме! Нещо се обърка с заявката ви."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Докладвай проблем"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Сорс код"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "Дневник на промените"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Контакт"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Избeри всичко"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Покажи QR Код"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR Код за вашите bridge линии"
@@ -70,58 +84,58 @@ msgstr "QR Код за вашите bridge линии"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Ооо, спагетки!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "Изглежда е имало грешка при получаване на вашия QR Код."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "В момента няма налични bridges ..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Стъпка %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Свали %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Стъпка %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Вземи %s bridges %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Стъпка %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Сега %sдобавете bridges към Tor Browser %s"
@@ -130,27 +144,27 @@ msgstr "Сега %sдобавете bridges към Tor Browser %s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sП%sросто ми дайте bridges!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Разширени възможности"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Не"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sД%sа!"
@@ -158,7 +172,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sВ%sземи Bridges"
@@ -202,7 +216,7 @@ msgstr "Хей, %s!"
msgid "Hello, friend!"
msgstr "Здравей, приятел!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Обществен ключ"
@@ -252,7 +266,7 @@ msgid ""
"\n"
msgstr "Допълнително, BridgeDB има много plain-ol'-vanilla bridges %s без никакви\nPluggable Transports %s които не изглеждат толкова добре, но все пак могат\nда помогнат за заобикаляне на интернет цензурата в много случаи.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Какво са bridges?"
@@ -270,8 +284,8 @@ msgstr "Имам нужда от алтернативен вариант за н
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Друг вариант за набавяне на bridges е пращане на е-поща до %s. Моля отбележете, че вие трябва да\nизпратите е-поща използвайки адрес на един от следните доставчици:\n%s, %s or %s."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -280,54 +294,44 @@ msgstr "Моите bridges не работят! Имам нужда от пом
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ако вашия Tor не работи, изпратете е-поща до %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "Опитайте се да включите колкото се може повече информация за вашия случай, включително списък на\nbridges и Pluggable Transports които сте използвали, вашата Tor Browser версия,\nи всяко съобщение с което Tor е отговорил, и т.н."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Тус са вашите bridge връзки:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Вземете Bridges!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Моля изберете опция за вид bridge:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Нуждаете ли се от IPv6 адреси?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Нуздаете ли се от %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Вашия браузер не показва правилно изображения."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Въведете символите от изображението от горе..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Как да започнете да използвате вашите bridges"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -336,21 +340,21 @@ msgid ""
msgstr "За въвеждане на bridges в Tor Browser, първо отидете на \n%s Tor Browser уеб страницата за сваляне %s и след това \nследвайте инструкциите там за сваляне и стартиране на \nTor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -358,28 +362,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Изберете 'Да' и след това кликнете 'Напред'. За да конфигурирате вашите нови bridges, копирайте и\nпоставете bridge редовете в прозореца за текстово въвеждане. На края натиснете 'Свържи се', и\nтрябва да сте готови! Ако срещате трудности, отидете на 'Помощ' бутона в 'Tor Network Settings' съветника за помощ."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Заяви стандартни bridges."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Заяви IPv6 bridges."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Заяви Pluggable Transport според TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Вземи копие на BridgeDB's обществен GnuPG ключ."
diff --git a/bn/LC_MESSAGES/bridgedb.po b/bn/LC_MESSAGES/bridgedb.po
index 1cdc0286f..6b9e403bb 100644
--- a/bn/LC_MESSAGES/bridgedb.po
+++ b/bn/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# code smite <codesmite at gmail.com>, 2018
# Humayun Rashid <reporterhr at gmail.com>, 2019
# Mahmud Numan <mahmudnuman at gmail.com>, 2016-2017
@@ -14,17 +13,36 @@ msgid ""
msgstr ""
"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-06-25 11:00+0000\n"
-"Last-Translator: Tasneem Khalil <tasneem.khalil at gmail.com>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Bengali (http://www.transifex.com/otf/torproject/language/bn/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: bn\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -36,35 +54,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "দুঃখিত! আপনার অনুরোধে কিছু ভুল হয়েছে।"
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "একটি ত্রুটি রিপোর্ট করুন"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "সোর্স কোড"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "পরিবর্তনের তালিকা"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "যোগাযোগ"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "সব নির্বাচন করুন"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "QR কোড দেখুন"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "আপনার ব্রিজ লাইন জন্য QR কোড"
@@ -72,58 +86,58 @@ msgstr "আপনার ব্রিজ লাইন জন্য QR কোড"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "ধূর! কোথায় যেনো ঝামেলা হচ্ছে"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "মনে হচ্ছে আপনার QR কোড পেতে কোথাও ঝামেলা হয়েছে"
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "বর্তমানে কোন সুংযুক্তি লাইন সহজলভ্য নেই..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "ধাপ %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "ডাউনলোড %s টর ব্রাউজার %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "ধাপ %s 2 %s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "গেট %s ব্রিজ %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "ধাপ %s 3 %s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "এখন %s টর ব্রাউজারে ব্রিজ যুক্ত করুন%s"
@@ -132,27 +146,27 @@ msgstr "এখন %s টর ব্রাউজারে ব্রিজ যু
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sJ %s আমাকে শুধু ব্রিজ দাও!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "উন্নত বিকল্প"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "না"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%s %s হ্যাঁ"
@@ -160,7 +174,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sG%s গেট ব্রিজ"
@@ -204,7 +218,7 @@ msgstr "আরে, %s!"
msgid "Hello, friend!"
msgstr "ওহে বন্ধু!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "পাবলিক কী"
@@ -254,7 +268,7 @@ msgid ""
"\n"
msgstr "উপরন্তু, ব্রিজডিবি এর মধ্যে প্রচুর প্লেইন-ভ্যালি-ভ্যানিলা ব্রিজ %s রয়েছে\nপ্ল্যাগেবল ট্রান্সপোর্ট %s যা হয়তো ঠান্ডা বলে মনে করে না, তবে তারা এখনও করতে পারে\nঅনেক ক্ষেত্রে ইন্টারনেট সেন্সরশিপকে বাধা দিতে সাহায্য\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "ব্রিজ কি ?"
@@ -272,8 +286,8 @@ msgstr "ব্রিজের ব্যবস্থা করার একটা
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "ব্রিজ পেতে আরেকটি উপায় হল %s থেকে একটি ইমেল পাঠানো। দয়া করে মনে রাখবেন যে আপনাকে অবশ্যই\nনিম্নোক্ত ইমেল প্রদানকারীদের মধ্যে একটি ঠিকানা ব্যবহার করে ইমেল পাঠাতে হবে: %s\n, %s বা %s।"
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -282,54 +296,44 @@ msgstr "আমার ব্রিজ কাজ করছে না! আমার
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "যদি আপনার Tor কাজ না করে, তবে আপনার ইমেইল করা উচিৎ %s।"
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "তালিকাটি সহ আপনার কেস হিসাবে যতটা তথ্য অন্তর্ভুক্ত করার চেষ্টা করুন,\nসেতু এবং প্ল্যাগেবল ট্রান্সফর্মগুলি আপনি ব্যবহার করার চেষ্টা করেছেন, আপনার টর ব্রাউজারের সংস্করণ,\nএবং টর দিয়েছেন এমন কোন বার্তা ইত্যাদি।"
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "এখানে আপনার ব্রিজগুলি:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "গেট ব্রিজ"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "ব্রিজ টাইপ এর জন্য বিকল্প নির্বাচন করুন:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "আপনার কি IPv6 ঠিকানা প্রয়োজন?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "আপনি কি একটি %s প্রয়োজন?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "আপনার ব্রাউজার সঠিকভাবে ইমেজ প্রদর্শন করা হয় না।"
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "উপরের চিত্র থেকে অক্ষর গুলি লিখুন ..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "কিভাবে ব্রিজ ব্যবহার শুরু করবেন"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -338,21 +342,21 @@ msgid ""
msgstr "টর ব্রাউজারে ব্রিজ প্রবেশ করতে, প্রথমে %s টর ব্রাউজার ডাউনলোড করুন\nপৃষ্ঠা %s এবং তারপর ডাউনলোড এবং শুরু করার জন্য সেখানে নির্দেশাবলী অনুসরণ করুন\nটর ব্রাউজার"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "যখন 'টর নেটওয়ার্ক সেটিংস' সংলাপ পপ আপ, 'কনফিগার' ক্লিক করুন এবং অনুসরণ করুন\nউইজার্ড যতক্ষণ না জিজ্ঞাসা করে:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "আপনার ইন্টারনেট সার্ভিস প্রোভাইডার (আইএসপি) ব্লক বা অন্যথায় সংযোগ সেন্সর করে না\nটর নেটওয়ার্ক থেকে?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -360,28 +364,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "'হ্যাঁ' নির্বাচন করুন এবং তারপর 'পরবর্তী' ক্লিক করুন আপনার নতুন সেতু কনফিগার করতে, কপি এবং\nটেক্সট ইনপুট বাক্সে সেতু লাইন আটকান। অবশেষে, 'সংযুক্ত' ক্লিক করুন, এবং\nআপনি যেতে ভাল হতে হবে! যদি আপনি সমস্যায় পড়েন তবে 'সহায়তা' ক্লিক করার চেষ্টা করুন\nআরও সহায়তা জন্য 'টর নেটওয়ার্ক সেটিংস' উইজার্ড মধ্যে বাটন"
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "ভ্যানিলা ব্রীজসমূহের অনুরোধ করুন"
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "IPv6 ব্রিজের অনুরোধ করুন"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
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
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "BridgeDB এর সার্বজনীন GnuPG কী-্এর একটি অনুলিপি পান।"
diff --git a/bs/LC_MESSAGES/bridgedb.po b/bs/LC_MESSAGES/bridgedb.po
index 34fda4286..678c09a79 100644
--- a/bs/LC_MESSAGES/bridgedb.po
+++ b/bs/LC_MESSAGES/bridgedb.po
@@ -1,25 +1,43 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Amar Memisevic <factoryamar at gmail.com>, 2019
msgid ""
msgstr ""
"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-09-05 21:29+0000\n"
-"Last-Translator: Amar Memisevic <factoryamar at gmail.com>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Bosnian (http://www.transifex.com/otf/torproject/language/bs/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: bs\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"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -31,35 +49,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Izvini! Nešto je pošlo po zlu sa vašim zahtevom."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Prijavi grešku"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Izvorni kod"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "Promjene"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Označi sve"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Prikaži QR kod"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR kod za vašu briđ liniju"
@@ -67,58 +81,58 @@ msgstr "QR kod za vašu briđ liniju"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Uh oh, špagete!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "Čini se da je došlo do pogreške prilikom dostavljanja vašeg QRCode."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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 QRCode sadrži linije briđa. Skenirajte ga QRCode čitačem kako biste kopirali svoje briđeve linije na mobilne i druge uređaje."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "Trenutno nema dostupnih briđeva ..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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 biste trebali pokušati %s vratiti se %s i odabrati drugu vrstu mosta!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Korak %s 1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Preuzmi %s Tor Pretraživač %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Korak %s2%s "
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Uzmi %s briđ %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Korak %s3%s "
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Sada %s dodajte briđeve Tor pretraživaču %s"
@@ -127,27 +141,27 @@ msgstr "Sada %s dodajte briđeve Tor pretraživaču %s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sS%samo mi daj briđeve!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Napredne Opcije"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Ne"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sDa%s!"
@@ -155,7 +169,7 @@ msgstr "%sDa%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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sU%szmi Briđeve"
@@ -199,7 +213,7 @@ msgstr "Hej, %s!"
msgid "Hello, friend!"
msgstr "Zdravo, prijatelju!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Javni Ključevi"
@@ -249,7 +263,7 @@ msgid ""
"\n"
msgstr ""
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr ""
@@ -267,7 +281,7 @@ msgstr ""
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
+"%s or %s."
msgstr ""
#: bridgedb/strings.py:115
@@ -277,54 +291,44 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
msgstr ""
-#. 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 ""
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr ""
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr ""
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr ""
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr ""
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -333,21 +337,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -355,28 +359,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr ""
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
diff --git a/ca/LC_MESSAGES/bridgedb.po b/ca/LC_MESSAGES/bridgedb.po
index e7c74f758..251f9568f 100644
--- a/ca/LC_MESSAGES/bridgedb.po
+++ b/ca/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Albert <provisionalib at hotmail.com>, 2013
# Assumpta <assumptaanglada at gmail.com>, 2014
# Eloi García i Fargas, 2014
@@ -15,17 +14,36 @@ msgid ""
msgstr ""
"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-04-12 18:54+0000\n"
-"Last-Translator: IDRASSI Mounir <mounir.idrassi at idrix.fr>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -37,35 +55,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Quelcom ha anat malament amb la petició."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Comunica un error"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Codi font"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Selecciona-ho tot"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Mostra el codi QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Codi QR per les línies de ponts"
@@ -73,58 +87,58 @@ msgstr "Codi QR per les línies de ponts"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Vatua l'olla!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Pas %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Pas %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Descarrega %s ponts %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Pas %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/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"
@@ -133,27 +147,27 @@ msgstr "Ara %s adjunta els ponts al Tor Browser %s"
#. 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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Opcions Avançades"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "No"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sS%sí!"
@@ -161,7 +175,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sD%sescarrega Bridges"
@@ -205,7 +219,7 @@ msgstr "Hola, %s!"
msgid "Hello, friend!"
msgstr "Hola, amic!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Claus Públiques"
@@ -255,7 +269,7 @@ 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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Què són els ponts?"
@@ -273,8 +287,8 @@ msgstr "Em cal una manera alternativa d'obtenir ponts."
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %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."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -283,54 +297,44 @@ msgstr "No em funcionen els ponts! Ajuda!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Si Tor no us funciona, envieu un correu a %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "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."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Les vostres línies de ponts:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Descarregueu ponts!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Seleccioneu les opcions pel tipus de pont:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Necessiteu adreces IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Necessiteu un %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "El navegador no està mostrant les imatges correctament."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Introduïu els caràcters de la imatge superior..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Com començar a utilitzar els ponts"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -339,21 +343,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".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -361,28 +365,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."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Demanar ponts estàndard."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Demanar ponts IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
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".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Descarregar una còpia de la clau pública GnuPG del BridgeDB."
diff --git a/cs/LC_MESSAGES/bridgedb.po b/cs/LC_MESSAGES/bridgedb.po
index 544a6da70..9c661eb4a 100644
--- a/cs/LC_MESSAGES/bridgedb.po
+++ b/cs/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# A5h8d0wf0x <littleslyfoxie28 at gmail.com>, 2014
# Adam Slovacek <adamslovacek at gmail.com>, 2013
# Elisa <valhalla at gishpuppy.com>, 2011
@@ -19,17 +18,36 @@ msgid ""
msgstr ""
"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-25 18:02+0000\n"
-"Last-Translator: Michal Stanke <mstanke at mozilla.cz>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: cs\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"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -41,35 +59,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Promiňte. Váš požadavek se nepodařilo provést."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Nahlásit chybu"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Zdrojový kód"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Označit vše"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Zobrazit QR kód"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR kód pro vaše linky k mostům"
@@ -77,58 +91,58 @@ msgstr "QR kód pro vaše linky k mostům"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Ježíšku na křížku!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Krok %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Krok %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Získat %s mosty %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Krok %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/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"
@@ -137,27 +151,27 @@ msgstr "Nyní %s přidejte mosty do prohlížeče Tor %s"
#. 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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Rozšířená nastavení"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Ne"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sA%sno!"
@@ -165,7 +179,7 @@ msgstr "%sA%sno!"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sN%sastavit mosty"
@@ -209,7 +223,7 @@ msgstr "Hey, %s!"
msgid "Hello, friend!"
msgstr "Ahoj, příteli!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Veřejné klíče"
@@ -259,7 +273,7 @@ msgid ""
"\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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Co jsou to mosty?"
@@ -277,8 +291,8 @@ msgstr "Potřebuji jiný způsob jak získat most!"
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 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."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -287,54 +301,44 @@ msgstr "Mé mosty nefungují. Potřebuji pomoc!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Pokud vám Tor nefunguje, pošlete nám e-mail na %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "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."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Zde jsou vaše linky k mostům: "
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Získat mosty!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Vyberte úrosím nastavení pro typ mostu:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Potřebujete IPv6 adresu?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Potřebujete %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Váš prohlížeč nezobrazuje správně obrázky."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Zadejte písmena z obrázku výše..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Jak začít používat mosty."
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -343,21 +347,21 @@ msgid ""
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".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
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".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Blokuje nebo jinak cenzuruje váš poskytovatel internetového připojení (ISP) spojení se sítí Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -365,28 +369,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
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'."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Požádat o obyčejné mosty."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Požádat o IPv6 mosty."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Požádat o Pluggable Transport s TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Získat kopii veřejného GnuPG klíče BridgeDB."
diff --git a/da/LC_MESSAGES/bridgedb.po b/da/LC_MESSAGES/bridgedb.po
index 403498ecc..249a3d0e7 100644
--- a/da/LC_MESSAGES/bridgedb.po
+++ b/da/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Christian Villum <villum at autofunk.dk>, 2014-2015
# David Nielsen <gnomeuser at gmail.com>, 2014
# Mogelbjerg <jan at mogelbjerg.dk>, 2015
@@ -16,17 +15,36 @@ msgid ""
msgstr ""
"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-06-21 06:01+0000\n"
-"Last-Translator: scootergrisen\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -38,35 +56,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Beklager. Noget gik galt med din anmodning."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Rapportér en fejl"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Kildekode"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Marker alle"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Vis QRCode"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QRCode for dine brolinjer"
@@ -74,58 +88,58 @@ msgstr "QRCode for dine brolinjer"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Ups, vi står i lort til halsen!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Trin %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Trin %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Få %s broer %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Trin %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/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"
@@ -134,27 +148,27 @@ msgstr "%s Tilføj broer til Tor Browser %s"
#. 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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Avancerede indstillinger"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Nej"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sJ%sa!"
@@ -162,7 +176,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sH%sent broer"
@@ -206,7 +220,7 @@ msgstr "Hej %s!"
msgid "Hello, friend!"
msgstr "Hej min ven!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Offentlige nøgler"
@@ -256,7 +270,7 @@ msgid ""
"\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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Hvad er broer?"
@@ -274,8 +288,8 @@ msgstr "Jeg har brug for en alternativ metode til at få broer på!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %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."
+"%s or %s."
+msgstr "En anden måde at finde broer er at sende en email til %s. Bemærk venligst at du skal\nsende emailen fra en konto hos en af de følgende email udbydere:\n%s eller %s."
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -284,54 +298,44 @@ msgstr "Mine broer virker ikke! Jeg har brug for hjælp!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: 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 e-mail til %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "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."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Her er dine bro linjer:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Find broer!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Vælg venligst valgmuligheder for brotypen:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Har du brug for IPv6 adresser?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Har du brug for en %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Din browser kan ikke vise billeder ordentligt."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Indtast tegnene fra billedet ovenfor..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Sådan starter du med at bruge dine broer"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -340,21 +344,21 @@ msgid ""
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".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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\"-dialogen popper op, så klik på \"Konfigurer\" og følg guiden til den siger:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Blokerer eller på anden vis censurerer din internetudbyder forbindelser\ntil Tor-netværket?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -362,28 +366,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Vælg \"Ja\" og klik så på \"Næste\". For at konfigurere dine nye broer, 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."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Anmod almindelige broer."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Anmod IPv6-broer."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Anmod om udskiftelig transport efter TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Hent en kopi af BridgeDB's offentlige GnuPG nøgle."
diff --git a/de/LC_MESSAGES/bridgedb.po b/de/LC_MESSAGES/bridgedb.po
index a5d5a41da..fa04d355f 100644
--- a/de/LC_MESSAGES/bridgedb.po
+++ b/de/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Christian Kaindl <crisscross.kaindl at outlook.de>, 2015
# trantor <clucko3 at gmail.com>, 2014
# Ettore Atalan <atalanttore at googlemail.com>, 2014
@@ -24,17 +23,36 @@ msgid ""
msgstr ""
"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-06-11 23:31+0000\n"
-"Last-Translator: Roland Illig <roland.illig at gmx.de>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -46,35 +64,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Wir bitten um Entschuldigung. Bei Ihrer Anfrage lief etwas schief."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Einen Fehler melden"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Quellcode"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Alles auswählen"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "QRCode anzeigen"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QRCode für Ihre Brückenverbindungen"
@@ -82,58 +96,58 @@ msgstr "QRCode für Ihre Brückenverbindungen"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Oh, es ist etwas schief gegangen!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Schritt %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Schritt %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "%s Brücken %s erhalten"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Schritt %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/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"
@@ -142,27 +156,27 @@ msgstr "Jetzt %s bitte die Brücken zum Tor-Browser hinzufügen %s"
#. 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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Erweiterte Optionen"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Nein"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sJ%sa!"
@@ -170,7 +184,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sB%srücken erhalten"
@@ -214,7 +228,7 @@ msgstr "Hallo, %s!"
msgid "Hello, friend!"
msgstr "Hallo Freund!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Öffentliche Schlüssel"
@@ -264,7 +278,7 @@ 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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Was sind Brücken?"
@@ -282,8 +296,8 @@ msgstr "Ich brauche einen anderen Weg, um Adressen von Brücken-Servern zu erhal
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 "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."
+"%s or %s."
+msgstr "Eine weitere Möglichkeit, um Brücken zu erhalten, ist eine E-Mail an %s zu senden. \nBitte beachte Sie, dass Sie die E-Mail von einem der folgenden E-Mail-Anbieter versenden: \n%s oder %s."
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -292,54 +306,44 @@ msgstr "Meine Brücken-Server funktionieren nicht! Ich brauche Hilfe!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: 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."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "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."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Hier sind Ihre Brückenadressen:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Erhalten Sie Adressen von Brücken-Servern!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Bitte wählen Sie die Optionen für den Brückentyp aus:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Benötigen Sie IPv6-Adressen?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Benötigen Sie eine %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Bilder werden in Ihrem Browser nicht korrekt dargestellt."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Bitte geben Sie die Zeichen aus dem oberen Bild ein."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "So starten Sie die Benutzung Ihrer Brücken"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -348,21 +352,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".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -370,28 +374,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."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Standard-Brücken anfordern."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "IPv6-Brücken anfordern."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Einen Pluggable Transport des TYPEs anfordern."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Eine Kopie des öffentlichen GnuPG-Schlüssels der Brückendatenbank erhalten."
diff --git a/el/LC_MESSAGES/bridgedb.po b/el/LC_MESSAGES/bridgedb.po
index d86fda92a..9f061af68 100644
--- a/el/LC_MESSAGES/bridgedb.po
+++ b/el/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Adrian Pappas <pappasadrian at gmail.com>, 2014
# Aikaterini Katmada, 2015
# andromeas <andromeas at hotmail.com>, 2014
@@ -23,17 +22,36 @@ msgid ""
msgstr ""
"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-01-15 12:20+0000\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -45,35 +63,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Συγνώμη! Κάτι πήγε στραβά με το αίτημά σας."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Αναφορά Προβλήματος"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Πηγαίος Κώδικας"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "Αρχείο καταγραφής αλλαγών"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Επαφή"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Επιλογή όλων"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Εμφάνιση QRCode"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QRCode για τις γέφυρές σας"
@@ -81,58 +95,58 @@ msgstr "QRCode για τις γέφυρές σας"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Ουπς, κάτι πήγε στραβά!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "Από ό,τι φαίνεται, υπήρξε ένα πρόβλημα κατά την ανάκτηση του QRCode σας. "
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "Δεν υπάρχουν διαθέσιμες γέφυρες..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Βήμα %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Κατεβάστε τον %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Βήμα %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Αποκτήστε τις %s γέφυρες%s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Βήμα %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Τώρα %s προσθέστε τις γέφυρες στον Tor Browser %s"
@@ -141,27 +155,27 @@ msgstr "Τώρα %s προσθέστε τις γέφυρες στον Tor Browse
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sΑ%sπλώς δώσε μου γέφυρες!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Επιλογές για προχωρημένους"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Όχι"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sΝ%sαι!"
@@ -169,7 +183,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sΛ%sήψη Γεφυρών"
@@ -213,7 +227,7 @@ msgstr "Γειά σας, %s!"
msgid "Hello, friend!"
msgstr "Γεια σου, φίλε!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Δημόσια Κλειδιά"
@@ -263,7 +277,7 @@ msgid ""
"\n"
msgstr "Επίσης, η BridgeDB έχει πολλές παλιές καλές γέφυρες %s χωρίς\nPluggable Transports %s που ίσως δεν ακούγεται καταπληκτικό, αλλά σε πολλές περιπτώσεις μπορούν να σας βοηθήσουν να παρακάμψετε τη λογοκρισία.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Τι είναι οι γέφυρες;"
@@ -281,8 +295,8 @@ msgstr "Χρειάζομαι έναν εναλλακτικό τρόπο για
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Εναλλακτικά μπορείτε να λάβετε γέφυρες στελνοντας email στο %s. Πρέπει να στείλετε email χρησιμοποιώντας μία διευθυνση email από έναν από τους παρακάτω πάροχους:\n%s, %s or %s."
+"%s or %s."
+msgstr "Εναλλακτικά, για να μάθετε γέφυρες, στείλτε email στο %s. Σημείωση: Το email πρέπει να σταλεί χρησιμοποιώντας έναν από τους παρακάτω παρόχους:\n%s ή %s."
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -291,54 +305,44 @@ msgstr "Οι γέφυρες μου δεν λειτουργούν! Χρειάζο
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Αν το Tor σας δε δουλεύει, παρακαλώ στείλτε email στο %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "Παρακαλώ δώστε μας όσο το δυνατόν περισσότερες πληροφορίες για το \nσφάλμα που συναντήσατε, όπως τη λίστα γεφυρών και τα Pluggable Transports \nπου προσπαθήσατε να χρησιμοποιήσετε, την έκδοση του Tor Browser, \nό,τι μηνύματα έδειξε το Tor, κτλ."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Ορίστε, οι γραμμές για τις γέφυρές σας:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Λήψη Γεφυρών!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Παρακαλώ επιλέξτε τις επιλογές για τον τύπο της γέφυρας:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Χρειάζεστε μια διεύθυνση IPv6;"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Μήπως χρειάζεστε ένα %s;"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Ο browser σας δεν εμφανίζει τις εικόνες σωστά."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Εισάγετε τους χαρακτήρες από την παραπάνω φωτογραφία..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Πώς να αρχίσετε να χρησιμοποιείτε τις γέφυρες σας"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -347,21 +351,21 @@ msgid ""
msgstr "Για να εισάγετε bridges στο Tor Browser, αρχικά επιλέξτε %s Tor Browser σελίδα\nκατεβάσματος%s έπειτα ακολουθήστε τις οδηγίες για κατέβασμα και εκκίνηση του \nTor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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
+#: bridgedb/strings.py:148
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -369,28 +373,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Επιλέξτε \"Ναι\" και μετά πατήστε \"Επόμενο\". Για να ρυθμίσετε τα νέα σας \nbridges, αντιγράψτε τις γραμμές με τις διευθύνσεις των bridges στο κουτί \nκειμένου. Μετά πατήστε \"Σύνδεση\" και πρέπει να είστε εντάξει! Αν \nαντιμετωπίσετε προβλήματα, επιλέξτε το κουμπί \"Βοήθεια\" στις \"Ρυθμίσεις \nδικτύου του Tor\"."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Αίτηση παλιών καλών bridges."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Αίτηση IPv6 γεφυρών."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Ζητήστε ένα Pluggable Transport βάσει TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Λάβετε ένα αντίγραφο του δημοσίου GnuPG κλειδιού του BridgeDB."
diff --git a/en_GB/LC_MESSAGES/bridgedb.po b/en_GB/LC_MESSAGES/bridgedb.po
index 99ad27094..50395fe70 100644
--- a/en_GB/LC_MESSAGES/bridgedb.po
+++ b/en_GB/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Andi Chandler <andi at gowling.com>, 2014-2015
# Richard Shaylor <rshaylor at me.com>, 2014
# ronnietse <tseronnie at ymail.com>, 2014
@@ -11,17 +10,36 @@ msgid ""
msgstr ""
"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: 2017-09-19 23:30+0000\n"
-"Last-Translator: Andi Chandler <andi at gowling.com>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -33,35 +51,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Sorry! Something went wrong with your request."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Report a Bug"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Source Code"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Select All"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Show QRCode"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QRCode for your bridge lines"
@@ -69,58 +83,58 @@ msgstr "QRCode for your bridge lines"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Uh oh, spaghettios!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Step %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Step %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Get %s bridges %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Step %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/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"
@@ -129,27 +143,27 @@ msgstr "Now %s add the bridges to Tor Browser %s"
#. 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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Advanced Options"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "No"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sY%ses!"
@@ -157,7 +171,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sG%set Bridges"
@@ -201,7 +215,7 @@ msgstr "Hey, %s!"
msgid "Hello, friend!"
msgstr "Hello, friend!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Public Keys"
@@ -251,7 +265,7 @@ 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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "What are bridges?"
@@ -269,8 +283,8 @@ msgstr "I need an alternative way of getting bridges!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %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."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -279,54 +293,44 @@ 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 "If your Tor doesn't work, you should email %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "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 "Here are your bridge lines:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Get Bridges!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Please select options for bridge type:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Do you need IPv6 addresses?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Do you need a %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Your browser is not displaying images properly."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Enter the characters from the image above..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "How to start using your bridges"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -335,21 +339,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".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -357,28 +361,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."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Request vanilla bridges."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Request IPv6 bridges."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
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".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Get a copy of BridgeDB's public GnuPG key."
diff --git a/eo/LC_MESSAGES/bridgedb.po b/eo/LC_MESSAGES/bridgedb.po
index e995146b8..89b8816d4 100644
--- a/eo/LC_MESSAGES/bridgedb.po
+++ b/eo/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# identity, 2012
# Mara Monstro <errydayanarchy at riseup.net>, 2018
# Rico Chan <rico at tutanota.de>, 2014
@@ -13,17 +12,36 @@ msgid ""
msgstr ""
"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-07-11 23:22+0000\n"
-"Last-Translator: 6c9ad24fb5ff3a00859fb84514d79173\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Esperanto (http://www.transifex.com/otf/torproject/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -35,35 +53,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Pardonu! Io ne funkcias pri via peto."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "raporti cimo"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "fontkodo"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "ŝanĝoprotokolo"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "kontakto"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "elekti ĉion"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Montri QR-kodon"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR Kodo por viaj ponto linioj"
@@ -71,58 +85,58 @@ msgstr "QR Kodo por viaj ponto linioj"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "ho ve, ho ve!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "Ŝajnas, ke estis eraro ricevante vian QR-kodon."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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 "Ĉi tiu QR-kodo enhavas viajn ponto liniojn. Skanu ĝin per QR-leganto por kopii viajn ponto liniojn sur poŝtelefonojn kaj aliajn aparatojn."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "Nuntempe ne ekzistas retpontojn."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "Vi eble davas provi %s reiri %s kaj selekti alian retpontospeco."
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "paŝo %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "elŝuti %s Tor-retumilo %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "paŝo %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "ekhavi %s retpotojn %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "paŝo %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Nun %s aldonu la retpontojn al la Tor-retumilo %s"
@@ -131,27 +145,27 @@ msgstr "Nun %s aldonu la retpontojn al la Tor-retumilo %s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sT%suj donu retpontojn al mi!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "detalaj opcioj"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Ne"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
msgid "none"
msgstr "neniom/neniu"
#. 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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sJ%ses!"
@@ -159,7 +173,7 @@ msgstr "%sJ%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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sE%skhavi Bridges"
@@ -203,7 +217,7 @@ msgstr "Saluton, %s!"
msgid "Hello, friend!"
msgstr "Saluton, amiko!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "publikaj ŝlosiloj"
@@ -253,7 +267,7 @@ msgid ""
"\n"
msgstr "Krome BridgeDB havas abundon da regulaj retpontoj %s sen iuj\nPluggable Transports %s, kiuj eble ne estas mojosa, tamen ofte povas helpi eviti\nreta cenzuro.\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Kio estas retpontoj?"
@@ -271,8 +285,8 @@ msgstr "Mi bezonas alternativon ekhavi retpontojn!"
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 "Sendu retletero al %s por ekhavi retpontojn alternative. Bonvolu konstati ke vi\nbezonas sendi retleteron per adreso de la sekvonta retpoŝta provizanto:\n%s, %s aŭ %s."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -281,54 +295,44 @@ msgstr "Miaj retpontoj ne funkcias! Mi bezonas helpon!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Se Tor ne funkcias, kontaktigu %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "Provu klarigi vian kazon tre detale kaj aldonu liston da retpontoj kaj Pluggable Transports\nkiujn vi provis uzi. Krome aldonu vian Tor Browser-version kaj ĉiujn mesaĝojn, kiujn Tor\neligis."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Jen viaj retpontoj:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Ekhavu retpontojn!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Bonvolu selekti opciojn pri retpontospeco."
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Ĉu vi bezonas IPv6-adresojn?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Ĉu vi bezonas %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Via retumilo vidigas bildojn ne dece."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Enigu la literoj en la bildo ĉi-supre."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Kiel komenci uzi viajn retpontojn."
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -337,21 +341,21 @@ msgid ""
msgstr "Por enigi retpontojn en Tor Browser, unue iru al la %s elŝuta paĝo de Tor Browser %s kaj poste sekvu la instruojn tie por elŝuti kaj startigi Tor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Kiam la Tor retagordaj dialogujo elklapas, alklaku 'agordi/konfiguri' kaj sekvu\nla asistanto ĝis ĝi demandas: "
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Ĉu via provizanto de retservoj (angle: ISP) blokas aŭ alimaniere cenzuras konektojn al la Tor-reto?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -359,28 +363,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Selektu 'Jes' kaj alklaku 'sekva'. Por konfiguri viajn novajn retpontojn, kopiu kaj alglui\nla retpontolineojn al la dialogujo. Finfine alklaku 'konektiĝi'.\nSe vi havas problemojn, provi alklaki la 'helpo'-butonon en la Tor-retagordasistanto\npor pli da asistado."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
msgid "Displays this message."
msgstr "Vidigi ĉi tiun mesaĝon."
#. 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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Peti regulajn retpontojn (nepermutebla transporta retpontoj / non-Pluggable Transport bridges)."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Peti IPv6-retpontojn."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Peti permutebla transporto de TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Ekhavi kopio de publika GnuPG-ŝlosilo de BridgeDB."
diff --git a/es/LC_MESSAGES/bridgedb.po b/es/LC_MESSAGES/bridgedb.po
index 754becfdc..b72cee53d 100644
--- a/es/LC_MESSAGES/bridgedb.po
+++ b/es/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# dark_yoshi <angelargi at yahoo.es>, 2014
# toypurina <biolenta at riseup.net>, 2014
# B. K., 2016
@@ -25,17 +24,36 @@ msgid ""
msgstr ""
"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-10 11:12+0000\n"
-"Last-Translator: Emma Peel\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -47,35 +65,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "¡Lo sentimos! Algo ha fallado al procesar tu solicitud."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Informar sobre un error"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Código fuente"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Seleccionar todos"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Mostrar código QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Código QR para tus líneas de puentes"
@@ -83,58 +97,58 @@ msgstr "Código QR para tus líneas de puentes"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Oh oh, ¡la liamos! "
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Paso %s1%s "
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Paso %s2%s "
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Consigue %s puentes %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Paso %s3%s "
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/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"
@@ -143,27 +157,27 @@ msgstr "Ahora %s añade los puentes al Tor Browser %s"
#. 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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Opciones avanzadas"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "No"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "¡%sS%sí!"
@@ -171,7 +185,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sC%sonseguir Puentes"
@@ -215,7 +229,7 @@ msgstr "¡Eh, %s!"
msgid "Hello, friend!"
msgstr "¡Hola amigo!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Claves públicas"
@@ -265,7 +279,7 @@ msgid ""
"\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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "¿Qué son los puentes?"
@@ -283,8 +297,8 @@ msgstr "¡Necesito un modo alternativo de obtención de puentes de red!"
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 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."
+"%s or %s."
+msgstr "Otra forma de obtener bridges es enviar un correo a %s. Por favor observe que debe\nenviar el correo electrónico usando una dirección de uno de los siguientes proveedores\nde correo electrónico:\n%s o %s"
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -293,54 +307,44 @@ msgstr "¡Mis puentes funcionan! ¡Necesito ayuda!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Si Tor no funciona, debes enviar un correo a %s"
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "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."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Estas son tus líneas de puente de red:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "¡Obtener puentes!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Por favor, selecciona opciones para el tipo de puente:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "¿Necesitas direcciones IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "¿Necesitas un %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Tu navegador no está mostrando las imágenes correctamente."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Introduce los caracteres de la imagen de arriba..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Cómo comenzar a usar los puentes"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -349,21 +353,21 @@ msgid ""
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".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
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".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "¿Tu proveedor de Internet (ISP) bloquea o censura de alguna manera las conexiones a la red Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -371,28 +375,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
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."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Solicitar puentes estándar."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Solicitar puente de red IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Solicitar un Pluggable Transport por TYPE ."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Obtener una copia de la clave pública GnuPG de BridgeDB."
diff --git a/es_AR/LC_MESSAGES/bridgedb.po b/es_AR/LC_MESSAGES/bridgedb.po
index d5bd8da48..075672da5 100644
--- a/es_AR/LC_MESSAGES/bridgedb.po
+++ b/es_AR/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# cametiope <aldohcasa at hotmail.com>, 2014
# Alfredo Chaves <achaves.blg at gmail.com>, 2015
# angelica14 <angmarmt13 at gmail.com>, 2014
@@ -16,17 +15,36 @@ msgid ""
msgstr ""
"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-07 15:16+0000\n"
-"Last-Translator: Zuhualime Akoochimoya\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/torproject/language/es_AR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: es_AR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -38,35 +56,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "¡Lo sentimos! Algo salió mal con tu solicitud."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Reportar un error"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Código fuente"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "Bitácora de cambios"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contacto"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Seleccionar Todos"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Mostrar Código QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Código QR para tus líneas de bridge"
@@ -74,58 +88,58 @@ msgstr "Código QR para tus líneas de bridge"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "¡Oh, sonamos!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "Ha ocurrido un error al obtener tu código QR."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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 tus líneas de bridge. Escanealo con un lector de códigos QR para copiarlas en tus dispositivos móviles y otros."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "En este momento no existen bridges disponibles..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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 %s volver %s y escoger otro tipo de bridge!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Paso %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Descargar el %s Navegador Tor %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Paso %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Obtener %s bridges %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Paso %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Ahora %s agregá los puentes al Navegador Tor %s"
@@ -134,27 +148,27 @@ msgstr "Ahora %s agregá los puentes al Navegador Tor %s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "¡%sS%solamente dáme bridges!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Opciones avanzadas"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "No"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "¡%sS%sí!"
@@ -162,7 +176,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sO%sbtener bridges"
@@ -206,7 +220,7 @@ msgstr "¡Eh, %s!"
msgid "Hello, friend!"
msgstr "¡Hola amigo!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Claves públicas"
@@ -256,7 +270,7 @@ msgid ""
"\n"
msgstr "Adicionalmente, BridgeDB tiene varios bridges ordinarios como papel de cuete, %s sin ningún\nPluggable Transports %s, que tal vez no suenen tan genial, pero aún pueden\nayudar a burlar la censura de internet en muchos casos.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "¿Qué son los bridges?"
@@ -274,8 +288,8 @@ msgstr "¡Necesito una manera alternativa de obtener bridges!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Otra manera de obtener bridges es enviando un correo electrónico a %s. Por favor notá que debés enviar el correo electrónico usando una dirección de uno de los siguientes proveedores:\n%s, %s o %s."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -284,54 +298,44 @@ msgstr "¡Mis bridges no funcionan! ¡Necesito ayuda!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Si Tor no funciona, deberías enviar un correo electrónico a %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "Intentá incluir toda la información posible sobre tu caso, incluyendo la lista de\npuentes y Pluggable Transports que intentaste usar, la versión de tu Navegador Tor,\ny cualquier mensaje que Tor haya presentado, etc."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Aquí están tus líneas de bridges:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "¡Obtené Bridges!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Por favor seleccioná opciones para tipo de bridge:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "¿Necesitás direcciones IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "¿Necesitás una %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Tu navegador no muestra las imágenes correctamente."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Ingresá los caracteres de la imagen..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Cómo comenzar a usar tus bridges"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -340,21 +344,21 @@ msgid ""
msgstr "Para introducir puentes en tu Navegador Tor, primero andá hasta la %s página de descarga\ndel Navegador Tor %s y desde ahí seguí las instrucciones para descargar y ejecutar el Navegador Tor."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Cuando el diálogo 'Configuración de Red de Tor' aparezca, cliqueá 'Configurar' y continuá con\nel asistente hasta que pregunte:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "¿Su Proveedor de Servicios de Internet (ISP) bloquea o de algún modo censura conexiones\na la red de Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -362,28 +366,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Seleccioná 'Sí' y luego cliqueá 'Siguiente'. Para configurar tus nuevos bridges, copiá y\npegá las líneas de bridges en el cuadro de texto. Finalmente, cliqueá 'Conectar' y,\n¡eso debería de ser todo! Si experimentás algún problema, intentá cliquear el botón 'Ayuda'\ndel asistente de 'Configuración de la Red de Tor' para recibir más asistencia."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
msgid "Displays this message."
msgstr "Mostrar éste 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.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Pedir bridges ordinarios."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Pedir bridges IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Pedir un Pluggable Transport por TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Obtener una copia de la clave pública GnuPG de BridgeDB."
diff --git a/es_MX/LC_MESSAGES/bridgedb.po b/es_MX/LC_MESSAGES/bridgedb.po
index 65b188d05..b6dc414ba 100644
--- a/es_MX/LC_MESSAGES/bridgedb.po
+++ b/es_MX/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Bernard Rodriguez <hey.bernard at gmail.com>, 2016
# manuelglz <cglzmtzg at gmail.com>, 2014
# Javier Flores Topete <javierflorestopete789 at gmail.com>, 2015
@@ -15,17 +14,36 @@ msgid ""
msgstr ""
"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: 2017-09-20 00:56+0000\n"
-"Last-Translator: b39e6b72373066b02663de71fc788486\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/otf/torproject/language/es_MX/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: es_MX\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -37,35 +55,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Perdón! Algo salió mal con tu petición."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Reportar un error"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Código fuente"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Seleccionar todo"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Mostrar código QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Código QR para las entradas de tu(s) repetidores/puente(s)(bridge lines)"
@@ -73,58 +87,58 @@ msgstr "Código QR para las entradas de tu(s) repetidores/puente(s)(bridge line
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "¡Oh, diantres!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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 entradas de tus repetidores/puentes. Léelo con un lector de códigos QR para copiar las entradas de tus repetidores/puentes en tu teléfono móvil u otros dispositivos."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "Actualmente no hay ningún repetidor/puente disponible..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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ía intentar %s ir hacía atrás %s y seleccionar un tipo de repetidor/puente diferente."
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Paso %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Descargar %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Paso %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Obtener %s repetidores/puentes %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Paso %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Ahora %s agregar los repetidores/puents al Navegador Tor %s"
@@ -133,27 +147,27 @@ msgstr "Ahora %s agregar los repetidores/puents al Navegador Tor %s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "¡Sólo(%sJ%s) dame los repetidores/puentes!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Opciones avanzadas"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "No"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "¡Sí(%sY%s)!"
@@ -161,7 +175,7 @@ msgstr "¡Sí(%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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "Obtener(%sG%s) repetidores/puentes"
@@ -205,7 +219,7 @@ msgstr "¡Eh, %s!"
msgid "Hello, friend!"
msgstr "¡Hola, amigo!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Claves Públicas"
@@ -255,7 +269,7 @@ msgid ""
"\n"
msgstr "Adicionalmente, BridgeDB tiene muchos puentes de simple vainilla %s sin tener ningun transporte conectable %s lo cual podria no sonar tan genial, pero aun asi pueden ayudar con la censura de internet en muchos casos.\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "¿Que son puentes?"
@@ -273,8 +287,8 @@ msgstr "¡Necessito una forma alternativo de conectar con puentes!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Otro modo de consigir puentes es mandar un correo electronico a %s. Tenga en cuenta que debe enviar el correco electronico con dirección de uno de los siguientes proveedores de correo electrónico: %s, %s or %s."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -283,54 +297,44 @@ msgstr "¡Mis puentes no funcionan! ¡Necesito ayuda!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Si tu Tor no funciona, usted debe enviar por correo electrónico %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "Intenta poner tanta informacion como puedas sobre tu problema, incluyendo una lista de los puentes y Pluggable Transports que hayas intentado usar, tu version de Tor Browser, y cualquier mensaje que Tor haya mostrado, etc."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Aqui estan tus puentes:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "¡Obten puentes!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Por favor selecciona las opciones para tu tipo de puente:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "¿Necesitas direcciones IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "¿Necesitas un %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Tu navegador no muestra las imagenes correctamente"
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Ponga los caracteres de la imagen de arriba..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Como empezar a usar tus puentes."
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -339,21 +343,21 @@ msgid ""
msgstr "Para conectar puentes al Tor Browser; primero ve al %s Tor Browser pagina de descargas %s luego siga las instrucciones para descargar y empezar\nTor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Cuando la \"Configuración de Red Tor\" aparesca, presione \"Configurar y siguiente\nhasta que pregunte:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "¿Tu proveedor de servicios de internet (ISP) bloquea o censura las conecciones\na la red Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -361,28 +365,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Seleccione \"Si\" luego presione \"Siguiente\".\nPara configurar sus nuevos puentes, copie y pegue\nlas lineas de los puentes en la caja de texto. Finalmente, presione \"Conectar\" y ¡deberias de estar listo para continuar! Si tienes problemas, prueba presionar en el botón de \"Ayuda\" en las \"configuraciones de red de Tor\" para mas asistencia."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Solicita un puente por defecto"
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Solicita puentes IPv6"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Solicita un transporte enchufable por TYPE"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Obten una copia de la llave GnuPG deBridgeDB´s "
diff --git a/et/LC_MESSAGES/bridgedb.po b/et/LC_MESSAGES/bridgedb.po
index 3663a1f25..d1798814e 100644
--- a/et/LC_MESSAGES/bridgedb.po
+++ b/et/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Emma Peel, 2019
# G <purexxxx at hotmail.com>, 2015
# Mart Laub <mart at esec.ee>, 2014
@@ -12,17 +11,36 @@ msgid ""
msgstr ""
"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-30 10:46+0000\n"
-"Last-Translator: Emma Peel\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Estonian (http://www.transifex.com/otf/torproject/language/et/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: et\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -34,35 +52,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Vabandust! Midagi läks Teie päringuga valesti."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Teatage viga"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Lähtekood"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "Muudatuste logi"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Vali kõik"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Näita QR-koodi"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QRKood teie silla ridade jaoks"
@@ -70,58 +84,58 @@ msgstr "QRKood teie silla ridade jaoks"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Oli seda nüüd vaja..."
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "QR-koodi hankimisel ilmnes viga."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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 "See QRKood sisaldab teie silla ridu. Skaneeri seda QRKoodi lugejaga, et kopeerida silla read telefoni või teistesse seadmetesse."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "Ühtegi silda ei ole hetkel saadaval..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "Võib-olla peaksid proovima %s tagasi minna %s ja valima teise silla tüübi!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "%s1%s samm."
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Lae alla %s Tor brauser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "%s2%s samm."
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Hangi %s sillad %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "%s3%s samm."
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Nüüd %s lisa sillad Tor\\'i brauserisse%s"
@@ -130,27 +144,27 @@ msgstr "Nüüd %s lisa sillad Tor\\'i brauserisse%s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sL%sihtsalt anna mulle sillad!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Täpsemad seaded"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Ei"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
msgid "none"
msgstr "mitte ükski"
#. 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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sJ%sah!"
@@ -158,7 +172,7 @@ msgstr "%sJ%sah!"
#. 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sH%sangi sillad"
@@ -202,7 +216,7 @@ msgstr "Hei, %s!"
msgid "Hello, friend!"
msgstr "Tervist, sõber!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Avalikud Võtmed"
@@ -252,7 +266,7 @@ msgid ""
"\n"
msgstr "Lisaks on BridgeDB-l ka palju tavapäraseid, igavaid sildu %s ilma\nPluggable Transports-ideta %s, mis võib-olla ei kõla nii lahedalt, kuid need sillad saavad teil paljudel juhtul internetitsensuuri eest kõrvale põigata.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Mis on sillad?"
@@ -270,8 +284,8 @@ msgstr "Mul on vaja teist viisi sildade saamiseks!"
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 "Sildu on võimalik saada ka saates e-maili järgnevale aadressile: %s. Palun pange\ntähele, et peate saatma e-maili selliselt aadressilt, mis kasutab ühte järgnevatest e-maili teenusepakkujatest:\n%s, %s või %s."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -280,54 +294,44 @@ msgstr "Mu sillad ei tööta! Vajan abi!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Kui Teil Tor ei tööta, saatke e-mail aadressile %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "Proovige lisada võimalikult palju informatsioon seoses oma juhtumiga, lisades järjendi sildadest ja\nPluggable Transports\\'idest, mida Te üritasite kasutada; oma Tor brauseri versioon\nja kõik teated, mida Tor sulle edastas jne."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Siin on teie silla read:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Hangi sillad!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Palun valige silla tüüp:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Kas teil on vaja IPv6 aadresse?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Kas teil on vaja %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Teie veebilehitseja ei kuva pilte korrektselt."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Sisestage ülemisel pildil olevad sümbolid..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Kuidas alustada oma sildade kasutamist"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -336,21 +340,21 @@ msgid ""
msgstr "Et lisada sildu Tor\\'i brauserisse, minge %s Tor\\'i brauseri allalaadimisleheküljele %s ja järgige seal olevaid instruktsioone Tor brauseri allalaadimiseks ja käivitamiseks."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Kui 'Tor\\'i võrgu seaded' dialoog kerkib esile, vajutage 'Seadista' ja järgige nõustajat kuni see küsib:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Kas Teie Internetiteenuse pakkuja (ISP) blokeerib või tsensoreerib ühendusi Tor\\'i võrku?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -358,28 +362,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Valige \"Jah\" ja klikkige \"Järgmine\". Et seadistada oma uusi sildu, kopeeri ja kleebi silla read teksti sisendikasti. Lõpetuseks vajutage \"Ühenda\", ja kõik peaks toimima! Kui Teil tekib probleeme, proovige klikkida \"Abi\" nuppu, mis asub \"Tor\\'i võrgu seaded\" nõustajas edasise abi saamiseks."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
msgid "Displays this message."
msgstr "Näitab seda teadet."
#. 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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Esita päring tavaliste sildade jaoks."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Esita päring IPv6 sildade jaoks."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Esita päring Pluggable Transpordi jaoks TYPE järgi."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Hangi koopia BridgeDB GnuPG avalikust võtmest."
diff --git a/eu/LC_MESSAGES/bridgedb.po b/eu/LC_MESSAGES/bridgedb.po
index 8f2e0d198..576af2c8c 100644
--- a/eu/LC_MESSAGES/bridgedb.po
+++ b/eu/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# baldarra, 2013
# Aritz Jorge Sánchez <aritz.jorge at protonmail.com>, 2015
# baldarra, 2011, 2012
@@ -16,17 +15,36 @@ msgid ""
msgstr ""
"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-01-02 09:53+0000\n"
-"Last-Translator: Osoitz <oelkoro at gmail.com>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Basque (http://www.transifex.com/otf/torproject/language/eu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -38,35 +56,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Barkatu! Zerbait gaizki joan da zure eskaeran."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Eman errore baten berri"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Iturburu-kodea"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "Changelog-a"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontaktuan jarri."
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Hautatu dena"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Erakutsi QR Kodea"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR kodea zubi-lerroentzarako"
@@ -74,58 +88,58 @@ msgstr "QR kodea zubi-lerroentzarako"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "A ze parea!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "Akats bat egon da zure QR kodea lortzen."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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 kode hau zure zubi-lerroak dauzka. Eskaneatu QR kode irakurle batekin kopiatzeko mugikorrean edo beste gailutan."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "Momentuz ez daude zubirik..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "Agian saiatu %s atzera itzuli %s eta beste zubi mota bat aukeratzen!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "%s1.%s urratsa"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Jaitsi %s Tor Nabigatzailea %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "%s2.%s urratsa"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Eskuratu %s zubiak %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "%s3.%s urratsa"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Orain %s gehitu zubiak Torera %s"
@@ -134,27 +148,27 @@ msgstr "Orain %s gehitu zubiak Torera %s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sJ%sust emaidazu zubiak!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Aukera Aurreratuak"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Ez"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
msgid "none"
msgstr "Bat ere ez."
#. 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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sB%sai!"
@@ -162,7 +176,7 @@ msgstr "%sB%sai!"
#. 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr ""
@@ -206,7 +220,7 @@ msgstr "Kaixo, %s!"
msgid "Hello, friend!"
msgstr "Kaixo, lagun!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Gako Publikoak"
@@ -256,7 +270,7 @@ msgid ""
"\n"
msgstr ""
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Zer dira zubiak?"
@@ -274,7 +288,7 @@ msgstr "Zubiak eskuratzeko modu alternatibo bat behar dut!"
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."
+"%s or %s."
msgstr ""
#: bridgedb/strings.py:115
@@ -284,54 +298,44 @@ msgstr "Nire zubiak ez dute funtzionatzen! Laguntza behar dut!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Tor ondo ez badabil, %s(r)i posta elektroniko bat bidali beharko zenioke."
-
-#. 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."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
msgstr ""
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:121
msgid "Here are your bridge lines:"
msgstr ""
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Zubiak Lortu!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr ""
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "IPv6 helbideak behar dituzu?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "%s behar duzu?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Zure nabigatzaileak ez ditu irudiak behar bezala erakusten."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Sartu goiko irudiko karaktereak..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Nola hasi zure zubiak erabiltzen"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -340,21 +344,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -362,28 +366,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
msgid "Displays this message."
msgstr "Mezu hau erakusten du"
#. 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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr ""
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Eskatu IPv6 zubiak."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
diff --git a/fa/LC_MESSAGES/bridgedb.po b/fa/LC_MESSAGES/bridgedb.po
index e2b03a093..5f72b8975 100644
--- a/fa/LC_MESSAGES/bridgedb.po
+++ b/fa/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# arashaalaei <aalaeiarash at gmail.com>, 2011
# signal89, 2014
# Amir Moezzi <amirreza.mz at yahoo.com>, 2017
@@ -21,17 +20,36 @@ msgid ""
msgstr ""
"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-08-17 08:33+0000\n"
-"Last-Translator: MYZJ\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: fa\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -43,35 +61,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "متاسفانه در رابطه با درخواست شما خطایی رخ داده است."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "گزارش یک باگ"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "کد منبع"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "لیست تغییرات"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "تماس"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "انتخاب همه"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "نمایش QRCode"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QRCode برای مسیرهای پل شما"
@@ -79,58 +93,58 @@ msgstr "QRCode برای مسیرهای پل شما"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "ای وای، متاسفیم!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "به نظر می رسد در دریافت QRCode برای شما، خطا وجود داشت."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "هماکنون هیچ پلی در دسترس نیست..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "مرحله %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "دانلود %s مرورگر تور %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "مرحله %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "دریافت %s پل ها %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "مرحله %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "اکنون، %s افزودن پل ها به مرورگر تور %s"
@@ -139,27 +153,27 @@ msgstr "اکنون، %s افزودن پل ها به مرورگر تور %s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sف%sقط پل ها را بمن بده!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "گزینههای پیشرفته"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "نه"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sب%sله!"
@@ -167,7 +181,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sد%sریافت پلها"
@@ -211,7 +225,7 @@ msgstr "سلام، %s!"
msgid "Hello, friend!"
msgstr "سلام دوست من!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "کلیدهای عمومی"
@@ -261,7 +275,7 @@ msgid ""
"\n"
msgstr "همچنین BridgeDB شامل تعداد زیادی پل های ابتدایی و قدیمی است که %s Pluggable Transports ندارند %s و ممکن است بی مصرف به نظر برسند اما همچنان ممکن است در موارد متعددی جهت دور زدن فیلترینگ به شما کمک کنند.\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "پل ها چه هستند؟"
@@ -279,8 +293,8 @@ msgstr "به یک راه دیگر برای دریافت bridge ها احتیاج
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "یک طریق دیگری که میتوانید پلها را بگیرید, از طریق فزستادن یک ایمیل به %s میباشد. لطفا دقت فر مایید که شما باید ایمیل خود را حتما از یکی از فراهمکنند گان ایمیلی زیر بفرستیذ: %s %s و یا %s ."
+"%s or %s."
+msgstr "یک راه دیگر برای دریافت پل ها ارسال ایمیل به آدرس %s است. توجه کنید ایمیلی که ارسال می کنید، حتماً از طریق یکی از شرکت های زیر باشد:\n%s یا %s"
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -289,54 +303,44 @@ msgstr "به کمک احتیاج دارم! پلهای من کار نمیک
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "اگر تور شما کار نمی کند, شما باید ایمیل کنید %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 و هر پیغامی که Tor به شما داده است."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "خطوط پل شما در اینجا:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "دریافت پلها!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "لطفا گزینه نوع پل را انتخاب کنید:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "آیا شما به آدرس های IPv6 نیاز دارید؟"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "آیا شما نیاز دارید به یک %s؟"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "مرورگر شما تصاویر را به درستی نمایش نمی دهد."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "کاراکتر ها را از تصویر بالا وارد کنید..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "چگونگی از پلهای خود استفاده کنید"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -345,21 +349,21 @@ msgid ""
msgstr "برای ورود به پل در مرورگر Tor ، برای اولین بار %s به دانلود مرورگر Tor \nصفحه %s و پس از آن به دنبال دستورالعمل دانلود و استفاده از\nمرورگر Tor بروید."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -367,28 +371,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "'بله' را انتخاب کرده و سپس 'بعدی' را انتخاب کنید. برای پیکربندی پل جدید خود, copy و paste کنید خطوط پل را در متن جعبه ورودی. در نهایت, روی 'اتصال' کلیک کنید,\nراه درستش این است! اگر مشکلی پیش آمد, کلیک کنید روی کلید 'راهنما'\nدر 'تنظیمات شبکه تور' wizard برای اطلاعات بیشتر."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "درخواست پلهای عادی"
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "درخواست پلهای IPv6"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "درخواست یک روش Transport جایگزین براساس TYPE"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "دریافت یک رونوشت از کلیدِ GnuPG عمومیِ BridgeDB"
diff --git a/fi/LC_MESSAGES/bridgedb.po b/fi/LC_MESSAGES/bridgedb.po
index 8f863f043..9ce2ea3ce 100644
--- a/fi/LC_MESSAGES/bridgedb.po
+++ b/fi/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Hessu Lumberi <pitkahessu at hotmail.com>, 2015
# Jorma Karvonen <karvonen.jorma at gmail.com>, 2015
# Jorma Karvonen <karvonen.jorma at gmail.com>, 2014
@@ -19,17 +18,36 @@ msgid ""
msgstr ""
"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-01-15 12:20+0000\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: fi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -41,35 +59,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Pyyntösi epäonnistui jostain syystä."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Ilmoita ohjelmointivirheestä"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Lähdekoodi"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Valitse kaikki"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Näytä QR-koodi"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Siltariviesi QR-koodi"
@@ -77,58 +91,58 @@ msgstr "Siltariviesi QR-koodi"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Jossain on pulma!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Vaihe %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Vaihe %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Hanki %s sillat %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Vaihe %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/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"
@@ -137,27 +151,27 @@ msgstr "Nyt %s lisää sillat Tor Browseriin %s"
#. 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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Lisävalitsimet"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Ei"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sK%syllä!"
@@ -165,7 +179,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sH%sae sillat"
@@ -209,7 +223,7 @@ msgstr "Hei, %s!"
msgid "Hello, friend!"
msgstr "Hei ystävä!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Julkiset avaimet"
@@ -259,7 +273,7 @@ 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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Mitä ovat sillat?"
@@ -277,8 +291,8 @@ msgstr "Tarvitsen vaihtoehtoisen tavan tavoittaa sillat!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %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."
+"%s or %s."
+msgstr "Toinen tapa siltojen hankkimiseen on lähettää sähköpostia osoitteeseen %s. Huomaa,\nettä sinun on lähetettävä sähköpostiviesti käyttäen yhtä seuraavien sähköpostitarjoajien\nosoitetta:\n%s tai %s."
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -287,54 +301,44 @@ msgstr "Siltani eivät toimi! Tarvitsen apua!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: 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."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "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."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Tässä ovat siltarivisi:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Hae sillat!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Valitse valitsimet siltatyypille:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Tarvitsetko IPv6-osoitteita?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Tarvitsetko %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Selaimesi ei näytä kuvia oikein."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Syötä merkit yläpuolella olevasta kuvasta..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Kuinka aloitat siltojesi käytön"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -343,21 +347,21 @@ msgid ""
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".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -365,28 +369,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."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Pyydä tavallisia siltoja."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Pyydä IPv6-siltoja."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
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".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Hae kopio BridgeDB:n julkisesta GnuPG-avaimesta."
diff --git a/fr/LC_MESSAGES/bridgedb.po b/fr/LC_MESSAGES/bridgedb.po
index 12d091db5..841cd3c1e 100644
--- a/fr/LC_MESSAGES/bridgedb.po
+++ b/fr/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# AO <ao at localizationlab.org>, 2018-2019
# apaddlingduck, 2014
# Boubou <cece31840 at gmail.com>, 2015
@@ -30,17 +29,36 @@ msgid ""
msgstr ""
"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-09-23 19:14+0000\n"
-"Last-Translator: AO <ao at localizationlab.org>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -52,35 +70,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Désolé ! Un problème est survenu à la suite de votre requête."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Signaler un bogue"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Code source"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Tout sélectionner"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Afficher le code QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Code QR pour vos lignes de ponts"
@@ -88,58 +102,58 @@ msgstr "Code QR pour vos lignes de ponts"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Un problème est survenu !"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Étape %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Téléchargez %s le Navigateur Tor %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Étape %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Obtenez des %s ponts %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Étape %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Maintenant, %s ajoutez les ponts au Navigateur Tor %s"
@@ -148,27 +162,27 @@ msgstr "Maintenant, %s ajoutez les ponts au Navigateur Tor %s"
#. 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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Options avancées"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Non"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sO%sui !"
@@ -176,7 +190,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sO%sbtenir des ponts"
@@ -220,7 +234,7 @@ msgstr "Bonjour, %s !"
msgid "Hello, friend!"
msgstr "Bonjour, l’ami !"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Clés publiques"
@@ -270,7 +284,7 @@ msgid ""
"\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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Que sont les ponts ?"
@@ -288,8 +302,8 @@ msgstr "Il me faut une autre façon d’obtenir des ponts !"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %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."
+"%s or %s."
+msgstr "Une autre alternative pour obtenir bridges est d'envoyer un email à %s. Veuillez noter que vous devez envoyer un email en utilisant une adresse email d'un des fournisseurs d'accès suivant: %s ou %s."
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -298,54 +312,44 @@ msgstr "Mes ponts ne fonctionnent pas, j’ai besoin d’aide !"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: 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."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "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."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Voici vos lignes de ponts :"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Obtenez des ponts !"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Veuillez choisir des options pour le type de ponts :"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Avez-vous besoin d’adresses IPv6 ?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Avez-vous besoin d’un transport enfichable (%s) ?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Votre navigateur n’affiche pas les images correctement."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Saisir les caractères de l’image ci-dessus…"
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Comment commencer à utiliser vos ponts ?"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -354,21 +358,21 @@ msgid ""
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".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
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".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -376,28 +380,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further 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."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
msgid "Displays this 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.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Demander des ponts traditionnels."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Demander des ponts IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Demander un transport enfichable par TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Obtenir une copie de la clé GnuPG publique de BridgeDB."
diff --git a/ga/LC_MESSAGES/bridgedb.po b/ga/LC_MESSAGES/bridgedb.po
index 44a4ea45f..883d1f210 100644
--- a/ga/LC_MESSAGES/bridgedb.po
+++ b/ga/LC_MESSAGES/bridgedb.po
@@ -1,25 +1,43 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Kevin Scannell <kscanne at gmail.com>, 2017
msgid ""
msgstr ""
"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: 2017-10-07 19:53+0000\n"
-"Last-Translator: Kevin Scannell <kscanne at gmail.com>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Irish (http://www.transifex.com/otf/torproject/language/ga/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: ga\n"
"Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -31,35 +49,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Ár leithscéal! Bhí fadhb leis an iarratas a rinne tú."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Tuairiscigh Fabht"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Cód Foinseach"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "Logchomhad athruithe"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Teagmháil"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Roghnaigh Uile"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Taispeáin Cód QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Do chuid línte droichid mar chód QR"
@@ -67,58 +81,58 @@ msgstr "Do chuid línte droichid mar chód QR"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Ochón ó!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "Dealraíonn sé gur tharla earráid agus do chód QR á fháil."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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á do chuid línte droichid laistigh den chód QR seo. Is féidir é a scanadh le léitheoir QR chun na línte droichid a chóipeáil go dtí fón póca nó gléasanna soghluaiste eile."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "Níl aon droichead ar fáil faoi láthair..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "B'fhéidir gur chóir duit %s dul siar %s agus cineál difriúil droichid a roghnú!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Céim %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Íoslódáil %s Brabhsálaí Tor %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Céim %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Faigh %s droichid %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Céim %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Anois %s cuir na droichid le Brabhsálaí Tor %s"
@@ -127,27 +141,27 @@ msgstr "Anois %s cuir na droichid le Brabhsálaí Tor %s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sN%sí theastaíonn uaim ach droichid!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Ardroghanna"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Níl"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
msgid "none"
msgstr "dada"
#. 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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sT%sá!"
@@ -155,7 +169,7 @@ msgstr "%sT%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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sF%saigh Droichid"
@@ -199,7 +213,7 @@ msgstr "Hóra a %s!"
msgid "Hello, friend!"
msgstr "Dia dhuit a chara!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Eochracha Poiblí"
@@ -249,7 +263,7 @@ msgid ""
"\n"
msgstr "Tá go leor gnáthdhroichead ar fáil mar chuid de BridgeDB freisin, droichid %s nach mbaineann úsáid as córais iompair ionphlugáilte %s. B'fhéidir nach bhfuil siad chomh spéisiúil sin, ach cabhraíonn siad leat cinsireacht Idirlín a sheachaint mar sin féin.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Cad is droichead ann?"
@@ -267,8 +281,8 @@ msgstr "Teastaíonn uaim bealach malartach le droichid a fháil!"
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 "Is féidir droichid a fháil freisin trí ríomhphost a sheoladh chuig %s. Caithfidh tú an teachtaireacht a sheoladh ó cheann de na soláthraithe ríomhphoist seo a leanas:\n%s, %s nó %s."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -277,54 +291,44 @@ msgstr "Níl mo chuid droichead ag obair! Tá cúnamh uaim!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Mura bhfuil Tor ag obair duit, seol ríomhphost chuig %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "Déan iarracht an méid is mó eolais agus is féidir a sholáthar: na droichid agus na córais iompair ionphlugáilte a d'úsáid tú, an leagan de do bhrabhsálaí Tor, teachtaireachtaí a chuir Tor amach, srl."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Seo do chuid línte droichid:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Faigh Droichid!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Roghanna don chineál droichid:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "An dteastaíonn seoltaí IPv6 uait?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "An dteastaíonn %s uait?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Níl do bhrabhsálaí ag taispeáint íomhánna mar is ceart."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Cuir isteach na carachtair ón íomhá thuas..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Conas do chuid droichead a úsáid"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -333,21 +337,21 @@ msgid ""
msgstr "Chun droichid a chur le Brabhsálaí Tor, ar dtús oscail an %sleathanach íoslódála%s, ansin lean na treoracha atá ann leis an mbrabhsálaí a íoslódáil agus a thosú."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Nuair a osclaíonn an fhuinneog 'Socruithe Líonra Tor', cliceáil 'Cumraigh' agus lean an treoraí go dtí go bhfiafraíonn sé:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "An bhfuil do Sholáthraí Seirbhíse Idirlín (ISP) ag cur cosc ar, nó ag déanamh cinsireacht ar cheangail le Líonra Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -355,28 +359,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Roghnaigh 'Tá' ansin cliceáil 'Ar Aghaidh'. Chun na droichid nua a chumrú, cóipeáil agus greamaigh na línte droichid isteach sa mbosca ionchurtha. Ansin, cliceáil 'Ceangail' agus beidh gach uile rud réidh! Má tharlaíonn aon fhadhb, cliceáil an cnaipe 'Cabhair' sa treoraí 'Socruithe Líonra Tor' chun tuilleadh eolais a fháil."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
msgid "Displays this message."
msgstr "Taispeánann sé an teachtaireacht seo."
#. 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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Iarr gnáthdhroichid."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Iarr droichid IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Iarr Córas Iompair Ionphlugáilte de réir a CHINEÁL."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Faigh cóip den eochair phoiblí GnuPG a úsáideann BridgeDB."
diff --git a/gd/LC_MESSAGES/bridgedb.po b/gd/LC_MESSAGES/bridgedb.po
index 276c7328c..92bb89cba 100644
--- a/gd/LC_MESSAGES/bridgedb.po
+++ b/gd/LC_MESSAGES/bridgedb.po
@@ -1,25 +1,43 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Mairi Macleod <mairi_mac9 at hotmail.com>, 2016,2018
msgid ""
msgstr ""
"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-03-31 23:19+0000\n"
-"Last-Translator: Mairi Macleod <mairi_mac9 at hotmail.com>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Gaelic, Scottish (http://www.transifex.com/otf/torproject/language/gd/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: gd\n"
"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -31,35 +49,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Duilich! Chaidh rudeigin cearr leis na dh'iarr thu."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Innis mu mhearachd"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Còd Tùsail"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "Clar-atharraich"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Cuir fios gu"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Tagh e uile"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Seall Còd-QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Còd-QR airson do loidhnichean-drochaid"
@@ -67,58 +81,58 @@ msgstr "Còd-QR airson do loidhnichean-drochaid"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Obh obh, brochan lom!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "Tha e coltach gu bheil mearachd air a bhith ann a' faighinn do Chòd-QR."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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 "Tha na loidhnichean drochaid agad sa Chòd QR seo. Sganaich an còd leis an leughadair QR agad gus lethbhreac fhaighinn air na h-innealan eile a th' agad."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "Chan eil drochaid sam bith ri fhaotainn an-drasta..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "'S dòcha gum bu chòir dhut %s dol air ais %s fheuchainn agus drochaid eadar-dhealaichte a thaghadh!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Ceum %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Luchdaich a-nuas %s Brabhsair Tor %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Ceum %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Faigh %s drochaidean %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Ceum %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Nise %s cuir na drochaidean ri do Shealladair Tor %s"
@@ -127,27 +141,27 @@ msgstr "Nise %s cuir na drochaidean ri do Shealladair Tor %s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sB%sheir dhomh drochaidean!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Roghainnean adhartach"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Chan eil"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
msgid "none"
msgstr "Chan eil gin"
#. 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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sT%sha!"
@@ -155,7 +169,7 @@ msgstr "%sT%sha!"
#. 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sF%saigh Drochaidean"
@@ -199,7 +213,7 @@ msgstr "Hai, %s!"
msgid "Hello, friend!"
msgstr "Hallo a charaid!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Iuchairichean Poblach"
@@ -249,7 +263,7 @@ msgid ""
"\n"
msgstr "Cuideachd, tha gu leòr drochaidean àbhaisteach%s aig BridgeDB às aonais\ndòighean siubhail Pluggable %snach eil cho tarraingeach, \nach a gheibheadh\nseachad air oidhirpean oifigeil gus casg a chur air beachdan mi-iomchaidh a sgaoileadh air an t-eadar-lion.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "De a th' ann an drochaidean?"
@@ -267,8 +281,8 @@ msgstr "Tha feum agam air dòigh eile drochaidean fhaighinn!"
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 "Dòigh eile drochaidean fhaighinn, 's e bhith a' cur post-dealan gu %s. Thoir fa-near gu bheil feum agad\nam post-dealan a chur, a' cleachdadh seòladh bho aon de na solaraichean post-dealain a leanas:\n%s, %s no %s. "
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -277,54 +291,44 @@ msgstr "Chan eil mo dhrochaidean ag obair! Tha feum agam air cuideachadh!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Mar nach eil an Tor agad ag obair, bu chòir dhut post-dealain a chur %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "Feuch gun toir thu seachad na 's urrainn dhut de dh'fhiosrachaidh mun chùis, a' gabhail a-steach liosta de na\ndrochaidean agus dè na dòighean siubhail Pluggable a chleachd thu, an dreach de Bhrabhsair Tor a tha agad,\nagus teachdaireachd sam bith a thug Tor a-mach, msaa. "
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Seo do loidhnichean-drochaid:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Faigh Drochaidean!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "A bheil feum agad air seolaidhean-IPv6?"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "A bheil feum agad air seòlaidhean IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Am feum thu %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Chan eil do Shealladair a' sealltainn dealbhan anns an dòigh cheart."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Sgrìobh a-steach na caractaran bhon ìomhaigh gu h-àirde..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Mar a thòisicheas tu a' cleachdadh do dhrochaidean"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -333,21 +337,21 @@ msgid ""
msgstr "Gus drochaidean a chur an luib Brabhsair Tor, an toiseach thig chun duilleig luchdachaidh%s airson %sBrabhsair Tor\nagus nuairsin, lean an stiùireadh airson \nBrabhsair Tor \na luchdachadh a-nuas."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Nuair a nochdas am bucas-còmhraidh airson 'Seataidhean Lion-obrach Tor', tagh 'Rèitich' agus lean\nan stiùireadh gus am faighnich e: "
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "An bheil an solaraiche eadar-lion (ISP) agad a' cur bacadh no caisg ann an dòigh sam bith air ceanglaichean\nri lion-obrach Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -355,28 +359,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Tagh 'Yes', agus an uair sin, 'Next'. Airson do dhrochaidean ùr a rèiteachadh, ath-sgrìobh agus \ncuir na loidhnichean drochaid dhan a' bhucas teacsa. Mu dheireadh, tagh 'Connect', agus,\nle sin, bu chòir gum biodh tu deiseil. Ma bhios duilgheadas sam bith agad, tagh am putan 'Help', \na tha ri fhaighinn sna 'Seataidhean Lion-obrach Tor' airson barrachd cuideachadh agus stiùireadh."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
msgid "Displays this message."
msgstr "Seall an teachdaireachd seo."
#. 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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Faighnich airson drochaidean vanilla."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Faighnich airson drochaidean IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Faigh lethbhreac den iuchar Gnupg phoblach aig BridgeDB."
diff --git a/gl/LC_MESSAGES/bridgedb.po b/gl/LC_MESSAGES/bridgedb.po
index b356b6dfc..e45f2f538 100644
--- a/gl/LC_MESSAGES/bridgedb.po
+++ b/gl/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Eu <luz.armas at udc.es>, 2014
# manuel meixide <m.meixide at gmail.com>, 2013
# Miguel Anxo Bouzada <mbouzada at gmail.com>, 2013
@@ -13,17 +12,36 @@ msgid ""
msgstr ""
"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"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -35,35 +53,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Sentímolo! Algo foi mal coa súa solicitude."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Informar dun Bug"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Código Fonte"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Seleccionar todo"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Amosar Código QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Código QR para as súas liñas ponte"
@@ -71,58 +85,58 @@ msgstr "Código QR para as súas liñas ponte"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Ups!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Paso %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Paso %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Obter as %s pontes %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Paso %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/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"
@@ -131,27 +145,27 @@ msgstr "Agora %s engada as pontes ao Tor Browser %s"
#. 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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Opcións Avanzadas"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Non"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sS%si!"
@@ -159,7 +173,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sO%sbter Pontes"
@@ -203,7 +217,7 @@ msgstr "Ola, %s!"
msgid "Hello, friend!"
msgstr "Ola amigo/a!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Claves públicas"
@@ -253,7 +267,7 @@ msgid ""
"\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
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Que son os repetidores ponte?"
@@ -271,8 +285,8 @@ msgstr "Eu necesito un xeito alternativo de obter pontes!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %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."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -281,54 +295,44 @@ msgstr "As miñas pontes non funcionan! Necesito axuda!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Se o seu Tor non funciona, debe enviar un email a %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "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."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Estas son as súas liñas ponte:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Obter Pontes!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Por favor seleccione opcións para o tipo de ponte:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Necesita direccións IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Necesita vostede un %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "O seu navegador non está amosando imaxes adecuadamente."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Introduza os caracteres da imaxen de enrriba..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Cómo comenzar a usar as súas pontes"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -337,21 +341,21 @@ msgid ""
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
+#: bridgedb/strings.py:144
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
+#: bridgedb/strings.py:148
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
+#: bridgedb/strings.py:152
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"
@@ -359,28 +363,28 @@ msgid ""
"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
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Solicitar pontes estándar."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Solicitar pontes IPv6"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
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
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Obter unha copia da clave pública GnuPG de BridgeDB."
diff --git a/gu/LC_MESSAGES/bridgedb.po b/gu/LC_MESSAGES/bridgedb.po
index 6252847c2..9b4e29df5 100644
--- a/gu/LC_MESSAGES/bridgedb.po
+++ b/gu/LC_MESSAGES/bridgedb.po
@@ -1,25 +1,43 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Drashti Pandya <drashtipandya37 at gmail.com>, 2018
msgid ""
msgstr ""
"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-26 18:28+0000\n"
-"Last-Translator: Drashti Pandya <drashtipandya37 at gmail.com>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Gujarati (http://www.transifex.com/otf/torproject/language/gu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: gu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -31,35 +49,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "માફ કરશો! તમારી વિનંતી સાથે કંઈક ખોટું થયું."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "સમસ્યાની જાણ કરો"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "સ્ત્રોત કોડ"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "નોંધણીઓ બદલો"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "સંપર્ક કરો"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "બધુ પસંદ કરો"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "QRCode બતાવો"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "તમારી bridge લાઇન્સ માટે QRCode"
@@ -67,58 +81,58 @@ msgstr "તમારી bridge લાઇન્સ માટે QRCode"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr ""
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "એવું લાગે છે કે તમારું QRCode મેળવવામાં ભૂલ આવી હતી."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "હાલમાં કોઈ bridges ઉપલબ્ધ નથી..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr ""
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "પગલું %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "ડાઉનલોડ કરો %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr ""
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "પગલું %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr ""
@@ -127,27 +141,27 @@ msgstr ""
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "અદ્યતન વિકલ્પો"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "નહિ"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sહા%s"
@@ -155,7 +169,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sમે%sળવો Bridges"
@@ -199,7 +213,7 @@ msgstr "હાય, %s!"
msgid "Hello, friend!"
msgstr "નમસ્તે, મિત્ર!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr ""
@@ -249,7 +263,7 @@ msgid ""
"\n"
msgstr ""
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr ""
@@ -267,7 +281,7 @@ msgstr "મને bridges મેળવવાનો વૈકલ્પિક ર
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
+"%s or %s."
msgstr ""
#: bridgedb/strings.py:115
@@ -277,54 +291,44 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-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."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
msgstr ""
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:121
msgid "Here are your bridge lines:"
msgstr ""
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "bridges મેળવો!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr ""
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr ""
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr ""
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -333,21 +337,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -355,28 +359,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr ""
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
diff --git a/he/LC_MESSAGES/bridgedb.po b/he/LC_MESSAGES/bridgedb.po
index 61f5fb2d1..ab3f21a94 100644
--- a/he/LC_MESSAGES/bridgedb.po
+++ b/he/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# aharon, 2012
# Elifelet <arab.with.nargila at gmail.com>, 2014
# Dvir Rosen <ndvnis at gmail.com>, 2014
@@ -19,17 +18,36 @@ msgid ""
msgstr ""
"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"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: he\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"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -41,35 +59,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "סליחה! משהו השתבש בבקשה שלך."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "דווח על תקל"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "קוד מקור"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "יומן שינויים"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "צור קשר"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "בחר הכל"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "הצג קוד QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "קוד QR לרשימת הגשרים שלך"
@@ -77,58 +91,58 @@ msgstr "קוד QR לרשימת הגשרים שלך"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "אוי ואבוי!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "נראה שנפלה טעות בקבלת קוד ה-QR שלך."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "אין כרגע גשרים זמינים כלשהם..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "שלב %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "הורד את %s דפדפן Tor %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "שלב %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "השג %s גשרים %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "שלב %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "%s הוסף את הגשרים לדפדפן Tor %s עכשיו"
@@ -137,27 +151,27 @@ msgstr "%s הוסף את הגשרים לדפדפן Tor %s עכשיו"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sר%sק תן לי גשרים!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "אפשרויות מתקדמות"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "לא"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sכ%sן!"
@@ -165,7 +179,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sק%sבל גשרים"
@@ -209,7 +223,7 @@ msgstr "היי, %s!"
msgid "Hello, friend!"
msgstr "שלום, חבר!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "מפתחות ציבוריים"
@@ -259,7 +273,7 @@ msgid ""
"\n"
msgstr "בנוסף, ל-BridgeDB יש שפע של גשרים מהסוג הישן והטוב %s ללא מסווי תעבורה כלשהם %s, מה שאולי לא נשמע מגניב, אך הם עדין יכולים לעזור לעקוף צנזורת אינטרנט במקרים רבים.\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "מהם גשרים?"
@@ -277,8 +291,8 @@ msgstr "אני צריך דרך חלופית לקבלת גשרים!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "דרך נוספת להשיג גשרים היא לשלוח דוא״ל אל%s. אנא שים לב שאתה חייב לשלוח את הדוא״ל ע\"י שימוש באחד מספקי הדוא\"ל הבאים:\n%s, %s או %s."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -287,54 +301,44 @@ msgstr "הגשרים שלי לא עובדים! אני צריך עזרה!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "אם Tor לא עובד, עליך לשלוח דוא״ל אל%s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "נסה לכלול כמה שיותר פרטים על המקרה שלך ככל יכולתך, לרבות רשימת הגשרים ומסווי התעבורה אותם ניסית, גרסת דפדפן Tor שברשותך, כל הודעה כתובה שהתקבלה ב-Tor ביחס לבעיה וכל פרט נוסף שרלוונטי בעיניך."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "להלן שורות הגשר שלך:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "השג גשרים!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "אנא בחר אפשרויות לסוג הגשר:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "האם אתה צריך כתובות IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "האם אתה צריך %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "הדפדפן שלך לא מציג תמונות כראוי."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "הכנס את התווים מהתמונה למעלה..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "איך להתחיל להשתמש בגשרים שלך"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -343,21 +347,21 @@ msgid ""
msgstr "כדי להכניס גשרים לתוך דפדפן Tor, ראשית לך אל %s דף הורדת דפדפן Tor %s ולאחר מכן עקוב אחר ההוראות עבור הורדה והתחלה של דפדפן Tor."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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
+#: bridgedb/strings.py:148
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
+#: bridgedb/strings.py:152
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"
@@ -365,28 +369,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "בחר 'כן' ואז לחץ על 'הבא'. כדי לתצר את הגשרים החדשים שלך, העתק והדבק את שורות הגשרים לתוך תיבת הקלט של המלל. לבסוף, לחץ על 'התחבר' ואתה אמור להיות מוכן! אם תחווה תקלה, נסה ללחוץ על הכפתור 'עזרה' באשף 'הגדרות רשת Tor' לסיוע נוסף."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "בקש גשרים מהסוג הישן."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "בקש גשרי IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
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
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "קבל עותק של מפתח ה-GPG הציבורי של BridgeDB."
diff --git a/hi/LC_MESSAGES/bridgedb.po b/hi/LC_MESSAGES/bridgedb.po
index ab6b1beb7..49c89cbee 100644
--- a/hi/LC_MESSAGES/bridgedb.po
+++ b/hi/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# A. Saad Imran, 2016
# Bineet kumar gaur <bineetkumar at live.in>, 2014
# Minnie Kaur <tuteja.minnie at gmail.com>, 2016
@@ -12,17 +11,36 @@ msgid ""
msgstr ""
"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-01-15 12:20+0000\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Hindi (http://www.transifex.com/otf/torproject/language/hi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -34,35 +52,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "क्षमा करें ! आपका अनुरोध पूरा नहीं किया जा सका। "
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "किसी त्रुटी के बारें में बताएं। "
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "संकेत लिपि का स्त्रोत।"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "परिवर्तनसूची।"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "संपर्क करें।"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "सब कुछ चुने। "
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "QRcode (क्यूआर कोड) दिखाएं। "
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "ये रहे QRCode (क्यूआर कोड) आपके bridges lines (ब्रिज लाइन्स) के लिए। "
@@ -70,58 +84,58 @@ msgstr "ये रहे QRCode (क्यूआर कोड) आपके brid
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "अरे नहीं , कुछ सही नहीं है!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "ऐसा लग रहा है आपके QRCode को प्राप्त करने में कुछ त्रुटी हुई."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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 lines रखता हैं. अपनी bridge lines को मोबाइल और दुसरे उपकरणों में प्रतिलिपि प्राप्त करने के लिए इसे QRCode Reader से Scan करें ."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "इस समय कोई bridge उपलब्ध नहीं हैं ..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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 type का चयन करने की कोशिश करनी चाहिए!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "चरण %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "%s Tor Browser %s डाउनलोड करें."
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "चरण %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "%s bridges %s प्राप्त हो रहे हैं "
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "चरण %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "अब %s bridges को Tor Browser से जोड़ें %s"
@@ -130,27 +144,27 @@ msgstr "अब %s bridges को Tor Browser से जोड़ें %s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sकेवल%s bridges दीजिये !"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "उन्नत विकल्प"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "नहीं"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sजी%s हाँ!"
@@ -158,7 +172,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sB%sridges प्राप्त हो रहे हैं."
@@ -202,7 +216,7 @@ msgstr "अरे, %s!"
msgid "Hello, friend!"
msgstr "नमस्ते, दोस्त!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "सार्वजनिक कुंजी"
@@ -252,7 +266,7 @@ msgid ""
"\n"
msgstr "इसके अतिरिक्त, BridgeDB के पास कुछ साधारण bridges %s बिना किन्हीं Pluggable Transports %s\nके भी हैं. जो कि सुनने में इतने अच्छे नहीं है लेकिन फिर भी ये\nकुछ मामलो में इन्टरनेट सेंसरशिप को रोक सकते हैं.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "bridges क्या हैं?"
@@ -270,8 +284,8 @@ msgstr "मुझे Bridges प्राप्त करने के लिए
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Bridges प्राप्त करने का अन्य तरीका %s को एक ईमेल भेजना हैं. कृपया ध्यान दें कि आपको यह \nईमेल, निम्न में से किसी किसी भी एक ईमेल प्रदाता के एड्रेस से भेजना होगा:\n%s, %s or %s."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -280,54 +294,44 @@ msgstr "मेरे Bridges काम नहीं कर रहे है! म
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "यदि आपका Tor काम नहीं कर रहा है तो आपको %s पर ईमेल भेजना चाहिए."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "आपके मामले में अधिक से अधिक जानकारी देने कि कोशिश कीजिये, जैसे कि उन bridges और Pluggable Transports की सूची\nजिन्हें आपने इस्तेमाल करने की कोशिश की, आपके Tor Browser का संस्करण, \nऔर ऐसे कोई मेसेज जो Tor ने दिए हो, आदि."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "ये रही आपकी bridges पंक्तियाँ:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Bridges प्राप्त करें!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "कृपया Bridge के प्रकार का विकल्प चुनिए:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "क्या आपको IPv6 पतों की जरुरत है?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "क्या आपको %s चाहिए?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "आपका ब्राउज़र फोटोज को ठीक से प्रदर्शित नहीं कर रहा है."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "ऊपर के चित्र से अक्षर डाले."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "आपके bridges को इस्तेमाल करना कैसे शुरू करें?"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -336,21 +340,21 @@ msgid ""
msgstr "Tor Browser में bridges में प्रवेश करने के लिए, सबसे पहले %s Tor Browser डाउनलोड पेज पर जाएँ\n%s और उसके बाद वहां पर Tor Browser को डाउनलोड और शुरू करने के निर्देशों का पालन करें."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "जब \"Tor ब्राउज़र सेटिंग\" का डायलॉग सामने आये, तब \"configure\" पर क्लिक करें तथा पूरे प्रक्रम का पालन करें जब तक यह ये नहीं पूछे:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -358,28 +362,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "'हाँ' चुने और तब 'आगे' पर क्लिक करें. अपने नए bridges को configure करने के लिए, bridges पंक्तियों \nको कॉपी करके टेक्स्ट इनपुट बॉक्समें पेस्ट कर दें. अंत में,\"संपर्क करें\" पर क्लिक करेसब कुछ अपने आप हो जाएगा. \nयदि आपके सामने कोई परेशानी\nआये तो आगे की सहायता के लिए Tor नेटवर्क सेटिंग में \"मदद\" बटन पर क्लिक कर दें."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "vanilla bridges के लिए निवेदन करें."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "IPv6 bridges के लिए निवेदन करें."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "TYPE के द्वारा Pluggable Transport का अनुरोध करें."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "BridgeDB की सार्वजनिक GnuPG कुंजी प्राप्त करें."
diff --git a/hr/LC_MESSAGES/bridgedb.po b/hr/LC_MESSAGES/bridgedb.po
index 66b463939..08ab2508f 100644
--- a/hr/LC_MESSAGES/bridgedb.po
+++ b/hr/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Joziah Cameron <cambergeron55 at gmail.com>, 2016
# Nikola Parsifal <anchorsound at gmail.com>, 2014
# Nives Miletic <nives.miletic at gmail.com>, 2018
@@ -12,17 +11,36 @@ msgid ""
msgstr ""
"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-17 20:44+0000\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
"Last-Translator: erinm\n"
"Language-Team: Croatian (http://www.transifex.com/otf/torproject/language/hr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: 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"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -34,35 +52,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Oprostite! Nešto je pošlo po krivu s Vašim zahtjevom."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Prijavite grešku"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Izvorni kod"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Odaberi sve"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Pokaži QR kod"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR kod za Vaše linije mostova"
@@ -70,58 +84,58 @@ msgstr "QR kod za Vaše linije mostova"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "O ne, greška!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "Trenutno nema dostupnih mostova..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Korak %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Korak %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Preuzmi %s mostove %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Korak %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/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"
@@ -130,27 +144,27 @@ msgstr "Sad %s dodaj mostove u Tor Browser %s"
#. 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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Napredne opcije"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Ne"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sD%sa!"
@@ -158,7 +172,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sP%sreuzmi mostove"
@@ -202,7 +216,7 @@ msgstr "Bok, %s!"
msgid "Hello, friend!"
msgstr "Bok, prijatelju!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Javni ključevi"
@@ -252,7 +266,7 @@ msgid ""
"\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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Što su mostovi?"
@@ -270,8 +284,8 @@ msgstr "Trebam alternativni način preuzimanja mostova!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %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."
+"%s or %s."
+msgstr "Još jedan način za dobiti mostove je da pošaljete email na %s. Imajte na umu da morate\nposlati email koristeći adresu jednog od sljedećih email providera:\n%s ili %s."
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -280,54 +294,44 @@ msgstr "Moji mostovi ne rade! Treba mi pomoć!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: 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."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "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."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Ovo su linije vaših mostova:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Preuzmite mostove!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Molimo odaberite opcije za tip mosta:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Trebaju li Vam IPv6 adrese?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Trebate li %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Vaš preglednik ne prikazuje slike ispravno."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Unesite znakove sa slike iznad..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Kako početi koristite mostove"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -336,21 +340,21 @@ msgid ""
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".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
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".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
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?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -358,28 +362,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
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ć."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Zatraži dobre, stare mostove."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Zatraži IPv6 mostove."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Zatraži priključni transport po tipu."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Preuzmi kopiju BridgeDB-ovog javnog GnuPG ključa."
diff --git a/hu/LC_MESSAGES/bridgedb.po b/hu/LC_MESSAGES/bridgedb.po
index c13cb3c70..96e53cff5 100644
--- a/hu/LC_MESSAGES/bridgedb.po
+++ b/hu/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# benewfy <benewfy at gmail.com>, 2015
# Blackywantscookies, 2014
# Lajos Pasztor <mrlajos at gmail.com>, 2014
@@ -14,17 +13,36 @@ msgid ""
msgstr ""
"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-12-28 15:07+0000\n"
-"Last-Translator: vargaviktor <viktor.varga at gmail.com>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: hu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -36,35 +54,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Elnézést! Valami rosszul működött a kérésed közben."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Hiba jelentése"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Forrás kód"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Mindent kijelöl"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "QR Kód megjelenítése"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR Kód a híd sorokhoz"
@@ -72,58 +86,58 @@ msgstr "QR Kód a híd sorokhoz"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Hoppá!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Lépés %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Lépés %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "%s Hidak %s beszerzése"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Lépés %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/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"
@@ -132,27 +146,27 @@ msgstr "Most %s a hidak hozzáadása a Tor Browser-hez %s"
#. 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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Haladó beállítások"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Nem"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sS%szeretnék!"
@@ -160,7 +174,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sS%szerezni Bridge -et!"
@@ -204,7 +218,7 @@ msgstr "Hé, %s!"
msgid "Hello, friend!"
msgstr "Hello!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Nyilvános kulcsok"
@@ -254,7 +268,7 @@ 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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Mik is a Hidak?"
@@ -272,8 +286,8 @@ msgstr "Szükségem van egy alternatív módra a Hidak beszerzéséhez!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %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."
+"%s or %s."
+msgstr "Másik módszer hidak beszerzésére email küldésével lehetséges a %s címre. \nKérem vegye figyelembe azt hogy az email küldéséhez használjon egyet az alábbi email szolgáltatók közül. \n%s vagy %s"
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -282,54 +296,44 @@ msgstr "A Hídjaim nem működnek! Segítségre van szükségem!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ha a Tor böngészője nem működik, akkor küldjön egy email-t %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "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."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Itt vannak a híd soraid:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Hidak szerzése!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Kérjük, válasszon opciót a híd típushoz:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Kellenek önnek IPv6 címek?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Szüksége van egy %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Ez a böngésző nem jeleníti meg a képeket rendesen."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Adja meg a karaktereket amik a fenti képen láthatóak ..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Hogyan kezdjük használni a hidat "
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -338,21 +342,21 @@ msgid ""
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".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -360,28 +364,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."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Nem csatlakoztatható szállító híd kérelme."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "IPV6 híd kérése."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
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".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Másolat szertése a BridgeDB's publikus GnuPG kulcsából."
diff --git a/hy/LC_MESSAGES/bridgedb.po b/hy/LC_MESSAGES/bridgedb.po
index 4fb5abb38..818ad61b5 100644
--- a/hy/LC_MESSAGES/bridgedb.po
+++ b/hy/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Hrach Mkrtchyan <mhrach87 at gmail.com>, 2016
# Sarkis Andreyan <sarkis.andreyan at gmail.com>, 2017
# Sergei <serjsafarian at gmail.com>, 2018
@@ -11,17 +10,36 @@ msgid ""
msgstr ""
"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-04-15 05:53+0000\n"
-"Last-Translator: Sergei <serjsafarian at gmail.com>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Armenian (http://www.transifex.com/otf/torproject/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: hy\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -33,35 +51,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Ներեցե՛ք, Ձեր հարցումը սխալ ընթացք ստացավ:"
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Հայտնել սխալի մասին"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Ելակետային կոդ"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "Փոփոխությունների մատյան"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Կապ"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Ընտրել բոլորը"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Ցուցադրել QR ծածկագիրը"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR-կոդը՝ Ձեր վերահեռարձակիչների հասցեների համար"
@@ -69,58 +83,58 @@ msgstr "QR-կոդը՝ Ձեր վերահեռարձակիչների հասցենե
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Փֆֆ, մի բան նենց չեղավ:"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "Կարծես թե սխալ տեղի ունեցավ Ձեր QR-կոդը ստանալիս։"
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "Այժմ ոչ մի հասանելի կամուրջ չկա…"
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Քայլ %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Ներբեռնել %s«Tor» դիտարկիչը%s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Քայլ %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Ստանալ %s կամուրջներ %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Քայլ %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Այժմ %s ավելացրեք կամրջի հասցեները Tor դիտարկիչին%s"
@@ -129,27 +143,27 @@ msgstr "Այժմ %s ավելացրեք կամրջի հասցեները Tor դի
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sՊ%sարզապես ավելացրեք Ձեր կամրջի հասցեն։"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Լրացուցիչ ընտրանքեր"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Ոչ"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sԱ%sյո։"
@@ -157,7 +171,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sՍ%sտանալ կամրջի հասցեն"
@@ -201,7 +215,7 @@ msgstr "Հե՛յ, %s։"
msgid "Hello, friend!"
msgstr "Բարև՛, ընկերս:"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Հանրային բանալիներ"
@@ -251,7 +265,7 @@ msgid ""
"\n"
msgstr "Հավելենք, որ BridgeDB-ն ունի նաև բազում հասարակ կամուրջներ, որոնք չեն աջակցում\n%s տվյալների փոխանցումը %s, ինչը կարող է ազդել կայքի էջի տեսքի վրա,\nբայց շատ դեպքերում կարող են օգնել շրջանցել համացանցային գրաքննությունը։\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Ի՞նչ են կամուրջները։"
@@ -269,8 +283,8 @@ msgstr "Ինձ պետք է կամուրջներ ստանալու այլ եղա
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Կամուրջներ ստանալու մեկ այլ եղանակ է էլ. նամակ ուղարկելը %s հասցեին։\nՀաշվի առեք, որ Դուք պետք է ուղարկեք էլեկտրոնային նամակը հետևյալ\nէլ. փոստային ծառայություն մատուցողներից որևէ մեկի միջոցով.\n%s,%s կամ %s։"
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -279,54 +293,44 @@ msgstr "Իմ կամուրջները չեն աշխատում։ Ինձ օգնու
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Եթե Ձեր Tor-ը չի աշխատում, պետք է էլեկտրոնային նամակ ուղարկել %s: "
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "Փորձեք ներառել որքան հնարավոր է շատ տվյալներ Ձեր դեպքի վերաբերյալ, ներառյալ այն bridge-ների\nև Pluggable Transport-ների ցանկը, որոնց փորձել եք օգտագործել, Ձեր Tor Browser-ի տարբերակը,\n ցանկացած այլ հաղորդագրություն, որ Tor-ը հաղորդել է Ձեզ, և այլն:"
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Ահա Ձեր bridge line-երը."
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Ստացե՛ք Bridge-ներ:"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Խնդրում ենք ընտրել bridge-ի տեսակի տարբերակները."
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Ձեզ պե՞տք են IPv6 հասցեներ:"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Ձեզ պե՞տք է %s:"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Ձեր բրաուզերը նկարները ճշտորեն ցույց չի տալիս:"
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Մուտքագրե՛ք տառանշանները վերևի նկարից:"
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Ինչպե՞ս սկսել օգտագործել Ձեր bridge-ները:"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -335,21 +339,21 @@ msgid ""
msgstr "Մուտքագրելու համար bridge-ները Tor Browser, նախ մտե՛ք %sTor Browser-ի ներբեռնման էջը%s և հետևե՛ք հրահանգներին՝ նեբեռնելու և գործարկելու համար Tor Browser-ը:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Ձեր Ինտերնետ Ծառայություններ Մատուցողը (ISP) արգելափակում կամ հետաքննո՞ւմ է Ձեր միացումները\nTor ցանցին:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -357,28 +361,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Սեղմեք «Այո», իսկ հետո «Հաջորդը»: Կարգավորելու համար Ձեր նոր bridge-ները, պատճենեք և\nտեղադրեք bridge line-ը տեքստային դաշտում: Վերջում, սեղմեք «Միանալ», և Դուք պատրաստ կլինեք: Եթե չկողմնորոշվեք՝ փորձեք սեղմել «Օգնություն»\nկոճակը «Tor-ի ցանցային կարգավորումներ»-ում՝ հետագա օգնության համար:"
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Դիմել հասարակ bridge-ների համար:"
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Դիմել IPv6 bridge-ների համար:"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Դիմել Pluggable Transport-ի համար՝ ըստ TYPE-ի: "
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Ստանալ BridgeDB-ի public Gnu-PG key-ի պատճեն:"
diff --git a/id/LC_MESSAGES/bridgedb.po b/id/LC_MESSAGES/bridgedb.po
index 61d5dc162..20b3edbf7 100644
--- a/id/LC_MESSAGES/bridgedb.po
+++ b/id/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# anzhyo, 2014
# Astryd Viandila Dahlan, 2015
# cholif yulian <cholifyulian123 at gmail.com>, 2015
@@ -23,17 +22,36 @@ msgid ""
msgstr ""
"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"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -45,35 +63,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Maaf! Telah terjadi kesalahan dengan permintaan Anda."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Laporkan bug"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Kode Sumber"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Pilih Semua"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Tampilkan QRCode"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QRCode untuk bridge Anda"
@@ -81,58 +95,58 @@ msgstr "QRCode untuk bridge Anda"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Ada masalah!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Langkah %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Langkah %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Dapatkan %s bridge %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Langkah %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/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"
@@ -141,27 +155,27 @@ msgstr "Sekarang %s tambahkan bridge ke Tor Browser %s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sB%serikan saya bridge!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Pilihan Lebih Lanjut"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Tidak"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sY%sa!"
@@ -169,7 +183,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sD%sapatkan Jembatan!"
@@ -213,7 +227,7 @@ msgstr "Hai, %s!"
msgid "Hello, friend!"
msgstr "Halo, kawan!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Kunci Publik"
@@ -263,7 +277,7 @@ msgid ""
"\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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Apa itu jembatan?"
@@ -281,8 +295,8 @@ msgstr "Saya membutuhkan cara lain untuk mendapatkan jembatan!"
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 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."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -291,54 +305,44 @@ msgstr "Jembatan saya tidak bekerja! Saya butuh bantuan!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: 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."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "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."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Berikut jembatan Anda:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Dapatkan Jembatan!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Mohon pilih opsi untuk tipe jembatan:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Apakah Anda membutuhkan alamat IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Apakah Anda membutuhkan %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Peramban Anda tidak menampilkan gambar dengan benar."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Masukkan karakter dari gambar di atas..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Cara memulai menggunakan jembatan Anda"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -347,21 +351,21 @@ msgid ""
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".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Ketika muncul dialog 'Pengaturan Jaringan Tor', klik 'Konfigurasi' dan ikuti\npenuntun sampai ia meminta:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
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 atau menyensor\nkoneksi ke jaringan Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -369,28 +373,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
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."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Minta jembatan yang biasa."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Minta jembatan IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Minta Pluggable Transport berdasarkan TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Dapatkan salinan kunci publik GnuPG BridgeDB."
diff --git a/is/LC_MESSAGES/bridgedb.po b/is/LC_MESSAGES/bridgedb.po
index b2d6b6771..12b7a3ad4 100644
--- a/is/LC_MESSAGES/bridgedb.po
+++ b/is/LC_MESSAGES/bridgedb.po
@@ -1,25 +1,43 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Sveinn í Felli <sv1 at fellsnet.is>, 2016-2017
msgid ""
msgstr ""
"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-01-22 09:08+0000\n"
-"Last-Translator: Sveinn í Felli <sv1 at fellsnet.is>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -31,35 +49,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Úbbs! Eitthvað fór úrskeiðis varðandi beiðnina þína."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Tilkynna um villu"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Grunnkóði"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "Breytingaannáll"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Hafa samband"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Velja allt"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Birta QR-kóða"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR-kóði fyrir brúarlínurnar þínar"
@@ -67,58 +81,58 @@ msgstr "QR-kóði fyrir brúarlínurnar þínar"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Æ, æ, skrambans!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "Villa kom upp þegar þú reyndar að nálgast QR-kóðann þinn."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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 "Þessi QR-kóði inniheldur brúarlínurnar þínar. Skannaðu QR-kóðann með strikamerkjalesara til að afrita brúarlínurnar yfir á farsíma og önnur snjalltæki."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "Engar brýr eru tiltækar í augnablikinu..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr " Hugsanlega ættirðu að reyna að %s fara til baka %s og velja aðra tegund brúar!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Skref %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Sækja %s Tor-vafrann %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Skref %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Ná í %s brýr %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Skref %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Núna á að %s bæta brúnum við Tor-vafrann %s"
@@ -127,27 +141,27 @@ msgstr "Núna á að %s bæta brúnum við Tor-vafrann %s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sG%sefðu mér bara brýrnar!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Nánari stillingar"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Nei"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
msgid "none"
msgstr "ekkert"
#. 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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sJ%sá!"
@@ -155,7 +169,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sN%sá í brýr"
@@ -199,7 +213,7 @@ msgstr "Hæ, %s!"
msgid "Hello, friend!"
msgstr "Sæll vinur!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Dreifilyklar"
@@ -249,7 +263,7 @@ msgid ""
"\n"
msgstr "Að auki er BridgeDB með fullt af ósköp venjulegum brúm %s sem ekki nota\nPluggable Transports %s, sem gæti hljómað aðeins minna svalt, en getur samt\nhjálpað til í mörgum tilfellum til að komast framhjá ritskoðun.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Hvað eru brýr?"
@@ -267,8 +281,8 @@ msgstr "Ég þarf einhverja aðra leið til að ná í brýr!"
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 "Önnur leið til að ná í brýr er að senda tölvupóst til %s. Athugaðu að þú verður\nað senda tölvupóstinn með netfangi frá einhverjum að eftirtöldum póstþjónustum:\n%s, %s eða %s."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -277,54 +291,44 @@ msgstr "Brýrnar mínar virka ekki! Ég þarf hjálp!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ef Tor virkar ekki, ættirðu að senda tölvupóst á %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "Reyndu að hafa með eins miklar upplýsingar um aðstæður þínar eins og hægt er,\nþar með talið allar þær brýr og Pluggable Transport tengileiðir þú reyndir að nota,\nútgáfu Tor-vafrans, auk allra skilaboða sem komu frá Tor, o.s.frv.."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Hér eru brúarlínurnar þínar:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Sækja brýr!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Veldu valkosti fyrir tegund brúar:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Þarftu IPv6-vistföng?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Þarftu %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Vafrinn þinn birtir myndir ekki rétt."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Settu inn stafina úr myndinni hér að ofan..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Leiðir til að byrja að nota brýrnar þínar"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -333,21 +337,21 @@ msgid ""
msgstr "Til að setja brýr inn í Tor-vafrann, farðu fyrst á %s niðurhalssíðu Tor-vafrans %s\nog farðu eftir leiðbeiningum um hvernig eigi að sækja og gangsetja hann."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Þegar glugginn 'Netkerfisstillingar Tor' birtist, smelltu á 'Stilla' og fylgdu síðan\nleiðarvísinum þar til hann spyr:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Hindrar eða ritskoðar netþjónustuaðilinn þinn (ISP) á einhvern hátt tengingar\ninn á Tor-netið?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -355,28 +359,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Veldu 'Já' og smelltu síðan á 'Næsta'. Til að setja upp nýju brýrnar þínar, afritaðu\nog límdu brúarlínurnar inn í textareitinn. Að lokum smellirðu á 'Tengjast', og þá\nætti allt að vera tilbúið! Ef þú lendir í vandræðum, geturðu prófað að smella á\n'Hjálp'-hnappinn í 'Netstillingar Tor'-leiðarvísinum."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
msgid "Displays this message."
msgstr "Birtir þessi skilaboð."
#. 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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Biðja um venjulegar brýr."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Biðja um IPv6-brýr."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Biðja um Pluggable Transport tengileið eftir TYPE tegundum."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Ná í afrit af GnuPG-dreifilykli frá BridgeDB"
diff --git a/it/LC_MESSAGES/bridgedb.po b/it/LC_MESSAGES/bridgedb.po
index f7e7265e5..909d4811e 100644
--- a/it/LC_MESSAGES/bridgedb.po
+++ b/it/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Alberto <alberto.pilato at gmail.com>, 2015
# Alessandro Toffalini, 2017
# DarkGreninja <leonardo.pantani at gmail.com>, 2017
@@ -27,17 +26,36 @@ msgid ""
msgstr ""
"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-06-05 09:40+0000\n"
-"Last-Translator: Gio Doro <CyberMatique at protonmail.com>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -49,35 +67,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Siamo spiacenti ma qualcosa è andato storto con la tua richiesta."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Segnala un Problema"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Codice sorgente"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Seleziona tutto"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Mostra Codice QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Codice QR per le tue bridge lines"
@@ -85,58 +99,58 @@ msgstr "Codice QR per le tue bridge lines"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Figo!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Passo %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Passo %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Ottenere dei %s bridge %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Passo %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/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"
@@ -145,27 +159,27 @@ msgstr "Ora %s aggiungi i bridge al Tor Browser %s"
#. 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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Opzioni Avanzate"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "No"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sS%sì!"
@@ -173,7 +187,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sO%sttieni Bridge"
@@ -217,7 +231,7 @@ msgstr "Hey, %s!"
msgid "Hello, friend!"
msgstr "Ciao amico!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Chiavi Pubbliche"
@@ -267,7 +281,7 @@ 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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Cosa sono i bridge?"
@@ -285,8 +299,8 @@ msgstr "Mi serve un altro modo per avere dei bridge!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %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."
+"%s or %s."
+msgstr "Un altro modo per ottenere dei bridge è inviare un'email a %s. Nota che devi\ninviare l'email usando un indirizzo tra uno dei seguenti provider di email:\n%s o %s."
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -295,54 +309,44 @@ msgstr "I miei bridge non funzionano! Mi serve aiuto!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: 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."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "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."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Ecco le tue linee bridge:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Ottieni dei Bridge!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Seleziona le opzioni per il tipo di bridge:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Ti servono indirizzi IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Ti serve un %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Il tuo browser non mostra le immagini in modo corretto."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Inserisci i caratteri nell'immagine sopra..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Come iniziare a usare i tuoi bridge"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -351,21 +355,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".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -373,28 +377,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."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Richiedi bridge vanilla."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Richiedi bridge IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
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".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Ottieni una copia della chiave pubblica GnuPG di BridgeDB."
diff --git a/ja/LC_MESSAGES/bridgedb.po b/ja/LC_MESSAGES/bridgedb.po
index 3b07e6470..33b5e20d8 100644
--- a/ja/LC_MESSAGES/bridgedb.po
+++ b/ja/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# 323484, 2018
# brt <87 at itokei.info>, 2013
# ABE Tsunehiko, 2014-2015
@@ -16,17 +15,36 @@ msgid ""
msgstr ""
"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-01-15 12:20+0000\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: ja\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -38,35 +56,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "申し訳ありません！リクエストに問題がありました。"
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "バグを報告する"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "ソースコード"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "変更履歴"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "お問い合わせ"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "すべて選択"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "QR コードを表示"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "あなたのブリッジラインの QR コード"
@@ -74,58 +88,58 @@ msgstr "あなたのブリッジラインの QR コード"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "おっとスパゲッティ！"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "QR コードを作成する際にエラーが発生しました。"
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "今の時点では利用できるブリッジがありません..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "ステップ %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "%s Tor Browser %s をダウンロード"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "ステップ %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "%s ブリッジ %s を手に入れる"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "ステップ %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "%s Tor Browser にブリッジを追加します %s"
@@ -134,27 +148,27 @@ msgstr "%s Tor Browser にブリッジを追加します %s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sあ%sの、ください、 bridges!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "高度な設定"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "いいえ"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sは%sい！"
@@ -162,7 +176,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sG%set Bridges"
@@ -206,7 +220,7 @@ msgstr "どうも %s さん！"
msgid "Hello, friend!"
msgstr "どうも、こんにちは！"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "公開鍵"
@@ -256,7 +270,7 @@ msgid ""
"\n"
msgstr "加えて、 BridgeDB は、 %s Pluggable Transport %s のない多くの何の変哲もない\n通常のブリッジを持ち、それはクールには思えないかもしれません。しかし、多くの場合、インターネット検閲を回避するのになお有効です。\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "ブリッジとは？"
@@ -274,8 +288,8 @@ msgstr "ブリッジを得る他の方法が必要です!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "ブリッジを入手する別のやり方は %s までメールを送ることです。\n以下のメールプロバイダのうちの1つのアドレスを使用してメールを送信しなければならないことにご注意ください:\n %s 、 %s または %s"
+"%s or %s."
+msgstr "ブリッジを入手する別のやり方は %s までメールを送ることです。以下のメールプロバイダのうちの1つのアドレスを使用してメールを送信しなければならないことにご注意ください: %s または %s"
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -284,54 +298,44 @@ msgstr "私のブリッジが動きません! 助けてください!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Tor がうまく動作しない場合、 %s までメールを下さい。"
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 バージョン、そして Tor が出力したメッセージ等などを含み、出来る限りあなたのケースに関する多くの情報を含めてみてください。"
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "あなたのブリッジラインはこちらです:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "ブリッジを入手！"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "ブリッジタイプのオプションを選択してください:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "IPv6 アドレスが必要ですか？"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "%s が必要ですか？"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "ご利用のブラウザは適切に画像を表示していません。"
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "上記の画像から文字を入力してください..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "ブリッジ使用の始め方"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -340,21 +344,21 @@ msgid ""
msgstr "Tor Browser にブリッジを登録する前に、まずは %s Tor Browser ダウンロードページ %s に移動して Tor Browser のダウンロード方法と始め方の説明をご覧ください。"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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
+#: bridgedb/strings.py:148
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -362,28 +366,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "「はい」を選択して、「次」をクリックしてください。新しいブリッジを構成するために、テキスト\n入力ボックスにブリッジラインをコピーペーストしてください。最後に、「接続」をクリックして、\nさあ準備が出来たはずです！何か問題があったら、さらなる助けを得るために\n「Tor ネットワーク設定」ウィザード内「ヘルプ」ボタンをクリックしてください。"
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "vanilla ブリッジをリクエスト"
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "IPv6 ブリッジをリクエスト"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
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
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "BridgeDB の GnuPG 公開鍵のコピーを手に入れましょう。"
diff --git a/ka/LC_MESSAGES/bridgedb.po b/ka/LC_MESSAGES/bridgedb.po
index e5a385f20..a7c0e9485 100644
--- a/ka/LC_MESSAGES/bridgedb.po
+++ b/ka/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Georgianization, 2018
# George Rommel <x0rmia at gmail.com>, 2013
# Shanidze <sandro.shanidze at gmail.com>, 2015
@@ -11,17 +10,36 @@ msgid ""
msgstr ""
"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-01-15 12:20+0000\n"
-"Last-Translator: Georgianization\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Georgian (http://www.transifex.com/otf/torproject/language/ka/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: ka\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -33,35 +51,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "უკაცრავად! თქვენს მოთხოვნასთან დაკავშირებით რაღაც აირია."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "ხარვეზის მოხსენება"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "პირველწყარო კოდი"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "ცვლილებები"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "კავშირი"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "ყველას მონიშვნა"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "QR-კოდის ჩვენება"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR-კოდი გადამცემის მისამართისთვის"
@@ -69,58 +83,58 @@ msgstr "QR-კოდი გადამცემის მისამართ
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "უჰ, რაღაც რიგზე ვერაა!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "როგორც ჩანს, რაღაც შეცდომა წარმოიშვა QR-კოდის მიღებისას."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "ამჟამად არცერთი გადამცემი ხიდი არაა ხელმისაწვდომი..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "ნაბიჯი %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "ჩამოტვირთეთ %s Tor-ბრაუზერი %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "ნაბიჯი %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "მიიღეთ %s გადამცემი ხიდები %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "ნაბიჯი %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "ახლა %s დაამატეთ გადამცემი ხიდები Tor-ბრაუზერის %s"
@@ -129,27 +143,27 @@ msgstr "ახლა %s დაამატეთ გადამცემი ხ
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sუ%sბრალოდ მომეცით გადამცემი ხიდები!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "დამატებითი პარამეტრები"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "არა"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sდ%sიახ!"
@@ -157,7 +171,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sმ%sიიღეთ გადამცემები (Bridges)"
@@ -201,7 +215,7 @@ msgstr "გამარჯობა, %s!"
msgid "Hello, friend!"
msgstr "მოგესალმებით, მეგობარო!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "საჯარო გასაღებები"
@@ -251,7 +265,7 @@ msgid ""
"\n"
msgstr "ამასთან, BridgeDB-ს გააჩნია უამრავი ჩვეულებრივი სახის გადამცემი ხიდიც %sყოველგვარი\nმისაერთებელი გადამყვანის (Pluggable Transports) გარეშე, %s რაც არც ისე შთამბეჭდავად გამოითქმის, თუმცა მაინც გამოსადეგია\nინტერნეტის შეზღუდვებისთვის თავის ასარიდებლად არაერთ შემთხვევაში.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "რას წარმოადგენს ხიდები?"
@@ -269,8 +283,8 @@ msgstr "სხვა გზები მესაჭიროება გად
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "კიდევ ერთი საშუალებაა გადამცემი ხიდების მისაღებად, რომ გაგზავნოთ ელფოსტა მისამართზე %s. გთხოვთ გაითვალისწინეთ, რომ წერილი გამოგზავნილი უნდა იყოს ელფოსტის მომსახურების რომელიმე ამ მომწოდებლის ფოსტიდან:\n%s, %s ან %s."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -279,54 +293,44 @@ msgstr "ჩემი ხიდები არ მუშაობს! დახ
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "თუ თქვენი Tor არ მუშაობს, გამოგზავნეთ ელფოსტა %s მისამართზე."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "შეეცადეთ მეტად ვრცლად აღწეროთ თქვენი შემთხვევა და დაურთოთ სია იმ\nგადამცემი ხიდებისა და მისაერთებელი გადამყვანების (Pluggable Transports) \nრომლის გამოყენებაც სცადეთ, ამასთან თქვენი Tor-ბრაუზერის ვერსია, ყველა შეტყობინება, რაც Tor-მა გიჩვენათ და ა.შ."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "აქ არის თქვენი სახიდე ხაზები:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "მიიღეთ გადამცემი ხიდები!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "გთხოვთ, მიუთითოთ გადაცემის სახე:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "გესაჭიროებათ IPv6-მისამართები?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "გესაჭიროებათ %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "თქვენი ბრაუზერი არ აჩვენებს სურათებს გამართულად."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "შეიყვანეთ სიმბოლოები ზემოთ არსებული სურათიდან..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "როგორ უნდა გამოვიყენო გადამცემი ხიდები"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -335,21 +339,21 @@ msgid ""
msgstr "გადამცემი ხიდების მისამართების Tor-ბრაუზერში შესაყვანად, თავდაპირველად გადადით %sTor-ბრაუზერის ჩამოტვირთვის\nგვერდზე %s და შემდეგ მიყევით იქ მოცემულ მითითებებს Tor-ბრაუზერის ჩამოტვირთვისა და\nგაშვების თაობაზე."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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
+#: bridgedb/strings.py:148
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -357,28 +361,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "მიუთითეთ „დიახ“ და შემდეგ დაწკაპეთ „შემდეგ“. თქვენი ახალი გადამცემი ხიდის გასამართად, აიღეთ ასლი და\nჩასვით ხიდის მისამართები ტექსტის შესაყვან ველში. ბოლოს დაწკაპეთ „დაკავშირება“ და\nწესით ყველაფერი იმუშავებს! თუ რამე დაბრკოლებას გადააწყდებით, სცადეთ „დახმარების“ ღილაკზე\nდაწკაპება „Tor-ქსელის პარამეტრების“ მეგზურში, დამატებითი მხარდაჭერის მისაღებად."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "ჩვეულებრივი გადამცემი ხიდების მოთხოვნა."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "IPv6-მისამართის ხიდების მოთხოვნა."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
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
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "BridgeDB-ს სააჯარო GnuPG-გასაღების მიღება."
diff --git a/kk/LC_MESSAGES/bridgedb.po b/kk/LC_MESSAGES/bridgedb.po
index d5c2548da..7cef6a792 100644
--- a/kk/LC_MESSAGES/bridgedb.po
+++ b/kk/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Dinmuhamed Esengeldi <esengeldi0202 at gmail.com>, 2019
# Gabit Aidarbek <agabit at yandex.kz>, 2014
# Nurlan Rakhimzhanov <nurlan.rakhimzhanov at gmail.com>, 2014
@@ -11,17 +10,36 @@ msgid ""
msgstr ""
"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-20 18:32+0000\n"
-"Last-Translator: Dinmuhamed Esengeldi <esengeldi0202 at gmail.com>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Kazakh (http://www.transifex.com/otf/torproject/language/kk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: kk\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -33,35 +51,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Кешіріңіз, сіздің сұранысыңыз бойынша белгісіз қиыншылықтар бар. "
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Қате туралы хабарлау"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Бастапқы коды"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "Өзгерістер журналы"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Байланыс"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Барлығын таңдаңыз"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "QR кодты көрсету"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Сіздің көпірлер желілеріңіз үшін QR коды"
@@ -69,58 +83,58 @@ msgstr "Сіздің көпірлер желілеріңіз үшін QR код
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Ууу,спагетти!\nЖаргон сөз."
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "Сіздің QR кодты алған кезде қателік болған сияқты."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "Онда қазіргі кезде көпірлер жоқ ..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Қадам %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "%s Tor Browser %s жүктеу"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Қадам %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "%s көпірлерді %s алу"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Қадам %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Енді %s Tor Brouser-ге көпірлерді қосу %s"
@@ -129,27 +143,27 @@ msgstr "Енді %s Tor Brouser-ге көпірлерді қосу %s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sJ%sust көпірлерді маған беріңіз! "
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Толық параметрлер"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Жоқ"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sY%ses! "
@@ -157,7 +171,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sG%set Көпір "
@@ -201,7 +215,7 @@ msgstr "Әй, %s!"
msgid "Hello, friend!"
msgstr "Сәлем, досым!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Ашық кілттер"
@@ -251,7 +265,7 @@ msgid ""
"\n"
msgstr "Сонымен қатар, BridgeDB-де көптеген plain-ol'-vanilla көпірлері%s Pluggable Transports %sолар мүмкін күшті емес, бірақ олар \nкөптеген жағдайларда интернет цензураны айналып өтуге көмектеседі.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Көпірлер дегеніміз не?"
@@ -269,8 +283,8 @@ msgstr "Көпірлер алудың маған басқа жолы керек!
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Көпірлерді алудың тағы бір жолы - электрондық поштаға жіберу%s.Назар аударыңыз, сізге керек\nэлектрондық поштаны төмендегі электрондық пошта провайдерлерінің бірінің мекенжайынан жіберіңіз:%s,%s немесе%s."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -279,54 +293,44 @@ msgstr "Менің көпірлерім жұмыс істемейді! Көме
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Егер сіздің Tor желіңіз істемесе,мына email-ға жазыңыз %s. "
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "Өзіңіздің ісіңіз туралы, соның ішінде, тізімін қосып көріңіз\nкөпірлерді және Pluggable Transports-ты пайдаланғыңыз келген, Tor Browser нұсқасын,\nжәне Tor берген барлық хабарлар және т.б."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Міне сіздің көпір желілеріңіз:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Көпірлерді алыңыз!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Көпір түрінің параметрлерін таңдаңыз:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Сізге IPv6 мекенжайлары керек пе?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "%s сізге қажетпе?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Сіздің браузеріңіз дұрыс бейнені көрсетпейді."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Жоғарыдағы суреттегі таңбаларды енгізіңіз ..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Сіздің көпірлеріңізді қалай пайдалануға болады"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -335,21 +339,21 @@ msgid ""
msgstr "Tor Browser-ге көпірлерді енгізу үшін, бірінші осы жерден %sTor Browser-ді басыңыз\n %sжәне осы жерден нұсқаулықты оқып Tor Browser-ді басыңыз және БАСТАҢЫЗ."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "'Tor Network Settings' диалогы шыққан кезде 'Конфигурация' пәрменін таңдап, оны орындаңыз\nшебер сұрағанша:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
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
+#: bridgedb/strings.py:152
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"
@@ -357,28 +361,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "'Ия' дегенді таңдап, 'Келесі' дегенді басыңыз. Жаңа көпірлерді конфигурациялау, көшіру және\nкөпір жолдарын мәтін енгізу жолағына қойыңыз. Соңында, «Қосылу» түймешігн басыңыз.\nЕгер сізде қиындықтар туындаса, «Анықтама» басыңыз және\nқосымша көмек алу үшін «Tor Network Settings» батырмасын басыңыз"
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Ванильді көпірлерді сұрау."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "IPv6 көпірлерін сұрау."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
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
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "BridgeDB қоғамдық GnuPG кілтінің көшірмесін алыңыз."
diff --git a/km/LC_MESSAGES/bridgedb.po b/km/LC_MESSAGES/bridgedb.po
index 1fd1db148..5dab45671 100644
--- a/km/LC_MESSAGES/bridgedb.po
+++ b/km/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Dany Sum <danysum696 at gmail.com>, 2018
# Seng Sutha <sutha at open.org.kh>, 2014
# Sokhem Khoem <sokhem at open.org.kh>, 2014
@@ -13,17 +12,36 @@ msgid ""
msgstr ""
"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-09-23 05:02+0000\n"
-"Last-Translator: Dany Sum <danysum696 at gmail.com>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\n"
"Language-Team: Khmer (http://www.transifex.com/otf/torproject/language/km/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: km\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -35,35 +53,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "សូមទោស! អ្វីមួយមានកំហុសជាមួយសំណើរបស់អ្នក។"
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "របាយការណ៍កំហុស"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "កូដប្រភព"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "Changelog"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "ទំនាក់ទំនង"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "ជ្រើសរើសទាំងអស់"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "បង្ហាញ QRកូដ"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr ""
@@ -71,58 +85,58 @@ msgstr ""
#. "There was a problem!" in your language. For example,
#. for Italian, you might translate this into "Mama mia!",
#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Uh oh, spaghettios!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr ""
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "បច្ចុប្បន្នមិនមានប៊្រីដ្យមួយចំនួនឡើយ..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "ជំហាន %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "ទាញយក %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "ជំហាន %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "យក %s ប្រ៊ីដ្យ %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "ជំហាន %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "ឥឡូវ %s បន្ថែមប៊្រីដ្យទៅកាន់ Tor Browser %s"
@@ -131,27 +145,27 @@ msgstr "ឥឡូវ %s បន្ថែមប៊្រីដ្យទ
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sJ%sust ផ្ដល់ឲ្យខ្ញុំនូវប៊្រីដ្យ!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "ជម្រើសកម្រិតខ្ពស់"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "ទេ"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sY%ses!"
@@ -159,7 +173,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sG%set ប៊្រីដ្យ"
@@ -203,7 +217,7 @@ msgstr "ហេ, %s!"
msgid "Hello, friend!"
msgstr "សួស្ដី, មិត្តភ័ក្ដិ!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "សោសាធារណៈ"
@@ -253,7 +267,7 @@ msgid ""
"\n"
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
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "តើប្រ៊ីដ្យជាអ្វី?"
@@ -271,8 +285,8 @@ msgstr "ខ្ញុំត្រូវការវិធីសាស្ត
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "វិធីមួយទៀតដើម្បីទទួល bridges គឺត្រូវផ្ញើអ៊ីមែលទៅ %s ។ សូមចំណាំថា អ្នកត្រូវតែផ្ញើអ៊ីមែលដោយប្រើអាសយដ្ឋានពីក្រុមហ៊ុនផ្ដល់អ៊ីមែលមួយក្នុងចំណោមក្រុមហ៊ុនខាងក្រោម៖\n%s, %s ឬ %s ។"
+"%s or %s."
+msgstr "Another way to get bridges is to send an email to %s. Please note that you must\nsend the email using an address from one of the following email providers:\n%s or %s."
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -281,54 +295,44 @@ msgstr "ប្រ៊ីដ្យរបស់ខ្ញុំមិន
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "ប្រសិនបើ Tor របស់អ្នកមិនដំណើរការ, អ្នកគួរតែអ៊ីមែល %s ។"
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "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 "នេះជាតំណប៊្រីដ្យរបស់អ្នក៖"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "ទទួលយកប៊្រីដ្យ!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "សូមជ្រើសជម្រើសសម្រាប់ប្រភេទប៊្រីដ្យ៖"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "តើអ្នកត្រូវការអាសយដ្ឋាន IPv6 ឬ?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "តើអ្នកត្រូវការ %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "កម្មវិធីអ៊ីនធឺណិតរបស់អ្នកមិនកំពុងបង្ហាញរូបភាពដោយត្រឹមត្រូវឡើយ។"
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "បញ្ចូលតួអក្សរពីរូបភាពខាងលើ..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "របៀបចាប់ផ្ដើមប្រើប៊្រីដ្យរបស់អ្នក"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -337,21 +341,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "នៅពេលប្រអប់ 'ការកំណត់បណ្ដាញ' លេចឡើង, ចុច 'កំណត់រចនាសម្ព័ន្ធ' និងអនុវត្តអ្នកជំនួយការរហូតដល់ភារកិច្ចរបស់អ្នក៖"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -359,28 +363,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."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "ស្នើប៊្រីដ្យមូលដ្ឋាន។"
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "ស្នើប៊្រីដ្យ IPv6 ។"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
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
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Get a copy of BridgeDB's public GnuPG key."
diff --git a/ko/LC_MESSAGES/bridgedb.po b/ko/LC_MESSAGES/bridgedb.po
index 14595d18f..5828df480 100644
--- a/ko/LC_MESSAGES/bridgedb.po
+++ b/ko/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 '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
@@ -27,17 +26,36 @@ msgid ""
msgstr ""
"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-08-10 10:10+0000\n"
-"Last-Translator: woo lee <leewoo0614 at gmail.com>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -49,35 +67,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "죄송합니다! 당신의 요청에 무언가 문제가 있습니다."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "버그를 보고하기"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "소스 코드"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "변경 기록"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "연락하기"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "모두 선택"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "QR코드 보기"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "브릿지 라인을 위한 QR코드"
@@ -85,58 +99,58 @@ msgstr "브릿지 라인을 위한 QR코드"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "어머나, 뭔가 잘못되었습니다!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "QR 코드를 불러 오는 중 오류가 생긴 것 같습니다."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "현재 사용할 수 있는 브릿지가 없습니다..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "%s1%s단계 "
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "%s Tor 브라우저 %s를 다운받습니다 "
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "%s2%s단계 "
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "%s 브릿지 %s를 가져옵니다"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "%s3%s단계 "
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "이제 %s 브릿지를 Tor 브라우저에 추가합니다 %s"
@@ -145,27 +159,27 @@ msgstr "이제 %s 브릿지를 Tor 브라우저에 추가합니다 %s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%s그%s냥 브릿지 주세요!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "고급 옵션"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "아니오"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%s네!%s"
@@ -173,7 +187,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%s브%s릿지 얻기"
@@ -217,7 +231,7 @@ msgstr "저기, %s야! "
msgid "Hello, friend!"
msgstr "안녕 친구!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "공개 키"
@@ -267,7 +281,7 @@ msgid ""
"\n"
msgstr "거기다, BridgeDB는 %s Pluggable Transport가 없는 %s\n흔해빠진 브릿지들도 많아요. 대단한 소리같지 않겠지만,\n그래도 여러 모로 인터넷 검열 우회를 도와줍니다.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "'브릿지'란?"
@@ -285,8 +299,8 @@ msgstr "브릿지를 얻는 다른 방법이 없을까요?"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "브릿지를 얻을 수 있는 다른 방법은 %s 로 이메일을 보내주시는 것입니다.\n이 이메일 서비스를 통해서 보내셔야 한다는 것을 명심해 주세요 :\n%s, %s, %s"
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -295,54 +309,44 @@ msgstr "브릿지가 맛이 갔어요! 도와줘요!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "만약 Tor가 작동하지 않으면, %s로 이메일을 보내 주세요. "
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "가능한 한 많은 정보를 포함해주세요.\n예를 들어 브릿지 목록 및 사용하려는 Pluggable Transport,\nTor 브라우저 버전, Tor가 준 메시지 등."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "당신의 브릿지 행들은 다음과 같습니다:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "브릿지를 얻으세요!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "브릿지 종류에 관한 옵션을 골라 주세요:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "IPv6 주소가 필요합니까?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "%s 가 필요합니까?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "브라우저가 사진을 정상적으로 불러오지 못합니다."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "위 그림의 문자를 입력하십시오..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "브릿지를 사용하는 방법"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -351,21 +355,21 @@ msgid ""
msgstr "Tor 브라우저에 브리지를 입력하려면 먼저 %s Tor 브라우저 다운로드로 이동하십시오.\n페이지 %s로 이동 후 다음 지침에 따라 다운로드 및 시작을 수행하십시오.\nTor 브라우저."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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
+#: bridgedb/strings.py:148
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
+#: bridgedb/strings.py:152
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"
@@ -373,28 +377,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "'예' 혹은 'Yes' 버튼을 누르신 후 '다음' 혹은 'Next' 버튼을 눌러 주세요.\n브릿지를 설정하시려면, 이 메일로 받으신 브릿지를 텍스트 박스에 복사하신 다음,\n'접속' 혹은 'Connect'를 눌러 주시면 작동될 것입니다!\n만약 문제가 있다면, 'Tor 네트워크 설정' 마법사의 '도움말' 혹은 'Help' 버튼을 눌러 도움을 받으세요."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "일반 브릿지를 요청합니다."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "IPv6 브릿지를 요청합니다."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
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
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "BridgeDB의 공개 GnuPG 키를 얻습니다."
diff --git a/lt/LC_MESSAGES/bridgedb.po b/lt/LC_MESSAGES/bridgedb.po
index b685aa689..210c377e8 100644
--- a/lt/LC_MESSAGES/bridgedb.po
+++ b/lt/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Aiste G <aiste.gvildyte at gmail.com>, 2016
# Aiste G <aiste.gvildyte at gmail.com>, 2016
# Moo, 2015-2018
@@ -16,17 +15,36 @@ msgid ""
msgstr ""
"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-12-04 22:30+0000\n"
-"Last-Translator: Moo\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: lt\n"
"Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -38,35 +56,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Atleiskite! Kažkas nutiko su jūsų užklausa."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Pranešti apie klaidą"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Pirminis kodas"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "Keitinių žurnalas"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Susisiekti"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Žymėti viską"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Rodyti QR kodą"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Jūsų tinklų tilto linijų QR kodas"
@@ -74,58 +88,58 @@ msgstr "Jūsų tinklų tilto linijų QR kodas"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Ajerguteliau!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "Atrodo, kad gaunant jūsų QR kodą, įvyko klaida."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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 "Šiame QR kode yra jūsų tinklų tilto linijos. Nuskenuokite šį kodą, naudodami QR kodų skaitytuvą, kad nukopijuotumėte savo tinklų tilto linijas į mobilųjį ar kitus įrenginius."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "Šiuo metu nėra prieinami jokie tinklų tiltai..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "Galbūt, jums reikėtų pabandyti %s grįžti atgal %s ir pasirinkti kitą tinklų tilto tipą!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "%s1%s žingsnis "
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Atsisiųskite %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "%s2%s žingsnis "
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Gaukite %s tinklų tiltus %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "%s3%s žingsnis "
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Dabar, %s pridėkite tinklų tiltus į Tor Browser %s"
@@ -134,27 +148,27 @@ msgstr "Dabar, %s pridėkite tinklų tiltus į Tor Browser %s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sT%siesiog suteikite man tinklų tiltus!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Išplėstiniai parametrai"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Ne"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
msgid "none"
msgstr "nėra"
#. 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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sT%saip!"
@@ -162,7 +176,7 @@ msgstr "%sT%saip!"
#. 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sG%sauti tinklų tiltus"
@@ -206,7 +220,7 @@ msgstr "Sveiki, %s!"
msgid "Hello, friend!"
msgstr "Sveiki!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Viešieji raktai"
@@ -256,7 +270,7 @@ msgid ""
"\n"
msgstr "Be to, BridgeDB taip pat turi ir paprastus tinklų tiltus %s be jokių\nprijungiamų perdavimų %s, kurie, galbūt, ir neskamba patraukliai, tačiau vis tiek\ndaugeliu atvejų gali padėti apeiti interneto cenzūrą.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Kas yra tinklų tiltai?"
@@ -274,8 +288,8 @@ msgstr "Man reikia alternatyvaus būdo tinklų tiltams gauti!"
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 "Kitas būdas gauti tinklų tiltus yra siusti el. laišką į %s. Turėkite omenyje, kad laiškus\nbūtina siųsti, naudojant vieno iš šių el. pašto tiekėjų adresą: \n%s, %s ar %s."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -284,54 +298,44 @@ msgstr "Mano tinklų tiltai neveikia! Man reikia pagalbos!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Jeigu jūsų Tor neveikia, turėtumėte parašyti el. laišką adresu %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "Pasistenkite įtraukti kuo daugiau informacijos apie savo situaciją, įskaitant\ntinklų tiltus ir prijungiamus perdavimus, kuriais naudojotės, taip pat savo Tor naršyklės versiją,\nbei bet kokius pranešimus, kuriuos parodė Tor ir t. t."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Štai jūsų tinklų tilto linijos:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Gauti tinklų tiltus!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Prašome pažymėti tinklų tilto tipo parametrus:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Ar jums reikia IPv6 adresų?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Ar jums reikia %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Jūsų naršyklė netinkamai atvaizduoja paveikslus."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Įveskite simbolius iš aukščiau esančio paveikslo..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Kaip pradėti naudotis tinklų tiltais"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -340,21 +344,21 @@ msgid ""
msgstr "Norėdami pridėti tinklų tiltus į Tor Browser, pirmiausia turite nueiti į %s Tor naršyklės atsisiuntimo\npuslapį %s ir sekdami instrukcijas atsisiųsti ir paleisti\nTor naršyklę."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Kai pasirodys langas \"Tor tinklo nustatymai\", spauskite \"Konfigūruoti\" ir sekite\nvediklį tol, kol jis paprašys:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Ar jūsų interneto paslaugų tiekėjas (ISP) blokuoja ar kitaip cenzūruoja prisijungimus\nprie Tor tinklo?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -362,28 +366,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Pasirinkite \"Taip\" ir tuomet \"Kitas\". Norėdami konfigūruoti naujus tinklų tiltus, nukopijuokite ir\nįdėkite tinklų tiltų linijas į tekstinį įvesties laukelį. Galiausiai, spustelėkite \"Prisijungti\" ir\nviskas turėtų veikti! Jei iškils nesklandumų, pabandykite spustelėti \"Tor tinklo nustatymuose\" esantį \"Žinyno\" mygtuką."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
msgid "Displays this message."
msgstr "Rodo šį pranešimą."
#. 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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Užklausti paprastų tinklų tiltų."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Užklausti IPv6 tinklų tiltų."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Užklausti prijungiamų perdavimų pagal TIPĄ."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Gauti BridgeDB viešojo GnuPG rakto kopiją."
diff --git a/lv/LC_MESSAGES/bridgedb.po b/lv/LC_MESSAGES/bridgedb.po
index 367a38259..171b59fe3 100644
--- a/lv/LC_MESSAGES/bridgedb.po
+++ b/lv/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Ojars Balcers <ojars.balcers at gmail.com>, 2012
# Ojars Balcers <ojars.balcers at gmail.com>, 2013-2015
# ThePirateDuck <thepirateduck.w at gmail.com>, 2014
@@ -11,17 +10,36 @@ msgid ""
msgstr ""
"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-04-12 18:54+0000\n"
-"Last-Translator: IDRASSI Mounir <mounir.idrassi at idrix.fr>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: lv\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -33,35 +51,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Atvainojiet! Notikusi ar Jūsu pieprasījumu saistīta kļūme."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Ziņot par kļūdu"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Pirmkods"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Atlasīt visu"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Parādīt QRCode"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QRCode Jūsu tiltu rindām"
@@ -69,58 +83,58 @@ msgstr "QRCode Jūsu tiltu rindām"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Ak, man' dieniņ!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Solis %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Solis %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Saņemt %s tiltus %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Solis %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/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"
@@ -129,27 +143,27 @@ msgstr "Tagad %s pievienot Pārlūkam Tor tiltus %s"
#. 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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Lietpratēju opcijas "
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Nē"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sJ%sā!"
@@ -157,7 +171,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sS%saņemt tiltus"
@@ -201,7 +215,7 @@ msgstr "Hei, %s!"
msgid "Hello, friend!"
msgstr "Sveiks, draug!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Publiskās atslēgas"
@@ -251,7 +265,7 @@ 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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Kas ir tilti?"
@@ -269,8 +283,8 @@ msgstr "Man nepieciešams alternatīvs tiltu iegūšanas veids!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %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."
+"%s or %s."
+msgstr "Vēl cits veids kā saņemt tiltu sarakstus ir nosūtīt e-pastu uz %s. Lūdzu, ievērojiet, ka e-pasts jānosūta no norādīto e-pasta pakalpojumu sniedzēju nodrošinātas adreses:\n%s vai %s."
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -279,54 +293,44 @@ msgstr "Mani tilti nestrādā! Man nepieciešama palīdzība!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: 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."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "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."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Te ir Jūsu tiltu līnijas:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Saņemt Tiltus!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Lūdzu, izvēlieties tilta veida opcijas:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Vai ir nepieciešamas IPv6 adreses?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Vai ir nepieciešams %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Jūsu pārlūks neattēlo attēlus pareizi."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Ievadīt burtus no augstāk parādītā attēla..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Kā sākt izmantot Jūsu tiltus"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -335,21 +339,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".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -357,28 +361,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\"."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Pieprasīt parastos tiltus."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Pieprasīt IPv6 tiltus."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
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".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Saņemt BridgeDB publiskās GnuPG atslēgas kopiju."
diff --git a/mk/LC_MESSAGES/bridgedb.po b/mk/LC_MESSAGES/bridgedb.po
index 1e5cc369c..6684a20d3 100644
--- a/mk/LC_MESSAGES/bridgedb.po
+++ b/mk/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Cacko Cackoas <cackothe at gmail.com>, 2015
# Viktor Hristov, 2014
# Zarko Gjurov <zarkogjurov at gmail.com>, 2017-2018
@@ -11,17 +10,36 @@ msgid ""
msgstr ""
"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"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -33,35 +51,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Извинете! Се случи грешка со вашето барање."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Пријави проблем"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Изворен код"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "Лог на измени"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Контакт"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Одбери се"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Покажи QR код"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR код за вашите мост конекции"
@@ -69,58 +83,58 @@ msgstr "QR код за вашите мост конекции"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Леле мајко!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "Има грешка во добивањето на вашиот QR код."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "Моментално нема достапни мостови..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Чекор %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Преземи %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Чекор %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Земи %s мостови %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Чекор %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Сега %s додади ги мостовите во Tor Browser%s"
@@ -129,27 +143,27 @@ msgstr "Сега %s додади ги мостовите во Tor Browser%s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sС%sамо дај ми мост конекции!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Напредни опции"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Не"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sД%sа! Ми требаат IPv6 адреси."
@@ -157,7 +171,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sО%sвозможи Мостови"
@@ -201,7 +215,7 @@ msgstr "Здраво, %s!"
msgid "Hello, friend!"
msgstr "Здраво, пријателу!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Јавни клучеви"
@@ -251,7 +265,7 @@ msgid ""
"\n"
msgstr "Дополнително, BridgeDB има многу стандардни мостови %sбез ниту еден\nPluggable Transports %s преку кои можеби не звучи кул, но тие сеуште можат\nда помогнат во заобиколување на Интернет цензурата во многу случаи.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Што се мостови?"
@@ -269,8 +283,8 @@ msgstr "Ми треба алтернативен начин да добијам
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Друг начин да добиете мостови е да пратите е-пошта на %s. \nЗабелешка: Морате\nда пратите е-пошта користејќи адреса на еден од следниве е-пошта / е-маил провајдери:\n%s, %s или %s."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -279,54 +293,44 @@ msgstr "Моите мостови не функционираат! Ми треб
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ако твојот Tor не работи, тогаш треба да пратите е-пошта на %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "Ова се вашите мост коненции:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Добиј мостови!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Одберете опции за тип на мост:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Дали ви требаат IPv6 адреси?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Дали ти треба %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Вашиот прелистувач не ги покажува сликите правилно."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Внесете ги карактерите од сликата погоре:"
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Како да започнете со користење на мостови"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -335,21 +339,21 @@ msgid ""
msgstr "Да внесете мостови во Tor Browser, прво одете на %s Tor Browser за преземање\nстраната %s и потоа следете ги инструкциите за преземање и стартување на Tor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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
+#: bridgedb/strings.py:148
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
+#: bridgedb/strings.py:152
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"
@@ -357,28 +361,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Одберете 'Да' и кликнете 'Следно'. За да ги конфигурирате вашите нови мостови, копирајте и\nзалепете ја мост линијата во текст полето. На крај кликнете 'Поврзи', и\nби требало да сте готови! Ако имате проблеми, пробајте со кликање на 'Помош'\nкопчето во 'Tor мрежни подесувања' и следете ги инструкциите."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Побарува стандардни мостови."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Побарува IPv6 мостови."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
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
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Преземи копија од јавниот GnuPG клуч на BridgeDB."
diff --git a/ml/LC_MESSAGES/bridgedb.po b/ml/LC_MESSAGES/bridgedb.po
index afbc1ecfb..4205da6a3 100644
--- a/ml/LC_MESSAGES/bridgedb.po
+++ b/ml/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Abhishek C <abhishek.mvr at outlook.com>, 2018
# ameer pb <ameerpbekm at gmail.com>, 2019
# Christy K Kurian <christykurian2494 at gmail.com>, 2018
@@ -13,17 +12,36 @@ msgid ""
msgstr ""
"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-09-12 06:36+0000\n"
-"Last-Translator: ameer pb <ameerpbekm at gmail.com>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Malayalam (http://www.transifex.com/otf/torproject/language/ml/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: ml\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -35,35 +53,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "ക്ഷമിക്കൂ! നിങ്ങളുടെ അഭ്യർത്ഥനയിൽ തെറ്റുണ്ട് "
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "ഒരു ബഗ് റിപ്പോർട്ട് ചെയ്യുക"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "സോഴ്സ് കോഡ്"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "മാറ്റ വിവരപ്പട്ടിക "
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "ബന്ധപ്പെടുക"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "എല്ലാം തിരഞ്ഞെടുക്കുക"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr " QRCode കാണിക്കുക"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "നിങ്ങളുടെ പാലം ലൈനുകൾ വേണ്ടി QRCode"
@@ -71,58 +85,58 @@ msgstr "നിങ്ങളുടെ പാലം ലൈനുകൾ വേണ്
#. "There was a problem!" in your language. For example,
#. for Italian, you might translate this into "Mama mia!",
#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "പരിഹരിക്കുന്നതിലും അതീതമായി "
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "നിങ്ങളുടെ ക്യു ആർ കോഡ് ലഭ്യമാക്കുന്നതിൽ ഒരു പിശക് സംഭവിച്ചു"
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "തൽസമയം ഒരു ബ്രിഡ്ജും ലഭ്യമല്ല."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "ചിലപ്പോൾ താങ്കൾ ഒരു ശതമാനം 1%s പുറകിലേക്കു പോയി 1%s മറ്റൊരു ബ്രിഡ്ജ് സ്വീകരിക്കുക "
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "സ്റ്റെപ് %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "ടോർ ബ്രൗസർ %s ഡൗൺലോഡ് ചെയ്യുക %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "സ്റ്റെപ് %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "ഒരു ശതമാനം %s ബ്രിഡ്ജ് സ്വീകരിക്കുക %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "സ്റ്റെപ് %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "ഇനി ഒരു ശതമാനം %s ബ്രിഡ്ജ് ടോർ ബ്രൗസേറി ലേക് കൂട്ടിച്ചേർക്കുക %s"
@@ -131,27 +145,27 @@ msgstr "ഇനി ഒരു ശതമാനം %s ബ്രിഡ്ജ് ട
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%s ബ്രിഡ്ജുകൾ തരുക %s "
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "കൂടുതൽ ക്രമീകരണങ്ങൾ "
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "വേണ്ട"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%s ശെരി %s "
@@ -159,7 +173,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%s ബ്രിഡ്ജുകൾ എടുക്കുക %s "
@@ -203,7 +217,7 @@ msgstr "നമസ്കാരം ! %s"
msgid "Hello, friend!"
msgstr "നമസ്കാരം സുഹൃത്തേ !"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "പൊതുവായ താക്കോൽ കൂട്ടങ്ങൾ "
@@ -253,7 +267,7 @@ msgid ""
"\n"
msgstr "കൂടാതെ ബ്രിഡ്ജ് ഡിബിക്കു അനവധി പ്ലഗ്ഗ്ബിൾ ട്രാൻസ്പോർട്ടുകൾ %s ഇല്ലാത്ത പ്ലെയിൻ ഓൾ വാനില ബ്രിഡ്ജുകൾ %s ഉണ്ട് \nഅത് കേൾക്കാൻ അത്ര രസം ഇല്ലെങ്കിലും \nഅവയ്ക്കു പല സാഹചര്യത്തിലും ഇന്റർനെറ്റ് സെൻസർഷിപ് ഒഴിവാവാക്കാൻ പറ്റും \n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "എന്തൊക്കെയാണ് ബ്രിഡ്ജുകൾ ?"
@@ -271,8 +285,8 @@ msgstr "എനിക്ക് ബ്രിഡ്ജുകൾ കിട്ടാ
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "ബ്രിഡ്ജുകൾ കിട്ടാൻ മറ്റൊരു വഴി ഉള്ളത് ഇമെയിൽ അയക്കലാണ് %s. ദയവായി ശ്രെദ്ധിക്കുക \nനിങ്ങൾ നിർബന്ധമായും താഴെ പറയുന്ന സേവന ദാദാക്കളുടെ ഈമെയിലിൽ നിന്നും ഇമെയിൽ അയക്കുക \n%s, %s അല്ലെങ്കിൽ %s."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -281,54 +295,44 @@ msgstr "എന്റെ ബ്രിഡ്ജുകൾ പ്രവർത്ത
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "നിങ്ങളുടെ ടോർ പ്രവർത്തിക്കുന്നില്ലെങ്കിൽ തീർച്ചയായും ഇമെയിൽ അയക്കുക %s"
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "കിട്ടാവുന്ന അത്രയും പ്രശ്ന വിവരങ്ങൾ കൂട്ടിച്ചേർക്കാൻ ശ്രെമിക്കുക , \nകൂട്ടത്തിൽ നിങ്ങൾ ഉപയോഗിച്ച ബ്രിഡ്ജുകളുടെ പട്ടികയും ഉപയോഗിച്ച പ്ലഗ്ഗ്ബിൾ ട്രാൻസ്പോർട്ടുകളെയും ഉൾപെടുത്തുക , നിങ്ങളുടെ ടോർ ബ്രൗസറിന്റെ വേർഷനും \nകൂടാതെ ഏതെങ്കിലും സന്ദേശങ്ങൾ ടോർ തന്നിട്ടുണ്ടെങ്കിൽ അതും ."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "ഇതാണ് നിങ്ങളുടെ ബ്രിഡ്ജുകളുടെ പട്ടിക :"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "ബ്രിഡ്ജുകൾ സ്വീകരിക്കുക "
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "ദയവായി ബ്രിഡ്ജു വകഭേദങ്ങൾ തിരഞ്ഞെടുക്കുക :"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "നിങ്ങൾക് ഐ പി വി 6 മേൽവിലാസം ആവശ്യമുണ്ടോ?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "നിങ്ങൾക് ഒരു ആവശ്യമുണ്ടോ %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "നിങ്ങളുടെ ബ്രൌസർ ചിത്രങ്ങൾ വേണ്ട രീതിയിൽ പ്രദര്ശിപ്പിക്കുന്നില്ല ."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr " മുകളിൽ കാണുന്ന ചിത്രത്തിൽ നിന്നും അക്ഷരങ്ങൾ ചേർക്കുക "
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "എങ്ങനെ ബ്രിഡ്ജുകൾ ഉപയോഗിച്ച് തുടങ്ങും "
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -337,21 +341,21 @@ msgid ""
msgstr "ടോർ ബ്രൗസേരിലേക്കു ബ്രിഡ്ജുകൾ ചേർക്കണമെങ്കിൽ , ആദ്യം ടോർ ബ്രൌസർ ഇറക്കിവെക്കുന്ന %s വെബ് സൈറ്റിലേക് പോകുക \n%s എന്നിട് അവിടെ നിന്നും ഇറക്കിവെക്കാനും ടോർ ബ്രൌസർ തുടങ്ങാനുമുള്ള \nനിർദേശങ്ങൾ പിന്തുടരുക "
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "ടോർ നെറ്വർക്കിന്റെ സജ്ജീകരണ ജാലകം വരുമ്പോൾ , കോൺഫിഗറിൽ അമർത്തുകയും ആവശ്യപ്പെടുന്ന \nനിർദേശങ്ങൾ പിന്തുടരുകയും ചെയ്യുക :"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "നിങ്ങളുടെ ഇന്റർനെറ്റ് സേവന ദാതാവ് ( ഐ എസ് പി )ടോർ ശൃംഖലയിലേക്കുള്ള ബന്ധം തടസ്സപ്പെടുത്തുകയോ \nമറ്റോ ചെയ്യുന്നുണ്ടോ?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -359,28 +363,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "അതെ എന്നും തുടരുക എന്നും അമർത്തുക . നിങ്ങളുടെ ടോർ ബ്രിഡ്ജ് സജ്ജീകരിക്കാൻ , \nബ്രിഡ്ജ് വരികൾ ടെക്സ്റ്റ് ബോക്സിലേക് പകർത്തുകയും ഒട്ടിക്കുകയും ചെയ്യുക. അവസാനമായി 'കണക്ടിൽ' അമർത്തുക, കൂടാതെ \nനിങ്ങൾ തയ്യാറായി! ഇനി നിങ്ങൾ എന്തെങ്കിലും പ്രേശ്നങ്ങൾ അഭിമുഘീകരിക്കുക ആണെങ്കിൽ, ടോർ നെറ്റ്വർക്ക് സെറ്റിംഗ്സ് \nഎന്ന സഹായ നിർദ്ദേശ ജാലകത്തിലെ ഹെലീപിൽ അമർത്തുക ."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "വാനില ബ്രിഡ്ജുകൾ അപേക്ഷിക്കുക "
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "ഐ പി വി 6 ബ്രിഡ്ജുകൾ അപേക്ഷിക്കുക "
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "ഒരു പ്ലഗ്ഗ്ബിൾ ട്രാൻസ്പോർട് രീതി അപേക്ഷിക്കുക "
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "ബ്രിഡ്ജ് ഡി ബി യുടെ പൊതുവായ ഒരു ഗ്നു പി ജി കീ ലഭ്യമാക്കുക "
diff --git a/mr/LC_MESSAGES/bridgedb.po b/mr/LC_MESSAGES/bridgedb.po
index ec3f14ea9..8b2925d35 100644
--- a/mr/LC_MESSAGES/bridgedb.po
+++ b/mr/LC_MESSAGES/bridgedb.po
@@ -1,25 +1,43 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Vikrant Korde <vikrant.korde at gmail.com>, 2015-2016
msgid ""
msgstr ""
"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: 2017-09-19 18:38+0000\n"
-"Last-Translator: Vikrant Korde <vikrant.korde at gmail.com>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Marathi (http://www.transifex.com/otf/torproject/language/mr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: mr\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -31,35 +49,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "क्षमस्व! काहीतरी चूक झाली आहे"
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "दोष नोंदवा"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "सोअर्स कोड"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "बदल लॉग"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "संपर्क"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "सर्व निवडा"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "क्यूआर कोड दर्शवा"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "क्यू आर कोड मिळवताना गडबड झाली"
@@ -67,58 +81,58 @@ msgstr "क्यू आर कोड मिळवताना गडबड झ
#. "There was a problem!" in your language. For example,
#. for Italian, you might translate this into "Mama mia!",
#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "ओ हो !"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "मिळवताना गडबड झाली"
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "सध्या कोणतेही ब्रिजेस उपलब्ध नाहीत ... "
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "पायरी %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "डाउनलोड %s टोर ब्राउझर %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "पायरी %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "%s पूल %s मिळवा"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "पायरी %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "आता %s ब्रिजेस टोर ब्राउझर मध्ये टाका %s"
@@ -127,27 +141,27 @@ msgstr "आता %s ब्रिजेस टोर ब्राउझर म
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sम%sला ब्रिजेस द्या!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "प्रगत पर्याय"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "नाही"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sहो%sय!"
@@ -155,7 +169,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%s पूल %s मिळवा"
@@ -199,7 +213,7 @@ msgstr "ओय, %s!"
msgid "Hello, friend!"
msgstr "हॅलो, मित्रा !"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "पब्लिक किज्"
@@ -249,7 +263,7 @@ msgid ""
"\n"
msgstr ""
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "ब्रिजेस म्हणजे काय?"
@@ -267,7 +281,7 @@ msgstr "मला ब्रिजेस मिळवण्यासाठी प
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
+"%s or %s."
msgstr ""
#: bridgedb/strings.py:115
@@ -277,54 +291,44 @@ msgstr "माझे ब्रिजेस कार्य करत नाह
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "आपले टोर चालत नसेल तर, %s इथे ईमेल करा."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
msgstr ""
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:121
msgid "Here are your bridge lines:"
msgstr "आपल्या ब्रिज ओळी"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "%s पूल %s मिळवा"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "ब्रिज प्रकारातील पर्याय निवडा:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "आपणास IPv6 पत्ते (addresses) हवे आहेत का? "
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "आपणास %s हवे आहे का?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "आपला ब्राउझर प्रतिमा नीट दाखवत नाही. "
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "वरील प्रतिमेतील शब्द लिहा"
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "आपले ब्रिजेस कसे वापरावेत"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -333,21 +337,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -355,28 +359,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "सध्या ब्रिजची विनंती."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "IPv6 ब्रिजेस विनंती."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
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
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "BridgeDB साठी पब्लिक GnuPG की प्रत मिळवा."
diff --git a/ms_MY/LC_MESSAGES/bridgedb.po b/ms_MY/LC_MESSAGES/bridgedb.po
index 3340421db..133e5a802 100644
--- a/ms_MY/LC_MESSAGES/bridgedb.po
+++ b/ms_MY/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# abuyop <abuyop at gmail.com>, 2017
# Celine Yap Suet Ling <celine.sodawine at gmail.com>, 2017
# danial abd talib <muhammaddanialabdtalib at gmail.com>, 2014
@@ -16,17 +15,36 @@ msgid ""
msgstr ""
"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"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: ms_MY\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -38,35 +56,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Maaf! Terdapat sedikit kesulitan dengan permintaan anda."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Lapor kesilapan kod"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Kod Sumber"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Pilih Semua"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Tunjuk Kod QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR Kod untuk talian 'bridge'"
@@ -74,58 +88,58 @@ msgstr "QR Kod untuk talian 'bridge'"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Alamak, spaghettios!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:132
#, python-format
msgid ""
" 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!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Langkah %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Langkah%s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Dapatkan %s titi %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Langkah%s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/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"
@@ -134,27 +148,27 @@ msgstr "Kemudian%s tambah bridges tersebut ke Pelayar Web Tor %s"
#. 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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Pilihan Lanjutan"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Tidak"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sY%sa!"
@@ -162,7 +176,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sG%suna Bridges"
@@ -206,7 +220,7 @@ msgstr "Hai, %s!"
msgid "Hello, friend!"
msgstr "Hai, kawan!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Kunci Awam"
@@ -256,7 +270,7 @@ msgid ""
"\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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Apakah itu 'bridges'?"
@@ -274,8 +288,8 @@ msgstr "Saya perlukan jalan lain untuk dapatkan titi!"
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."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -284,54 +298,44 @@ msgstr "'Bridge' saya tidak berfungsi! Saya perlukan bantuan!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Jika konfigurasi Tor tidak berfungsi, anda patut email %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Dapat sambungan Bridges!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Sila pilih jenis bridge:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Anda perlukan alamat IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Perlukah anda %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Pelayar anda tidak memaparkan imej dengan betul."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Masukkan imej aksara yang tertera..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
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
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -340,21 +344,21 @@ msgid ""
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
+#: bridgedb/strings.py:144
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
+#: bridgedb/strings.py:148
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
+#: bridgedb/strings.py:152
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"
@@ -362,28 +366,28 @@ msgid ""
"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
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Pinta bridges yang disyorkan."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Pinta IPv6 bridges."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
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
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Dapatkan salinan dari BridgeDB GnuPG kunci awam."
diff --git a/nb/LC_MESSAGES/bridgedb.po b/nb/LC_MESSAGES/bridgedb.po
index a1e7e1b6b..79a8677e1 100644
--- a/nb/LC_MESSAGES/bridgedb.po
+++ b/nb/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# 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
@@ -17,17 +16,36 @@ msgid ""
msgstr ""
"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: 2017-12-29 18:29+0000\n"
-"Last-Translator: Allan Nordhøy <epost at anotheragency.no>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: nb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -39,35 +57,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Beklager! Noe gikk galt med forespørselen din."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Innrapporter feil"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Kildekode"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Velg alt"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Vis QR-kode"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR-kode for dine brolinjer"
@@ -75,58 +89,58 @@ msgstr "QR-kode for dine brolinjer"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Oisann!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Steg %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Steg %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Tilknytt %s broer %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Steg %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/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"
@@ -135,27 +149,27 @@ msgstr "Nå %s legg til broer til Tor-nettleseren %s"
#. 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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Avanserte valg"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Nei"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sJ%sa!"
@@ -163,7 +177,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sT%silknytt broer"
@@ -207,7 +221,7 @@ msgstr "Hei, %s!"
msgid "Hello, friend!"
msgstr "Hallo, lille venn!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Offentlige nøkler"
@@ -257,7 +271,7 @@ msgid ""
"\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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Hva er broer?"
@@ -275,8 +289,8 @@ msgstr "Jeg trenger en alternativ måte å få broer på!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %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."
+"%s or %s."
+msgstr "En annen måte å tilknytte seg broer på er å sende en epost til %s. Merk at du må\nsende eposten fra en adresse tilhørende en av følgende epost-tilbydere:\n%s eller %s."
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -285,54 +299,44 @@ msgstr "Broene mine virker ikke! Jeg trenger hjelp!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: 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 e-post til %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "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."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Her er dine bro-linjer:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Tilknytt broer!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Gjør valg for brotype:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Trenger du IPv6-adresser?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Trenger du en %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Nettleseren din viser ikke bilder ordentlig."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Skriv inn bokstavene fra bildet ovenfor…"
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Hvordan starte med bruk av dine broer"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -341,21 +345,21 @@ msgid ""
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".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -363,28 +367,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
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."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Be om broer med \"vanilla\" fabrikkoppsett."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Etterspør IPv6-broer."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
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".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Få kopi av BridgeDBs offentlige GnuPG-nøkkel."
diff --git a/nl/LC_MESSAGES/bridgedb.po b/nl/LC_MESSAGES/bridgedb.po
index 089ae79f8..d4f29b444 100644
--- a/nl/LC_MESSAGES/bridgedb.po
+++ b/nl/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Adriaan Callaerts <adriaan.callaerts at gmail.com>, 2013
# André Koot <meneer at tken.net>, 2016
# Ann Boen <ann.boen at gmail.com>, 2014
@@ -14,6 +13,7 @@
# Joren Vandeweyer <jorenvandeweyer at gmail.com>, 2019
# 53a60eabbf5124a226a7678001f9a57b, 2015
# Meteor 0id, 2019
+# Meteor 0id, 2019
# Not Much <1028484728393 at protonmail.com>, 2018
# Shondoit Walker <shondoit at gmail.com>, 2011
# Marco Brohet <inactive+therbom at transifex.com>, 2012
@@ -26,17 +26,36 @@ msgid ""
msgstr ""
"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-09-09 13:57+0000\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 01:01+0000\n"
"Last-Translator: Meteor 0id\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -48,35 +67,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Sorry! Er is iets misgegaan met uw aanvraag."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Een bug melden"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Broncode"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "Lijst van wijzigingen"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contact"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Alles selecteren"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "QRCode tonen"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QRCode voor uw bridge regels"
@@ -84,58 +99,58 @@ msgstr "QRCode voor uw bridge regels"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Helaas pindakaas!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Stap %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Stap %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Download %s bridges %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Stap %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/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"
@@ -144,27 +159,27 @@ msgstr "Nu %s voeg de bridges toe aan Tor Browser %s"
#. 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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Geavanceerde opties"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Nee"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sJ%sa!"
@@ -172,7 +187,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sK%srijg Bridges"
@@ -216,7 +231,7 @@ msgstr "Hoi, %s!"
msgid "Hello, friend!"
msgstr "Hallo, vriend!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Publieke Sleutels"
@@ -266,7 +281,7 @@ 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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Wat zijn bridges?"
@@ -284,8 +299,8 @@ msgstr "Ik heb een alternatieve manier nodig om bridges te verkrijgen!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %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."
+"%s or %s."
+msgstr "Een andere manier om bridges te bemachtingen is door een email te sturen naar %s. \nHoudt er rekening mee dat u een email moet sturen door gebruik te maken van een adres van een de volgende providers:\n%s of %s."
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -294,54 +309,44 @@ msgstr "Mijn bridges werken niet! Ik heb hulp nodig!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Als je Tor niet werkt, email dan naar %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr "Als het met je Tor niet lukt om verbinding te maken, lees dan naar de %s en onze %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 "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."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Hier zijn je bridge regels:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Krijg Bridges!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Selecteer opties voor bridge type:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Heb je IPv6 adressen nodig?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Heb je een %s nodig?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Uw browser vertoont afbeeldingen niet naar behoren."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Voer de tekens in van de afbeelding hieronder…"
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Hoe te starten met het gebruik van je bridges"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -350,21 +355,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".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -372,28 +377,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."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Vraag vanilla bridges aan."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Verzoek IPv6 bridges"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
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".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Verkrijg een kopie van BridgeDB's publieke GnuPG key."
diff --git a/nl_BE/LC_MESSAGES/bridgedb.po b/nl_BE/LC_MESSAGES/bridgedb.po
index ce1ba2253..1f3b356fd 100644
--- a/nl_BE/LC_MESSAGES/bridgedb.po
+++ b/nl_BE/LC_MESSAGES/bridgedb.po
@@ -1,25 +1,43 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Katrien Igodt <kigodt at gmail.com>, 2015
msgid ""
msgstr ""
"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-06-08 07:09+0000\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Dutch (Belgium) (http://www.transifex.com/otf/torproject/language/nl_BE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: nl_BE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -31,35 +49,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Onze excuses! Er ging iets mis met uw aanvraag."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Rapporteer een Bug"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Broncode"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "Changelog"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contacteer"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Selecteer Alles"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Toon QRCode"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QRCode voor uw bridge lines"
@@ -67,58 +81,58 @@ msgstr "QRCode voor uw bridge lines"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "t'Is om zeep!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "Er lijkt een fout gebeurd te zijn in het verkrijgen van uw QRCode."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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 lines. Scan deze aub met een QRCode lezer om zo uw bridge lines te kopiëren naar uw mobiele en andere toestellen. "
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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 u proberen %s even terug %s te gaan om een andere bridge type te selecteren."
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Stap %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Stap %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Verkrijg %s bridges %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Stap %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Voeg nu %s de bridges toe aan de Tor Browser %s."
@@ -127,27 +141,27 @@ msgstr "Voeg nu %s de bridges toe aan de Tor Browser %s."
#. 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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Geavanceerde Opties"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Nee"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sJ%sa!"
@@ -155,7 +169,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sV%serkrijg Bridges"
@@ -199,7 +213,7 @@ msgstr "Hallo, %s!"
msgid "Hello, friend!"
msgstr "Hallo, vriend!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Public Keys"
@@ -249,7 +263,7 @@ msgid ""
"\n"
msgstr "Verder heeft BridgeDB standaard bridges %s in overvloed zonder enige Pluggable Transports %s. Dit lijkt allemaal niet zo spannend, maar helpen nog steeds om in de meeste gevallen internetcensuur te omzeilen. \n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Wat zijn bridges?"
@@ -267,8 +281,8 @@ msgstr "Ik heb een alternatieve route nodig om bridges te verkrijgen!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Een andere manier om bridges te verkrijgen is om een email te sturen naar %s. Gelieve zeker te zijn dat u uw e-mail verstuurt vanuit een e-mailadres van de volgende e-mail providers:\n%s, %s of %s."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -277,54 +291,44 @@ msgstr "Mijn bridges werken niet! Ik heb hulp nodig!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Indien Tor niet werkt, dient u een e-mail te sturen naar %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "Probeer zoveel mogelijk informatie mee te geven, \nzoals de lijst van\nbridges en Pluggable Transports die u probeerde te gebruiken, de versie van uw Tor Browser,\nen de meldingen die u verkreeg van Tor, etc."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Hier zijn uw bridge lines:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Verkrijg Bridges!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Gelieve opties te selecteren voor bridge type:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Heeft u IPv6 adressen nodig?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Heeft u een %s nodig?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Uw browser geeft afbeeldingen niet correct weer."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Voer de karakters van de afbeelding hierboven in..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Hoe beginnen met bridges te gebruiken"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -333,21 +337,21 @@ msgid ""
msgstr "Om bridges toe te voegen in de Tor Browser, gaat u eerst naar de %s Tor Browser download\npagina %s en volgt u daar verder instructies om de Tor Browser te downloaden en te starten."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Wanneer het 'Tor Netwerk Instellingen' dialoogvenster opent, klikt u op 'Configureer' en volgt u de wizard totdat deze vraagt: "
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Blokkeert of censureert uw internetleverancier (ISP) connecties naar het Tor netwerk?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -355,28 +359,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Selecteer 'Ja' en klik vervolgens op 'Volgende'. Om uw nieuwe bridges te configureren, kopieer en plak de bridge lines in het tekst invoerveld. Tenslotte, klik 'Connecteer' en u zou moeten kunnen connecteren. Indien u toch problemen ondervindt, klik dan op de 'Help' knop in de 'Tor Netwerk Instellingen' wizard voor verdere ondersteuning."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Vraag standaard bridges aan."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Vraag IPv6 bridges aan."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Vraag Pluggable Transport by TYPE aan."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Verkijg een kopie van de BridgeDB's public GnuPG key."
diff --git a/nn/LC_MESSAGES/bridgedb.po b/nn/LC_MESSAGES/bridgedb.po
index 5e6ebc28d..cd1710bff 100644
--- a/nn/LC_MESSAGES/bridgedb.po
+++ b/nn/LC_MESSAGES/bridgedb.po
@@ -1,26 +1,44 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Bjørn I., 2014-2015
# Finn Brudal <finnbrudal at yahoo.com>, 2016
msgid ""
msgstr ""
"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: 2017-09-19 19:57+0000\n"
-"Last-Translator: Finn Brudal <finnbrudal at yahoo.com>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: nn\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -32,35 +50,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Orsak! Noko gjekk gale med førespurnaden din."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Rapporter feil"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Kjeldekode"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Vel alle"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Vis QR-kode"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR-for brulinjene dine"
@@ -68,58 +82,58 @@ msgstr "QR-for brulinjene dine"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Ojsann!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "Det oppstod ein feil under henting av QR-koden din."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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 inneheld brulinjene dine. Skann han med ein QR-lesar for å kopiera brulinjene dine over på mobilen og andre einingar."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "Ingen bruer er for tida tilgjengelege "
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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 skulle freista å %s gå tilbake %s og velja ei anna brutype!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Steg %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Last ned %s Tor-nettlesaren %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Steg %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Hent %s bruer %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Steg %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "No kan du %s leggja til bruene i Tor Browser %s"
@@ -128,27 +142,27 @@ msgstr "No kan du %s leggja til bruene i Tor Browser %s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sB%serre gje meg nokre bruer!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Avanserte innstillingar"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Nei"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sJ%sa!"
@@ -156,7 +170,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sK%snyt til bruer"
@@ -200,7 +214,7 @@ msgstr "Hei, %s!"
msgid "Hello, friend!"
msgstr "Hallo, ven!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Offentlege nøklar"
@@ -250,7 +264,7 @@ msgid ""
"\n"
msgstr "I tillegg hev BridgeDB mange vanlege bruer %s utan nokon Pluggbare\nTransportar %s, noko som kanskje ikkje høyrast så kult ut, men dei kan framleis\nhjelpa med å koma utanum internettsensur i mange døme.\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Kva er bruer?"
@@ -268,8 +282,8 @@ msgstr "Eg treng ein alternativ måte å få bruer på!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Eit anna vis å fenge bruer på er å sende ein e-post åt %s. Ver venleg og merk at du\nlyt sende e-posten ved hjelp av ei adressa frå ein av dei fylgjande\ne-poståtbjodarane: %s, %s eller %s."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -278,54 +292,44 @@ msgstr "Brua mi verkar ikkje! Eg treng hjelp!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Om Tor ikkje fungerer, skriv ein e-post til %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "Freist å taka med so mange upplysingar um saka di som du kan, medrekna\nlista yver bruer og Pluggbare Transportar du freista å nytta, Tor-nettlesarversjonen\ndin og alle meldinger som Tor gav ut, osv."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Her er bru-linene dine:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Få bruer!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Ver venleg og gjer val for brutype:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Treng du IPv6-adresser?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Treng du %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Nettlesaren din viser ikkje bilete skikeleg."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Skriv inn teikn frå biletet nedanfor "
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Korleis starta å bruka bruer"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -334,21 +338,21 @@ msgid ""
msgstr "For å leggja bruer inn i Tor-nettlesaren, gakk fyst åt %s Tor-nettlesarnedlastings-\nsida %s og fylg deretter rettleiingane der for å lasta ned og starta Tor-nettlesaren."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Når 'Tor-nettverksinnstillingar'-dialogen kjem upp, klikk på 'Set upp' og fylg\nvegvisaren inntil han spør:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Blokkerer internett-tenesteåtbjodaren (ISP) din eller sensurerer han på anna vis\ntilkoplingar åt Tor-nettverket?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -356,28 +360,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Vel 'Ja' og klikk deretter 'Neste'. For å setja upp dei nye bruene dine, kopier og\nlim brulinene inn i tekstfeltet. Klikk åt slutt 'Kopla til', og du burde vere klår! Um du\nupplever vanskar, freist å klikka på 'Hjelp'-knappen i 'Tor-nettverksinnstillingar'-\nvegvisaren for meir hjelp."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
msgid "Displays this message."
msgstr "Viser denne meldinga."
#. 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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Be om bruer med fabrikkoppsett."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Be om IPv6-bruer."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Be um ein Pluggbar Transport ved hjelp av TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Feng ein kopi av BridgeDBs offentlege GnuPG-lykel."
diff --git a/pa/LC_MESSAGES/bridgedb.po b/pa/LC_MESSAGES/bridgedb.po
index 8003375e1..dc59dcdb0 100644
--- a/pa/LC_MESSAGES/bridgedb.po
+++ b/pa/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# A S Alam <alam.yellow at gmail.com>, 2014
# KAMALJEET SINGH, 2018
# SONIA SINGLA <soniasingla.1812 at gmail.com>, 2018
@@ -11,17 +10,36 @@ msgid ""
msgstr ""
"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-09-05 14:15+0000\n"
-"Last-Translator: KAMALJEET SINGH\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/otf/torproject/language/pa/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: pa\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -33,35 +51,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "ਅਫ਼ਸੋਸ ਹੈ ਕਿ ਤੁਹਾਡੀ ਬੇਨਤੀ ਵਿਚ ਕੁਝ ਗਲਤ ਹੋ ਗਿਆ ਹੈ |"
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "ਇੱਕ ਬੱਗ ਦੀ ਰਿਪੋਰਟ ਕਰੋ |"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "ਸਰੋਤ ਕੋਡ |"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "ਲਾਗ ਬਦਲੋ"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "ਸੰਪਰਕ "
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "ਸਾਰੇ ਚੁਣੋ"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "QR ਕੋਡ ਦਿਖਾਓ"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR ਕੋਡ ਤੁਹਾਡੀ ਪੁੱਲ ਲਾਈਨਜ਼ ਲਈ"
@@ -69,58 +83,58 @@ msgstr "QR ਕੋਡ ਤੁਹਾਡੀ ਪੁੱਲ ਲਾਈਨਜ਼ ਲਈ"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "ਓਹ, ਸਪੈਗੇਟੀਓਸ!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "ਅਜਿਹਾ ਲਗਦਾ ਹੈ ਕਿ ਤੁਹਾਡੇ QRcode ਨੂੰ ਪ੍ਰਾਪਤ ਕਰਨ ਵਿੱਚ ਇੱਕ ਤਰੁੱਟੀ ਹੋਈ ਸੀ"
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "ਇਸ ਵੇਲੇ ਕੋਈ ਵੀ ਪੁਲ ਉਪਲਬੱਧ ਨਹੀਂ ਹੈ ..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "ਕਦਮ %s 1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "ਡਾਉਨਲੋਡ %s ਟੋਰ ਬ੍ਰਾਉਜ਼ਰ %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "ਕਦਮ %s 2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "ਪੁਲ %s ਲਵੋ %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "ਕਦਮ %s 3 %s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr ""
@@ -129,27 +143,27 @@ msgstr ""
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr ""
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "ਨਹੀਂ"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -157,7 +171,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr ""
@@ -201,7 +215,7 @@ msgstr ""
msgid "Hello, friend!"
msgstr ""
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "ਪਬਲਿਕ ਕੁੰਜੀ"
@@ -251,7 +265,7 @@ msgid ""
"\n"
msgstr ""
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "ਪੁਲ ਕੀ ਹਨ?"
@@ -269,7 +283,7 @@ msgstr ""
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
+"%s or %s."
msgstr ""
#: bridgedb/strings.py:115
@@ -279,54 +293,44 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
msgstr ""
-#. 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 ""
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr ""
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr ""
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr ""
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr ""
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -335,21 +339,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -357,28 +361,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr ""
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
diff --git a/pl/LC_MESSAGES/bridgedb.po b/pl/LC_MESSAGES/bridgedb.po
index ce86df166..c7c0778f9 100644
--- a/pl/LC_MESSAGES/bridgedb.po
+++ b/pl/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Aron <aron.plotnikowski at cryptolab.net>, 2014
# Aron <aron.plotnikowski at cryptolab.net>, 2013
# JerBen <ayurveda63 at gmail.com>, 2012
@@ -18,17 +17,36 @@ msgid ""
msgstr ""
"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-01-15 12:20+0000\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: pl\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"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -40,35 +58,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Przepraszamy! Ale coś poszło nie tak z Twoim zapytaniem."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Zgłoś Błąd"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Kod źródłowy"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Zaznacz wszystko"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Pokaż KodQR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "KodQR dla Twoich linii bridge"
@@ -76,58 +90,58 @@ msgstr "KodQR dla Twoich linii bridge"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Ups, coś poszło nie tak!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Krok %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Krok %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Pobierz %s mostki %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Krok %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/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"
@@ -136,27 +150,27 @@ msgstr "Teraz %s dodaj mosty do Tor Browser %s"
#. 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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Opcje zaawansowane"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Nie"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sT%sak!"
@@ -164,7 +178,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sP%sozyskaj mosty"
@@ -208,7 +222,7 @@ msgstr "Witaj, %s!"
msgid "Hello, friend!"
msgstr "Witaj przyjacielu!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Klucze Publiczne"
@@ -258,7 +272,7 @@ 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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Czym są mostki?"
@@ -276,8 +290,8 @@ msgstr "Potrzebuję alternatywnego sposobu na pozyskanie mostków!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %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."
+"%s or %s."
+msgstr "Innym sposobem uzyskania bridges jest wysłanie e-maila do %s. Proszę pamiętaj, że musisz \nwysłać e-mail za uzywając adresu z jednego z następujących dostawców usługi email:\n%s lub %s."
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -286,54 +300,44 @@ msgstr "Moje mostki nie działają! Potrzebuję pomocy!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: 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."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "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."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Oto Twoje połączenia z wykorzystaniem mostów:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Zdobądź Mosty!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Proszę wybrać opcje dla typu mostu:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Czy potrzebujesz adresów IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Czy potrzebujesz %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Twoja przeglądarka nie wyświetla obrazów prawidłowo."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Wprowadź tekst z obrazka powyżej..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Jak zacząć używać mostów"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -342,21 +346,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".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -364,28 +368,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."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Poproś o regularne mosty."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Poproś o mosty IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
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".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Uzyskaj kopię klucza publicznego GnuPG BridgeDB."
diff --git a/pt_BR/LC_MESSAGES/bridgedb.po b/pt_BR/LC_MESSAGES/bridgedb.po
index 1ef738569..ee9eb82bb 100644
--- a/pt_BR/LC_MESSAGES/bridgedb.po
+++ b/pt_BR/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Communia <ameaneantie at riseup.net>, 2013-2017
# André Almeida <andrefalmeida at protonmail.com>, 2018
# anominino anomino <anominino at riseup.net>, 2018
@@ -25,17 +24,36 @@ msgid ""
msgstr ""
"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-08-02 18:18+0000\n"
-"Last-Translator: Cy Belle <cyb3ll3 at protonmail.com>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -47,35 +65,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Desculpe! Algo errado ocorreu com a sua solicitação."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Relatar um Bug"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Código Fonte:"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Selecionar tudo"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Mostrar Código QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Código QR para as suas pontes de conexão"
@@ -83,58 +97,58 @@ msgstr "Código QR para as suas pontes de conexão"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Ai, caramba!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Passo %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Passo %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Obter %s pontes %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Passo %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/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"
@@ -143,27 +157,27 @@ msgstr "Agora, %s inserir as pontes no Navegador Tor %s"
#. 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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Opções Avançadas"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Não"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sS%sim!"
@@ -171,7 +185,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sObter%s Bridges"
@@ -215,7 +229,7 @@ msgstr "Olá, %s!"
msgid "Hello, friend!"
msgstr "Olá, amigo!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Chaves Públicas"
@@ -265,7 +279,7 @@ msgid ""
"\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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "O que são pontes?"
@@ -283,8 +297,8 @@ msgstr "Preciso de um outro modo de obter pontes!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %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."
+"%s or %s."
+msgstr "Outro modo de obter pontes é enviando um e-mail para %s. Por favor, lembre que você deve enviar o e-mail utilizando um endereço de um dos seguintes provedores de e-mail: \n%s ou %s. "
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -293,54 +307,44 @@ msgstr "Minhas pontes não funcionam! Preciso de ajuda!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: 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."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "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."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Aqui estão as suas pontes de conexão:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Obtenha Pontes!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Por favor, selecione as opções de tipos de pontes:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Você precisa de endereços IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Você precisa de %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Seu navegador não está mostrando as imagens corretamente."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Digite os caracteres da imagem acima..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Como começar a usar as suas pontes"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -349,21 +353,21 @@ 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".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -371,28 +375,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
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."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Solicitar pontes simples."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Solicitar pontes IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Solicitar um Transportador Plugável por TIPO."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Obter uma cópia da chave pública GnuPG do BridgeDB."
diff --git a/pt_PT/LC_MESSAGES/bridgedb.po b/pt_PT/LC_MESSAGES/bridgedb.po
index e42ec77a8..89fb1bd13 100644
--- a/pt_PT/LC_MESSAGES/bridgedb.po
+++ b/pt_PT/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# A Russo <quisquiliarum2001-habitica at yahoo.co.uk>, 2019
# Manuela Silva <manuelarodsilva at gmail.com>, 2018
# Manuela Silva <manuelarodsilva at gmail.com>, 2019
@@ -13,17 +12,36 @@ msgid ""
msgstr ""
"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-08-11 10:53+0000\n"
-"Last-Translator: Nuno Rego <nuno.rego at outlook.com>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/otf/torproject/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -35,35 +53,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Desculpe! Ocorreu algo de errado com o seu pedido."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Comunicar um Erro"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Código Fonte"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "Registo de alterações"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contactar"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Selecionar Tudo"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Mostrar Código QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Código QR para as suas linhas de ponte"
@@ -71,58 +85,58 @@ msgstr "Código QR para as suas linhas de ponte"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Ocorreu um erro!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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 linhas de ponte. Digitalize-as com um leitor de Código QR para copiar as suas linhas de ponte para os dispositivos móveis e outros dispositivos."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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, escolhendo um tipo de ligação diferente!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Passo %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Passo %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Obter %s pontes %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Passo %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/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"
@@ -131,27 +145,27 @@ msgstr "Agora, %s adicione as pontes ao Tor Browser %s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sD%sisponibilizem-me apenas as pontes!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Opções Avançadas"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Não"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sS%sim!"
@@ -159,7 +173,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sO%sbter Pontes"
@@ -203,7 +217,7 @@ msgstr "Olá, %s!"
msgid "Hello, friend!"
msgstr "Olá, amigo!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Chaves Públicas"
@@ -253,7 +267,7 @@ msgid ""
"\n"
msgstr "Adicionalmente, BridgeDB tem imensas ligações %s simples, normais e regulares,\nsem quaisquer Transportes de Ligação %s, o que poderá não parecer ótimo, mas estes,\nainda assim, ajudam a contornar a censura na Internet, na maioria dos casos.\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "O que são pontes?"
@@ -271,8 +285,8 @@ msgstr "Eu preciso de um modo alternativo para obter as pontes!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Outra forma de 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."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -281,54 +295,44 @@ msgstr "As minhas pontes não funcionam! Eu preciso de ajuda!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: 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."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "Tente incluir o máximo de informação possível sobre o seu caso, incluindo a lista\nde ligações e Pluggable Transports que tentou utilizar, a versão do seu Tor Browser e \nquaisquer mensagens que o Tor devolveu, etc."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Aqui estão as suas linhas de ponte:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Obter Pontes!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Por favor, selecione as opções para o tipo de ponte:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Precisa de endereços de IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Precisa de %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "O seu navegador não está a exibir as imagens devidamente."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Insira os carateres da imagem acima..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Como começar a utilizar as suas pontes"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -337,21 +341,21 @@ msgid ""
msgstr "Para inserir as ligações no Tor Browser, aceda primeiro à página %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".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Assim que aparecer a janela de 'Configurações da Rede Tor' clique em 'Configurar' e siga\nas instruções do assistente até que lhe pergunte:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "O seu fornecedor de acesso à Internet (ISP) bloqueia ou censura as ligações\nà rede Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -359,28 +363,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Selecione 'Sim' e depois clique em 'Seguinte'. Para configurar as suas novas conexões, 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."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
msgid "Displays this message."
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.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Solicite as pontes básicas."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Solicite as pontes de IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Solicite um Transporte de Ligação por TIPO."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Obtenha uma cópia da chave pública GnuPG da BridgeDB."
diff --git a/ro/LC_MESSAGES/bridgedb.po b/ro/LC_MESSAGES/bridgedb.po
index 3f05a7d4e..afaebe8c0 100644
--- a/ro/LC_MESSAGES/bridgedb.po
+++ b/ro/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# A C <ana at shiftout.net>, 2019
# Adda.17 <inactive+Adda.17 at transifex.com>, 2013
# Adrian Staicu <astaicu at gmail.com>, 2017
@@ -17,17 +16,36 @@ msgid ""
msgstr ""
"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-01-08 20:34+0000\n"
-"Last-Translator: A C <ana at shiftout.net>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -39,35 +57,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Scuze ! Ceva n-a mers cum trebuie!"
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Raportează un bug"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Cod sursă"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Selectare totală"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Arată QRcod-ul"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Cod QR pentru punțile tale"
@@ -75,58 +89,58 @@ msgstr "Cod QR pentru punțile tale"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Oops, ca să vezi!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Pasul %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Pasul %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Pasul %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/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"
@@ -135,27 +149,27 @@ msgstr "Acum %s adaugă punțile în Tor Browser %s"
#. 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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Opțiuni avansate"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Nu"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sD%sa!"
@@ -163,7 +177,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sO%sbține Bridges"
@@ -207,7 +221,7 @@ msgstr "Bună , %s!"
msgid "Hello, friend!"
msgstr "Bună, prietene!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Chei publice"
@@ -257,7 +271,7 @@ msgid ""
"\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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Ce sunt punțile? "
@@ -275,8 +289,8 @@ msgstr "Am nevoie de o cale alternativă de a obține punțile!"
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 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."
+"%s or %s."
+msgstr "Alt mod de a obține punție este să trimiteți un email la %s. Remarcați că trebuie să trimiteți un email de la unul din următorii privederi::\n%s or %s."
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -285,54 +299,44 @@ msgstr "Punțile mele nu funcționează! Am nevoie de ajutor!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Dacă Tor nu funcţionează pentru tine, trimite un mesaj la %s ."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "Î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."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Acestea sunt liniile tale de punți:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Obține punți!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Alege opțiunile pentru tipul de punte:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Ai nevoie de adrese IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Ai nevoie de %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Browserul nu afișează imaginile corect."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Introdu caracterele din imaginea de mai sus..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Cum să începi să foloseşti punțile"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -341,21 +345,21 @@ msgid ""
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".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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ă 'Configurare' și urmează \nindicațiile programului până când va cere:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -363,28 +367,28 @@ msgid ""
"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 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'."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Cere punți simple."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Cere punți IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Solicită un Transport Conectabil după TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Obține o copie a cheii GnuPG publice a BridgeDB."
diff --git a/ru/LC_MESSAGES/bridgedb.po b/ru/LC_MESSAGES/bridgedb.po
index c40b69918..1cacedc6f 100644
--- a/ru/LC_MESSAGES/bridgedb.po
+++ b/ru/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Andrey, 2017
# Andrey Yoker Ogurchikov <domovoy.yoker at gmail.com>, 2014
# Антон Толмачев <a.tolmachev at richart-consalt.ru>, 2016
@@ -30,17 +29,36 @@ msgid ""
msgstr ""
"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-01 09:18+0000\n"
-"Last-Translator: Dmitry Schneider <adamred280 at live.ru>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\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 1.3\n"
+"Generated-By: Babel 2.7.0\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"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -52,35 +70,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Извините! Что-то пошло не так с вашим запросом."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Сообщить об ошибке"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Исходный код"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "Журнал изменений"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Контакты"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Выбрать все"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Показать QR-код"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR-код для адресов ретрансляторов"
@@ -88,58 +102,58 @@ msgstr "QR-код для адресов ретрансляторов"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Эх, что-то пошло не так!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "Похоже, произошла ошибка при получении QR-кода."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "На данный момент нет доступных мостов..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Шаг %s№1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Скачайте %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Шаг %s№2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Установите %s мосты %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Шаг %s№3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Затем %s добавьте адреса мостов в Tor Browser %s"
@@ -148,27 +162,27 @@ msgstr "Затем %s добавьте адреса мостов в Tor Browser
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sП%sросто добавьте ваш адрес моста!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Дополнительные настройки"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Нет"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sД%sа! "
@@ -176,7 +190,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sПолучить адреса мостов%s"
@@ -220,7 +234,7 @@ msgstr "Эй, %s!"
msgid "Hello, friend!"
msgstr "Здравствуй, друг!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Открытые ключи"
@@ -270,7 +284,7 @@ msgid ""
"\n"
msgstr "Более того, BridgeDB содержит множество стандартных мостов %s, не поддерживающий передачу данных %s, что может повлиять на отображение страницы сайта, так-же они во многих случаях, помогают обойти интернет-цензуру.\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Что такое соединение типа мост?"
@@ -288,8 +302,8 @@ msgstr "Другой способ получение списка соедине
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Другим способом для получения списка мостов является отправка электронного сообщения на адрес %s. Обратите внимание, вы должны отправить электронный запрос только с использованием одного из доступных сервисов: %s, %s или %s."
+"%s or %s."
+msgstr "Другим способом получения мостов является отправка электронного письма на адрес %s. Пожалуйста, обратите внимание на то, что вы должны \nотправить электронный запрос с использованием одного из перечисленных сервисов:\n%s или %s."
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -298,54 +312,44 @@ msgstr "Нет соединения с мостом! Помогите!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Если Tor не запускается, напишите нам на электронный адрес %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "Для быстрого устранения вашей проблемы в сообщении необходимо указать полную информацию о проблеме, включая имя моста и соединение, которое вы использовали для передачи данных, а также версию Tor Browser."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Строка ввода адресов мостов:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Получить адрес моста!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Пожалуйста, выберите параметры типа моста:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Используете адреса IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Будете использовать %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Браузер некорректно отображает изображения."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Введите символы с изображения..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Как использовать мосты?"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -354,21 +358,21 @@ msgid ""
msgstr "Чтобы добавить новый мост в %s Tor Browser, необходимо перейти на страницу загрузки Tor Browser %s и следовать инструкциям по скачиванию и запуску Tor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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
+#: bridgedb/strings.py:148
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
+#: bridgedb/strings.py:152
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"
@@ -376,28 +380,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Выберите 'Да' и нажмите 'Далее'. Для настройки ваших новых мостов скопируйте и\nвставьте их адреса в поле для ввода текста. И нажимаете 'Подключиться'! Если у вас возникли проблемы с подключением, попробуйте воспользоваться кнопкой 'Помощь'\nво вкладке 'Сетевые настройки Tor' для получения помощи."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Запросить обычные мосты."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Запросить мосты с поддержкой IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
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
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Получить копию открытого GnuPG-ключа BridgeDB."
diff --git a/sk/LC_MESSAGES/bridgedb.po b/sk/LC_MESSAGES/bridgedb.po
index 4c9e905b0..e3ee9f9e2 100644
--- a/sk/LC_MESSAGES/bridgedb.po
+++ b/sk/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# elo, 2014
# FooBar <thewired at riseup.net>, 2015
# Marek Čápek <capek.marek at gmail.com>, 2019
@@ -14,17 +13,36 @@ msgid ""
msgstr ""
"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 06:45+0000\n"
-"Last-Translator: Marek Čápek <capek.marek at gmail.com>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: sk\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"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -36,35 +54,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Prepáčte! Pri spracovaní vašej požiadavky sa vyskytla chyba."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Nahlásiť chybu"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Zdrojový kód"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Označiť všetko"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Zobraziť QR Kód"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR kód vašich premostení"
@@ -72,58 +86,58 @@ msgstr "QR kód vašich premostení"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Do pekla!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Krok %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Krok %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Získajte %s premostenia %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Krok %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/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"
@@ -132,27 +146,27 @@ msgstr "Teraz %s pridajte premostenia do Tor Browsera %s"
#. 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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Pokročilé možnosti"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Nie"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sÁ%sno!"
@@ -160,7 +174,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sN%sastaviť Bridges"
@@ -204,7 +218,7 @@ msgstr "Hej, %s!"
msgid "Hello, friend!"
msgstr "Ahoj, priateľ!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Verejné kľúče"
@@ -254,7 +268,7 @@ 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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Čo sú to premostenia?"
@@ -272,8 +286,8 @@ msgstr "Potrebujem iný spôsob ako získať premostenia!"
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ší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."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -282,54 +296,44 @@ msgstr "Moje premostenia nefungujú! Potrebujem pomoc!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: 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."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "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."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Tu sú vaše premostenia:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Získať premostenia!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Prosím vyberte si možnosti na typ premostenia:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Potrebujete IPv6 adresy?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Potrebujete %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Váš prehliadač nezobrazuje obrázky správne."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Vložte znaky z obrázku vyššie..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Ako začať používať vaše premostenia"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -338,21 +342,21 @@ msgid ""
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".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -360,28 +364,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í. "
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Požiadať o pôvodné premostenia."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Požiadať o IPv6 premostenia."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
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".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Stiahnite si kópiu verejného klúča GNUPG pre BridgeDB."
diff --git a/sl/LC_MESSAGES/bridgedb.po b/sl/LC_MESSAGES/bridgedb.po
index 14b972fd4..fedc3aebc 100644
--- a/sl/LC_MESSAGES/bridgedb.po
+++ b/sl/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Lovro Drofenik <lovro.drofenik at pm.me>, 2018
# Rok Kepa <rokkepa at gmail.com>, 2019
# RokX, 2016
@@ -12,17 +11,36 @@ msgid ""
msgstr ""
"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-01-16 06:52+0000\n"
-"Last-Translator: Rok Kepa <rokkepa at gmail.com>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Slovenian (http://www.transifex.com/otf/torproject/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -34,35 +52,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Oprostite! Z vašo zahtevo je bilo nekaj narobe."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Prijavi napako"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Izvorna koda"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "Novosti"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Stik"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Vse"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Prikaži QR kodo"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR koda za mostovne povezave"
@@ -70,58 +84,58 @@ msgstr "QR koda za mostovne povezave"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Uh oh, špageti :)"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "Napak pri izdelavi QR kode"
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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 koda vsebuje mostovne povezave. Slikaj kodo za kopiranje mostovnih povezav na mobilne in druge naprave."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "Trenutno ni na voljo mostovnih povezav..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "Mogoče je bolje, če %s greš nazaj %s in izbereš drugo vrsto mosta."
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Korak %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Poberi %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Korak %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Dobi %s bridges %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Korak %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Zdaj %s dodaj mostove v Tor Browser %s"
@@ -130,27 +144,27 @@ msgstr "Zdaj %s dodaj mostove v Tor Browser %s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sS%samo dodaj mostove!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Napredno"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Ne"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
msgid "none"
msgstr "nič"
#. 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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sJ%sa!"
@@ -158,7 +172,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sD%sobi mostove"
@@ -202,7 +216,7 @@ msgstr "Oj, %s!"
msgid "Hello, friend!"
msgstr "Pozdravljen!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Javni ključ"
@@ -252,7 +266,7 @@ msgid ""
"\n"
msgstr "Dodatno, BridgeDB ima mnogo nezanimih mostičkov %s brez kakršnjihkoli\ntransportnih vtičnikov %s ki morda ne zvenijo dobro, vendar še vedno\npomagajo pri preslepitvi internetne cenzure v mnogih primerih\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Kaj so mostovi?"
@@ -270,8 +284,8 @@ msgstr "Potrebujem drug način za priti do mosta!"
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 "Drug način za zbiranje mostičkov je preko naše e-pošte %s. Zapomnite si, da morate poslati e-pismo z uporabo naslova naslednjih e-poštnih ponudnikov\n%s, %s ali %s."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -280,54 +294,44 @@ msgstr "Moji mostovi ne delujejo! Potrebujem pomoč!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Če vaš Tor brskalnik ne deluje, pošljite elektronsko pošto na naslov %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "Poskusite vključiti čim več informacij o vašem primeru,\nvključno s seznamom\nmostičkov in transportnih vtičnikov, ki ste jih uporabili, verzijo Tor iskalnik\nin vsa sporočila, ki vam jih je dal Tor, itd."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Tu so vrstice mostičkov:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Pridobite si mostičke!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Izberite tip mostička:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Potrebujete IPv6 naslove?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Potrebujete %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Vaš brskalnik ne prikazuje slik pravilno."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Vnesite znake vsebovane v zgornji sliki..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Kako začeti uporabljati svoje mostove"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -336,21 +340,21 @@ msgid ""
msgstr "Da vstavite mostove v brskalnik Tor, pojdite najprej na %s stran za naložitev brskalnika Tor %s in sledite navodilom za naložitev in zagon brskalnika Tor."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Ko se 'Nastavitve Tor omrežja' okence pojavi, kliknite 'Nastavi' in sledite navodilom čarovnika, dokler ne vpraša:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Ali vaš ponudnik internetnih storitev (ISP) blokira ali kako drugače cenzurira povezave na Tor omrežje?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -358,28 +362,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Izberite 'Da' in nato kliknite 'Naprej'. Za nastavitev vaših novih mostov, kopirajte in prilepite povezave mostov v prostor za vnos besedila. Zdaj pritisnite 'Poveži' in moralo bi delovati! Če se pojavijo problemi poskusite klikniti tipko 'Pomoč' v čarovniku za 'Nastavitve Tor omrežja' za nadaljnjo pomoč."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
msgid "Displays this message."
msgstr "Prikaži to sporočilo."
#. 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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Zahteva za vanilla mostičke."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Zaprosi za IPv6 mostove."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Zahtevjte transportne vtičnike po tipu."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Pridobite kopijo javnega GnuPG ključa za BridgeDB."
diff --git a/sq/LC_MESSAGES/bridgedb.po b/sq/LC_MESSAGES/bridgedb.po
index 02cfc76ff..c71986efe 100644
--- a/sq/LC_MESSAGES/bridgedb.po
+++ b/sq/LC_MESSAGES/bridgedb.po
@@ -1,26 +1,44 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Bujar Tafili, 2015
# Mirela Pacani <milela00 at gmail.com>, 2016
msgid ""
msgstr ""
"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-01-15 12:20+0000\n"
-"Last-Translator: Besnik <besnik at programeshqip.org>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -32,35 +50,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Kërkojmë ndjesë! Diçka shkoi keq me kërkesën tuaj."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Raportoni një gabim"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Kodi Burimor"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Përzgjidhini të Gjitha"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Tregoni Kodin QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Kodi QR përlinjat e urave tuaja"
@@ -68,58 +82,58 @@ msgstr "Kodi QR përlinjat e urave tuaja"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Çfarë tersi!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Hapi %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Hapi %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Merrni %s ura %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Hapi %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/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"
@@ -128,27 +142,27 @@ msgstr "Tani %s shtojini urat tek Tor Browser %s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sM%së jepni urat!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Opsionet e Përparuara"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Jo"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sP%so!"
@@ -156,7 +170,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sM%serrni Urat"
@@ -200,7 +214,7 @@ msgstr "Hej, %s!"
msgid "Hello, friend!"
msgstr "Përshëndetje mik!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Kyça Publikë"
@@ -250,7 +264,7 @@ 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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Ç'janë urat?"
@@ -268,8 +282,8 @@ msgstr "Më nevojitet një mënyrë alternative për përftimin e urave!"
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."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -278,54 +292,44 @@ msgstr "Urat e mia nuk punojnë! Më duhet ndihmë!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: 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."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "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."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Këtu janë linjat e urave tuaja:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Merrni Ura!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Ju lutemi përzgjidhni mundësitë për llojin e urës:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "A ju nevojiten adresat IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "A ju nevojitet një %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Shfletuesi juaj nuk po i shfaq si duhet imazhet."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Futini karakteret nga imazhi më sipër..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Si të nisni t'i përdorni urat tuaja"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -334,21 +338,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".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -356,28 +360,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."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Kërkoni urat vanilje ose non-Pluggable Transport."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Kërkoni urat IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
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".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Merrni një kopje të kyçit publik GnuPG të BridgeDB."
diff --git a/sr/LC_MESSAGES/bridgedb.po b/sr/LC_MESSAGES/bridgedb.po
index cf9b486c5..cb237f5ea 100644
--- a/sr/LC_MESSAGES/bridgedb.po
+++ b/sr/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Aleksa Ristić, 2019
# an lykin <lykin at protonmail.com>, 2018
# Pseudoscops, 2018
@@ -16,17 +15,36 @@ msgid ""
msgstr ""
"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-07-10 11:07+0000\n"
-"Last-Translator: Aleksa Ristić\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\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 1.3\n"
+"Generated-By: Babel 2.7.0\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"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -38,35 +56,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Извините! Догодила се грешка са вашим захтевом."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Пријавите грешку"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Изворни код"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "Дневник измена"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Контакт"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Обележи све"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Прикажи QRCode"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR код за ваше линије премошћивања"
@@ -74,58 +88,58 @@ msgstr "QR код за ваше линије премошћивања"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Ух, страшно!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "Изгледа да је дошло до грешке при добијању вашег QR kода."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "Тренутно нема доступних премошћивача..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Корак %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Преузмите %s прегледач Тор %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Корак %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Добијте %s премошћиваче %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Корак %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Сада %s додајте премошћиваче у прегледач Тор%s"
@@ -134,27 +148,27 @@ msgstr "Сада %s додајте премошћиваче у прегледа
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sС%sамо ми дај премошћиваче!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Напредне опције"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Не"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sТ%sо!"
@@ -162,7 +176,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sД%sобијте премошћиваче"
@@ -206,7 +220,7 @@ msgstr "Здраво, %s!"
msgid "Hello, friend!"
msgstr "Здраво, пријатељу!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Јавни кључеви"
@@ -256,7 +270,7 @@ msgid ""
"\n"
msgstr "Поред тога, BridgeDB има пуно најобичнијих премошћчивача %s без икаквих\nприкључних преноса %s што можда не звучи толико кул, али они ипак\nу много случајева могу помоћи да се заобиђе интернет цензура.\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Шта су премошћивачи?"
@@ -274,8 +288,8 @@ msgstr "Потребан ми је алтернативан начин за до
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Још један начин добијања премошћивача је да се пошаље и-мејл на %s. Узмите у обзир да\nморате послати и-мејл користећи адресу једног од следећих и-мејл провајдера.\n%s, %s или %s."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -284,54 +298,44 @@ msgstr "Моји премошћивачи не раде! Потребна ми
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ако Ваш Тор не ради, пошаљите електронску пошту %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "Унесите што више информација о вашем случају, укључујући списак\nмостова и прикљуивих транспорта које сте покушали да користите, \nверзију вашег тор претраживача, било \nкоју поруку коју вам је Тор избацио, итд."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Ево Ваших линија премошћивача:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Добијте премошћиваче!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Молимо Вас, изаберите опције за врсту премошћивача:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Да ли су Вам потребне IPv6 адресе?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Да ли Вам треба %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Ваш прегледач не приказује слике исправно."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Унесите знакове са слике изнад..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Како да почнете са коришћењем Ваших премошћивача"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -340,21 +344,21 @@ msgid ""
msgstr "Да бисте унели премошћиваче у претраживач Tor, први идите на страници %s за преузимање %s \nпретраживача Тор и тамо пратите упутства за преузимање и покретање претрачивача Тор."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Када се дијалог 'Подешавања Тор мреже' појави, кликните 'Конфигуриши' и пратите упутства до питања:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Да ли ваш интернет сервис провајдер (ИСП) блокира или на било који начин цензурише повезивање на Тор мрежу?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -362,28 +366,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Изаберите 'Да' и кликните на 'Следеће'. Да бисте конфигурисали своје нове премошћиваче, копирајте и\nналепите линије премошчивача у поље за унос текста. Коначно, кликните на 'конектуј се', i\nможете да почнете! Ако будете имали проблема, кликните на дугме 'Помоћ'\nу чаробњакз за подешавања мреже Тор за даљу помоћ."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Захтева базичне премошћиваче."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Захтева IPv6 премошћиваче."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Захтеба прикључиви пренос по ТИПУ."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Добијте копију кључа BridgeDB јавног GnuPG."
diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po
index a5c01551c..a95fecfaf 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Anders Jensen-Urstad <anders at unix.se>, 2014
# Emil Johansson <emil.a.johansson at gmail.com>, 2015
# Gabor Sebastiani, 2014
@@ -20,17 +19,36 @@ msgid ""
msgstr ""
"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-01 08:49+0000\n"
-"Last-Translator: Jonatan Nyberg\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -42,35 +60,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Något gick tyvärr fel med din förfrågan."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Rapportera ett fel"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Källkod"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Markera allt"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Visa QR-kod"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR-kod för dina brorader"
@@ -78,58 +92,58 @@ msgstr "QR-kod för dina brorader"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Bomber och granater, något gick snett!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Steg %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Steg %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Skaffa %s broar %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Steg %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/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"
@@ -138,27 +152,27 @@ msgstr "Lägg nu till %s broarna till Tor Browser%s"
#. 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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Avancerade inställningar"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Nej"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sJ%sa!"
@@ -166,7 +180,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sH%sämta broar"
@@ -210,7 +224,7 @@ msgstr "Hej, %s!"
msgid "Hello, friend!"
msgstr "Hej, kompis!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Publika nycklar"
@@ -260,7 +274,7 @@ msgid ""
"\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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Vad är broar?"
@@ -278,8 +292,8 @@ msgstr "Jag behöver ett alternativt sätt att skaffa broar på!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %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."
+"%s or %s."
+msgstr "Ett annat sätt att få nya bryggor är att skicka e-post till %s. Du måste skicka mailet\nfrån en adress hos någon av följande epostleverantörer:\n%s eller %s."
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -288,54 +302,44 @@ msgstr "Mina broar fungerar inte! Jag behöver hjälp!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: 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."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "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."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Här är dina rader med broar:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Skaffa broar!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Välj alternativ för typ av bro:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Behöver du en IPv6-adress?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Behöver du %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Din webbläsare visar inte bilder korrekt."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Skriv in tecknen från bilden ovan..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Hur du börjar använda dina broar"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -344,21 +348,21 @@ msgid ""
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".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -366,28 +370,28 @@ msgid ""
"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 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."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Leta efter vanliga broar."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Begär IPv6-broar"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
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".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Hämta en kopia av BridgeDB:s publika GnuPG-nyckel."
diff --git a/sw/LC_MESSAGES/bridgedb.po b/sw/LC_MESSAGES/bridgedb.po
index aaf722a3d..567b70ff0 100644
--- a/sw/LC_MESSAGES/bridgedb.po
+++ b/sw/LC_MESSAGES/bridgedb.po
@@ -1,25 +1,43 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Zaituni Njovu <zaituni at zainafoundationtz.org>, 2019
msgid ""
msgstr ""
"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-21 13:55+0000\n"
-"Last-Translator: Zaituni Njovu <zaituni at zainafoundationtz.org>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: sw\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -31,35 +49,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Samahani! Kitufulani kimekwenda vibaya pamoja na ombi lako."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Ripoti Bug"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Chanzo msimbo"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "Badili log"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Mawasiliano"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Chagua zote"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Onyesha QR msimbo"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR msimbo kwa mistari ya daraja"
@@ -67,58 +81,58 @@ msgstr "QR msimbo kwa mistari ya daraja"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Uh oh, spaghettios!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "Inaonekana kuna kosa katika kupata QR msimbo wako."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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 "Msimbo huu wa QR unanayo mistari ya daraja lako. Scan msimbo wa QR msomaji kutoa nakala ya daraja lako kwa simu na vifaa vingine."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "Huko sasa hakuna madaraja yoyote yanayopatikana..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "Labda ujaribu 1%s kurudi 1%s na uchague aina tofauti ya daraja!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Hatua 1%s 1 1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Pakua 1%s Kivinjari cha Tor 1%s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr ""
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Pata 1%s madaraja 1%s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Hatua 1%s 3 1%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Sasa 1%s ongeza madaraja kwa Kivinjari cha Tor 1%s"
@@ -127,27 +141,27 @@ msgstr "Sasa 1%s ongeza madaraja kwa Kivinjari cha Tor 1%s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "1%s J 1%s ust nipe mimi daraja!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "chaguo la juu"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "hapana"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
msgid "none"
msgstr "Hakuna"
#. 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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "1%s Y 1%s es!"
@@ -155,7 +169,7 @@ msgstr "1%s Y 1%s es!"
#. 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "1%s G 1%s et Madaraja"
@@ -199,7 +213,7 @@ msgstr "Wewe, 1%s !"
msgid "Hello, friend!"
msgstr "Hujamboa, rafiki!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Ufunguo za umma"
@@ -249,7 +263,7 @@ msgid ""
"\n"
msgstr ""
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Ni nini madaraja?"
@@ -267,7 +281,7 @@ msgstr "Nahitaji njia nyingine ya kupata madaraja mbadala!"
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."
+"%s or %s."
msgstr ""
#: bridgedb/strings.py:115
@@ -277,54 +291,44 @@ msgstr "Madaraja yangu hayafanyi kazi! Ninahitaji msaada!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Kama Tor yako haifanyi kazi, tuma email tafadhali 1 %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "Jaaribu kujumuisha taarifa zaidi kuhusu kesi yako kama unajumuisha orodha ya madaraja na pluggable usafiri uliojaribu kutumia, toleo la kivinjari chako cha Tor na ujumbe wowote ambao Tor waliutoa, nk."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Hapa ni mistari ya daraja lako:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Pata madaraja!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Tafadhali chagua chaguo kwa aina ya daraja:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Unahitaji anuani za IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Unahitaji 1%s ?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Kivinjari chako hakionyeshi picha vizuri."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Ingiza maneno kutoka kwenye picha juu..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Jinsi ya kuanza kutumia madaraja yako"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -333,21 +337,21 @@ msgid ""
msgstr "Ili kuingia madaraja kwenye 1%s Kivinjari cha Tor, kwanza nenda kwenye pakua ya Kivinjari cha Tor 1%s ukurasa na kisha kufuata maelekezo huko kwa kupakua na kuanzia Kivinjari cha Tor."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Wakati mpangilio wa mtandao wa Tor mazungumzo yakitokea, gusa mpagilio tena na fuata wizard hadi ikuulize:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Imtoa huduma ya Mtandao wako (ISP) zuia au vinginevyo hisi muunganiko kwenye mtandao wa Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -355,28 +359,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
msgid "Displays this message."
msgstr "Onyesha picha hii."
#. 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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Ombi Vanilla madaraja."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Ombi IPv6 madaraja."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Ombi la Pluggable Usafiri na Aina."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Pata nakala ya daraja DB ufunguo wa umma GnuPG."
diff --git a/ta/LC_MESSAGES/bridgedb.po b/ta/LC_MESSAGES/bridgedb.po
index 417207fc0..4fc9bd67c 100644
--- a/ta/LC_MESSAGES/bridgedb.po
+++ b/ta/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Anto Sujesh <sujeshantoj at gmail.com>, 2015
# deadrat <jayabharat at live.com>, 2017
# Ephraim Raj <ephraimraj11299 at gmail.com>, 2016
@@ -13,17 +12,36 @@ msgid ""
msgstr ""
"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-01-15 12:20+0000\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: ta\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -35,35 +53,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "மன்னிக்கவும்! உங்கள் வேண்டுகோளிற்கு ஏதோஒரு தவறு நேர்ந்துள்ளது."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "ஒரு பிழையை அறிக்கைசெய்க"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "மூல தொகுப்பு"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "மாற்றம்குறிக்கும் கோப்பு"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "தொடர்பு கொள்"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "அனைத்தையும் தேர்ந்தெடு"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "க்யு ஆர் குறியீடு காண்பி "
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "உங்களுடைய bridge வரிகளுக்கான QRCode"
@@ -71,58 +85,58 @@ msgstr "உங்களுடைய bridge வரிகளுக்கான QRC
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr " ஐயகோ, பிரச்சனை!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "க்யு ஆர் குறியீடு எடுக்க முடியாது"
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "தற்சமயம் Bridge-கள் யேதும் இல்லை..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "அடி %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "பதிவிறக்கவும் %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "அடி %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "%s Bridge-களை %s பெறுக"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "அடி %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "இப்பொழுது %s bridge-களை Tor Browser-உள் %s சேர்க்கவும்"
@@ -131,27 +145,27 @@ msgstr "இப்பொழுது %s bridge-களை Tor Browser-உள் %s
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sநே%sரயடியாக bridge-களை கொடுக்கவும்!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "மேம்பட்ட விருப்பங்கள்"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "இல்லை"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sஆ%sம்!"
@@ -159,7 +173,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sபெ%sருக Bridge-களை"
@@ -203,7 +217,7 @@ msgstr "ஹே, %s!"
msgid "Hello, friend!"
msgstr "ஹலோ, தோழா!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "பொது சாவிகள்"
@@ -253,7 +267,7 @@ msgid ""
"\n"
msgstr "கூடுதலாக, BridgeDB-யினுள் ஏராளமான பழையமுறை bridge-கள் \n%s Pluggable Transports வசதியில்லாமல் உள்ளது %s உணர்ச்சி ஊட்டுகிறவாறு இல்லாவிட்டாலும், \nஇவையால் பல சந்தர்ப்பங்களில் இனைய தணிக்கையை கடக்க உதவும்.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Bridges என்றால் என்ன?"
@@ -271,8 +285,8 @@ msgstr "எனக்கு Bridge-களை பெறுவதற்கு ஓ
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Bridge-களை பெறுவதற்கு ஓர் மாற்றுவழி %s முகவரிக்கு ஒரு மின்னஞ்சல் அனுப்பலாம்.\nதயவு செய்யது கவனிக்கவும், நீங்கள் கட்டாயமாக கீழ்கண்ட மின்னஞ்சல் சேவைகளின் முகவரியிலிருந்து மட்டுமே மின்னஞ்சல் அனுப்பலாம் :\n%s, %s or %s."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -281,54 +295,44 @@ msgstr "என் Bridge-கள் வேலை செய்யவில்ல
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "உங்கள் Tor வேலை செய்யவில்லை எனில், நீங்கள் %s தொடர்புகொள்க "
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "உங்கள் வழக்கு குறித்து அதிகபட்ச தகவல்களை சேருங்கள், இதில் நீங்கள் பயன்படுத்த முயற்சித்த bridges\nமற்றும் Pluggable Transports, தங்களின் Tor Browser பதிப்பு எண் ஆகியவை அடங்கும், மற்றும் Tor\nகூரியதகவல்கள் போன்றவற்றையும் சேர்க்கவும்."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "இதோ உங்கள் bridge வரிசைகள்: "
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Bridge-களை பெறுக!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Bridge வகை விருப்பங்களை தேர்ந்தெடுக்கவும்:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "உங்களுக்கு IPv6 முகவரிகள் வேண்டுமா?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "உங்களுக்கு ஒரு %s தேவையா?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr " தங்களின் browser படங்களை சரியாக காட்டவில்லை."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "மேலே உள்ள படத்தில் இருக்கும் எழுத்துக்கள் உள்ளிடவும்..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "தங்களின் bridge-களை பயன்படுத்த தொடங்குவது எப்படி"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -337,21 +341,21 @@ msgid ""
msgstr "Tor உலாவியில் bridgeகளை உள்ளீடு செய்ய, முதலில் %s Tor உலாவி பதிவிறக்க பக்கத்திற்கு சென்று %s மேலும் பிறகு அங்கு Tor உலாவியை பதிவிறக்கம் மற்றும் தொடங்குவதற்கான அறிவுறுத்தல்களை பின்பற்றுங்கள்."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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
+#: bridgedb/strings.py:148
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -359,28 +363,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "'ஆம்' தேர்ந்தெடுத்து பின்னர் 'அடுத்து' கிளிக் செய்யவும். தங்களின் புதிய bridge-களை கட்டமைக்க, \nவரிசைகளை வாக்கியம் உள்ளீtடு பெட்டியில் நகல்எடுத்து பேஸ்ட் செய்யவும். இறுதியாக, 'இணைக்க' கிளிக் \nசெய்தவுடன், நீங்கள் செல்ல தயார்! நீங்கள் பிரச்சினையை சந்தித்தால், 'Tor நெட்வொர்க் அமைப்புகள்' \nவழிகாட்டியில் உள்ள 'உதவி' பொத்தானை கிளிக் செய்து மேலும் உதவி பெறவும்."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "பழையமுறையான bridge-களை விண்ணப்பிக்கவும்."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "IPv6 bridge-களை விண்ணப்பிக்கவும்."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Pluggable Transport bridge-களை TYPE வகையில் விண்ணப்பிக்கவும்."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr " BridgeDB-யுடைய பொது GnuPG சாவியின் ஒரு நகலை பெறவும்."
diff --git a/templates/bridgedb.pot b/templates/bridgedb.pot
index 252adf612..9e591db37 100644
--- a/templates/bridgedb.pot
+++ b/templates/bridgedb.pot
@@ -1,24 +1,43 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# runasand <inactive+runasand at transifex.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-07-25 03:40+0000\n"
-"PO-Revision-Date: 2017-09-19 09:41+0000\n"
-"Last-Translator: runasand <inactive+runasand at transifex.com>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\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-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: en\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -30,35 +49,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Sorry! Something went wrong with your request."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Report a Bug"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Source Code"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Select All"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Show QRCode"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QRCode for your bridge lines"
@@ -66,58 +81,58 @@ msgstr "QRCode for your bridge lines"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Uh oh, spaghettios!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "There currently aren't any bridges available..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Step %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Step %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Get %s bridges %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Step %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/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"
@@ -126,27 +141,27 @@ msgstr "Now %s add the bridges to Tor Browser %s"
#. 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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Advanced Options"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "No"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sY%ses!"
@@ -154,7 +169,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sG%set Bridges"
@@ -198,7 +213,7 @@ msgstr "Hey, %s!"
msgid "Hello, friend!"
msgstr "Hello, friend!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Public Keys"
@@ -248,7 +263,7 @@ msgid ""
"\n"
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
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "What are bridges?"
@@ -266,8 +281,8 @@ msgstr "I need an alternative way of getting bridges!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %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."
+"%s or %s."
+msgstr "Another way to get bridges is to send an email to %s. Please note that you must\nsend the email using an address from one of the following email providers:\n%s or %s."
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -276,54 +291,44 @@ 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 "If your Tor doesn't work, you should email %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr "If your Tor cannot connect, please take a look at the %s and our %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 "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 "Here are your bridge lines:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Get Bridges!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Please select options for bridge type:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Do you need IPv6 addresses?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Do you need a %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Your browser is not displaying images properly."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Enter the characters from the image above..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "How to start using your bridges"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -332,21 +337,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".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -354,28 +359,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."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Request vanilla bridges."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Request IPv6 bridges."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
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".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Get a copy of BridgeDB's public GnuPG key."
diff --git a/th/LC_MESSAGES/bridgedb.po b/th/LC_MESSAGES/bridgedb.po
index a4c88a1a0..7d3b13346 100644
--- a/th/LC_MESSAGES/bridgedb.po
+++ b/th/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# bact' <arthit at gmail.com>, 2017
# bact' <arthit at gmail.com>, 2017
# BlackDog ForThai <myblackdog at tuta.io>, 2015
@@ -19,17 +18,36 @@ msgid ""
msgstr ""
"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-07-03 05:55+0000\n"
-"Last-Translator: DN DN <deen6 at protonmail.com>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: th\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -41,35 +59,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "ขออภัย! มีอะไรผิดปกติเกิดขึ้นกับคำขอของคุณ"
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "แจ้งบั๊ก"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "ซอร์สโค้ด"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "สมุดบันทึกสิ่งของใหม่"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "ผู้ติดต่อ"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "เลือกทั้งหมด"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "แสดงรหัส QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "รหัส QR สำหรับเส้นทางบริดจ์ของคุณ"
@@ -77,58 +91,58 @@ msgstr "รหัส QR สำหรับเส้นทางบริดจ
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "อ้าว ยุ่งแล้วไง!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "เหมือนจะมีข้อผิดพลาดระหว่างรับรหัส QR ของคุณ"
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "ปัจจุบันนี้ไม่มีบริดจ์ที่ใช้ได้"
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "ลำดับ%s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "ดาวน์โหลด %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "ลำดับ%s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "เอา %s บริดจ์ มา %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "ลำดับ%s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "ตอนนี้ %s เพิ่มบริดจ์ให้กับ Tor Browser %s"
@@ -137,27 +151,27 @@ msgstr "ตอนนี้ %s เพิ่มบริดจ์ให้กั
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sเอา%sบริดจ์ให้ฉันเท่านั้น!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "ตัวเลือกขั้นสูง"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "ไม่"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sไช่%s"
@@ -165,7 +179,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sเอา%sบริดจฺมา"
@@ -209,7 +223,7 @@ msgstr "เฮ้!, %s!"
msgid "Hello, friend!"
msgstr "สวัสดีเพื่อน!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "กุญแจสาธารณะ"
@@ -259,7 +273,7 @@ msgid ""
"\n"
msgstr "ยิ่งกว่านั้น BridgeDB มีบริดจฺมาตรฐาน %s โดยไม่มี\nPluggable Transports %s\nที่ช่วยหลีกเลี่ยงการเซ็นเซอร์ในสถานการณ์ส่วนมาก\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "บริดจ์คืออะไร?"
@@ -277,8 +291,8 @@ msgstr "ต้องการทางเลือกเพื่อใช้บ
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "อีกวิธีรับบริดจฺหนึ่งคือส่งอีเมลให้ %s โปรดเข้าใจว่าคุณต้อง\nส่งอีเมลด้วยอีเมลจากบริการอีเมลซึ่งตามมา:\n%s %s หรือ %s."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -287,54 +301,44 @@ msgstr "บริดจ์ไม่ทำงาน ต้องการคว
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-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."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
msgstr ""
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:121
msgid "Here are your bridge lines:"
msgstr "กำหนดเส้นทางบริดจ์ของคุณที่นี่:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "รับบริดจ์"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "กรุณาเลือกตัวเลือกสำหรับชนิดของบริดจ์:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "คุณต้องการที่อยู่ IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "คุณต้องการ %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "บราวเซอร์ของคุณไม่แสดงผลอย่างที่ควร"
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "พิมพ์ตัวอักษรจากภาพด้านบน..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "เริ่มต้นใช้งานบริดจ์ของคุณได้อย่างไร"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -343,21 +347,21 @@ msgid ""
msgstr "ก่อนจะเข้าบริดจ์ใน Tor Browser, ก่อนอื่นไปที่ %s หน้า Tor Browser ดาวน์โหลด\nและทำตามขั้นตอนเพื่อเริ่มดาวน์โหลดและเริ่ม Tor Browser"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "หาก pops up 'Tor Network Settings' แสดงขึ้นมา, ให้คลิก 'Configure' และทำตามขั้นตอนใน wizard"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
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
+#: bridgedb/strings.py:152
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"
@@ -365,28 +369,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "เลือก 'ใช่' และกด 'ต่อไป' เพื่อตั้งค่าบริดจ์ของคุณ, สำเนา และ\nวาง เส้นทางบริดจ์ ในกล่องข้อความ. สุดท้าย, กด 'เชื่อมต่อ', และ\nคุณควรจะไปได้ดี! หากคุณติดปัญหา, ให้ลองกดปุ่ม 'ช่วยเหลือ'\nในหน้า 'Tor Network Settings' wizard สำหรับความช่วยเหลือเพิ่มเติม."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "ขอร้องบริดจ์มาตรฐาน"
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "ร้องขอ IPv6 บริดจ์"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "ส่งคำร้อง Pluggable Transport โดยใส่คำว่า TYPE"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "รับสำเนาของกุญแจสาธารณะ BridgeDB's GnuPG"
diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po
index a1f17cbf0..ba98d98bd 100644
--- a/tr/LC_MESSAGES/bridgedb.po
+++ b/tr/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Bullgeschichte <bullgeschichte at riseup.net>, 2015
# eromytsatiffird <driffitastymore at gmail.com>, 2014
# Emir Sarı <bitigchi at openmailbox.org>, 2014
@@ -27,17 +26,36 @@ msgid ""
msgstr ""
"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-09 02:36+0000\n"
-"Last-Translator: Kaya Zeren <kayazeren at gmail.com>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: tr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -49,35 +67,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Üzgünüz! İsteğiniz ile ilgili bir şeyler ters gitti."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Bir Hata Bildirin"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Kaynak Kodu"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Tümünü Seç"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "QR Kodunu Görüntüle"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Köprü satırlarınızın QR Kodu"
@@ -85,58 +99,58 @@ msgstr "Köprü satırlarınızın QR Kodu"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Haydi hayırlısı!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "%s1%s. Adım"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "%s2%s. Adım"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "%s3%s. Adım"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/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"
@@ -145,27 +159,27 @@ msgstr "Şimdi %s Tor Browser üzerine köprüler ekleyin %s"
#. 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
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Gelişmiş Ayarlar"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Hayır"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sE%svet!"
@@ -173,7 +187,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sK%söprüleri Al"
@@ -217,7 +231,7 @@ msgstr "Selam, %s!"
msgid "Hello, friend!"
msgstr "Selam, arkadaş!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Herkese Açık Anahtarlar"
@@ -267,7 +281,7 @@ msgid ""
"\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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Köprü nedir?"
@@ -285,8 +299,8 @@ msgstr "Köprüleri edinmek için başka bir yola gerek duyuyorum!"
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 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."
+"%s or %s."
+msgstr "Köprüleri almanın diğer bir yolu da %s adresine bir e-posta göndermektir.\nLütfen e-postanın aşağıdaki e-posta sağlayıcılardan birinden alınmış bir\nadresten gönderilmesi gerektiğini unutmayın:\n%s veya %s."
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -295,54 +309,44 @@ msgstr "Köprülerim çalışmıyor! Yardım gerek!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Tor uygulamanız çalışmıyorsa %s adresine e-posta göndermelisiniz."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "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."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "İşte köprü satırlarınız:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Köprüleri Al!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Lütfen köprü türü seçeneklerini belirleyin:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "IPv6 adresleri gerekli mi?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "%s gerekli mi?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Tarayıcınız görselleri düzgün görüntülemiyor."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Yukarıdaki görselde bulunan karakterleri yazın..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Köprülerinizi nasıl kullanabilirsiniz"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -351,21 +355,21 @@ msgid ""
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".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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, 'Ayarla' üzerine tıklayın ve şu soru soruluncaya\ndek yardımcıyı izleyin:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -373,28 +377,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
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."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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.
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Normal köprüler iste."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "IPv6 köprüleri iste."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "TYPE uyumlu bir Değiştirilebilir Taşıyıcı iste."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Herkese açık BridgeDB GnuPG anahtarının bir kopyasını al."
diff --git a/uk/LC_MESSAGES/bridgedb.po b/uk/LC_MESSAGES/bridgedb.po
index 3f0f11a91..30d93a0a2 100644
--- a/uk/LC_MESSAGES/bridgedb.po
+++ b/uk/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Bogdan Kulynych <bogdan.kulynych at gmail.com>, 2019
# Eugene ghostishev, 2014
# LinuxChata, 2014-2015
@@ -16,17 +15,36 @@ msgid ""
msgstr ""
"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-05 23:58+0000\n"
-"Last-Translator: Bogdan Kulynych <bogdan.kulynych at gmail.com>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: uk\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"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -38,35 +56,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Ми приносимо наші вибачення! Щось пішло не так з Вашим запитом."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Повідомити про помилку"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Код"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "Список змін"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Контакт"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Вибрати всі"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Показати QR-код"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR-код для адрес ретрансляторів"
@@ -74,58 +88,58 @@ msgstr "QR-код для адрес ретрансляторів"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Отакої!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "Здається, що сталася помилка при отриманні вашого QR-коду."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "В даний час немає доступних мостів..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Крок %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Завантажити %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Крок %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Отримайте %s мости %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Крок %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Тепер %s додай bridges до Tor Browser %s"
@@ -134,27 +148,27 @@ msgstr "Тепер %s додай bridges до Tor Browser %s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sТ%sільки дай мені мости!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Розширені Параметри"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Ні"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sТ%sак!"
@@ -162,7 +176,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sО%sтримати мости"
@@ -206,7 +220,7 @@ msgstr "Привіт, %s!"
msgid "Hello, friend!"
msgstr "Привіт, друже!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Відкриті ключі"
@@ -256,7 +270,7 @@ msgid ""
"\n"
msgstr "Крім того, BridgeDB має багато простих як двері мостів %s без\nвставних транспортерів %s, які, можливо, не звучать гарно, але вони \nможуть допомогти обійти інтернет-цензуру в багатьох випадках.\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Що таке ретранслятор типу міст?"
@@ -274,8 +288,8 @@ msgstr "Мені потрібен альтернативний спосіб от
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Ще один спосіб отримати bridges - це відправити лист на адресу %s. Зверніть увагу, що\nВи повинні надіслати лист, використовуючи адресу від одного з наступних постачальників\nпослуг електронної пошти:\n%s, %s або %s."
+"%s or %s."
+msgstr "Ще один спосіб отримати bridges - це відправити лист на адресу %s. Зверніть увагу, що\nВи повинні надіслати лист, використовуючи адресу від одного з наступних постачальників\nпослуг електронної пошти:\n%s або %s."
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -284,54 +298,44 @@ msgstr "Мої мости не працюють! Допоможіть!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Якщо Ваш Tor не працює, Ви можете відправити нам електронного листа %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "Спробуйте додати якнайбільше інформації про Ваш випадок, в тому числі список\nмостів і вставних транспортерів, які Ви пробували використовувати, версію браузера Tor,\nі будь-які повідомлення, які Tor видавав, і т.д."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Лінії для Вашого мосту:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Отримати Bridges!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Будь ласка, оберіть параметри типу міст:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Вам потрібні адреси IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Вам потрібен %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Ваш браузер не відображає зображення належним чином."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Введіть зображенні символи ..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Як почати користуватися Вашими мостами"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -340,21 +344,21 @@ msgid ""
msgstr "Щоб додати ретранслятори у Tor Browser, спочатку ідіть на %s сторінку завантаження Tor Browser %s а потім слідуйте інструкціям для скачування і запуску Tor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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
+#: bridgedb/strings.py:148
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".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -362,28 +366,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Виберіть \"Так\", а потім натисніть \"Далі\". Для налаштування нових bridges, скопіюйте і\nвставте лінії bridge у поле для введення тексту. Потім, натисніть 'Підключатися', і\nвсе повинно працювати! Якщо у Вас виникли проблеми, спробуйте натиснути \"Довідка\" \nв майстрові \"Мережеві параметри Tor' для отримання додаткової допомоги."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Запит на отримання vanilla bridges."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Запит на отримання IPv6 bridges."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Запит на отримання Pluggable Transport по TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Отримати копію відкритого GnuPG ключа для BridgeDB."
diff --git a/ur/LC_MESSAGES/bridgedb.po b/ur/LC_MESSAGES/bridgedb.po
index 2e7f8277e..28c40993e 100644
--- a/ur/LC_MESSAGES/bridgedb.po
+++ b/ur/LC_MESSAGES/bridgedb.po
@@ -1,26 +1,44 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Ali Kamran <kamran at digitalrightsfoundation.pk>, 2019
# Muhammad Sohaib Raza <sohaibraza000 at gmail.com>, 2016
msgid ""
msgstr ""
"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-09-14 08:46+0000\n"
-"Last-Translator: Ali Kamran <kamran at digitalrightsfoundation.pk>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: ur\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -32,35 +50,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr ""
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "مسئلہ رپورٹ کریں"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "سورس کوڈ"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "لاگ تبدیل کریں"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "رابطہ"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "تمام منتخب کریں."
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "QR کوڈ ظاہر کریں۔"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr ""
@@ -68,58 +82,58 @@ msgstr ""
#. "There was a problem!" in your language. For example,
#. for Italian, you might translate this into "Mama mia!",
#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr ""
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr ""
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr ""
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr ""
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr ""
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr ""
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr ""
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr ""
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr ""
@@ -128,27 +142,27 @@ msgstr ""
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "مزید انتخابات۔"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "نہیں"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -156,7 +170,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr ""
@@ -200,7 +214,7 @@ msgstr "ہیلو ، %s"
msgid "Hello, friend!"
msgstr "ہیلو دوستو!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "عوامی چابی"
@@ -250,7 +264,7 @@ msgid ""
"\n"
msgstr ""
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr ""
@@ -268,7 +282,7 @@ msgstr ""
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
+"%s or %s."
msgstr ""
#: bridgedb/strings.py:115
@@ -278,54 +292,44 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
msgstr ""
-#. 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 ""
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr ""
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr ""
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "کیا آپ کو ایک %s چائیے ؟"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr ""
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr ""
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -334,21 +338,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -356,28 +360,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr ""
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
diff --git a/uz/LC_MESSAGES/bridgedb.po b/uz/LC_MESSAGES/bridgedb.po
index 8f5036df6..25bdca2cd 100644
--- a/uz/LC_MESSAGES/bridgedb.po
+++ b/uz/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Akmal <uzbadmin at gmail.com>, 2018
# Shuhrat Dehkanov <k+transifex at efir.uz>, 2014
# U A <u.almasov at gmail.com>, 2013
@@ -11,17 +10,36 @@ msgid ""
msgstr ""
"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-12-01 11:54+0000\n"
-"Last-Translator: Akmal <uzbadmin at gmail.com>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Uzbek (http://www.transifex.com/otf/torproject/language/uz/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: uz\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -33,35 +51,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Uzr, nimadir xato ketdi."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Nosozlik haqida xabar berish"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Kod"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "Oʻzgarishlar"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Bogʻlanish"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Barchasini belgilash"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "QR kodni koʻrsatish"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr ""
@@ -69,58 +83,58 @@ msgstr ""
#. "There was a problem!" in your language. For example,
#. for Italian, you might translate this into "Mama mia!",
#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Voy savil!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "QR kod olinmadi"
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr ""
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr ""
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "%s1%s-bosqich"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr " %s Tor brauzeri %sni yuklab olish"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "%s2%s-bosqich"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "%s3%s-qadam"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr ""
@@ -129,27 +143,27 @@ msgstr ""
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Ilg'or moslamalar"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Yoʻq"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
msgid "none"
msgstr "yoʻq"
#. 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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sH%sa!"
@@ -157,7 +171,7 @@ msgstr "%sH%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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr ""
@@ -201,7 +215,7 @@ msgstr "Salom, %s!"
msgid "Hello, friend!"
msgstr "Salom, do'st!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Ommaviy kalitlar"
@@ -251,7 +265,7 @@ msgid ""
"\n"
msgstr ""
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Ko'priklar nima?"
@@ -269,7 +283,7 @@ msgstr ""
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
+"%s or %s."
msgstr ""
#: bridgedb/strings.py:115
@@ -279,54 +293,44 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
msgstr ""
-#. 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 ""
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr ""
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr ""
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr ""
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr ""
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -335,21 +339,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -357,28 +361,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr ""
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
diff --git a/vi/LC_MESSAGES/bridgedb.po b/vi/LC_MESSAGES/bridgedb.po
index 3402b9c7a..1b8f82b64 100644
--- a/vi/LC_MESSAGES/bridgedb.po
+++ b/vi/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Acooldude, 2016
# Khanh Nguyen <nguyenduykhanh85 at gmail.com>, 2015-2016
# Gary, 2016
@@ -13,17 +12,36 @@ msgid ""
msgstr ""
"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-07-19 14:23+0000\n"
-"Last-Translator: Ngo Long <ngotienlong1996 at gmail.com>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -35,35 +53,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Xin lỗi! Có gì đó không đúng với yêu cầu của bạn."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "Báo cáo lỗi"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "Mã Nguồn"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "Nhật ký thay đổi"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Liên hệ"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Chọn Tất cả"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Hiển thị Mã QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Mã QR cho các đường cầu nối của bạn"
@@ -71,58 +85,58 @@ msgstr "Mã QR cho các đường cầu nối của bạn"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "Uh oh, spaghettios!"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "Có vẻ như có lỗi khi đang lấy mã QR của bạn."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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 "Mã QR chứa những đường cầu nối của bạn. Quét nó bằng một trình đọc mã QR và sao chép những đường cầu nối lên điện thoại và các thiết bị khác."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "Hiện không có sẵn cầu nối nào..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "Có lẽ bạn nên thử %s quay lại %s và chọn một loại cầu nối khác!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Bước %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Tải xuống %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Bước %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Chọn %sbridges%s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "Bước %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Bây giờ thì %s thêm bridges đó vào Tor Browser %s"
@@ -131,27 +145,27 @@ msgstr "Bây giờ thì %s thêm bridges đó vào Tor Browser %s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sC%shỉ cần đưa cho tôi bridges!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "Các Tùy Chọn Nâng Cao"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "Không"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
msgid "none"
msgstr "rỗng"
#. 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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sV%sâng!"
@@ -159,7 +173,7 @@ msgstr "%sV%sâng!"
#. 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sL%sấy Bridges"
@@ -203,7 +217,7 @@ msgstr "Này, %s!"
msgid "Hello, friend!"
msgstr "Chào bạn!"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Khóa công khai"
@@ -253,7 +267,7 @@ msgid ""
"\n"
msgstr "Thêm vào đó, BridgeDB có rất nhiều bridge nguyên gốc %s tức là những bridge\nkhông có Pluggable Transports nào %s và điều đó nghe có vẻ không tốt cho\nlắm, nhưng chúng có thể vẫn giúp tránh các sự kiểm duyệt internet trong nhiều\ntrường hợp.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "Bridges là gì?"
@@ -271,8 +285,8 @@ msgstr "Tôi cần một cách khác để lấy bridges!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Cách khác để lấy bridges là gửi một email tới %s. Hãy lưu ý rằng bạn phải gửi một email\nsử dụng đỉa chỉ từ một trong những nhà cung cấp email sau:\n%s, %s hoặc %s."
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -281,54 +295,44 @@ msgstr "Bridges của tôi không hoạt động! Tôi cần giúp đỡ!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Nếu Tor của bạn không hoạt động, bạn nên gửi email cho %s."
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "Cố gắng cung cấp càng nhiều thông tin về trường hợp của bạn nếu có thể,\nbao gồm danh sách những bridges và Pluggable Transports bạn đã thử sử\ndụng, phiên bản của Tor Browser, và bất kỳ thông điệp nào mà Tor đưa ra\ncho bạn, v.v..."
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Bridge lines của bạn đây:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "Lấy Bridges!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "Hãy chọn các tùy chọn cho bridge type:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "Bạn có cần các địa chỉ IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "Bạn có cần một %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "Trình duyệt của bạn không hiểu thị hình ảnh chính xác."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "Nhập các ký tự từ hình ảnh ở trên..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "Làm sao để bắt đầu sử dụng bridges của bạn"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -337,21 +341,21 @@ msgid ""
msgstr "Để nhập bridges vào Tor Browser, đầu tiên đi đến %s trang tải xuống của\nTor Browser %s và sau đó làm theo hướng dẫn ở đó để tải xuống và bắt đầu\nTor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Khi hộp thoại 'Tùy chỉnh Tor Network' xuất hiện, bấm chuột vào 'Cấu hình' và làm theo\ntrình hướng dẫn đến khi nó hỏi:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Có phải nhà Cung Cấp Dịch Vụ Internet (ISP) của bạn đã khóa hoặc kiểm duyệt các kết nối đến Tor network?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -359,28 +363,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Chọn 'Đúng' và sau đó nhấn 'Tiếp theo'. Để cấu hình bridges mới của bạn, sao chép và dán bridge lines vào hộp nhập văn bản. Cuối cùng, nhấn 'Kết nối', và bạn đã hoàn thành rồi đấy! Nếu bạn gặp rắc rối khi trải nghiệm, hãy thử nhấn nút 'Giúp đỡ' trong trình hướng dẫn 'Các Tùy Chỉnh Tor Network' để nhận được sự giúp đỡ tốt hơn."
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
msgid "Displays this message."
msgstr "Hiển thị tin nhắn này."
#. 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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "Yêu cầu bridges nguyên gốc."
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "Yêu cầu bridges cho IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "Yêu cầu một Pluggable Transport by TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Lấy một bản sao của chỉa khóa GnuPG công cộng của BridgeDB."
diff --git a/zh_CN/LC_MESSAGES/bridgedb.po b/zh_CN/LC_MESSAGES/bridgedb.po
index 33ebf4db1..458c8317e 100644
--- a/zh_CN/LC_MESSAGES/bridgedb.po
+++ b/zh_CN/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# khi, 2013
# khi, 2013
# khi, 2013
@@ -20,17 +19,36 @@ msgid ""
msgstr ""
"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-30 00:43+0000\n"
-"Last-Translator: ff98sha\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -42,35 +60,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "抱歉，你的邮件请求出现问题。"
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "报告漏洞"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "源代码"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "更改日志"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "联系方式"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "选择全部"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "显示二维码"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "网桥二维码"
@@ -78,58 +92,58 @@ msgstr "网桥二维码"
#. "There was a problem!" in your language. For example,
#. for Italian, you might translate this into "Mama mia!",
#. or for French: "Sacrebleu!". :)
-#: bridgedb/https/templates/bridges.html:67
-#: bridgedb/https/templates/bridges.html:125
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "哎呀！"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "获取二维码时出错。"
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "现在没有可用的网桥。"
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "第 %s 1 %s 步"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "下载 %s Tor 浏览器 %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "第 %s 2 %s 步"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "获取 %s 网桥 %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "第 %s 3 %s 步"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "如何 %s 在 Tor 浏览器添加网桥%s"
@@ -138,27 +152,27 @@ msgstr "如何 %s 在 Tor 浏览器添加网桥%s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr " 直接给我网桥(%sJ%s)！ "
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "高级选项"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "否"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "是(%sY%s)！"
@@ -166,7 +180,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "获取网桥(%sG%s)"
@@ -210,7 +224,7 @@ msgstr "你好，%s！"
msgid "Hello, friend!"
msgstr "你好，朋友！"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "公共密匙"
@@ -260,7 +274,7 @@ msgid ""
"\n"
msgstr "此外，BridgeDB 提供很多 %s 非可插拔传输 %s 的普通网桥。\n虽然听起来不够酷，但是这些普通网桥依然可以在很多情况下帮助绕过审查。\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "什么是网桥？"
@@ -278,8 +292,8 @@ msgstr "需要使用其他获取方式获取网桥！"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "另一种获取网桥的方式是发送电子邮件至 %s。注意：必须使用以下电子邮箱发送请求：%s、%s 或 %s。"
+"%s or %s."
+msgstr "获得 bridges（网桥）的另一种方法是向 %s 发送一封邮件。注意：您只能使用以下邮件服务商提供的邮件地址发送：%s 或 %s 。"
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -288,54 +302,44 @@ msgstr "用网桥也无法连接，需要帮助！"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "如果 Tor 无法正常运行，请发邮件至 %s。"
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "请尽量详细地描述你的情况，包括所用的网桥及其类型，Tor 浏览器版本以及任何 Tor 显示的信息等等。"
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "以下是为你提供的网桥："
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "获得网桥！"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "请选择类型类型。"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "是否需要IPv6地址？"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "是否需要 %s？"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "浏览器无法正确显示图片。"
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "请输入上图中的字符（不区分大小写）..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "如何使用网桥"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -344,21 +348,21 @@ msgid ""
msgstr "如需在 Tor 浏览器中添加网桥，请先根据 %s Tor 浏览器下载页面 %s 的说明下载和启动 Tor 浏览器。"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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
+#: bridgedb/strings.py:148
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
+#: bridgedb/strings.py:152
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"
@@ -366,28 +370,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "选择“是”，然后点击“下一步”。如下添加新的网桥，请将网桥地址行通过复制粘贴的方式输入到文本输入框。最后，点击“连接”就可以连接至 Tor 网络。如有问题需要帮助，请点击“Tor 网络设置”向导窗口中的“帮助”按钮。"
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "请求普通网桥。"
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "请求IPv6网络。"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "按照类型请求不同的可插拔传输网桥。"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "获取 BridgeDB 的 GnuPG 公共密匙。"
diff --git a/zh_HK/LC_MESSAGES/bridgedb.po b/zh_HK/LC_MESSAGES/bridgedb.po
index 241a35a48..c4fda3149 100644
--- a/zh_HK/LC_MESSAGES/bridgedb.po
+++ b/zh_HK/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Casper LI <casper.hk at hotmail.com>, 2013
# 大圈洋蔥, 2016
# Casper LI <casper.hk at hotmail.com>, 2013
@@ -14,17 +13,36 @@ msgid ""
msgstr ""
"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-04-12 18:54+0000\n"
-"Last-Translator: Chi-Hsun Tsai\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: zh_HK\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -36,35 +54,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "對唔住！你嘅請求有錯誤。"
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "回報錯誤"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "原始程式碼"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "更新日誌"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "聯絡資訊"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "選擇全部"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "顯示QRCode"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "你嘅橋接線路QRCode"
@@ -72,58 +86,58 @@ msgstr "你嘅橋接線路QRCode"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "有問題！"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "掃瞄QRCode時似乎發生錯誤。"
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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含你嘅橋接線路。以流動裝置掃瞄可取得你嘅橋接線路。"
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "目前無可用嘅橋接器…"
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "步驟%s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "下載%s Tor洋蔥路由瀏覽器%s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "步驟%s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "取得%s橋接器%s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "步驟%s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "咿㗎%s將橋接加入到Tor洋蔥路由瀏覽器%s"
@@ -132,27 +146,27 @@ msgstr "咿㗎%s將橋接加入到Tor洋蔥路由瀏覽器%s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%s畀%s我橋接！"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "進階選項"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "否"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%s是%s！"
@@ -160,7 +174,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%s取得%s橋接器"
@@ -204,7 +218,7 @@ msgstr "嘿，%s！"
msgid "Hello, friend!"
msgstr "朋友，你好！"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "公匙"
@@ -254,7 +268,7 @@ msgid ""
"\n"
msgstr "此外，BridgeDB有普通嘅橋接器%s，無任何\nPluggable Transports %s，或者聽起嚟唔型，但\n仍有助於規避好多情況下嘅網絡審查。\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "咩係橋接？"
@@ -272,8 +286,8 @@ msgstr "我需要另一方式做橋接！"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "另一取得橋接嘅方式係電郵到%s。請注意，你須\n使用下列電郵提供者嘅位址嚟寄電郵：\n%s、%s或%s。"
+"%s or %s."
+msgstr ""
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -282,54 +296,44 @@ msgstr "橋接器無法正常運作，我需要幫助！"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "如果Tor洋蔥路由無法運作，可電郵到%s。"
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "盡可能包含最多有關你情況嘅資訊，包括你嘗試使用過嘅\n橋接和Pluggable Transports清單、Tor洋蔥路由瀏覽器版本，\n以及Tor洋蔥路由顯示嘅任何訊息。"
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "呢個係你嘅橋接線路："
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "取得橋接器！"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "請選取橋接器類型："
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "你需要IPv6位址嗎？"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "你需要%s嗎？"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "你嘅瀏覽器唔能夠正確顯示圖像。"
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "輸入上面圖像中嘅字元…"
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "點樣開始使用橋接器"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -338,21 +342,21 @@ msgid ""
msgstr "將橋接器輸入到Tor洋蔥路由瀏覽器，請首先前往%s Tor洋蔥路由\n瀏覽器下載頁面%s，並按照頁面上嘅指示下載同啟動Tor洋蔥\n路由瀏覽器。"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
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
+#: bridgedb/strings.py:148
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
+#: bridgedb/strings.py:152
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"
@@ -360,28 +364,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "選取〔是〕，然後撳〔下一步〕。要設定新橋接器，請複製同\n將橋接線路貼到文字輸入匣中。最後，撳〔連接〕。\n如果遇到麻煩，請嘗試撳「Tor洋蔥路由網絡設定」嘅〔説明〕\n尋求進一步協助。"
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "請求Vanilla橋接器。"
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "請求IPv6橋接器。"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
msgid "Request a Pluggable Transport by TYPE."
msgstr "按照TYPE請求Pluggable Transport。"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "取得BridgeDB公共GnuPG鎖匙。"
diff --git a/zh_TW/LC_MESSAGES/bridgedb.po b/zh_TW/LC_MESSAGES/bridgedb.po
index b49e358ef..f93bfc53b 100644
--- a/zh_TW/LC_MESSAGES/bridgedb.po
+++ b/zh_TW/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Agustín Wu <losangwuyts at gmail.com>, 2016
# Chi-Hsun Tsai, 2017
# danfong <danfong.hsieh at gmail.com>, 2014
@@ -15,17 +14,36 @@ msgid ""
msgstr ""
"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-23 14:36+0000\n"
-"Last-Translator: 孟邦 王\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-04 00:54+0000\n"
+"Last-Translator: erinm\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 1.3\n"
+"Generated-By: Babel 2.7.0\n"
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -37,35 +55,31 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "抱歉！您的請求發生錯誤。"
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
msgid "Report a Bug"
msgstr "回報錯誤"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
msgid "Source Code"
msgstr "原始程式碼"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
msgid "Changelog"
msgstr "變更記錄"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "聯絡資訊"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "選擇全部"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "顯示 QRCode"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "您橋接用的 QRCode"
@@ -73,58 +87,58 @@ msgstr "您橋接用的 QRCode"
#. "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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
msgstr "有問題！"
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
msgstr "掃描 QRCode 時似乎發生錯誤"
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
msgstr "目前沒有任何橋接器接可用....."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "步驟 %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "下載 %s 洋蔥路由瀏覽器 %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "步驟 %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "取得 %s 橋接器 %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
msgstr "步驟 %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "現在 %s 將橋接器加入到洋蔥路由瀏覽器中 %s"
@@ -133,27 +147,27 @@ msgstr "現在 %s 將橋接器加入到洋蔥路由瀏覽器中 %s"
#. 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
+#: bridgedb/distributors/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%s %s 給我橋接器！"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
msgid "Advanced Options"
msgstr "進階選項"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
msgid "No"
msgstr "否"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
msgstr "%sY%ses!"
@@ -161,7 +175,7 @@ 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
+#: bridgedb/distributors/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
msgstr "%sG%s 設定橋接器"
@@ -205,7 +219,7 @@ msgstr "嘿，%s！"
msgid "Hello, friend!"
msgstr "朋友，您好！"
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "公開金鑰"
@@ -255,7 +269,7 @@ msgid ""
"\n"
msgstr "此外，BridgeDB 有普通的橋接器 %s，沒有任何\n可插拔傳輸 %s，這也許聽起來不酷，但它\n仍有助於規避在許多情況下的網路審查。\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
msgid "What are bridges?"
msgstr "什麼是橋接器？"
@@ -273,8 +287,8 @@ msgstr "我需要使用其他方式取得橋接器！"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "另一種取得橋接的方式為發送電子郵件至 %s。請注意，您必須 \n使用從下列電子郵件提供廠商之一的位址來發送電子郵件:\n%s, %s 或 %s。"
+"%s or %s."
+msgstr "取得橋接的另一種方式是發送電子郵件至 %s。請注意，您必須 \n使用來自下列電子郵件提供者之一的位址發送電子郵件: \n%s 或 %s。"
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
@@ -283,54 +297,44 @@ msgstr "橋接器無法正常執行，我需要幫助！"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "如果您的洋蔥路由無法運作，您應該發送電子郵件給 %s。"
+msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#. 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 "請儘可能的給我們更多關於您的問題之相關資訊，包含您嘗試使用過的 \n橋接器和可插拔傳輸、您的洋蔥路由瀏覽器版本\n以及洋蔥路由給出的任何訊息。"
-
-#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "這裡是您的橋接線路："
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
msgid "Get Bridges!"
msgstr "取得橋接器："
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
msgid "Please select options for bridge type:"
msgstr "請選擇橋接器類型的選項："
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
msgid "Do you need IPv6 addresses?"
msgstr "您需要 IPv6 位址嗎？"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
#, python-format
msgid "Do you need a %s?"
msgstr "您需要 %s 嗎？"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
msgid "Your browser is not displaying images properly."
msgstr "您的瀏覽器不能正確顯示圖像。"
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
msgid "Enter the characters from the image above..."
msgstr "從上面的圖像中輸入字元....."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
msgid "How to start using your bridges"
msgstr "如何開始使用您的橋接器"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -339,21 +343,21 @@ msgid ""
msgstr "若要將橋接器加入到洋蔥路由瀏覽器中，首先請到 %s 洋蔥路由瀏覽器下載頁面 %s 並按照頁面上的說明來下載和啟動洋蔥路由瀏覽器。"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "當「洋蔥路由網路設定」對話彈出時，按一下〔設定〕，然後按照設定精靈的導引進行："
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "您的網際網路服務供應商(ISP)阻擋或過濾洋蔥路由網路的連線嗎？"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
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"
@@ -361,28 +365,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "選擇〔是〕，然後按一下〔下一步〕。要設定您的新橋接器，複製和\n將橋接線路貼上到文字輸入方塊中。最後，按一下〔連接〕就好。\n如果您遇到麻煩，請嘗試按一下「洋蔥路由網路設定」精靈中的〔説明〕\n按鈕尋求進一步的協助 。"
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
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
+#: bridgedb/strings.py:164
msgid "Request vanilla bridges."
msgstr "請求標準橋接器。"
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
msgid "Request IPv6 bridges."
msgstr "請求 IPv6 橋接器。"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
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
+#: bridgedb/strings.py:170
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "取得 BridgeDB 上的 GnuPG 公開金鑰副本。"
More information about the tor-commits
mailing list