[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
commit 9d069d74f4757eed4c780a945528c2bc2632d638
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date: Thu Mar 19 07:15:57 2020 +0000
https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
---
ar/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
az/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
be/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
bg/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
bn/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
bs/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
ca/LC_MESSAGES/bridgedb.po | 114 +++++++++++++++++++++++++++++++--------
cs/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
da/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
de/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
el/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
en_GB/LC_MESSAGES/bridgedb.po | 114 +++++++++++++++++++++++++++++++--------
eo/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
es/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
es_AR/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
es_MX/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
et/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
eu/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
fa/LC_MESSAGES/bridgedb.po | 114 +++++++++++++++++++++++++++++++--------
fi/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
fr/LC_MESSAGES/bridgedb.po | 119 ++++++++++++++++++++++++++++++++---------
ga/LC_MESSAGES/bridgedb.po | 119 ++++++++++++++++++++++++++++++++---------
gd/LC_MESSAGES/bridgedb.po | 119 ++++++++++++++++++++++++++++++++---------
gl/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
gu/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
he/LC_MESSAGES/bridgedb.po | 119 ++++++++++++++++++++++++++++++++---------
hi/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
hr/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
hu/LC_MESSAGES/bridgedb.po | 114 +++++++++++++++++++++++++++++++--------
hy/LC_MESSAGES/bridgedb.po | 119 ++++++++++++++++++++++++++++++++---------
id/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
is/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
it/LC_MESSAGES/bridgedb.po | 114 +++++++++++++++++++++++++++++++--------
ja/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
ka/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
kk/LC_MESSAGES/bridgedb.po | 119 ++++++++++++++++++++++++++++++++---------
km/LC_MESSAGES/bridgedb.po | 119 ++++++++++++++++++++++++++++++++---------
ko/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
lt/LC_MESSAGES/bridgedb.po | 119 ++++++++++++++++++++++++++++++++---------
lv/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
mk/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
ml/LC_MESSAGES/bridgedb.po | 119 ++++++++++++++++++++++++++++++++---------
mr/LC_MESSAGES/bridgedb.po | 119 ++++++++++++++++++++++++++++++++---------
ms_MY/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
nb/LC_MESSAGES/bridgedb.po | 114 +++++++++++++++++++++++++++++++--------
nl/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
nl_BE/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
nn/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
pa/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
pl/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
pt_BR/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
pt_PT/LC_MESSAGES/bridgedb.po | 114 +++++++++++++++++++++++++++++++--------
ro/LC_MESSAGES/bridgedb.po | 114 +++++++++++++++++++++++++++++++--------
ru/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
sk/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
sl/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
sq/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
sr/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
sv/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
sw/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
ta/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
templates/bridgedb.pot | 119 ++++++++++++++++++++++++++++++++---------
th/LC_MESSAGES/bridgedb.po | 114 +++++++++++++++++++++++++++++++--------
tr/LC_MESSAGES/bridgedb.po | 112 ++++++++++++++++++++++++++++++--------
uk/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
uz/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
vi/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
zh_CN/LC_MESSAGES/bridgedb.po | 119 ++++++++++++++++++++++++++++++++---------
zh_HK/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
zh_TW/LC_MESSAGES/bridgedb.po | 121 ++++++++++++++++++++++++++++++++----------
70 files changed, 6547 insertions(+), 1827 deletions(-)
diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po
index 9dfed8ecc4..32053083cd 100644
--- a/ar/LC_MESSAGES/bridgedb.po
+++ b/ar/LC_MESSAGES/bridgedb.po
@@ -33,9 +33,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+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"
@@ -63,18 +63,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "عذراÙ?! Øدث خطأ Ù?Ù? Ø·Ù?بÙ?."
@@ -82,15 +80,15 @@ msgstr "عذراÙ?! Øدث خطأ Ù?Ù? Ø·Ù?بÙ?."
msgid "Language"
msgstr "اÙ?Ù?غة"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "ابÙ?غ عÙ? خطأ باÙ?برÙ?اÙ?ج"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Ù?Ù?د اÙ?برÙ?اÙ?ج"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "اÙ?تغÙ?Ù?رات"
@@ -245,7 +243,7 @@ msgstr "Ù?رØباØ? %s "
msgid "Hello, friend!"
msgstr "Ù?رØبا ,صدÙ?Ù?Ù?!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Ù?Ù?اتÙ?Ø Ø¹Ø§Ù?Ø©"
@@ -295,7 +293,7 @@ msgid ""
"\n"
msgstr "باÙ?أضاÙ?Ø© Ø¥Ù?Ù? Ø°Ù?Ù?Ø? BridgeDB Ù?ØتÙ?Ù? عÙ?Ù? bridges %s عادÙ?Ø© بدÙ?Ù? Ø£Ù? Pluggable Transports %s تستطÙ?ع اÙ?ضا اÙ?Ù?ساعدة Ù?Ù? اÙ?تØاÙ?Ù? عÙ?Ù? رÙ?ابة عÙ?Ù? اÙ?Ø¥Ù?ترÙ?ت Ù?Ù? اÙ?Ù?Ø«Ù?ر Ù?Ù? اÙ?اØÙ?اÙ?.\n"
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Ù?ا Ù?Ù? bridgesØ?"
@@ -340,32 +338,101 @@ msgid "Get Bridges!"
msgstr "Ø£ØصÙ? عÙ?Ù? Bridges"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Ù?ا Ø´Ù?Ø¡"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Ù?Ù? Ù?ضÙ?Ù? Øدد اÙ?Ø®Ù?ارات Ù?Ù?Ù?ع اÙ?Ù?bridge"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Ù?Ù? تØتاج عÙ?اÙ?Ù?Ù? IPv6Ø?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Ù?Ù? تØتاج Ø¥Ù?Ù? %sØ?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Ù?تصÙ?ØÙ? Ù?ا Ù?عرض اÙ?صÙ?ر بشÙ?Ù? صØÙ?Ø"
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "أدخÙ? اÙ?ØرÙ?Ù? Ø£Ù? اÙ?أرÙ?اÙ? Ù?Ù? اÙ?صÙ?رة أعÙ?اÙ? ..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "Ù?Ù?Ù? تبدأ باستعÙ?اÙ? اÙ?Ù?bridges"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -374,21 +441,21 @@ msgid ""
msgstr "Ù?تتÙ?Ù?Ù? Ù?Ù? إدخاÙ? جسÙ?ر Ø¥Ù?Ù? اÙ?Ù?تصÙ?Ø TorØ? أذÙ?ب Ø¥Ù?Ù? %s صÙ?ØØ© تØÙ?Ù?Ù?ات اÙ?Ù?تصÙ?Ø Tor %s Ù?أتبع اÙ?تعÙ?Ù?Ù?ات اÙ?Ù?Ø°Ù?Ù?رة Ù?Ù?Ù?ا Ù?Ù? اجÙ? تØÙ?Ù?Ù? Ù?بدء اÙ?Ù?تصÙ?Ø Tor"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -396,28 +463,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "اختار 'Ù?عÙ?' Ø«Ù? 'Next' Ø«Ù? Ù?Ù? بÙ?صÙ? اÙ?Ù?bridges اÙ?جدÙ?دة Ù?Ù? اÙ?Ù?ربع. Ø«Ù? اختار 'اتصاÙ?' Ù? اذا Ù?اجÙ?تÙ? Ù?Ø´Ù?Ù?Ø© اضغط عÙ?Ù? 'Ù?ساعدة' Ù?Ù? Ù?اÙ?ذة اعداد Tor."
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "أطÙ?ب bridges عادÙ?Ø©."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "أطÙ?ب IPv6 bridges"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 ca59d1d48d..16ed6c781d 100644
--- a/az/LC_MESSAGES/bridgedb.po
+++ b/az/LC_MESSAGES/bridgedb.po
@@ -9,9 +9,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: Nikafn <appone6@xxxxxxxxx>\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"
@@ -39,18 +39,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Ã?zr istÉ?yirik! TÉ?lÉ?binlÉ? baÄ?lı nÉ? isÉ? sÉ?hv oldu."
@@ -58,15 +56,15 @@ msgstr "Ã?zr istÉ?yirik! TÉ?lÉ?binlÉ? baÄ?lı nÉ? isÉ? sÉ?hv oldu."
msgid "Language"
msgstr "Dil"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Problemi XÉ?bÉ?r Ver"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "MÉ?nbÉ? Kodu"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "DÉ?yiÅ?ikliklÉ?r"
@@ -221,7 +219,7 @@ msgstr "Ey, %s!"
msgid "Hello, friend!"
msgstr "Salam, dost!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "İctimai Açarlar"
@@ -271,7 +269,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "KörpülÉ?r nÉ?dir?"
@@ -316,32 +314,101 @@ msgid "Get Bridges!"
msgstr "Körpü Æ?ldÉ? Et!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Heç biri"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
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:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "IPv6 ünvanlara ehtiyacın var?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "%s ehtiyacın var?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "SÉ?nin brauzerin Å?É?killÉ?ri göstÉ?rÉ? bilmir."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Yuxarıdakı Å?É?kildÉ?n iÅ?arÉ?lÉ?ri daxil et..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
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:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -350,21 +417,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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 +439,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Vanil körpü xahiÅ? et."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "IPv6 körpü xahiÅ? et."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 a739e9096c..3f49dc6587 100644
--- a/be/LC_MESSAGES/bridgedb.po
+++ b/be/LC_MESSAGES/bridgedb.po
@@ -11,9 +11,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: abc3538a5083768d7140873e7131fdd3\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"
@@ -41,18 +41,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Ð?Ñ?баÑ?айÑ?е! ШÑ?оÑ?Ñ?Ñ?Ñ? пайÑ?ло не Ñ?ак падÑ?аÑ? адпÑ?аÑ?кÑ? ваÑ?ага запÑ?Ñ?а."
@@ -60,15 +58,15 @@ msgstr "Ð?Ñ?баÑ?айÑ?е! ШÑ?оÑ?Ñ?Ñ?Ñ? пайÑ?ло не Ñ?ак падÑ?аÑ?
msgid "Language"
msgstr "Ð?ова"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Ð?аведамiÑ?Ñ? пÑ?а баг."
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Ð?Ñ?Ñ?нÑ?Ñ?нÑ? код"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Ð?Ñ?Ñ?Ñ?оÑ?Ñ?Ñ? зменаÑ?"
@@ -223,7 +221,7 @@ msgstr "Ð?Ñ?Ñ?вÑ?Ñ?анне, %s!"
msgid "Hello, friend!"
msgstr "Ð?Ñ?Ñ?аÑ?, Ñ?Ñ?бÑ?а!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Ð?Ñ?блÑ?Ñ?нÑ?Ñ? Ð?лÑ?Ñ?Ñ?"
@@ -273,7 +271,7 @@ msgid ""
"\n"
msgstr "ТакÑ?ама маÑ?Ñ?Ñ? BridgeDB маÑ?Ñ?Ñ? мноÑ?Ñ?ва Ñ?Ñ?андаÑ?Ñ?нÑ?Ñ? маÑ?Ñ?оÑ? %s, Ñ?кÑ?Ñ? не падÑ?Ñ?Ñ?моÑ?ваÑ?Ñ?Ñ? пеÑ?адаÑ?Ñ? дадзеннÑ?Ñ?\nPluggable Transports %s. Ð?Ñ?Ñ?а гÑ?Ñ?Ñ?Ñ?Ñ? не велÑ?мÑ? добÑ?а, Ñ? можа паÑ?плÑ?ваÑ?Ñ? на Ñ?ое, Ñ?к адлÑ?Ñ?Ñ?Ñ?оÑ?ваÑ?Ñ?Ñ?а Ñ?айÑ?Ñ?, аднак маÑ?Ñ?Ñ? Ñ?к Ñ? Ñ?аней,\nдапамагаÑ?Ñ?Ñ? абÑ?Ñ?одзÑ?Ñ?Ñ? Ñ?нÑ?Ñ?Ñ?нÑ?Ñ?-Ñ?Ñ?нзÑ?Ñ?Ñ?.\n\n"
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "ШÑ?о за маÑ?Ñ?Ñ??"
@@ -318,32 +316,101 @@ msgid "Get Bridges!"
msgstr "Ð?Ñ?Ñ?Ñ?маÑ?Ñ? маÑ?Ñ?Ñ?!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Ð?е"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Ð?алÑ? лаÑ?ка, абÑ?Ñ?Ñ?Ñ?е наладÑ? длÑ? Ñ?Ñ?пÑ? маÑ?Ñ?а:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "ЦÑ? паÑ?Ñ?Ñ?бнÑ? вам IPv6 адÑ?аÑ?Ñ??"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "ЦÑ? паÑ?Ñ?Ñ?бнÑ? вам %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Ð?аÑ? бÑ?аÑ?зÑ?Ñ? адлÑ?Ñ?Ñ?Ñ?оÑ?вае вÑ?Ñ?вÑ? некаÑ?Ñ?кÑ?на."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "УвÑ?дзÑ?Ñ?е Ñ?Ñ?мвалÑ? з вÑ?Ñ?вÑ?..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "Як паÑ?аÑ?Ñ? каÑ?Ñ?Ñ?Ñ?аÑ?Ñ?а маÑ?Ñ?амÑ?"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -352,21 +419,21 @@ msgid ""
msgstr "Ð?аб дадаÑ?Ñ? новÑ? моÑ?Ñ? Ñ? бÑ?аÑ?зÑ?Ñ? Tor, Ñ?Ñ?Ñ?ба пеÑ?айÑ?Ñ?Ñ? на Ñ?Ñ?аÑ?онкÑ? Ñ?пампоÑ?ваннÑ? %s Tor Browser\n %s Ñ? Ñ?Ñ?Ñ?маÑ?Ñ?а Ñ?нÑ?Ñ?Ñ?Ñ?кÑ?Ñ?й па Ñ?Ñ?Ñ?алÑ?Ñ?Ñ?Ñ?\nбÑ?аÑ?зÑ?Ñ?а Tor."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -374,28 +441,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Ð?бÑ?Ñ?Ñ?Ñ?е \"Так\" а заÑ?Ñ?м наÑ?Ñ?Ñ?нÑ?Ñ?е \"Ð?алей\". Ð?аб наладзÑ?Ñ?Ñ? маÑ?Ñ?Ñ? Ñ?капÑ?Ñ?Ñ?йÑ?е Ñ?\nÑ?Ñ?Ñ?аÑ?Ñ?е Ñ?адкÑ? маÑ?Ñ?оÑ? Ñ? Ñ?Ñ?кÑ?Ñ?авае вакенÑ?а. Ð?оÑ?Ñ?м наÑ?Ñ?Ñ?нÑ?Ñ?е \"Ð?лÑ?Ñ?Ñ?Ñ?Ñ?а\"\nÑ? можаÑ?е паÑ?Ñ?наÑ?Ñ? каÑ?Ñ?Ñ?Ñ?аÑ?Ñ?а бÑ?аÑ?зÑ?Ñ?ам. Ð?алÑ? вÑ? Ñ?Ñ?Ñ?Ñ?кнÑ?лÑ?Ñ?Ñ? з пÑ?аблемамÑ?,\nпаÑ?пÑ?абÑ?йÑ?е наÑ?Ñ?Ñ?нÑ?Ñ?Ñ? \"Ð?апамога\" Ñ? вакенÑ?Ñ? \"СеÑ?кавÑ?Ñ? наладÑ? Tor\" каб аÑ?Ñ?Ñ?маÑ?Ñ? падÑ?Ñ?Ñ?мкÑ?."
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Ð?аÑ?лаÑ?Ñ? запÑ?Ñ? на Ñ?Ñ?андаÑ?Ñ?нÑ?Ñ? маÑ?Ñ?Ñ?."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Ð?апÑ?Ñ?аÑ?Ñ? маÑ?Ñ?Ñ? IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 6f68f649f5..3d4f6d38bf 100644
--- a/bg/LC_MESSAGES/bridgedb.po
+++ b/bg/LC_MESSAGES/bridgedb.po
@@ -11,9 +11,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: erinm\n"
"Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -41,18 +41,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "СÑ?жалÑ?ваме! Ð?еÑ?о Ñ?е обÑ?Ñ?ка Ñ? заÑ?вкаÑ?а ви."
@@ -60,15 +58,15 @@ msgstr "СÑ?жалÑ?ваме! Ð?еÑ?о Ñ?е обÑ?Ñ?ка Ñ? заÑ?вкаÑ?а в
msgid "Language"
msgstr "Ð?зик"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Ð?окладвай пÑ?облем"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "СоÑ?Ñ? код"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Ð?невник на пÑ?омениÑ?е"
@@ -223,7 +221,7 @@ msgstr "Хей, %s!"
msgid "Hello, friend!"
msgstr "Ð?дÑ?авей, пÑ?иÑ?Ñ?ел!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Ð?бÑ?еÑ?Ñ?вен клÑ?Ñ?"
@@ -273,7 +271,7 @@ msgid ""
"\n"
msgstr "Ð?опÑ?лниÑ?елно, BridgeDB има много plain-ol'-vanilla bridges %s без никакви\nPluggable Transports %s коиÑ?о не изглеждаÑ? Ñ?олкова добÑ?е, но вÑ?е пак могаÑ?\nда помогнаÑ? за заобикалÑ?не на инÑ?еÑ?неÑ? Ñ?ензÑ?Ñ?аÑ?а в много Ñ?лÑ?Ñ?аи.\n\n"
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Ð?акво Ñ?а bridges?"
@@ -318,32 +316,101 @@ msgid "Get Bridges!"
msgstr "Ð?земеÑ?е Bridges!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Ð?иÑ?о"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Ð?олÑ? избеÑ?еÑ?е опÑ?иÑ? за вид bridge:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Ð?Ñ?ждаеÑ?е ли Ñ?е оÑ? IPv6 адÑ?еÑ?и?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Ð?Ñ?здаеÑ?е ли Ñ?е оÑ? %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Ð?аÑ?иÑ? бÑ?аÑ?зеÑ? не показва пÑ?авилно изобÑ?ажениÑ?."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Ð?Ñ?ведеÑ?е Ñ?имволиÑ?е оÑ? изобÑ?ажениеÑ?о оÑ? гоÑ?е..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "Ð?ак да запоÑ?неÑ?е да използваÑ?е ваÑ?иÑ?е bridges"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -352,21 +419,21 @@ msgid ""
msgstr "Ð?а вÑ?веждане на bridges в Tor Browser, пÑ?Ñ?во оÑ?идеÑ?е на \n%s Tor Browser Ñ?еб Ñ?Ñ?Ñ?аниÑ?аÑ?а за Ñ?валÑ?не %s и Ñ?лед Ñ?ова \nÑ?ледвайÑ?е инÑ?Ñ?Ñ?Ñ?кÑ?ииÑ?е Ñ?ам за Ñ?валÑ?не и Ñ?Ñ?аÑ?Ñ?иÑ?ане на \nTor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -374,28 +441,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Ð?збеÑ?еÑ?е 'Ð?а' и Ñ?лед Ñ?ова кликнеÑ?е 'Ð?апÑ?ед'. Ð?а да конÑ?игÑ?Ñ?иÑ?аÑ?е ваÑ?иÑ?е нови bridges, копиÑ?айÑ?е и\nпоÑ?Ñ?авеÑ?е bridge Ñ?едовеÑ?е в пÑ?озоÑ?еÑ?а за Ñ?екÑ?Ñ?ово вÑ?веждане. Ð?а кÑ?аÑ? наÑ?иÑ?неÑ?е 'СвÑ?Ñ?жи Ñ?е', и\nÑ?Ñ?Ñ?бва да Ñ?Ñ?е гоÑ?ови! Ð?ко Ñ?Ñ?еÑ?аÑ?е Ñ?Ñ?Ñ?дноÑ?Ñ?и, оÑ?идеÑ?е на 'Ð?омоÑ?' бÑ?Ñ?она в 'Tor Network Settings' Ñ?Ñ?веÑ?ника за помоÑ?."
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Ð?аÑ?ви Ñ?Ñ?андаÑ?Ñ?ни bridges."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Ð?аÑ?ви IPv6 bridges."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 9fb36661c8..8e12ae3110 100644
--- a/bn/LC_MESSAGES/bridgedb.po
+++ b/bn/LC_MESSAGES/bridgedb.po
@@ -14,9 +14,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: Tabiha Tanha <tabihatanha@xxxxxxxxxx>\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"
@@ -44,18 +44,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "দà§?à¦?à¦?িত! à¦?পনার à¦?নà§?রà§?ধà§? à¦?িà¦?à§? à¦à§?ল হয়à§?à¦?à§?।"
@@ -63,15 +61,15 @@ msgstr "দ���িত! �পনার �ন�র�ধ� �ি��
msgid "Language"
msgstr "à¦à¦¾à¦·à¦¾"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "���ি ত�র��ি রিপ�র�� �র�ন"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "স�র�স ��ড"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "পরিবর�তন�র তালি�া"
@@ -226,7 +224,7 @@ msgstr "�র�, %s!"
msgid "Hello, friend!"
msgstr "�হ� বন�ধ�!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "পাবলি� ��"
@@ -276,7 +274,7 @@ msgid ""
"\n"
msgstr "à¦?পরনà§?তà§?, বà§?রিà¦?ডিবি à¦?র মধà§?যà§? পà§?রà¦?à§?র পà§?লà§?à¦?ন-à¦à§?যালি-à¦à§?যানিলা বà§?রিà¦? %s রয়à§?à¦?à§?\nপà§?লà§?যাà¦?à§?বল à¦?à§?রানà§?সপà§?রà§?à¦? %s যা হয়তà§? ঠানà§?ডা বলà§? মনà§? à¦?রà§? না, তবà§? তারা à¦?à¦?নà¦? à¦?রতà§? পারà§?\nà¦?নà§?à¦? à¦?à§?ষà§?তà§?রà§? à¦?নà§?à¦?ারনà§?à¦? সà§?নà§?সরশিপà¦?à§? বাধা দিতà§? সাহাযà§?য\n"
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "ব�রি� �ি ?"
@@ -321,32 +319,101 @@ msgid "Get Bridges!"
msgstr "��� ব�রি�"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "��ন�ি না"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "ব�রি� �া�প �র �ন�য বি�ল�প নির�বা�ন �র�ন:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "�পনার �ি IPv6 ঠি�ানা প�রয়��ন?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "�পনি �ি ���ি %s প�রয়��ন?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "à¦?পনার বà§?রাà¦?à¦?ার সঠিà¦?à¦à¦¾à¦¬à§? à¦?মà§?à¦? পà§?রদরà§?শন à¦?রা হয় না।"
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "�পর�র �িত�র থ��� ���ষর ��লি লি��ন ..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "à¦?িà¦à¦¾à¦¬à§? বà§?রিà¦? বà§?যবহার শà§?রà§? à¦?রবà§?ন"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -355,21 +422,21 @@ msgid ""
msgstr "�র ব�রা��ার� ব�রি� প�রব�শ �রত�, প�রথম� %s �র ব�রা��ার ডা�নল�ড �র�ন\nপ�ষ�ঠা %s �ব� তারপর ডা�নল�ড �ব� শ�র� �রার �ন�য স��ান� নির�দ�শাবল� �ন�সরণ �র�ন\n�র ব�রা��ার"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -377,28 +444,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "'হà§?যাà¦?' নিরà§?বাà¦?ন à¦?রà§?ন à¦?বà¦? তারপর 'পরবরà§?তà§?' à¦?à§?লিà¦? à¦?রà§?ন à¦?পনার নতà§?ন সà§?তà§? à¦?নফিà¦?ার à¦?রতà§?, à¦?পি à¦?বà¦?\nà¦?à§?à¦?à§?সà¦? à¦?নপà§?à¦? বাà¦?à§?সà§? সà§?তà§? লাà¦?ন à¦?à¦?à¦?ান। à¦?বশà§?ষà§?, 'সà¦?যà§?à¦?à§?ত' à¦?à§?লিà¦? à¦?রà§?ন, à¦?বà¦?\nà¦?পনি যà§?তà§? à¦à¦¾à¦² হতà§? হবà§?! যদি à¦?পনি সমসà§?যায় পড়à§?ন তবà§? 'সহায়তা' à¦?à§?লিà¦? à¦?রার à¦?à§?ষà§?à¦?া à¦?রà§?ন\nà¦?রà¦? সহায়তা à¦?নà§?য 'à¦?র নà§?à¦?à¦?য়ারà§?à¦? সà§?à¦?িà¦?স' à¦?à¦?à¦?ারà§?ড মধà§?যà§? বাà¦?ন"
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "à¦à§?যানিলা বà§?রà§?à¦?সমà§?হà§?র à¦?নà§?রà§?ধ à¦?রà§?ন"
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "IPv6 ব�রি��র �ন�র�ধ �র�ন"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
msgid "Request a Pluggable Transport by TYPE."
msgstr "TYPE দ�বারা প�ল�যা��বল ��রান�সপ�র���র �ন�র�ধ �র�ন"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:215
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 8425786b9e..8e90e7b399 100644
--- a/bs/LC_MESSAGES/bridgedb.po
+++ b/bs/LC_MESSAGES/bridgedb.po
@@ -8,9 +8,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: Mersad Avdic <mersad.developer@xxxxxxxxx>\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"
@@ -38,18 +38,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Izvini! Nešto je pošlo po zlu sa vašim zahtevom."
@@ -57,15 +55,15 @@ msgstr "Izvini! Nešto je pošlo po zlu sa vašim zahtevom."
msgid "Language"
msgstr "Jezik"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Prijavi grešku"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Izvorni kod"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Promjene"
@@ -220,7 +218,7 @@ msgstr "Hej, %s!"
msgid "Hello, friend!"
msgstr "Zdravo, prijatelju!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Javni KljuÄ?evi"
@@ -270,7 +268,7 @@ msgid ""
"\n"
msgstr ""
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Å ta su Mostovi ?"
@@ -315,32 +313,101 @@ msgid "Get Bridges!"
msgstr ""
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Ništa"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr ""
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr ""
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr ""
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -349,21 +416,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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 +438,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr ""
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:215
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 16e22c1619..f8422ae74d 100644
--- a/ca/LC_MESSAGES/bridgedb.po
+++ b/ca/LC_MESSAGES/bridgedb.po
@@ -16,9 +16,9 @@ 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: 2020-02-18 13:39-0800\n"
-"PO-Revision-Date: 2020-02-20 11:08+0000\n"
-"Last-Translator: Benny Beat <bennybeat@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: erinm\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"
@@ -46,6 +46,7 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -54,7 +55,7 @@ msgstr ""
#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Quelcom ha anat malament amb la petició."
@@ -62,15 +63,15 @@ msgstr "Quelcom ha anat malament amb la petició."
msgid "Language"
msgstr "Llengua"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Comunica un error"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Codi font"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Registre de canvis"
@@ -225,7 +226,7 @@ msgstr "Hola, %s!"
msgid "Hello, friend!"
msgstr "Hola, col·lega!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Claus públiques"
@@ -320,32 +321,101 @@ msgid "Get Bridges!"
msgstr "Baixa els ponts!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Cap"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Seleccioneu les opcions pel tipus de pont:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Us calen adreces IPv6?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Us cal un %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "El navegador no està mostrant les imatges correctament."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Introduïu els carà cters de la imatge superior..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
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:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -354,21 +424,21 @@ msgid ""
msgstr "Per a introduir ponts al Tor Browser, primer cal anar a la %spà gina de baixada del navegador Tor%s i després seguir les instruccions per baixar i iniciar\nel navegador Tor. "
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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ó de la xarxa Tor», feu clic a «Configura» i seguiu\nl'auxiliar fins que us demani:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:152
+#: bridgedb/strings.py:193
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) bloca o censura les connexions amb la xarxa Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:156
+#: bridgedb/strings.py:197
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 +446,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Seleccioneu «Sû i feu clic a «Següent». Per a configurar els ponts nous, copieu i enganxeu les lÃnies del pont al següent quadre d'entrada de text. Finalment, feu clic a «Connecta» i ja hauria d'estar a punt! Si teniu problemes, feu clic al botó «Ajuda» de l'auxiliar «Configuració de la xarxa Tor» per a obtenir més assistència."
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Sol·licitud de ponts està ndard."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Sol·licitud de ponts IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
msgid "Request a Pluggable Transport by TYPE."
msgstr "Sol·licitud d'un transport extensible per TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:215
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Baixa 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 18d8e7b8c2..5e52e28fae 100644
--- a/cs/LC_MESSAGES/bridgedb.po
+++ b/cs/LC_MESSAGES/bridgedb.po
@@ -19,9 +19,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: erinm\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"
@@ -49,18 +49,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "PromiÅ?te. Váš požadavek se nepodaÅ?ilo provést."
@@ -68,15 +66,15 @@ msgstr "PromiÅ?te. Váš požadavek se nepodaÅ?ilo provést."
msgid "Language"
msgstr "Jazyk"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Nahlásit chybu"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Zdrojový kód"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Seznam zmÄ?n"
@@ -231,7 +229,7 @@ msgstr "Hey, %s!"
msgid "Hello, friend!"
msgstr "Ahoj, pÅ?Ãteli!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "VeÅ?ejné klÃÄ?e"
@@ -281,7 +279,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Co jsou to mosty?"
@@ -326,32 +324,101 @@ msgid "Get Bridges!"
msgstr "ZÃskat mosty!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Žádné"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Vyberte úrosÃm nastavenà pro typ mostu:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "PotÅ?ebujete IPv6 adresu?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "PotÅ?ebujete %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Váš prohlÞeÄ? nezobrazuje správnÄ? obrázky."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Zadejte pÃsmena z obrázku výše..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "Jak zaÄ?Ãt použÃvat mosty."
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -360,21 +427,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -382,28 +449,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Požádat o obyÄ?ejné mosty."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Požádat o IPv6 mosty."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 68a91a54ec..fe281b544b 100644
--- a/da/LC_MESSAGES/bridgedb.po
+++ b/da/LC_MESSAGES/bridgedb.po
@@ -15,9 +15,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-07 07:22+0000\n"
-"Last-Translator: scootergrisen\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+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"
@@ -45,18 +45,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Beklager. Noget gik galt med din anmodning."
@@ -64,15 +62,15 @@ msgstr "Beklager. Noget gik galt med din anmodning."
msgid "Language"
msgstr "Sprog"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Rapportér en fejl"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Kildekode"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Ã?ndringslog"
@@ -227,7 +225,7 @@ msgstr "Hej %s!"
msgid "Hello, friend!"
msgstr "Hej min ven!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Offentlige nøgler"
@@ -277,7 +275,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Hvad er broer?"
@@ -322,32 +320,101 @@ msgid "Get Bridges!"
msgstr "Find broer!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Ingen"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Vælg venligst valgmuligheder for brotypen:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Har du brug for IPv6-adresser?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Har du brug for en %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Din browser kan ikke vise billeder ordentligt."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Indtast tegnene fra billedet ovenfor..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
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:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -356,21 +423,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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 +445,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Anmod almindelige broer."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Anmod IPv6-broer."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 4595e99b42..7aaafafc46 100644
--- a/de/LC_MESSAGES/bridgedb.po
+++ b/de/LC_MESSAGES/bridgedb.po
@@ -27,9 +27,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-09 14:49+0000\n"
-"Last-Translator: Curtis Baltimore <curtisbaltimore@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+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"
@@ -57,18 +57,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Wir bitten um Entschuldigung. Bei Ihrer Anfrage lief etwas schief."
@@ -76,15 +74,15 @@ msgstr "Wir bitten um Entschuldigung. Bei Ihrer Anfrage lief etwas schief."
msgid "Language"
msgstr "Sprache"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Einen Fehler melden"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Quellcode"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Ã?nderungsprotokoll"
@@ -239,7 +237,7 @@ msgstr "Hallo, %s!"
msgid "Hello, friend!"
msgstr "Hallo Freund!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "�ffentliche Schlüssel"
@@ -289,7 +287,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Was sind Brücken?"
@@ -334,32 +332,101 @@ msgid "Get Bridges!"
msgstr "Erhalten Sie Adressen von Brücken-Servern!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Nichts"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Bitte wählen Sie die Optionen für den Brückentyp aus:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Benötigen Sie IPv6-Adressen?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Benötigen Sie eine %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Bilder werden in Ihrem Browser nicht korrekt dargestellt."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Bitte geben Sie die Zeichen aus dem oberen Bild ein."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
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:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -368,21 +435,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -390,28 +457,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Standard-Brücken anfordern."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "IPv6-Brücken anfordern."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 4d2ba0cc0b..149b9cd5b7 100644
--- a/el/LC_MESSAGES/bridgedb.po
+++ b/el/LC_MESSAGES/bridgedb.po
@@ -24,9 +24,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-16 15:40+0000\n"
-"Last-Translator: Elektra M. <safiragon@xxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+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"
@@ -54,18 +54,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "ΣÏ?γνÏ?μη! Î?άÏ?ι Ï?ήγε Ï?Ï?Ï?αβά με Ï?ο αίÏ?ημά Ï?αÏ?."
@@ -73,15 +71,15 @@ msgstr "ΣÏ?γνÏ?μη! Î?άÏ?ι Ï?ήγε Ï?Ï?Ï?αβά με Ï?ο αίÏ?ημά Ï?
msgid "Language"
msgstr "Î?λÏ?Ï?Ï?α"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Î?ναÏ?οÏ?ά Î Ï?οβλήμαÏ?οÏ?"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "ΠηγαίοÏ? Î?Ï?δικαÏ?"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Î?Ï?Ï?είο καÏ?αγÏ?αÏ?ήÏ? αλλαγÏ?ν"
@@ -236,7 +234,7 @@ msgstr "Î?ειά Ï?αÏ?, %s!"
msgid "Hello, friend!"
msgstr "Î?εια Ï?οÏ?, Ï?ίλε!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Î?ημÏ?Ï?ια Î?λειδιά"
@@ -286,7 +284,7 @@ msgid ""
"\n"
msgstr "Î?Ï?ίÏ?ηÏ?, η BridgeDB ÎÏ?ει Ï?ολλÎÏ? Ï?αλιÎÏ? καλÎÏ? γÎÏ?Ï?Ï?εÏ? %s Ï?Ï?Ï?ίÏ?\nPluggable Transports %s Ï?οÏ? ίÏ?Ï?Ï? δεν ακοÏ?γεÏ?αι καÏ?αÏ?ληκÏ?ικÏ?, αλλά Ï?ε Ï?ολλÎÏ? Ï?εÏ?ιÏ?Ï?Ï?Ï?ειÏ? μÏ?οÏ?οÏ?ν να Ï?αÏ? βοηθήÏ?οÏ?ν να Ï?αÏ?ακάμÏ?εÏ?ε Ï?η λογοκÏ?ιÏ?ία.\n\n"
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Τι είναι οι γÎÏ?Ï?Ï?εÏ?;"
@@ -331,32 +329,101 @@ msgid "Get Bridges!"
msgstr "Î?ήÏ?η Î?εÏ?Ï?Ï?Ï?ν!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Î?αμία"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "ΠαÏ?ακαλÏ? εÏ?ιλÎξÏ?ε Ï?ιÏ? εÏ?ιλογÎÏ? για Ï?ον Ï?Ï?Ï?ο Ï?ηÏ? γÎÏ?Ï?Ï?αÏ?:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "ΧÏ?ειάζεÏ?Ï?ε μια διεÏ?θÏ?νÏ?η IPv6;"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Î?ήÏ?Ï?Ï? Ï?Ï?ειάζεÏ?Ï?ε Îνα %s;"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Î? browser Ï?αÏ? δεν εμÏ?ανίζει Ï?ιÏ? εικÏ?νεÏ? Ï?Ï?Ï?Ï?ά."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Î?ιÏ?άγεÏ?ε Ï?οÏ?Ï? Ï?αÏ?ακÏ?ήÏ?εÏ? αÏ?Ï? Ï?ην Ï?αÏ?αÏ?άνÏ? Ï?Ï?Ï?ογÏ?αÏ?ία..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "Î Ï?Ï? να αÏ?Ï?ίÏ?εÏ?ε να Ï?Ï?ηÏ?ιμοÏ?οιείÏ?ε Ï?ιÏ? γÎÏ?Ï?Ï?εÏ? Ï?αÏ?"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -365,21 +432,21 @@ msgid ""
msgstr "Î?ια να ειÏ?άγεÏ?ε bridges Ï?Ï?ο Tor Browser, αÏ?Ï?ικά εÏ?ιλÎξÏ?ε %s Tor Browser Ï?ελίδα\nκαÏ?εβάÏ?μαÏ?οÏ?%s ÎÏ?ειÏ?α ακολοÏ?θήÏ?Ï?ε Ï?ιÏ? οδηγίεÏ? για καÏ?ÎβαÏ?μα και εκκίνηÏ?η Ï?οÏ? \nTor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -387,28 +454,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Î?Ï?ιλÎξÏ?ε \"Î?αι\" και μεÏ?ά Ï?αÏ?ήÏ?Ï?ε \"Î?Ï?Ï?μενο\". Î?ια να Ï?Ï?θμίÏ?εÏ?ε Ï?α νÎα Ï?αÏ? \nbridges, ανÏ?ιγÏ?άÏ?Ï?ε Ï?ιÏ? γÏ?αμμÎÏ? με Ï?ιÏ? διεÏ?θÏ?νÏ?ειÏ? Ï?Ï?ν bridges Ï?Ï?ο κοÏ?Ï?ί \nκειμÎνοÏ?. Î?εÏ?ά Ï?αÏ?ήÏ?Ï?ε \"ΣÏ?νδεÏ?η\" και Ï?Ï?ÎÏ?ει να είÏ?Ï?ε ενÏ?άξει! Î?ν \nανÏ?ιμεÏ?Ï?Ï?ίÏ?εÏ?ε Ï?Ï?οβλήμαÏ?α, εÏ?ιλÎξÏ?ε Ï?ο κοÏ?μÏ?ί \"Î?οήθεια\" Ï?Ï?ιÏ? \"ΡÏ?θμίÏ?ειÏ? \nδικÏ?Ï?οÏ? Ï?οÏ? Tor\"."
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Î?ίÏ?ηÏ?η Ï?αλιÏ?ν καλÏ?ν bridges."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Î?ίÏ?ηÏ?η IPv6 γεÏ?Ï?Ï?Ï?ν."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 51981d9b8d..c32be7663b 100644
--- a/en_GB/LC_MESSAGES/bridgedb.po
+++ b/en_GB/LC_MESSAGES/bridgedb.po
@@ -10,9 +10,9 @@ 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: 2020-02-18 13:39-0800\n"
-"PO-Revision-Date: 2020-02-28 14:25+0000\n"
-"Last-Translator: Andi Chandler <andi@xxxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: de2286e7b84b28568a252c2543472b1e\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"
@@ -40,6 +40,7 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -48,7 +49,7 @@ msgstr ""
#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Sorry! Something went wrong with your request."
@@ -56,15 +57,15 @@ msgstr "Sorry! Something went wrong with your request."
msgid "Language"
msgstr "Language"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Report a Bug"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Source Code"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Changelog"
@@ -219,7 +220,7 @@ msgstr "Hey, %s!"
msgid "Hello, friend!"
msgstr "Hello, friend!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Public Keys"
@@ -314,32 +315,101 @@ msgid "Get Bridges!"
msgstr "Get Bridges!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "None"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Please select options for bridge type:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Do you need IPv6 addresses?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Do you need a %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Your browser is not displaying images properly."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Enter the characters from the image above..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "How to start using your bridges"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -348,21 +418,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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 +440,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Request vanilla bridges."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Request IPv6 bridges."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 e7fdb01546..7026e73fc2 100644
--- a/eo/LC_MESSAGES/bridgedb.po
+++ b/eo/LC_MESSAGES/bridgedb.po
@@ -12,9 +12,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: erinm\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"
@@ -42,18 +42,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Pardonu! Io ne funkcias pri via peto."
@@ -61,15 +59,15 @@ msgstr "Pardonu! Io ne funkcias pri via peto."
msgid "Language"
msgstr "Lingvo"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "raporti cimo"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "fontkodo"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Å?anÄ?oprotokolo"
@@ -224,7 +222,7 @@ msgstr "Saluton, %s!"
msgid "Hello, friend!"
msgstr "Saluton, amiko!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "publikaj Å?losiloj"
@@ -274,7 +272,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Kio estas retpontoj?"
@@ -319,32 +317,101 @@ msgid "Get Bridges!"
msgstr "Ekhavu retpontojn!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Neniom"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Bonvolu selekti opciojn pri retpontospeco."
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Ä?u vi bezonas IPv6-adresojn?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Ä?u vi bezonas %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Via retumilo vidigas bildojn ne dece."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Enigu la literoj en la bildo Ä?i-supre."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "Kiel komenci uzi viajn retpontojn."
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -353,21 +420,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -375,28 +442,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Peti regulajn retpontojn (nepermutebla transporta retpontoj / non-Pluggable Transport bridges)."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Peti IPv6-retpontojn."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 1a92da0864..e61c32361a 100644
--- a/es/LC_MESSAGES/bridgedb.po
+++ b/es/LC_MESSAGES/bridgedb.po
@@ -24,9 +24,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 11:02+0000\n"
-"Last-Translator: eulalio barbero espinosa <eulaliob@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+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"
@@ -54,18 +54,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "¡Lo sentimos! Algo ha fallado al procesar tu solicitud."
@@ -73,15 +71,15 @@ msgstr "¡Lo sentimos! Algo ha fallado al procesar tu solicitud."
msgid "Language"
msgstr "Idioma"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Informar sobre un error"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Código fuente"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Registro de cambios"
@@ -236,7 +234,7 @@ msgstr "¡Eh, %s!"
msgid "Hello, friend!"
msgstr "¡Hola amigo!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Claves públicas"
@@ -286,7 +284,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "¿Qué son los puentes?"
@@ -331,32 +329,101 @@ msgid "Get Bridges!"
msgstr "¡Obtener puentes!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Ninguno"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Por favor, selecciona opciones para el tipo de puente:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "¿Necesitas direcciones IPv6?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "¿Necesitas un %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Tu navegador no está mostrando las imágenes correctamente."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Introduce los caracteres de la imagen de arriba..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
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:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -365,21 +432,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -387,28 +454,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Solicitar puentes estándar."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Solicitar puente de red IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 a4177bd9cf..11cf891746 100644
--- a/es_AR/LC_MESSAGES/bridgedb.po
+++ b/es_AR/LC_MESSAGES/bridgedb.po
@@ -17,9 +17,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: yamila gonzalez <yamilabaddouh@xxxxxxxxx>\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"
@@ -47,18 +47,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "¡Lo sentimos! Algo salió mal con tu solicitud."
@@ -66,15 +64,15 @@ msgstr "¡Lo sentimos! Algo salió mal con tu solicitud."
msgid "Language"
msgstr "Idioma"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Reportar un error"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Código fuente"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Bitácora de cambios"
@@ -229,7 +227,7 @@ msgstr "¡Eh, %s!"
msgid "Hello, friend!"
msgstr "¡Hola amigo!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Claves públicas"
@@ -279,7 +277,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "¿Qué son los bridges?"
@@ -324,32 +322,101 @@ msgid "Get Bridges!"
msgstr "¡Obtené Bridges!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "ninguno"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Por favor seleccioná opciones para tipo de bridge:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "¿Necesitás direcciones IPv6?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "¿Necesitás una %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Tu navegador no muestra las imágenes correctamente."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Ingresá los caracteres de la imagen..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
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:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -358,21 +425,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -380,28 +447,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Pedir bridges ordinarios."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Pedir bridges IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 a7fb95c93c..28a1327437 100644
--- a/es_MX/LC_MESSAGES/bridgedb.po
+++ b/es_MX/LC_MESSAGES/bridgedb.po
@@ -14,9 +14,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: neoriddle <neopromos@xxxxxxxxx>\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"
@@ -44,18 +44,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Perdón! Algo salió mal con tu petición."
@@ -63,15 +61,15 @@ msgstr "Perdón! Algo salió mal con tu petición."
msgid "Language"
msgstr "Lenguaje"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Reportar un error"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Código fuente"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Registro de cambios"
@@ -226,7 +224,7 @@ msgstr "¡Eh, %s!"
msgid "Hello, friend!"
msgstr "¡Hola, amigo!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Claves Públicas"
@@ -276,7 +274,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "¿Que son puentes?"
@@ -321,32 +319,101 @@ msgid "Get Bridges!"
msgstr "¡Obten puentes!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Ninguno"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Por favor selecciona las opciones para tu tipo de puente:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "¿Necesitas direcciones IPv6?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "¿Necesitas un %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Tu navegador no muestra las imagenes correctamente"
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Ponga los caracteres de la imagen de arriba..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "Como empezar a usar tus puentes."
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -355,21 +422,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -377,28 +444,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Solicita un puente por defecto"
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Solicita puentes IPv6"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 46a9854995..21203f308f 100644
--- a/et/LC_MESSAGES/bridgedb.po
+++ b/et/LC_MESSAGES/bridgedb.po
@@ -11,9 +11,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: IDRASSI Mounir <mounir.idrassi@xxxxxxxx>\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"
@@ -41,18 +41,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Vabandust! Midagi läks Teie päringuga valesti."
@@ -60,15 +58,15 @@ msgstr "Vabandust! Midagi läks Teie päringuga valesti."
msgid "Language"
msgstr ""
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Teatage viga"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Lähtekood"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Muudatuste logi"
@@ -223,7 +221,7 @@ msgstr "Hei, %s!"
msgid "Hello, friend!"
msgstr "Tervist, sõber!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Avalikud Võtmed"
@@ -273,7 +271,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Mis on sillad?"
@@ -318,32 +316,101 @@ msgid "Get Bridges!"
msgstr "Hangi sillad!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "puudub"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Palun valige silla tüüp:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Kas teil on vaja IPv6 aadresse?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Kas teil on vaja %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Teie veebilehitseja ei kuva pilte korrektselt."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Sisestage ülemisel pildil olevad sümbolid..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "Kuidas alustada oma sildade kasutamist"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -352,21 +419,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -374,28 +441,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Esita päring tavaliste sildade jaoks."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Esita päring IPv6 sildade jaoks."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 f86e036607..703f606426 100644
--- a/eu/LC_MESSAGES/bridgedb.po
+++ b/eu/LC_MESSAGES/bridgedb.po
@@ -15,9 +15,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: erinm\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"
@@ -45,18 +45,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Barkatu! Zerbait gaizki joan da zure eskaeran."
@@ -64,15 +62,15 @@ msgstr "Barkatu! Zerbait gaizki joan da zure eskaeran."
msgid "Language"
msgstr "Hizkuntza"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Eman errore baten berri"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Iturburu-kodea"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Changelog-a"
@@ -227,7 +225,7 @@ msgstr "Kaixo, %s!"
msgid "Hello, friend!"
msgstr "Kaixo, lagun!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Gako Publikoak"
@@ -277,7 +275,7 @@ msgid ""
"\n"
msgstr ""
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Zer dira zubiak?"
@@ -322,32 +320,101 @@ msgid "Get Bridges!"
msgstr "Zubiak Lortu!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Bat ere ez"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr ""
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "IPv6 helbideak behar dituzu?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "%s behar duzu?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Zure nabigatzaileak ez ditu irudiak behar bezala erakusten."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Sartu goiko irudiko karaktereak..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "Nola hasi zure zubiak erabiltzen"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -356,21 +423,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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 +445,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr ""
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Eskatu IPv6 zubiak."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:215
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 f206b3fd20..b3b60f4a24 100644
--- a/fa/LC_MESSAGES/bridgedb.po
+++ b/fa/LC_MESSAGES/bridgedb.po
@@ -23,9 +23,9 @@ 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: 2020-02-18 13:39-0800\n"
-"PO-Revision-Date: 2020-03-13 23:37+0000\n"
-"Last-Translator: Seyyed Hossein Darvari <xhdix@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: magnifico\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"
@@ -53,6 +53,7 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -61,7 +62,7 @@ msgstr ""
#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Ù?تاسÙ?اÙ?Ù? در رابطÙ? با درخÙ?است Ø´Ù?ا خطاÛ?Û? رخ دادÙ? است."
@@ -69,15 +70,15 @@ msgstr "Ù?تاسÙ?اÙ?Ù? در رابطÙ? با درخÙ?است Ø´Ù?ا خطاÛ?Û?
msgid "Language"
msgstr "زباÙ?"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "گزارش اشکاÙ? در برÙ?اÙ?Ù?"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "کد Ù?Ù?بع"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Ù?Û?ست تغÛ?Û?رات"
@@ -232,7 +233,7 @@ msgstr "سÙ?اÙ?Ø? %s!"
msgid "Hello, friend!"
msgstr "سÙ?اÙ? دÙ?ست Ù?Ù?!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Ú©Ù?Û?دÙ?اÛ? عÙ?Ù?Ù?Û?"
@@ -327,32 +328,101 @@ msgid "Get Bridges!"
msgstr "درÛ?اÙ?ت Ù¾Ù?â??Ù?ا!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Ù?Û?Ú?"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Ù?Ø·Ù?ا گزÛ?Ù?Ù? Ù?Ù?ع Ù¾Ù? را اÙ?تخاب Ú©Ù?Û?د:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Ø¢Û?ا Ø´Ù?ا بÙ? آدرس Ù?اÛ? IPv6 Ù?Û?از دارÛ?دØ?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Ø¢Û?ا Ø´Ù?ا Ù?Û?از دارÛ?د بÙ? Û?Ú© %sØ?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Ù?رÙ?رگر Ø´Ù?ا تصاÙ?Û?ر را بÙ? درستÛ? Ù?Ù?اÛ?Ø´ Ù?Ù?Û? دÙ?د."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "کاراکتر Ù?ا را از تصÙ?Û?ر باÙ?ا Ù?ارد Ú©Ù?Û?د..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "Ú?Ú¯Ù?Ù?Ú¯Û? از Ù¾Ù?â??Ù?اÛ? Ø®Ù?د استÙ?ادÙ? Ú©Ù?Û?د"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -361,21 +431,21 @@ msgid ""
msgstr "براÛ? Ù?رÙ?د بÙ? Ù¾Ù? در Ù?رÙ?رگر Tor Ø? براÛ? اÙ?Ù?Û?Ù? بار %s بÙ? داÙ?Ù?Ù?د Ù?رÙ?رگر Tor \nصÙ?ØÙ? %s Ù? پس از Ø¢Ù? بÙ? دÙ?باÙ? دستÙ?راÙ?عÙ?Ù? داÙ?Ù?Ù?د Ù? استÙ?ادÙ? از\nÙ?رÙ?رگر Tor برÙ?Û?د."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Ù?Ù?تÛ? Ú©Ù? صÙ?ØÙ? 'تÙ?ظÛ?Ù?ات شبکÙ? Tor' Ù?Ù?اÛ?Ø´ دادÙ? شد, رÙ?Û? گزÛ?Ù?Ù? 'Ù¾Û?کربÙ?دÛ?' Ú©Ù?Û?Ú© Ú©Ù?Û?د Ù? دÙ?باÙ? Ú©Ù?Û?د\nتا زÙ?اÙ?Û? Ú©Ù? wizard از Ø´Ù?ا بپرسد:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -383,28 +453,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "'بÙ?Ù?' را اÙ?تخاب کردÙ? Ù? سپس 'بعدÛ?' را اÙ?تخاب Ú©Ù?Û?د. براÛ? Ù¾Û?کربÙ?دÛ? Ù¾Ù? جدÛ?د Ø®Ù?د, copy Ù? paste Ú©Ù?Û?د خطÙ?Ø· Ù¾Ù? را در Ù?تÙ? جعبÙ? Ù?رÙ?دÛ?. در Ù?Ù?اÛ?ت, رÙ?Û? 'اتصاÙ?' Ú©Ù?Û?Ú© Ú©Ù?Û?د,\nراÙ? درستش اÛ?Ù? است! اگر Ù?Ø´Ú©Ù?Û? Ù¾Û?Ø´ Ø¢Ù?د, Ú©Ù?Û?Ú© Ú©Ù?Û?د رÙ?Û? Ú©Ù?Û?د 'راÙ?Ù?Ù?ا'\nدر 'تÙ?ظÛ?Ù?ات شبکÙ? Tor' wizard براÛ? اطÙ?اعات بÛ?شتر."
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "درخÙ?است Ù¾Ù?â??Ù?اÛ? عادÛ?"
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "درخÙ?است Ù¾Ù?â??Ù?اÛ? IPv6"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 b2c8b9bc69..2a910e8687 100644
--- a/fi/LC_MESSAGES/bridgedb.po
+++ b/fi/LC_MESSAGES/bridgedb.po
@@ -18,9 +18,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+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"
@@ -48,18 +48,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Pyyntösi epäonnistui jostain syystä."
@@ -67,15 +65,15 @@ msgstr "Pyyntösi epäonnistui jostain syystä."
msgid "Language"
msgstr "Kieli"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Ilmoita ohjelmointivirheestä"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Lähdekoodi"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Muutosloki"
@@ -230,7 +228,7 @@ msgstr "Hei, %s!"
msgid "Hello, friend!"
msgstr "Hei ystävä!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Julkiset avaimet"
@@ -280,7 +278,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Mitä ovat sillat?"
@@ -325,32 +323,101 @@ msgid "Get Bridges!"
msgstr "Hae sillat!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Ei mikään"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Valitse valitsimet siltatyypille:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Tarvitsetko IPv6-osoitteita?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Tarvitsetko %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Selaimesi ei näytä kuvia oikein."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Syötä merkit yläpuolella olevasta kuvasta..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "Kuinka aloitat siltojesi käytön"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -359,21 +426,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -381,28 +448,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Pyydä tavallisia siltoja."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Pyydä IPv6-siltoja."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 79905a5ac6..978eb7a662 100644
--- a/fr/LC_MESSAGES/bridgedb.po
+++ b/fr/LC_MESSAGES/bridgedb.po
@@ -29,8 +29,8 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 14:28+0000\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
"Last-Translator: AO <ao@xxxxxxxxxxxxxxxxxxx>\n"
"Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -59,18 +59,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Désoléâ??! Un problème est survenu à la suite de votre requête."
@@ -78,15 +76,15 @@ msgstr "Désoléâ??! Un problème est survenu à la suite de votre requête."
msgid "Language"
msgstr "Langue"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Signaler un bogue"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Code source"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Journal des changements"
@@ -241,7 +239,7 @@ msgstr "Bonjour, %sâ??!"
msgid "Hello, friend!"
msgstr "Bonjour, lâ??amiâ??!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Clés publiques"
@@ -291,7 +289,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Que sont les pontsâ???"
@@ -336,32 +334,101 @@ msgid "Get Bridges!"
msgstr "Obtenez des pontsâ??!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Aucune"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Veuillez choisir des options pour le type de pontsâ??:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Avez-vous besoin dâ??adresses IPv6â???"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Avez-vous besoin dâ??un transport enfichable (%s)â???"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Votre navigateur nâ??affiche pas les images correctement."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Saisir les caractères de lâ??image ci-dessusâ?¦"
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "Comment commencer à utiliser vos pontsâ???"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -370,21 +437,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -392,28 +459,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Demander des ponts traditionnels."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Demander des ponts IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 dfe8b6c1e5..5dcbe40826 100644
--- a/ga/LC_MESSAGES/bridgedb.po
+++ b/ga/LC_MESSAGES/bridgedb.po
@@ -8,8 +8,8 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
"Language-Team: Irish (http://www.transifex.com/otf/torproject/language/ga/)\n"
"MIME-Version: 1.0\n"
@@ -38,18 +38,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "�r leithscéal! Bhà fadhb leis an iarratas a rinne tú."
@@ -57,15 +55,15 @@ msgstr "�r leithscéal! Bhà fadhb leis an iarratas a rinne tú."
msgid "Language"
msgstr "Teanga"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Tuairiscigh Fabht"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Cód Foinseach"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Logchomhad athruithe"
@@ -220,7 +218,7 @@ msgstr "Hóra a %s!"
msgid "Hello, friend!"
msgstr "Dia dhuit a chara!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Eochracha PoiblÃ"
@@ -270,7 +268,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Cad is droichead ann?"
@@ -315,32 +313,101 @@ msgid "Get Bridges!"
msgstr "Faigh Droichid!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr ""
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Roghanna don chineál droichid:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "An dteastaÃonn seoltaà IPv6 uait?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "An dteastaÃonn %s uait?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
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:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Cuir isteach na carachtair ón Ãomhá thuas..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
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:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -349,21 +416,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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 +438,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Iarr gnáthdhroichid."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Iarr droichid IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 a29d78b67b..3da744ffae 100644
--- a/gd/LC_MESSAGES/bridgedb.po
+++ b/gd/LC_MESSAGES/bridgedb.po
@@ -8,8 +8,8 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
"Language-Team: Gaelic, Scottish (http://www.transifex.com/otf/torproject/language/gd/)\n"
"MIME-Version: 1.0\n"
@@ -38,18 +38,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Duilich! Chaidh rudeigin cearr leis na dh'iarr thu."
@@ -57,15 +55,15 @@ msgstr "Duilich! Chaidh rudeigin cearr leis na dh'iarr thu."
msgid "Language"
msgstr ""
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Innis mu mhearachd"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Còd Tùsail"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Clar-atharraich"
@@ -220,7 +218,7 @@ msgstr "Hai, %s!"
msgid "Hello, friend!"
msgstr "Hallo a charaid!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Iuchairichean Poblach"
@@ -270,7 +268,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "De a th' ann an drochaidean?"
@@ -315,32 +313,101 @@ msgid "Get Bridges!"
msgstr "Faigh Drochaidean!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr ""
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "A bheil feum agad air seolaidhean-IPv6?"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "A bheil feum agad air seòlaidhean IPv6?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Am feum thu %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Chan eil do Shealladair a' sealltainn dealbhan anns an dòigh cheart."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Sgrìobh a-steach na caractaran bhon ìomhaigh gu h-à irde..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
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:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -349,21 +416,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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 +438,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Faighnich airson drochaidean vanilla."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Faighnich airson drochaidean IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:215
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 bc862983e4..261b17fbc9 100644
--- a/gl/LC_MESSAGES/bridgedb.po
+++ b/gl/LC_MESSAGES/bridgedb.po
@@ -12,9 +12,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: Oscar Guardiola <Oscar.Guardiola@xxxxxxxxxxxxx>\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"
@@ -42,18 +42,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "SentÃmolo! Algo foi mal coa súa solicitude."
@@ -61,15 +59,15 @@ msgstr "SentÃmolo! Algo foi mal coa súa solicitude."
msgid "Language"
msgstr "Lingua"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Informar dun Bug"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Código Fonte"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Rexistro de Cambios"
@@ -224,7 +222,7 @@ msgstr "Ola, %s!"
msgid "Hello, friend!"
msgstr "Ola amigo/a!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Claves públicas"
@@ -274,7 +272,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Que son os repetidores ponte?"
@@ -319,32 +317,101 @@ msgid "Get Bridges!"
msgstr "Obter Pontes!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Nada"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Por favor seleccione opcións para o tipo de ponte:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Necesita direccións IPv6?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Necesita vostede un %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "O seu navegador non está amosando imaxes adecuadamente."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Introduza os caracteres da imaxen de enrriba..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
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:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -353,21 +420,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -375,28 +442,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Solicitar pontes estándar."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Solicitar pontes IPv6"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 acabc56699..d9fae794f6 100644
--- a/gu/LC_MESSAGES/bridgedb.po
+++ b/gu/LC_MESSAGES/bridgedb.po
@@ -8,9 +8,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: Michael Hathi <numerativetech@xxxxxxxxx>\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"
@@ -38,18 +38,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "માફ �રશ�! તમાર� વિન�ત� સાથ� ���� ����� થય��."
@@ -57,15 +55,15 @@ msgstr "માફ �રશ�! તમાર� વિન�ત� સાથ�
msgid "Language"
msgstr ""
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "સમસ�યાન� �ાણ �ર�"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "સ�ત�ર�ત ��ડ"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "ન��ધણ�� બદલ�"
@@ -220,7 +218,7 @@ msgstr "હાય, %s!"
msgid "Hello, friend!"
msgstr "નમસ�ત�, મિત�ર!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr ""
@@ -270,7 +268,7 @@ msgid ""
"\n"
msgstr ""
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr ""
@@ -315,32 +313,101 @@ msgid "Get Bridges!"
msgstr "bridges મ�ળવ�!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "��� નહિ"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr ""
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr ""
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr ""
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -349,21 +416,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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 +438,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr ""
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:215
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 e2cdc0a3f4..c52c935527 100644
--- a/he/LC_MESSAGES/bridgedb.po
+++ b/he/LC_MESSAGES/bridgedb.po
@@ -18,8 +18,8 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-06 22:46+0000\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
"Last-Translator: ION\n"
"Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -48,18 +48,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "ס×?×?×?×?! ×?ש×?×? ×?שת×?ש ×?×?קש×? ש×?×?."
@@ -67,15 +65,15 @@ msgstr "ס×?×?×?×?! ×?ש×?×? ×?שת×?ש ×?×?קש×? ש×?×?."
msgid "Language"
msgstr "שפ×?"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "×?×?×?×? ×¢×? תק×?"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "ק×?×? ×?ק×?ר"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "×?×?×?×? ש×?× ×?×?×?×?"
@@ -230,7 +228,7 @@ msgstr "×?×?×?, %s!"
msgid "Hello, friend!"
msgstr "ש×?×?×?, ×?×?ר!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "×?פת×?×?ת צ×?×?×?ר×?×?×?"
@@ -280,7 +278,7 @@ msgid ""
"\n"
msgstr "×?× ×?סף, ×?Ö¾BridgeDB ×?ש שפע ש×? ×?שר×?×? ×?×?ס×?×? ×?×?ש×? ×?×?×?×?×? %s ×?×?×? תע×?×?ר×?ת × ×ª×?ק×?ת ×?×?ש×?×? %s, ×?×? ש×?×?×?×? ×?×? × ×©×?×¢ ×?×?× ×?×?, ×?×? ×?×? ×¢×?×?×? ×?×?×?×?×?×? ×?×¢×?×?ר ×?עק×?×£ ×¦× ×?×?רת ×?×?× ×?×¨× ×? ×?×?קר×?×? ר×?×?×?.\n"
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "×?×?×? ×?שר×?×??"
@@ -325,32 +323,101 @@ msgid "Get Bridges!"
msgstr "×?ש×? ×?שר×?×?!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "×?×?×?×?"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "×?× ×? ×?×?ר ×?פשר×?×?×?ת ×?ס×?×? ×?×?שר:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "×?×?×? ×?ת×? צר×?×? ×?ת×?×?×?ת IPv6?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "×?×?×? ×?ת×? צר×?×? %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "×?×?פ×?פ×? ש×?×? ×?×? ×?צ×?×? ת×?×?× ×?ת ×?ר×?×?×?."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "×?×?× ×¡ ×?ת ×?ת×?×?×?×? ×?×?ת×?×?× ×? ×?×?×¢×?×?â?¦"
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "×?×?×? ×?×?ת×?×?×? ×?×?שת×?ש ×?×?שר×?×? ש×?×?"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -359,21 +426,21 @@ msgid ""
msgstr "×?×?×? ×?×?×?× ×?ס ×?שר×?×? ×?ת×?×? ×?פ×?פ×? Tor, ר×?ש×?ת ×?×? ×?×? %s ×?×£ ×?×?ר×?ת ×?פ×?פ×? Tor %s ×?×?×?×?ר ×?×?×? עק×?×? ×?×?ר ×?×?×?ר×?×?ת ×¢×?×?ר ×?×?ר×?×? ×?×?ת×?×?×? ש×? ×?פ×?פ×? Tor."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -381,28 +448,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "×?×?ר '×?×?' ×?×?×? ×?×?×¥ ×¢×? '×?×?×?'. ×?×?×? ×?תצר ×?ת ×?×?שר×?×? ×?×?×?ש×?×? ש×?×?, ×?עתק ×?×?×?×?ק ×?ת ש×?ר×?ת ×?×?שר×?×? ×?ת×?×? ת×?×?ת ×?ק×?×? ש×? ×?×?×?×?. ×?×?ס×?×£, ×?×?×¥ ×¢×? '×?ת×?×?ר' ×?×?ת×? ×?×?×?ר ×?×?×?×?ת ×?×?×?×?! ×?×? ת×?×?×?×? תק×?×?, × ×¡×? ×?×?×?×?×¥ ×¢×? ×?×?פת×?ר '×¢×?ר×?' ×?×?שף '×?×?×?ר×?ת רשת Tor' ×?ס×?×?×¢ × ×?סף."
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "×?קש ×?שר×?×? ×?×?ס×?×? ×?×?ש×?."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "×?קש ×?שר×? IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
msgid "Request a Pluggable Transport by TYPE."
msgstr "×?קש תע×?×?ר×? × ×ª×?ק×? ×?פ×? TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:215
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 9b7f496f8b..29015db33f 100644
--- a/hi/LC_MESSAGES/bridgedb.po
+++ b/hi/LC_MESSAGES/bridgedb.po
@@ -11,9 +11,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: erinm\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"
@@ -41,18 +41,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "��षमा �र�� ! �प�ा �न�र�ध प�रा नह�� �िया �ा स�ा। "
@@ -60,15 +58,15 @@ msgstr "��षमा �र�� ! �प�ा �न�र�ध प�र
msgid "Language"
msgstr "à¤à¤¾à¤·à¤¾"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "�िस� त�र��� �� बार�� म�� बता��। "
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "स���त लिपि �ा स�त�र�त।"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "परिवर�तनस���।"
@@ -223,7 +221,7 @@ msgstr "�र�, %s!"
msgid "Hello, friend!"
msgstr "नमस�त�, द�स�त!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "सार�व�नि� �����"
@@ -273,7 +271,7 @@ msgid ""
"\n"
msgstr "à¤?सà¤?à¥? à¤?तिरिà¤?à¥?त, BridgeDB à¤?à¥? पास à¤?à¥?à¤? साधारण bridges %s बिना à¤?िनà¥?हà¥?à¤? Pluggable Transports %s\nà¤?à¥? à¤à¥? हà¥?à¤?. à¤?à¥? à¤?ि सà¥?ननà¥? मà¥?à¤? à¤?तनà¥? à¤?à¤?à¥?à¤?à¥? नहà¥?à¤? हà¥? लà¥?à¤?िन फिर à¤à¥? यà¥?\nà¤?à¥?à¤? मामलà¥? मà¥?à¤? à¤?नà¥?à¤?रनà¥?à¤? सà¥?à¤?सरशिप à¤?à¥? रà¥?à¤? सà¤?तà¥? हà¥?à¤?.\n\n"
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "bridges ��या ह��?"
@@ -318,32 +316,101 @@ msgid "Get Bridges!"
msgstr "Bridges प�राप�त �र��!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "��� नह��"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "��पया Bridge �� प�र�ार �ा वि�ल�प ��नि�:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "��या �प�� IPv6 पत�� �� �र�रत ह�?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "��या �प�� %s �ाहि�?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "�प�ा ब�रा��र फ���� �� ठ�� स� प�रदर�शित नह�� �र रहा ह�."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "�पर �� �ित�र स� ���षर डाल�."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "�प�� bridges �� �स�त�माल �रना ��स� श�र� �र��?"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -352,21 +419,21 @@ msgid ""
msgstr "Tor Browser म�� bridges म�� प�रव�श �रन� �� लि�, सबस� पहल� %s Tor Browser डा�नल�ड प�� पर �ा��\n%s �र �स�� बाद वहा� पर Tor Browser �� डा�नल�ड �र श�र� �रन� �� निर�द�श�� �ा पालन �र��."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -374,28 +441,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "'हा�' ��न� �र तब '���' पर ��लि� �र��. �पन� न� bridges �� configure �रन� �� लि�, bridges प���तिय�� \n�� ��प� �र�� ����स�� �नप�� ब���सम�� प�स�� �र द��. ��त म��,\"स�पर�� �र��\" पर ��लि� �र�सब ��� �पन� �प ह� �ा��ा. \nयदि �प�� सामन� ��� पर�शान�\n�य� त� ��� �� सहायता �� लि� Tor न��वर�� स��ि�� म�� \"मदद\" ब�न पर ��लि� �र द��."
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "vanilla bridges �� लि� निव�दन �र��."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "IPv6 bridges �� लि� निव�दन �र��."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 554a3a7054..cb4b5fdfa2 100644
--- a/hr/LC_MESSAGES/bridgedb.po
+++ b/hr/LC_MESSAGES/bridgedb.po
@@ -11,9 +11,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+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"
@@ -41,18 +41,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Oprostite! Nešto je pošlo po krivu s Vašim zahtjevom."
@@ -60,15 +58,15 @@ msgstr "Oprostite! Nešto je pošlo po krivu s Vašim zahtjevom."
msgid "Language"
msgstr "Jezik"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Prijavite grešku"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Izvorni kod"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Zapisnik o promjenama"
@@ -223,7 +221,7 @@ msgstr "Bok, %s!"
msgid "Hello, friend!"
msgstr "Bok, prijatelju!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Javni kljuÄ?evi"
@@ -273,7 +271,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Å to su mostovi?"
@@ -318,32 +316,101 @@ msgid "Get Bridges!"
msgstr "Preuzmite mostove!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Ništa"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Molimo odaberite opcije za tip mosta:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Trebaju li Vam IPv6 adrese?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Trebate li %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Vaš preglednik ne prikazuje slike ispravno."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Unesite znakove sa slike iznad..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "Kako poÄ?eti koristite mostove"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -352,21 +419,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -374,28 +441,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Zatraži dobre, stare mostove."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Zatraži IPv6 mostove."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 651b13aa05..1aa7086e92 100644
--- a/hu/LC_MESSAGES/bridgedb.po
+++ b/hu/LC_MESSAGES/bridgedb.po
@@ -13,9 +13,9 @@ 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: 2020-02-18 13:39-0800\n"
-"PO-Revision-Date: 2020-03-16 14:19+0000\n"
-"Last-Translator: vargaviktor <viktor.varga@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+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"
@@ -43,6 +43,7 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -51,7 +52,7 @@ msgstr ""
#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Elnézést! Valami rosszul működött a kérésed közben."
@@ -59,15 +60,15 @@ msgstr "Elnézést! Valami rosszul működött a kérésed közben."
msgid "Language"
msgstr "Nyelv"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Hiba jelentése"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Forrás kód"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Változások"
@@ -222,7 +223,7 @@ msgstr "Hé, %s!"
msgid "Hello, friend!"
msgstr "Hello!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Nyilvános kulcsok"
@@ -317,32 +318,101 @@ msgid "Get Bridges!"
msgstr "Hidak szerzése!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Nincs"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Kérjük, válasszon opciót a hÃd tÃpushoz:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Kellenek önnek IPv6 cÃmek?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Szüksége van egy %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
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:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Adja meg a karaktereket amik a fenti képen láthatóak ..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
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:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -351,21 +421,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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 +443,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Nem csatlakoztatható szállÃtó hÃd kérelme."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "IPV6 hÃd kérése."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 9f7a763d37..7e8dc95149 100644
--- a/hy/LC_MESSAGES/bridgedb.po
+++ b/hy/LC_MESSAGES/bridgedb.po
@@ -10,8 +10,8 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
"Language-Team: Armenian (http://www.transifex.com/otf/torproject/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -40,18 +40,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Õ?Õ¥Ö?Õ¥Ö?Õ¥Õ?Ö?, Õ?Õ¥Ö? Õ°Õ¡Ö?Ö?Õ¸Ö?Õ´Õ¨ Õ½ÕÕ¡Õ¬ Õ¨Õ¶Õ©Õ¡Ö?Ö? Õ½Õ¿Õ¡Ö?Õ¡Õ¾:"
@@ -59,15 +57,15 @@ msgstr "Õ?Õ¥Ö?Õ¥Ö?Õ¥Õ?Ö?, Õ?Õ¥Ö? Õ°Õ¡Ö?Ö?Õ¸Ö?Õ´Õ¨ Õ½ÕÕ¡Õ¬ Õ¨Õ¶Õ©Õ¡Ö?Ö? Õ½Õ¿Õ¡Ö?
msgid "Language"
msgstr "Ô¼Õ¥Õ¦Õ¸Ö?Õ¶"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Õ?Õ¡ÕµÕ¿Õ¶Õ¥Õ¬ Õ½ÕÕ¡Õ¬Õ« Õ´Õ¡Õ½Õ«Õ¶"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "ÔµÕ¬Õ¡Õ¯Õ¥Õ¿Õ¡ÕµÕ«Õ¶ Õ¯Õ¸Õ¤"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Õ?Õ¸Ö?Õ¸ÕÕ¸Ö?Õ©ÕµÕ¸Ö?Õ¶Õ¶Õ¥Ö?Õ« Õ´Õ¡Õ¿ÕµÕ¡Õ¶"
@@ -222,7 +220,7 @@ msgstr "Õ?Õ¥Õ?Õµ, %sÖ?"
msgid "Hello, friend!"
msgstr "Ô²Õ¡Ö?Ö?Õ?, Õ¨Õ¶Õ¯Õ¥Ö?Õ½:"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Õ?Õ¡Õ¶Ö?Õ¡ÕµÕ«Õ¶ Õ¢Õ¡Õ¶Õ¡Õ¬Õ«Õ¶Õ¥Ö?"
@@ -272,7 +270,7 @@ msgid ""
"\n"
msgstr "Õ?Õ¡Õ¾Õ¥Õ¬Õ¥Õ¶Ö?, Õ¸Ö? BridgeDB-Õ¶ Õ¸Ö?Õ¶Õ« Õ¶Õ¡Ö? Õ¢Õ¡Õ¦Õ¸Ö?Õ´ Õ°Õ¡Õ½Õ¡Ö?Õ¡Õ¯ Õ¯Õ¡Õ´Õ¸Ö?Ö?Õ»Õ¶Õ¥Ö?, Õ¸Ö?Õ¸Õ¶Ö? Õ¹Õ¥Õ¶ Õ¡Õ»Õ¡Õ¯Ö?Õ¸Ö?Õ´\n%s Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö?Õ« Ö?Õ¸ÕÕ¡Õ¶Ö?Õ¸Ö?Õ´Õ¨ %s, Õ«Õ¶Õ¹Õ¨ Õ¯Õ¡Ö?Õ¸Õ² Õ§ Õ¡Õ¦Õ¤Õ¥Õ¬ Õ¯Õ¡ÕµÖ?Õ« Õ§Õ»Õ« Õ¿Õ¥Õ½Ö?Õ« Õ¾Ö?Õ¡,\nÕ¢Õ¡ÕµÖ? Õ·Õ¡Õ¿ Õ¤Õ¥ÕºÖ?Õ¥Ö?Õ¸Ö?Õ´ Õ¯Õ¡Ö?Õ¸Õ² Õ¥Õ¶ Ö?Õ£Õ¶Õ¥Õ¬ Õ·Ö?Õ»Õ¡Õ¶Ö?Õ¥Õ¬ Õ°Õ¡Õ´Õ¡Ö?Õ¡Õ¶Ö?Õ¡ÕµÕ«Õ¶ Õ£Ö?Õ¡Ö?Õ¶Õ¶Õ¸Ö?Õ©ÕµÕ¸Ö?Õ¶Õ¨Ö?\n\n"
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Ô»Õ?Õ¶Õ¹ Õ¥Õ¶ Õ¯Õ¡Õ´Õ¸Ö?Ö?Õ»Õ¶Õ¥Ö?Õ¨Ö?"
@@ -317,32 +315,101 @@ msgid "Get Bridges!"
msgstr "Õ?Õ¿Õ¡Ö?Õ¥Õ?Ö? Bridge-Õ¶Õ¥Ö?:"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr ""
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Ô½Õ¶Õ¤Ö?Õ¸Ö?Õ´ Õ¥Õ¶Ö? Õ¨Õ¶Õ¿Ö?Õ¥Õ¬ bridge-Õ« Õ¿Õ¥Õ½Õ¡Õ¯Õ« Õ¿Õ¡Ö?Õ¢Õ¥Ö?Õ¡Õ¯Õ¶Õ¥Ö?Õ¨."
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Õ?Õ¥Õ¦ ÕºÕ¥Õ?Õ¿Ö? Õ¥Õ¶ IPv6 Õ°Õ¡Õ½Ö?Õ¥Õ¶Õ¥Ö?:"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Õ?Õ¥Õ¦ ÕºÕ¥Õ?Õ¿Ö? Õ§ %s:"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Õ?Õ¥Ö? Õ¢Ö?Õ¡Õ¸Ö?Õ¦Õ¥Ö?Õ¨ Õ¶Õ¯Õ¡Ö?Õ¶Õ¥Ö?Õ¨ Õ³Õ·Õ¿Õ¸Ö?Õ¥Õ¶ Ö?Õ¸Ö?ÕµÖ? Õ¹Õ« Õ¿Õ¡Õ¬Õ«Õ½:"
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Õ?Õ¸Ö?Õ¿Ö?Õ¡Õ£Ö?Õ¥Õ?Ö? Õ¿Õ¡Õ¼Õ¡Õ¶Õ·Õ¡Õ¶Õ¶Õ¥Ö?Õ¨ Õ¾Õ¥Ö?Ö?Õ« Õ¶Õ¯Õ¡Ö?Õ«Ö?:"
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "Ô»Õ¶Õ¹ÕºÕ¥Õ?Õ½ Õ½Õ¯Õ½Õ¥Õ¬ Ö?Õ£Õ¿Õ¡Õ£Õ¸Ö?Õ®Õ¥Õ¬ Õ?Õ¥Ö? bridge-Õ¶Õ¥Ö?Õ¨:"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -351,21 +418,21 @@ msgid ""
msgstr "Õ?Õ¸Ö?Õ¿Ö?Õ¡Õ£Ö?Õ¥Õ¬Õ¸Ö? Õ°Õ¡Õ´Õ¡Ö? bridge-Õ¶Õ¥Ö?Õ¨ Tor Browser, Õ¶Õ¡Õ Õ´Õ¿Õ¥Õ?Ö? %sTor Browser-Õ« Õ¶Õ¥Ö?Õ¢Õ¥Õ¼Õ¶Õ´Õ¡Õ¶ Õ§Õ»Õ¨%s Ö? Õ°Õ¥Õ¿Ö?Õ¥Õ?Ö? Õ°Ö?Õ¡Õ°Õ¡Õ¶Õ£Õ¶Õ¥Ö?Õ«Õ¶Õ? Õ¶Õ¥Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬Õ¸Ö? Ö? Õ£Õ¸Ö?Õ®Õ¡Ö?Õ¯Õ¥Õ¬Õ¸Ö? Õ°Õ¡Õ´Õ¡Ö? Tor Browser-Õ¨:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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 +440,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Õ?Õ¥Õ²Õ´Õ¥Ö? «Այո», Õ«Õ½Õ¯ Õ°Õ¥Õ¿Õ¸ «Õ?Õ¡Õ»Õ¸Ö?դը»: Ô¿Õ¡Ö?Õ£Õ¡Õ¾Õ¸Ö?Õ¥Õ¬Õ¸Ö? Õ°Õ¡Õ´Õ¡Ö? Õ?Õ¥Ö? Õ¶Õ¸Ö? bridge-Õ¶Õ¥Ö?Õ¨, ÕºÕ¡Õ¿Õ³Õ¥Õ¶Õ¥Ö? Ö?\nÕ¿Õ¥Õ²Õ¡Õ¤Ö?Õ¥Ö? bridge line-Õ¨ Õ¿Õ¥Ö?Õ½Õ¿Õ¡ÕµÕ«Õ¶ Õ¤Õ¡Õ·Õ¿Õ¸Ö?Õ´: Õ?Õ¥Ö?Õ»Õ¸Ö?Õ´, Õ½Õ¥Õ²Õ´Õ¥Ö? «Õ?իանալ», Ö? Ô´Õ¸Ö?Ö? ÕºÕ¡Õ¿Ö?Õ¡Õ½Õ¿ Õ¯Õ¬Õ«Õ¶Õ¥Ö?: ÔµÕ©Õ¥ Õ¹Õ¯Õ¸Õ²Õ´Õ¶Õ¸Ö?Õ¸Õ·Õ¾Õ¥Ö?Õ? Ö?Õ¸Ö?Õ±Õ¥Ö? Õ½Õ¥Õ²Õ´Õ¥Õ¬ «Õ?Õ£Õ¶Õ¸Ö?Õ©ÕµÕ¸Ö?ն»\nÕ¯Õ¸Õ³Õ¡Õ¯Õ¨ «Tor-Õ« Ö?Õ¡Õ¶Ö?Õ¡ÕµÕ«Õ¶ Õ¯Õ¡Ö?Õ£Õ¡Õ¾Õ¸Ö?Õ¸Ö?Õ´Õ¶Õ¥Ö?»-Õ¸Ö?Õ´Õ? Õ°Õ¥Õ¿Õ¡Õ£Õ¡ Ö?Õ£Õ¶Õ¸Ö?Õ©ÕµÕ¡Õ¶ Õ°Õ¡Õ´Õ¡Ö?:"
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Ô´Õ«Õ´Õ¥Õ¬ Õ°Õ¡Õ½Õ¡Ö?Õ¡Õ¯ bridge-Õ¶Õ¥Ö?Õ« Õ°Õ¡Õ´Õ¡Ö?:"
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Ô´Õ«Õ´Õ¥Õ¬ IPv6 bridge-Õ¶Õ¥Ö?Õ« Õ°Õ¡Õ´Õ¡Ö?:"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 1fa4b7cbd8..69de215f7f 100644
--- a/id/LC_MESSAGES/bridgedb.po
+++ b/id/LC_MESSAGES/bridgedb.po
@@ -24,9 +24,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: erinm\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"
@@ -54,18 +54,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Maaf! Telah terjadi kesalahan dengan permintaan Anda."
@@ -73,15 +71,15 @@ msgstr "Maaf! Telah terjadi kesalahan dengan permintaan Anda."
msgid "Language"
msgstr "Language"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Laporkan bug"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Kode Sumber"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Perubahan"
@@ -236,7 +234,7 @@ msgstr "Hai, %s!"
msgid "Hello, friend!"
msgstr "Halo, kawan!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Kunci Publik"
@@ -286,7 +284,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Apa itu jembatan?"
@@ -331,32 +329,101 @@ msgid "Get Bridges!"
msgstr "Dapatkan Jembatan!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Tidak ada"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Mohon pilih opsi untuk tipe jembatan:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Apakah Anda membutuhkan alamat IPv6?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Apakah Anda membutuhkan %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Peramban Anda tidak menampilkan gambar dengan benar."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Masukkan karakter dari gambar di atas..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "Cara memulai menggunakan jembatan Anda"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -365,21 +432,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -387,28 +454,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Minta jembatan yang biasa."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Minta jembatan IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 c9ea69db60..ae11392fbb 100644
--- a/is/LC_MESSAGES/bridgedb.po
+++ b/is/LC_MESSAGES/bridgedb.po
@@ -8,9 +8,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-10 18:43+0000\n"
-"Last-Translator: Sveinn à Felli <sv1@xxxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: erinm\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"
@@ -38,18 +38,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Ã?bbs! Eitthvað fór úrskeiðis varðandi beiðnina þÃna."
@@ -57,15 +55,15 @@ msgstr "Ã?bbs! Eitthvað fór úrskeiðis varðandi beiðnina þÃna."
msgid "Language"
msgstr "Tungumál"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Tilkynna um villu"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Grunnkóði"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Breytingaannáll"
@@ -220,7 +218,7 @@ msgstr "Hæ, %s!"
msgid "Hello, friend!"
msgstr "Sæll vinur!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Dreifilyklar"
@@ -270,7 +268,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Hvað eru brýr?"
@@ -315,32 +313,101 @@ msgid "Get Bridges!"
msgstr "Sækja brýr!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Engin"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Veldu valkosti fyrir tegund brúar:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "�arftu IPv6-vistföng?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Ã?arftu %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Vafrinn þinn birtir myndir ekki rétt."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Settu inn stafina úr myndinni hér að ofan..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
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:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -349,21 +416,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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 +438,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Biðja um venjulegar brýr."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Biðja um IPv6-brýr."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 c076415778..b9a9873221 100644
--- a/it/LC_MESSAGES/bridgedb.po
+++ b/it/LC_MESSAGES/bridgedb.po
@@ -26,9 +26,9 @@ 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: 2020-02-18 13:39-0800\n"
-"PO-Revision-Date: 2020-02-24 09:39+0000\n"
-"Last-Translator: Random_R\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+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"
@@ -56,6 +56,7 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -64,7 +65,7 @@ msgstr ""
#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Siamo spiacenti ma qualcosa è andato storto con la tua richiesta."
@@ -72,15 +73,15 @@ msgstr "Siamo spiacenti ma qualcosa è andato storto con la tua richiesta."
msgid "Language"
msgstr "Lingua"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Segnala un Problema"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Codice sorgente"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Novità "
@@ -235,7 +236,7 @@ msgstr "Hey, %s!"
msgid "Hello, friend!"
msgstr "Ciao amico!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Chiavi Pubbliche"
@@ -330,32 +331,101 @@ msgid "Get Bridges!"
msgstr "Ottieni dei Bridge!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Nessuno"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Seleziona le opzioni per il tipo di bridge:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Ti servono indirizzi IPv6?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Ti serve un %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Il tuo browser non mostra le immagini in modo corretto."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Inserisci i caratteri nell'immagine sopra..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
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:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -364,21 +434,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -386,28 +456,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Richiedi bridge vanilla."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Richiedi bridge IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 89c71c564b..35dce867b4 100644
--- a/ja/LC_MESSAGES/bridgedb.po
+++ b/ja/LC_MESSAGES/bridgedb.po
@@ -17,9 +17,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-15 12:42+0000\n"
-"Last-Translator: 323484\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+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"
@@ -47,18 +47,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "ç?³ã??訳ã??ã??ã?¾ã??ã??ï¼?ã?ªã?¯ã?¨ã?¹ã??ã?«å??é¡?ã??ã??ã??ã?¾ã??ã??ã??"
@@ -66,15 +64,15 @@ msgstr "ç?³ã??訳ã??ã??ã?¾ã??ã??ï¼?ã?ªã?¯ã?¨ã?¹ã??ã?«å??é¡?ã??ã??ã??ã?¾ã??ã??ã??
msgid "Language"
msgstr "��"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "ã??ã?°ã??å ±å??ã??ã??"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "ã?½ã?¼ã?¹ã?³ã?¼ã??"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "å¤?æ?´å±¥æ´"
@@ -229,7 +227,7 @@ msgstr "ã??ã??ã?«ã?¡ã?¯ã??%sã??ã??ï¼?"
msgid "Hello, friend!"
msgstr "ã??ã??ã?«ã?¡ã?¯ï¼?"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "å?¬é??é?µ"
@@ -279,7 +277,7 @@ msgid ""
"\n"
msgstr "å? ã??ã?¦ã?? BridgeDB ã?¯ã?? %sPluggable Transportã?®ã?ªã??%s ã??ã??ã?©ã?¢ã?¤ã?¹ã?®ã??ã??ã?«ã??ã??ã?¬ã?¼ã?³ã??ã?ª\nã??ã?ªã??ã?¸ã??æ??ã?¡ã??ã??ã??ã?¯ã??ã?¾ã??å®?ç?¨æ?§ã??ã?ªã??ã??ã??ã?§ã??ã??ã??å®?é??ã?¯å¤?ã??ã?®å ´å??ã?¤ã?³ã?¿ã?¼ã??ã??ã??æ¤?é?²ã??å??é?¿ã??ã??ã?®ã?«ã?ªã??æ??å?¹ã?§ã??ã??\n"
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "ã??ã?ªã??ã?¸ã?¨ã?¯ï¼?"
@@ -324,32 +322,101 @@ msgid "Get Bridges!"
msgstr "ã??ã?ªã??ã?¸ã??å?¥æ??ï¼?"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "ã?ªã??"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "ã??ã?ªã??ã?¸ã?¿ã?¤ã??ã?®ã?ªã??ã?·ã?§ã?³ã??é?¸æ??ã??ã?¦ã??ã? ã??ã??:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "IPv6 ã?¢ã??ã?¬ã?¹ã??å¿?è¦?ã?§ã??ã??ï¼?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "%s ã??å¿?è¦?ã?§ã??ã??ï¼?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "ã??å?©ç?¨ã?®ã??ã?©ã?¦ã?¶ã?¯é?©å??ã?«ç?»å??ã??表示ã??ã?¦ã??ã?¾ã??ã??ã??"
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "ä¸?è¨?ã?®ç?»å??ã??ã??æ??å?ã??å?¥å??ã??ã?¦ã??ã? ã??ã??..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "ã??ã?ªã??ã?¸ä½¿ç?¨ã?®å§?ã??æ?¹"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -358,21 +425,21 @@ msgid ""
msgstr "Tor Browser ã?«ã??ã?ªã??ã?¸ã??ç?»é?²ã??ã??å??ã?«ã??ã?¾ã??ã?¯ %s Tor Browser ã??ã?¦ã?³ã?ã?¼ã??ã??ã?¼ã?¸ %s ã?«ç§»å??ã??ã?¦ Tor Browser ã?®ã??ã?¦ã?³ã?ã?¼ã??æ?¹æ³?ã?¨å§?ã??æ?¹ã?®èª¬æ??ã??ã??覧ã??ã? ã??ã??ã??"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -380,28 +447,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "ã??ã?¯ã??ã??ã??é?¸æ??ã??ã?¦ã??ã??次ã?¸ã??ã??ã?¯ã?ªã??ã?¯ã??ã?¦ã??ã? ã??ã??ã??æ?°ã??ã??ã??ã?ªã??ã?¸ã??æ§?æ??ã??ã??ã?«ã?¯ã??ã??ã?ã?¹ã??\nå?¥å??ã??ã??ã?¯ã?¹ã?«ã??ã?ªã??ã?¸ã?©ã?¤ã?³ã??ã?³ã??ã?¼ï¼?ã??ã?¼ã?¹ã??ã??ã?¦ã??ã? ã??ã??ã??æ??å¾?ã?«ã??ã??æ?¥ç¶?ã??ã??ã?¯ã?ªã??ã?¯ã??ã??ã?¨ã??\næº?å??å®?äº?ã?§ã??ï¼?ä½?ã??å??é¡?ã??ã??ã?£ã??ã??ã??ã??ã??ã?ªã??å?©ã??ã??å¾?ã??ã??ã??ã?«\nã??Tor ã??ã??ã??ã?¯ã?¼ã?¯è¨å®?ã??ã?¦ã?£ã?¶ã?¼ã??å??ã??ã??ã?«ã??ã??ã??ã?¿ã?³ã??ã?¯ã?ªã??ã?¯ã??ã?¦ã??ã? ã??ã??ã??"
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "ã??ã??ã?¬ã?¼ã?³ã??ã?ªã??ã?ªã??ã?¸ã??ã?ªã?¯ã?¨ã?¹ã??"
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "IPv6 ã??ã?ªã??ã?¸ã??ã?ªã?¯ã?¨ã?¹ã??"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 0f563b6e9a..4f2df744f5 100644
--- a/ka/LC_MESSAGES/bridgedb.po
+++ b/ka/LC_MESSAGES/bridgedb.po
@@ -11,9 +11,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 12:06+0000\n"
-"Last-Translator: Georgianization\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: IDRASSI Mounir <mounir.idrassi@xxxxxxxx>\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"
@@ -41,18 +41,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "á?£á??á??á?ªá? á??á??á??á??! á??á?¥á??á??á??á?¡ á??á??á??á?®á??á??á??á??á?¡á??á??á?? á??á??á??á??á??á?¨á??á? á??á??á??á?? á? á??á?¦á??á?ª á??á??á? á??á??."
@@ -60,15 +58,15 @@ msgstr "á?£á??á??á?ªá? á??á??á??á??! á??á?¥á??á??á??á?¡ á??á??á??á?®á??á??á??á??
msgid "Language"
msgstr "á??á??á??"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "á?®á??á? á??á??á??á??á?¡ á??á??á?®á?¡á??á??á??á??á??"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "á??á??á? á??á??á??á?¬á?§á??á? á?? á??á??á??á??"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "á?ªá??á??á??á??á??á??á??á??á??"
@@ -223,7 +221,7 @@ msgstr "á??á??á??á??á? á?¯á??á??á??, %s!"
msgid "Hello, friend!"
msgstr "á??á??á??á??á?¡á??á??á??á??á??á??á??, á??á??á??á??á??á??á? á??!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "á?¡á??á?¯á??á? á?? á??á??á?¡á??á?¦á??á??á??á??á??"
@@ -273,7 +271,7 @@ msgid ""
"\n"
msgstr "á??á??á??á?¡á??á??á??, BridgeDB-á?¡ á??á??á??á?©á??á??á?? á?£á??á??á? á??á??á?? á?©á??á??á?£á??á??á??á? á??á??á?? á?¡á??á?®á??á?¡ á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á?ª %sá?§á??á??á??á??á??á??á??á? á??\ná??á??á?¡á??á??á? á??á??á??á??á??á?? á??á??á??á??á??á?§á??á??á??á??á?¡ (Pluggable Transports) á??á??á? á??á?¨á??, %s á? á??á?ª á??á? á?ª á??á?¡á?? á?¨á??á??á??á??á??á?á??á??á??á??á?? á??á??á??á??á??á??á?¥á??á??á?¡, á??á?£á??á?ªá?? á??á??á??á??á?ª á??á??á??á??á?¡á??á??á??á??á??á??\ná??á??á?¢á??á? á??á??á?¢á??á?¡ á?¨á??á??á?¦á?£á??á??á??á??á??á?¡á??á??á??á?¡ á??á??á??á??á?¡ á??á?¡á??á? á??á??á??á??á??á??á?? á??á? á??á??á? á?? á?¨á??á??á??á?®á??á??á??á??á?¨á??.\n\n"
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "á? á??á?¡ á?¬á??á? á??á??á??á??á??á??á??á?¡ á?®á??á??á??á??á???"
@@ -318,32 +316,101 @@ msgid "Get Bridges!"
msgstr "á??á??á??á?¦á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "á??á? á??"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "á??á??á?®á??á??á??, á??á??á?£á??á??á??á??á?? á??á??á??á??á?ªá??á??á??á?¡ á?¡á??á?®á??:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "á??á??á?¡á??á?á??á? á??á??á??á??á?? IPv6-á??á??á?¡á??á??á??á? á??á??á??á???"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "á??á??á?¡á??á?á??á? á??á??á??á??á?? %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "á??á?¥á??á??á??á?? á??á? á??á?£á??á??á? á?? á??á? á??á?©á??á??á??á??á??á?¡ á?¡á?£á? á??á??á??á??á?¡ á??á??á??á??á? á??á?£á??á??á??."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "á?¨á??á??á?§á??á??á??á??á?? á?¡á??á??á??á??á??á??á??á??á?? á??á??á??á??á?? á??á? á?¡á??á??á?£á??á?? á?¡á?£á? á??á??á??á??á??á??..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "á? á??á??á??á? á?£á??á??á?? á??á??á??á??á??á??á?§á??á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -352,21 +419,21 @@ msgid ""
msgstr "á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??á?¡ á??á??á?¡á??á??á??á? á??á??á??á??á?¡ Tor-á??á? á??á?£á??á??á? á?¨á?? á?¨á??á?¡á??á?§á??á??á??á??á??, á??á??á??á??á??á??á??á? á??á??á??á??á?? á??á??á??á??á??á??á?? %sTor-á??á? á??á?£á??á??á? á??á?¡ á?©á??á??á??á?¢á??á??á? á??á??á??á?¡\ná??á??á??á? á??á??á?? %s á??á?? á?¨á??á??á??á??á?? á??á??á?§á??á??á??á?? á??á?¥ á??á??á?ªá??á??á?£á?? á??á??á??á??á??á??á??á??á??á?¡ Tor-á??á? á??á?£á??á??á? á??á?¡ á?©á??á??á??á?¢á??á??á? á??á??á??á?¡á?? á??á??\ná??á??á?¨á??á??á??á??á?¡ á??á??á??á??á??á??á??."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -374,28 +441,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "á??á??á?£á??á??á??á??á?? â??á??á??á??á?®â?? á??á?? á?¨á??á??á??á??á?? á??á??á?¬á??á??á??á??á?? â??á?¨á??á??á??á??á??â??. á??á?¥á??á??á??á?? á??á?®á??á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á?¡ á??á??á?¡á??á??á??á? á??á??á??, á??á??á?¦á??á?? á??á?¡á??á?? á??á??\ná?©á??á?¡á??á??á?? á?®á??á??á??á?¡ á??á??á?¡á??á??á??á? á??á??á??á?? á?¢á??á?¥á?¡á?¢á??á?¡ á?¨á??á?¡á??á?§á??á??á?? á??á??á??á?¨á??. á??á??á??á??á?¡ á??á??á?¬á??á??á??á??á?? â??á??á??á??á??á??á?¨á??á? á??á??á??â?? á??á??\ná?¬á??á?¡á??á?? á?§á??á??á??á??á?¤á??á? á?? á??á??á?£á?¨á??á??á??á??á?¡! á??á?£ á? á??á??á?? á??á??á??á? á??á??á??á??á??á??á?¡ á??á??á??á??á??á?¬á?§á??á??á??á??á??, á?¡á?ªá??á??á??á?? â??á??á??á?®á??á??á? á??á??á??á?¡â?? á?¦á??á??á??á??á??á??\ná??á??á?¬á??á??á??á??á??á?? â??Tor-á?¥á?¡á??á??á??á?¡ á??á??á? á??á??á??á?¢á? á??á??á??á?¡â?? á??á??á??á??á?£á? á?¨á??, á??á??á??á??á?¢á??á??á??á??á?? á??á?®á??á? á??á??á?á??á? á??á?¡ á??á??á?¡á??á?¦á??á??á??á??."
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "á?©á??á??á?£á??á??á??á? á??á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??á?¡ á??á??á??á?®á??á??á??á??."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "IPv6-á??á??á?¡á??á??á??á? á??á??á?¡ á?®á??á??á??á??á??á?¡ á??á??á??á?®á??á??á??á??."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
msgid "Request a Pluggable Transport by TYPE."
msgstr "á??á??á?¡á??á??á? á??á??á??á??á??á?? TYPE-á??á??á??á??á??á?§á??á??á??á??á?¡ á??á??á??á?®á??á??á??á??."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:215
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 aca1b30d95..3792c3304a 100644
--- a/kk/LC_MESSAGES/bridgedb.po
+++ b/kk/LC_MESSAGES/bridgedb.po
@@ -10,8 +10,8 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
"Language-Team: Kazakh (http://www.transifex.com/otf/torproject/language/kk/)\n"
"MIME-Version: 1.0\n"
@@ -40,18 +40,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Ð?еÑ?Ñ?Ñ?Ñ?Ò£Ñ?з, Ñ?Ñ?здÑ?Ò£ Ñ?Ò±Ñ?анÑ?Ñ?Ñ?Ò£Ñ?з бойÑ?нÑ?а белгÑ?Ñ?Ñ?з Ò?иÑ?нÑ?Ñ?лÑ?Ò?Ñ?аÑ? баÑ?. "
@@ -59,15 +57,15 @@ msgstr "Ð?еÑ?Ñ?Ñ?Ñ?Ò£Ñ?з, Ñ?Ñ?здÑ?Ò£ Ñ?Ò±Ñ?анÑ?Ñ?Ñ?Ò£Ñ?з бойÑ?нÑ?а
msgid "Language"
msgstr "ТÑ?л"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Ò?аÑ?е Ñ?Ñ?Ñ?алÑ? Ñ?абаÑ?лаÑ?"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Ð?аÑ?Ñ?апÒ?Ñ? кодÑ?"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "ӨзгеÑ?Ñ?Ñ?Ñ?еÑ? жÑ?Ñ?налÑ?"
@@ -222,7 +220,7 @@ msgstr "Ó?й, %s!"
msgid "Hello, friend!"
msgstr "СÓ?лем, доÑ?Ñ?м!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Ð?Ñ?Ñ?Ò? кÑ?лÑ?Ñ?еÑ?"
@@ -272,7 +270,7 @@ msgid ""
"\n"
msgstr "СонÑ?мен Ò?аÑ?аÑ?, BridgeDB-де көпÑ?еген plain-ol'-vanilla көпÑ?Ñ?леÑ?Ñ?%s Pluggable Transports %sолаÑ? мүмкÑ?н күÑ?Ñ?Ñ? емеÑ?, бÑ?Ñ?аÒ? олаÑ? \nкөпÑ?еген жаÒ?дайлаÑ?да инÑ?еÑ?неÑ? Ñ?ензÑ?Ñ?анÑ? айналÑ?п Ó©Ñ?Ñ?ге көмекÑ?еÑ?едÑ?.\n\n"
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Ð?өпÑ?Ñ?леÑ? дегенÑ?мÑ?з не?"
@@ -317,32 +315,101 @@ msgid "Get Bridges!"
msgstr "Ð?өпÑ?Ñ?леÑ?дÑ? алÑ?Ò£Ñ?з!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr ""
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Ð?өпÑ?Ñ? Ñ?Ò¯Ñ?Ñ?нÑ?Ò£ паÑ?амеÑ?Ñ?леÑ?Ñ?н Ñ?аңдаңÑ?з:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "СÑ?зге IPv6 мекенжайлаÑ?Ñ? кеÑ?ек пе?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "%s Ñ?Ñ?зге Ò?ажеÑ?пе?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "СÑ?здÑ?Ò£ бÑ?аÑ?зеÑ?Ñ?Ò£Ñ?з дұÑ?Ñ?Ñ? бейненÑ? көÑ?Ñ?еÑ?пейдÑ?."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Ð?оÒ?аÑ?Ñ?даÒ?Ñ? Ñ?Ñ?Ñ?еÑ?Ñ?егÑ? Ñ?аңбалаÑ?дÑ? енгÑ?зÑ?Ò£Ñ?з ..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "СÑ?здÑ?Ò£ көпÑ?Ñ?леÑ?Ñ?Ò£Ñ?здÑ? Ò?алай пайдаланÑ?Ò?а боладÑ?"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -351,21 +418,21 @@ msgid ""
msgstr "Tor Browser-ге көпÑ?Ñ?леÑ?дÑ? енгÑ?зÑ? Ò¯Ñ?Ñ?н, бÑ?Ñ?Ñ?нÑ?Ñ? оÑ?Ñ? жеÑ?ден %sTor Browser-дÑ? баÑ?Ñ?Ò£Ñ?з\n %sжÓ?не оÑ?Ñ? жеÑ?ден нұÑ?Ò?аÑ?лÑ?Ò?Ñ?Ñ? оÒ?Ñ?п Tor Browser-дÑ? баÑ?Ñ?Ò£Ñ?з жÓ?не Ð?Ð?СТÐ?ҢЫÐ?."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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 +440,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "'Ð?Ñ?' дегендÑ? Ñ?аңдап, 'Ð?елеÑ?Ñ?' дегендÑ? баÑ?Ñ?Ò£Ñ?з. Ð?аңа көпÑ?Ñ?леÑ?дÑ? конÑ?игÑ?Ñ?аÑ?иÑ?лаÑ?, көÑ?Ñ?Ñ?Ñ? жÓ?не\nкөпÑ?Ñ? жолдаÑ?Ñ?н мÓ?Ñ?Ñ?н енгÑ?зÑ? жолаÒ?Ñ?на Ò?ойÑ?Ò£Ñ?з. СоңÑ?нда, «Ò?оÑ?Ñ?лÑ?» Ñ?үймеÑ?Ñ?гн баÑ?Ñ?Ò£Ñ?з.\nÐ?геÑ? Ñ?Ñ?зде Ò?иÑ?ндÑ?Ò?Ñ?аÑ? Ñ?Ñ?Ñ?ндаÑ?а, «Ð?нÑ?Ò?Ñ?ама» баÑ?Ñ?Ò£Ñ?з жÓ?не\nÒ?оÑ?Ñ?мÑ?а көмек алÑ? Ò¯Ñ?Ñ?н «Tor Network Settings» баÑ?Ñ?Ñ?маÑ?Ñ?н баÑ?Ñ?Ò£Ñ?з"
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Ð?анилÑ?дÑ? көпÑ?Ñ?леÑ?дÑ? Ñ?Ò±Ñ?аÑ?."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "IPv6 көпÑ?Ñ?леÑ?Ñ?н Ñ?Ò±Ñ?аÑ?."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
msgid "Request a Pluggable Transport by TYPE."
msgstr "TYPE бойÑ?нÑ?а бÑ?Ñ?Ñ?кÑ?Ñ?Ñ?Ñ?лген Ñ?аÑ?Ñ?малдÑ? Ñ?Ò±Ñ?аңÑ?з."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:215
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 d0a6bc8507..30f62cfa61 100644
--- a/km/LC_MESSAGES/bridgedb.po
+++ b/km/LC_MESSAGES/bridgedb.po
@@ -12,8 +12,8 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
"Language-Team: Khmer (http://www.transifex.com/otf/torproject/language/km/)\n"
"MIME-Version: 1.0\n"
@@ -42,18 +42,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "á??á?¼á??á??á??á??! á?¢á??á??á?¸â??á??á?½á??â??á??á?¶á??â??á??á??á? á?»á??â??á??á?¶á??á?½á??â??á??á??á??á?¾â??á??á??á??á??â??á?¢á??á??á??á??"
@@ -61,15 +59,15 @@ msgstr "á??á?¼á??á??á??á??! á?¢á??á??á?¸â??á??á?½á??â??á??á?¶á??â??á??á??á? á?»
msgid "Language"
msgstr "á??á?¶á??á?¶"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "á??á??á?¶á??á??á?¶á??á??á??â??á??á??á? á?»á??"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "á??á?¼á??â??á??á??á??á??á??"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Changelog"
@@ -224,7 +222,7 @@ msgstr "á? á??, %s!"
msgid "Hello, friend!"
msgstr "á??á?½á??á??á??á?¸, á??á?·á??á??á??á??á??á??á??á??á?·!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "á??á??â??á??á?¶á??á?¶á??á??á??"
@@ -274,7 +272,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "á??á?¾â??á??á??á??á??á?¸á??á??á??â??â??á??á?¶â??á?¢á??á??á?¸?"
@@ -319,32 +317,101 @@ msgid "Get Bridges!"
msgstr "á??á??á?½á??â??á??á??â??á??á??á??á??á?¸á??á??á??!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr ""
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "á??á?¼á??â??á??á??á??á?¾á??â??á??á??á??á??á?¾á??â??á??á??á??á??á?¶á??á??â??á??á??á??á??á??á??â??á??á??á??á??á?¸á??á??á??á??"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "á??á?¾â??á?¢á??á??á??â??á??á??á??á?¼á??â??á??á?¶á??â??á?¢á?¶á??á??á??á??á??á?¶á?? IPv6 á?¬?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "á??á?¾â??á?¢á??á??á??â??á??á??á??á?¼á??â??á??á?¶á?? %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "á??á??á??á??á??á?·á??á?¸â??á?¢á??á?¸á??á??á?ºá??á?·á??â??á??á??á??á??â??á?¢á??á??á??â??â??á??á?·á??â??á??á??á??á?»á??â??á??á??á??á? á?¶á??â??á??á?¼á??á??á?¶á??â??á??á??á??â??á??á??á??á?¹á??á??á??á??á?¼á??â??á?¡á?¾á??á??"
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "á??á??á??á??á?¼á??â??á??á?½â??á?¢á??á??á??á??â??á??á?¸â??á??á?¼á??á??á?¶á??â??á??á?¶á??á??á?¾..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "á??á??á??á??â??á??á?¶á??á??á??á??á??á?¾á??â??á??á??á??á?¾â??á??á??á??á??á?¸á??á??á??â??á??á??á??á??â??á?¢á??á??á??"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -353,21 +420,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -375,28 +442,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "á??á??á??á?¾â??á??á??á??á??á?¸á??á??á??â??á??á?¼á??á??á??á??á?¶á??á??"
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "á??á??á??á?¾â??á??á??á??á??á?¸á??á??á?? IPv6 á??"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
msgid "Request a Pluggable Transport by TYPE."
msgstr "á??á??á??á?¾â??á??á?¶á??â??á??á??á??á??á??â??á??á??á??â??á?¢á?¶á??â??á??á??á??â??á??á?¶á??â??á??á?¶á??â??á??á??á?? TYPE á??"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:215
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 bedffa1edb..a25393ecd7 100644
--- a/ko/LC_MESSAGES/bridgedb.po
+++ b/ko/LC_MESSAGES/bridgedb.po
@@ -26,9 +26,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: erinm\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"
@@ -56,18 +56,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "ì£?ì?¡í?©ë??ë?¤! ë?¹ì? ì?? ì??ì²ì?? 무ì?¸ê°? 문ì ?ê°? ì??ì?µë??ë?¤."
@@ -75,15 +73,15 @@ msgstr "ì£?ì?¡í?©ë??ë?¤! ë?¹ì? ì?? ì??ì²ì?? 무ì?¸ê°? 문ì ?ê°? ì??ì?µë??ë?¤."
msgid "Language"
msgstr "��"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "ë²?그를 ë³´ê³ í??기"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "ì??ì?¤ ì½?ë??"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "�경 기�"
@@ -238,7 +236,7 @@ msgstr "ì ?기, %sì?¼! "
msgid "Hello, friend!"
msgstr "ì??ë?? ì¹?구!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "공� �"
@@ -288,7 +286,7 @@ msgid ""
"\n"
msgstr "거기ë?¤, BridgeDBë?? %s Pluggable Transportê°? ì??ë?? %s\ní??í?´ë¹ ì§? ë¸?릿ì§?ë?¤ë?? ë§?ì??ì??. ë??ë?¨í?? ì??리ê°?ì§? ì??ê² ì§?ë§?,\nê·¸ë??ë?? ì?¬ë?¬ 모ë¡? ì?¸í?°ë?· ê²?ì?´ ì?°í??를 ë??ì??ì¤?ë??ë?¤.\n\n"
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "'ë¸?릿ì§?'ë???"
@@ -333,32 +331,101 @@ msgid "Get Bridges!"
msgstr "ë¸?릿ì§?를 ì?»ì?¼ì?¸ì??!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "ì??ì??"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "ë¸?릿ì§? ì¢?ë¥?ì?? ê´?í?? ì?µì??ì?? 골ë?¼ 주ì?¸ì??:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "IPv6 주ì??ê°? í??ì??í?©ë??ê¹??"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "%s ê°? í??ì??í?©ë??ê¹??"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "ë¸?ë?¼ì?°ì ?ê°? ì?¬ì§?ì?? ì ?ì??ì ?ì?¼ë¡? ë¶?ë?¬ì?¤ì§? 못í?©ë??ë?¤."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "ì?? 그림ì?? 문ì??를 ì??ë ¥í??ì?ì??ì?¤..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "ë¸?릿ì§?를 ì?¬ì?©í??ë?? ë°©ë²?"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -367,21 +434,21 @@ msgid ""
msgstr "Tor ë¸?ë?¼ì?°ì ?ì?? ë¸?리ì§?를 ì??ë ¥í??ë ¤ë©´ 먼ì ? %s Tor ë¸?ë?¼ì?°ì ? ë?¤ì?´ë¡?ë??ë¡? ì?´ë??í??ì?ì??ì?¤.\ní??ì?´ì§? %së¡? ì?´ë?? í?? ë?¤ì?? ì§?침ì?? ë?°ë?¼ ë?¤ì?´ë¡?ë?? ë°? ì??ì??ì?? ì??í??í??ì?ì??ì?¤.\nTor ë¸?ë?¼ì?°ì ?."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -389,28 +456,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "'ì??' í?¹ì?? 'Yes' ë²?í?¼ì?? ë??르ì? í?? 'ë?¤ì??' í?¹ì?? 'Next' ë²?í?¼ì?? ë??ë?¬ 주ì?¸ì??.\në¸?릿ì§?를 ì?¤ì ?í??ì??ë ¤ë©´, ì?´ ë©?ì?¼ë¡? ë°?ì?¼ì? ë¸?릿ì§?를 í??ì?¤í?¸ ë°?ì?¤ì?? ë³µì?¬í??ì? ë?¤ì??,\n'ì ?ì??' í?¹ì?? 'Connect'를 ë??ë?¬ 주ì??ë©´ ì??ë??ë? ê²?ì??ë??ë?¤!\në§?ì?½ 문ì ?ê°? ì??ë?¤ë©´, 'Tor ë?¤í?¸ì??í?¬ ì?¤ì ?' ë§?ë²?ì?¬ì?? 'ë??ì??ë§?' í?¹ì?? 'Help' ë²?í?¼ì?? ë??ë?¬ ë??ì??ì?? ë°?ì?¼ì?¸ì??."
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "ì?¼ë°? ë¸?릿ì§?를 ì??ì²í?©ë??ë?¤."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "IPv6 ë¸?릿ì§?를 ì??ì²í?©ë??ë?¤."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
msgid "Request a Pluggable Transport by TYPE."
msgstr "ì?½ì??í?? ì?¥ì¹?를 TYPE를 í?µí?´ì?? ì??ì²í??ì?¸ì??."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:215
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 4cfc1345f3..8eb595139f 100644
--- a/lt/LC_MESSAGES/bridgedb.po
+++ b/lt/LC_MESSAGES/bridgedb.po
@@ -15,8 +15,8 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 21:29+0000\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
"Last-Translator: Moo\n"
"Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n"
"MIME-Version: 1.0\n"
@@ -45,18 +45,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Atleiskite! Kažkas nutiko su jūsų užklausa."
@@ -64,15 +62,15 @@ msgstr "Atleiskite! Kažkas nutiko su jūsų užklausa."
msgid "Language"
msgstr "Kalba"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "PraneÅ¡ti apie klaidÄ?"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Pirminis kodas"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Keitinių žurnalas"
@@ -227,7 +225,7 @@ msgstr "Sveiki, %s!"
msgid "Hello, friend!"
msgstr "Sveiki!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Viešieji raktai"
@@ -277,7 +275,7 @@ msgid ""
"\n"
msgstr "Be to, BridgeDB taip pat turi daug paprastų tinklų tiltų %s be jokių\nkeiÄ?iamųjų 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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Kas yra tinklų tiltai?"
@@ -322,32 +320,101 @@ msgid "Get Bridges!"
msgstr "Gauti tinklų tiltus!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "NÄ?ra"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "PraÅ¡ome pažymÄ?ti tinklų tilto tipo parametrus:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Ar jums reikia IPv6 adresų?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Ar jums reikia %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "JÅ«sų narÅ¡yklÄ? netinkamai atvaizduoja paveikslus."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Ä®veskite simbolius iÅ¡ aukÅ¡Ä?iau esanÄ?io paveikslo..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "Kaip pradÄ?ti naudotis tinklų tiltais"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -356,21 +423,21 @@ msgid ""
msgstr "NorÄ?dami pridÄ?ti tinklų tiltus į Tor NarÅ¡yklÄ?, 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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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 +445,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Užklausti paprastų tinklų tiltų."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Užklausti IPv6 tinklų tiltų."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
msgid "Request a Pluggable Transport by TYPE."
msgstr "Užklausti keiÄ?iamųjų perdavimų pagal TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:215
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 af1bd08da5..319cd91e2b 100644
--- a/lv/LC_MESSAGES/bridgedb.po
+++ b/lv/LC_MESSAGES/bridgedb.po
@@ -10,9 +10,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+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"
@@ -40,18 +40,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Atvainojiet! Notikusi ar Jūsu pieprasījumu saistīta kļūme."
@@ -59,15 +57,15 @@ msgstr "Atvainojiet! Notikusi ar Jūsu pieprasījumu saistīta kļūme."
msgid "Language"
msgstr "Valoda"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "ZiÅ?ot par kļūdu"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Pirmkods"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "IzmaiÅ?u žurnÄ?ls"
@@ -222,7 +220,7 @@ msgstr "Hei, %s!"
msgid "Hello, friend!"
msgstr "Sveiks, draug!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "PubliskÄ?s atslÄ?gas"
@@ -272,7 +270,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Kas ir tilti?"
@@ -317,32 +315,101 @@ msgid "Get Bridges!"
msgstr "SaÅ?emt Tiltus!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Nav"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "LÅ«dzu, izvÄ?lieties tilta veida opcijas:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Vai ir nepieciešamas IPv6 adreses?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Vai ir nepieciešams %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "JÅ«su pÄ?rlÅ«ks neattÄ?lo attÄ?lus pareizi."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "IevadÄ«t burtus no augstÄ?k parÄ?dÄ«tÄ? attÄ?la..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
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:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -351,21 +418,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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 +440,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Pieprasīt parastos tiltus."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Pieprasīt IPv6 tiltus."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 a7aa7c77e6..9b13f69a1e 100644
--- a/mk/LC_MESSAGES/bridgedb.po
+++ b/mk/LC_MESSAGES/bridgedb.po
@@ -11,9 +11,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-11 22:38+0000\n"
-"Last-Translator: Zarko Gjurov <zarkogjurov@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: Liljana Ackovska <liljanagjurova@xxxxxxxxx>\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"
@@ -41,18 +41,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Ð?звинеÑ?е! Се Ñ?лÑ?Ñ?и гÑ?еÑ?ка Ñ?о ваÑ?еÑ?о баÑ?аÑ?е."
@@ -60,15 +58,15 @@ msgstr "Ð?звинеÑ?е! Се Ñ?лÑ?Ñ?и гÑ?еÑ?ка Ñ?о ваÑ?еÑ?о баÑ?
msgid "Language"
msgstr "Ð?азик"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Ð?Ñ?иÑ?ави пÑ?облем"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Ð?звоÑ?ен код"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Ð?ог на измени"
@@ -223,7 +221,7 @@ msgstr "Ð?дÑ?аво, %s!"
msgid "Hello, friend!"
msgstr "Ð?дÑ?аво, пÑ?иÑ?аÑ?елÑ?!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Ð?авни клÑ?Ñ?еви"
@@ -273,7 +271,7 @@ msgid ""
"\n"
msgstr "Ð?ополниÑ?елно, BridgeDB има многÑ? Ñ?Ñ?андаÑ?дни моÑ?Ñ?ови %sбез ниÑ?Ñ? еден\nPluggable Transports %s пÑ?екÑ? кои можеби не звÑ?Ñ?и кÑ?л, но Ñ?ие Ñ?еÑ?Ñ?Ñ?е можаÑ?\nда помогнаÑ? во заобиколÑ?ваÑ?е на Ð?нÑ?еÑ?неÑ? Ñ?ензÑ?Ñ?аÑ?а во многÑ? Ñ?лÑ?Ñ?аи.\n\n"
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "ШÑ?о Ñ?е моÑ?Ñ?ови?"
@@ -318,32 +316,101 @@ msgid "Get Bridges!"
msgstr "Ð?обиÑ? моÑ?Ñ?ови!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Ð?иÑ?Ñ?о"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Ð?дбеÑ?еÑ?е опÑ?ии за Ñ?ип на моÑ?Ñ?:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Ð?али ви Ñ?Ñ?ебааÑ? IPv6 адÑ?еÑ?и?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Ð?али Ñ?и Ñ?Ñ?еба %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Ð?аÑ?иоÑ? пÑ?елиÑ?Ñ?Ñ?ваÑ? не ги покажÑ?ва Ñ?ликиÑ?е пÑ?авилно."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Ð?неÑ?еÑ?е ги каÑ?акÑ?еÑ?иÑ?е од Ñ?ликаÑ?а погоÑ?е:"
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "Ð?ако да запоÑ?неÑ?е Ñ?о коÑ?иÑ?Ñ?еÑ?е на моÑ?Ñ?ови"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -352,21 +419,21 @@ msgid ""
msgstr "Ð?а внеÑ?еÑ?е моÑ?Ñ?ови во Tor Browser, пÑ?во одеÑ?е на %s Tor Browser за пÑ?еземаÑ?е\nÑ?Ñ?Ñ?анаÑ?а %s и поÑ?оа Ñ?ледеÑ?е ги инÑ?Ñ?Ñ?Ñ?кÑ?ииÑ?е за пÑ?еземаÑ?е и Ñ?Ñ?аÑ?Ñ?Ñ?ваÑ?е на Tor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -374,28 +441,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Ð?дбеÑ?еÑ?е 'Ð?а' и кликнеÑ?е 'Следно'. Ð?а да ги конÑ?игÑ?Ñ?иÑ?аÑ?е ваÑ?иÑ?е нови моÑ?Ñ?ови, копиÑ?аÑ?Ñ?е и\nзалепеÑ?е Ñ?а моÑ?Ñ? линиÑ?аÑ?а во Ñ?екÑ?Ñ? полеÑ?о. Ð?а кÑ?аÑ? кликнеÑ?е 'Ð?овÑ?зи', и\nби Ñ?Ñ?ебало да Ñ?Ñ?е гоÑ?ови! Ð?ко имаÑ?е пÑ?облеми, пÑ?обаÑ?Ñ?е Ñ?о кликаÑ?е на 'Ð?омоÑ?'\nкопÑ?еÑ?о во 'Tor мÑ?ежни подеÑ?Ñ?ваÑ?а' и Ñ?ледеÑ?е ги инÑ?Ñ?Ñ?Ñ?кÑ?ииÑ?е."
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Ð?обаÑ?Ñ?ва Ñ?Ñ?андаÑ?дни моÑ?Ñ?ови."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Ð?обаÑ?Ñ?ва IPv6 моÑ?Ñ?ови."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 6f2071d1cf..cc413ac3e3 100644
--- a/ml/LC_MESSAGES/bridgedb.po
+++ b/ml/LC_MESSAGES/bridgedb.po
@@ -12,8 +12,8 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
"Language-Team: Malayalam (http://www.transifex.com/otf/torproject/language/ml/)\n"
"MIME-Version: 1.0\n"
@@ -42,18 +42,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "à´?àµ?ഷമിà´?àµ?à´?àµ?! നിà´?àµ?à´?à´³àµ?à´?àµ? à´?à´àµ?യർതàµ?ഥനയിൽ à´¤àµ?à´±àµ?à´±àµ?à´£àµ?à´?àµ? "
@@ -61,15 +59,15 @@ msgstr "à´?àµ?ഷമിà´?àµ?à´?àµ?! നിà´?àµ?à´?à´³àµ?à´?àµ? à´?à´àµ?യർ
msgid "Language"
msgstr "à´à´¾à´· "
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "�ര� ബ�� റിപ�പ�ാർ���� ��യ�യ��"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "സ�ാഴ�സ� ��ാഡ�"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "മാറ�റ വിവരപ�പ���ി� "
@@ -224,7 +222,7 @@ msgstr "നമസ��ാര� ! %s"
msgid "Hello, friend!"
msgstr "നമസ��ാര� സ�ഹ�ത�ത� !"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "പ�ത�വായ താ����ൽ ��������ൾ "
@@ -274,7 +272,7 @@ msgid ""
"\n"
msgstr "à´?àµ?à´?ാതàµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? ഡിബിà´?àµ?à´?àµ? à´?നവധി à´ªàµ?à´²à´?àµ?à´?àµ?â??ബിൾ à´?àµ?രാൻസàµ?à´ªàµ?ർà´?àµ?à´?àµ?à´?ൾ %s à´?à´²àµ?ലാതàµ?à´¤ à´ªàµ?à´²àµ?യിൻ à´?ൾ വാനില à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?ൾ %s à´?à´£àµ?à´?àµ? \nà´?à´¤àµ? à´?àµ?ൾà´?àµ?à´?ാൻ à´?à´¤àµ?à´° à´°à´¸à´? à´?à´²àµ?à´²àµ?à´?àµ?à´?à´¿à´²àµ?à´? \nà´?വയàµ?à´?àµ?à´?àµ? പല സാഹà´?à´°àµ?യതàµ?തിലàµ?à´? à´?à´¨àµ?റർനàµ?à´±àµ?à´±àµ? à´¸àµ?ൻസർഷിപàµ? à´?ഴിവാവാà´?àµ?à´?ാൻ പറàµ?à´±àµ?à´? \n\n"
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "�ന�ത�����യാണ� ബ�രിഡ����ൾ ?"
@@ -319,32 +317,101 @@ msgid "Get Bridges!"
msgstr "ബ�രിഡ����ൾ സ�വ��രി����� "
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr ""
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "ദയവായി à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´µà´?à´àµ?à´¦à´?àµ?à´?ൾ തിരà´?àµ?à´?àµ?à´?àµ?à´?àµ?à´?àµ?à´? :"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "നി���ൾ�� � പി വി 6 മ�ൽവിലാസ� �വശ�യമ�ണ���?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "നി���ൾ�� �ര� �വശ�യമ�ണ��� %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "നി���ള��� ബ�ര�സർ �ിത�ര���ൾ വ�ണ�� ര�തിയിൽ പ�രദര�ശിപ�പി����ന�നില�ല ."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr " മ��ളിൽ �ാണ�ന�ന �ിത�രത�തിൽ നിന�ന�� ���ഷര���ൾ ��ർ����� "
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "����ന� ബ�രിഡ����ൾ �പയ��ി���� ത������� "
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -353,21 +420,21 @@ msgid ""
msgstr "��ർ ബ�ര�സ�രില����� ബ�രിഡ����ൾ ��ർ���ണമ����ിൽ , �ദ�യ� ��ർ ബ�ര�സർ �റ���ിവ�����ന�ന %s വ�ബ� സ�റ�റില��� പ���� \n%s �ന�നി�� �വി�� നിന�ന�� �റ���ിവ����ാന�� ��ർ ബ�ര�സർ ത�����ാന�മ�ള�ള \nനിർദ�ശ���ൾ പിന�ത��ര�� "
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -375,28 +442,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "à´?à´¤àµ? à´?à´¨àµ?à´¨àµ?à´? à´¤àµ?à´?à´°àµ?à´? à´?à´¨àµ?à´¨àµ?à´? à´?മർതàµ?à´¤àµ?à´? . നിà´?àµ?à´?à´³àµ?à´?àµ? à´?àµ?ർ à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´¸à´?àµ?à´?àµ?à´?à´°à´¿à´?àµ?à´?ാൻ , \nà´¬àµ?à´°à´¿à´¡àµ?à´?àµ? വരിà´?ൾ à´?àµ?à´?àµ?à´¸àµ?à´±àµ?à´±àµ? à´¬àµ?à´?àµ?സിലàµ?à´?àµ? à´ªà´?ർതàµ?à´¤àµ?à´?à´¯àµ?à´? à´?à´?àµ?à´?à´¿à´?àµ?à´?àµ?à´?à´¯àµ?à´? à´?àµ?à´¯àµ?à´¯àµ?à´?. à´?വസാനമായി 'à´?à´£à´?àµ?à´?ിൽ' à´?മർതàµ?à´¤àµ?à´?, à´?àµ?à´?ാതàµ? \nനിà´?àµ?à´?ൾ തയàµ?യാറായി! à´?നി നിà´?àµ?à´?ൾ à´?à´¨àµ?à´¤àµ?à´?àµ?à´?à´¿à´²àµ?à´? à´ªàµ?à´°àµ?à´¶àµ?à´¨à´?àµ?à´?ൾ à´?à´à´¿à´®àµ?à´?àµ?à´?à´°à´¿à´?àµ?à´?àµ?à´? à´?à´£àµ?à´?àµ?à´?ിൽ, à´?àµ?ർ à´¨àµ?à´±àµ?à´±àµ?â??വർà´?àµ?à´?àµ? à´¸àµ?à´±àµ?റിà´?à´?àµ?à´¸àµ? \nà´?à´¨àµ?à´¨ സഹായ നിർദàµ?à´¦àµ?à´¶ à´?ാലà´?à´¤àµ?തിലàµ? à´¹àµ?à´²àµ?പിൽ à´?മർതàµ?à´¤àµ?à´? ."
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "വാനില ബ�രിഡ����ൾ �പ���ഷി����� "
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "� പി വി 6 ബ�രിഡ����ൾ �പ���ഷി����� "
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
msgid "Request a Pluggable Transport by TYPE."
msgstr "à´?à´°àµ? à´ªàµ?à´²à´?àµ?à´?àµ?â??ബിൾ à´?àµ?രാൻസàµ?à´ªàµ?ർà´?àµ? à´°àµ?തി à´?à´ªàµ?à´?àµ?à´·à´¿à´?àµ?à´?àµ?à´? "
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:215
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 49cb0e672f..dcc423873f 100644
--- a/mr/LC_MESSAGES/bridgedb.po
+++ b/mr/LC_MESSAGES/bridgedb.po
@@ -9,8 +9,8 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
"Language-Team: Marathi (http://www.transifex.com/otf/torproject/language/mr/)\n"
"MIME-Version: 1.0\n"
@@ -39,18 +39,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "��षमस�व! �ाह�तर� ��� �ाल� �ह�"
@@ -58,15 +56,15 @@ msgstr "��षमस�व! �ाह�तर� ��� �ाल� �
msgid "Language"
msgstr "à¤à¤¾à¤·à¤¾"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "द�ष न��दवा"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "स��र�स ��ड"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "बदल ल��"
@@ -221,7 +219,7 @@ msgstr "�य, %s!"
msgid "Hello, friend!"
msgstr "ह�ल�, मित�रा !"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "पब�लि� �ि��"
@@ -271,7 +269,7 @@ msgid ""
"\n"
msgstr ""
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "ब�रि��स म�हण�� �ाय?"
@@ -316,32 +314,101 @@ msgid "Get Bridges!"
msgstr "%s प�ल %s मिळवा"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr ""
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "ब�रि� प�र�ारात�ल पर�याय निवडा:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "�पणास IPv6 पत�त� (addresses) हव� �ह�त �ा? "
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "�पणास %s हव� �ह� �ा?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "�पला ब�रा��र प�रतिमा न�� दा�वत नाह�. "
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "वर�ल प�रतिम�त�ल शब�द लिहा"
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "�पल� ब�रि��स �स� वापराव�त"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -350,21 +417,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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 +439,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "सध�या ब�रि��� विन�त�."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "IPv6 ब�रि��स विन�त�."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
msgid "Request a Pluggable Transport by TYPE."
msgstr "प�ल��बल ��रा�स�प�र�� TYPE विन�त�."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:215
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 521931c38e..83dc17f3bd 100644
--- a/ms_MY/LC_MESSAGES/bridgedb.po
+++ b/ms_MY/LC_MESSAGES/bridgedb.po
@@ -15,9 +15,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: erinm\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"
@@ -45,18 +45,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Maaf! Terdapat sedikit kesulitan dengan permintaan anda."
@@ -64,15 +62,15 @@ msgstr "Maaf! Terdapat sedikit kesulitan dengan permintaan anda."
msgid "Language"
msgstr "Bahasa"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Lapor kesilapan kod"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Kod Sumber"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Sejarah log"
@@ -227,7 +225,7 @@ msgstr "Hai, %s!"
msgid "Hello, friend!"
msgstr "Hai, kawan!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Kunci Awam"
@@ -277,7 +275,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Apakah itu 'bridges'?"
@@ -322,32 +320,101 @@ msgid "Get Bridges!"
msgstr "Dapat sambungan Bridges!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Tiada"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Sila pilih jenis bridge:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Anda perlukan alamat IPv6?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Perlukah anda %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Pelayar anda tidak memaparkan imej dengan betul."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Masukkan imej aksara yang tertera..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "Bagaimana cara untuk mula mengunakan bridges"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -356,21 +423,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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 +445,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Pinta bridges yang disyorkan."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Pinta IPv6 bridges."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 ebfa8128fc..21e32176b9 100644
--- a/nb/LC_MESSAGES/bridgedb.po
+++ b/nb/LC_MESSAGES/bridgedb.po
@@ -19,9 +19,9 @@ 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: 2020-02-18 13:39-0800\n"
-"PO-Revision-Date: 2020-03-12 11:21+0000\n"
-"Last-Translator: Arne Fjotland Holmen <afjo@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+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"
@@ -49,6 +49,7 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -57,7 +58,7 @@ msgstr ""
#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Beklager! Noe gikk galt med forespørselen din."
@@ -65,15 +66,15 @@ msgstr "Beklager! Noe gikk galt med forespørselen din."
msgid "Language"
msgstr "Språk"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Innrapporter feil"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Kildekode"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Endringslogg"
@@ -228,7 +229,7 @@ msgstr "Hei, %s!"
msgid "Hello, friend!"
msgstr "Hallo, lille venn!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Offentlige nøkler"
@@ -323,32 +324,101 @@ msgid "Get Bridges!"
msgstr "Tilknytt broer!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Ingen"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Gjør valg for brotype:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Trenger du IPv6-adresser?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Trenger du en %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Nettleseren din viser ikke bilder ordentlig."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Skriv inn bokstavene fra bildet ovenforâ?¦"
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
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:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -357,21 +427,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -379,28 +449,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Be om broer med \"vanilla\" fabrikkoppsett."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Etterspør IPv6-broer."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 934657f632..ad7d6f9565 100644
--- a/nl/LC_MESSAGES/bridgedb.po
+++ b/nl/LC_MESSAGES/bridgedb.po
@@ -27,9 +27,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 09:16+0000\n"
-"Last-Translator: Tonnes <tonnes.mb@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: erinm\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"
@@ -57,18 +57,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Sorry! Er is iets misgegaan met uw aanvraag."
@@ -76,15 +74,15 @@ msgstr "Sorry! Er is iets misgegaan met uw aanvraag."
msgid "Language"
msgstr "Taal"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Een bug melden"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Broncode"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Lijst van wijzigingen"
@@ -239,7 +237,7 @@ msgstr "Hoi, %s!"
msgid "Hello, friend!"
msgstr "Hallo, vriend!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Publieke sleutels"
@@ -289,7 +287,7 @@ msgid ""
"\n"
msgstr "Verder heeft BridgeDB genoeg gewone vanilla-bridges %s zonder enige\nPluggable Transports %s, wat misschien niet zo cool klinkt, maar in veel gevallen\nkunnen deze toch internetcensuur helpen omzeilen.\n\n"
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Wat zijn bridges?"
@@ -334,32 +332,101 @@ msgid "Get Bridges!"
msgstr "Bridges verkrijgen!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Geen"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Selecteer opties voor bridge-type:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Hebt u IPv6-adressen nodig?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Hebt u een %s nodig?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Uw browser geeft afbeeldingen niet goed weer."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Voer de tekens in van de bovenstaande afbeelding..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "Beginnen met het gebruik van uw bridges"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -368,21 +435,21 @@ msgid ""
msgstr "Ga voor het invoeren van bridges in Tor Browser eerst naar de %s Tor Browser-\ndownloadpagina %s en volg daar de instructies voor het downloaden en starten van\nTor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Klik zodra het dialoogvenster 'Tor-netwerkinstellingen' verschijnt op 'Configureren' en volg\nde wizard totdat deze vraagt:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:152
+#: bridgedb/strings.py:193
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Blokkeert of censureert uw internetprovider (ISP) op een andere manier verbindingen\nnaar het Tor-netwerk?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:156
+#: bridgedb/strings.py:197
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"
@@ -390,28 +457,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Selecteer 'Ja' en klik daarna op 'Volgende'. Om uw nieuwe bridges te configureren, kopieert en\nplakt u de bridge-regels in het tekstinvoerveld. Klik tot slot op 'Verbinden', en\nu kunt beginnen! Als u problemen ervaart, klik dan op de knop 'Help'\nin de wizard 'Tor-netwerkinstellingen' voor verdere hulp."
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
msgid "Displays this message."
msgstr "Geeft dit bericht weer."
#. 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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Vanilla-bridges aanvragen."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "IPv6-bridges aanvragen."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
msgid "Request a Pluggable Transport by TYPE."
msgstr "Een Pluggable Transport aanvragen op TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:215
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Een kopie van BridgeDB's publieke GnuPG-sleutel verkrijgen."
diff --git a/nl_BE/LC_MESSAGES/bridgedb.po b/nl_BE/LC_MESSAGES/bridgedb.po
index cf19f04fd5..cd63780f13 100644
--- a/nl_BE/LC_MESSAGES/bridgedb.po
+++ b/nl_BE/LC_MESSAGES/bridgedb.po
@@ -8,9 +8,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: erinm\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"
@@ -38,18 +38,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Onze excuses! Er ging iets mis met uw aanvraag."
@@ -57,15 +55,15 @@ msgstr "Onze excuses! Er ging iets mis met uw aanvraag."
msgid "Language"
msgstr "Taal"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Rapporteer een Bug"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Broncode"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Changelog"
@@ -220,7 +218,7 @@ msgstr "Hallo, %s!"
msgid "Hello, friend!"
msgstr "Hallo, vriend!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Public Keys"
@@ -270,7 +268,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Wat zijn bridges?"
@@ -315,32 +313,101 @@ msgid "Get Bridges!"
msgstr "Verkrijg Bridges!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Geen"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Gelieve opties te selecteren voor bridge type:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Heeft u IPv6 adressen nodig?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Heeft u een %s nodig?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Uw browser geeft afbeeldingen niet correct weer."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Voer de karakters van de afbeelding hierboven in..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "Hoe beginnen met bridges te gebruiken"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -349,21 +416,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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 +438,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Vraag standaard bridges aan."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Vraag IPv6 bridges aan."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 89c442ad1e..84005d8934 100644
--- a/nn/LC_MESSAGES/bridgedb.po
+++ b/nn/LC_MESSAGES/bridgedb.po
@@ -9,9 +9,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: IDRASSI Mounir <mounir.idrassi@xxxxxxxx>\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"
@@ -39,18 +39,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Orsak! Noko gjekk gale med førespurnaden din."
@@ -58,15 +56,15 @@ msgstr "Orsak! Noko gjekk gale med førespurnaden din."
msgid "Language"
msgstr "Språk"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Rapporter feil"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Kjeldekode"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Endringslogg"
@@ -221,7 +219,7 @@ msgstr "Hei, %s!"
msgid "Hello, friend!"
msgstr "Hallo, ven!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Offentlege nøklar"
@@ -271,7 +269,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Kva er bruer?"
@@ -316,32 +314,101 @@ msgid "Get Bridges!"
msgstr "FÃ¥ bruer!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Ingen"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Ver venleg og gjer val for brutype:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Treng du IPv6-adresser?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Treng du %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Nettlesaren din viser ikkje bilete skikeleg."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Skriv inn teikn frå biletet nedanfor "
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "Korleis starta å bruka bruer"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -350,21 +417,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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 +439,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Be om bruer med fabrikkoppsett."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Be om IPv6-bruer."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 e33f362eec..a23a80d07b 100644
--- a/pa/LC_MESSAGES/bridgedb.po
+++ b/pa/LC_MESSAGES/bridgedb.po
@@ -11,9 +11,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: erinm\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"
@@ -41,18 +41,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "ਮਾਫ਼ �ਰਨਾ, ਤ�ਹਾਡ� ਬ�ਨਤ� ਵਿੱ� ��� ��ਬ� ਹ��।"
@@ -60,15 +58,15 @@ msgstr "ਮਾਫ਼ �ਰਨਾ, ਤ�ਹਾਡ� ਬ�ਨਤ� ਵਿੱ
msgid "Language"
msgstr "à¨à¨¾à¨¸à¨¼à¨¾"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "ਬੱ� ਦ� ਰਿਪ�ਰ� �ਰ�"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "ਸਰ�ਤ ��ਡ"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "ਲਾ� ਬਦਲ�"
@@ -223,7 +221,7 @@ msgstr ""
msgid "Hello, friend!"
msgstr ""
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "ਪਬਲਿ� ��ੰ��"
@@ -273,7 +271,7 @@ msgid ""
"\n"
msgstr ""
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "ਪ�ਲ �� ਹਨ?"
@@ -318,32 +316,101 @@ msgid "Get Bridges!"
msgstr ""
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "�ਾਲ�"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr ""
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr ""
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr ""
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -352,21 +419,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -374,28 +441,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr ""
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:215
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 767ccfa0c6..766d50d2e9 100644
--- a/pl/LC_MESSAGES/bridgedb.po
+++ b/pl/LC_MESSAGES/bridgedb.po
@@ -18,9 +18,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+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"
@@ -48,18 +48,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Przepraszamy! Ale coÅ? poszÅ?o nie tak z Twoim zapytaniem."
@@ -67,15 +65,15 @@ msgstr "Przepraszamy! Ale coÅ? poszÅ?o nie tak z Twoim zapytaniem."
msgid "Language"
msgstr "JÄ?zyk"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "ZgÅ?oÅ? BÅ?Ä?d"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Kod źródÅ?owy"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Lista zmian"
@@ -230,7 +228,7 @@ msgstr "Witaj, %s!"
msgid "Hello, friend!"
msgstr "Witaj przyjacielu!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Klucze Publiczne"
@@ -280,7 +278,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Czym sÄ? mostki?"
@@ -325,32 +323,101 @@ msgid "Get Bridges!"
msgstr "ZdobÄ?dź Mosty!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Brak"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "ProszÄ? wybraÄ? opcje dla typu mostu:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Czy potrzebujesz adresów IPv6?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Czy potrzebujesz %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Twoja przeglÄ?darka nie wyÅ?wietla obrazów prawidÅ?owo."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Wprowadź tekst z obrazka powyżej..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "Jak zaczÄ?Ä? używaÄ? mostów"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -359,21 +426,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -381,28 +448,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "PoproÅ? o regularne mosty."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "PoproÅ? o mosty IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 f519fd34c3..8e01042544 100644
--- a/pt_BR/LC_MESSAGES/bridgedb.po
+++ b/pt_BR/LC_MESSAGES/bridgedb.po
@@ -27,9 +27,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-14 14:46+0000\n"
-"Last-Translator: Communia <ameaneantie@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+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"
@@ -57,18 +57,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Desculpe! Algo errado ocorreu com a sua solicitação."
@@ -76,15 +74,15 @@ msgstr "Desculpe! Algo errado ocorreu com a sua solicitação."
msgid "Language"
msgstr "Idioma"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Relatar um Bug"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Código Fonte:"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Registro de alterações"
@@ -239,7 +237,7 @@ msgstr "Olá, %s!"
msgid "Hello, friend!"
msgstr "Olá, amigo!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Chaves Públicas"
@@ -289,7 +287,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "O que são pontes?"
@@ -334,32 +332,101 @@ msgid "Get Bridges!"
msgstr "Obtenha Pontes!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Nenhum"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Por favor, selecione as opções de tipos de pontes:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Você precisa de endereços IPv6?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Você precisa de %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Seu navegador não está mostrando as imagens corretamente."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Digite os caracteres da imagem acima..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
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:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -368,21 +435,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -390,28 +457,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Solicitar pontes simples."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Solicitar pontes IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 ac741c510a..a5c7571a94 100644
--- a/pt_PT/LC_MESSAGES/bridgedb.po
+++ b/pt_PT/LC_MESSAGES/bridgedb.po
@@ -14,9 +14,9 @@ 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: 2020-02-18 13:39-0800\n"
-"PO-Revision-Date: 2020-02-25 11:16+0000\n"
-"Last-Translator: Hugo9191 <hugoncosta@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: Rui <xymarior@xxxxxxxxxx>\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"
@@ -44,6 +44,7 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -52,7 +53,7 @@ msgstr ""
#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Desculpe! Ocorreu algo de errado com o seu pedido."
@@ -60,15 +61,15 @@ msgstr "Desculpe! Ocorreu algo de errado com o seu pedido."
msgid "Language"
msgstr "Idioma"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Comunicar um Erro"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Código Fonte"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Registo de alterações"
@@ -223,7 +224,7 @@ msgstr "Olá, %s!"
msgid "Hello, friend!"
msgstr "Olá!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Chaves Públicas"
@@ -318,32 +319,101 @@ msgid "Get Bridges!"
msgstr "Obter Pontes!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Nenhum"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Por favor, selecione as opções para o tipo de ponte:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Precisa de endereços de IPv6?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Precisa de %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "O seu navegador não está a exibir as imagens devidamente."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Insira os carateres da imagem acima..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
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:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -352,21 +422,21 @@ msgid ""
msgstr "Para inserir as pontes 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 Tor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Quando a janela das 'Configurações da Rede Tor' aparecer, clique em 'Configurar' e siga\no assistente até que este lhe pergunte:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:152
+#: bridgedb/strings.py:193
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "O seu 'Provedor de Serviço' à Internet (ISP) bloqueia ou censura as ligações\nà rede Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:156
+#: bridgedb/strings.py:197
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"
@@ -374,28 +444,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 pontes, copie e\ncole as linhas de ponte na caixa de texto. Finalmente, clique em 'Ligar' e\ndeveria estar pronto para continuar! Se encontrar problemas, tente clicar no botão de 'Ajuda'\nno assistente das 'Configurações da Rede Tor' para mais assistência."
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Solicite as pontes básicas."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Solicite as pontes de IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 9e221ab591..5e6ab29edb 100644
--- a/ro/LC_MESSAGES/bridgedb.po
+++ b/ro/LC_MESSAGES/bridgedb.po
@@ -18,9 +18,9 @@ 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: 2020-02-18 13:39-0800\n"
-"PO-Revision-Date: 2020-02-21 16:09+0000\n"
-"Last-Translator: eduard pintilie <eduard.pintilie@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+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"
@@ -48,6 +48,7 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -56,7 +57,7 @@ msgstr ""
#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Scuze ! Ceva n-a mers cum trebuie!"
@@ -64,15 +65,15 @@ msgstr "Scuze ! Ceva n-a mers cum trebuie!"
msgid "Language"
msgstr "LimbÄ?"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "RaporteazÄ? un bug"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Cod sursÄ?"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "SchimbÄ?ri"
@@ -227,7 +228,7 @@ msgstr "BunÄ? , %s!"
msgid "Hello, friend!"
msgstr "BunÄ?, prietene!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Chei publice"
@@ -322,32 +323,101 @@ msgid "Get Bridges!"
msgstr "ObÈ?ine punÈ?i!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Nimic"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Alege opÈ?iunile pentru tipul de punte:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Ai nevoie de adrese IPv6?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Ai nevoie de %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Browserul nu afiÈ?eazÄ? imaginile corect."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Introdu caracterele din imaginea de mai sus..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
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:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -356,21 +426,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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 +448,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Cere punÈ?i simple."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Cere punÈ?i IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 3b55ef59ea..dc1f8b83d6 100644
--- a/ru/LC_MESSAGES/bridgedb.po
+++ b/ru/LC_MESSAGES/bridgedb.po
@@ -31,9 +31,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+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"
@@ -61,18 +61,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Ð?звиниÑ?е! ЧÑ?о-Ñ?о поÑ?ло не Ñ?ак Ñ? ваÑ?им запÑ?оÑ?ом."
@@ -80,15 +78,15 @@ msgstr "Ð?звиниÑ?е! ЧÑ?о-Ñ?о поÑ?ло не Ñ?ак Ñ? ваÑ?им за
msgid "Language"
msgstr "ЯзÑ?к"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "СообÑ?иÑ?Ñ? об оÑ?ибке"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Ð?Ñ?Ñ?однÑ?й код"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Ð?Ñ?Ñ?нал изменений"
@@ -243,7 +241,7 @@ msgstr "Ðй, %s!"
msgid "Hello, friend!"
msgstr "Ð?дÑ?авÑ?Ñ?вÑ?й, дÑ?Ñ?г!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ?е клÑ?Ñ?и"
@@ -293,7 +291,7 @@ msgid ""
"\n"
msgstr "Ð?Ñ?оме Ñ?ого, BridgeDB Ñ?одеÑ?жиÑ? множеÑ?Ñ?во обÑ?Ñ?нÑ?Ñ? моÑ?Ñ?ов %s без какиÑ?-либо\nподклÑ?Ñ?аемÑ?Ñ? Ñ?Ñ?анÑ?поÑ?Ñ?ов %s. ÐÑ?о не Ñ?ак кÑ?Ñ?Ñ?о вÑ?глÑ?диÑ?, но во многиÑ? Ñ?лÑ?Ñ?аÑ?Ñ?\nпозволÑ?еÑ? обÑ?одиÑ?Ñ? инÑ?еÑ?неÑ?-Ñ?ензÑ?Ñ?Ñ?.\n\n"
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "ЧÑ?о Ñ?акое моÑ?Ñ??"
@@ -338,32 +336,101 @@ msgid "Get Bridges!"
msgstr "Ð?олÑ?Ñ?иÑ?Ñ? адÑ?еÑ? моÑ?Ñ?а!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Ð?еÑ?"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Ð?ожалÑ?йÑ?Ñ?а, вÑ?беÑ?иÑ?е паÑ?амеÑ?Ñ?Ñ? Ñ?ипа моÑ?Ñ?а:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Ð?Ñ?полÑ?зÑ?еÑ?е адÑ?еÑ?а IPv6?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Ð?Ñ?деÑ?е иÑ?полÑ?зоваÑ?Ñ? %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Ð?Ñ?аÑ?зеÑ? некоÑ?Ñ?екÑ?но оÑ?обÑ?ажаеÑ? изобÑ?ажениÑ?."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Ð?ведиÑ?е Ñ?имволÑ? Ñ? изобÑ?ажениÑ?..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "Ð?ак иÑ?полÑ?зоваÑ?Ñ? моÑ?Ñ?Ñ??"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -372,21 +439,21 @@ msgid ""
msgstr "ЧÑ?обÑ? добавиÑ?Ñ? новÑ?й моÑ?Ñ? в %s Tor Browser, необÑ?одимо пеÑ?ейÑ?и на Ñ?Ñ?Ñ?аниÑ?Ñ? загÑ?Ñ?зки Tor Browser %s и Ñ?ледоваÑ?Ñ? инÑ?Ñ?Ñ?Ñ?кÑ?иÑ?м по Ñ?каÑ?иваниÑ? и запÑ?Ñ?кÑ? Tor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -394,28 +461,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Ð?Ñ?беÑ?иÑ?е 'Ð?а' и нажмиÑ?е 'Ð?алее'. Ð?лÑ? наÑ?Ñ?Ñ?ойки ваÑ?иÑ? новÑ?Ñ? моÑ?Ñ?ов Ñ?копиÑ?Ñ?йÑ?е и\nвÑ?Ñ?авÑ?Ñ?е иÑ? адÑ?еÑ?а в поле длÑ? ввода Ñ?екÑ?Ñ?а. Ð? нажимаеÑ?е 'Ð?одклÑ?Ñ?иÑ?Ñ?Ñ?Ñ?'! Ð?Ñ?ли Ñ? ваÑ? возникли пÑ?облемÑ? Ñ? подклÑ?Ñ?ением, попÑ?обÑ?йÑ?е воÑ?полÑ?зоваÑ?Ñ?Ñ?Ñ? кнопкой 'Ð?омоÑ?Ñ?'\nво вкладке 'СеÑ?евÑ?е наÑ?Ñ?Ñ?ойки Tor' длÑ? полÑ?Ñ?ениÑ? помоÑ?и."
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Ð?апÑ?оÑ?иÑ?Ñ? обÑ?Ñ?нÑ?е моÑ?Ñ?Ñ?."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Ð?апÑ?оÑ?иÑ?Ñ? моÑ?Ñ?Ñ? Ñ? поддеÑ?жкой IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
msgid "Request a Pluggable Transport by TYPE."
msgstr "Ð?апÑ?оÑ?иÑ?Ñ? подклÑ?Ñ?аемÑ?й Ñ?Ñ?анÑ?поÑ?Ñ? TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:215
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 46755533df..461f270463 100644
--- a/sk/LC_MESSAGES/bridgedb.po
+++ b/sk/LC_MESSAGES/bridgedb.po
@@ -14,9 +14,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: erinm\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"
@@ -44,18 +44,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "PrepáÄ?te! Pri spracovanà vaÅ¡ej požiadavky sa vyskytla chyba."
@@ -63,15 +61,15 @@ msgstr "PrepáÄ?te! Pri spracovanà vaÅ¡ej požiadavky sa vyskytla chyba."
msgid "Language"
msgstr "Jazyk"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Nahlásiť chybu"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Zdrojový kód"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Posledné zmeny"
@@ -226,7 +224,7 @@ msgstr "Hej, %s!"
msgid "Hello, friend!"
msgstr "Ahoj, priateľ!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Verejné kľúÄ?e"
@@ -276,7 +274,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Ä?o sú to premostenia?"
@@ -321,32 +319,101 @@ msgid "Get Bridges!"
msgstr "ZÃskaÅ¥ premostenia!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Žiadny"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "ProsÃm vyberte si možnosti na typ premostenia:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Potrebujete IPv6 adresy?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Potrebujete %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Váš prehliadaÄ? nezobrazuje obrázky správne."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Vložte znaky z obrázku vyššie..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
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:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -355,21 +422,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -377,28 +444,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Požiadať o pôvodné premostenia."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Požiadať o IPv6 premostenia."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 07c7017ebb..f94f469644 100644
--- a/sl/LC_MESSAGES/bridgedb.po
+++ b/sl/LC_MESSAGES/bridgedb.po
@@ -11,9 +11,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: Rory Byrne <info@xxxxxxxxxxxx>\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"
@@ -41,18 +41,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Oprostite! Z vašo zahtevo je bilo nekaj narobe."
@@ -60,15 +58,15 @@ msgstr "Oprostite! Z vašo zahtevo je bilo nekaj narobe."
msgid "Language"
msgstr "Jezik"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Prijavi napako"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Izvorna koda"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Novosti"
@@ -223,7 +221,7 @@ msgstr "Oj, %s!"
msgid "Hello, friend!"
msgstr "Pozdravljen!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Javni kljuÄ?"
@@ -273,7 +271,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Kaj so mostovi?"
@@ -318,32 +316,101 @@ msgid "Get Bridges!"
msgstr "Pridobite si mostiÄ?ke!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "NiÄ?"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Izberite tip mostiÄ?ka:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Potrebujete IPv6 naslove?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Potrebujete %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Vaš brskalnik ne prikazuje slik pravilno."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Vnesite znake vsebovane v zgornji sliki..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "Kako zaÄ?eti uporabljati svoje mostove"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -352,21 +419,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -374,28 +441,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Zahteva za vanilla mostiÄ?ke."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Zaprosi za IPv6 mostove."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 6f43463194..cf4a19a19e 100644
--- a/sq/LC_MESSAGES/bridgedb.po
+++ b/sq/LC_MESSAGES/bridgedb.po
@@ -11,9 +11,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: erinm\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"
@@ -41,18 +41,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Kërkojmë ndjesë! Diçka shkoi keq me kërkesën tuaj."
@@ -60,15 +58,15 @@ msgstr "Kërkojmë ndjesë! Diçka shkoi keq me kërkesën tuaj."
msgid "Language"
msgstr "Gjuhë"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Raportoni një gabim"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Kodi Bazë"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Regjistri i ndryshimeve"
@@ -223,7 +221,7 @@ msgstr "Hej, %s!"
msgid "Hello, friend!"
msgstr "Përshëndetje mik!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Kyça Publikë"
@@ -273,7 +271,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "�'janë urat?"
@@ -318,32 +316,101 @@ msgid "Get Bridges!"
msgstr "Merrni Ura!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Asnjë"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Ju lutemi përzgjidhni mundësitë për llojin e urës:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "A ju nevojiten adresat IPv6?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "A ju nevojitet një %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Shfletuesi juaj nuk po i shfaq si duhet imazhet."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Futini karakteret nga imazhi më sipër..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
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:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -352,21 +419,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -374,28 +441,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Kërkoni urat vanilje ose non-Pluggable Transport."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Kërkoni urat IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 90c50813c7..498c69b5cb 100644
--- a/sr/LC_MESSAGES/bridgedb.po
+++ b/sr/LC_MESSAGES/bridgedb.po
@@ -15,9 +15,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: erinm\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"
@@ -45,18 +45,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Ð?звиниÑ?е! Ð?огодила Ñ?е гÑ?еÑ?ка Ñ?а ваÑ?им заÑ?Ñ?евом."
@@ -64,15 +62,15 @@ msgstr "Ð?звиниÑ?е! Ð?огодила Ñ?е гÑ?еÑ?ка Ñ?а ваÑ?им з
msgid "Language"
msgstr "Jezik"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Ð?Ñ?иÑ?авиÑ?е гÑ?еÑ?кÑ?"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Ð?звоÑ?ни код"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Ð?невник измена"
@@ -227,7 +225,7 @@ msgstr "Ð?дÑ?аво, %s!"
msgid "Hello, friend!"
msgstr "Ð?дÑ?аво, пÑ?иÑ?аÑ?еÑ?Ñ?!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Ð?авни кÑ?Ñ?Ñ?еви"
@@ -277,7 +275,7 @@ msgid ""
"\n"
msgstr "Ð?оÑ?ед Ñ?ога, BridgeDB има пÑ?но наÑ?обиÑ?ниÑ?иÑ? пÑ?емоÑ?Ñ?Ñ?иваÑ?а %s без икаквиÑ?\nпÑ?икÑ?Ñ?Ñ?ниÑ? пÑ?еноÑ?а %s Ñ?Ñ?о можда не звÑ?Ñ?и Ñ?олико кÑ?л, али они ипак\nÑ? много Ñ?лÑ?Ñ?аÑ?ева могÑ? помоÑ?и да Ñ?е заобиÑ?е инÑ?еÑ?неÑ? Ñ?ензÑ?Ñ?а.\n"
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "ШÑ?а Ñ?Ñ? пÑ?емоÑ?Ñ?иваÑ?и?"
@@ -322,32 +320,101 @@ msgid "Get Bridges!"
msgstr "Ð?обиÑ?Ñ?е пÑ?емоÑ?Ñ?иваÑ?е!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Ð?иÑ?едан"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Ð?олимо Ð?аÑ?, изабеÑ?иÑ?е опÑ?иÑ?е за вÑ?Ñ?Ñ?Ñ? пÑ?емоÑ?Ñ?иваÑ?а:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Ð?а ли Ñ?Ñ? Ð?ам поÑ?Ñ?ебне IPv6 адÑ?еÑ?е?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Ð?а ли Ð?ам Ñ?Ñ?еба %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Ð?аÑ? пÑ?егледаÑ? не пÑ?иказÑ?Ñ?е Ñ?лике иÑ?пÑ?авно."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "УнеÑ?иÑ?е знакове Ñ?а Ñ?лике изнад..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "Ð?ако да поÑ?неÑ?е Ñ?а коÑ?иÑ?Ñ?еÑ?ем Ð?аÑ?иÑ? пÑ?емоÑ?Ñ?иваÑ?а"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -356,21 +423,21 @@ msgid ""
msgstr "Ð?а биÑ?Ñ?е Ñ?нели пÑ?емоÑ?Ñ?иваÑ?е Ñ? пÑ?еÑ?Ñ?аживаÑ? Tor, пÑ?ви идиÑ?е на Ñ?Ñ?Ñ?аниÑ?и %s за пÑ?еÑ?зимаÑ?е %s \nпÑ?еÑ?Ñ?аживаÑ?а ТоÑ? и Ñ?амо пÑ?аÑ?иÑ?е Ñ?пÑ?Ñ?Ñ?Ñ?ва за пÑ?еÑ?зимаÑ?е и покÑ?еÑ?аÑ?е пÑ?еÑ?Ñ?аÑ?иваÑ?а ТоÑ?."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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 +445,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Ð?забеÑ?иÑ?е 'Ð?а' и кликниÑ?е на 'СледеÑ?е'. Ð?а биÑ?Ñ?е конÑ?игÑ?Ñ?иÑ?али Ñ?воÑ?е нове пÑ?емоÑ?Ñ?иваÑ?е, копиÑ?аÑ?Ñ?е и\nналепиÑ?е линиÑ?е пÑ?емоÑ?Ñ?иваÑ?а Ñ? поÑ?е за Ñ?ноÑ? Ñ?екÑ?Ñ?а. Ð?онаÑ?но, кликниÑ?е на 'конекÑ?Ñ?Ñ? Ñ?е', i\nможеÑ?е да поÑ?неÑ?е! Ð?ко бÑ?деÑ?е имали пÑ?облема, кликниÑ?е на дÑ?гме 'Ð?омоÑ?'\nÑ? Ñ?аÑ?обÑ?акз за подеÑ?аваÑ?а мÑ?еже ТоÑ? за даÑ?Ñ? помоÑ?."
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Ð?аÑ?Ñ?ева базиÑ?не пÑ?емоÑ?Ñ?иваÑ?е."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Ð?аÑ?Ñ?ева IPv6 пÑ?емоÑ?Ñ?иваÑ?е."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
msgid "Request a Pluggable Transport by TYPE."
msgstr "Ð?аÑ?Ñ?еба пÑ?икÑ?Ñ?Ñ?иви пÑ?еноÑ? по ТÐ?Ð?У."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:215
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 bbfebadc72..b2a2805aea 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -19,9 +19,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-09 11:34+0000\n"
-"Last-Translator: Jonatan Nyberg\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+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"
@@ -49,18 +49,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Något gick tyvärr fel med din förfrågan."
@@ -68,15 +66,15 @@ msgstr "Något gick tyvärr fel med din förfrågan."
msgid "Language"
msgstr "Språk"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Rapportera ett fel"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Källkod"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Ã?ndringslogg"
@@ -231,7 +229,7 @@ msgstr "Hej, %s!"
msgid "Hello, friend!"
msgstr "Hej, kompis!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Publika nycklar"
@@ -281,7 +279,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Vad är broar?"
@@ -326,32 +324,101 @@ msgid "Get Bridges!"
msgstr "Skaffa broar!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Ingen"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Välj alternativ för typ av bro:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Behöver du en IPv6-adress?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Behöver du %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Din webbläsare visar inte bilder korrekt."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Skriv in tecknen från bilden ovan..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
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:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -360,21 +427,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -382,28 +449,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å knappen \"Hjälp\" i \"Tor-nätverksinställningar\" för vidare hjälp."
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Leta efter vanliga broar."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Begär IPv6-broar"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 fc6d57ab66..805094fd76 100644
--- a/sw/LC_MESSAGES/bridgedb.po
+++ b/sw/LC_MESSAGES/bridgedb.po
@@ -8,9 +8,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: Louis Lloyd <louislloyd12@xxxxxxxxx>\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"
@@ -38,18 +38,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Samahani! Kitufulani kimekwenda vibaya pamoja na ombi lako."
@@ -57,15 +55,15 @@ msgstr "Samahani! Kitufulani kimekwenda vibaya pamoja na ombi lako."
msgid "Language"
msgstr ""
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Ripoti Bug"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Chanzo msimbo"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Badili log"
@@ -220,7 +218,7 @@ msgstr "Wewe, 1%s !"
msgid "Hello, friend!"
msgstr "Hujamboa, rafiki!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Ufunguo za umma"
@@ -270,7 +268,7 @@ msgid ""
"\n"
msgstr ""
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Ni nini madaraja?"
@@ -315,32 +313,101 @@ msgid "Get Bridges!"
msgstr "Pata madaraja!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Hakuna"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Tafadhali chagua chaguo kwa aina ya daraja:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Unahitaji anuani za IPv6?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Unahitaji 1%s ?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Kivinjari chako hakionyeshi picha vizuri."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Ingiza maneno kutoka kwenye picha juu..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "Jinsi ya kuanza kutumia madaraja yako"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -349,21 +416,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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 +438,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Ombi Vanilla madaraja."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Ombi IPv6 madaraja."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 1288094f58..bf4cc8417e 100644
--- a/ta/LC_MESSAGES/bridgedb.po
+++ b/ta/LC_MESSAGES/bridgedb.po
@@ -13,9 +13,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: Bala Subramaniyan <balapandu222@xxxxxxxxxxx>\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"
@@ -43,18 +43,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "மன�னி���வ�ம�! ����ள� வ�ண�����ளிற��� �த��ர� தவற� ந�ர�ந�த�ள�ளத�."
@@ -62,15 +60,15 @@ msgstr "மன�னி���வ�ம�! ����ள� வ�ண��
msgid "Language"
msgstr "ம�ாழி"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "�ர� பிழ�ய� �றி������ய��"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "ம�ல த���ப�ப�"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "மாற�றம���றி����ம� ��ாப�ப�"
@@ -225,7 +223,7 @@ msgstr "ஹ�, %s!"
msgid "Hello, friend!"
msgstr "ஹல�ா, த�ழா!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "ப�ாத� �ாவி�ள�"
@@ -275,7 +273,7 @@ msgid ""
"\n"
msgstr "����தலா�, BridgeDB-யின�ள� �ராளமான பழ�யம�ற� bridge-�ள� \n%s Pluggable Transports வ�தியில�லாமல� �ள�ளத� %s �ணர����ி ������ிறவாற� �ல�லாவி���ால�ம�, \n�வ�யால� பல �ந�தர�ப�ப���ளில� �ன�ய தணி����ய� ����� �தவ�ம�.\n\n"
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Bridges �ன�றால� �ன�ன?"
@@ -320,32 +318,101 @@ msgid "Get Bridges!"
msgstr "Bridge-�ள� ப�ற��!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "யார�ம�"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Bridge வ�� விர�ப�ப���ள� த�ர�ந�த������வ�ம�:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "����ள����� IPv6 ம��வரி�ள� வ�ண���மா?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "����ள����� �ர� %s த�வ�யா?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr " த���ளின� browser ப����ள� �ரியா� �ா���வில�ல�."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "ம�ல� �ள�ள ப�த�தில� �ர�����ம� �ழ�த�த����ள� �ள�ளி�வ�ம�..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "த���ளின� bridge-�ள� பயன�ப��த�த த�ா�����வத� �ப�ப�ி"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -354,21 +421,21 @@ msgid ""
msgstr "Tor �லாவியில� bridge�ள� �ள�ள��� ��ய�ய, ம�தலில� %s Tor �லாவி பதிவிற��� ப���த�திற��� ��ன�ற� %s ம�ல�ம� பிற�� ����� Tor �லாவிய� பதிவிற���ம� மற�ற�ம� த������வதற��ான �றிவ�ற�த�தல��ள� பின�பற�ற����ள�."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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 +443,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "'�ம�' த�ர�ந�த���த�த� பின�னர� '���த�த�' �ிளி�� ��ய�யவ�ம�. த���ளின� ப�திய bridge-�ள� ����ம����, \nவரி���ள� வா���ியம� �ள�ள�t�� ப����ியில� ந�ல����த�த� ப�ஸ��� ��ய�யவ�ம�. �ற�தியா�, '�ண����' �ிளி�� \n��ய�தவ��ன�, ந����ள� ��ல�ல தயார�! ந����ள� பிர���ின�ய� �ந�தித�தால�, 'Tor ந���வ�ார��� �ம�ப�ப��ள�' \nவழி�ா���ியில� �ள�ள '�தவி' ப�ாத�தான� �ிளி�� ��ய�த� ம�ல�ம� �தவி ப�றவ�ம�."
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "பழ�யம�ற�யான bridge-�ள� விண�ணப�பி���வ�ம�."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "IPv6 bridge-�ள� விண�ணப�பி���வ�ம�."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr " BridgeDB-ய���ய ப�ாத� GnuPG �ாவியின� �ர� ந�ல� ப�றவ�ம�."
diff --git a/templates/bridgedb.pot b/templates/bridgedb.pot
index 070e38f5d9..e42e42258e 100644
--- a/templates/bridgedb.pot
+++ b/templates/bridgedb.pot
@@ -9,8 +9,8 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
"Language-Team: English (http://www.transifex.com/otf/torproject/language/en/)\n"
"MIME-Version: 1.0\n"
@@ -39,18 +39,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Sorry! Something went wrong with your request."
@@ -58,15 +56,15 @@ msgstr "Sorry! Something went wrong with your request."
msgid "Language"
msgstr "Language"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Report a Bug"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Source Code"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Changelog"
@@ -221,7 +219,7 @@ msgstr "Hey, %s!"
msgid "Hello, friend!"
msgstr "Hello, friend!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Public Keys"
@@ -271,7 +269,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/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "What are bridges?"
@@ -316,32 +314,101 @@ msgid "Get Bridges!"
msgstr "Get Bridges!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr "Bridge distribution mechanisms"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr "BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\nthe pseudo-mechanism \"None\". The following list briefly explains how these\nmechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\nmechanisms is."
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr "The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\nbridges, go to %sbridges.torproject.org%s, select your preferred options, and\nsolve the subsequent CAPTCHA."
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr "The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\nrequest bridges from inside their Tor Browser settings. To get bridges, go to\nyour Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\nsubsequent CAPTCHA, and Tor Browser will automatically add your new\nbridges."
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr "Users can request bridges from the \"Email\" distribution mechanism by sending an\nemail to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\nemail body."
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr "Reserved"
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr "BridgeDB maintains a small number of bridges that are not distributed\nautomatically. Instead, we reserve these bridges for manual distribution and\nhand them out to NGOs and other organizations and individuals that need\nbridges. Bridges that are distributed over the \"Reserved\" mechanism may not\nsee users for a long time. Note that the \"Reserved\" distribution mechanism is\ncalled \"Unallocated\" in %sbridge pool assignment%s files."
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "None"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr "Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\nIt is the bridge operator's responsibility to distribute their bridges to\nusers. Note that on Relay Search, a freshly set up bridge's distribution\nmechanism says \"None\" for up to approximately one day. Be a bit patient, and\nit will then change to the bridge's actual distribution mechanism.\n"
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Please select options for bridge type:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Do you need IPv6 addresses?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Do you need a %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Your browser is not displaying images properly."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Enter the characters from the image above..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "How to start using your bridges"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -350,21 +417,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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 +439,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Request vanilla bridges."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Request IPv6 bridges."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 10c19ae4f9..7c55d0c549 100644
--- a/th/LC_MESSAGES/bridgedb.po
+++ b/th/LC_MESSAGES/bridgedb.po
@@ -18,9 +18,9 @@ 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: 2020-02-18 13:39-0800\n"
-"PO-Revision-Date: 2020-03-14 19:04+0000\n"
-"Last-Translator: bact' <arthit@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: erinm\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"
@@ -48,6 +48,7 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -56,7 +57,7 @@ msgstr ""
#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "à¸?à¸à¸à¸ ัย! มีà¸à¸°à¹?รà¸?ิà¸?à¸?à¸?à¸?ิà¹?à¸?ิà¸?à¸?ึà¹?à¸?à¸?ัà¸?à¸?ำà¸?à¸à¸?à¸à¸?à¸?ุà¸?"
@@ -64,15 +65,15 @@ msgstr "à¸?à¸à¸à¸ ัย! มีà¸à¸°à¹?รà¸?ิà¸?à¸?à¸?à¸?ิà¹?à¸?ิà¸?
msgid "Language"
msgstr "ภาษา"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "�����ั��"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "à¸?à¸à¸£à¹?สà¹?à¸?à¹?à¸?"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "�ูม�วาม��ลี�ย���ล�"
@@ -227,7 +228,7 @@ msgstr "�ฮ� %s!"
msgid "Hello, friend!"
msgstr "สวัสà¸?ีà¹?à¸?ืà¹?à¸à¸?!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "�ุ���สา�าร�ะ"
@@ -322,32 +323,101 @@ msgid "Get Bridges!"
msgstr "รั��ริ���"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "�ม�มี"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "à¸?รุà¸?าà¹?ลืà¸à¸?à¸?ัวà¹?ลืà¸à¸?สำหรัà¸?à¸?à¸?ิà¸?à¸?à¸à¸?à¸?ริà¸?à¸?à¹?:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "à¸?ุà¸?à¸?à¹?à¸à¸?à¸?ารà¸?ีà¹?à¸à¸¢à¸¹à¹? IPv6?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "à¸?ุà¸?à¸?à¹?à¸à¸?à¸?าร %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "à¸?ราวà¹?à¸?à¸à¸£à¹?à¸?à¸à¸?à¸?ุà¸?à¹?มà¹?à¹?สà¸?à¸?à¸?ลà¸à¸¢à¹?าà¸?à¸?ีà¹?à¸?วร"
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "à¸?ิมà¸?à¹?à¸?ัวà¸à¸±à¸?ษรà¸?าà¸?ภาà¸?à¸?à¹?าà¸?à¸?à¸?..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "à¹?ริà¹?มà¸?à¹?à¸?à¹?à¸?à¹?à¸?าà¸?à¸?ริà¸?à¸?à¹?à¸?à¸à¸?à¸?ุà¸?à¹?à¸?à¹?à¸à¸¢à¹?าà¸?à¹?ร"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -356,21 +426,21 @@ msgid ""
msgstr "à¸?à¹?à¸à¸?à¸?ะà¹?à¸?à¹?าà¸?ริà¸?à¸?à¹?à¹?à¸? Tor Browser, à¸?à¹?à¸à¸?à¸à¸·à¹?à¸?à¹?à¸?à¸?ีà¹? %s หà¸?à¹?า Tor Browser à¸?าวà¸?à¹?à¹?หลà¸?\nà¹?ละà¸?ำà¸?ามà¸?ัà¹?à¸?à¸?à¸à¸?à¹?à¸?ืà¹?à¸à¹?ริà¹?มà¸?าวà¸?à¹?à¹?หลà¸?à¹?ละà¹?ริà¹?ม Tor Browser"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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 +448,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "à¹?ลืà¸à¸? 'à¹?à¸?à¹?' à¹?ละà¸?à¸? 'à¸?ัà¸?à¹?à¸?' à¹?à¸?ืà¹?à¸à¸?ัà¹?à¸?à¸?à¹?าà¸?ริà¸?à¸?à¹?à¸?à¸à¸?à¸?ุà¸? à¸?ัà¸?ลà¸à¸?à¹?ละ\nวาà¸?à¸?รรà¸?ัà¸?à¸?ริà¸?à¸?à¹?ลà¸?à¹?à¸?à¸?ลà¹?à¸à¸?à¸?à¹?à¸à¸?วาม สุà¸?à¸?à¹?าย à¸?à¸? 'à¹?à¸?ืà¹?à¸à¸¡à¸?à¹?à¸' à¹?ละ\nมัà¸?à¸?à¹?าà¸?ะà¹?à¸?à¹?à¸?าà¸?à¹?à¸?à¹?à¹?ลà¹?ว! หาà¸?à¸?ุà¸?à¸?à¸?à¸?ัà¸?หา à¹?หà¹?ลà¸à¸?à¸?à¸?à¸?ุà¹?ม 'à¸?à¹?วยà¹?หลืà¸'\nà¹?à¸?หà¸?à¹?า 'à¸?ารà¸?ัà¹?à¸?à¸?à¹?าà¹?à¸?รืà¸à¸?à¹?าย Tor' สำหรัà¸?à¸?วามà¸?à¹?วยà¹?หลืà¸à¹?à¸?ิà¹?มà¹?à¸?ิม"
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "à¸?à¸à¸£à¹?à¸à¸?à¸?ริà¸?à¸?à¹?มาà¸?รà¸?าà¸?"
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "รà¹?à¸à¸?à¸?à¸à¸?ริà¸?à¸?à¹? IPv6"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
msgid "Request a Pluggable Transport by TYPE."
msgstr "สà¹?à¸?à¸?ำรà¹?à¸à¸?à¸?à¸à¸?ัวสà¹?à¸?à¸?ราà¸?à¸?à¹?à¸à¸¡à¸¹à¸¥à¸?าม TYPE"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:215
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 5d290b1c64..93d486757c 100644
--- a/tr/LC_MESSAGES/bridgedb.po
+++ b/tr/LC_MESSAGES/bridgedb.po
@@ -27,8 +27,8 @@ 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: 2020-02-18 13:39-0800\n"
-"PO-Revision-Date: 2020-02-29 06:28+0000\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
"Last-Translator: Kaya Zeren <kayazeren@xxxxxxxxx>\n"
"Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -57,6 +57,7 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
@@ -65,7 +66,7 @@ msgstr ""
#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Ã?zgünüz! Ä°steÄ?iniz ile ilgili bir Å?eyler ters gitti."
@@ -73,15 +74,15 @@ msgstr "Ã?zgünüz! Ä°steÄ?iniz ile ilgili bir Å?eyler ters gitti."
msgid "Language"
msgstr "Dil"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Bir Hata Bildirin"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Kaynak Kodu"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Sürüm Notları"
@@ -236,7 +237,7 @@ msgstr "Selam, %s!"
msgid "Hello, friend!"
msgstr "Selam, arkadaÅ?!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Herkese Açık Anahtarlar"
@@ -331,32 +332,101 @@ msgid "Get Bridges!"
msgstr "Köprüleri Al!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Hiçbirini"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Lütfen köprü türü seçeneklerini belirleyin:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "IPv6 adresleri gerekli mi?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "%s gerekli mi?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
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:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Yukarıdaki görselde bulunan karakterleri yazın..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "Köprülerinizi nasıl kullanabilirsiniz"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -365,21 +435,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:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -387,28 +457,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:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Normal köprü isteÄ?inde bulun."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "IPv6 köprüsü isteÄ?inde bulun."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
msgid "Request a Pluggable Transport by TYPE."
msgstr "TYPE uyumlu bir DeÄ?iÅ?tirilebilir TaÅ?ıyıcı isteÄ?inde bulun."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:215
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 51fc5306a2..148bd0ea7a 100644
--- a/uk/LC_MESSAGES/bridgedb.po
+++ b/uk/LC_MESSAGES/bridgedb.po
@@ -15,9 +15,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+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"
@@ -45,18 +45,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Ð?и пÑ?иноÑ?имо наÑ?Ñ? вибаÑ?еннÑ?! ЩоÑ?Ñ? пÑ?Ñ?ло не Ñ?ак з Ð?аÑ?им запиÑ?ом."
@@ -64,15 +62,15 @@ msgstr "Ð?и пÑ?иноÑ?имо наÑ?Ñ? вибаÑ?еннÑ?! ЩоÑ?Ñ? пÑ?Ñ?ло
msgid "Language"
msgstr "Ð?ова"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Ð?овÑ?домиÑ?и пÑ?о помилкÑ?"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Ð?од"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "СпиÑ?ок змÑ?н"
@@ -227,7 +225,7 @@ msgstr "Ð?Ñ?ивÑ?Ñ?, %s!"
msgid "Hello, friend!"
msgstr "Ð?Ñ?ивÑ?Ñ?, дÑ?Ñ?же!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Ð?Ñ?дкÑ?иÑ?Ñ? клÑ?Ñ?Ñ?"
@@ -277,7 +275,7 @@ msgid ""
"\n"
msgstr "Ð?Ñ?Ñ?м Ñ?ого, BridgeDB маÑ? багаÑ?о пÑ?оÑ?Ñ?иÑ? Ñ?к двеÑ?Ñ? моÑ?Ñ?Ñ?в %s без\nвÑ?Ñ?авниÑ? Ñ?Ñ?анÑ?поÑ?Ñ?еÑ?Ñ?в %s, Ñ?кÑ?, можливо, не звÑ?Ñ?аÑ?Ñ? гаÑ?но, але вони \nможÑ?Ñ?Ñ? допомогÑ?и обÑ?йÑ?и Ñ?нÑ?еÑ?неÑ?-Ñ?ензÑ?Ñ?Ñ? в багаÑ?Ñ?оÑ? випадкаÑ?.\n"
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Що Ñ?аке Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ? Ñ?ипÑ? мÑ?Ñ?Ñ??"
@@ -322,32 +320,101 @@ msgid "Get Bridges!"
msgstr "Ð?Ñ?Ñ?имаÑ?и Bridges!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Ð?Ñ?Ñ?ого"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "Ð?Ñ?дÑ? лаÑ?ка, обеÑ?Ñ?Ñ?Ñ? паÑ?амеÑ?Ñ?и Ñ?ипÑ? мÑ?Ñ?Ñ?:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "Ð?ам поÑ?Ñ?Ñ?бнÑ? адÑ?еÑ?и IPv6?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "Ð?ам поÑ?Ñ?Ñ?бен %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "Ð?аÑ? бÑ?аÑ?зеÑ? не вÑ?добÑ?ажаÑ? зобÑ?аженнÑ? належним Ñ?ином."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Ð?ведÑ?Ñ?Ñ? зобÑ?аженнÑ? Ñ?имволи ..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "Як поÑ?аÑ?и коÑ?иÑ?Ñ?Ñ?ваÑ?иÑ?Ñ? Ð?аÑ?ими моÑ?Ñ?ами"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -356,21 +423,21 @@ msgid ""
msgstr "Щоб додаÑ?и Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?и Ñ? Tor Browser, Ñ?поÑ?аÑ?кÑ? Ñ?дÑ?Ñ?Ñ? на %s Ñ?Ñ?оÑ?Ñ?нкÑ? заванÑ?аженнÑ? Tor Browser %s а поÑ?Ñ?м Ñ?лÑ?дÑ?йÑ?е Ñ?нÑ?Ñ?Ñ?Ñ?кÑ?Ñ?Ñ?м длÑ? Ñ?каÑ?Ñ?ваннÑ? Ñ? запÑ?Ñ?кÑ? Tor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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 +445,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? \"Так\", а поÑ?Ñ?м наÑ?иÑ?нÑ?Ñ?Ñ? \"Ð?алÑ?\". Ð?лÑ? налаÑ?Ñ?Ñ?ваннÑ? новиÑ? bridges, Ñ?копÑ?Ñ?йÑ?е Ñ?\nвÑ?Ñ?авÑ?е лÑ?нÑ?Ñ? bridge Ñ? поле длÑ? введеннÑ? Ñ?екÑ?Ñ?Ñ?. Ð?оÑ?Ñ?м, наÑ?иÑ?нÑ?Ñ?Ñ? 'Ð?Ñ?дклÑ?Ñ?аÑ?иÑ?Ñ?', Ñ?\nвÑ?е повинно пÑ?аÑ?Ñ?ваÑ?и! ЯкÑ?о Ñ? Ð?аÑ? виникли пÑ?облеми, Ñ?пÑ?обÑ?йÑ?е наÑ?иÑ?нÑ?Ñ?и \"Ð?овÑ?дка\" \nв майÑ?Ñ?Ñ?овÑ? \"Ð?еÑ?ежевÑ? паÑ?амеÑ?Ñ?и Tor' длÑ? оÑ?Ñ?иманнÑ? додаÑ?ковоÑ? допомоги."
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Ð?апиÑ? на оÑ?Ñ?иманнÑ? vanilla bridges."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Ð?апиÑ? на оÑ?Ñ?иманнÑ? IPv6 bridges."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Ð?Ñ?Ñ?имаÑ?и копÑ?Ñ? вÑ?дкÑ?иÑ?ого GnuPG клÑ?Ñ?а длÑ? BridgeDB."
diff --git a/uz/LC_MESSAGES/bridgedb.po b/uz/LC_MESSAGES/bridgedb.po
index ad91dac4bf..590a3d8c1f 100644
--- a/uz/LC_MESSAGES/bridgedb.po
+++ b/uz/LC_MESSAGES/bridgedb.po
@@ -10,9 +10,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: IDRASSI Mounir <mounir.idrassi@xxxxxxxx>\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"
@@ -40,18 +40,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Uzr, nimadir xato ketdi."
@@ -59,15 +57,15 @@ msgstr "Uzr, nimadir xato ketdi."
msgid "Language"
msgstr "Til"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Nosozlik haqida xabar berish"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Kod"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Oʻzgarishlar"
@@ -222,7 +220,7 @@ msgstr "Salom, %s!"
msgid "Hello, friend!"
msgstr "Salom, do'st!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Ommaviy kalitlar"
@@ -272,7 +270,7 @@ msgid ""
"\n"
msgstr ""
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Ko'priklar nima?"
@@ -317,32 +315,101 @@ msgid "Get Bridges!"
msgstr ""
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Ð?еÑ?"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr ""
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr ""
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr ""
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -351,21 +418,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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 +440,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr ""
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:215
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 e31ffe5007..341731ecb0 100644
--- a/vi/LC_MESSAGES/bridgedb.po
+++ b/vi/LC_MESSAGES/bridgedb.po
@@ -13,9 +13,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: erinm\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"
@@ -43,18 +43,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
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."
@@ -62,15 +60,15 @@ msgstr "Xin lá»?i! Có gì Ä?ó không Ä?úng vá»?i yêu cầu của bạn."
msgid "Language"
msgstr "Ngôn ngữ"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Báo cáo l�i"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "MaÌ? NguôÌ?n"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Nháºt ký thay Ä?ôÌ?i"
@@ -225,7 +223,7 @@ msgstr "NaÌ?y, %s!"
msgid "Hello, friend!"
msgstr "Chà o bạn!"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "Khóa công khai"
@@ -275,7 +273,7 @@ msgid ""
"\n"
msgstr "Thêm vaÌ?o Ä?oÌ?, BridgeDB coÌ? râÌ?t nhiêÌ?u cầu ná»?i tầm thÆ°á»?ng %s tÆ°Ì?c laÌ? nhÆ°Ì?ng bridge\nkhông coÌ? Pluggable Transports naÌ?o %s vaÌ? Ä?iêÌ?u Ä?oÌ? nghe coÌ? veÌ? không tôÌ?t cho\nlÄ?Ì?m, nhÆ°ng chuÌ?ng coÌ? thêÌ? vâÌ?n giuÌ?p traÌ?nh caÌ?c sÆ°Ì£ kiêÌ?m duyệt internet trong nhiêÌ?u\ntrÆ°Æ¡Ì?ng hÆ¡Ì£p.\n\n"
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Cầu ná»?i laÌ? giÌ??"
@@ -320,32 +318,101 @@ msgid "Get Bridges!"
msgstr "LâÌ?y Cầu ná»?i!"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "Không có"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "HaÌ?y choÌ£n caÌ?c tuÌ?y choÌ£n cho loại cầu ná»?i:"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "BaÌ£n coÌ? câÌ?n caÌ?c Ä?iÌ£a chiÌ? IPv6?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "BaÌ£n coÌ? câÌ?n một %s?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "TriÌ?nh duyệt cuÌ?a baÌ£n Ä?ang không hiêÌ?u thiÌ£ hiÌ?nh aÌ?nh chiÌ?nh xaÌ?c."
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "Nhập caÌ?c kyÌ? tÆ°Ì£ tÆ°Ì? hiÌ?nh aÌ?nh Æ¡Ì? trên..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "LaÌ?m sao Ä?êÌ? bÄ?Ì?t Ä?âÌ?u sÆ°Ì? duÌ£ng cầu ná»?i cuÌ?a baÌ£n"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -354,21 +421,21 @@ msgid ""
msgstr "Ä?êÌ? nhập cầu ná»?i vaÌ?o Tor Browser, Ä?âÌ?u tiên Ä?i Ä?êÌ?n %s trang taÌ?i xuôÌ?ng cuÌ?a\nTor Browser %s vaÌ? sau Ä?oÌ? laÌ?m theo hÆ°Æ¡Ì?ng dâÌ?n Æ¡Ì? Ä?oÌ? Ä?êÌ? taÌ?i xuôÌ?ng vaÌ? bÄ?Ì?t Ä?âÌ?u\nTor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Khi hộp thoaÌ£i 'TuÌ?y chiÌ?nh mạng Tor' xuâÌ?t hiện, bấm chuá»?t vaÌ?o 'CâÌ?u hiÌ?nh' vaÌ? laÌ?m theo\ntriÌ?nh hÆ°Æ¡Ì?ng dâÌ?n Ä?êÌ?n khi noÌ? hoÌ?i:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:152
+#: bridgedb/strings.py:193
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "CoÌ? phaÌ?i nhaÌ? Cung CâÌ?p DiÌ£ch VuÌ£ Internet (ISP) cuÌ?a baÌ£n Ä?aÌ? khoÌ?a hoÄ?Ì£c kiêÌ?m duyệt caÌ?c kêÌ?t nôÌ?i Ä?êÌ?n mạng Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:156
+#: bridgedb/strings.py:197
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 +443,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "ChoÌ£n 'Ä?uÌ?ng' vaÌ? sau Ä?oÌ? nhâÌ?n 'TiêÌ?p theo'. Ä?êÌ? câÌ?u hiÌ?nh cầu ná»?i mÆ¡Ì?i cuÌ?a baÌ£n, sao cheÌ?p vaÌ? daÌ?n những Ä?Æ°á»?ng cầu ná»?i vaÌ?o hộp nhập vÄ?n baÌ?n. CuôÌ?i cuÌ?ng, nhâÌ?n 'KêÌ?t nôÌ?i', vaÌ? baÌ£n Ä?aÌ? hoaÌ?n thaÌ?nh rôÌ?i Ä?âÌ?y! NêÌ?u baÌ£n gÄ?Ì£p rÄ?Ì?c rôÌ?i khi traÌ?i nghiệm, haÌ?y thÆ°Ì? nhâÌ?n nuÌ?t 'GiuÌ?p Ä?Æ¡Ì?' trong triÌ?nh hÆ°Æ¡Ì?ng dâÌ?n 'CaÌ?c TuÌ?y ChiÌ?nh mạng Tor' Ä?êÌ? nhận Ä?Æ°Æ¡Ì£c sÆ°Ì£ giuÌ?p Ä?Æ¡Ì? tôÌ?t hÆ¡n."
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
msgid "Displays this message."
msgstr "HiêÌ?n thiÌ£ tin nhÄ?Ì?n naÌ?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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "Yêu câÌ?u bridges nguyên gôÌ?c."
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "Yêu câÌ?u cầu ná»?i cho IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
msgid "Request a Pluggable Transport by TYPE."
msgstr "Yêu cầu m�t Pluggable Transport b�i TYPE"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:215
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Lấy một baÌ?n sao của chiÌ?a khóa GnuPG công cá»?ng cuÌ?a BridgeDB."
diff --git a/zh_CN/LC_MESSAGES/bridgedb.po b/zh_CN/LC_MESSAGES/bridgedb.po
index 9a9310c512..74330439f0 100644
--- a/zh_CN/LC_MESSAGES/bridgedb.po
+++ b/zh_CN/LC_MESSAGES/bridgedb.po
@@ -21,8 +21,8 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 14:57+0000\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
"Last-Translator: ff98sha\n"
"Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -51,18 +51,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "æ?±æ?ï¼?ä½ ç??é?®ä»¶è¯·æ±?å?ºç?°é?®é¢?ã??"
@@ -70,15 +68,15 @@ msgstr "æ?±æ?ï¼?ä½ ç??é?®ä»¶è¯·æ±?å?ºç?°é?®é¢?ã??"
msgid "Language"
msgstr "è¯è¨?"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "æ?¥å??æ¼?æ´?"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "æº?代ç ?"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "����"
@@ -233,7 +231,7 @@ msgstr "ä½ å¥½ï¼?%sï¼?"
msgid "Hello, friend!"
msgstr "ä½ å¥½ï¼?æ??å??ï¼?"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "å?¬å?±å¯?å??"
@@ -283,7 +281,7 @@ msgid ""
"\n"
msgstr "æ¤å¤?ï¼?BridgeDB æ??ä¾?å¾?å¤? %s é??å?¯æ??æ??ä¼ è¾? %s ç??æ?®é??ç½?æ¡¥ã??\nè?½ç?¶å?¬èµ·æ?¥ä¸?å¤?é?·ï¼?ä½?æ?¯è¿?äº?æ?®é??ç½?æ¡¥ä¾?ç?¶å?¯ä»¥å?¨å¾?å¤?æ??å?µä¸?帮å?©ç»?è¿?审æ?¥ã??\n"
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "����桥�"
@@ -328,32 +326,101 @@ msgid "Get Bridges!"
msgstr "���桥�"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "None"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "请é??æ?©ç±»å??ç±»å??ã??"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "æ?¯å?¦é??è¦?IPv6å?°å??ï¼?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "æ?¯å?¦é??è¦? %sï¼?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "æµ?è§?å?¨æ? æ³?æ£ç¡®æ?¾ç¤ºå?¾ç??ã??"
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "请è¾?å?¥ä¸?å?¾ä¸ç??å?符ï¼?ä¸?å?ºå??大å°?å??ï¼?..."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "��使��桥"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -362,21 +429,21 @@ msgid ""
msgstr "å¦?é??å?¨ Tor æµ?è§?å?¨ä¸æ·»å? ç½?æ¡¥ï¼?请å??æ ¹æ?® %s Tor æµ?è§?å?¨ä¸?载页é?¢ %s ç??说æ??ä¸?è½½å??å?¯å?¨ Tor æµ?è§?å?¨ã??"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -384,28 +451,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "é??æ?©â??æ?¯â??ï¼?ç?¶å??ç?¹å?»â??ä¸?ä¸?æ¥â??ã??å¦?ä¸?æ·»å? æ?°ç??ç½?æ¡¥ï¼?请å°?ç½?æ¡¥å?°å??è¡?é??è¿?å¤?å?¶ç²?è´´ç??æ?¹å¼?è¾?å?¥å?°æ??æ?¬è¾?å?¥æ¡?ã??æ??å??ï¼?ç?¹å?»â??è¿?æ?¥â??å°±å?¯ä»¥è¿?æ?¥è?³ Tor ç½?ç»?ã??å¦?æ??é?®é¢?é??è¦?帮å?©ï¼?请ç?¹å?»â??Tor ç½?ç»?设置â??å??导çª?å?£ä¸ç??â??帮å?©â??æ??é?®ã??"
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "请æ±?æ?®é??ç½?æ¡¥ã??"
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "请æ±?IPv6ç½?ç»?ã??"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
msgid "Request a Pluggable Transport by TYPE."
msgstr "æ??ç?§ç±»å??请æ±?ä¸?å??ç??å?¯æ??æ??ä¼ è¾?ç½?æ¡¥ã??"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:215
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 2646b4d7de..a9f58a7201 100644
--- a/zh_HK/LC_MESSAGES/bridgedb.po
+++ b/zh_HK/LC_MESSAGES/bridgedb.po
@@ -13,9 +13,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+0000\n"
+"Last-Translator: IDRASSI Mounir <mounir.idrassi@xxxxxxxx>\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"
@@ -43,18 +43,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "å°?å??ä½?ï¼?ä½ å??è«?æ±?æ??é?¯èª¤ã??"
@@ -62,15 +60,15 @@ msgstr "å°?å??ä½?ï¼?ä½ å??è«?æ±?æ??é?¯èª¤ã??"
msgid "Language"
msgstr "��"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "å??å ±é?¯èª¤"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "å??å§?ç¨?å¼?碼"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "����"
@@ -225,7 +223,7 @@ msgstr "å?¿ï¼?%sï¼?"
msgid "Hello, friend!"
msgstr "æ??å??ï¼?ä½ å¥½ï¼?"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "å?¬å??"
@@ -275,7 +273,7 @@ msgid ""
"\n"
msgstr "æ¤å¤?ï¼?BridgeDBæ??æ?®é??å??æ©?æ?¥å?¨%sï¼?ç?¡ä»»ä½?\nPluggable Transports %sï¼?æ??è??è?½èµ·å??å??å??ï¼?ä½?\nä»?æ??å?©æ?¼è¦?é?¿å¥½å¤?æ??æ³?ä¸?å??網絡審æ?¥ã??\n\n"
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "�����"
@@ -320,32 +318,101 @@ msgid "Get Bridges!"
msgstr "å??å¾?æ©?æ?¥å?¨ï¼?"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "ç?¡"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "è«?é?¸å??æ©?æ?¥å?¨é¡?å??ï¼?"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "ä½ é??è¦?IPv6ä½?å??å??ï¼?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "ä½ é??è¦?%så??ï¼?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "ä½ å??ç??覽å?¨å??è?½å¤ æ£ç¢ºé¡¯ç¤ºå??å??ã??"
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "輸å?¥ä¸?é?¢å??å??ä¸å??å?å??â?¦"
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "é»?樣é??å§?使ç?¨æ©?æ?¥å?¨"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -354,21 +421,21 @@ msgid ""
msgstr "å°?æ©?æ?¥å?¨è¼¸å?¥å?°Toræ´?è?¥è·¯ç?±ç??覽å?¨ï¼?è«?é¦?å??å??å¾?%s Toræ´?è?¥è·¯ç?±\nç??覽å?¨ä¸?è¼?é ?é?¢%sï¼?並æ??ç?§é ?é?¢ä¸?å??æ??示ä¸?è¼?å??å??å??Toræ´?è?¥\nè·¯ç?±ç??覽å?¨ã??"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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 +443,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "é?¸å??ã??æ?¯ã??ï¼?ç?¶å¾?æ?³ã??ä¸?ä¸?æ¥ã??ã??è¦?è¨å®?æ?°æ©?æ?¥å?¨ï¼?è«?è¤?製å??\nå°?æ©?æ?¥ç·?路貼å?°æ??å?輸å?¥å?£ä¸ã??æ??å¾?ï¼?æ?³ã??é?£æ?¥ã??ã??\nå¦?æ??é??å?°éº»ç?©ï¼?è«?å??試æ?³ã??Toræ´?è?¥è·¯ç?±ç¶²çµ¡è¨å®?ã??å??ã??説æ??ã??\nå°?æ±?é?²ä¸?æ¥å??å?©ã??"
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "è«?æ±?Vanillaæ©?æ?¥å?¨ã??"
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "è«?æ±?IPv6æ©?æ?¥å?¨ã??"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
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:174
+#: bridgedb/strings.py:215
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 fd9f6db16b..c2c2f22d43 100644
--- a/zh_TW/LC_MESSAGES/bridgedb.po
+++ b/zh_TW/LC_MESSAGES/bridgedb.po
@@ -16,9 +16,9 @@ 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: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 12:49+0000\n"
-"Last-Translator: Hsiu-Ming Chang <cges30901@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-03-18 09:23-0700\n"
+"PO-Revision-Date: 2020-03-19 07:14+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"
@@ -46,18 +46,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "æ?±æ?ï¼?æ?¨ç??è«?æ±?ç?¼ç??é?¯èª¤ã??"
@@ -65,15 +63,15 @@ msgstr "æ?±æ?ï¼?æ?¨ç??è«?æ±?ç?¼ç??é?¯èª¤ã??"
msgid "Language"
msgstr "��"
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "å??å ±é?¯èª¤"
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "å??å§?ç¨?å¼?碼"
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "è®?æ?´è¨?é??"
@@ -228,7 +226,7 @@ msgstr "å?¿ï¼?%sï¼?"
msgid "Hello, friend!"
msgstr "æ??å??ï¼?æ?¨å¥½ï¼?"
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58
msgid "Public Keys"
msgstr "å?¬é??é??é?°"
@@ -278,7 +276,7 @@ msgid ""
"\n"
msgstr "æ¤å¤?ï¼?BridgeDB æ??æ?®é??ç??æ©?æ?¥å?¨ %sï¼?æ²?æ??ä»»ä½?\nå?¯æ??æ??å?³è¼¸ %sï¼?é??ä¹?許è?½èµ·ä¾?ä¸?é?·ï¼?ä½?å®?\nä»?æ??å?©æ?¼è¦?é?¿å?¨è¨±å¤?æ??æ³?ä¸?ç??網路審æ?¥ã??\n"
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "�麼�����"
@@ -323,32 +321,101 @@ msgid "Get Bridges!"
msgstr "å??å¾?æ©?æ?¥å?¨ï¼?"
#: bridgedb/strings.py:130
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:132
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:138
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:142
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:148
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:152
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:153
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:160
+msgid "None"
+msgstr "ç?¡"
+
+#: bridgedb/strings.py:161
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:171
msgid "Please select options for bridge type:"
msgstr "è«?é?¸æ??æ©?æ?¥å?¨é¡?å??ç??é?¸é ?ï¼?"
-#: bridgedb/strings.py:131
+#: bridgedb/strings.py:172
msgid "Do you need IPv6 addresses?"
msgstr "æ?¨é??è¦? IPv6 ä½?å??å??ï¼?"
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:173
#, python-format
msgid "Do you need a %s?"
msgstr "æ?¨é??è¦? %s å??ï¼?"
-#: bridgedb/strings.py:136
+#: bridgedb/strings.py:177
msgid "Your browser is not displaying images properly."
msgstr "æ?¨ç??ç??覽å?¨ä¸?è?½æ£ç¢ºé¡¯ç¤ºå??å??ã??"
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:178
msgid "Enter the characters from the image above..."
msgstr "å¾?ä¸?é?¢ç??å??å??ä¸è¼¸å?¥å?å??....."
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:182
msgid "How to start using your bridges"
msgstr "å¦?ä½?é??å§?使ç?¨æ?¨ç??æ©?æ?¥å?¨"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:184
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -357,21 +424,21 @@ msgid ""
msgstr "è?¥è¦?å°?æ©?æ?¥å?¨å? å?¥å?°æ´?è?¥è·¯ç?±ç??覽å?¨ä¸ï¼?é¦?å??è«?å?° %s æ´?è?¥è·¯ç?±ç??覽å?¨ä¸?è¼?é ?é?¢ %s 並æ??ç?§é ?é?¢ä¸?ç??說æ??ä¾?ä¸?è¼?å??å??å??æ´?è?¥è·¯ç?±ç??覽å?¨ã??"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:189
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:152
+#: bridgedb/strings.py:193
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:156
+#: bridgedb/strings.py:197
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"
@@ -379,28 +446,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "é?¸æ??ã??æ?¯ã??ï¼?ç?¶å¾?æ??ä¸?ä¸?ã??ä¸?ä¸?æ¥ã??ã??è¦?è¨å®?æ?¨ç??æ?°æ©?æ?¥å?¨ï¼?è¤?製å??\nå°?æ©?æ?¥ç·?路貼ä¸?å?°æ??å?輸å?¥æ?¹å¡?ä¸ã??æ??å¾?ï¼?æ??ä¸?ä¸?ã??é?£æ?¥ã??就好ã??\nå¦?æ??æ?¨é??å?°éº»ç?©ï¼?è«?å??試æ??ä¸?ä¸?ã??æ´?è?¥è·¯ç?±ç¶²è·¯è¨å®?ã??ç²¾é??ä¸ç??ã??説æ??ã??\næ??é??å°?æ±?é?²ä¸?æ¥ç??å??å?© ã??"
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:205
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:168
+#: bridgedb/strings.py:209
msgid "Request vanilla bridges."
msgstr "è«?æ±?æ¨?æº?æ©?æ?¥å?¨ã??"
-#: bridgedb/strings.py:169
+#: bridgedb/strings.py:210
msgid "Request IPv6 bridges."
msgstr "è«?æ±? IPv6 æ©?æ?¥å?¨ã??"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
+#: bridgedb/strings.py:212
msgid "Request a Pluggable Transport by TYPE."
msgstr "æ??ç?§ TYPE è«?æ±?å?¯æ??æ??å?³è¼¸ã??"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:215
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "å??å¾? BridgeDB ä¸?ç?? GnuPG å?¬é??é??é?°å?¯æ?¬ã??"
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits